From nobody Sat Mar 25 22:55: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 4PkZDk1ZQbz41rKg; Sat, 25 Mar 2023 22:55: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 4PkZDk11twz4F0m; Sat, 25 Mar 2023 22:55:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679784950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pr5dstzAT0HCcYtPD6UjalzHR5A15IEey8AoN0Hnz94=; b=GAa/ODOcPF6ZXqfHVrIfThihFjFXS1RWT3DDxMuV22e5s7iVWfbI89FV2aglO+nm9EORQL +sMG0+2+7wUvUHt795DeNpz+Oq3h8nhwnXiQcdRi0GoQcO8lSUel6MdqkJ7cX9+EikE1Vy fKSdEBFKerozXrHj5HSTUC9UC9Qx0N9U571zdEMfTFtzrchPYwbvSm0SViXD9KxKQYk0Fq qnimF+Xm2sxRaNRogJbgfdM3hdUmVfhq3QNvduqjdDk50bN4P51gjBjwZ+FFrTZpn9Gctt 1wQ78JgCaBTGJAaX3DQqNEvma+zfps51+DY2UT3BZZTpEAEwNCUDS8iRqCEjsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679784950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pr5dstzAT0HCcYtPD6UjalzHR5A15IEey8AoN0Hnz94=; b=JB+q4x1flkNxp2SmptswYh8pC3UVI2l4feLPxSRz3yYRwt2ef3whJeiVFNu6lOX7I0dXBw wqlAXi+XBLXIuMn3kgjQE7gKc0znQsWh/R1M1NnGcwv82swWE0CgqAh7ZibNtnsXlwET1J YzPDSL4iSvDzPONeY8o8M+JyDf2q6QVpU9idcvZVbB6X0nKX1/LO7AYy07IA9YZdXwvAAv CHrqw9M7zgRY4s+KYyb32GH1sRllxfyO+IcTTlqnC0kvme8gZUqnMVP9rT898Kl/Ko4z5o FiG5fBhdsOTiR1Pyc7LGc73LU9TiRDkTAu6zjuQ30vLUhbpLAPEBhyfnot6Vnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679784950; a=rsa-sha256; cv=none; b=arpmXOQCRwXLouqpk7v8I3X257izSsDH5pRri7Fvn/sfVX0Lf66Ya8AdRNArFD3nzhu+dK 3U97VoGojJosqNInHwrF83zb1IiNg6yP0LRaZdQyzc6CSVuT4DzvhKhjw2SVPPZF7T4LkA RE3+6o3OxuuYYXtSUtnG1oSc2MTaR9atcvgR+FTiKdccTozn0yeA9VI0iyg7WC2LErdCgs A5Msz6Mpmf8iHSu9+ApSKX3xPMbDIqPKC8OP+Lc/kBIcxz59SoRVye59VkOSFclcDkSBfA Xt91dUdjYNb9ByMkBVq/EWEAYqPy/4xWpSQFtPHix/WBjhK10aTnXBXRxFv3Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PkZDk04qPzHKJ; Sat, 25 Mar 2023 22:55:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32PMtn4k054031; Sat, 25 Mar 2023 22:55:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32PMtnil054030; Sat, 25 Mar 2023 22:55:49 GMT (envelope-from git) Date: Sat, 25 Mar 2023 22:55:49 GMT Message-Id: <202303252255.32PMtnil054030@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: 28f957b8b3a2 - main - vnode_pager_input: return runningbufspace back List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 28f957b8b3a22086927451fee89789fdf596260b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=28f957b8b3a22086927451fee89789fdf596260b commit 28f957b8b3a22086927451fee89789fdf596260b Author: Konstantin Belousov AuthorDate: 2023-03-24 21:12:21 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-25 22:55:29 +0000 vnode_pager_input: return runningbufspace back Both vnode_pager_input_smlfs() and vnode_pager_generic_getpages() increment runningbufspace, but also both delegate io completion handling on the pbuf to either plain bdone() or filesystem-specific strategy routine. Accidentally, for e.g. UFS it is g_vfs_strategy()/g_vfs_done(). The later calls bufdone() which handles runningbufspace reclamation. For plain bdone() io done handler, nothing would return accounted b_runningbufspace back. Do it in the new helper vnode_pager_input_bdone(), as well as in vnode_pager_generic_getpages_done() explicitly. Note that potential multiple calls to runningbufwakeup() for the same pbuf or buf completion are safe. runningbufwakeup() clears accounting for the buffer, so second and later calls are nop. The problem was found due to tarfs using small vnode pager input but not g_vfs_strategy(). Reported by: des Reviewed by: markj, sjg Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39263 --- sys/vm/vnode_pager.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 56caf75d7f90..6103daaf13c2 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -640,6 +640,13 @@ vnode_pager_addr(struct vnode *vp, vm_ooffset_t address, daddr_t *rtaddress, return (err); } +static void +vnode_pager_input_bdone(struct buf *bp) +{ + runningbufwakeup(bp); + bdone(bp); +} + /* * small block filesystem vnode pager input */ @@ -686,7 +693,7 @@ vnode_pager_input_smlfs(vm_object_t object, vm_page_t m) /* build a minimal buffer header */ bp->b_iocmd = BIO_READ; - bp->b_iodone = bdone; + bp->b_iodone = vnode_pager_input_bdone; KASSERT(bp->b_rcred == NOCRED, ("leaking read ucred")); KASSERT(bp->b_wcred == NOCRED, ("leaking write ucred")); bp->b_rcred = crhold(curthread->td_ucred); @@ -1204,6 +1211,8 @@ vnode_pager_generic_getpages_done(struct buf *bp) error = (bp->b_ioflags & BIO_ERROR) != 0 ? bp->b_error : 0; object = bp->b_vp->v_object; + runningbufwakeup(bp); + if (error == 0 && bp->b_bcount != bp->b_npages * PAGE_SIZE) { if (!buf_mapped(bp)) { bp->b_data = bp->b_kvabase; From nobody Sun Mar 26 03:31: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 4PkhLc3FQWz418ZM; Sun, 26 Mar 2023 03:31: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 4PkhLc2qGdz3LwB; Sun, 26 Mar 2023 03:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679801480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8jUyfH7V7G9NAb4vwZ8AJ6gx9flNhs0sfV9HMVfK63g=; b=yyha27b0qDgtC+/HqAkQXXsAs4u7UDYqFJynuaA2NF421JU1jyriJYa6s21GFs9gf/OsQU yznppdGC/yg4D1jYIoh0tntJrr51bA0f+Zsv+n64/bwyBrYcPqZxW4w4Te2ByvZVma93Hg VNPn1C4ujoaLfXK5C9hfTY5vGCM4YOLJoS1KI/Jx1liBbl1+uRqSsOJiph9sXDKhFAnor5 mGeevLpeVJwPFApnWefxJBQhfHQwWMtD/eeFM5mgmOw+DXHPnTDic/+X1CzwsWE4JFO5Wj 3pzUj6zXmO+YF1ucY77a99Jj8S804XVLzUjLRxtRVi5wOqNFgil6L8/ta8NP2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679801480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8jUyfH7V7G9NAb4vwZ8AJ6gx9flNhs0sfV9HMVfK63g=; b=lfJ0TljY3AIv6wLx4bohI9BFjnIr0n0WG5Yt2J+IDQv5NpXiEaLeTQc71xQD3ccZLkNqQH WZS8og+6KxWjYfDy/du2O3j+AEwwZE9+oCKqs3x6eH8SAz2Mb5AIdY5mnGreKPLXGzl/Ul 4uu6L//GxL/1wtaDmp6/oliKZEmmdoNcNJ5phaIfZ4NR0jmsTfk3oojLKoZn8uG6lAKVOT wLIwQQZj2t/6IXbFnXmQp1I33DU28NJHFCYsa9zBM4/cbxDXsy3L1+Z1viCGidr8FGEXdT 53xdakp4suA35x4Ts4ZCKAgv7J+XSDAqzE/+T/sSVbOAzBiutFuOnb5DiBL1Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679801480; a=rsa-sha256; cv=none; b=W0NII29Jt3pLUa9ciFne4k0fonk5JlPKId2K+l69yPiHIXzr9krvRdWFP8d++tMW25o0Ui bcRxIGAIkgbt02QX+/2ZZVlec4MRsOfhyLHEQqPqkqTVknGXK1Ybb+LdTft2Jy5tfsRfMV UYxotAG5u9/beEitYpxVBUlOP4dcs2AwLDsUiT8/7FBJQpUNKMcrgBMdfOwn4wbSYmumTc PoIXRlfYUrymFBRtOGO7qTSpX0T/qKdHWYuk7X4MXKw515tpvNikgTq7EbkewantIQSV8v 5ZpxpZWnke/hh8BcePVOOyTtcRm76b7+pRwV7cAazYwEgJ9zm33rOYGBj7SrbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PkhLc1qy9zPp6; Sun, 26 Mar 2023 03:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32Q3VKDO009107; Sun, 26 Mar 2023 03:31:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32Q3VKDp009106; Sun, 26 Mar 2023 03:31:20 GMT (envelope-from git) Date: Sun, 26 Mar 2023 03:31:20 GMT Message-Id: <202303260331.32Q3VKDp009106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 1f5c16c4e177 - main - share/misc/committers-*: Document my mentors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f5c16c4e177b9306a47102a248f738c201f968b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1f5c16c4e177b9306a47102a248f738c201f968b commit 1f5c16c4e177b9306a47102a248f738c201f968b Author: Cy Schubert AuthorDate: 2023-03-26 03:29:37 +0000 Commit: Cy Schubert CommitDate: 2023-03-26 03:29:37 +0000 share/misc/committers-*: Document my mentors Document my ports and src mentors. --- share/misc/committers-ports.dot | 2 ++ share/misc/committers-src.dot | 1 + 2 files changed, 3 insertions(+) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 48563c84adac..93e7a3f97827 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -655,6 +655,8 @@ miwi -> zeising mnag -> jmelo +nectar -> cy + netchild -> bsam nork -> ale diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 0afa32f65654..6e7b5b6c63b3 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -551,6 +551,7 @@ gibbs -> njl gibbs -> royger gibbs -> whu +glebius -> cy glebius -> mav gnn -> arybchik From nobody Sun Mar 26 07:44: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 4PknyM0Xtlz41RT4; Sun, 26 Mar 2023 07:44: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 4PknyL73q4z40DM; Sun, 26 Mar 2023 07:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679816651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ozbM9egjxpuGK7EGXCGOg02IfJsyUl3Ly8jaHLtcjw8=; b=jy55HTMAYuq94MLqgblM9JwSCUMqYkL68WiKY0Qe94qxBSDsmwATJ5WW0JJuXdq+ATYy5/ HWNXKNDVROmaUyVRkvRySc9I8FaJKuB5Lj+O053BfgiRZjiied8mwRKoei1jvFXO12Md3h pfyKoNl/JF1UTMb13Uc9OOeWGFQlajh0Bz7VXF5GAZV0AE/08lcJbgTeiNf2zawL6U6esc jZD5KGa3r1T3Csmca7WYggnr1AXN2/2ZYgZ+PSBuOhVT+/ZpDO5p6sEz+NCiUFRnoaT/fA hlB/uX4QsKFnBScttuWw1tK6VJYPU+Y8gA2+FW4UoEYnjQbj9gPMzhFSI/XFrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679816651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ozbM9egjxpuGK7EGXCGOg02IfJsyUl3Ly8jaHLtcjw8=; b=tkDl1XoPRmIhr+xBWfxCQbql4fndTlsSlDApXqOdoyMZsBE31fe3BvSOjL2Z24jK9H9umC GjYFHHfWUFYMSEc8RkZju/oyY9MudXYNTHSfZBfxE0yDd67Ui2hjzk7sdf/bur8UqUCfiY g7lsHN62S0EpF7QxPLdDO93jkpRgTlcPhVSba84B1gD21Y95ZRt1/VTeGnkXyp68yyiQOD EXG7q5pJvscLxwkt5A5tiglLh2BIVgP4b8IH93l5gjmZbJpZPcdwCq2fAJTZeX2miFDYIw QUad5F4TKdSBLNJRXzvEIF+MKjWsxVTMiyoPe5A7bGaObrRpHGG91jM4YBDQ4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679816651; a=rsa-sha256; cv=none; b=MyApuQOvSHXr7kjoFnJQ6Of1zyOMz7NmxFoQrVwaD5MdV0zoSDdMCo34x2Eq3iqWT5MZ9s utvP7gIkaBuMNA+0w5WddaY9wxPrBhCn9ZoKdOz386I8tpM4wze9f07O2hYc+2oSKr+NxP IA8gwVxOB3ezCcuRG0Lf6c6LN+E5i+ZaNHjgBSjGazbZSE4oENBsfVowBAYRpSkjlGV6wu h8/1U8q2TFhEaUEFoNLvin8QVmWeL+fEAqmjN8iOJlvvzlT9GnveQien+lBjdqWDR7jNpY 4eYP+N2PPbbGm2faU3PXwmYve1qKYSXnshJpqcbokPGEfdQpt/LK6PP0vQdomQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PknyL677wzXdh; Sun, 26 Mar 2023 07:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32Q7iAoO024049; Sun, 26 Mar 2023 07:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32Q7iAUd024048; Sun, 26 Mar 2023 07:44:10 GMT (envelope-from git) Date: Sun, 26 Mar 2023 07:44:10 GMT Message-Id: <202303260744.32Q7iAUd024048@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 328ebd468056 - main - devd.conf.5: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 328ebd4680563d62d79c724ab6bbeaadafba7997 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=328ebd4680563d62d79c724ab6bbeaadafba7997 commit 328ebd4680563d62d79c724ab6bbeaadafba7997 Author: Gordon Bergling AuthorDate: 2023-03-26 07:43:58 +0000 Commit: Gordon Bergling CommitDate: 2023-03-26 07:43:58 +0000 devd.conf.5: Fix a typo in the manual page - s/deteted/detected/ MFC after: 5 days --- sbin/devd/devd.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5 index d07b776c3ee8..4a76b24e323a 100644 --- a/sbin/devd/devd.conf.5 +++ b/sbin/devd/devd.conf.5 @@ -543,7 +543,7 @@ device has detected the lid openinging. .It Li PMU Ta Li POWER Ta ACLINE Ta The .Xr pmc 4 -device has deteted an AC line state ($notify=0x00 is offline, 0x01 is online). +device has detected an AC line state ($notify=0x00 is offline, 0x01 is online). .It Li PMU Ta Li USB Ta overvoltage Ta An over-voltage condition on the power lines for the USB power pins. .It Li PMU Ta Li USB Ta plugged Ta From nobody Sun Mar 26 08:38: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 4Pkq952rkGz41VRJ; Sun, 26 Mar 2023 08:38: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 4Pkq952Mzzz44Vv; Sun, 26 Mar 2023 08:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679819913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1UhhpDpBx/fwNO0z/ugz7Vr0URnT4vM0KaykJ2+kezs=; b=K9PB6fMTloRwIuJWwqL5JZRi9gcr9ongC5gFTNfaskAkwZ9kp/P+6EhX9lQXrBD84/W4XK xHnUdwshP0zLH1mwKXjhR7HrFRwmUChqNh8/MSV3fhrs8EqGnO0rMJBW/IpNzV4qLpLxVp DGmZ3fRnNjdnfIGLgs0YrgOfuX9EY9q1ovAz2pgDx2MQfcY6ODrsRWTc98t95Aqkq7RYGT SG7mfx8Er+U9j4nV2G/7ixICMKZpaIdZS6Tj+9EqDJbmT4b6Au1vhhdSCUMwu8Gl0osFXZ i16nWR+VX7clHLs+iAPzkQpyzz1g8F+tpaMMLYKroS9jDekq6hkoXG3EdDK0bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679819913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1UhhpDpBx/fwNO0z/ugz7Vr0URnT4vM0KaykJ2+kezs=; b=JwheG/KRrMFhSx/PT+bkWGzzfAVfXcvcis9B+RpL2cBVTrdkSfgqUEC4fnTu35IlJJPhWG /sfPmEZ3aKhCvqLbKrM8PAOeJNnfIcwRlSrKRadSCVqdI3+QGLeqmCHwit83HhiL7iyfSR SgOYLy6+MDUkX77lq42HvYSwwRFMAHv9tUaVi7Ml7Xfta6Huk8R2yRurcjFkyvcp/2rzMn /JCAWmKLp1ECuTAmSf9Nb9BXTMCn/htqGWYV+yuNisUul1DZ1uAJ1AEY569+XEjqy2qWOI Hyd4nkSERlS/99GsjZ095DXPnmhU3VTCTqlav44R9vSrcZjkPfnuyLvV3R238Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679819913; a=rsa-sha256; cv=none; b=b3q/QWn1A1Xm5ZZpD0nxeUVHCYI5G2Aj96q9Kg3L9O90ijr3qB/cHJmA3gDr1dwLzlop3R fkazqJ6DScl/I4wdFI28R4TTnmD/ijz9v0/Z1MunUA/cqZq+VQtJx0m/7LG3UMrKdztX3A OXfKcLWGyt6EJq0OK6SPmJ+q74K15vih11DKvgPrZ4CqIBlOnDVQU5kBcGkfApfbiuBCg3 fDgx89yOnOBZ+yTSJEks31ltgjR/nkub9wgRWFiJxu62fy3AYVIYs8nQE2Vv0X+RzJNIXz w41xHctfue3F+P1J4T6vETyR9jJxNG63FNd9L+rMrDGeCozY61iZuy0KwES3/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pkq951QGyzZ1N; Sun, 26 Mar 2023 08:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32Q8cXQb006074; Sun, 26 Mar 2023 08:38:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32Q8cXDH006073; Sun, 26 Mar 2023 08:38:33 GMT (envelope-from git) Date: Sun, 26 Mar 2023 08:38:33 GMT Message-Id: <202303260838.32Q8cXDH006073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 2cda6a2fb0d9 - main - routing: add public rt_is_exportable() version to check if the route can be exported to userland when jailed. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cda6a2fb0d9473a53931dc2b0171af54dd79b04 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=2cda6a2fb0d9473a53931dc2b0171af54dd79b04 commit 2cda6a2fb0d9473a53931dc2b0171af54dd79b04 Author: Alexander V. Chernikov AuthorDate: 2023-03-26 08:19:56 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-26 08:24:27 +0000 routing: add public rt_is_exportable() version to check if the route can be exported to userland when jailed. Differential Revision: https://reviews.freebsd.org/D39204 MFC after: 2 weeks --- sys/net/route/route_ctl.h | 2 ++ sys/net/route/route_rtentry.c | 24 ++++++++++++++++++++++++ sys/net/rtsock.c | 29 ++++------------------------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/sys/net/route/route_ctl.h b/sys/net/route/route_ctl.h index e8560e681ddb..b65b64fcdaa0 100644 --- a/sys/net/route/route_ctl.h +++ b/sys/net/route/route_ctl.h @@ -121,6 +121,7 @@ void rib_foreach_table_walk_del(int family, rib_filter_f_t *filter_f, void *arg) struct nhop_object; struct nhgrp_object; +struct ucred; const struct rtentry *rib_lookup_prefix(uint32_t fibnum, int family, const struct sockaddr *dst, const struct sockaddr *netmask, @@ -133,6 +134,7 @@ bool rt_is_host(const struct rtentry *rt); sa_family_t rt_get_family(const struct rtentry *); struct nhop_object *rt_get_raw_nhop(const struct rtentry *rt); void rt_get_rnd(const struct rtentry *rt, struct route_nhop_data *rnd); +bool rt_is_exportable(const struct rtentry *rt, struct ucred *cred); #ifdef INET struct in_addr; void rt_get_inet_prefix_plen(const struct rtentry *rt, struct in_addr *paddr, diff --git a/sys/net/route/route_rtentry.c b/sys/net/route/route_rtentry.c index 0c3c8ddd7361..d57b5db80b89 100644 --- a/sys/net/route/route_rtentry.c +++ b/sys/net/route/route_rtentry.c @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -197,6 +198,29 @@ rt_get_rnd(const struct rtentry *rt, struct route_nhop_data *rnd) rnd->rnd_weight = rt->rt_weight; } +/* + * If the process in in jail w/o VNET, export only host routes for the + * addresses assigned to the jail. + * Otherwise, allow exporting the entire table. + */ +bool +rt_is_exportable(const struct rtentry *rt, struct ucred *cred) +{ + if (!rt_is_host(rt)) { + /* + * Performance optimisation: only host routes are allowed + * in the jail w/o vnet. + */ + if (jailed_without_vnet(cred)) + return (false); + } else { + if (prison_if(cred, rt_key_const(rt)) != 0) + return (false); + } + + return (true); +} + #ifdef INET /* * Stores IPv4 address and prefix length of @rt inside diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index b77692d28588..548caf0ef23a 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -218,8 +218,6 @@ static int update_rtm_from_rc(struct rt_addrinfo *info, static void send_rtm_reply(struct socket *so, struct rt_msghdr *rtm, struct mbuf *m, sa_family_t saf, u_int fibnum, int rtm_errno); -static bool can_export_rte(struct ucred *td_ucred, bool rt_is_host, - const struct sockaddr *rt_dst); static void rtsock_notify_event(uint32_t fibnum, const struct rib_cmd_info *rc); static void rtsock_ifmsg(struct ifnet *ifp, int if_flags_mask); @@ -1168,11 +1166,8 @@ rts_send(struct socket *so, int flags, struct mbuf *m, senderr(error); nh = rc.rc_nh_new; - if (!can_export_rte(curthread->td_ucred, - info.rti_info[RTAX_NETMASK] == NULL, - info.rti_info[RTAX_DST])) { + if (!rt_is_exportable(rc.rc_rt, curthread->td_ucred)) senderr(ESRCH); - } break; default: @@ -2198,23 +2193,6 @@ rt_dispatch(struct mbuf *m, sa_family_t saf) netisr_queue(NETISR_ROUTE, m); /* mbuf is free'd on failure. */ } -/* - * Checks if rte can be exported w.r.t jails/vnets. - * - * Returns true if it can, false otherwise. - */ -static bool -can_export_rte(struct ucred *td_ucred, bool rt_is_host, - const struct sockaddr *rt_dst) -{ - - if ((!rt_is_host) ? jailed_without_vnet(td_ucred) - : prison_if(td_ucred, rt_dst) != 0) - return (false); - return (true); -} - - /* * This is used in dumping the kernel table via sysctl(). */ @@ -2226,9 +2204,10 @@ sysctl_dumpentry(struct rtentry *rt, void *vw) NET_EPOCH_ASSERT(); - export_rtaddrs(rt, w->dst, w->mask); - if (!can_export_rte(w->w_req->td->td_ucred, rt_is_host(rt), w->dst)) + if (!rt_is_exportable(rt, w->w_req->td->td_ucred)) return (0); + + export_rtaddrs(rt, w->dst, w->mask); nh = rt_get_raw_nhop(rt); #ifdef ROUTE_MPATH if (NH_IS_NHGRP(nh)) { From nobody Sun Mar 26 08:53: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 4PkqVL2RfYz41WjK; Sun, 26 Mar 2023 08:53: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 4PkqVL1t3Tz47mM; Sun, 26 Mar 2023 08:53:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679820810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uN4NBqd0zwNqfzLTwJJPfKP2lcaGd2t58St01vaqmBQ=; b=JTQ5Dc8mUdaTuZWl3/jA0VdDN/YcfGUohn+UUhhqKUWK8/+rZkJB3WTiyCFdShUEkxAgtc 3HP9gXAdgNQ5Ou1CzauIdp/Czu66CQkygWzPIGEMZEiWzUmsHUszmA80VI9bTirnwhgvSI tdiV32ZbWpS+cbdfK5jd0VII59Ac7krySlbFucfuU+Z2ZfA8Ggoz8NzgZ1EecQt9XApGnl HAR3hMEWYzzlQ4n0DYe9HOVeDTB+jjFxBsmhVQxmSxYN1/jU3q0p97FGAYMkzT7yq+XZpi Nt+n0qIjc4HGA6/2NJ389YABmIZLt6Afvb0Qv8g/BRQBS0N6uL2hMXrp465SPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679820810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uN4NBqd0zwNqfzLTwJJPfKP2lcaGd2t58St01vaqmBQ=; b=Q2JDcElNJmDT8Lun0yLHLuSNdfo7RwzTP1ve8ItB6SMEN66752u+D5xodEiR99LcfXzrru joNXlA+0p1fUYSBthWNIY+8WKfI0IqHGe4ItVcKJ/dKzrjRuZnRKgJNSr16Yk/O8G/5gKd TkXTTyxkYpQLbUdzBZIzEqo57K5JwMVXKbSkVPphVIdV0GHBGHG4Eo9mbSs5ExCsAgfHIY uCOebidPMrXqbUajiBL0gqQKRKtskS7qAuWmxg1ju9LkTy/vRRXffXptBX7cIQ0mahI7kO NbIFQ88LM9te0cJ0Nxis/ztJV5yPlykw4kFCLKhpKvgvNR/va+0eqmxeA/NH3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679820810; a=rsa-sha256; cv=none; b=ejUv2qo+IglTZZQfZtDb7CXIBvidq0nweQ9gwcU3xFGiJnNBmLDh0GwQuQjQZtsSIt2LWP vnYCtNlCueLwyyumlUlG1dKy5Msf7JFnFPfjS0vIL7wc+VtseSThm3U5fsrBnyJav9u5ri nZvmJcNu9JkcE8d4DlO4tKx7xqrK+6Y+kdOifuT9I25kcMRvRK3VcP4Z/hrvQqH9QTxREL ZINr3Bq6kA0WAgfF292oEhQLT/h354rwezxAL4OZb+0yCNIbcO/uu5Iwg5/VGCQbQyg0TD 1eqNKClPjt9J0AN6UgTYgF7yNsF+tLZ+4uhbZzgeeUZXC+OPaDCE7Ny9C8XZwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PkqVL0xMSzYyy; Sun, 26 Mar 2023 08:53:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32Q8rUFM039415; Sun, 26 Mar 2023 08:53:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32Q8rUSo039414; Sun, 26 Mar 2023 08:53:30 GMT (envelope-from git) Date: Sun, 26 Mar 2023 08:53:30 GMT Message-Id: <202303260853.32Q8rUSo039414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 04f75b980293 - main - netlink: allow netlink sockets in non-vnet 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04f75b980293d517558990a7fda6900445edcac6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=04f75b980293d517558990a7fda6900445edcac6 commit 04f75b980293d517558990a7fda6900445edcac6 Author: Alexander V. Chernikov AuthorDate: 2023-03-26 08:42:51 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-26 08:44:09 +0000 netlink: allow netlink sockets in non-vnet jails. This change allow to open Netlink sockets in the non-vnet jails, even for unpriviledged processes. The security model largely follows the existing one. To be more specific: * by default, every `NETLINK_ROUTE` command is **NOT** allowed in non-VNET jail UNLESS `RTNL_F_ALLOW_NONVNET_JAIL` flag is specified in the command handler. * All notifications are **disabled** for non-vnet jails (requests to subscribe for the notifications are ignored). This will change to be more fine-grained model once the first netlink provider requiring this gets committed. * Listing interfaces (RTM_GETLINK) is **allowed** w/o limits (**including** interfaces w/o any addresses attached to the jail). The value of this is questionable, but it follows the existing approach. * Listing ARP/NDP neighbours is **forbidden**. This is a **change** from the current approach - currently we list static ARP/ND entries belonging to the addresses attached to the jail. * Listing interface addresses is **allowed**, but the addresses are filtered to match only ones attached to the jail. * Listing routes is **allowed**, but the routes are filtered to provide only host routes matching the addresses attached to the jail. * By default, every `NETLINK_GENERIC` command is **allowed** in non-VNET jail (as sub-families may be unrelated to network at all). It is the goal of the family author to implement the restriction if necessary. Differential Revision: https://reviews.freebsd.org/D39206 MFC after: 1 month --- sys/kern/kern_jail.c | 1 + sys/netlink/netlink_ctl.h | 1 + sys/netlink/netlink_domain.c | 12 ++++++++++++ sys/netlink/netlink_generic.c | 1 + sys/netlink/netlink_route.c | 5 +++++ sys/netlink/netlink_var.h | 1 + sys/netlink/route/iface.c | 8 +++++++- sys/netlink/route/route_var.h | 3 ++- sys/netlink/route/rt.c | 6 ++++++ 9 files changed, 36 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 7b57e5bb9d61..0558c7d9b7fe 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3440,6 +3440,7 @@ prison_check_af(struct ucred *cred, int af) #endif case AF_LOCAL: case AF_ROUTE: + case AF_NETLINK: break; default: if (!(pr->pr_allow & PR_ALLOW_SOCKET_AF)) diff --git a/sys/netlink/netlink_ctl.h b/sys/netlink/netlink_ctl.h index 8cd29cf56d10..9369194151af 100644 --- a/sys/netlink/netlink_ctl.h +++ b/sys/netlink/netlink_ctl.h @@ -81,6 +81,7 @@ bool netlink_unregister_proto(int proto); bool nl_has_listeners(int netlink_family, uint32_t groups_mask); bool nlp_has_priv(struct nlpcb *nlp, int priv); struct ucred *nlp_get_cred(struct nlpcb *nlp); +bool nlp_unconstrained_vnet(const struct nlpcb *nlp); /* netlink_generic.c */ struct genl_cmd { diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 2704974173b4..24ca9de877f0 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -111,6 +112,10 @@ nl_add_group_locked(struct nlpcb *nlp, unsigned int group_id) MPASS(group_id <= NLP_MAX_GROUPS); --group_id; + /* TODO: add family handler callback */ + if (!nlp_unconstrained_vnet(nlp)) + return; + nlp->nl_groups[group_id / 64] |= (uint64_t)1 << (group_id % 64); } @@ -212,6 +217,12 @@ nlp_has_priv(struct nlpcb *nlp, int priv) return (priv_check_cred(nlp->nl_cred, priv) == 0); } +bool +nlp_unconstrained_vnet(const struct nlpcb *nlp) +{ + return (nlp->nl_unconstrained_vnet); +} + struct ucred * nlp_get_cred(struct nlpcb *nlp) { @@ -308,6 +319,7 @@ nl_pru_attach(struct socket *so, int proto, struct thread *td) nlp->nl_process_id = curproc->p_pid; nlp->nl_linux = is_linux; nlp->nl_active = true; + nlp->nl_unconstrained_vnet = !jailed_without_vnet(so->so_cred); NLP_LOCK_INIT(nlp); refcount_init(&nlp->nl_refcount, 1); nl_init_io(nlp); diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index d4022c2c2a75..a2bd624f99d9 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include diff --git a/sys/netlink/netlink_route.c b/sys/netlink/netlink_route.c index 037fd2170c66..ce0c0eb36dbc 100644 --- a/sys/netlink/netlink_route.c +++ b/sys/netlink/netlink_route.c @@ -93,6 +93,11 @@ rtnl_handle_message(struct nlmsghdr *hdr, struct nl_pstate *npt) } else if (cmd->priv != 0) NLP_LOG(LOG_DEBUG3, nlp, "priv %d check passed for msg %s", cmd->priv, cmd->name); + if (!nlp_unconstrained_vnet(nlp) && (cmd->flags & RTNL_F_ALLOW_NONVNET_JAIL) == 0) { + NLP_LOG(LOG_DEBUG2, nlp, "jail check failed for msg %s", cmd->name); + return (EPERM); + } + bool need_epoch = !(cmd->flags & RTNL_F_NOEPOCH); if (need_epoch) diff --git a/sys/netlink/netlink_var.h b/sys/netlink/netlink_var.h index ed19008248e9..0114306885cf 100644 --- a/sys/netlink/netlink_var.h +++ b/sys/netlink/netlink_var.h @@ -61,6 +61,7 @@ struct nlpcb { bool nl_task_pending; bool nl_tx_blocked; /* No new requests accepted */ bool nl_linux; /* true if running under compat */ + bool nl_unconstrained_vnet; /* true if running under VNET jail (or without jail) */ struct nl_io_queue rx_queue; struct nl_io_queue tx_queue; struct taskqueue *nl_taskqueue; diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 6704acd1624f..18eab05576b7 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -61,6 +62,7 @@ struct netlink_walkargs { struct nl_writer *nw; struct nlmsghdr hdr; struct nlpcb *so; + struct ucred *cred; uint32_t fibnum; int family; int error; @@ -833,6 +835,8 @@ dump_iface_addrs(struct netlink_walkargs *wa, struct ifnet *ifp) continue; if (ifa->ifa_addr->sa_family == AF_LINK) continue; + if (prison_if(wa->cred, ifa->ifa_addr) != 0) + continue; wa->count++; if (!dump_iface_addr(wa->nw, ifp, ifa, &wa->hdr)) return (ENOMEM); @@ -856,6 +860,7 @@ rtnl_handle_getaddr(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n struct netlink_walkargs wa = { .so = nlp, .nw = npt->nw, + .cred = nlp_get_cred(nlp), .family = attrs.ifa_family, .hdr.nlmsg_pid = hdr->nlmsg_pid, .hdr.nlmsg_seq = hdr->nlmsg_seq, @@ -977,7 +982,7 @@ static const struct rtnl_cmd_handler cmd_handlers[] = { .cmd = NL_RTM_GETLINK, .name = "RTM_GETLINK", .cb = &rtnl_handle_getlink, - .flags = RTNL_F_NOEPOCH, + .flags = RTNL_F_NOEPOCH | RTNL_F_ALLOW_NONVNET_JAIL, }, { .cmd = NL_RTM_DELLINK, @@ -997,6 +1002,7 @@ static const struct rtnl_cmd_handler cmd_handlers[] = { .cmd = NL_RTM_GETADDR, .name = "RTM_GETADDR", .cb = &rtnl_handle_getaddr, + .flags = RTNL_F_ALLOW_NONVNET_JAIL, }, { .cmd = NL_RTM_NEWADDR, diff --git a/sys/netlink/route/route_var.h b/sys/netlink/route/route_var.h index f3b1d7d929a5..a11857b14a1f 100644 --- a/sys/netlink/route/route_var.h +++ b/sys/netlink/route/route_var.h @@ -48,7 +48,8 @@ struct rtnl_cmd_handler { int flags; }; -#define RTNL_F_NOEPOCH 0x01 +#define RTNL_F_NOEPOCH 0x01 /* Do not enter epoch when handling command */ +#define RTNL_F_ALLOW_NONVNET_JAIL 0x02 /* Allow command execution inside non-VNET jail */ bool rtnl_register_messages(const struct rtnl_cmd_handler *handlers, int count); diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index badd8d937be2..ef52dbf4edd6 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -513,6 +513,8 @@ dump_rtentry(struct rtentry *rt, void *_arg) wa->count++; if (wa->error != 0) return (0); + if (!rt_is_exportable(rt, nlp_get_cred(wa->nlp))) + return (0); wa->dumped++; rt_get_rnd(rt, &wa->rnd); @@ -606,6 +608,9 @@ handle_rtm_getroute(struct nlpcb *nlp, struct nl_parsed_route *attrs, RIB_RUNLOCK(rnh); + if (!rt_is_exportable(rt, nlp_get_cred(nlp))) + return (ESRCH); + IF_DEBUG_LEVEL(LOG_DEBUG2) { char rtbuf[NHOP_PRINT_BUFSIZE] __unused, nhbuf[NHOP_PRINT_BUFSIZE] __unused; FIB_LOG(LOG_DEBUG2, fibnum, family, "getroute completed: got %s for %s", @@ -1026,6 +1031,7 @@ static const struct rtnl_cmd_handler cmd_handlers[] = { .cmd = NL_RTM_GETROUTE, .name = "RTM_GETROUTE", .cb = &rtnl_handle_getroute, + .flags = RTNL_F_ALLOW_NONVNET_JAIL, }, { .cmd = NL_RTM_DELROUTE, From nobody Sun Mar 26 09:00: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 4PkqfD5Qq6z41X5h; Sun, 26 Mar 2023 09:00: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 4PkqfD4vgpz4BYg; Sun, 26 Mar 2023 09:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679821220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mr9rdXWaeA1vv1JtEJ2HJPef1xbsmugQdzRTbgunz2E=; b=dqwJ0Yh214V3pSson2w9QQgPr+hts/jsWyl3trNZirpuGGYaJCNdLtegyHTLzewR+YCNJo Am2q4R+k5XYxTM1BW0oXQ7ZzVNeNjqZDBlgx4kAqXfD2J7agKfqRni0s8c5MNjItugJGc9 /PK8/HTHbxTDz1M1h4TEE5C4v8/f2YwTxoq58tz0y33+fjGwQDmKcMxlUgGvbf3M9678im pFZdNETFx49PGv0AwvqqsVJiSjufiiqihV9zKr/hIfalhvUUDUFWQQgueDTX612N43tow1 Hh2DuIfWrPPbSdUZpu+biB7fa6ri1gCqPIz+01BQUEiibsj1EdCWqXjqahrhgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679821220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mr9rdXWaeA1vv1JtEJ2HJPef1xbsmugQdzRTbgunz2E=; b=spWns9XhMM24uPSvP+snVUhr+V+b4lmJLPiRRtOsVEhMgxcoEAtBHBg/Mq9f7cSJlBT7bd dKnYfHpwSBZqRdMwrzVPe5ZlTRhHYGEow12URq3BbdMvdKMe9eVHThvry83xNy+4dU9dlH oTCIpWpsFRtJdpW1bEQvhxWZZqLY+2I9FFLzEPDI8cFlxkwlo0hgxcmpm8k5X9RcZcYAvs DqrD8LWOWToXsM896OcjzSJKZv1msYzrYRP3prak3oIlgM8QxHoQ3CNrhmBN/ugB0dWeey V0aknulMxd/8b66Yn7oT57encByneCw6qtTe74DQxISe2IyOHmgg0k6zX8n16g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679821220; a=rsa-sha256; cv=none; b=CdEn9ksvR7jGu8SyyrwJeF7h6mgaQoyWpgfyo++uZAEOINDszbqNjdMeUedmgh4ZRUoZY3 gH1tCH/R0TjoGzOPlGyRN+QsTNTjWeCj2YaeBnmOp6TYaBi/xgUZxTsukp9+5LkYQjPObO qYKI6DwlYJGbTmMdGwLfVqp+XMhN4bBa4yr/qm0ccvMSeaoz139qGoZLxcib7qAT2m2Sx/ Y2DCYTM2HCc5KbsoluL3qeib7aUCy8rKsr85m60CntHAat9pm3/Y0JsOTivZlBys3x0wq5 VmBBooSFdQll7mQme2UJGI+CVf/GIjLN2t/optjbYpK3n0uvgm2Ww+FsMhs4nQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PkqfD3f1dzZDg; Sun, 26 Mar 2023 09:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32Q90K2A049917; Sun, 26 Mar 2023 09:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32Q90Kh0049916; Sun, 26 Mar 2023 09:00:20 GMT (envelope-from git) Date: Sun, 26 Mar 2023 09:00:20 GMT Message-Id: <202303260900.32Q90Kh0049916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 64dfea86515e - main - netlink: add NETLINK/NETLINK_SUPPORT userland options. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64dfea86515e71af254cf90d6d5ceb689b8fbf5a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=64dfea86515e71af254cf90d6d5ceb689b8fbf5a commit 64dfea86515e71af254cf90d6d5ceb689b8fbf5a Author: Alexander V. Chernikov AuthorDate: 2023-03-26 08:56:49 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-26 08:59:58 +0000 netlink: add NETLINK/NETLINK_SUPPORT userland options. Make userland tools such as netstat, route, arp and ndp use either netlink or rtsock interfaces based on the NETLINK_SUPPORT options. Both NETLINK and NETLINK_SUPPORT options are turned on by default. Reviewed By: eugen Differential Revision: https://reviews.freebsd.org/D39148 --- share/mk/src.opts.mk | 2 ++ tools/build/options/WITHOUT_NETLINK_SUPPORT | 5 +++++ usr.bin/netstat/Makefile | 7 ++++++- usr.bin/netstat/route.c | 13 +++++++++++-- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 880f1139843c..7c73e66aba18 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -145,6 +145,7 @@ __DEFAULT_YES_OPTIONS = \ MLX5TOOL \ NETCAT \ NETGRAPH \ + NETLINK \ NLS_CATALOGS \ NS_CACHING \ NTP \ @@ -233,6 +234,7 @@ __DEFAULT_DEPENDENT_OPTIONS= \ KERBEROS \ KVM \ NETGRAPH \ + NETLINK \ PAM \ TESTS \ WIRELESS diff --git a/tools/build/options/WITHOUT_NETLINK_SUPPORT b/tools/build/options/WITHOUT_NETLINK_SUPPORT new file mode 100644 index 000000000000..4a72d3f1e4d1 --- /dev/null +++ b/tools/build/options/WITHOUT_NETLINK_SUPPORT @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Make libraries and programs use rtsock and +.Xr sysctl 3 +interfaces instead of +.Xr snl 3 . diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index e2c9ca09eea5..92f8aa9c30fa 100644 --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -6,7 +6,6 @@ PROG= netstat SRCS= if.c inet.c main.c mbuf.c mroute.c netisr.c nl_symbols.c route.c \ unix.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c common.c nhops.c nhgrp.c \ - route_netlink.c \ nl_defs.h nl_symbols.c: nlist_symbols @@ -64,4 +63,10 @@ LIBADD+= netgraph CFLAGS+=-DNETGRAPH .endif +.if ${MK_NETLINK_SUPPORT} != "no" +SRCS+= route_netlink.c +.else +CFLAGS+=-DWITHOUT_NETLINK +.endif + .include diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index 5de683ebfe7a..c597f3632fa6 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -96,16 +96,20 @@ struct bits rt_bits[] = { { 0 , 0, NULL } }; +#ifdef WITHOUT_NETLINK static struct ifmap_entry *ifmap; static size_t ifmap_size; +#endif static struct timespec uptime; static const char *netname4(in_addr_t, in_addr_t); #ifdef INET6 static const char *netname6(struct sockaddr_in6 *, struct sockaddr_in6 *); #endif +#ifdef WITHOUT_NETLINK static void p_rtable_sysctl(int, int); static void p_rtentry_sysctl(const char *name, struct rt_msghdr *); +#endif static void domask(char *, size_t, u_long); const uint32_t rt_default_weight = RT_DEFAULT_WEIGHT; @@ -143,8 +147,11 @@ routepr(int fibnum, int af) if (fibnum) xo_emit(" ({L:fib}: {:fib/%d})", fibnum); xo_emit("\n"); - if (!p_rtable_netlink(fibnum, af)) - p_rtable_sysctl(fibnum, af); +#ifdef WITHOUT_NETLINK + p_rtable_sysctl(fibnum, af); +#else + p_rtable_netlink(fibnum, af); +#endif xo_close_container("route-information"); } @@ -240,6 +247,7 @@ set_wid(int fam) wid.expire = 6; } +#ifdef WITHOUT_NETLINK static void p_rtable_sysctl(int fibnum, int af) { @@ -365,6 +373,7 @@ p_rtentry_sysctl(const char *name, struct rt_msghdr *rtm) xo_emit("\n"); xo_close_instance(name); } +#endif int p_sockaddr(const char *name, struct sockaddr *sa, struct sockaddr *mask, From nobody Sun Mar 26 09:05: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 4PkqmG0yMDz41XRC; Sun, 26 Mar 2023 09:05: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 4PkqmG0R4dz4DvM; Sun, 26 Mar 2023 09:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679821534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xDIQLxSW+CR7mE8a19796XkbA484fV5pUyEvH+rMc6o=; b=oV+WVNr/hI0eStKBOdsTMiXQZEtmxU7ryDBn1yWocG3OIaLggmtiIySwRdfWySpcKY0teW l2V9EbSOtEyWNMzCoGvF1IavmCRcd2j3dCve1OoqV2Nxpw3kS7HEv8xwkEetCXt+wBuwKm HbxGJstfQLW68nPLY38JAafJDEBIhsIKvR/L+PF3UXi5ZPnPF4Svz5SC9Gto3AORZ3o28M 6lROIi3ZNrmdDzd53MjQ80zvvdp/kAoFBwB2VxhdnD0U+J5WWKv4Bobf42k3JilqGn0bOJ 2DTVUrgANrhFSd48+tKO6Yvch28dnJ/FA24oxk/oRVdPy8HmeBQsuuzHQXySJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679821534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xDIQLxSW+CR7mE8a19796XkbA484fV5pUyEvH+rMc6o=; b=X8KB1C4Wo2znfELtw2sWlBti5u0uNenfw3AeLGz/C5T9QKr3DCCawZKoVUGFJoDb1u7qvl OU1TyTcdC1ze9qOxpYbIvpra019otGRVYdFNYs3RuDqvvwUfhrqpPU9uu6RG9d8WUNU1Ur Ad4ITvrY+ixY02P6NzAAfqZHkiqo2HtRuAGDxkqka2MgKyqbMaFykW+mBYnyIJW/uJAfVt stCp2Cala/B3h7xC5/kGA9yHi+AHs0nuOAQ+UrBK9Ia66H4pjISqcx+V1SyCAv6zOJTAQu jhWb1pZqVmyjtGxNdmWhsiu8qYBEHrUrD27IFi+a+sRJXAUhQK3+7nt6EUAEZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679821534; a=rsa-sha256; cv=none; b=s6Nt3MsexaWDLCihVwIXbaewwFB2h2N+dKXapK8kWss4duDkZNMFFYNnPbRW7enn6yC8qn 1ZTKAM2d5ZPCHXFb/BH2Ilhibq/C5ee8V73+5xsTzDOYkOWklAKCoLeOi9a8xro+jFL4hR JdrUHDWS/5BoiMWonIqbjLiFlH77EP+ZdENTnrQpFsPvCHeR8rOXJihKoBuvJ/C1QGtIkX fJWKQIRr9BzRob6eEvJn0H8nIH71xtUhuY66OSNwdLJ4V3UOsJ2dA2WoC7quc1x0/attk/ ZP8whcevdmieyA68UgdcyDEAqdZsx6CBpxnAvzBJyI1Ys/Ke/2p55KNfkn/dWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PkqmF6crCzZjl; Sun, 26 Mar 2023 09:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32Q95X7H056875; Sun, 26 Mar 2023 09:05:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32Q95X10056874; Sun, 26 Mar 2023 09:05:33 GMT (envelope-from git) Date: Sun, 26 Mar 2023 09:05:33 GMT Message-Id: <202303260905.32Q95X10056874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 9a11f3dff991 - main - netlink: add standrard ifaddr/neigh parsers to snl(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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a11f3dff991bac89afb5f74a476e765abdbd1d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=9a11f3dff991bac89afb5f74a476e765abdbd1d1 commit 9a11f3dff991bac89afb5f74a476e765abdbd1d1 Author: Alexander V. Chernikov AuthorDate: 2023-03-26 09:04:41 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-26 09:04:41 +0000 netlink: add standrard ifaddr/neigh parsers to snl(3). MFC after: 2 weeks --- sys/netlink/netlink_snl_route_parsers.h | 57 ++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h index a370f89fb9e3..ba9ead461c80 100644 --- a/sys/netlink/netlink_snl_route_parsers.h +++ b/sys/netlink/netlink_snl_route_parsers.h @@ -198,6 +198,7 @@ struct snl_parsed_link_simple { uint32_t ifi_index; uint32_t ifla_mtu; uint16_t ifi_type; + uint32_t ifi_flags; char *ifla_ifname; }; @@ -210,14 +211,68 @@ static struct snl_attr_parser _nla_p_link_s[] = { static struct snl_field_parser _fp_p_link_s[] = { {.off_in = _IN(ifi_index), .off_out = _OUT(ifi_index), .cb = snl_field_get_uint32 }, {.off_in = _IN(ifi_type), .off_out = _OUT(ifi_type), .cb = snl_field_get_uint16 }, + {.off_in = _IN(ifi_flags), .off_out = _OUT(ifi_flags), .cb = snl_field_get_uint32 }, }; #undef _IN #undef _OUT SNL_DECLARE_PARSER(snl_rtm_link_parser_simple, struct ifinfomsg, _fp_p_link_s, _nla_p_link_s); +struct snl_parsed_neigh { + uint8_t ndm_family; + uint8_t ndm_flags; + uint16_t ndm_state; + uint32_t nda_ifindex; + struct sockaddr *nda_dst; + struct nlattr *nda_lladdr; +}; + +#define _IN(_field) offsetof(struct ndmsg, _field) +#define _OUT(_field) offsetof(struct snl_parsed_neigh, _field) +static struct snl_attr_parser _nla_p_neigh_s[] = { + { .type = NDA_DST, .off = _OUT(nda_dst), .cb = snl_attr_get_ip }, + { .type = NDA_LLADDR , .off = _OUT(nda_lladdr), .cb = snl_attr_get_nla }, + { .type = NDA_IFINDEX, .off = _OUT(nda_ifindex), .cb = snl_attr_get_uint32 }, +}; +static struct snl_field_parser _fp_p_neigh_s[] = { + {.off_in = _IN(ndm_family), .off_out = _OUT(ndm_family), .cb = snl_field_get_uint8 }, + {.off_in = _IN(ndm_flags), .off_out = _OUT(ndm_flags), .cb = snl_field_get_uint8 }, + {.off_in = _IN(ndm_state), .off_out = _OUT(ndm_state), .cb = snl_field_get_uint16 }, +}; +#undef _IN +#undef _OUT +SNL_DECLARE_PARSER(snl_rtm_neigh_parser, struct ndmsg, _fp_p_neigh_s, _nla_p_neigh_s); + +struct snl_parsed_addr { + uint8_t ifa_family; + uint8_t ifa_prefixlen; + uint32_t ifa_index; + struct sockaddr *ifa_local; + struct sockaddr *ifa_address; + struct sockaddr *ifa_broadcast; + char *ifa_label; +}; + +#define _IN(_field) offsetof(struct ifaddrmsg, _field) +#define _OUT(_field) offsetof(struct snl_parsed_addr, _field) +static struct snl_attr_parser _nla_p_addr_s[] = { + { .type = IFA_ADDRESS, .off = _OUT(ifa_address), .cb = snl_attr_get_ip }, + { .type = IFA_LOCAL, .off = _OUT(ifa_local), .cb = snl_attr_get_ip }, + { .type = IFA_LABEL, .off = _OUT(ifa_label), .cb = snl_attr_get_string }, + { .type = IFA_BROADCAST, .off = _OUT(ifa_broadcast), .cb = snl_attr_get_ip }, +}; +static struct snl_field_parser _fp_p_addr_s[] = { + {.off_in = _IN(ifa_family), .off_out = _OUT(ifa_family), .cb = snl_field_get_uint8 }, + {.off_in = _IN(ifa_prefixlen), .off_out = _OUT(ifa_prefixlen), .cb = snl_field_get_uint8 }, + {.off_in = _IN(ifa_index), .off_out = _OUT(ifa_index), .cb = snl_field_get_uint32 }, +}; +#undef _IN +#undef _OUT +SNL_DECLARE_PARSER(snl_rtm_addr_parser, struct ifaddrmsg, _fp_p_addr_s, _nla_p_addr_s); + static const struct snl_hdr_parser *snl_all_route_parsers[] = { &_metrics_mp_nh_parser, &_mpath_nh_parser, &_metrics_parser, &snl_rtm_route_parser, - &snl_rtm_link_parser, &snl_rtm_link_parser_simple, + &snl_rtm_link_parser, &snl_rtm_link_parser_simple, &snl_rtm_neigh_parser, + &snl_rtm_addr_parser, }; #endif From nobody Sun Mar 26 11:07: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 4PktSx6PVbz41g34; Sun, 26 Mar 2023 11:07: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 4PktSx5HkRz4Pb7; Sun, 26 Mar 2023 11:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679828849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5QWol2aMXqhL8O/7UgHQDuSbJfhxgdZF7lcp9Pe0BtM=; b=x6+GSYSmO3624JRUUkEYRL/4zaTGL5/9PZeDQjlO3fRBbCK03ZpvotJ396w6jPKmu497XJ R3OP5Z5IOA4qC1EsyYMQKzf7X+fW7qWnimRRUJ8gjtAWUqMXJY67nFmZkUSputh+0F4APf vE54ypV4HkwwWjmiHAEeJqBYrxiF+derg2i5o7RF4C9OZkbxxNa+Wl2bmuYr0St3GwLN8y rPRBI3eeR/63UPadOZYrj98fwNs1HiIoQn2wI0YsX8XkEYHVh5jAN3DhBqd9foOBO6ipYR OHskoFFZLc6YBFYlU96zqU/iaWX03hHqo4nLxeJiNYe21yHBBTieAFgDSIO1Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679828849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5QWol2aMXqhL8O/7UgHQDuSbJfhxgdZF7lcp9Pe0BtM=; b=DWkDBktjuwzF1WssYv0DUbcYz7shgD07Hz1Wp6puxEDQQzUZQ9ehVuJaRl3G1sHIMG10z/ CCdI3WlE+UyHljMUzEuWhG3Yzcx+MSSnGoPxyBZ/fl1kqW2IKo8HNvW9MwoSHtIJ6Wrc9j qUCT6JnV8JskML8ijaosjhmUbYiBUSr0S1MLmI28PX0jEBu8nWHXF192NtbeMCqGy+EPCs gx7UB/8YjopOmirQ4PpqQe9FVw34FToKy+Fq5CRy5Ud7dJU4SvLDqA33T9/huLxAHlWNnm sGHjy0cYA4fUXkpT3EGjTW5dMBcLSA8iy0GKQ0D+sHkzMfhKmn+zrFvOd5u/bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679828849; a=rsa-sha256; cv=none; b=Wlsa8naxZPWq7BIov9ssnOamUNw4ccrTyD/co2qStc8FLD7XyaFKUdDgbniDlrBFtpwxb6 3uajcLElsf6TypYmcFYNBBs5ZLMxx6hKmyH9rXSj70dX+xqz7EsaQF5A/vuw21fl/7F0H9 ssBTB/eCMJOzKKXOee8+8myNOssQe2Bh9WrpMjyDCkJm5K/yQwOvBaZzU7DlTysnmmntZ4 Ef1LuKHshCJELnhKdqsg5yY9riOLbCvHgu/blvW7nZWDrfm7J1WF402WEf+bH/rMUMiIMb 5dMPZfCMuR+siqy52BTckatQpXYHlCax80nUOLBbUTOWcd/TuyoMRGiNBW3lAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PktSx4KFBzdQQ; Sun, 26 Mar 2023 11:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32QB7TiC058868; Sun, 26 Mar 2023 11:07:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32QB7T7N058867; Sun, 26 Mar 2023 11:07:29 GMT (envelope-from git) Date: Sun, 26 Mar 2023 11:07:29 GMT Message-Id: <202303261107.32QB7T7N058867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: a85dcd4ac4b0 - main - netlink: restrict default userland switch to netlink to i386/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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a85dcd4ac4b0612b63b5a71eeaaa707a09ae0003 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=a85dcd4ac4b0612b63b5a71eeaaa707a09ae0003 commit a85dcd4ac4b0612b63b5a71eeaaa707a09ae0003 Author: Alexander V. Chernikov AuthorDate: 2023-03-26 11:05:21 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-26 11:06:53 +0000 netlink: restrict default userland switch to netlink to i386/amd64. --- share/mk/src.opts.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 7c73e66aba18..c0491d6e8769 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -145,7 +145,6 @@ __DEFAULT_YES_OPTIONS = \ MLX5TOOL \ NETCAT \ NETGRAPH \ - NETLINK \ NLS_CATALOGS \ NS_CACHING \ NTP \ @@ -234,7 +233,6 @@ __DEFAULT_DEPENDENT_OPTIONS= \ KERBEROS \ KVM \ NETGRAPH \ - NETLINK \ PAM \ TESTS \ WIRELESS @@ -359,6 +357,14 @@ __DEFAULT_NO_OPTIONS+=OPENMP BROKEN_OPTIONS+= OFED .endif +.if ${__T} == "i386" || ${__T} == "amd64" +__DEFAULT_YES_OPTIONS+=NETLINK +__DEFAULT_YES_OPTIONS+=NETLINK_SUPPORT +.else +__DEFAULT_NO_OPTIONS+=NETLINK +__DEFAULT_NO_OPTIONS+=NETLINK_SUPPORT +.endif + .include # From nobody Sun Mar 26 11: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 4PktSz1nkRz41g6B; Sun, 26 Mar 2023 11:07: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 4PktSy6C9nz4PbR; Sun, 26 Mar 2023 11: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=1679828850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l2r+DZhxO1LAYMwfY6mOATo7/ulcs1h8kYqljNXZpUc=; b=bR/D7WfTX0fmtCDW88oe/KOxrOWHjYuvAba9HMzBmIA4rCLTGN8sB2Yq1jW/n37DHIwjXh rr6+ylJFuzZHdkCPT5zuIpasudP44ryQNXiOhalqvlN1bHAGGtBTEbaQjJA6LHSi+LOI35 D0jE0S9RCGJ++xGycA92KRjIBVz1E1sgy8dUJlwxYF1STmBYkmfzanUCAIp5hG3Y+9Iyj8 UzbzZ6yxkuXVNHeEqFo0rL2qMbYwQjmLVCmoVlTqBCBmGrzVre5IZ1zXz+7XI+5KPleVkM nUiskz99rmk2ld7IKBjVx8PblWQcJQPNXtsLc2YVqZOCXB8LheQqaZIkUVHK9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679828850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l2r+DZhxO1LAYMwfY6mOATo7/ulcs1h8kYqljNXZpUc=; b=ofFfJMXIrBUvu8EvRzXfBUCviJmgQHXgMkYv7NrmiJSJzf269X59IhLJTSyknuFpS23ZSS C0m8eLa561A6lyri8fqRs6Y8NRKoe3gZdIoSZVkl3SOFSbgMiGv3yrOeLXL1vGml56TNJI mEbexvA74BTABppemaxnSEZpzycwWv5MoTNIWdFYDXoTbL/iJyhrhGq+2meJLv6OSVAVPP 4RFIzLhKYtb9AtyGO5Hkwv67NVNyuDvkx36JLzVITbtY4IoVt66fln3iQFSvC/g4tQpxhd /BoruzaE0JTR4E8OupkLFUds1npj9XUhtAkftqMio4vbn5vAvrf2Y8NNB9gtCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679828850; a=rsa-sha256; cv=none; b=XA3+mejFuV7ecZl4UdEGoAn7nmJckEh5bi+4vRwemo3AOIr4zF1RzKNysKD12UStrCZ05A muGFAqyJclHh4/grwND5ssQ3cmKmnGcWZSktkiQkffiIkW9e1LDEX3W4WsLB4LqEHbcrdt O111y9arKtELHlB4uBg/5+KrXVyLkdNhwhy/Yl/NPJERQREs2cP+qM4n0fYrVGKp7uw7sP 0sn9gnohHQJ7GXF0+yCEwahqFDvo0lDPaxCJe6r04b9xmMnx9/3SP8R66wO6teHSHXQ5on Z9EY97kOGRoWnIrIc30mE8BpRSL/7uYM9+NjSDT0KGyQqeYJxlRxqNB1q3cfjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PktSy4frNzcxP; Sun, 26 Mar 2023 11:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32QB7UTJ058894; Sun, 26 Mar 2023 11:07:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32QB7UZK058893; Sun, 26 Mar 2023 11:07:30 GMT (envelope-from git) Date: Sun, 26 Mar 2023 11:07:30 GMT Message-Id: <202303261107.32QB7UZK058893@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: c597432e2297 - main - route(8): convert to netlink List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c597432e22975f4d409b8453779967129c6b57e9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=c597432e22975f4d409b8453779967129c6b57e9 commit c597432e22975f4d409b8453779967129c6b57e9 Author: Alexander V. Chernikov AuthorDate: 2023-03-26 09:13:50 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-26 11:06:56 +0000 route(8): convert to netlink This change converts all kernel rtsock interactions in route(8) to Netlink. Based on the WITHOUT_NETLINK_SUPPORT src.conf(5) variable, route(8) now fully operates either via Netlink or via rtsock/sysctl. The default (compile-time) is Netlink. The output for route delete/add/get/flush is targeted to be exactly the same (apart from some error handling cases). The output for the route monitor has been changed to improve readability and support netlink models. Other behaviour changes: * exact prefix lookup (route -n get a.b.c.d/e) is not yet supported. * route monitor does not show the change originator yet. Differential Revision: https://reviews.freebsd.org/D39007 --- sbin/route/Makefile | 6 + sbin/route/route.c | 117 +++++-- sbin/route/route_netlink.c | 835 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 930 insertions(+), 28 deletions(-) diff --git a/sbin/route/Makefile b/sbin/route/Makefile index e65030f805bb..aec222310d46 100644 --- a/sbin/route/Makefile +++ b/sbin/route/Makefile @@ -19,6 +19,12 @@ CFLAGS+= -DINET6 .endif CFLAGS+= -I. +.if ${MK_NETLINK_SUPPORT} != "no" +SRCS+= route_netlink.c +.else +CFLAGS+=-DWITHOUT_NETLINK +.endif + HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/sbin/route/route.c b/sbin/route/route.c index 5f33cecb1b20..947c97ce794a 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -90,12 +90,11 @@ static struct keytab { {0, 0} }; +int verbose, debugonly; static struct sockaddr_storage so[RTAX_MAX]; static int pid, rtm_addrs; -static int s; -static int nflag, af, qflag, tflag; -static int verbose, aflen; -static int locking, lockrest, debugonly; +static int nflag, af, aflen, qflag, tflag; +static int locking, lockrest; static struct rt_metrics rt_metrics; static u_long rtm_inits; static uid_t uid; @@ -103,18 +102,30 @@ static int defaultfib; static int numfibs; static char domain[MAXHOSTNAMELEN + 1]; static bool domain_initialized; -static int rtm_seq; static char rt_line[NI_MAXHOST]; static char net_line[MAXHOSTNAMELEN + 1]; +#ifdef WITHOUT_NETLINK +static int s; +static int rtm_seq; + static struct { struct rt_msghdr m_rtm; char m_space[512]; } m_rtmsg; +static int rtmsg_rtsock(int, int, int); +static int flushroutes_fib_rtsock(int); +static void monitor_rtsock(void); +#else +int rtmsg_nl(int, int, int, struct sockaddr_storage *, struct rt_metrics *); +int flushroutes_fib_nl(int, int); +void monitor_nl(int); +#endif + static TAILQ_HEAD(fibl_head_t, fibl) fibl_head; -static void printb(int, const char *); +void printb(int, const char *); static void flushroutes(int argc, char *argv[]); static int flushroutes_fib(int); static int getaddr(int, char *, int); @@ -127,7 +138,7 @@ static int inet6_makenetandmask(struct sockaddr_in6 *, const char *); #endif static void interfaces(void); static void monitor(int, char*[]); -static const char *netname(struct sockaddr *); +const char *netname(struct sockaddr *); static void newroute(int, char **); static int newroute_fib(int, char *, int); static void pmsg_addrs(char *, int, size_t); @@ -135,7 +146,7 @@ static void pmsg_common(struct rt_msghdr *, size_t); static int prefixlen(const char *); static void print_getmsg(struct rt_msghdr *, int, int); static void print_rtmsg(struct rt_msghdr *, size_t); -static const char *routename(struct sockaddr *); +const char *routename(struct sockaddr *); static int rtmsg(int, int, int); static void set_metric(char *, int); static int set_sofib(int); @@ -216,12 +227,14 @@ main(int argc, char **argv) pid = getpid(); uid = geteuid(); +#ifdef WITHOUT_NETLINK if (tflag) s = open(_PATH_DEVNULL, O_WRONLY, 0); else s = socket(PF_ROUTE, SOCK_RAW, 0); if (s < 0) err(EX_OSERR, "socket"); +#endif len = sizeof(numfibs); if (sysctlbyname("net.fibs", (void *)&numfibs, &len, NULL, 0) == -1) @@ -264,10 +277,14 @@ static int set_sofib(int fib) { +#ifdef WITHOUT_NETLINK if (fib < 0) return (0); return (setsockopt(s, SOL_SOCKET, SO_SETFIB, (void *)&fib, sizeof(fib))); +#else + return (0); +#endif } static int @@ -395,7 +412,9 @@ flushroutes(int argc, char *argv[]) if (uid != 0 && !debugonly && !tflag) errx(EX_NOPERM, "must be root to alter routing table"); +#ifdef WITHOUT_NETLINK shutdown(s, SHUT_RD); /* Don't want to read back our messages */ +#endif TAILQ_INIT(&fibl_head); while (argc > 1) { @@ -441,6 +460,17 @@ flushroutes(int argc, char *argv[]) static int flushroutes_fib(int fib) +{ +#ifdef WITHOUT_NETLINK + return (flushroutes_fib_rtsock(fib)); +#else + return (flushroutes_fib_nl(fib, af)); +#endif +} + +#ifdef WITHOUT_NETLINK +static int +flushroutes_fib_rtsock(int fib) { struct rt_msghdr *rtm; size_t needed; @@ -525,8 +555,9 @@ retry: free(buf); return (error); } +#endif -static const char * +const char * routename(struct sockaddr *sa) { struct sockaddr_dl *sdl; @@ -645,7 +676,7 @@ routename(struct sockaddr *sa) * Return the name of the network whose address is given. * The address is assumed to be that of a net, not a host. */ -static const char * +const char * netname(struct sockaddr *sa) { struct sockaddr_dl *sdl; @@ -810,8 +841,10 @@ newroute(int argc, char **argv) warn("sigaction SIGALRM"); cmd = argv[0]; +#ifdef WITHOUT_NETLINK if (*cmd != 'g' && *cmd != 's') shutdown(s, SHUT_RD); /* Don't want to read back our messages */ +#endif while (--argc > 0) { if (**(++argv)== '-') { switch (key = keyword(1 + *argv)) { @@ -1398,8 +1431,8 @@ retry2: static void monitor(int argc, char *argv[]) { - int n, fib, error; - char msg[2048], *endptr; + int fib, error; + char *endptr; fib = defaultfib; while (argc > 1) { @@ -1435,6 +1468,19 @@ monitor(int argc, char *argv[]) interfaces(); exit(0); } +#ifdef WITHOUT_NETLINK + monitor_rtsock(); +#else + monitor_nl(fib); +#endif +} + +#ifdef WITHOUT_NETLINK +static void +monitor_rtsock(void) +{ + char msg[2048]; + int n; #ifdef SO_RERROR n = 1; @@ -1454,25 +1500,12 @@ monitor(int argc, char *argv[]) print_rtmsg((struct rt_msghdr *)(void *)msg, n); } } +#endif static int rtmsg(int cmd, int flags, int fib) { - int rlen; - char *cp = m_rtmsg.m_space; - int l; - -#define NEXTADDR(w, u) \ - if (rtm_addrs & (w)) { \ - l = SA_SIZE(&(u)); \ - memmove(cp, (char *)&(u), l); \ - cp += l; \ - if (verbose) \ - sodump((struct sockaddr *)&(u), #w); \ - } - errno = 0; - memset(&m_rtmsg, 0, sizeof(m_rtmsg)); if (cmd == 'a') cmd = RTM_ADD; else if (cmd == 'c') @@ -1488,6 +1521,33 @@ rtmsg(int cmd, int flags, int fib) cmd = RTM_DELETE; flags |= RTF_PINNED; } +#ifdef WITHOUT_NETLINK + return (rtmsg_rtsock(cmd, flags, fib)); +#else + errno = rtmsg_nl(cmd, flags, fib, so, &rt_metrics); + return (errno == 0 ? 0 : -1); +#endif +} + +#ifdef WITHOUT_NETLINK +static int +rtmsg_rtsock(int cmd, int flags, int fib) +{ + int rlen; + char *cp = m_rtmsg.m_space; + int l; + + memset(&m_rtmsg, 0, sizeof(m_rtmsg)); + +#define NEXTADDR(w, u) \ + if (rtm_addrs & (w)) { \ + l = SA_SIZE(&(u)); \ + memmove(cp, (char *)&(u), l); \ + cp += l; \ + if (verbose) \ + sodump((struct sockaddr *)&(u), #w); \ + } + #define rtm m_rtmsg.m_rtm rtm.rtm_type = cmd; rtm.rtm_flags = flags; @@ -1545,6 +1605,7 @@ rtmsg(int cmd, int flags, int fib) #undef rtm return (0); } +#endif static const char *const msgtypes[] = { "", @@ -1571,7 +1632,7 @@ static const char *const msgtypes[] = { static const char metricnames[] = "\011weight\010rttvar\7rtt\6ssthresh\5sendpipe\4recvpipe\3expire" "\1mtu"; -static const char routeflags[] = +const char routeflags[] = "\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7DONE" "\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE" "\017PROTO2\020PROTO1\021PRCLONING\022WASCLONED\023PROTO3" @@ -1812,7 +1873,7 @@ pmsg_addrs(char *cp, int addrs, size_t len) (void)fflush(stdout); } -static void +void printb(int b, const char *str) { int i; diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c new file mode 100644 index 000000000000..648d866670fc --- /dev/null +++ b/sbin/route/route_netlink.c @@ -0,0 +1,835 @@ +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +const char *routename(struct sockaddr *); +const char *netname(struct sockaddr *); +void printb(int, const char *); +extern const char routeflags[]; +extern int verbose, debugonly; + +int rtmsg_nl(int cmd, int rtm_flags, int fib, struct sockaddr_storage *so, + struct rt_metrics *rt_metrics); +int flushroutes_fib_nl(int fib, int af); +void monitor_nl(int fib); + +struct nl_helper; +static void print_getmsg(struct nl_helper *h, struct nlmsghdr *hdr, struct sockaddr *dst); +static void print_nlmsg(struct nl_helper *h, struct nlmsghdr *hdr); + +#define s6_addr32 __u6_addr.__u6_addr32 +#define bitcount32(x) __bitcount32((uint32_t)(x)) +static int +inet6_get_plen(const struct in6_addr *addr) +{ + + return (bitcount32(addr->s6_addr32[0]) + bitcount32(addr->s6_addr32[1]) + + bitcount32(addr->s6_addr32[2]) + bitcount32(addr->s6_addr32[3])); +} + +static void +ip6_writemask(struct in6_addr *addr6, uint8_t mask) +{ + uint32_t *cp; + + for (cp = (uint32_t *)addr6; mask >= 32; mask -= 32) + *cp++ = 0xFFFFFFFF; + if (mask > 0) + *cp = htonl(mask ? ~((1 << (32 - mask)) - 1) : 0); +} + +static struct sockaddr * +get_netmask(struct snl_state *ss, int family, int plen) +{ + if (family == AF_INET) { + if (plen == 32) + return (NULL); + + struct sockaddr_in *sin = snl_allocz(ss, sizeof(*sin)); + + sin->sin_len = sizeof(*sin); + sin->sin_family = family; + sin->sin_addr.s_addr = htonl(plen ? ~((1 << (32 - plen)) - 1) : 0); + + return (struct sockaddr *)sin; + } else if (family == AF_INET6) { + if (plen == 128) + return (NULL); + + struct sockaddr_in6 *sin6 = snl_allocz(ss, sizeof(*sin6)); + + sin6->sin6_len = sizeof(*sin6); + sin6->sin6_family = family; + ip6_writemask(&sin6->sin6_addr, plen); + + return (struct sockaddr *)sin6; + } + return (NULL); +} + +struct nl_helper { + struct snl_state ss_cmd; +}; + +static void +nl_helper_init(struct nl_helper *h) +{ + if (!snl_init(&h->ss_cmd, NETLINK_ROUTE)) + err(1, "unable to open netlink socket"); +} + +static void +nl_helper_free(struct nl_helper *h) +{ + snl_free(&h->ss_cmd); +} + +static int +rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, + struct sockaddr_storage *so, struct rt_metrics *rt_metrics) +{ + struct snl_state *ss = &h->ss_cmd; + struct snl_writer nw; + int nl_type = 0, nl_flags = 0; + + snl_init_writer(ss, &nw); + + switch (cmd) { + case RTSOCK_RTM_ADD: + nl_type = RTM_NEWROUTE; + nl_flags = NLM_F_CREATE | NLM_F_APPEND; /* Do append by default */ + break; + case RTSOCK_RTM_CHANGE: + nl_type = RTM_NEWROUTE; + nl_flags = NLM_F_REPLACE; + break; + case RTSOCK_RTM_DELETE: + nl_type = RTM_DELROUTE; + break; + case RTSOCK_RTM_GET: + nl_type = RTM_GETROUTE; + break; + default: + exit(1); + } + + struct sockaddr *dst = (struct sockaddr *)&so[RTAX_DST]; + struct sockaddr *mask = (struct sockaddr *)&so[RTAX_NETMASK]; + struct sockaddr *gw = (struct sockaddr *)&so[RTAX_GATEWAY]; + + if (dst == NULL) + return (EINVAL); + + struct nlmsghdr *hdr = snl_create_msg_request(&nw, nl_type); + hdr->nlmsg_flags |= nl_flags; + + int plen = 0; + int rtm_type = RTN_UNICAST; + + switch (dst->sa_family) { + case AF_INET: + { + struct sockaddr_in *mask4 = (struct sockaddr_in *)mask; + + plen = mask4 ? bitcount32(mask4->sin_addr.s_addr) : 32; + break; + } + case AF_INET6: + { + struct sockaddr_in6 *mask6 = (struct sockaddr_in6 *)mask; + + plen = mask6 ? inet6_get_plen(&mask6->sin6_addr) : 128; + break; + } + default: + return (ENOTSUP); + } + + if (rtm_flags & RTF_REJECT) + rtm_type = RTN_PROHIBIT; + else if (rtm_flags & RTF_BLACKHOLE) + rtm_type = RTN_BLACKHOLE; + + struct rtmsg *rtm = snl_reserve_msg_object(&nw, struct rtmsg); + rtm->rtm_family = dst->sa_family; + rtm->rtm_protocol = RTPROT_STATIC; + rtm->rtm_type = rtm_type; + rtm->rtm_dst_len = plen; + + snl_add_msg_attr_ip(&nw, RTA_DST, dst); + snl_add_msg_attr_u32(&nw, RTA_TABLE, fib); + + if (rtm_flags & RTF_GATEWAY) { + if (gw->sa_family == dst->sa_family) + snl_add_msg_attr_ip(&nw, RTA_GATEWAY, gw); + else + snl_add_msg_attr_ipvia(&nw, RTA_VIA, gw); + } else if (gw != NULL) { + /* Should be AF_LINK */ + struct sockaddr_dl *sdl = (struct sockaddr_dl *)gw; + if (sdl->sdl_index != 0) + snl_add_msg_attr_u32(&nw, RTA_OIF, sdl->sdl_index); + } + + if (rtm_flags != 0) + snl_add_msg_attr_u32(&nw, NL_RTA_RTFLAGS, rtm_flags); + + if (rt_metrics->rmx_mtu > 0) { + int off = snl_add_msg_attr_nested(&nw, RTA_METRICS); + snl_add_msg_attr_u32(&nw, RTAX_MTU, rt_metrics->rmx_mtu); + snl_end_attr_nested(&nw, off); + } + + if (rt_metrics->rmx_weight > 0) + snl_add_msg_attr_u32(&nw, NL_RTA_WEIGHT, rt_metrics->rmx_weight); + + if (snl_finalize_msg(&nw) && snl_send_message(ss, hdr)) { + struct snl_errmsg_data e = {}; + + hdr = snl_read_reply(ss, hdr->nlmsg_seq); + if (nl_type == NL_RTM_GETROUTE) { + if (hdr->nlmsg_type == NL_RTM_NEWROUTE) + print_getmsg(h, hdr, dst); + else { + snl_parse_errmsg(ss, hdr, &e); + if (e.error == ESRCH) + warn("route has not been found"); + else + warn("message indicates error %d", e.error); + } + + return (0); + } + + if (snl_parse_errmsg(ss, hdr, &e)) + return (e.error); + } + return (EINVAL); +} + +int +rtmsg_nl(int cmd, int rtm_flags, int fib, struct sockaddr_storage *so, + struct rt_metrics *rt_metrics) +{ + struct nl_helper h = {}; + + nl_helper_init(&h); + int error = rtmsg_nl_int(&h, cmd, rtm_flags, fib, so, rt_metrics); + nl_helper_free(&h); + + return (error); +} + +static void +get_ifdata(struct nl_helper *h, uint32_t ifindex, struct snl_parsed_link_simple *link) +{ + struct snl_state *ss = &h->ss_cmd; + struct snl_writer nw; + + snl_init_writer(ss, &nw); + struct nlmsghdr *hdr = snl_create_msg_request(&nw, NL_RTM_GETLINK); + struct ifinfomsg *ifmsg = snl_reserve_msg_object(&nw, struct ifinfomsg); + if (ifmsg != NULL) + ifmsg->ifi_index = ifindex; + if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + return; + + hdr = snl_read_reply(ss, hdr->nlmsg_seq); + + if (hdr != NULL && hdr->nlmsg_type == RTM_NEWLINK) { + snl_parse_nlmsg(ss, hdr, &snl_rtm_link_parser_simple, link); + } + + if (link->ifla_ifname == NULL) { + char ifname[16]; + + snprintf(ifname, sizeof(ifname), "if#%u", ifindex); + int len = strlen(ifname); + char *buf = snl_allocz(ss, len + 1); + strlcpy(buf, ifname, len + 1); + link->ifla_ifname = buf; + } +} + +static void +print_getmsg(struct nl_helper *h, struct nlmsghdr *hdr, struct sockaddr *dst) +{ + struct snl_state *ss = &h->ss_cmd; + struct timespec ts; + struct snl_parsed_route r = { .rtax_weight = RT_DEFAULT_WEIGHT }; + + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_route_parser, &r)) + return; + + struct snl_parsed_link_simple link = {}; + get_ifdata(h, r.rta_oif, &link); + + if (r.rtax_mtu == 0) + r.rtax_mtu = link.ifla_mtu; + r.rta_rtflags |= (RTF_UP | RTF_DONE); + + (void)printf(" route to: %s\n", routename(dst)); + + if (r.rta_dst) + (void)printf("destination: %s\n", routename(r.rta_dst)); + struct sockaddr *mask = get_netmask(ss, r.rtm_family, r.rtm_dst_len); + if (mask) + (void)printf(" mask: %s\n", routename(mask)); + if (r.rta_gw && (r.rta_rtflags & RTF_GATEWAY)) + (void)printf(" gateway: %s\n", routename(r.rta_gw)); + (void)printf(" fib: %u\n", (unsigned int)r.rta_table); + if (link.ifla_ifname) + (void)printf(" interface: %s\n", link.ifla_ifname); + (void)printf(" flags: "); + printb(r.rta_rtflags, routeflags); + + struct rt_metrics rmx = { + .rmx_mtu = r.rtax_mtu, + .rmx_weight = r.rtax_weight, + .rmx_expire = r.rta_expire, + }; + + printf("\n%9s %9s %9s %9s %9s %10s %9s\n", "recvpipe", + "sendpipe", "ssthresh", "rtt,msec", "mtu ", "weight", "expire"); + printf("%8lu ", rmx.rmx_recvpipe); + printf("%8lu ", rmx.rmx_sendpipe); + printf("%8lu ", rmx.rmx_ssthresh); + printf("%8lu ", 0UL); + printf("%8lu ", rmx.rmx_mtu); + printf("%8lu ", rmx.rmx_weight); + if (rmx.rmx_expire > 0) + clock_gettime(CLOCK_REALTIME_FAST, &ts); + else + ts.tv_sec = 0; + printf("%8ld \n", (long)(rmx.rmx_expire - ts.tv_sec)); +} + +static void +print_prefix(struct nl_helper *h, char *buf, int bufsize, struct sockaddr *sa, int plen) +{ + int sz = 0; + + if (sa == NULL) { + snprintf(buf, bufsize, ""); + return; + } + + switch (sa->sa_family) { + case AF_INET: + { + struct sockaddr_in *sin = (struct sockaddr_in *)sa; + char abuf[INET_ADDRSTRLEN]; + + inet_ntop(AF_INET, &sin->sin_addr, abuf, sizeof(abuf)); + sz = snprintf(buf, bufsize, "%s", abuf); + break; + } + case AF_INET6: + { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; + char abuf[INET6_ADDRSTRLEN]; + char *ifname = NULL; + + inet_ntop(AF_INET6, &sin6->sin6_addr, abuf, sizeof(abuf)); + if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { + struct snl_parsed_link_simple link = {}; + + if (sin6->sin6_scope_id != 0) { + get_ifdata(h, sin6->sin6_scope_id, &link); + ifname = link.ifla_ifname; + } + } + if (ifname == NULL) + sz = snprintf(buf, bufsize, "%s", abuf); + else + sz = snprintf(buf, bufsize, "%s%%%s", abuf, ifname); + break; + } + default: + snprintf(buf, bufsize, "unknown_af#%d", sa->sa_family); + plen = -1; + } + + if (plen >= 0) + snprintf(buf + sz, bufsize - sz, "/%d", plen); +} + + +static int +print_line_prefix(const char *cmd, const char *name) +{ + struct timespec tp; + struct tm tm; + char buf[32]; + + clock_gettime(CLOCK_REALTIME, &tp); + localtime_r(&tp.tv_sec, &tm); + + strftime(buf, sizeof(buf), "%T", &tm); + int len = printf("%s.%03ld %s %s ", buf, tp.tv_nsec / 1000000, cmd, name); + + return (len); +} + +static const char * +get_action_name(struct nlmsghdr *hdr, int new_cmd) +{ + if (hdr->nlmsg_type == new_cmd) { + //return ((hdr->nlmsg_flags & NLM_F_REPLACE) ? "replace" : "add"); + return ("add/repl"); + } else + return ("delete"); +} + +static void +print_nlmsg_route_nhop(struct nl_helper *h, struct snl_parsed_route *r, + struct rta_mpath_nh *nh, bool first) +{ + // gw 10.0.0.1 ifp vtnet0 mtu 1500 table inet.0 + if (nh->gw != NULL) { + char gwbuf[128]; + print_prefix(h, gwbuf, sizeof(gwbuf), nh->gw, -1); + printf("gw %s ", gwbuf); + } + + if (nh->ifindex != 0) { + struct snl_parsed_link_simple link = {}; + + get_ifdata(h, nh->ifindex, &link); + if (nh->rtax_mtu == 0) + nh->rtax_mtu = link.ifla_mtu; + printf("iface %s ", link.ifla_ifname); + if (nh->rtax_mtu != 0) + printf("mtu %d ", nh->rtax_mtu); + } + + if (first) { + switch (r->rtm_family) { + case AF_INET: + printf("table inet.%d", r->rta_table); + break; + case AF_INET6: + printf("table inet6.%d", r->rta_table); + break; + } + } + + printf("\n"); +} + +static void +print_nlmsg_route(struct nl_helper *h, struct nlmsghdr *hdr) +{ + struct snl_parsed_route r = { .rtax_weight = RT_DEFAULT_WEIGHT }; + struct snl_state *ss = &h->ss_cmd; + + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_route_parser, &r)) + return; + + // 20:19:41.333 add route 10.0.0.0/24 gw 10.0.0.1 ifp vtnet0 mtu 1500 table inet.0 + + const char *cmd = get_action_name(hdr, RTM_NEWROUTE); + int len = print_line_prefix(cmd, "route"); + + char buf[128]; + print_prefix(h, buf, sizeof(buf), r.rta_dst, r.rtm_dst_len); + len += strlen(buf) + 1; + printf("%s ", buf); + + switch (r.rtm_type) { + case RTN_BLACKHOLE: + printf("blackhole\n"); + return; + case RTN_UNREACHABLE: + printf("unreach(reject)\n"); + return; + case RTN_PROHIBIT: + printf("prohibit(reject)\n"); + return; + } + + if (r.rta_multipath != NULL) { + bool first = true; + + memset(buf, ' ', sizeof(buf)); + buf[len] = '\0'; + + for (int i = 0; i < r.rta_multipath->num_nhops; i++) { + struct rta_mpath_nh *nh = &r.rta_multipath->nhops[i]; + + if (!first) + printf("%s", buf); + print_nlmsg_route_nhop(h, &r, nh, first); + first = false; + } + } else { + struct rta_mpath_nh nh = { + .gw = r.rta_gw, + .ifindex = r.rta_oif, + .rtax_mtu = r.rtax_mtu, + }; + + print_nlmsg_route_nhop(h, &r, &nh, true); + } +} + +static const char *operstate[] = { + "UNKNOWN", /* 0, IF_OPER_UNKNOWN */ + "NOTPRESENT", /* 1, IF_OPER_NOTPRESENT */ + "DOWN", /* 2, IF_OPER_DOWN */ + "LLDOWN", /* 3, IF_OPER_LOWERLAYERDOWN */ + "TESTING", /* 4, IF_OPER_TESTING */ + "DORMANT", /* 5, IF_OPER_DORMANT */ + "UP", /* 6, IF_OPER_UP */ +}; + +static void +print_nlmsg_link(struct nl_helper *h, struct nlmsghdr *hdr) +{ + struct snl_parsed_link l = {}; + struct snl_state *ss = &h->ss_cmd; + + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_link_parser, &l)) + return; + + // 20:19:41.333 add iface#3 vtnet0 admin UP oper UP mtu 1500 table inet.0 + const char *cmd = get_action_name(hdr, RTM_NEWLINK); + print_line_prefix(cmd, "iface"); + + printf("iface#%u %s ", l.ifi_index, l.ifla_ifname); + printf("admin %s ", (l.ifi_flags & IFF_UP) ? "UP" : "DOWN"); + if (l.ifla_operstate < NL_ARRAY_LEN(operstate)) + printf("oper %s ", operstate[l.ifla_operstate]); + if (l.ifla_mtu > 0) + printf("mtu %u ", l.ifla_mtu); + + printf("\n"); +} + +static void +print_nlmsg_addr(struct nl_helper *h, struct nlmsghdr *hdr) +{ + struct snl_parsed_addr attrs = {}; + struct snl_state *ss = &h->ss_cmd; + + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_addr_parser, &attrs)) + return; + + // add addr 192.168.1.1/24 iface vtnet0 + const char *cmd = get_action_name(hdr, RTM_NEWADDR); + print_line_prefix(cmd, "addr"); + + char buf[128]; + struct sockaddr *addr = attrs.ifa_local ? attrs.ifa_local : attrs.ifa_address; + print_prefix(h, buf, sizeof(buf), addr, attrs.ifa_prefixlen); + printf("%s ", buf); + + struct snl_parsed_link_simple link = {}; + get_ifdata(h, attrs.ifa_index, &link); + + if (link.ifi_flags & IFF_POINTOPOINT) { + char buf[64]; + print_prefix(h, buf, sizeof(buf), attrs.ifa_address, -1); + printf("-> %s ", buf); + } + + printf("iface %s ", link.ifla_ifname); + + printf("\n"); +} + +static const char *nudstate[] = { + "INCOMPLETE", /* 0x01(0) */ + "REACHABLE", /* 0x02(1) */ + "STALE", /* 0x04(2) */ + "DELAY", /* 0x08(3) */ + "PROBE", /* 0x10(4) */ + "FAILED", /* 0x20(5) */ +}; + +#define NUD_INCOMPLETE 0x01 /* No lladdr, address resolution in progress */ +#define NUD_REACHABLE 0x02 /* reachable & recently resolved */ +#define NUD_STALE 0x04 /* has lladdr but it's stale */ +#define NUD_DELAY 0x08 /* has lladdr, is stale, probes delayed */ +#define NUD_PROBE 0x10 /* has lladdr, is stale, probes sent */ +#define NUD_FAILED 0x20 /* unused */ + + +static void +print_nlmsg_neigh(struct nl_helper *h, struct nlmsghdr *hdr) +{ + struct snl_parsed_neigh attrs = {}; + struct snl_state *ss = &h->ss_cmd; + + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_neigh_parser, &attrs)) + return; + + // add addr 192.168.1.1 state %s lladdr %s iface vtnet0 + const char *cmd = get_action_name(hdr, RTM_NEWNEIGH); + print_line_prefix(cmd, "neigh"); + + char buf[128]; + print_prefix(h, buf, sizeof(buf), attrs.nda_dst, -1); + printf("%s ", buf); + + struct snl_parsed_link_simple link = {}; + get_ifdata(h, attrs.nda_ifindex, &link); + + for (unsigned int i = 0; i < NL_ARRAY_LEN(nudstate); i++) { + if ((1 << i) & attrs.ndm_state) { + printf("state %s ", nudstate[i]); + break; + } + } + + if (attrs.nda_lladdr != NULL) { + int if_type = link.ifi_type; + + if ((if_type == IFT_ETHER || if_type == IFT_L2VLAN || if_type == IFT_BRIDGE) && + NLA_DATA_LEN(attrs.nda_lladdr) == ETHER_ADDR_LEN) { + struct ether_addr *ll; + + ll = (struct ether_addr *)NLA_DATA(attrs.nda_lladdr); + printf("lladdr %s ", ether_ntoa(ll)); + } else { + struct sockaddr_dl sdl = { + .sdl_len = sizeof(sdl), + .sdl_family = AF_LINK, + .sdl_index = attrs.nda_ifindex, + .sdl_type = if_type, + .sdl_alen = NLA_DATA_LEN(attrs.nda_lladdr), + }; + if (sdl.sdl_alen < sizeof(sdl.sdl_data)) { + void *ll = NLA_DATA(attrs.nda_lladdr); + + memcpy(sdl.sdl_data, ll, sdl.sdl_alen); + printf("lladdr %s ", link_ntoa(&sdl)); + } + } + } + + if (link.ifla_ifname != NULL) + printf("iface %s ", link.ifla_ifname); + printf("\n"); +} + +static void +print_nlmsg_generic(struct nl_helper *h, struct nlmsghdr *hdr) +{ +} + +static void +print_nlmsg(struct nl_helper *h, struct nlmsghdr *hdr) +{ + switch (hdr->nlmsg_type) { + case RTM_NEWLINK: + case RTM_DELLINK: + print_nlmsg_link(h, hdr); + break; *** 184 LINES SKIPPED *** From nobody Sun Mar 26 16:17: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 4Pl1Lh6Wkbz421p2; Sun, 26 Mar 2023 16:17:32 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 4Pl1Lh4ZcYz3Nlb; Sun, 26 Mar 2023 16:17:32 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f42.google.com with SMTP id k37so8287026lfv.0; Sun, 26 Mar 2023 09:17:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679847450; 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=2fv1SDTwRUB9PvJy6tRE11UrdYSR5Gv0BDGMrl4rYwU=; b=wdZRdDmxEI0qnUOG6bQr42U3l9uTJHS1qOt4UF2TZ1F8GU4/kx7B10c5WYANMnsCFG rjd6Cfm9+d1nGO5eUqBiRMDid8T1BTVx7rCahteCq9DmGMpoIJVJv7P9x+PqgeWgFYYI wFsxY6USNXPpVWs5bPaU03jZFHzr8eawoyEaJJgjkAwuVlzK7sU3hVWzSIXq0e/gGZJy rgTHUw1miut69qY3IIycqHefS3GcS3QKV7exTXcsBqimdXH3b2S73m52G/hqGZKpbEeh PFH4L4PUodgJSM9PPcVGdVdo1EFD7iVWOQK8hJbZB7NzvpVuXFb1HgU6VDNIkp4I0C27 kIbQ== X-Gm-Message-State: AAQBX9e093rmhvvInPq1nMHlbHhTgQuw6ORRAtYxwKSZqqz59CXN8e08 my1bdpRZb3IU6y1uajPhIJgObj8gq5I/ClXuY4ZPtqlY X-Google-Smtp-Source: AKy350aVGzmS5xEfDoAYTlbkPu2qs8rTcKu79BBW9WyQGAIgL4qnS3XCpyvOKVzW6hUeAcsvlMEUx36zRCWhMEI3Qls= X-Received: by 2002:ac2:4a84:0:b0:4db:2425:5d11 with SMTP id l4-20020ac24a84000000b004db24255d11mr2456581lfp.5.1679847449735; Sun, 26 Mar 2023 09:17:29 -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: <202303261107.32QB7T7N058867@gitrepo.freebsd.org> In-Reply-To: <202303261107.32QB7T7N058867@gitrepo.freebsd.org> From: Ed Maste Date: Sun, 26 Mar 2023 12:17:18 -0400 Message-ID: Subject: Re: git: a85dcd4ac4b0 - main - netlink: restrict default userland switch to netlink to i386/amd64. To: "Alexander V. Chernikov" 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-Rspamd-Queue-Id: 4Pl1Lh4ZcYz3Nlb X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Sun, 26 Mar 2023 at 07:07, Alexander V. Chernikov wrote: > > The branch main has been updated by melifaro: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a85dcd4ac4b0612b63b5a71eeaaa707a09ae0003 > > commit a85dcd4ac4b0612b63b5a71eeaaa707a09ae0003 > Author: Alexander V. Chernikov > AuthorDate: 2023-03-26 11:05:21 +0000 > Commit: Alexander V. Chernikov > CommitDate: 2023-03-26 11:06:53 +0000 > > netlink: restrict default userland switch to netlink to i386/amd64. We should keep default options the same for all Tier-1 architectures, so amd64 and arm64 should be in sync. From nobody Sun Mar 26 16: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 4Pl1yZ2F84z423HR for ; Sun, 26 Mar 2023 16:45:10 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 4Pl1yZ0LzPz3R86 for ; Sun, 26 Mar 2023 16:45:10 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f49.google.com with SMTP id r19-20020a05600c459300b003eb3e2a5e7bso3749189wmo.0 for ; Sun, 26 Mar 2023 09:45:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679849108; 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=WAPpCx+M5n/iKRLQ+8IanslLvxgXneQkkFkTbF6WPyI=; b=CdNUtuhVkT9TMJn6EHANst3yCd39PldNqJnSY/YJd4EKHC+JPkenoGXzuruRRv5XA+ jFAIEPocyIYC3djUseuRQbp1ABQ5bg8FUAMM920n7HTRll5VCBDaLdyNK3IzS+eYsixs bXxeyVJgRmFAk4jSiCl2CgGBHyN6SlHbWvztocl7d+4KCYGYyiuY/IgeIbCukYvKjIEn 7LGD2WbWh1UBhNvIxmToX3z3nPvBQPzPa5U2dgMMG4T+Y397FTVeCIQ5QmwdeRm+fPL4 ktxQjP7z5bMygDt4avNhXkYjkLl7TuPch7jgnfLVxolTVl6XEv3A08vy9iMaOC8kyH/w hXlA== X-Gm-Message-State: AO0yUKWAbyZu6JNM+pF6aeA6X4DUYtXmZixHwvoDnSbLpSm6YLYZWFKg v2wfJvew/yNn26IuYxFNeYNL1Q== X-Google-Smtp-Source: AK7set/et4nsHicv9WQLud7UI/uBDzFPbY4uHJI0tHjIuUem5bZSivLybwdyV6aUDLPf0McjAoYaKg== X-Received: by 2002:a1c:4b09:0:b0:3ed:1f9c:af12 with SMTP id y9-20020a1c4b09000000b003ed1f9caf12mr7909796wma.22.1679849108221; Sun, 26 Mar 2023 09:45:08 -0700 (PDT) Received: from smtpclient.apple (global-5-144.n-2.net.cam.ac.uk. [131.111.5.144]) by smtp.gmail.com with ESMTPSA id bg1-20020a05600c3c8100b003eddf20ed5bsm6080888wmb.18.2023.03.26.09.45.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Mar 2023 09:45:07 -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 \(3696.120.41.1.1\)) Subject: Re: git: a85dcd4ac4b0 - main - netlink: restrict default userland switch to netlink to i386/amd64. From: Jessica Clarke In-Reply-To: Date: Sun, 26 Mar 2023 17:45:07 +0100 Cc: Ed Maste , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <486C839F-181F-4CE8-8510-4A7D4D100FDC@freebsd.org> References: <202303261107.32QB7T7N058867@gitrepo.freebsd.org> To: "Alexander V. Chernikov" X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Rspamd-Queue-Id: 4Pl1yZ0LzPz3R86 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 26 Mar 2023, at 17:17, Ed Maste wrote: >=20 >=20 > On Sun, 26 Mar 2023 at 07:07, Alexander V. Chernikov > wrote: >>=20 >> The branch main has been updated by melifaro: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da85dcd4ac4b0612b63b5a71eeaaa707a= 09ae0003 >>=20 >> commit a85dcd4ac4b0612b63b5a71eeaaa707a09ae0003 >> Author: Alexander V. Chernikov >> AuthorDate: 2023-03-26 11:05:21 +0000 >> Commit: Alexander V. Chernikov >> CommitDate: 2023-03-26 11:06:53 +0000 >>=20 >> netlink: restrict default userland switch to netlink to = i386/amd64. >=20 > We should keep default options the same for all Tier-1 architectures, > so amd64 and arm64 should be in sync. But also, what=E2=80=99s the technical justification for this change? = There should not be gratuitous differences between architectures like this, only when there is a reason something shouldn=E2=80=99t be enabled. Why = should x86 (and possibly arm64) get netlink, but not arm/powerpc/riscv? We have very few machine-dependent defaults in src.opts.mk. If there is no such justification then please revert this in its entirety, and if there is such a justification it belongs in a comment above the if. Jess From nobody Sun Mar 26 16:57: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 4Pl2DQ0Hkmz423nm; Sun, 26 Mar 2023 16: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 4Pl2DP5K7Mz3j1P; Sun, 26 Mar 2023 16: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=1679849829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e47wV1Ey35NvHbwxWU6qofR8TU7FeeZ+4yE2AWlzNPg=; b=B+o8ifJua9OMJa5AYJuZ1FHoHleWXtFrNgPOENo0tjtoEMbOVrXXUZtaE7PxNchQPa5Enh PFKr39XUN90bx0v8aGQULBPnKuBnhliN0PNdxnc29Z0vB3uuyUyyRU4PikJkXGPmCnyXVO W+KBiJgG4iH74DIUYyXFf6NIJW+Ut+0T+TLd2FKXprZRMVBdLjEtWTWuwPVWS1u/lMUVCc PD+rFR2BeUzj9cwhkTBp4kNKE1y8rnxmkFrLUSbxswsdrJX0Qk6//4uPsjtn5Stnl7kO0q zQTedkEqC/CFqkUQ7VMZ6Iq5xM5hPR1FV8g+ODYfvQpYBG1S6JfGoriv5K9XhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679849829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e47wV1Ey35NvHbwxWU6qofR8TU7FeeZ+4yE2AWlzNPg=; b=nkcIa4HESutPinQ9cIAEkeBEIopGDRPlF1TcFmmKWE2bG2kQafx/zZfvr/V3raLlCfvriO 1/04qlj6W2FxxjdPZrbmvxIHgbY1UB5NqXef6FCt6l8Z7gC8aSSZXrI0H6Yv9cbucOdCYh 9tK+mG4BIXjxjHHLDEFmp+B4XEXbCGbu4Oote+iGlnd52ICTxMhW5E0f137s7tIr/04i8P o1f0jvmRFr84alJaZmvVukxaNI6v0ZqSthWOVXNEKZZcWSBwJqeqZ7pi90s7XOv/EY416k gEYl4EhkZ3TTVhDiTWkW/SgBoDq9/mtLiOC9SLEAp8N8DxLaDu/3EUGsc+/tQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679849829; a=rsa-sha256; cv=none; b=X5Ksg9/5SD+1JcGzhbDill3vVycvTCKic2w68N8uIbHVuFyCFaMweNDKdQbnDcjIOgl4wW rUT573rUnu1FWoSqLtfXsdKPGNutnA/62E9S1NykOoWaplfKjiMbsY5vn5h4iCkuK1v5Kn Rbjtb/0UHuMopRG/N7GYBKPru3rTBohL/7RDwu7ep+ZBdOw2/WNk6H+o3g1+6O1tVa6TY+ AhGsap0jhxY+7mcKxgag+FVObLCVhL3N+pIAJ70Xc5RldNMRBHwnrSIAI3JGJq36MnCnXZ KtAXbyfmTlJdN5JOZAY53OB8uIsQNk420yutzPCYLdyN6f174J0Wm4Tshu6RuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pl2DP4PzKznhM; Sun, 26 Mar 2023 16:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32QGv9DA033536; Sun, 26 Mar 2023 16:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32QGv9d1033535; Sun, 26 Mar 2023 16:57:09 GMT (envelope-from git) Date: Sun, 26 Mar 2023 16:57:09 GMT Message-Id: <202303261657.32QGv9d1033535@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: ae2f0b2611f1 - main - tftp tests: Fix a typo in the makefile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: ae2f0b2611f112b400177db951f9bd992de72b4d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ae2f0b2611f112b400177db951f9bd992de72b4d commit ae2f0b2611f112b400177db951f9bd992de72b4d Author: Mark Johnston AuthorDate: 2023-03-26 16:54:59 +0000 Commit: Mark Johnston CommitDate: 2023-03-26 16:54:59 +0000 tftp tests: Fix a typo in the makefile Fixes: 64c2a712d661 ("tftp: Add tests.") --- usr.bin/tftp/tests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/tftp/tests/Makefile b/usr.bin/tftp/tests/Makefile index ca5d89f92af3..36b95628ad87 100644 --- a/usr.bin/tftp/tests/Makefile +++ b/usr.bin/tftp/tests/Makefile @@ -5,6 +5,6 @@ PACKAGE= tests ATF_TESTS_SH= tftp_test BINDIR= ${TESTSDIR} -TESTS_METADATA.tftp_test+= is_exclusive="true" +TEST_METADATA.tftp_test+= is_exclusive="true" .include From nobody Sun Mar 26 17:08: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 4Pl2Tv05lXz424hR for ; Sun, 26 Mar 2023 17:08:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (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 4Pl2Tt5S8Tz3kTD for ; Sun, 26 Mar 2023 17:08:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52e.google.com with SMTP id ek18so26658540edb.6 for ; Sun, 26 Mar 2023 10:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; t=1679850529; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=4kbGvLJ8gO+97y9HkGxG6sz3TbKkVcSV5WrMRF9kqI4=; b=CWaQ/EgZyZMiN7T02XI30E4HajQtJIMfHbRDs5L8MGyHdtE3PAkbcNqTLTEGA+WWJF 6UG/X8A/oksPIhEKtFSDzAk/vZLGw5CzWVKq05zvhGqn+QjTCydvJbpsHuMhGNjAwfhZ ms/wc8S6Iq4nVocLHdwA7dL0FAZHtBENh/XzgOSJU+nvCkaaEwy0MjXj8CmMvySzHUXS fs/jIXUSTsGbjm6/gdmGHC+SPVHDPGuS+HlJnm057v5TOgo5Seqb02E2+Tq+A16AMeRC 10yVoJrQCbkAW/xv2mVy4jNMupdGjEjZOvcpiUePJGtAzFC0ZY166Dpame1/19mZc121 3zxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679850529; 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=4kbGvLJ8gO+97y9HkGxG6sz3TbKkVcSV5WrMRF9kqI4=; b=ynhjPiphdokC91vps/0bjVO0QITd79IIUO+eDr9AYR37jbodFjrp5gbwt0UKpJP6// mArFxxy4IOhqN8ELE2t+/6j3lXVdo/5CA/Y7GSrASeQiV/BLYPCaWnADIF6rBjiotIyw HMhkPJijcQeNctdk+H1uUIkzo5BvN3cx0i0ZD+8csXAwmVG7F5E6WuBgebWUtac5v2O0 +Xb25ZwGcewL+epUg3o31olp5/lhz7GrT1uRyZ+mC5uet3mUiaQrDYoejnNnsbYXD6gk JohTXEvB/f46uHRbwBVRCFQZzq2pfE/iExpXBMLh/wQJtpPS30zWbM7Ft4uQw7pzkMAu o8xw== X-Gm-Message-State: AAQBX9dIuaVL9i1Cl2TcT2VWv4LsF/eF7IuSdz+bji2+3zjHB8o0eq8z mmMRFepmr8uS+8HH51VA2BR4aBYv0ptiKmiXQMYCHQ== X-Google-Smtp-Source: AKy350YD+xDdKWIQa0FK8liHUF0PigheZiXGSN+PmldCs5mnvA4Rc2TvHT+XYB+woRDVK6ra337Qr/Yd0Ypue88gyDw= X-Received: by 2002:a17:907:d687:b0:93d:a14f:c9b4 with SMTP id wf7-20020a170907d68700b0093da14fc9b4mr4308425ejc.2.1679850529367; Sun, 26 Mar 2023 10:08:49 -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: <202303261107.32QB7T7N058867@gitrepo.freebsd.org> <486C839F-181F-4CE8-8510-4A7D4D100FDC@freebsd.org> In-Reply-To: <486C839F-181F-4CE8-8510-4A7D4D100FDC@freebsd.org> From: Warner Losh Date: Sun, 26 Mar 2023 19:08:38 +0200 Message-ID: Subject: Re: git: a85dcd4ac4b0 - main - netlink: restrict default userland switch to netlink to i386/amd64. To: Jessica Clarke Cc: "Alexander V. Chernikov" , Ed Maste , src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000014576405f7d0aed5" X-Rspamd-Queue-Id: 4Pl2Tt5S8Tz3kTD X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --00000000000014576405f7d0aed5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Mar 26, 2023, 6:45 PM Jessica Clarke wrote: > On 26 Mar 2023, at 17:17, Ed Maste wrote: > > > > > > On Sun, 26 Mar 2023 at 07:07, Alexander V. Chernikov > > wrote: > >> > >> The branch main has been updated by melifaro: > >> > >> URL: > https://cgit.FreeBSD.org/src/commit/?id=3Da85dcd4ac4b0612b63b5a71eeaaa707= a09ae0003 > >> > >> commit a85dcd4ac4b0612b63b5a71eeaaa707a09ae0003 > >> Author: Alexander V. Chernikov > >> AuthorDate: 2023-03-26 11:05:21 +0000 > >> Commit: Alexander V. Chernikov > >> CommitDate: 2023-03-26 11:06:53 +0000 > >> > >> netlink: restrict default userland switch to netlink to i386/amd64. > > > > We should keep default options the same for all Tier-1 architectures, > > so amd64 and arm64 should be in sync. > > But also, what=E2=80=99s the technical justification for this change? The= re > should not be gratuitous differences between architectures like this, > only when there is a reason something shouldn=E2=80=99t be enabled. Why s= hould > x86 (and possibly arm64) get netlink, but not arm/powerpc/riscv? We > have very few machine-dependent defaults in src.opts.mk. If there is no > such justification then please revert this in its entirety, and if > there is such a justification it belongs in a comment above the if. > So if it's a matter of testing, enable it everywhere. We'll get testing. If it's something known to be bad on say riscv64 we should have a bug and reference it in src.opts.mk to document why. If it's just a conservative approach to a roll out, then I'd suggest being less conservative. Warner > --00000000000014576405f7d0aed5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sun, Mar 26, 2023, 6:45 PM Jessica Clarke <jrtc27@freebsd.org> wrote:
On 26 Mar 2023, at 17:17, Ed Maste <emas= te@freebsd.org> wrote:
>
>
> On Sun, 26 Mar 2023 at 07:07, Alexander V. Chernikov
> <melifaro@freebsd.org> wrote:
>>
>> The branch main has been updated by melifaro:
>>
>> URL: https://cgit.FreeBSD.org/src/commit/?id=3Da85dcd4ac4b0612b63b5a71eea= aa707a09ae0003
>>
>> commit a85dcd4ac4b0612b63b5a71eeaaa707a09ae0003
>> Author:=C2=A0 =C2=A0 =C2=A0Alexander V. Chernikov <melifaro@Fre= eBSD.org>
>> AuthorDate: 2023-03-26 11:05:21 +0000
>> Commit:=C2=A0 =C2=A0 =C2=A0Alexander V. Chernikov <melifaro@Fre= eBSD.org>
>> CommitDate: 2023-03-26 11:06:53 +0000
>>
>>=C2=A0 =C2=A0 netlink: restrict default userland switch to netlink = to i386/amd64.
>
> We should keep default options the same for all Tier-1 architectures,<= br> > so amd64 and arm64 should be in sync.

But also, what=E2=80=99s the technical justification for this change? There=
should not be gratuitous differences between architectures like this,
only when there is a reason something shouldn=E2=80=99t be enabled. Why sho= uld
x86 (and possibly arm64) get netlink, but not arm/powerpc/riscv? We
have very few machine-dependent defaults in src.opts.mk. If there i= s no
such justification then please revert this in its entirety, and if
there is such a justification it belongs in a comment above the if.

So if it= 's a matter of testing, enable it everywhere. We'll get testing. If= it's something known to be bad on say riscv64 we should have a bug and= reference it in src.opts.mk to document= why. If it's just a conservative approach to a roll out, then I'd = suggest being less conservative.=C2=A0

Warner
--00000000000014576405f7d0aed5-- From nobody Sun Mar 26 18:07: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 4Pl3nc2Wdcz427sP; Sun, 26 Mar 2023 18:07: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 4Pl3nc1J8Xz3qxl; Sun, 26 Mar 2023 18:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679854052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i3pwVzDh+F9iLZx0ArkMtbPULqRfMK/NrVcqH7xMO2U=; b=jWH/scuOtxOM6YBXG9I71PPFd10hGC7EJQGAJUvQanGjGzf3mwB+750fx+YTwtdVrTA4cs 0Rl7I8dRNLzL0byzYp4M7edMSVjRWjprUOm45tVa8HKRiQ8Ee+cCIDK2PVsayc70cpgA7I kdsGwaG5zTrobiF9Fza83+W5Yl/bSJ4D/g+BUq2RMq6O9MOUh1S+mjqFqCiEodkhiVAV4z 6utZFJ3gAMjbpQHkie8niWVbPQu+hgeg1Dh2iTYUCJ48kMjFSKOYFYjwJUXx/fhCduypvv p+xzob6+pQin/FB+SveQpEXTHN2BU/yEPFEkwMfJMRKNH/VJT7ITJeY+5V1F9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679854052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i3pwVzDh+F9iLZx0ArkMtbPULqRfMK/NrVcqH7xMO2U=; b=oQMkLKKBO2eKY791fvf6WPZI6kZVeACg+MullxYiyYfECA5K9w31XHzX/q4sNF7GdNJBKa +WY+twjjQnk6Don2Kmj55rtFkWsHHh81Pom0NxZJf73/1loE+pEuHAit0Q+QDFm9mRvxuv F358/esc7xRVXFaNFNcjR991R6DimbNAh5z2ta2kDvpFJ3F1mUe2GCEYKqgsHT3smZk/c7 AaHjTYB+GZNjnXDps7nrh0dFCNdr27efp8quKVkzsxtxd+f+6RAP3hK31kNoXiMqeox8yI J7jMEbw3U/X123WfjlRFehFK00aqGVj3V1B8dvQF0+vmBUPlRdqtEgeHg81sUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679854052; a=rsa-sha256; cv=none; b=ynQNDxiQR/Eg71wljXFJSNZhgLvIO2TTaNMCLj9DfKnuof7qJIAU/+x+7Ovv4vn6tBY7H2 B2ww9OIpjMI2s5lFhmpdJDP1n/jnvABbKdVkLKeedHNlQVOEHUjcVNezsbXTNdkIcbBkFm dA6/jBpFVEkfb/xaGzBp1OTb8D7D+QmlB42VNRdE8bu4Bg8eKT9/r1oLsOZBuTFu4QcJzb no5++BhAd5Lxu1F2PwGkxUi7OcSmwZM5Kk7HXbuVK8JHLHYZbjbriTC0rSmnqzC6q79DoW 7OYWfM4DHtgcr2MJ9r1aeT0ka3hYXP2N7izY4nUxkmTg1S02mzYCnAuZW6Jl5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pl3nc0KvnzqYl; Sun, 26 Mar 2023 18:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32QI7VOe049888; Sun, 26 Mar 2023 18:07:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32QI7V1f049887; Sun, 26 Mar 2023 18:07:31 GMT (envelope-from git) Date: Sun, 26 Mar 2023 18:07:31 GMT Message-Id: <202303261807.32QI7V1f049887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 3a151e31ac6e - main - route: fix RTF_HOST & non-empty mask handling in netlink translation. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a151e31ac6ea7e4555dd874fc23f70527eb359b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=3a151e31ac6ea7e4555dd874fc23f70527eb359b commit 3a151e31ac6ea7e4555dd874fc23f70527eb359b Author: Alexander V. Chernikov AuthorDate: 2023-03-26 18:06:34 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-26 18:07:23 +0000 route: fix RTF_HOST & non-empty mask handling in netlink translation. --- sbin/route/route_netlink.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index 648d866670fc..0b9bb4ff5750 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -154,14 +154,20 @@ rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, { struct sockaddr_in *mask4 = (struct sockaddr_in *)mask; - plen = mask4 ? bitcount32(mask4->sin_addr.s_addr) : 32; + if ((rtm_flags & RTF_HOST) == 0 && mask4 != NULL) + plen = bitcount32(mask4->sin_addr.s_addr); + else + plen = 32; break; } case AF_INET6: { struct sockaddr_in6 *mask6 = (struct sockaddr_in6 *)mask; - plen = mask6 ? inet6_get_plen(&mask6->sin6_addr) : 128; + if ((rtm_flags & RTF_HOST) == 0 && mask6 != NULL) + plen = inet6_get_plen(&mask6->sin6_addr); + else + plen = 128; break; } default: From nobody Sun Mar 26 18:35: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 4Pl4QB3j99z429P0; Sun, 26 Mar 2023 18:35:46 +0000 (UTC) (envelope-from melifaro@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 4Pl4QB3C5sz3tQn; Sun, 26 Mar 2023 18:35:46 +0000 (UTC) (envelope-from melifaro@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679855746; 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=jN5E4edUvt5dyA0UrfEp684z1XWv+pGDpaaJT+bwGS8=; b=mFvXnpLmu3pnNxot2Nhb3bf1oIxybunQ3nzKtPRZoES61rNS7nKGfEZ2VZ7XqWSlIPo/Ks P9H6CtpJBIJI3sx6vR5PkRSApsLQdLp/Y6L+2vdJMRu9Ox9SqdGCLl3BNljiVAjd/PyrSl MlsweZWwRAeXqu9tbqupY2gDDyRPb9MLod4l/r4qvwjm04PkjWAhMT7QkVujt26AoQJ4Wv p8preHNv2nWSx9rEKTWUv9kPYDUSnb8SM2fwmxIdkDGVWlkL/Ke/GPPlPs5A0rXTWx6ThZ 6ido1o4prof4EDNGTcls2M+r4ZkWQQ1WB9EW/WAnOeMw8O9OGkEx5+Vvpc8akg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679855746; 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=jN5E4edUvt5dyA0UrfEp684z1XWv+pGDpaaJT+bwGS8=; b=RUWAwc9AGuudupGtigaNBCMqypTFJflYVdgFTdNtLHGxgXCq1nufVnPwRau9GrAVhf7j5t 84UT2GIsCyP9V/ZeqR9hRJn0hQvUTBxu9SbRZAKN+Bmhx+2N27C73s7xMfx+F1BVuiSh6f uVmdYscMZv7plFbsCu8PZ4Bts+58LXPe9IA05+5oZuHP5tlGSTdOfQ539MreHmR2Lp3qOQ Y5l3zAueNCK8v/Xzw1jt7x8xJlefEm+D8DrY/2EtDe1nwzsD0yXgF+s6+MH5HuekKXLKaR syxG8CB8hGPmKWiW3b4Gt3+HyvnK5ggai1axfhj00nEEUdf1aLhxH/X5Gddhmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679855746; a=rsa-sha256; cv=none; b=Y5qRKIPE7I17HDcQtCxTbrWKETzUtJxWJsD5frG98bQ9IDfamczDthb3F3b5bIOiQ9V3q8 6yLcp9+sXrHogL3+puGW3nnp106L48Kd+/AJfU3isyEFZ6Z+yuYZpR0Oatpw1B+iq/Cxod /31QtsqZaYzVcSW9G+etGe9aIM57H7QH5IgoOEr9znVEAySElVzO6C/z7MJpumGd9hJcwk gJFWwgmPP6JxL6hD3CfEidxtG4dQuGkB8iy3reQAvcCkQXt2lBrY7O0j0qsvuhXeOqlhZ/ UQYFIu0BeZb1xa5NtpYMSg6QgCto1lXtM+YLzrz1zwq/kiTLYGEgKpR6COdVlA== Received: from smtpclient.apple (unknown [IPv6:2a02:8084:d6bb:510:70c8:f40a:69bf:81a8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: melifaro/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pl4Q94D3Dz14mY; Sun, 26 Mar 2023 18:35:45 +0000 (UTC) (envelope-from melifaro@freebsd.org) 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.400.51.1.1\)) Subject: Re: git: a85dcd4ac4b0 - main - netlink: restrict default userland switch to netlink to i386/amd64. From: Alexander Chernikov In-Reply-To: Date: Sun, 26 Mar 2023 19:35:34 +0100 Cc: Jessica Clarke , Ed Maste , src-committers , "" , dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <3FCBB04E-F975-42BF-B401-47EAE718FD38@freebsd.org> References: <202303261107.32QB7T7N058867@gitrepo.freebsd.org> <486C839F-181F-4CE8-8510-4A7D4D100FDC@freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3731.400.51.1.1) X-ThisMailContainsUnwantedMimeParts: N > On 26 Mar 2023, at 18:08, Warner Losh wrote: >=20 >=20 >=20 > On Sun, Mar 26, 2023, 6:45 PM Jessica Clarke = wrote: > On 26 Mar 2023, at 17:17, Ed Maste wrote: >>=20 >>=20 >> On Sun, 26 Mar 2023 at 07:07, Alexander V. Chernikov >> wrote: >>>=20 >>> The branch main has been updated by melifaro: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da85dcd4ac4b0612b63b5a71eeaaa707a= 09ae0003 >>>=20 >>> commit a85dcd4ac4b0612b63b5a71eeaaa707a09ae0003 >>> Author: Alexander V. Chernikov >>> AuthorDate: 2023-03-26 11:05:21 +0000 >>> Commit: Alexander V. Chernikov >>> CommitDate: 2023-03-26 11:06:53 +0000 >>>=20 >>> netlink: restrict default userland switch to netlink to = i386/amd64. >>=20 >> We should keep default options the same for all Tier-1 architectures, >> so amd64 and arm64 should be in sync. >=20 > But also, what=E2=80=99s the technical justification for this change? = There > should not be gratuitous differences between architectures like this, > only when there is a reason something shouldn=E2=80=99t be enabled. = Why should > x86 (and possibly arm64) get netlink, but not arm/powerpc/riscv? We > have very few machine-dependent defaults in src.opts.mk. If there is = no > such justification then please revert this in its entirety, and if > there is such a justification it belongs in a comment above the if. >=20 > So if it's a matter of testing, enable it everywhere. We'll get = testing. If it's something known to be bad on say riscv64 we should have = a bug and reference it in src.opts.mk to document why. If it's just a = conservative approach to a roll out, then I'd suggest being less = conservative.=20 I=E2=80=99d actually be happy to enable it everywhere and fix the bugs = if/when they appear. I=E2=80=99m not sure what is the best way to implement this. Having = Netlink on in the userland implies that route(8) (and soon ifconfig(8)) = will need kernel-side Netlink support to operate. Thus, for the particular platform, one need to ensure that either (a) = Netlink is present in the config or (b) Netlink is loaded as a module = during boot. Given that successful boot w/o working route(8) may not = just happen, it really boils down to (a). arm (like v6) or ppc or riscv may represent some lower-scale devices, = where adding Netlink to the default config may represent a size (or = other) concerns [1].=20 With all that in mind, in order to gather more datapoints & have a = gradual conversion, I started with the archs I can reason about. In the = end, it=E2=80=99s pretty easy to enable it arch-by-arch (or everywhere) = when there is a consensus on the situation mentioned above. [1] https://reviews.freebsd.org/D39047 >=20 > Warner From nobody Sun Mar 26 19:21: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 4Pl5RK4XfRz42Cns; Sun, 26 Mar 2023 19:21: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 4Pl5RK44T1z40Jn; Sun, 26 Mar 2023 19:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679858509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8egDH4yD4L8tK1m4nZUiEwKwG7n1/wkZXsmO8gJzf4k=; b=IruOq41z/mfzItk/ArMpo2vB2wmZ9Y6fybY4kbKkwdWfnT64g30OCpepfXn4yHil3RzYJ1 1ebOs4ke0eWSGSdpLzKYDsBxjSVvqkJVi0Us0kFjgvO1wTJ0C+/4J95q3djDHtDGjkypqE tRUhMnIwj5Z9vn1ZdhUGwzRtV9Jg9YF+NsSwGSzmz+PEfryPbiNDv2IpTAYFZKy3XjiQGD metKe1bFAYwbNWumhnutzGxkvPZuVcXleqn/uRyrbtSd33tbzLq5YK2lfThTLt/S7vskqZ 3h33+xUw+TDtLZ8DWQJZksUz5GzfQVhRYgG1icjMiZTyLJ4NHaZjBMpD2vIAbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679858509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8egDH4yD4L8tK1m4nZUiEwKwG7n1/wkZXsmO8gJzf4k=; b=BrlQfu/UdPm9yAO3Kom/fCBo3DOpMhvzTEN5sN1kY9TAifuVZXNdSU3T0e6keyiafK7kXA 7lRAH4RV/gWG4UtVzGnKFWn9hce36HvN8FznXmf06/SQCMZWvYIXSNtwf3nxnwiXy00O6k ZxhXdYYqmmNpBHiyzhfDi2iiy7eM6gfaIAYbiD+GTHL1Hl4gTtbGbf0ToWRGa/Qq53i9oB L8X9o7lBUaDJsLOx2TcXCWsX1hLvQMCwfs1Mt1Fpb+cyRQodevJn6Wx4nHAg2J8Rd1DDkT 5byPNrhsn0/I+f2/cly1+7dOZY3LNyX4hezS25vKH33KsFJfYIjcENgS1RsYRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679858509; a=rsa-sha256; cv=none; b=djHtMMg6GZXrASPp7O+uzdFg7OnA2Pukb3fDBNd9AS+1mgTpOTAIUM67OcPQx/BQgUF6ih t7GIvK6Yml2amgGoxEornuwazRaMttHo0mFJMFVnPSt/90aLEFCN6SatVQ8gUFdUES0BC5 JTYLvu+xecY5uZTdqMehH1qXbouxRsdksW+eYr/r2Ll4Ss2aTioMbwnAWC0cCzQZ9D5205 cRo4VO/mtLhKpSHluC0q35GsYHxbwcO/GKgcT3Br+hoSqKuCMTlEaZ1LhIDBqyd0foTwMa vCUAXOMccxn2ngXoZOzmTS4WmqUYUH3tIg4+EnYYVdLxtyZveA/Dx+IK1u7Kog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pl5RK377dzsfv; Sun, 26 Mar 2023 19:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32QJLnPH079201; Sun, 26 Mar 2023 19:21:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32QJLn4M079200; Sun, 26 Mar 2023 19:21:49 GMT (envelope-from git) Date: Sun, 26 Mar 2023 19:21:49 GMT Message-Id: <202303261921.32QJLn4M079200@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: ec1bc530027f - main - arm64: cpu_switch: don't zero out pcb_onfault List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: ec1bc530027f0f17cd7f3979b5df85fdd57a461f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ec1bc530027f0f17cd7f3979b5df85fdd57a461f commit ec1bc530027f0f17cd7f3979b5df85fdd57a461f Author: Kyle Evans AuthorDate: 2023-03-26 18:48:22 +0000 Commit: Kyle Evans CommitDate: 2023-03-26 18:48:22 +0000 arm64: cpu_switch: don't zero out pcb_onfault Previously this would zero out x18 in the pcb, now it's attacking the innocent pcb_onfault -- drop it entirely. This technically fixes e605b87a9e7 ("Save only callee-saved registers in pcb"), but it's harmless until the below commit trims down pcb_x. Reported by: mmel Reviewed by: andrew, mmel Fixes: 1c1f31a5e517 ("Remove unused registes from the arm pcb") Differential Revision: https://reviews.freebsd.org/D39277 --- sys/arm64/arm64/swtch.S | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index 538235d7b3e8..656ab9c864b7 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -203,7 +203,6 @@ ENTRY(cpu_switch) ldp x27, x28, [x4, #PCB_REGS + (PCB_X19 + 8) * 8] ldp x29, lr, [x4, #PCB_REGS + (PCB_X19 + 10) * 8] - str xzr, [x4, #PCB_REGS + 18 * 8] ret END(cpu_switch) From nobody Mon Mar 27 03:49: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 4PlJhh5hLhz41dKC; Mon, 27 Mar 2023 03:49: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 4PlJhh4z9Wz3mty; Mon, 27 Mar 2023 03:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679888948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vaJIDPK0wmUuTOLCOLUWrtMdz+IniX4lTuuswfI6x2M=; b=VUWi/BR5YMFJKvpPmgUVY8tSuNftcRxJQoDb6Lg7rbMYHJPywgPY8UxH7uSBbMNL7BnYmo ZaxRL1GAiCC46+tbUR4eWB46RalNpSd+IKrqPDh4ld1hgZyX9eV7UZItMgkI9pC/bfzzRf DZ5jPK8MxemKeqiF/AGAAW+H2ZmJ3tjRaogk65zM8KheKoihdljvE5hGkJBLU11yxIVPfK YrNEGxs6sbG3kac3d6aXhj6200DuK3iPFXSptgi9M4M7WEs6tTsUoK2z05dkHfffpn2aqV KdEEJ3eFAUS3gm3l8XxyZb1QmzoRV78xg7jltB79Q0POZ05X3zsiFwGCrZbJVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679888948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vaJIDPK0wmUuTOLCOLUWrtMdz+IniX4lTuuswfI6x2M=; b=EhgNh4AH0oQGtKX3OBuT2/TL9BfQSpKacR59o+ZsInineVW1p5mJe62VwG6aBb8rvXwFS6 GgNQ1TtUJihSVvOAXeCkjMbT638b5uHF7owp9QeKvtVkmuvyOq5kl2a1EkWasUuKHUVa31 F+baKhrbdJmmee3Xg/spCYYpw/ioU2xgpQMmPfEb3Lfw3x2DcuJK3b7IaJ3kueYBYgt7Vx KSaT3sD7/DbqDSs3GY6q3Hd8r2iKpHNqpRPX3PCm0vMMA5GMSIxqPjdZ8nz7zBJk3dIADG Cj0kecv6C3WXKiuAPND86R+0EfnwflvMZBFVXfCJmAjfAFs1GhFso3cGqyUuJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679888948; a=rsa-sha256; cv=none; b=NivWe11t9dmkVw2rKmfIclpbOc62CrxfTIRovTMib0Adqbd4QCOiuY0MccDbGzoUhw4omB ALOrjXAWR6jjdwdVl4JPmW5GxkxIR3XOTy1JapCRKiCgAGC3bqt2qrSSlj83DvPaBvxyT/ Zpzgg8FKvZtVsPEdGPMG7vmNTKNmEtDI/212qsmAM9wh95jWtImMBxeighTWllT1ndragv dsmNWIZ5b3UD+ZfLcwtv4vtOwzX6Gpe48qoS4rBfvpdpWVfdKIUwhO2w0Q+GZLHdpSzZG2 V9uQfVBj5KxUQU/5ut93xeMqKgnoyChr36Uzz1y0GLZkqUT0fK41NDtoyGZB1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlJhh40Pqz16P0; Mon, 27 Mar 2023 03:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R3n8fX002529; Mon, 27 Mar 2023 03:49:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R3n8JL002528; Mon, 27 Mar 2023 03:49:08 GMT (envelope-from git) Date: Mon, 27 Mar 2023 03:49:08 GMT Message-Id: <202303270349.32R3n8JL002528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 9fc2d858b4e9 - main - ping tests: Add a 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fc2d858b4e9457a122a54c1a25715314032bf41 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=9fc2d858b4e9457a122a54c1a25715314032bf41 commit 9fc2d858b4e9457a122a54c1a25715314032bf41 Author: Jose Luis Duran AuthorDate: 2023-03-26 03:11:50 +0000 Commit: Cy Schubert CommitDate: 2023-03-27 02:54:29 +0000 ping tests: Add a regression test Test regression fixed in 4630a3252ac8. Add two tests that do not use the verbose flag, so the code path in question can be reached: 1. Respond with a proper ICMP destination host unreachable packet. 2. Respond with a doctored ICMP destination host unreachable packet, that has the ICMP Identifier field modified (+1 bit). Reviewed by: cy MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39244 --- sbin/ping/tests/test_ping.py | 61 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index f1c961c5b551..79cde1f4936c 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -56,6 +56,9 @@ def build_response_packet(echo, ip, icmp, oip_ihl, special): # Build a package with a wrong last byte payload_no_last_byte = sc.bytes_hex(load)[:-2] load = (sc.hex_bytes(payload_no_last_byte)) + b"\x00" + if special == "not-mine": + # Modify the ICMP Identifier field + oicmp.id += 1 if icmp.type in icmp_id_seq_types: pkt = ip / icmp / load @@ -148,6 +151,7 @@ def pinger( # Miscellaneous arguments count: int = 1, dup: bool = False, + verbose: bool = True, ) -> subprocess.CompletedProcess: """P I N G E R @@ -173,8 +177,8 @@ def pinger( :type opts: str, optional :keyword oip_ihl: Inner packet's Internet Header Length, defaults to None :type oip_ihl: class:`scapy.fields.BitField`, optional - :keyword special: Send a special packet - one of `no-payload`, `tcp`, - `udp`, `wrong` or `warp`, defaults to None + :keyword special: Send a special packet - one of `no-payload`, `not-mine`, + `tcp`, `udp`, `wrong` or `warp`, defaults to None :type special: str, optional :keyword icmp_pptr: ICMP pointer, defaults to 0 :type icmp_pptr: class:`scapy.fields.ByteField` @@ -197,6 +201,8 @@ def pinger( :type count: int :keyword dup: Duplicate packets, defaults to `False` :type dup: bool + :keyword verbose: Turn on/off verbosity, defaults to `True` + :type verbose: bool :return: A class:`subprocess.CompletedProcess` with the output from the ping utility @@ -213,8 +219,9 @@ def pinger( str(count), "-t", str(count), - "-v", ] + if verbose: + command += ["-v"] if request == "mask": command += ["-Mm"] if request == "timestamp": @@ -1210,6 +1217,54 @@ ping: quoted data too short (28 bytes) from 192.0.2.2 }, id="_3_1_special_udp", ), + pytest.param( + { + "src": "192.0.2.1", + "dst": "192.0.2.2", + "icmp_type": 3, + "icmp_code": 1, + "verbose": False, + }, + { + "returncode": 2, + "stdout": """\ +PING 192.0.2.2 (192.0.2.2): 56 data bytes +92 bytes from 192.0.2.2: Destination Host Unreachable +Vr HL TOS Len ID Flg off TTL Pro cks Src Dst + 4 5 00 0054 0001 0 0000 40 01 f6a4 192.0.2.1 192.0.2.2 + + +--- 192.0.2.2 ping statistics --- +1 packets transmitted, 0 packets received, 100.0% packet loss +""", + "stderr": "", + "redacted": False, + }, + id="_3_1_verbose_false", + ), + pytest.param( + { + "src": "192.0.2.1", + "dst": "192.0.2.2", + "icmp_type": 3, + "icmp_code": 1, + "special": "not-mine", + "verbose": False, + }, + { + "returncode": 2, + "stdout": """\ +PATTERN: 0x01 +PING 192.0.2.2 (192.0.2.2): 56 data bytes + +--- 192.0.2.2 ping statistics --- +1 packets transmitted, 0 packets received, 100.0% packet loss +""", + "stderr": "", + "redacted": False, + }, + id="_3_1_special_not_mine_verbose_false", + ), pytest.param( { "src": "192.0.2.1", From nobody Mon Mar 27 06:40: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 4PlNV11wsmz41qbh; Mon, 27 Mar 2023 06:40: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 4PlNV11M0Vz41Gl; Mon, 27 Mar 2023 06:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679899209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c7ZyfrT89U1zUtMzDlAyv+fqD3ufeC/IqsqG7m07nx4=; b=ZgNS3Y5ETlG+sROhkNt31QppYbLkjyPD3huls5QpeMsOi54oLnCSrKsiLDWDbKFEvXr4+a NI04oNEbFYqOCYKWGmN8XHiZlfOpj3CxpkTLY8nOv9E+nGk88q1L+rwVDOpVUAPozW6Ek9 OlCWhdcmIJhZMDq35JwqGYAhNZ0oBKFdnUXXqIli7xlrHxAAjpl0OPnQGIy/WBkD3ZqrXK 7wJIprX0hhZyNVuEkrC6gSf8W5ZZgPUjPfLLF4jIc2K5RdWIuD5irJ2ueOantYvzVgmnJS G8Fw4rkzt3I77WWYgCnp01RehB3yyDn+WCooTvlSvJufCKtGaHz+Q29qwlCdbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679899209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c7ZyfrT89U1zUtMzDlAyv+fqD3ufeC/IqsqG7m07nx4=; b=hDSDgo6WoIR3E/wOjGJI8QvmJVhWIYiXq7WXnLbpREkqcYOhoTK//MOxnDOyA1uX3k0L8K EDjTa2xIUf1ZokWWVxckIBbyzy0O7xBsaERMLDIy/pUuuKU6PWEuBftbvO0gMfuGtsF+ND CiJUtBf6zVk4JLa1HYmjURdXYd+SIKQcGCwYU+Z+xgM3AT5KUgyGXp85RZdt2Y+H0UgSkv FSz6v6X1x3MqWTgxFrc0xUNg9bMYI63Y0uYJhAVJINjT45sTNZEaX3i4RMDrF42FUGJg54 s4n9QT823Q8dpi7azVDr/ewehiwGU2UnpOm+CmReGfQ1kYZBlEXTJtienwzkiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679899209; a=rsa-sha256; cv=none; b=FdFMdTV4LJt1ROOcEW5iuYrhQizlLS/ysSRM+FxJTIMCCTzzRvdmIJKdl7XAWVlYtz+nVL 0a7pPrss3pmKF6cNK1h6COTML+/SJTesuAp/ByWntapxK7eM8ob14/sZfuYbhrSLzpkhbA YjnUPJ5l3AR4mIp6Y2k98ITjY+T5E3gj2zI5/zlxmDoyY3Kci1gRjZfwYv7kL/G/8H7CYX Y7rQol1eZe1OEyIASWj5e9ZRCXY+VnWvifoMGRB23mZm1HNx3rswBgb96F124URGk4ne76 GSEBHeNSvZ77X1vsgtr0ur1GswtROfVU9HO72RYbF+9FOcY3dFtGsv7RQMMqYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlNV10Q1wz1BSD; Mon, 27 Mar 2023 06:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R6e86d085321; Mon, 27 Mar 2023 06:40:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R6e8Q1085315; Mon, 27 Mar 2023 06:40:08 GMT (envelope-from git) Date: Mon, 27 Mar 2023 06:40:08 GMT Message-Id: <202303270640.32R6e8Q1085315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 35bdc8b79e2a - stable/13 - bhyve: add helper for adding fwcfg 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 35bdc8b79e2af6565520eea81cf6be431ed5fd3f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=35bdc8b79e2af6565520eea81cf6be431ed5fd3f commit 35bdc8b79e2af6565520eea81cf6be431ed5fd3f Author: Corvin Köhne AuthorDate: 2021-08-11 08:04:36 +0000 Commit: Corvin Köhne CommitDate: 2023-03-27 06:32:59 +0000 bhyve: add helper for adding fwcfg files Fwcfg items without a fixed index are reported by the file_dir. They have an index of 0x20 and above. This helper simplifies the addition of such fwcfg items. It selects a new free index, assigns it to the fwcfg items and creates an proper entry in the file_dir. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38336 (cherry picked from commit 6f9ebb3d0fed2b0ae604dd6daf17f1fe1d8df216) --- usr.sbin/bhyve/qemu_fwcfg.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/qemu_fwcfg.h | 2 + 2 files changed, 92 insertions(+) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index e1a67fd0d8ef..5ee35d6764e6 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -43,6 +43,8 @@ #define QEMU_FWCFG_INDEX_ID 0x01 #define QEMU_FWCFG_INDEX_FILE_DIR 0x19 +#define QEMU_FWCFG_FIRST_FILE_INDEX 0x20 + #define QEMU_FWCFG_MIN_FILES 10 #pragma pack(1) @@ -87,6 +89,7 @@ struct qemu_fwcfg_softc { union qemu_fwcfg_selector selector; struct qemu_fwcfg_item items[QEMU_FWCFG_MAX_ARCHS] [QEMU_FWCFG_MAX_ENTRIES]; + struct qemu_fwcfg_directory *directory; }; static struct qemu_fwcfg_softc fwcfg_sc; @@ -256,6 +259,93 @@ qemu_fwcfg_register_port(const char *const name, const int port, const int size, return (register_inout(&iop)); } +int +qemu_fwcfg_add_file(const uint8_t name[QEMU_FWCFG_MAX_NAME], + const uint32_t size, void *const data) +{ + /* + * QEMU specifies count as big endian. + * Convert it to host endian to work with it. + */ + const uint32_t count = be32toh(fwcfg_sc.directory->be_count) + 1; + + /* add file to items list */ + const uint32_t index = QEMU_FWCFG_FIRST_FILE_INDEX + count - 1; + const int error = qemu_fwcfg_add_item(QEMU_FWCFG_ARCHITECTURE_GENERIC, + index, size, data); + if (error != 0) { + return (error); + } + + /* + * files should be sorted alphabetical, get index for new file + */ + uint32_t file_index; + for (file_index = 0; file_index < count - 1; ++file_index) { + if (strcmp(name, fwcfg_sc.directory->files[file_index].name) < + 0) + break; + } + + if (count > QEMU_FWCFG_MIN_FILES) { + /* alloc new file directory */ + const uint64_t new_size = sizeof(struct qemu_fwcfg_directory) + + count * sizeof(struct qemu_fwcfg_file); + struct qemu_fwcfg_directory *const new_directory = calloc(1, + new_size); + if (new_directory == NULL) { + warnx( + "%s: Unable to allocate a new qemu fwcfg files directory (count %d)", + __func__, count); + return (-ENOMEM); + } + + /* copy files below file_index to new directory */ + memcpy(new_directory->files, fwcfg_sc.directory->files, + file_index * sizeof(struct qemu_fwcfg_file)); + + /* copy files above file_index to directory */ + memcpy(&new_directory->files[file_index + 1], + &fwcfg_sc.directory->files[file_index], + (count - file_index) * sizeof(struct qemu_fwcfg_file)); + + /* free old directory */ + free(fwcfg_sc.directory); + + /* set directory pointer to new directory */ + fwcfg_sc.directory = new_directory; + + /* adjust directory pointer */ + fwcfg_sc.items[0][QEMU_FWCFG_INDEX_FILE_DIR].data = + (uint8_t *)fwcfg_sc.directory; + } else { + /* shift files behind file_index */ + for (uint32_t i = QEMU_FWCFG_MIN_FILES - 1; i > file_index; + --i) { + memcpy(&fwcfg_sc.directory->files[i], + &fwcfg_sc.directory->files[i - 1], + sizeof(struct qemu_fwcfg_file)); + } + } + + /* + * QEMU specifies count, size and index as big endian. + * Save these values in big endian to simplify guest reads of these + * values. + */ + fwcfg_sc.directory->be_count = htobe32(count); + fwcfg_sc.directory->files[file_index].be_size = htobe32(size); + fwcfg_sc.directory->files[file_index].be_selector = htobe16(index); + strcpy(fwcfg_sc.directory->files[file_index].name, name); + + /* set new size for the fwcfg_file_directory */ + fwcfg_sc.items[0][QEMU_FWCFG_INDEX_FILE_DIR].size = + sizeof(struct qemu_fwcfg_directory) + + count * sizeof(struct qemu_fwcfg_file); + + return (0); +} + int qemu_fwcfg_init(struct vmctx *const ctx) { diff --git a/usr.sbin/bhyve/qemu_fwcfg.h b/usr.sbin/bhyve/qemu_fwcfg.h index b5454fa9977d..f59087250816 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.h +++ b/usr.sbin/bhyve/qemu_fwcfg.h @@ -18,4 +18,6 @@ struct qemu_fwcfg_item { uint8_t *data; }; +int qemu_fwcfg_add_file(const uint8_t name[QEMU_FWCFG_MAX_NAME], + const uint32_t size, void *const data); int qemu_fwcfg_init(struct vmctx *const ctx); From nobody Mon Mar 27 06:40: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 4PlNV22KPnz41qTy; Mon, 27 Mar 2023 06:40: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 4PlNV21dWwz41MC; Mon, 27 Mar 2023 06:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679899210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hMshnW+5QOcPT3vBolS7npDA3Gb3aIqXBQoEZ/49q3s=; b=DwTYEkj8ZJn+UdMPxUrVAKgv5mFd13yqnRzD8BYLtajcAgMPcOoMb5vsv+cUPrVbduEf4S gsfCc9fxpX79UxEkWdsxqP8kPsIn/ISN1NVQPuBmDt9a8OdhnK66DPP5+ImbWHQUoQP/SR OhRV/mbN8E3EdkMgJCKg0X7uoqHAMo7RFEzFBmufsQnKoImOpckH7CBviUcjSaVBUT+ki6 AprT6sTDG2IXS7F/sjsNUvmbZ9EZjqtkhyyIE3xvGgpZ3De3rKqZw9etVMnkDFMGEX+vlB mduGFApHqLvggp62Pe62RP/ZdjKx6Ay/gvUcyIOoHQ2ypq1SN4lsdMd2wsQ8eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679899210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hMshnW+5QOcPT3vBolS7npDA3Gb3aIqXBQoEZ/49q3s=; b=V+OBibkaVmtoO8NKy9ergOFcAi3uRvBmBTcXZQl7Z3b+YLj9nB2a9FzpIIJSA7ddWtWOBA rzS+Nyh4E/is+wQqRaVSLaSaxEQFLBMdjuYfZrYSU2iZ2SqrzdtDVn6dZfwhWD6QKuDQCh l+ytGoxpknXqh1KCAbKrOn9zRSWthBSyzUnMgYk1Gk9zkTzXyv/tOP0H/De0zoPbkTtIkD FHImh5YcxfywpBQt5q2ME3u20t4VI9OCaezPxvreny2x0vuRWSSs8Btyv1fkrLBGuK6LVr IJeCS7/0YKXIOzD7ddSSxM/Dj6Q20Cc0VBYvc5XxV4zS8FZ6y71O+gqcTIzVZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679899210; a=rsa-sha256; cv=none; b=SA//S3ql33qKUvCEtfdO3bVMZU8A8adTzCy/GNTJsTLTFBjqa0CmK4mSatsesJibdaB2eq oiyQjlgmTFm5uuT9KWJDp9FZihxuIsGskMtXMpSpcH+BU3s1OElpKuMJGUVRFLv6iLqE/n /RDYx46q/wgcqQ/cIgeiKrLwWDeYT9bWq4TZhJiy451pwzQgoUF9Ob8xvxDFZpeLEwtgqY pk/6fy9a/8oHdNAWdKY9bSrnGfwA6/fugEjurolj2eF9BPaZvT1JIgHtNVL0zmTLjhI8Hw O9zIq2qPieQpjHhmurhXIhoms48V1lSCmo2YN+sIl9bOkTIhYSAgVndntXErJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlNV20j9Pz1BGR; Mon, 27 Mar 2023 06:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R6eA9C085951; Mon, 27 Mar 2023 06:40:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R6eAKm085947; Mon, 27 Mar 2023 06:40:10 GMT (envelope-from git) Date: Mon, 27 Mar 2023 06:40:10 GMT Message-Id: <202303270640.32R6eAKm085947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: d468d5dd195f - stable/13 - bhyve: add cmdline option to enable qemu's fwcfg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: d468d5dd195f58d9898f505289364ac98cfcbf05 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=d468d5dd195f58d9898f505289364ac98cfcbf05 commit d468d5dd195f58d9898f505289364ac98cfcbf05 Author: Corvin Köhne AuthorDate: 2021-08-18 07:31:59 +0000 Commit: Corvin Köhne CommitDate: 2023-03-27 06:32:59 +0000 bhyve: add cmdline option to enable qemu's fwcfg Let the user decide if he wants to use bhyve's fwctl or qemu's fwcfg. He can set the interface by adding a fwcfg option to bootrom: -l bootrom,,fwcfg=bhyve -l bootrom,,fwcfg=qemu Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38337 (cherry picked from commit d85147f3d6811c04e250bfb4597783d8844de315) --- usr.sbin/bhyve/Makefile | 1 + usr.sbin/bhyve/bhyve.8 | 29 ++++++++++++++++-- usr.sbin/bhyve/bhyve_config.5 | 8 +++++ usr.sbin/bhyve/bhyverun.c | 16 +++++++++- usr.sbin/bhyve/pci_lpc.c | 18 ++++++++++- usr.sbin/bhyve/pci_lpc.h | 1 + usr.sbin/bhyve/qemu_fwcfg.c | 71 +++++++++++++++++++++++++------------------ 7 files changed, 111 insertions(+), 33 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index bf0a17edc59e..967ea790caa5 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -63,6 +63,7 @@ SRCS= \ post.c \ ps2kbd.c \ ps2mouse.c \ + qemu_fwcfg.c \ rfb.c \ rtc.c \ smbiostbl.c \ diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 152557087862..ed9c045c3159 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -200,7 +200,9 @@ and .Cm com4 , the boot ROM device .Cm bootrom , -and the debug/test device +the +.Cm fwcfg +type and the debug/test device .Cm pc-testdev . .Pp The possible values for the @@ -345,7 +347,7 @@ PCI 16550 serial device. .It Cm lpc LPC PCI-ISA bridge with COM1, COM2, COM3, and COM4 16550 serial ports, a boot ROM, and, -optionally, the debug/test device. +optionally, a fwcfg type and the debug/test device. The LPC bridge emulation can only be configured on bus 0. .It Cm fbuf Raw framebuffer device attached to VNC server. @@ -520,6 +522,29 @@ address space, and any modifications the guest makes will be saved to that file. .El .Pp +Fwcfg types: +.Bl -tag -width 10n +.It Ar fwcfg +The fwcfg interface is used to pass information such as the CPU count or ACPI tables to the guest firmware. +Supported values are +.Ql bhyve +and +.Ql qemu . +Due to backward compatibility reasons, +.Ql bhyve +is the default option. +When +.Ql bhyve +is used, bhyve's fwctl interface is used. +It currently reports only the CPU count to the guest firmware. +The +.Ql qemu +option uses QEMU's fwcfg interface. +This interface is widely used and allows user-defined information to be passed to the guest. +It is used for passing the CPU count, ACPI tables, a boot order and many other things to the guest. +Some operating systems such as Fedora CoreOS can be configured by qemu's fwcfg interface as well. +.El +.Pp Pass-through device backends: .Sm off .Bl -bullet diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index 7c4f701d46f6..31f848740aa8 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -259,6 +259,7 @@ VGA framebuffer device attached to VNC server. .It Li lpc LPC PCI-ISA bridge with COM1-COM4 16550 serial ports, a boot ROM, +an optional fwcfg type, and an optional debug/test device. This device must be configured on bus 0. .It Li hda @@ -529,6 +530,13 @@ Settings for the COM2 serial port device. Settings for the COM3 serial port device. .It Va com4 Ta node Ta Ta Settings for the COM4 serial port device. +.It Va fwcfg Ta string Ta bhyve Ta +The fwcfg type to be used. +Supported values are +.Dq bhyve +for fwctl and +.Dq qemu +for fwcfg. .It Va pc-testdev Ta bool Ta false Ta Enable the PC debug/test device. .El diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 702ef0e12690..1becf998b976 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -101,6 +101,7 @@ __FBSDID("$FreeBSD$"); #include "pci_emul.h" #include "pci_irq.h" #include "pci_lpc.h" +#include "qemu_fwcfg.h" #include "smbiostbl.h" #ifdef BHYVE_SNAPSHOT #include "snapshot.h" @@ -1231,6 +1232,7 @@ set_defaults(void) set_config_bool("acpi_tables", false); set_config_value("memory.size", "256M"); set_config_bool("x86.strictmsr", true); + set_config_value("lpc.fwcfg", "bhyve"); } int @@ -1460,6 +1462,17 @@ main(int argc, char *argv[]) rtc_init(ctx); sci_init(ctx); + if (qemu_fwcfg_init(ctx) != 0) { + fprintf(stderr, "qemu fwcfg initialization error"); + exit(4); + } + + if (qemu_fwcfg_add_file("opt/bhyve/hw.ncpu", sizeof(guest_ncpus), + &guest_ncpus) != 0) { + fprintf(stderr, "Could not add qemu fwcfg opt/bhyve/hw.ncpu"); + exit(4); + } + /* * Exit if a device emulation finds an error in its initilization */ @@ -1554,8 +1567,9 @@ main(int argc, char *argv[]) assert(error == 0); } - if (lpc_bootrom()) + if (lpc_bootrom() && strcmp(lpc_fwcfg(), "bhyve") == 0) { fwctl_init(); + } /* * Change the proc title to include the VM name. diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c index 548726e27d0d..ad47230c005e 100644 --- a/usr.sbin/bhyve/pci_lpc.c +++ b/usr.sbin/bhyve/pci_lpc.c @@ -110,10 +110,20 @@ lpc_device_parse(const char *opts) set_config_value("lpc.bootrom", romfile); varfile = strsep(&str, ","); - if (varfile != NULL) { + if (varfile == NULL) { + error = 0; + goto done; + } + if (strchr(varfile, '=') == NULL) { set_config_value("lpc.bootvars", varfile); + } else { + /* varfile doesn't exist, it's another config + * option */ + pci_parse_legacy_config(find_config_node("lpc"), + varfile); } + pci_parse_legacy_config(find_config_node("lpc"), str); error = 0; goto done; } @@ -160,6 +170,12 @@ lpc_bootrom(void) return (get_config_value("lpc.bootrom")); } +const char * +lpc_fwcfg(void) +{ + return (get_config_value("lpc.fwcfg")); +} + static void lpc_uart_intr_assert(void *arg) { diff --git a/usr.sbin/bhyve/pci_lpc.h b/usr.sbin/bhyve/pci_lpc.h index 611b025d4386..ff3ea98b4f9c 100644 --- a/usr.sbin/bhyve/pci_lpc.h +++ b/usr.sbin/bhyve/pci_lpc.h @@ -72,5 +72,6 @@ void lpc_print_supported_devices(void); char *lpc_pirq_name(int pin); void lpc_pirq_routed(void); const char *lpc_bootrom(void); +const char *lpc_fwcfg(void); #endif diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index 5ee35d6764e6..1b0b5e3e9931 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -17,6 +17,7 @@ #include "acpi_device.h" #include "inout.h" +#include "pci_lpc.h" #include "qemu_fwcfg.h" #define QEMU_FWCFG_ACPI_DEVICE_NAME "FWCF" @@ -351,37 +352,49 @@ qemu_fwcfg_init(struct vmctx *const ctx) { int error; - error = acpi_device_create(&fwcfg_sc.acpi_dev, ctx, - QEMU_FWCFG_ACPI_DEVICE_NAME, QEMU_FWCFG_ACPI_HARDWARE_ID); - if (error) { - warnx("%s: failed to create ACPI device for QEMU FwCfg", - __func__); - goto done; - } + /* + * Bhyve supports fwctl (bhyve) and fwcfg (qemu) as firmware interfaces. + * Both are using the same ports. So, it's not possible to provide both + * interfaces at the same time to the guest. Therefore, only create acpi + * tables and register io ports for fwcfg, if it's used. + */ + if (strcmp(lpc_fwcfg(), "qemu") == 0) { + error = acpi_device_create(&fwcfg_sc.acpi_dev, ctx, + QEMU_FWCFG_ACPI_DEVICE_NAME, QEMU_FWCFG_ACPI_HARDWARE_ID); + if (error) { + warnx("%s: failed to create ACPI device for QEMU FwCfg", + __func__); + goto done; + } - error = acpi_device_add_res_fixed_ioport(fwcfg_sc.acpi_dev, - QEMU_FWCFG_SELECTOR_PORT_NUMBER, 2); - if (error) { - warnx("%s: failed to add fixed IO port for QEMU FwCfg", - __func__); - goto done; - } + error = acpi_device_add_res_fixed_ioport(fwcfg_sc.acpi_dev, + QEMU_FWCFG_SELECTOR_PORT_NUMBER, 2); + if (error) { + warnx("%s: failed to add fixed IO port for QEMU FwCfg", + __func__); + goto done; + } - /* add handlers for fwcfg ports */ - if ((error = qemu_fwcfg_register_port("qemu_fwcfg_selector", - QEMU_FWCFG_SELECTOR_PORT_NUMBER, QEMU_FWCFG_SELECTOR_PORT_SIZE, - QEMU_FWCFG_SELECTOR_PORT_FLAGS, - qemu_fwcfg_selector_port_handler)) != 0) { - warnx("%s: Unable to register qemu fwcfg selector port 0x%x", - __func__, QEMU_FWCFG_SELECTOR_PORT_NUMBER); - goto done; - } - if ((error = qemu_fwcfg_register_port("qemu_fwcfg_data", - QEMU_FWCFG_DATA_PORT_NUMBER, QEMU_FWCFG_DATA_PORT_SIZE, - QEMU_FWCFG_DATA_PORT_FLAGS, qemu_fwcfg_data_port_handler)) != 0) { - warnx("%s: Unable to register qemu fwcfg data port 0x%x", - __func__, QEMU_FWCFG_DATA_PORT_NUMBER); - goto done; + /* add handlers for fwcfg ports */ + if ((error = qemu_fwcfg_register_port("qemu_fwcfg_selector", + QEMU_FWCFG_SELECTOR_PORT_NUMBER, + QEMU_FWCFG_SELECTOR_PORT_SIZE, + QEMU_FWCFG_SELECTOR_PORT_FLAGS, + qemu_fwcfg_selector_port_handler)) != 0) { + warnx( + "%s: Unable to register qemu fwcfg selector port 0x%x", + __func__, QEMU_FWCFG_SELECTOR_PORT_NUMBER); + goto done; + } + if ((error = qemu_fwcfg_register_port("qemu_fwcfg_data", + QEMU_FWCFG_DATA_PORT_NUMBER, QEMU_FWCFG_DATA_PORT_SIZE, + QEMU_FWCFG_DATA_PORT_FLAGS, + qemu_fwcfg_data_port_handler)) != 0) { + warnx( + "%s: Unable to register qemu fwcfg data port 0x%x", + __func__, QEMU_FWCFG_DATA_PORT_NUMBER); + goto done; + } } /* add common fwcfg items */ From nobody Mon Mar 27 06:40: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 4PlNV32vmQz41qWg; Mon, 27 Mar 2023 06:40: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 4PlNV32N3Hz41F2; Mon, 27 Mar 2023 06:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679899211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mh7fLWG59nXCnmKWHJo5SwnN3i4BLJZm9BzGIpJCnvY=; b=VzvO1BtzyYddbdm9X10wnya0hIn6paEiXpMgNVPGTtkLz9ucZEBCWaEMvgDRcBlPRdejC5 98rYzdVk6jppj/Ya/41LTO5krIO9IuDxhrauq884AZfuYLdPlfW//TpvWuaqcW9htrcpEU O+I41Eb3zNJBIuywcyCrw0X2HG+dr+jijg9+gErjzFlAagItTi/wCesYEW8oIgwDZfr4hg pM4c55CvzQXdbIQZqDVuEa+CquSM5WcTRI/i1WnLSRBvZGvci9XbhyJJ2BSL4JkHF15oFS 3rq3XFRTR2ddava06LYCJIoiscPr6fOYUgxeb6PZ+ij/5VbPLHvgcgcvvQNVZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679899211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mh7fLWG59nXCnmKWHJo5SwnN3i4BLJZm9BzGIpJCnvY=; b=AYEu9mME0KuYgYrmvhaZ+cWL+NJpo0q9cc9UISAcJ3Atva6e2RIU+Hy4icSES9oXtEDa74 Nd4J5qY5N5Ey/dMSZ4AEYm3fdcD2TGWXKzoh+WYG0e0FSswWJounUlr5c3KPz15t6EkGpt 8UZG3RlPHnZynXoxv5xY+hKnnON1tA2po8F23gxpdt32gKhF7zXOKYRSUxYlCIfsbPd1Is wtvGpIYEjG6+Vu0qAJx9caH7tuDoOCoxUSP7FdkXr5iK9AW0WTzbPRQ5X/cE/ifl7z2p3n aMUYfSvZoF9WJvabJzRl7vMhoySN1HSd58sEOEpSTtyMNTaP+iLiOKUg9K9L6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679899211; a=rsa-sha256; cv=none; b=pdl0Xc3HCtY8UaM84o9azDFV+jU8VI/gezb5XrsBPu0yu8w0mHFQsNWys8nXz7BkxEusqy 5yywVCqD50iZnmaGYfo9BMPKCT+H6dzynHcfBo7CZRhVmmpFShG3Bgk0N+5SdCgRqeZuNo Vl2U7HpLAzjPW+bK+nxLpwZpNT5+2s0VvPFVScmDyAtSGwiH+o61CC4U6y2IUEzliBqJEA bK1jGV5wkWLVBN4QT67lVWrVpa02lZ80reE3aoYCnX03XJCbsJvXOat+RoNffIC8kmFZgk Kzrn1goQs6viHyoHh5ni1lt8rIHarivv7OnKSQDyjZ6mKncs0+hBCsTNsTvwFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlNV31QZtz1BGS; Mon, 27 Mar 2023 06:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R6eBrm086573; Mon, 27 Mar 2023 06:40:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R6eBYb086570; Mon, 27 Mar 2023 06:40:11 GMT (envelope-from git) Date: Mon, 27 Mar 2023 06:40:11 GMT Message-Id: <202303270640.32R6eBYb086570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 6dace6a5cc84 - stable/13 - vmm: fix missing ipi statistic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 6dace6a5cc84644668a66d58502b779243a666f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=6dace6a5cc84644668a66d58502b779243a666f0 commit 6dace6a5cc84644668a66d58502b779243a666f0 Author: Vitaliy Gusev AuthorDate: 2023-03-17 09:17:22 +0000 Commit: Corvin Köhne CommitDate: 2023-03-27 06:33:00 +0000 vmm: fix missing ipi statistic ipi counters are missing in bhyvectl's output because vm_maxcpu is 0 when initializing them. That's because vmm_stat_register is executed before vmm_init. Instead of directly fixing it, there's a better solution in illumos which is cherry picked: https://github.com/illumos/illumos-gate/commit/65a3bc83734e5fb0fc2c19df3e5112b87dcdc3f8 It replaces the matrix statistic by two counters per vcpu. One for counting the ipis to the vcpu and one counting the ipis received by the vcpu. This has several advantages: - A matrix statistic becomes huge when using many vcpus. - A matrix statistic easily reaches the MAX_VMM_STAT_ELEMS limit. - Two counters are enough in most cases. DTrace can be used for more advanced debugging purposes. - A matrix statistic wastes memory. The matrix size is determined by vm_maxcpu regardless of the number of vcpus assigned to the vm. Reviewed by: corvink, markj Fixes: ee98f99d7a68b284a669fefb969cbfc31df2d0ab ("vmm: Convert VM_MAXCPU into a loader tunable hw.vmm.maxcpu.") MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D39038 (cherry picked from commit 94a3876d7e18ada9596464623829d37d186da856) --- sys/amd64/vmm/io/vlapic.c | 9 ++++++--- sys/amd64/vmm/vmm_stat.c | 3 --- sys/amd64/vmm/vmm_stat.h | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c index 884e232b1422..2144cbabd979 100644 --- a/sys/amd64/vmm/io/vlapic.c +++ b/sys/amd64/vmm/io/vlapic.c @@ -905,7 +905,8 @@ vlapic_calcdest(struct vm *vm, cpuset_t *dmask, uint32_t dest, bool phys, } } -static VMM_STAT_ARRAY(IPIS_SENT, VMM_STAT_NELEMS_VCPU, "ipis sent to vcpu"); +static VMM_STAT(VLAPIC_IPI_SEND, "ipis sent from vcpu"); +static VMM_STAT(VLAPIC_IPI_RECV, "ipis received by vcpu"); static void vlapic_set_tpr(struct vlapic *vlapic, uint8_t val) @@ -1102,7 +1103,8 @@ vlapic_icrlo_write_handler(struct vlapic *vlapic, bool *retu) CPU_FOREACH_ISSET(i, &dmask) { vcpu = vm_vcpu(vlapic->vm, i); lapic_intr_edge(vcpu, vec); - vmm_stat_array_incr(vlapic->vcpu, IPIS_SENT, i, 1); + vmm_stat_incr(vlapic->vcpu, VLAPIC_IPI_SEND, 1); + vmm_stat_incr(vcpu, VLAPIC_IPI_RECV, 1); VLAPIC_CTR2(vlapic, "vlapic sending ipi %d to vcpuid %d", vec, i); } @@ -1223,7 +1225,8 @@ vlapic_self_ipi_handler(struct vlapic *vlapic, uint64_t val) vec = val & 0xff; lapic_intr_edge(vlapic->vcpu, vec); - vmm_stat_array_incr(vlapic->vcpu, IPIS_SENT, vlapic->vcpuid, 1); + vmm_stat_incr(vlapic->vcpu, VLAPIC_IPI_SEND, 1); + vmm_stat_incr(vlapic->vcpu, VLAPIC_IPI_RECV, 1); VLAPIC_CTR1(vlapic, "vlapic self-ipi %d", vec); } diff --git a/sys/amd64/vmm/vmm_stat.c b/sys/amd64/vmm/vmm_stat.c index 2750982185aa..2df4423bc60f 100644 --- a/sys/amd64/vmm/vmm_stat.c +++ b/sys/amd64/vmm/vmm_stat.c @@ -70,9 +70,6 @@ vmm_stat_register(void *arg) if (vst->scope == VMM_STAT_SCOPE_AMD && !vmm_is_svm()) return; - if (vst->nelems == VMM_STAT_NELEMS_VCPU) - vst->nelems = vm_maxcpu; - if (vst_num_elems + vst->nelems >= MAX_VMM_STAT_ELEMS) { printf("Cannot accommodate vmm stat type \"%s\"!\n", vst->desc); return; diff --git a/sys/amd64/vmm/vmm_stat.h b/sys/amd64/vmm/vmm_stat.h index 050d3c13dda1..e40a960ec82a 100644 --- a/sys/amd64/vmm/vmm_stat.h +++ b/sys/amd64/vmm/vmm_stat.h @@ -58,8 +58,6 @@ struct vmm_stat_type { void vmm_stat_register(void *arg); -#define VMM_STAT_NELEMS_VCPU (-1) - #define VMM_STAT_FDEFINE(type, nelems, desc, func, scope) \ struct vmm_stat_type type[1] = { \ { -1, nelems, desc, func, scope } \ From nobody Mon Mar 27 06:45: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 4PlNcg0cQCz41qjZ; Mon, 27 Mar 2023 06:45: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 4PlNcf6SNgz42K3; Mon, 27 Mar 2023 06:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679899554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zq4gOvHHuwNzD2p/vyNSm+N15+dBYAiuQpmVR9Jz1tk=; b=KVKSFFVwrQpA9flQtHTjU+So0EtVzDGYyirCW97E+4gcFADRXTrGk7tYhXcnil6nVAHs3m Pjawrh0ZInulszoCoWJIRBaXu8W5C0xuROkXJ9jGU3AHTAgo2qb4ghoQOTBHv9rSD54lWm RzmcWmlUNGLHENlKMca43VZnqhO3ZbVtGnGKbk/8CncycBwJ+5yUsolXQl0W8DSvsJ/utN gaeHJVSgFOC3LfjYxPIIrz9/Zqu2afOsU51BJtdY46VuNDb87/0U2ZAXSSNjiN3NbhrsAR Z3rF1tHXimGNM0ONZiB2SiWgSvktKD8tmYgW0nxIqeiV6juqZkK6wzeCEso0vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679899554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zq4gOvHHuwNzD2p/vyNSm+N15+dBYAiuQpmVR9Jz1tk=; b=xQUjL0ZZLyeVgGVuzFpPbAsBArfnXabB0rlAfpJ6r43yVCDtyFfLYHqkYfrMXXHpKsyU/h y3Tr5HxBxnORdJd2G01h7reD774sm8AOoO5t9mpra10x2DWx1TScMGsxtS1AWuMl9sZO6i 4c34mCzjHJRjQaBdfxryrB3RugaQStgu5IzZdRIit4AcjFf95zvNel7yIhR/2jNhb7i839 6pnt2cyAk5eB7NeZXQVpENC/30Q/tRcCCXvyBawWlWdB/c24QjVjr8yuLU3f/vSf/Is6/n t2hLRsimPeJ5KqRhvtDLdVFx5u9HmiKjWUKblMefCz5pQ7KB68BJPqoQXk3USg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679899554; a=rsa-sha256; cv=none; b=h6AHwXSKsnz7mVijzZKmGmRj4qxdt0yOv6B27fPmgcbXOhIBg/v81A+EM8Hv+AJINMelOx VWzwhERYRIOjQKPMqR7mhhQUwQHZeOnnXcFeXi8ylJvoz6RIph913LmsJJvbxd6naPhB4+ hGm6JvZfpu7Hrir7WQIEI7bZ9Cuv8Ju2f7SWFdE0jyYv77twfkdCDXE4aiH+8P1VjQdZIh rkYIE3F+kTNzB4D2tZCcc6/K7F5wxSn4MTDYHBwrHA5eQNcVo0s52LFyoup1RhXSQLoCvD /f8AtD+pktKUDGdW8CYjuSBVgbIFAbDVazKufg6h6ol3lb1U25AQklX5bmkrZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlNcf5Y9pz1BVs; Mon, 27 Mar 2023 06:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R6jsHI097454; Mon, 27 Mar 2023 06:45:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R6jsNU097453; Mon, 27 Mar 2023 06:45:54 GMT (envelope-from git) Date: Mon, 27 Mar 2023 06:45:54 GMT Message-Id: <202303270645.32R6jsNU097453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 107597fbd4dc - main - rarpd(8): Fix a typo in a source code 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 107597fbd4dcd6d0a6ec09913642af151635b77a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=107597fbd4dcd6d0a6ec09913642af151635b77a commit 107597fbd4dcd6d0a6ec09913642af151635b77a Author: Gordon Bergling AuthorDate: 2023-03-27 06:45:30 +0000 Commit: Gordon Bergling CommitDate: 2023-03-27 06:45:30 +0000 rarpd(8): Fix a typo in a source code comment - s/combinataion/combination/ Obtained from: NetBSD MFC after: 3 days --- usr.sbin/rarpd/rarpd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index 441164dd2bd2..29781be817f9 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -692,7 +692,7 @@ rarp_process(struct if_info *ii, u_char *pkt, u_int len) } /* - * Poke the kernel arp tables with the ethernet/ip address combinataion + * Poke the kernel arp tables with the ethernet/ip address combination * given. When processing a reply, we must do this so that the booting * host (i.e. the guy running rarpd), won't try to ARP for the hardware * address of the guy being booted (he cannot answer the ARP). From nobody Mon Mar 27 08:11: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 4PlQWb4dLgz41wYB; Mon, 27 Mar 2023 08:11: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 4PlQWb4CSDz483D; Mon, 27 Mar 2023 08:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3zKcaKbcXagYHYaJWnVOxhI4GF6Veazg3tkc2yHtwZg=; b=OLJHva+lvafZV/eFqrMRsuMMno8ecWM9tUFQiHYMMSGfK78QZOz2sST0GGR+rmMvuuhx3c 0ojiCFlFYmn6mBnVCAoGa9398oh7zJMI2w1QWZmbAv+0c+wPifTneFLIF9oaCPHojOQNQu 8ptQBHDTb3lwRFVPHZPmk+rw566j+RB+T9MYrATIvSklvlE+jeBtr/uyWEIR+AWM9Qzl/h GYPY/QNH2HwtCB/YLsyP1DKefMSeAYegoAG8zWKF+xwzE5JDDk7tWT3Z4z7S4LwOHnlLgs a4sKEyGAgIKFQuU7Gt/tYyDb2Nd5gK+1Gs7AX+OOYcuHr9SsqO6BmRfDz3LYiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3zKcaKbcXagYHYaJWnVOxhI4GF6Veazg3tkc2yHtwZg=; b=YzS8vI2J5NApAZaSnZ3mNp/L53jm1c9Q7s7kB/Nsgk3mk+czzIv0VuVH8nRB4jh3Cg9g6H ZxzMnU4Y2YSKl6VlJLyz2jI5Yi63Q43a0hmCFoXMmGNvi3B/fuOf9TMjbGh9LWyl3emQrt hSXS/Wx7vAV1ZyBi/VjLTLFck27pq2boNaCgNljnlACueIxgEdaJj8Ti/ENpFUnshIOTnX 1zCyg3WCit4BRS2UXmM2OMgWg4Vjin4Bi7jkASYJE5ZKjBUhkE56zCEg6Rb7bVW/dA0bpx Qozb+wSA4ZiKw7vYz/VSPrRqyg9ErVh+sRamDkiPit+w0QOGk/YP422GaI6L/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679904699; a=rsa-sha256; cv=none; b=P03desDXwzDxud9KKozuSroZFg6KmDaDzXYwaRmZZ6T6PEb/DgjeFNVkvGNwtqQIZpeNGr EQW572lxrAqxhNDkktx2efJ+SkjycNnNVyI6bK4Kh98X7fw7XseVrWyJP/cwSdga86UAx4 iMT1KYA1PW3w0OyYaYX5zyotiAHkGT/NKNbH0vreHceSLEuI/fOyFhLuCDidiJzkGS6rrA 14LhqpEVn5P6lDy1bKIoAsvKexS1Q8aTdp9iTrEEJl8Twc/sQw8wa7wUHDBdc0LtLNqWM5 VmQuLQ0HPOglSmF+aeElTm1W8MbCtP1Y3lKQE570s4BKGk7BC6grm1CbxCxscQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlQWb3GFxzF2m; Mon, 27 Mar 2023 08:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R8Bdiw043721; Mon, 27 Mar 2023 08:11:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R8Bd4B043720; Mon, 27 Mar 2023 08:11:39 GMT (envelope-from git) Date: Mon, 27 Mar 2023 08:11:39 GMT Message-Id: <202303270811.32R8Bd4B043720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: ffaed739a803 - main - bhyve: add helper to read PCI IDs from bhyve config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: ffaed739a80319a56d0b1dfd6cedeb3d194ff42c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=ffaed739a80319a56d0b1dfd6cedeb3d194ff42c commit ffaed739a80319a56d0b1dfd6cedeb3d194ff42c Author: Corvin Köhne AuthorDate: 2023-02-06 10:43:49 +0000 Commit: Corvin Köhne CommitDate: 2023-03-27 08:10:24 +0000 bhyve: add helper to read PCI IDs from bhyve config Changing the PCI IDs is valuable in some situations. The Intel GOP driver requires that some PCI IDs of the LPC bridge are aligned with the physical values of the host LPC bridge. Another use case are oracles virtio driver. They require different subvendor ID than the default one. For that reason, create a helper which makes it easy to read PCI IDs from bhyve config. Additionally, this helper ensures that all emulation devices are using the same config keys. Reviewed by: jhb MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38402 --- usr.sbin/bhyve/pci_emul.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/pci_emul.h | 3 +++ 2 files changed, 47 insertions(+) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 48d80a63ea51..d94b419ca622 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include "pci_emul.h" #include "pci_irq.h" #include "pci_lpc.h" +#include "pci_passthru.h" #define CONF1_ADDR_PORT 0x0cf8 #define CONF1_DATA_PORT 0x0cfc @@ -332,6 +333,49 @@ pci_print_supported_devices(void) } } +uint32_t +pci_config_read_reg(const struct pcisel *const host_sel, nvlist_t *nvl, + const uint32_t reg, const uint8_t size, const uint32_t def) +{ + const char *config; + const nvlist_t *pci_regs; + + assert(size == 1 || size == 2 || size == 4); + + pci_regs = find_relative_config_node(nvl, "pcireg"); + if (pci_regs == NULL) { + return def; + } + + switch (reg) { + case PCIR_DEVICE: + config = get_config_value_node(pci_regs, "device"); + break; + case PCIR_VENDOR: + config = get_config_value_node(pci_regs, "vendor"); + break; + case PCIR_REVID: + config = get_config_value_node(pci_regs, "revid"); + break; + case PCIR_SUBVEND_0: + config = get_config_value_node(pci_regs, "subvendor"); + break; + case PCIR_SUBDEV_0: + config = get_config_value_node(pci_regs, "subdevice"); + break; + default: + return (-1); + } + + if (config == NULL) { + return def; + } else if (host_sel != NULL && strcmp(config, "host") == 0) { + return read_config(host_sel, reg, size); + } else { + return strtol(config, NULL, 16); + } +} + static int pci_valid_pba_offset(struct pci_devinst *pi, uint64_t offset) { diff --git a/usr.sbin/bhyve/pci_emul.h b/usr.sbin/bhyve/pci_emul.h index b54f3f15fbad..c623576b37c0 100644 --- a/usr.sbin/bhyve/pci_emul.h +++ b/usr.sbin/bhyve/pci_emul.h @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -227,6 +228,8 @@ typedef void (*pci_lintr_cb)(int b, int s, int pin, int pirq_pin, int init_pci(struct vmctx *ctx); void pci_callback(void); +uint32_t pci_config_read_reg(const struct pcisel *host_sel, nvlist_t *nvl, + uint32_t reg, uint8_t size, uint32_t def); 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, From nobody Mon Mar 27 08:11: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 4PlQWc5PsBz41wky; Mon, 27 Mar 2023 08:11: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 4PlQWc4vyvz483h; Mon, 27 Mar 2023 08:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c9RLwBF0aqNMbqSlHHtBvlweCt88IHEikfd/oKBFQOc=; b=mYpSW9M5rBMeeGUNEtVCvWIDYY1Z6CcwXOTyPdZexitO6WOFpSWVDofxs7azIkXUxVyy8B ZXs0SHUQaDSoq9rhZ5p9jFAUQ7HWrTayRcSrlmMIFa3kqQinJwjW0J3mwvlo9ugPSb2Kat xIaTgVzX8Dx3BeGV4zQwP+jgpjRcHCz+i6qD6L0JRqz8h9mAsT8JM7jEq78sxUTXEmWUnC rSZQnciNzwMid0CysHTm/8V99h4BJGbCgeaslZhOmBWPQ6QGWr1MCXkiizK4Lni/OtalGy VMOmexqbvAx1WICQEBmloPStSWM1dmotDpkfTU4zry/pi0xDJuUi3juRUvYm9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c9RLwBF0aqNMbqSlHHtBvlweCt88IHEikfd/oKBFQOc=; b=v+0Bu4EeLnKpGnBRvaQlzbHDAoS6l4O5mdLw5ks55GSL+RKmdKWNNVWDAmeW4XjvkQKiyi M6dOMjEueYexte53Bkkw2xlA4/fauxsbOwWvav8ruFiL12bUjhXrgKWwu4K0L6zE+K4err UsxWXJ/sf+O3IawHdz0gsDEwBlrNgn1vTBFmwfae4CQNfk6/EowQhU1Ka96g1ybNLyU8E5 JdjLUak6tlM5t85Heu009ouPlmFXd77hIewYtH636YFHfIAz0TWFsUdFTdBCn2gRoyoedc qtAzHNvyDkBy1l58j4Axtw2Dy4sM71oxi0SbmUecXnfWfdqtyx8FVKymGjEnaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679904700; a=rsa-sha256; cv=none; b=wvpkeCLtMONOQgfxgUd+T6+C6zbsVyl1HqbqUas5GL6q84Hu839Ee7VwCGiqegL689tSfZ 2qGxDtyxViUb/Fa+pjoexguhdnZoPr+OmZ76D2R7vcgo+RAMDQ0aXfNjo1JOirDJuITIp9 zPtjEn7ZNvTqV67lHR65MZKw83pwF8nWHk3Y81f7E1KSV0RN2TLYHrdkpdEDtBY1kbvT4X tyjx9O2z275lFx6SR07SqDIlVPHHLGRDSJsbscU3ncWbNcP96XfCoMQfdv8AqMMltwSUE0 zhtC5q12uqB+HjZnX36YtcyE1O3ZtHAGCYmSkhTcmnTxiQoyltPLl5NBcfu+pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlQWc3kTZzF5x; Mon, 27 Mar 2023 08:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R8Be7S043746; Mon, 27 Mar 2023 08:11:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R8Be9L043745; Mon, 27 Mar 2023 08:11:40 GMT (envelope-from git) Date: Mon, 27 Mar 2023 08:11:40 GMT Message-Id: <202303270811.32R8Be9L043745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: b72e06b13ee0 - main - bhyve: make use of helper to read PCI IDs from bhyve config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: b72e06b13ee08b94a3e74ac2473e889aeb7a3d1a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b72e06b13ee08b94a3e74ac2473e889aeb7a3d1a commit b72e06b13ee08b94a3e74ac2473e889aeb7a3d1a Author: Corvin Köhne AuthorDate: 2023-02-06 10:13:56 +0000 Commit: Corvin Köhne CommitDate: 2023-03-27 08:10:24 +0000 bhyve: make use of helper to read PCI IDs from bhyve config For compatibilty reasons, the old config values are still supported. Reviewed by: jhb MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38403 --- usr.sbin/bhyve/bhyve_config.5 | 11 +++++++---- usr.sbin/bhyve/pci_hostbridge.c | 17 +++++++++++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index 32658c11f9e2..ddfcae8c51d3 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -412,12 +412,15 @@ to use standard input and output of the process. .El .Ss Host Bridge Settings -.Bl -column "vendor" "integer" "Default" +.Bl -column "pcireg.*" "integer" "Default" .It Sy Name Ta Sy Format Ta Sy Default Ta Sy Description +.It Va pcireg.* Ta integer Ta Ta +Values of PCI register. +.Bl -column "device" "Default" +.It Sy Name Ta Sy Default .It Va vendor Ta integer Ta 0x1275 Ta -PCI vendor ID. -.It Va devid Ta integer Ta 0x1275 Ta -PCI device ID. +.It Va device Ta integer Ta 0x1275 Ta +.El .El .Ss AHCI Controller Settings AHCI controller devices contain zero or more ports each of which diff --git a/usr.sbin/bhyve/pci_hostbridge.c b/usr.sbin/bhyve/pci_hostbridge.c index f0878d97a77e..cbc61893961b 100644 --- a/usr.sbin/bhyve/pci_hostbridge.c +++ b/usr.sbin/bhyve/pci_hostbridge.c @@ -31,6 +31,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include "config.h" @@ -48,9 +49,13 @@ pci_hostbridge_init(struct pci_devinst *pi, nvlist_t *nvl) value = get_config_value_node(nvl, "vendor"); if (value != NULL) vendor = strtol(value, NULL, 0); + else + vendor = pci_config_read_reg(NULL, nvl, PCIR_VENDOR, 2, vendor); value = get_config_value_node(nvl, "devid"); if (value != NULL) device = strtol(value, NULL, 0); + else + device = pci_config_read_reg(NULL, nvl, PCIR_DEVICE, 2, device); /* config space */ pci_set_cfgdata16(pi, PCIR_VENDOR, vendor); @@ -67,8 +72,16 @@ pci_hostbridge_init(struct pci_devinst *pi, nvlist_t *nvl) static int pci_amd_hostbridge_legacy_config(nvlist_t *nvl, const char *opts __unused) { - set_config_value_node(nvl, "vendor", "0x1022"); /* AMD */ - set_config_value_node(nvl, "devid", "0x7432"); /* made up */ + nvlist_t *pci_regs; + + pci_regs = create_relative_config_node(nvl, "pcireg"); + if (pci_regs == NULL) { + warnx("amd_hostbridge: failed to create pciregs node"); + return (-1); + } + + set_config_value_node(pci_regs, "vendor", "0x1022"); /* AMD */ + set_config_value_node(pci_regs, "device", "0x7432"); /* made up */ return (0); } From nobody Mon Mar 27 08:11: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 4PlQWd61n7z41wmF; Mon, 27 Mar 2023 08:11: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 4PlQWd59MYz48kt; Mon, 27 Mar 2023 08:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RgvGEe1IG2g8XN7vFNscYUEPITZJ7uPKOkk+MclYOEs=; b=pQWjbI2NXXMJAPF2vNlKV/ibvnYYXMb9XuVSo8fDVH6AicZSIxlabDGs8h4gTjdaAR2T1N bLQr+N6xzAojPr5hHeARo3DvSoThRbSM/6qeZ55uTHhx/IVARtqNxsOA8Xo8K5HTk1lU7c Sfn5XNjuDrKsQNqin7ePIbJZyzSSw0cYSmcrqvd/GXEnDdNcJ7O0mjKl/8juF11WN6sTpt zMb3dQP92FYBf+AYDWT4neikA2f80ofaU5ePx3SSrr0JME95ZHpj+SwvFMAgVwcoMFvNn8 Hyb4s5S9VSVS8cGEulnOJWPwjJCGakOp8O08hTUG9kbPzDD2CwjRg8yonnYdrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RgvGEe1IG2g8XN7vFNscYUEPITZJ7uPKOkk+MclYOEs=; b=fhLZ/MER4kJqxDNO166i7RGYAMzt8lSqw7VcpjzslYzEjJBo+uHMTl6kg+JFwU3l5p2N3n l65d6RPkBdUV603tADo2r+vz97tipF7GEIPtrYqx2vsD2LPbZgNFGpjCWvl6PxpyHHvWW0 iK87KtrYJqcWXJraygNTBfwFN+rgPsDnMNq8BO1M5zb3PtQhnIEZVPMzrMx2FbKfz48+GH 1GuTEKcfL1PKWqG5YqDEGuS5cG3Je7RnU/mDeiEGPVy50t/3VlwuvtmR45bpuO2cIZCTAV SfzXY7npw0Hns+mvDWsgE0Kv+ED/prWZQTQ7WU7JlDHJ8m35c+NOyISsjqrArw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679904701; a=rsa-sha256; cv=none; b=fc71w2+vpD/NZ5F0BKY8Pk1C/CuzkEkhoNEeLtnbtEyxzka5rX0e3BTK8lUJ0qjXiffHK4 f5umEwSEQ+bKCq+xfXQ0a5Tzv8cda7OiUZClLCkykvybOr6AOG3EQ2jthHnDxFjGdUS3bV OLycgnYGcSHyOeckO1+Fus9sJYaMTNk6UgwcOkZFxg2kOyjFmi4iE2CojGkvLaiYYZMVMA l6SZwq09rJesgFH8zafX4UqFABm7h5a0jtjiSZONtuAdsJB1GA7PJ5blBJG0OurVjGdKs8 QDo475x1eE4oKggNZ+whxA35jGCIuf0WncKYqRNnopBZtVHDXssFX1FPbIc2kA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlQWd4GjvzF2q; Mon, 27 Mar 2023 08:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R8BfKI043770; Mon, 27 Mar 2023 08:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R8BfHW043769; Mon, 27 Mar 2023 08:11:41 GMT (envelope-from git) Date: Mon, 27 Mar 2023 08:11:41 GMT Message-Id: <202303270811.32R8BfHW043769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: f4ceaff56dda - main - bhyve: add config option to modify LPC IDs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: f4ceaff56ddaacc151df07d2d205a2d7fcb736a8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=f4ceaff56ddaacc151df07d2d205a2d7fcb736a8 commit f4ceaff56ddaacc151df07d2d205a2d7fcb736a8 Author: Corvin Köhne AuthorDate: 2021-11-23 12:14:41 +0000 Commit: Corvin Köhne CommitDate: 2023-03-27 08:10:24 +0000 bhyve: add config option to modify LPC IDs The Intel GOP driver checks the LPC IDs to detect the platform it's running on. The GOP driver only works on the platforms it's written for. Maybe other Intel driver have the same behaviour. For that reason, we should use the LPC IDs of the FreeBSD host for GPU passthrough to work properly. We don't know if setting different LPC IDs have any side effect. Therefore, don't use the host LPC IDs by default on Intel system. Give the user the opportunity to modify the LPC IDs. Reviewed by: jhb MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D28280 --- usr.sbin/bhyve/bhyve_config.5 | 14 +++++++++++++ usr.sbin/bhyve/pci_lpc.c | 46 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index ddfcae8c51d3..e9594d432563 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -542,6 +542,20 @@ for fwctl and for fwcfg. .It Va pc-testdev Ta bool Ta false Ta Enable the PC debug/test device. +.It Va pcir.* Ta integer Ta Ta +Values of PCI register. +It also accepts the value +.Ar host +to use the pci id of the host system. +This value is required for the Intel GOP driver to work properly. +.Bl -column "subvendor" "Default" +.It Sy Name Ta Sy Default +.It Va vendor Ta 0x8086 +.It Va device Ta 0x7000 +.It Va revid Ta 0 +.It Va subvendor Ta 0 +.It Va subdevice Ta 0 +.El .El .Ss NVMe Controller Settings Each NVMe controller supports a single storage device. diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c index ad47230c005e..3b42947369a2 100644 --- a/usr.sbin/bhyve/pci_lpc.c +++ b/usr.sbin/bhyve/pci_lpc.c @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include "pci_emul.h" #include "pci_irq.h" #include "pci_lpc.h" +#include "pci_passthru.h" #include "pctestdev.h" #include "uart_emul.h" @@ -448,10 +449,35 @@ pci_lpc_read(struct pci_devinst *pi __unused, int baridx __unused, #define LPC_DEV 0x7000 #define LPC_VENDOR 0x8086 +#define LPC_REVID 0x00 +#define LPC_SUBVEND_0 0x0000 +#define LPC_SUBDEV_0 0x0000 static int -pci_lpc_init(struct pci_devinst *pi, nvlist_t *nvl __unused) +pci_lpc_get_sel(struct pcisel *const sel) { + assert(sel != NULL); + + memset(sel, 0, sizeof(*sel)); + + for (uint8_t slot = 0; slot <= PCI_SLOTMAX; ++slot) { + sel->pc_dev = slot; + if ((read_config(sel, PCIR_CLASS, 1) == PCIC_BRIDGE) && + (read_config(sel, PCIR_SUBCLASS, 1) == PCIS_BRIDGE_ISA)) { + return (0); + } + } + + return (-1); +} + +static int +pci_lpc_init(struct pci_devinst *pi, nvlist_t *nvl) +{ + struct pcisel sel = { 0 }; + uint16_t device, subdevice, subvendor, vendor; + uint8_t revid; + /* * Do not allow more than one LPC bridge to be configured. */ @@ -473,11 +499,25 @@ pci_lpc_init(struct pci_devinst *pi, nvlist_t *nvl __unused) if (lpc_init(pi->pi_vmctx) != 0) return (-1); + if (pci_lpc_get_sel(&sel) != 0) + return (-1); + + vendor = pci_config_read_reg(&sel, nvl, PCIR_VENDOR, 2, LPC_VENDOR); + device = pci_config_read_reg(&sel, nvl, PCIR_DEVICE, 2, LPC_DEV); + revid = pci_config_read_reg(&sel, nvl, PCIR_REVID, 1, LPC_REVID); + subvendor = pci_config_read_reg(&sel, nvl, PCIR_SUBVEND_0, 2, + LPC_SUBVEND_0); + subdevice = pci_config_read_reg(&sel, nvl, PCIR_SUBDEV_0, 2, + LPC_SUBDEV_0); + /* initialize config space */ - pci_set_cfgdata16(pi, PCIR_DEVICE, LPC_DEV); - pci_set_cfgdata16(pi, PCIR_VENDOR, LPC_VENDOR); + pci_set_cfgdata16(pi, PCIR_VENDOR, vendor); + pci_set_cfgdata16(pi, PCIR_DEVICE, device); pci_set_cfgdata8(pi, PCIR_CLASS, PCIC_BRIDGE); pci_set_cfgdata8(pi, PCIR_SUBCLASS, PCIS_BRIDGE_ISA); + pci_set_cfgdata8(pi, PCIR_REVID, revid); + pci_set_cfgdata16(pi, PCIR_SUBVEND_0, subvendor); + pci_set_cfgdata16(pi, PCIR_SUBDEV_0, subdevice); lpc_bridge = pi; From nobody Mon Mar 27 08:16: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 4PlQdK0KClz41wlP; Mon, 27 Mar 2023 08:16: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 4PlQdJ6jSCz4BHL; Mon, 27 Mar 2023 08:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wd8OIQuRX7OJSQzkkERq7BeYv52h+jONZfF2ny27Uog=; b=oEs545sC+CWoeDVaG08d3qVbIGdU/Eh+bqSLwvpAISzbJs671ClkROPUPWHeQAMLS007G+ i0ix+1oF8eJcl7Rz86fdUMJndyG0iNImhC40xw05m1G/elcWJa/fDB/+zcs2RKHlfDgdMW GjutA6/Jytb9qpNRwSNhL1L2LDBk28W8eOm7OEvkDqUZ5qEByLwTF6vHIdMSIahSUROMp6 5paqt+Uoef6M3UCAyrIs3gi9A3HDyP1hkeJeDLcmSLcD6NMPC6FGmkKKMFV+TQud00I+jh DIy4LR0wG1jPy/XkMC8U3Dmuo496v0BijvIeaMDXckCbPrG9xnaATuYiH0Ztng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wd8OIQuRX7OJSQzkkERq7BeYv52h+jONZfF2ny27Uog=; b=oBjPwW/ET+j8hd7srEv9xmG5bPpcwX+dXwjZCXjQrUzXe9TJzHOxU1z8oQ3s/o4ubXnxdS fSXtwLjMnhzs6uZi3hixPeWxVErDJz26sPLpJB2+IkWi55WQMoenSf87pHDMa/DLJAYDzQ mlj9FiujOSNZnFYzdJl3rmT/fLT14DyVckd3XIwKUadNfEE0OcDo0pAzFafz2hdQmFgEdU tsz1GU5pACuo2JGUmKwVkDvFbtv4OV6blZFd3WCT9vGkTmbPjqSW75vcGvxev3U9M8TshU agCpDZhrzniyA8cmLPkRorvFqKCvonksxa4xMfyoANQPveEs/sW/tcl7qzcLyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679904996; a=rsa-sha256; cv=none; b=N7bQG+aSjXfeugw53PGMUscqiTX5nbh/KI7naw7RAr7zXbV1JPmaay5KsXnlOFeIlpk71y jQGt/c5vUeQ2+oZxmMgYGUiK19WULA32o1XbWV9MZ9xKbUWkn7zEbTawljGli0V52vTKSh UP5gr4+aHLRgrYZtSi1GYAtj1OfzakM9NqNXK06wFRN/pap0cv/2HMpEzbopImO1nvw5PW LbuSj7mwDBUYO4GQhaAC+RUzkE/PXJvA58nGnOLGi81du6yfTibzft8qFHEwwVsVFQ4jfN cD6bIMRYl3ATxjK+N2AOfsT8H8qDoLJdH/Pi+dK+dgznEucEmqu2tX5TyMtMfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlQdJ5kZVzFNW; Mon, 27 Mar 2023 08:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R8Gaic045539; Mon, 27 Mar 2023 08:16:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R8GaRs045538; Mon, 27 Mar 2023 08:16:36 GMT (envelope-from git) Date: Mon, 27 Mar 2023 08:16:36 GMT Message-Id: <202303270816.32R8GaRs045538@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: 44af4103e422 - stable/13 - pfsync: fix pfsync_undefer_state() locking List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 44af4103e422029026e9bb1a5784550365831cf3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=44af4103e422029026e9bb1a5784550365831cf3 commit 44af4103e422029026e9bb1a5784550365831cf3 Author: Kristof Provost AuthorDate: 2023-03-20 13:29:55 +0000 Commit: Kristof Provost CommitDate: 2023-03-27 08:16:03 +0000 pfsync: fix pfsync_undefer_state() locking pfsync_undefer_state() takes the bucket lock, but could get called from places (e.g. from pfsync_update_state() or pfsync_delete_state()) where we already held the lock. As it can also be called from places where we don't yet hold the lock create new locked variant for use when the lock is already held. Keep using pfsync_undefer_state() where the lock must still be taken. PR: 268246 MFC after: 1 week Sponsored by: Rubicon Communications, LLC (Netgate) (cherry picked from commit 53247cdf12449e90f6736ae563e4cce8315c923f) --- sys/netpfil/pf/if_pfsync.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 610252a9fdf3..3b3d263fcf8b 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -296,6 +296,7 @@ static int pfsyncioctl(struct ifnet *, u_long, caddr_t); static int pfsync_defer(struct pf_kstate *, struct mbuf *); static void pfsync_undefer(struct pfsync_deferral *, int); +static void pfsync_undefer_state_locked(struct pf_kstate *, int); static void pfsync_undefer_state(struct pf_kstate *, int); static void pfsync_defer_tmo(void *); @@ -1851,28 +1852,37 @@ pfsync_defer_tmo(void *arg) } static void -pfsync_undefer_state(struct pf_kstate *st, int drop) +pfsync_undefer_state_locked(struct pf_kstate *st, int drop) { struct pfsync_softc *sc = V_pfsyncif; struct pfsync_deferral *pd; struct pfsync_bucket *b = pfsync_get_bucket(sc, st); - PFSYNC_BUCKET_LOCK(b); + PFSYNC_BUCKET_LOCK_ASSERT(b); TAILQ_FOREACH(pd, &b->b_deferrals, pd_entry) { if (pd->pd_st == st) { if (callout_stop(&pd->pd_tmo) > 0) pfsync_undefer(pd, drop); - PFSYNC_BUCKET_UNLOCK(b); return; } } - PFSYNC_BUCKET_UNLOCK(b); panic("%s: unable to find deferred state", __func__); } +static void +pfsync_undefer_state(struct pf_kstate *st, int drop) +{ + struct pfsync_softc *sc = V_pfsyncif; + struct pfsync_bucket *b = pfsync_get_bucket(sc, st); + + PFSYNC_BUCKET_LOCK(b); + pfsync_undefer_state_locked(st, drop); + PFSYNC_BUCKET_UNLOCK(b); +} + static struct pfsync_bucket* pfsync_get_bucket(struct pfsync_softc *sc, struct pf_kstate *st) { @@ -1891,7 +1901,7 @@ pfsync_update_state(struct pf_kstate *st) PFSYNC_BUCKET_LOCK(b); if (st->state_flags & PFSTATE_ACK) - pfsync_undefer_state(st, 0); + pfsync_undefer_state_locked(st, 0); if (st->state_flags & PFSTATE_NOSYNC) { if (st->sync_state != PFSYNC_S_NONE) pfsync_q_del(st, true, b); @@ -2034,7 +2044,7 @@ pfsync_delete_state(struct pf_kstate *st) PFSYNC_BUCKET_LOCK(b); if (st->state_flags & PFSTATE_ACK) - pfsync_undefer_state(st, 1); + pfsync_undefer_state_locked(st, 1); if (st->state_flags & PFSTATE_NOSYNC) { if (st->sync_state != PFSYNC_S_NONE) pfsync_q_del(st, true, b); From nobody Mon Mar 27 08:16: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 4PlQdK2zw5z41x3V; Mon, 27 Mar 2023 08:16: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 4PlQdK2YJ1z4BP6; Mon, 27 Mar 2023 08:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xJVCkcJjLOmf4ouqTdrtl8sksNUPK0jxUuoyz8tCvYk=; b=NC04yzTTm0KRhpbhTZfE5GR05XjNU9FIhfLU+sLhAXSsoc5KCpP/Achp+WvL3cIpcsoby7 KKMxPpzu3tizDHPKydhIHlJaMKk1HYa09HAPU7D1Y+r0HAbCRhZ7mUaUXYj9y7iztBJWl2 jZb8yxCl04GVJ17QM0eTRlFQ9QVwGgHZRIE//AJ4re0yaT5RdIFXe0nQ91GHZlROiJ48hk V5lzF8O/1b0Vy4k/g8NAQ7Y7udn/xbUyg7oIruxQpkfyYjWPAzi24c3ThrCYGsOo4VaBfP 8+3liGumGn0pAZvViKe+O6A4MgRRkAIAULvE9XBI60QHzF/uQRu0vGmtKKykLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xJVCkcJjLOmf4ouqTdrtl8sksNUPK0jxUuoyz8tCvYk=; b=WNiIPqdaXQ1yHepx6uQ3t00d7MulA7XFb0C+KILNtsNHuIUif0FHP5U41ZChc6LxbCffAB IAqjEQ+95hjTnifm+H7yIy9zGtdXtDUq/4jM6g1FAm+p7hcXF49uEcY51piTiLp0bYI42p s6H5c0W5l0jWQ/eW28P/A4dHKql/Y09FtjOnkghzK8jc0Vua5PxCSdxFExkdwkxw5A9eCy MlhaMFdnTbJ3bdzFFpfn2KAF3wK/2kUlMmd8xl6YKdE+9REn9WLyP2++4WGrmmcrW6NEdS RFLysOUTv6qRhTi7ZXdKaiMEl5uqhAdHQ+AXN3X5ZqQp0mjt5kh7Ikt5LBhobg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679904997; a=rsa-sha256; cv=none; b=B3Np5RQFgAX4G9eAy+g8XPVJcrGHHf+GPyMQMT4DYYSZS0R9e4gmFtV9zUw7je4TVUOpnV oXMlEQiCvcMgYfbwEmUEUo6Ss+1nJEwsslpgXPLJPtrtq0sJh6kn832opVO2amT1Rwaxj5 cTh8I8zhnOA2IbBvRFHtfffNi1VsrMy1daL08gwJXiWtNH9dkJM2RxXWx5Ap/7ddr/326Z V9uh3ikrJyKoaK5+WPN8YiDQhJQz/FObj6zzFLqXArt5Uu6YX4aJ2a9l/9jDxshdr+Pmlj gHchqy25YU+ZF8UYqlJ1Ys8SJ6BLXZQcZxtSv+R6RfM9MtPsf6Zqw9qROd8usA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlQdK1d2lzF3Q; Mon, 27 Mar 2023 08:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R8GbZC045619; Mon, 27 Mar 2023 08:16:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R8GbFZ045618; Mon, 27 Mar 2023 08:16:37 GMT (envelope-from git) Date: Mon, 27 Mar 2023 08:16:37 GMT Message-Id: <202303270816.32R8GbFZ045618@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: 09b7cab88f65 - stable/12 - pfsync: fix pfsync_undefer_state() locking List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/12 X-Git-Reftype: branch X-Git-Commit: 09b7cab88f652e3a3682749e38c043d25dd7d0ed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=09b7cab88f652e3a3682749e38c043d25dd7d0ed commit 09b7cab88f652e3a3682749e38c043d25dd7d0ed Author: Kristof Provost AuthorDate: 2023-03-20 13:29:55 +0000 Commit: Kristof Provost CommitDate: 2023-03-27 00:28:32 +0000 pfsync: fix pfsync_undefer_state() locking pfsync_undefer_state() takes the bucket lock, but could get called from places (e.g. from pfsync_update_state() or pfsync_delete_state()) where we already held the lock. As it can also be called from places where we don't yet hold the lock create new locked variant for use when the lock is already held. Keep using pfsync_undefer_state() where the lock must still be taken. PR: 268246 MFC after: 1 week Sponsored by: Rubicon Communications, LLC (Netgate) (cherry picked from commit 53247cdf12449e90f6736ae563e4cce8315c923f) --- sys/netpfil/pf/if_pfsync.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 8d90f76a3faa..6a67b8fe3d80 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -295,6 +295,7 @@ static int pfsyncioctl(struct ifnet *, u_long, caddr_t); static int pfsync_defer(struct pf_kstate *, struct mbuf *); static void pfsync_undefer(struct pfsync_deferral *, int); +static void pfsync_undefer_state_locked(struct pf_kstate *, int); static void pfsync_undefer_state(struct pf_kstate *, int); static void pfsync_defer_tmo(void *); @@ -1850,28 +1851,37 @@ pfsync_defer_tmo(void *arg) } static void -pfsync_undefer_state(struct pf_kstate *st, int drop) +pfsync_undefer_state_locked(struct pf_kstate *st, int drop) { struct pfsync_softc *sc = V_pfsyncif; struct pfsync_deferral *pd; struct pfsync_bucket *b = pfsync_get_bucket(sc, st); - PFSYNC_BUCKET_LOCK(b); + PFSYNC_BUCKET_LOCK_ASSERT(b); TAILQ_FOREACH(pd, &b->b_deferrals, pd_entry) { if (pd->pd_st == st) { if (callout_stop(&pd->pd_tmo) > 0) pfsync_undefer(pd, drop); - PFSYNC_BUCKET_UNLOCK(b); return; } } - PFSYNC_BUCKET_UNLOCK(b); panic("%s: unable to find deferred state", __func__); } +static void +pfsync_undefer_state(struct pf_kstate *st, int drop) +{ + struct pfsync_softc *sc = V_pfsyncif; + struct pfsync_bucket *b = pfsync_get_bucket(sc, st); + + PFSYNC_BUCKET_LOCK(b); + pfsync_undefer_state_locked(st, drop); + PFSYNC_BUCKET_UNLOCK(b); +} + static struct pfsync_bucket* pfsync_get_bucket(struct pfsync_softc *sc, struct pf_kstate *st) { @@ -1890,7 +1900,7 @@ pfsync_update_state(struct pf_kstate *st) PFSYNC_BUCKET_LOCK(b); if (st->state_flags & PFSTATE_ACK) - pfsync_undefer_state(st, 0); + pfsync_undefer_state_locked(st, 0); if (st->state_flags & PFSTATE_NOSYNC) { if (st->sync_state != PFSYNC_S_NONE) pfsync_q_del(st, true, b); @@ -2033,7 +2043,7 @@ pfsync_delete_state(struct pf_kstate *st) PFSYNC_BUCKET_LOCK(b); if (st->state_flags & PFSTATE_ACK) - pfsync_undefer_state(st, 1); + pfsync_undefer_state_locked(st, 1); if (st->state_flags & PFSTATE_NOSYNC) { if (st->sync_state != PFSYNC_S_NONE) pfsync_q_del(st, true, b); From nobody Mon Mar 27 08:16: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 4PlQdL15mrz41x3W; Mon, 27 Mar 2023 08:16: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 4PlQdL0NnPz4BLB; Mon, 27 Mar 2023 08:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HD9U6glx42uODfaNXWWT4CVJt7WQHkvzQl0WC+dKwl8=; b=hXzplmuBUSRp3JBoa5eHUYRDUsRxF9J0Rzbl2n4wuQcbiSZUAaBU9RyjlzG/AsvnfR2FcZ 2U5aeABXqfWPjMk1aMamaBhmJ+qA/Er0jcIw5cAt00/v/0AzlbHgPXFtV3naSY8dUTFwMJ 45+vtpqLQNQe5WQAsxHDxIAqWnmPcaR2d8lCsifCxQ+bwKP5oNlMZgZSzOpVjgc6OxhrCU DQuOlKJFCfOihXvWWRVdd3QbYn2YjZrXzNqkotnTdQAF+Cqh0++lx7P4fi12xcB4PdUlpy CCUGQfGwifAr82OPwDutqfck+ilF7jhJsxgAeiPC0BEd4z/tgkwfK6FtFSq7KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HD9U6glx42uODfaNXWWT4CVJt7WQHkvzQl0WC+dKwl8=; b=bIiORJxVmz1PrL/aF0CzHnNh7NLTsFgJb+eyJ35A+4VQ8GXNP+A+okXaYFoo8yiFGrsX6i agGvQfWPgtqmr6jhreRYFowGBxYdZHNFQ0F1EPuK1E+2JwExhu4FRPkTm5u+7cxWzgTHr4 lNtUvYrDCz9bxAYMOuKLPj1T4Ou5P1XhViqe6tIct94hNw4AljL4OzDSYije9qLJZzCUpC htdIscuuk8WjwoBDSUlZuJe46iGqlCzmuZDEeXaXmcNn8hH2rN65Q6ovUmCAAHWNfADBmM /ig1nq1LhkwVY5ARg9dXnfVdEHRIgJ4Mns52Anj2cw0ZX3hMUvKK7MioVJB0ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679904998; a=rsa-sha256; cv=none; b=X7IDz1VyP/wtXwJ+OmUhxqO93g9ri4wBdlntKgYhmHdmJVW3FmenZaXadTJgkK6nhJBzqU tkDFHWt+smFq//oxGV37QDA2K6ebydOwU75cAa39UVVXLd6qo5IZJU1oB4GvlJDpvzkUAi vXwmHgUIkEsTgonHuL8v6HxBi95NVOuG/gYs/d3nb3rgKD/KRocmDiPyp0v4t4u0aQYiw0 zOC8qR+GT8CJM5Iw5UR1ihel9yKeevj82vF5AL/dtwSyQoWPz+JyGGzl9oQ07djja4lNFg H9MZpXqaSKl47SLg7A4P8jFb5xDcfvbL55IoIwBC3DJxVdiAM8TCZF38z4OoFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlQdK6c5FzFQY; Mon, 27 Mar 2023 08:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R8Gbvo045638; Mon, 27 Mar 2023 08:16:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R8GbQk045637; Mon, 27 Mar 2023 08:16:37 GMT (envelope-from git) Date: Mon, 27 Mar 2023 08:16:37 GMT Message-Id: <202303270816.32R8GbQk045637@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: 3eb2341caaa3 - stable/13 - pfsync: add missing unlock in pfsync_defer_tmo() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 3eb2341caaa307a8d067333c8aebe3e269ade2fd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3eb2341caaa307a8d067333c8aebe3e269ade2fd commit 3eb2341caaa307a8d067333c8aebe3e269ade2fd Author: Kristof Provost AuthorDate: 2023-03-20 13:26:33 +0000 Commit: Kristof Provost CommitDate: 2023-03-27 08:16:03 +0000 pfsync: add missing unlock in pfsync_defer_tmo() The callout for pfsync_defer_tmo() is created with CALLOUT_RETURNUNLOCKED, because while the callout framework takes care of taking the lock we want to run a few operations outside of the lock, so we unlock ourselves. However, if `sc->sc_sync_if == NULL` we return without releasing the lock, and leak the lock, causing later deadlocks. Ensure we always release the bucket lock when we exit pfsync_defer_tmo() PR: 268246 MFC after: 1 week Sponsored by: Rubicon Communications, LLC (Netgate) (cherry picked from commit 844ad2828a35c434b893af4274b1f6c50332dd70) --- sys/netpfil/pf/if_pfsync.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 3b3d263fcf8b..0a8ece621006 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1830,8 +1830,10 @@ pfsync_defer_tmo(void *arg) PFSYNC_BUCKET_LOCK_ASSERT(b); - if (sc->sc_sync_if == NULL) + if (sc->sc_sync_if == NULL) { + PFSYNC_BUCKET_UNLOCK(b); return; + } NET_EPOCH_ENTER(et); CURVNET_SET(sc->sc_sync_if->if_vnet); From nobody Mon Mar 27 08:16: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 4PlQdL40zGz41x9Z; Mon, 27 Mar 2023 08:16: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 4PlQdL3Qhfz4Brt; Mon, 27 Mar 2023 08:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sA2sY7GsSaWealMpi5nDyGiohbzl5K1CZLzmDfmWslo=; b=nCVvqeLfbywNRxSNVUXa24V7JEZ28f6nY2xlp0EbAWE5Zp4/HP+TkNGbQDcyi8onyRiVFH MBuce7OVmO24nPcV3Ebaabl0VZMHfPMwyzSGACfm/rRcg4yk5dvJ63s8CRy5GiOTmt3jz7 xYxWuw1aD+bOKpCi+DRaqiyCZXyq/qoXjreJOUUWoWi90ne7jtpYTFlJ7HifJbKLLPTMVh i8ynzlPi1hP8xRQBDrKWbMUsGgLiZ5OGJRjQ2+k5tKL2DLVJw2mYRg6hRyLnfYh1VRQp/G BjTNcSvCZVhINTbJiUity3Uelhn6lSe3C/6XPUxE5GA28MFZlDkS4SYoJPmChA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sA2sY7GsSaWealMpi5nDyGiohbzl5K1CZLzmDfmWslo=; b=HY77UmdIccQpMFo4uUUU5FzOXyMRC3Y5EjSjQvZjOV+ZSIIaEbEJsPr8F4mLj3jS+MgbNz nUeSeFqxDbfFrGMqfsMph9+9zaiOa1aFDJeMXZRJNlX5ksNLKeqSOVhpEmtiHTsP0NwV4h S4kMcyTNBYyfh/IiQzf0h831YB4RpQppnNbHf0ASluEPT9ZvhnekswitjhD0huNYbrFCpG CFATd3bgAOwj0EtfqBF8W3Of6+STUSRzzoUD0Z+IravT2UGnwaSEK0KBIswZA9btFc69mE mvsnuoWbe++5U8KXO2d0FLXyyen1FDNmR+T1amdUqCmYm5TkUUm0ePniAayZ4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679904998; a=rsa-sha256; cv=none; b=CjFTRJ/kLKCodSEH2A/pHK7kBLxroAl721fmJn8JSf5VdRXpZauFMx4vyFUqA1o6y5/x1Y S6Q/px/47dbIaMjffUwN4U5avkHfhOwxkCEtsl74LGz0XKUMWilwqy2jUnT1t1Ed4niWwd AfjwTt8vxLDB9dhHEpKipT4YNNZeZRIDJCPy5gjKiSsUTo1Wg4rZuFGXGvmnarg0emJoft Cta05aY5lMM3gc0P+tX/C5XqzdI3aWvBOhV8FOgOQth38Tsxq4eR1225z3yGqrK4xBQH3M yGgiE9fvI8ARmRfM1RZEawH8luXHQ1QruAu4WekA2GNvOndT7yq0/kKLtofk1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlQdL2WyfzFQZ; Mon, 27 Mar 2023 08:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R8GcBY045657; Mon, 27 Mar 2023 08:16:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R8Gc26045656; Mon, 27 Mar 2023 08:16:38 GMT (envelope-from git) Date: Mon, 27 Mar 2023 08:16:38 GMT Message-Id: <202303270816.32R8Gc26045656@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: 1d6ece4351a0 - stable/12 - pfsync: add missing unlock in pfsync_defer_tmo() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/12 X-Git-Reftype: branch X-Git-Commit: 1d6ece4351a01179e3a5ebbdb3fa2e6053a2d7aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d6ece4351a01179e3a5ebbdb3fa2e6053a2d7aa commit 1d6ece4351a01179e3a5ebbdb3fa2e6053a2d7aa Author: Kristof Provost AuthorDate: 2023-03-20 13:26:33 +0000 Commit: Kristof Provost CommitDate: 2023-03-27 00:28:37 +0000 pfsync: add missing unlock in pfsync_defer_tmo() The callout for pfsync_defer_tmo() is created with CALLOUT_RETURNUNLOCKED, because while the callout framework takes care of taking the lock we want to run a few operations outside of the lock, so we unlock ourselves. However, if `sc->sc_sync_if == NULL` we return without releasing the lock, and leak the lock, causing later deadlocks. Ensure we always release the bucket lock when we exit pfsync_defer_tmo() PR: 268246 MFC after: 1 week Sponsored by: Rubicon Communications, LLC (Netgate) (cherry picked from commit 844ad2828a35c434b893af4274b1f6c50332dd70) --- sys/netpfil/pf/if_pfsync.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 6a67b8fe3d80..a73b4ff95c6a 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1831,8 +1831,10 @@ pfsync_defer_tmo(void *arg) PFSYNC_BUCKET_LOCK_ASSERT(b); - if (sc->sc_sync_if == NULL) + if (sc->sc_sync_if == NULL) { + PFSYNC_BUCKET_UNLOCK(b); return; + } CURVNET_SET(sc->sc_sync_if->if_vnet); From nobody Mon Mar 27 08:16: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 4PlQdM1x1wz41xFj; Mon, 27 Mar 2023 08:16: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 4PlQdM1Qm9z4CMp; Mon, 27 Mar 2023 08:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JkMmS+aMurobtBhCGY9jOb8b+F0dfWMNshqHtlQH+N8=; b=HSupuv3wtnv9iZcxC7kVOoTT23sQw4SNtJl0Kk+byAte3Kq+dgyLWMLzxyzyw5sRaD9Zqn iouL7YR6+WuAA79O69zTwz/EG0J2DkwDLCYbVDODpDT1Lqva5iDqCeum+zbadPU3sXs7Z9 AsS1aEtkh57QXIlqGG9asllmIsljAuWxJWHYBjCm1npUtUnCsNNVz4SfMxSNUx3EY7noSg Q1avPuPjImkPtCKtKLMWGm/Vuv6mhBGUC+rrb10VPVp04/XyVQyIJfgMZZ/K2+qYZTA4Rn 4vFwJ3mbQ78gMFyH42pl8s0swrQZp5GFFIFWtfQkyz4vTDM8mXp10jyjzVQI1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JkMmS+aMurobtBhCGY9jOb8b+F0dfWMNshqHtlQH+N8=; b=ZqZ5YWGa47gxneYTBNsn50Z0pCVBdclBFzsWwztvwvFbT4ph26OzO66Dw8XuFepvFyma+6 skhVyac1bO2VIrwd95HAkjBwcMBe3XQNN7QxzHcwQ+wPQDs92p3R+IbbQeh7CYfj71Ipd+ LusH3hDO7pkeQzYZSxURLaS26/FmhIEbe3nGpMRw9979LXvE65VUH9LQbQFX4gvvoQ9iUB rrrskGcSm+3ZleNuqoy9v6HPvPp9UyKBFzVuvZGY2lo+dfIt/9eb9h3JtmOX27swhuOQoU vQM4IGM6lxKtsieoypvtV947CEVe52A2kxjZX24oXe0CVjIORygevVDKI9S4vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679904999; a=rsa-sha256; cv=none; b=tGW2+R3RRJFS0SJeDwQ3xYnpysxDip04pJEIzP+YwwZoYBXamhtit1fEioFefAHPdOriJ0 v3C9dgnso2aB/iV8VUkdlqU3QvdgSjjEDs4v/KfveopnnLhspnB7ecDn/uTwbdziYPUxK0 5qQvE/1yWz7XIcQoeig6tTqigOOnJWjEwHzmAv9n1AvVM9uXZHIEZVl7dp7fNwcj0oKrzh gwFWo/aVrs0tfy2pXUR5wRKb1a0SAV9PUp1wfwqLkwLSB1GjQ14EgXhvpc7nrb0x1M0gaL yOql+JTXPXp0pX/c0sXadZjw9go6A/DzhwA7i93yCKBPbr/kAbrbPF/A+Dda3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlQdM0QlJzFCG; Mon, 27 Mar 2023 08:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R8GcJ5045676; Mon, 27 Mar 2023 08:16:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R8GcVZ045675; Mon, 27 Mar 2023 08:16:38 GMT (envelope-from git) Date: Mon, 27 Mar 2023 08:16:38 GMT Message-Id: <202303270816.32R8GcVZ045675@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: 5d6b503ed097 - stable/13 - pf tests: try to trigger locking issues in pfsync_timeout() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 5d6b503ed097733af83003cf675f3d55c2b90756 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5d6b503ed097733af83003cf675f3d55c2b90756 commit 5d6b503ed097733af83003cf675f3d55c2b90756 Author: Kristof Provost AuthorDate: 2023-03-20 13:58:34 +0000 Commit: Kristof Provost CommitDate: 2023-03-27 08:16:03 +0000 pf tests: try to trigger locking issues in pfsync_timeout() PR: 268246 MFC after: 1 week Sponsored by: Rubicon Communications, LLC (Netgate) (cherry picked from commit a6719858a48019aa54e1ea3be57d17fa88b080c6) --- tests/sys/netpfil/pf/pfsync.sh | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh index a5dc3716bbfe..748c0b2fcf29 100644 --- a/tests/sys/netpfil/pf/pfsync.sh +++ b/tests/sys/netpfil/pf/pfsync.sh @@ -584,6 +584,39 @@ pbr_common_cleanup() pft_cleanup } +atf_test_case "timeout" "cleanup" +timeout_head() +{ + atf_set descr 'Trigger pfsync_timeout()' + atf_set require.user root +} + +timeout_body() +{ + pft_init + + vnet_mkjail one + + jexec one ifconfig lo0 127.0.0.1/8 up + jexec one ifconfig lo0 inet6 ::1/128 up + + pft_set_rules one \ + "pass all" + jexec one pfctl -e + jexec one ifconfig pfsync0 defer up + + jexec one ping -c 1 ::1 + jexec one ping -c 1 127.0.0.1 + + # Give pfsync_timeout() time to fire (a callout on a 1 second delay) + sleep 2 +} + +timeout_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic" @@ -592,4 +625,5 @@ atf_init_test_cases() atf_add_test_case "bulk" atf_add_test_case "pbr" atf_add_test_case "pfsync_pbr" + atf_add_test_case "timeout" } From nobody Mon Mar 27 08:16: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 4PlQdM4tHzz41xLg; Mon, 27 Mar 2023 08:16: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 4PlQdM4RrJz4CQn; Mon, 27 Mar 2023 08:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vrgYhoXrY/WHy9k1R4uuEiz//YlmQcBJd2QAXJKghyg=; b=yNsqKbZiz0AK3LBfsNyIxXb/7Uf3/YfaHXHj0P4mDzD/oywA1gMswpaM7Tp2sL2L6/EA0Z sYtXibdEKZTzevjTJq44tdmy0AkS/0fvHwy66u1pNIYvLrQINxdVCNpIb1tRbt3ZAZQFSs cittmKBafgK2RiMez/YkTVh/f/MfU3LSDW96CTdxlEtaUu0/0DajryzaQ+JCFSlqsz1gM+ C1+D1QHICgfw3YrBfdH6H6gu9SJ3kHdX466da/wlsyDZKKDyuLjf6CEaKiduN77Am8PDRF sNfPqoHB+JKGB3vRkWDgP6R0W/ohnvKhMpr/u9chV0m34axfiqfEocDOGtvzlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vrgYhoXrY/WHy9k1R4uuEiz//YlmQcBJd2QAXJKghyg=; b=WA8M/TDaMxEpkYMFDz983WvW0pMtsMQzBtGAZDGJdD0sRZIlBqS+Loa4QHmQzkUsIMYi5j e0G5Ju0xPXVCRY2pVzMpzXeRDXaY2erdOwBcDkpOTxgPb/NS1Z3G6CGC6sf8bnSlBoWSBd oGSEGl8xyNfO57kH3pUSZS/KAmmVDNMxl6dQZA4Jl97iB8PYJEya7GeEsxyoMlzAbsYdj6 WUdt1mjplT7a3jcphPl+rPTtXMWDW2CCh+fR65C0jHAc1bsB7AscUqmPl0sAp4vfioAPlb rFtdi+j7nP0NKPe+/DuyHYjmkuOCV7tdxOMjAt/Xn4BPSlzOMUnKnga/M5qQ7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679904999; a=rsa-sha256; cv=none; b=OGupM1/EScWeS2rv8N/RDJzgZoUfpHgw/o3KBgZtdN1WMuvRFLnnY51rss7SB80Rr007Cz hNHmOorR68dH/cN8M8ezuZZs97HTtMEQhgjonFZ1glrLq3GoXdz5Ks5hWS/lup7IvIKsKv UCzU0HddYk9thfqTCWwMdEAXN6ZYfGkbMoFPgKY6u+7HTB/5Y8x816TIyJm8lMKUWpyBYz QVDtLGPFu7YKu6fSB6qcRN3MGEOM0tD6E/FP9N6VkECPlSnQdH3Qpl6CgDfKlGMgokj/G/ tsxTckVIXqI+kmz05sfxvYAbsBtkfA03xa2qjyqrUK+K93ZmGfFf0wZLwF2rqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlQdM3RvNzFYk; Mon, 27 Mar 2023 08:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R8GdrD045695; Mon, 27 Mar 2023 08:16:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R8Gd86045694; Mon, 27 Mar 2023 08:16:39 GMT (envelope-from git) Date: Mon, 27 Mar 2023 08:16:39 GMT Message-Id: <202303270816.32R8Gd86045694@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: 6b916bc91d76 - stable/12 - pf tests: try to trigger locking issues in pfsync_timeout() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/12 X-Git-Reftype: branch X-Git-Commit: 6b916bc91d76a4e91629074779a89b22207ea053 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6b916bc91d76a4e91629074779a89b22207ea053 commit 6b916bc91d76a4e91629074779a89b22207ea053 Author: Kristof Provost AuthorDate: 2023-03-20 13:58:34 +0000 Commit: Kristof Provost CommitDate: 2023-03-27 00:29:59 +0000 pf tests: try to trigger locking issues in pfsync_timeout() PR: 268246 MFC after: 1 week Sponsored by: Rubicon Communications, LLC (Netgate) (cherry picked from commit a6719858a48019aa54e1ea3be57d17fa88b080c6) --- tests/sys/netpfil/pf/pfsync.sh | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh index a5dc3716bbfe..748c0b2fcf29 100755 --- a/tests/sys/netpfil/pf/pfsync.sh +++ b/tests/sys/netpfil/pf/pfsync.sh @@ -584,6 +584,39 @@ pbr_common_cleanup() pft_cleanup } +atf_test_case "timeout" "cleanup" +timeout_head() +{ + atf_set descr 'Trigger pfsync_timeout()' + atf_set require.user root +} + +timeout_body() +{ + pft_init + + vnet_mkjail one + + jexec one ifconfig lo0 127.0.0.1/8 up + jexec one ifconfig lo0 inet6 ::1/128 up + + pft_set_rules one \ + "pass all" + jexec one pfctl -e + jexec one ifconfig pfsync0 defer up + + jexec one ping -c 1 ::1 + jexec one ping -c 1 127.0.0.1 + + # Give pfsync_timeout() time to fire (a callout on a 1 second delay) + sleep 2 +} + +timeout_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic" @@ -592,4 +625,5 @@ atf_init_test_cases() atf_add_test_case "bulk" atf_add_test_case "pbr" atf_add_test_case "pfsync_pbr" + atf_add_test_case "timeout" } From nobody Mon Mar 27 09:28: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 4PlSDK4pMsz4221y; Mon, 27 Mar 2023 09:28: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 4PlSDK4HQWz4MHR; Mon, 27 Mar 2023 09:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679909313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oEJy7Y0wJeE5eR2Jdepz2xKDaD0yu1z/3Fu65TSZEMs=; b=Oautlqk9Z343Lm/kIXBlAQeI/r70mtQNMR3FXKatlqAQ1q4qBl0SXnbm7QvoqgHmVzQR6s puGzoLzCScayICeIUvOjc3zF+qUjW5muKntpp9TPSuB9WZzCic755yE94qBYS0uED4Tuy3 m82/fKPN+Cu/ZwzfdkLVQ1HuRwQZfhu22P70OeCatvkonL2GuBuxXYoItmtFRRhgHmoxTH REJYPfZXigXqYzFWIzc+3y4RoIB3FWNPipdaTo14QTRDQ4YLvNuaXrl5/iT/kU8A5o/sAH qWv2Rox+AEN0W7qNKk4dk1eDu8C7by9P+Hg2JOHWMR5vg1OE+Vsg0ng3YNojng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679909313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oEJy7Y0wJeE5eR2Jdepz2xKDaD0yu1z/3Fu65TSZEMs=; b=ZTE5QoHOggK5XT+H7Ck807ML6LVB1tla8r76mz/4SLFR2Cbrw56LA75+dLjIvei6YpZew4 SSoFMfB0WYSaS0agWHQ8tl6mUteznbaRJ/eJfLdXmpCMJ/rcJ6ISd7ZrYt8oWHQz18YBMy lMq4XloVV39amrwNDnfbJIymK7XucXFITCypg9TEvg3rBXnYTwHmdgBj9tF5f89MKsl2GH 9cvCRqKcBLA3rUCql1NsIbZ6cPPliePnwkTe5rEYwRGjSQh853hepFMA4lh4VDE3HaVEmT bmHKFXLPQQb+8hag/l7TTjh3puXdf+WWTncWXWJsBSgjdWK8CwNXW3KOMVnMRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679909313; a=rsa-sha256; cv=none; b=RYPkUNujuvydmgJsv1nPBHhhfGrmKrsKsTKwRfOnsL0kan+dFHtbRoB4HWX2pMN4Fg1gfp rxq/3IpBs00/D3peTmn/KnELd5FQj3fOmrVePKxnpPvSPhrKeEyV8YRzKl64L8YHkocaTz 7he0pKD/rvQF6Y0Fj35OC8kFr2L5PVpzBBWwyMf3dgl3jAzAb9cTeDlUGOLcfaseJTQMry zESKtKgqj7KHngfczrjSHC13x32tlyXucgJY3vYnVwJg0fJ5BUvX/BryTSnKJskvd90PIQ X8psLyw8Hqz4wPhpiElKmieC6A4SbqqkRXp28bYmHaKTI+x2DHLLIywsgxFwFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlSDK3Kx4zGvy; Mon, 27 Mar 2023 09:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R9SXnm060928; Mon, 27 Mar 2023 09:28:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R9SXoV060927; Mon, 27 Mar 2023 09:28:33 GMT (envelope-from git) Date: Mon, 27 Mar 2023 09:28:33 GMT Message-Id: <202303270928.32R9SXoV060927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 48d70503bcae - main - pci: add tunable hw.pci.enable_mps_tune List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 48d70503bcae816eea6109c30ba79261eb47c9d0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=48d70503bcae816eea6109c30ba79261eb47c9d0 commit 48d70503bcae816eea6109c30ba79261eb47c9d0 Author: Corvin Köhne AuthorDate: 2023-02-06 09:26:33 +0000 Commit: Corvin Köhne CommitDate: 2023-03-27 09:28:27 +0000 pci: add tunable hw.pci.enable_mps_tune If the tunable is set to 0, the tuning of the MPS (maximum payload size) is disabled and the default MPS values set by the BIOS are used. In this case the system may use a lower speed or operate in a less optimized state, but it can resolve issues with stability and compatibility. With specific devices the tuning of the mps, can lead to a complete freeze of the system. Reviewed by: manu MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38397 --- sys/dev/pci/pci.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 335c89423f24..92368f42608b 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -420,6 +420,11 @@ SYSCTL_INT(_hw_pci, OID_AUTO, clear_aer_on_attach, CTLFLAG_RWTUN, &pci_clear_aer_on_attach, 0, "Clear port and device AER state on driver attach"); +static bool pci_enable_mps_tune = true; +SYSCTL_BOOL(_hw_pci, OID_AUTO, enable_mps_tune, CTLFLAG_RWTUN, + &pci_enable_mps_tune, 1, + "Enable tuning of MPS(maximum payload size)." ); + static int pci_has_quirk(uint32_t devid, int quirk) { @@ -4452,7 +4457,8 @@ pci_add_child(device_t bus, struct pci_devinfo *dinfo) pci_cfg_restore(dev, dinfo); pci_print_verbose(dinfo); pci_add_resources(bus, dev, 0, 0); - pcie_setup_mps(dev); + if (pci_enable_mps_tune) + pcie_setup_mps(dev); pci_child_added(dinfo->cfg.dev); if (pci_clear_aer_on_attach) From nobody Mon Mar 27 09:41: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 4PlSVy6gxLz422gt; Mon, 27 Mar 2023 09:41: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 4PlSVy4Ktgz4N9c; Mon, 27 Mar 2023 09:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679910074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B52ys/u3iy3uZZPZCwOByhjJ+l732Ar51pKIreFFfgs=; b=dHKr14dhy4hu1n2ux7JCxTsfbDV9sQBFxYeZRbBfpNZC8KpHSlwZKGTJe2hV8Zc3lfIkfp 1RHooOgjPkDq7G+Odt0Gkh+tYYY4m6AtLTPN1EeXjIuiNCApSWnTuvo3IRkJaXeZLIvkns Bv8CkcV4lC7GLFYpTEmJBtRC6zz+cUYtwD9Rmq8ZngnpOu6JQAw24EJpj6X8wVJmf5XlHu C6ma0ZYmOMEqaojE9LTCyiQWbE+1aDHR7MQfuTVwnl31WRm5MD0jtM3hUo5W9Ev+dLJ4m5 aEyh/fwyMIEBGkB3ANBdbwpKet3wMEf98+eVFGbvyBWfKjrIUPiTEW+Eh89JKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679910074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B52ys/u3iy3uZZPZCwOByhjJ+l732Ar51pKIreFFfgs=; b=LYF39rfUZBintwMSZ3O772QkQ616xuTSu764kabsYGyVvbCq8XD3CyZUy8lUsJ365XAhIV E/kAgQ+apwGzOqj1numWoGPhNBunozPQFbUaz+pkA4gWrEiK01V1hYrIzf9+gzMNZNTodC X4gXHaQMo2BlEleSX+qUYcNMK23e5hzzSCP3LZnVt2apjI8b1uZZL9Kywq7+tVfhh/UnrR NNnoyqCWNhQdYaYppn6T1qOT4X7cTax410JeWgE1jTSqVaEmMBXu3PQIEMTBoz7eNYR4oI Od6yTGZFDH3/4D6fQyeS1Veg5iaY0PGBj6JKP9f86yQniYpOKOus9stITgEA1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679910074; a=rsa-sha256; cv=none; b=YHf3ZJkrcQkWiI0sPoBJaVo11dn9b9+yRQkLK5cX2VLQXpXUQvThibhc2IwyV4yHydYxs+ uioykrt4XMdEdvopnbWO7qvCG84xiaFViNwwtCLSUKzOs+F299isqH7/n8u5jYHCf/pitq 7rsAEaJzlzHbUde5DfBTLjSCbQiiAi+CT0GTSs6BdOhvDurdZBdPPoeE6T0FzAHv+sn4ah ZkDebetpR3tBuIJxKi39w98QJZdWpsPdDVZrl+uaOrcdSiUJXcGQBTc4KBmQICGwCETEIo ehwfFQN95t6NWsLw3Ii4QbhRmQbhVa4aaMVtFMVllFSZefFsDFCSu2ddsLueJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlSVy3RSSzHK0; Mon, 27 Mar 2023 09:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32R9fEYk088950; Mon, 27 Mar 2023 09:41:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R9fEau088949; Mon, 27 Mar 2023 09:41:14 GMT (envelope-from git) Date: Mon, 27 Mar 2023 09:41:14 GMT Message-Id: <202303270941.32R9fEau088949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: e8988d60d24b - main - pci: expose intel_graphics_stolen as sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: e8988d60d24b05e98919e912329880a54cdfdd70 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=e8988d60d24b05e98919e912329880a54cdfdd70 commit e8988d60d24b05e98919e912329880a54cdfdd70 Author: Corvin Köhne AuthorDate: 2023-03-27 08:21:37 +0000 Commit: Corvin Köhne CommitDate: 2023-03-27 09:40:49 +0000 pci: expose intel_graphics_stolen as sysctl The Intel graphics stolen memory is used by the Intel GOP driver on boot. When using bhyve with GPU passthrough, it's also used by the guest GOP driver at guest boot. For that reason, bhyve needs to know the address and size of this region to inform the guest about this region. Exposing the variables as sysctl allows bhyve to easily read them. --- sys/x86/pci/pci_early_quirks.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/x86/pci/pci_early_quirks.c b/sys/x86/pci/pci_early_quirks.c index b9de1d78e022..7eb3fcd91927 100644 --- a/sys/x86/pci/pci_early_quirks.c +++ b/sys/x86/pci/pci_early_quirks.c @@ -32,6 +32,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + #include /* XXX: enable this once the KPI is available */ /* #include */ @@ -56,6 +58,12 @@ struct pci_device_id { */ vm_paddr_t intel_graphics_stolen_base = 0; vm_paddr_t intel_graphics_stolen_size = 0; +SYSCTL_U64(_hw, OID_AUTO, intel_graphics_stolen_base, CTLFLAG_RD, + &intel_graphics_stolen_base, 0, + "Base address of the intel graphics stolen memory."); +SYSCTL_U64(_hw, OID_AUTO, intel_graphics_stolen_size, CTLFLAG_RD, + &intel_graphics_stolen_size, 0, + "Size of the intel graphics stolen memory."); /* * Intel early quirks functions From nobody Mon Mar 27 09:57: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 4PlStj1kcqz423FS; Mon, 27 Mar 2023 09:58:21 +0000 (UTC) (envelope-from corvink@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 4PlStj1BjXz4PVy; Mon, 27 Mar 2023 09:58:21 +0000 (UTC) (envelope-from corvink@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679911101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=FChmZ+hwITOrB6HeOpL3D6mNNNj7A0I3u7ujVmjLJGY=; b=i/oHKSmTXWBtNcyIXWCbYF6HX2ShPpJ7EZZqXin6JE64naUKlVcC1DHpSU/YJ2Kj4bbpI5 GkBTpb5ptIeMUR5s0R5DNufbw3sYCAyGsSkKR+CHrR2j1uyJ88VmmHtbrpC16UwWc68i/I w0DVMnkIaFjfyL+/mJcjng6gShyl7/KrCzqHc0Ipwu+b6b4yKCfUSIJT1voRNX1OhuPQ2r 9FaMMr3SUf1KNi+nwZSXOSja2dEFlRcS5s/DhY3hRqQgpF+cVW6f+62+KsBRFuTthvXVJn uabtLkaQZIIrbvi96PU+93dGFePAcgKbAeeVg47k2bngxBYVbnneloHR/M7Hfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679911101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=FChmZ+hwITOrB6HeOpL3D6mNNNj7A0I3u7ujVmjLJGY=; b=u63T/6rU7iswVT7RimTav8kzk7ZzZ/9pOoSUZnknSozT489IHD+GwCesq+U50NNh0w1Xs0 Kxb4XtBMc0HPwbzNvZCDRZ+bQCn963EZah2U4RKv+W7zjP6c8B2UGFE9AeAioGj/J94XIH np8f7bQs1Qxsk+6+rm7tFmrx0j48MGq1Fwe2hbfleeoQwpJyQAWkYypkfpyMD/24q7oiJz BVbrY6en3ZQDoxq8w4ipK7wDAGe0lHFFz+o7YQn6IcYDPuUY0HmNLdFLLOXGnV3u9iUVEk rnLe7PROo0jX6F28Qt8XJkTM47Jc8yw2z4tTNdjMvei4aHvpPD1BKWOVyrRXQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679911101; a=rsa-sha256; cv=none; b=McidIapTopx9e2jogynC1ogjL+vMmEThwswNd1wNJT3lXHbSd5MPVRW6/KgP87Cn1eKoqM A7+XaXalB18MU/s2zaE2nFWyhWM9TSRd6HH+Ez0qnQL3KYcznUJHTqePLw0XNvMPwhivZW pDEgyn6+3cozKCFgjdUps5/I2n22z49ILoMAF6WkQDGN4LOoCXC2YbRrh6lC4+LxUA/CFf OcvwvoL9yP+Tc0bEHIrg4Hyyg+mI32x7LfVHSYKAR82ONnNF7TM1JxsfQIh+3Ez/834nTR xVIM7tcV68F8B8O+J9oVYM7KcDQ8jep+F0iU90LXqN+v0J8honFhjMQznzTDqQ== Received: from [IPv6:2001:16b8:181a:b800:4759:abeb:e811:4e66] (unknown [IPv6:2001:16b8:181a:b800:4759:abeb:e811:4e66]) (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: corvink) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PlSth3c1Bz1M4S; Mon, 27 Mar 2023 09:58:20 +0000 (UTC) (envelope-from corvink@FreeBSD.org) Message-ID: <2a4906a9b1063a75223abdd4de91cc5be4edc0cf.camel@FreeBSD.org> Subject: Re: git: e8988d60d24b - main - pci: expose intel_graphics_stolen as sysctl From: Corvin =?ISO-8859-1?Q?K=F6hne?= To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Date: Mon, 27 Mar 2023 11:57:58 +0200 In-Reply-To: <202303270941.32R9fEau088949@gitrepo.freebsd.org> References: <202303270941.32R9fEau088949@gitrepo.freebsd.org> Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-qqDnEX6frQzdsra6B7n0" User-Agent: Evolution 3.46.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 X-ThisMailContainsUnwantedMimeParts: N --=-qqDnEX6frQzdsra6B7n0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2023-03-27 at 09:41 +0000, Corvin K=C3=B6hne wrote: > The branch main has been updated by corvink: >=20 > URL: > https://cgit.FreeBSD.org/src/commit/?id=3De8988d60d24b05e98919e912329880a= 54cdfdd70 >=20 > commit e8988d60d24b05e98919e912329880a54cdfdd70 > Author:=C2=A0=C2=A0=C2=A0=C2=A0 Corvin K=C3=B6hne > AuthorDate: 2023-03-27 08:21:37 +0000 > Commit:=C2=A0=C2=A0=C2=A0=C2=A0 Corvin K=C3=B6hne > CommitDate: 2023-03-27 09:40:49 +0000 >=20 > =C2=A0=C2=A0=C2=A0 pci: expose intel_graphics_stolen as sysctl > =C2=A0=C2=A0=C2=A0=20 > =C2=A0=C2=A0=C2=A0 The Intel graphics stolen memory is used by the Intel = GOP driver > on > =C2=A0=C2=A0=C2=A0 boot. When using bhyve with GPU passthrough, it's also= used by > the guest > =C2=A0=C2=A0=C2=A0 GOP driver at guest boot. For that reason, bhyve needs= to know > the > =C2=A0=C2=A0=C2=A0 address and size of this region to inform the guest ab= out this > region. > =C2=A0=C2=A0=C2=A0 Exposing the variables as sysctl allows bhyve to easil= y read > them. > --- > =C2=A0sys/x86/pci/pci_early_quirks.c | 8 ++++++++ > =C2=A01 file changed, 8 insertions(+) >=20 > diff --git a/sys/x86/pci/pci_early_quirks.c > b/sys/x86/pci/pci_early_quirks.c > index b9de1d78e022..7eb3fcd91927 100644 > --- a/sys/x86/pci/pci_early_quirks.c > +++ b/sys/x86/pci/pci_early_quirks.c > @@ -32,6 +32,8 @@ __FBSDID("$FreeBSD$"); > =C2=A0#include > =C2=A0#include > =C2=A0#include > +#include > + > =C2=A0#include > =C2=A0/* XXX: enable this once the KPI is available */ > =C2=A0/* #include */ > @@ -56,6 +58,12 @@ struct pci_device_id { > =C2=A0 */ > =C2=A0vm_paddr_t intel_graphics_stolen_base =3D 0; > =C2=A0vm_paddr_t intel_graphics_stolen_size =3D 0; > +SYSCTL_U64(_hw, OID_AUTO, intel_graphics_stolen_base, CTLFLAG_RD, > +=C2=A0=C2=A0=C2=A0 &intel_graphics_stolen_base, 0, > +=C2=A0=C2=A0=C2=A0 "Base address of the intel graphics stolen memory."); > +SYSCTL_U64(_hw, OID_AUTO, intel_graphics_stolen_size, CTLFLAG_RD, > +=C2=A0=C2=A0=C2=A0 &intel_graphics_stolen_size, 0, > +=C2=A0=C2=A0=C2=A0 "Size of the intel graphics stolen memory."); > =C2=A0 > =C2=A0/* > =C2=A0 * Intel early quirks functions Reviewed by: manu MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39281 --=20 Kind regards, Corvin --=-qqDnEX6frQzdsra6B7n0 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQIyBAABCAAdFiEEgvRSla3m2t/H2U9G2FTaVjFeAmoFAmQhaKYACgkQ2FTaVjFe Amp/gg/4tW2Ess3YVGjA1eOjb47BJ7ZJMnt+1CgvWWxNiLEco56PRRXkHq8Vhi8L AAbGZUf/BBHGIB83jNXnlWqs0Joj/fNFrjLVnEOf1rqJ99yjBo5wF/PaYpojkF3Q 3iz5xmpFu5/2Go4FU51KDqNOx4YE9z/X6LgcpJheJoAKzdvQwiEDFpfDI+TUHjiD 1o5X/nyKdZFoOHv7pUTGw1BlutlIgqfoLlUH5vXp/40E2nWlEJYYsfo98PY/GR8l bekKdiW67lq/Qqj37OmjAiFML/8+IsFYhnXoyX7tRrfuGzNB8oRm02kJtpsJM4Rx IMiipbkrWIfTk2m9r09rf6td9PAlPlpxs6q5kdz20OesKwuMKZiUdJtQN0/ycsRl PBqR76yoo9dOfty8YIts6kaTwkzpTMzjgvrCejfVu9sArjW3f9ZFQktvEWLzr8XI wgUpNf9VlwTfPeSHVaEWobklfAtu1JziBcmc1/fRQbyyCEcccaC8qqd9+skqQZpS B1IU7h8/vFbIqpEvmLdrL2KqWWOggl9g1rn6qmz1GiMzmG+gRqizdWgeFhDQOFm6 ktRDmf5riiPD/UJxzAEqXUEPcK7chwfoMB+ePL/gVB/JWozTfuzi4hITyOBcOkYh I5IqzCyb5JCOc44gHFGp/lVjtIx+wk030iQalKo+765SaxWJ/w== =rwAD -----END PGP SIGNATURE----- --=-qqDnEX6frQzdsra6B7n0-- From nobody Mon Mar 27 10:50: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 4PlV2d0k4nz426J5; Mon, 27 Mar 2023 10:50: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 4PlV2d05zwz3G6N; Mon, 27 Mar 2023 10:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679914217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJ/PRzscS2BW96E8fibRYcFM392XxNy9L7MI3Kniz40=; b=gbk+53qKlI6xua6cN8D4M36qtVLLI9iJ6GK5st1EdpiL8RR+eqHCIGauKw1DbL8RzqbiXF TTSz0XgpgxTJZjhGu50Q0YlpzVp8hj31vztzd469oeO7Dejsh9/rPPr/9ZbfvqNMDgwx+1 d/XPtUoaBe3PgXE4fKXFNgWtUIcXJwpbPQGMwjzMmNhFgyFZGIOihyBpG0s5P2UqAs+2jm HRyqcKk1bKVgQtvzUgRynLz6/ADxyHFceMPN3jvGJUekk3f8lP/1/L2CD2tgspUXsSSKww fGAgOyYyTLaz6DmkCMljVHa/MWOJSEx2rDV0CQ+bo0l6s3Mo6haWu5k2OAMinw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679914217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJ/PRzscS2BW96E8fibRYcFM392XxNy9L7MI3Kniz40=; b=JRliXbAALfIdoRwgFAvqp6bWqwFI4WnskXPwekv54LHQKxE1KOtOxvEW+2OCgb0iawazVI 2gAuEMMztpYw41DIJ9FqMhmFXQLcTL3cgjQaY+phj/u03qmpOKdYa4wj8rxkPV/XbKA6Z4 IPWxcbh8nJ98fQ6BU1XykLUWFM96S18fprfGI2Rx836Wd7mliIsGWqed/uf5XiODBOPtHf L8LwNoh1pPzVEcLc2yrhVtojF7+t3sgQVwGN6P0UaukRTEVTtebkiG3L4AEWykAEQIWiKs QmSqW3X1Y7wTUuanFzCCGmO35IQ/TVzfsVLCnA0uWuL/9zxTF4SJET5etYn4gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679914217; a=rsa-sha256; cv=none; b=bK9dAIxjoHYvg3sqqb8gdqWObCgpgL3E1y51ZJlHjgY0/+WZ5ezSL2/93tyUUGNoo39q38 iCRzCSYSy9ZXAWyxVSkPYbzq5QPhNuvnAq9hL5Q72sbv+0f6wASR1OH2IBG606fRRXphJM LmDQVBDcdRdxmXOZ7yYCzNAi5hoRrJIypXp9QQOnACsxcs3BvztgT/QufEmfseJ7S1frdY zipPQ6fiyDXEY0wjli7ljMaoUOLalRSvBh8DDlRjAvmligHfeTk8INoDIsDbim2N8Xpk6/ TnSYZLRntg/S8kXGCk7l4P9xgvmpWHrR4eoVk+o0XZocRtjJjDPBD9VDEhKvFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlV2c6HQfzJfB; Mon, 27 Mar 2023 10:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RAoG8T001160; Mon, 27 Mar 2023 10:50:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RAoGnk001156; Mon, 27 Mar 2023 10:50:16 GMT (envelope-from git) Date: Mon, 27 Mar 2023 10:50:16 GMT Message-Id: <202303271050.32RAoGnk001156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 544f1492c026 - main - netlink: ensure genetlink control family always registers under the same ID. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 544f1492c026f358507d812b63943eea08d3155d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=544f1492c026f358507d812b63943eea08d3155d commit 544f1492c026f358507d812b63943eea08d3155d Author: Alexander V. Chernikov AuthorDate: 2023-03-27 10:48:24 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-27 10:48:24 +0000 netlink: ensure genetlink control family always registers under the same ID. MFC after: 2 weeks --- sys/netlink/netlink_generic.c | 52 ++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index a2bd624f99d9..16b49d5aa9ce 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -47,6 +47,8 @@ __FBSDID("$FreeBSD$"); #include _DECLARE_DEBUG(LOG_DEBUG); +#define CTRL_FAMILY_NAME "nlctrl" + #define MAX_FAMILIES 20 #define MAX_GROUPS 64 @@ -96,6 +98,28 @@ find_family(const char *family_name) return (NULL); } +static struct genl_family * +find_empty_family_id(const char *family_name) +{ + struct genl_family *gf = NULL; + + if (!strcmp(family_name, CTRL_FAMILY_NAME)) { + gf = &families[0]; + gf->family_id = GENL_MIN_ID; + } else { + /* Index 0 is reserved for the control family */ + for (int i = 1; i < MAX_FAMILIES; i++) { + struct genl_family *gf = &families[i]; + if (gf->family_name == NULL) { + gf->family_id = GENL_MIN_ID + i; + break; + } + } + } + + return (gf); +} + uint32_t genl_register_family(const char *family_name, size_t hdrsize, int family_version, int max_attr_idx) @@ -107,21 +131,18 @@ genl_register_family(const char *family_name, size_t hdrsize, int family_version return (0); GENL_LOCK(); - for (int i = 0; i < MAX_FAMILIES; i++) { - struct genl_family *gf = &families[i]; - if (gf->family_name == NULL) { - gf->family_name = family_name; - gf->family_version = family_version; - gf->family_hdrsize = hdrsize; - gf->family_attr_max = max_attr_idx; - gf->family_id = i + GENL_MIN_ID; - NL_LOG(LOG_DEBUG2, "Registered family %s id %d", - gf->family_name, gf->family_id); - family_id = gf->family_id; - nlctrl_notify(gf, CTRL_CMD_NEWFAMILY); - break; - } - } + + struct genl_family *gf = find_empty_family_id(family_name); + MPASS(gf != NULL); + + gf->family_name = family_name; + gf->family_version = family_version; + gf->family_hdrsize = hdrsize; + gf->family_attr_max = max_attr_idx; + NL_LOG(LOG_DEBUG2, "Registered family %s id %d", gf->family_name, gf->family_id); + family_id = gf->family_id; + nlctrl_notify(gf, CTRL_CMD_NEWFAMILY); + GENL_UNLOCK(); return (family_id); @@ -377,7 +398,6 @@ enomem: /* Declare ourself as a user */ -#define CTRL_FAMILY_NAME "nlctrl" static uint32_t ctrl_family_id; static uint32_t ctrl_group_id; From nobody Mon Mar 27 10:50: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 4PlV2f1N5Qz426J7; Mon, 27 Mar 2023 10:50: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 4PlV2f0bpxz3G5S; Mon, 27 Mar 2023 10:50:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679914218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ESE+HUwDS4/0uRKQw9jvwJZ03NHOENu5/PZTgcYTUfM=; b=j64fSUzlp751i0HOW0608vJPOmFcrkxSq5sDY8I8S5YcrO8oGqmkU0SNuj5zAFyyjzT9P5 Cl3Ml1ZfHPH1bM79AhAAp9IKj0EhUkb8f0UM9EdrEsXqjwXFy0my42U12IZ1tWlotqmRV0 vJ00MyGNY8YOaHoVZf+6QBwGY2mEZABPlcJEFpe3Oj+9t/0uGAsz/5Ul+PCpROmFiwjIE4 7D/dwBF2hoHx9dzBqGJlSkA7X943awCgT+1j+TNsDpuf5ojXV53cNYnJ98iDklsfEcuJNg s5xuY0PtE5VQGQbZ2V+LGELInT8n0LHsbRuFcqd9XbJlt3TI3vCiTJBxwpR4Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679914218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ESE+HUwDS4/0uRKQw9jvwJZ03NHOENu5/PZTgcYTUfM=; b=rtjuupf4ySPCUMZzDQHCoLccAbNrIizrQGisRJe9R+paDnZzIEImolwQQOYD3wZnaEXUZS WC2Jw9WID+/9m2slS0tuR+l+5IIfDJhKk1ufjbqFKYeqzhs9DKKGkeYJIxCfRQVSOiIjvh ho1Z+n3qBHSpycpmR8xWeP7EWxjxA1Q8PG24PKxPOb3glV4OLx28xoYz4/1aULwe3zXwJq SxCbRaj9IjHFWoW9o2Tj/Tq4vgBWd+7f/8ebJEn00tFbu/b5XeCzZmnbSqg7AneSo2ZUYF qBPVP3i4+PXFXVu/Fo0/6OwA1upBycwP1tHrfPfyqHwS+OtKBbNGyGMaxuLrgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679914218; a=rsa-sha256; cv=none; b=w1+F4ccL40s//mdzxKbZMcE/1MaWDMdEc307YgF70vt/PVv5HPJHnul2coyYa6AE0OrT6L bYF3WI2Ok1mzcKB/iERCSguqt2vSmWctpGl8qVaNes0yzj2MAYCbFkRChIIfBJuNzPEGMM q57wJq2tVt+dbRfn6wbMnzpGHHhWl3EcxbhhqpzCa2eDXrMyDbOejWQ9O75/B0H0LAr2hV dT8K7a16N59GARS0ePpcxLhOmBJl7IM1QIFCzXMZje0j0DtAXfG2/aaywSBN877vQY/Sod UNCkJMgehX0YneGADlSv5XkH3WkFUGfj7CDDt8eRhI2j2DxBbhYFwxHvq/2cTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlV2d6pNszKB2; Mon, 27 Mar 2023 10:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RAoHVo001404; Mon, 27 Mar 2023 10:50:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RAoHxP001403; Mon, 27 Mar 2023 10:50:17 GMT (envelope-from git) Date: Mon, 27 Mar 2023 10:50:17 GMT Message-Id: <202303271050.32RAoHxP001403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 6dc858d84c43 - main - netlink: remove forgotten debug message in handle_rtm_getroute(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dc858d84c43294c6bea8eb8288deb1adda4d1f6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=6dc858d84c43294c6bea8eb8288deb1adda4d1f6 commit 6dc858d84c43294c6bea8eb8288deb1adda4d1f6 Author: Alexander V. Chernikov AuthorDate: 2023-03-27 10:49:40 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-27 10:49:40 +0000 netlink: remove forgotten debug message in handle_rtm_getroute(). MFC after: 2 weeks --- sys/netlink/route/rt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index ef52dbf4edd6..1143ee581a31 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -588,8 +588,6 @@ handle_rtm_getroute(struct nlpcb *nlp, struct nl_parsed_route *attrs, return (EINVAL); } - FIB_LOG(LOG_DEBUG, fibnum, family, "getroute called"); - rnh = rt_tables_get_rnh(fibnum, family); if (rnh == NULL) return (EAFNOSUPPORT); From nobody Mon Mar 27 11:54: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 4PlWSV4jN4z42B00; Mon, 27 Mar 2023 11:54: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 4PlWSV47H0z3Pg3; Mon, 27 Mar 2023 11:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679918058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jKY0KpoW4kdvJoZwZ5KhPemblgJdd+mnQ4JutM3yOtE=; b=JJlthR6CPT/cGtgknuaenIGGxe//oqnPicel3pHB+MJBCir/WfQpwYBGxFx4+nwIoBVTZb dU1FhkEJLHAUYMCBIhz98PdtHyZ8GseCSgWNzNoMiMUVYY/phqAV2sC00zHpzY6xbcQ2jW 1k/ucSryIWQ+sPGV9QGIUeYmWITqzliWz56Op3/FeLoohOmtPKdrwVmXAIPYUARVgWR6Cs OJ1jeY9ac6IliN4Qc8INyiyVDeTVFJhMt/WkK0Pot9SHf8/VoYvo9bpUDyaa4Xjk7eKISR fw18dG4LZjP2pZvk3iWgPDKaXv9DLovB0ecThG00Gkg+rZSdENIv6dtpZFA8OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679918058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jKY0KpoW4kdvJoZwZ5KhPemblgJdd+mnQ4JutM3yOtE=; b=MFf3h8b45+8cdenJRdHL2DRzOMewQXZcoRadf2er8uOXM0EKtIbSCIZZ9l9LiYf1mmM8dJ n4NJnUWiJuMAfkEBMe1wYz0qF7IUtSnRZVM2mU5Tt5bIp7iU+FqvDy7eanX3MF1/sxs0P5 djvpsYpngKrGwtJjv2CBY72cJybUM8NGlBExT9oEz19rfIvpbKyb3evZtGrr+Pv9GK7+eX zfPHmuCvLP1WRv6SH4X1AG8EnF7y29zell1rPU8xm53fVSBxmunWarTPTtS/IPaRrb/TOk OYXTXs7Buk/EfbIYME2P6yme7d4gqCXWhWJXRdgdNytE4VcT6Ro7zhDA4FWaSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679918058; a=rsa-sha256; cv=none; b=FYKP/qz+FMhtYMBh1A9PyC4UeigU5q+TWtqXqOCeKWrQFhWWNCWVRTse9LQ77yR7JYEoYS b1Nf2V7y4XtMRIKMrNzPFmsgOzk6pxZZNjzQXNlHeKNNxhOYY8T+rEHzYKABrrFqilafjc 2p6xBzVqb36dJR1PYcz0buIRdmzgQK9qWEkvFqRPQW45BxhQ2ZxmJpeeoTLyPpSmYxUBWU NDMcRASPZ64EPaSoIgON0ON/JHZoiiw4lhh0DoBYnolbSE9KQS9ZIDiz0KV0drmke2cK/x JY3uQZRKvfDblS7WQOMHdiEQfCyiHFD1/CSOgNI5ORbFfwExl/0qYxjicRH8Wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlWSV38pczLc6; Mon, 27 Mar 2023 11:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RBsIls008076; Mon, 27 Mar 2023 11:54:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RBsIYb008075; Mon, 27 Mar 2023 11:54:18 GMT (envelope-from git) Date: Mon, 27 Mar 2023 11:54:18 GMT Message-Id: <202303271154.32RBsIYb008075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: eccccd657f01 - main - netlink: make nlattr_add_in[6]_addr inline List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eccccd657f018c35397e49b29cce527103bfd381 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=eccccd657f018c35397e49b29cce527103bfd381 commit eccccd657f018c35397e49b29cce527103bfd381 Author: Alexander V. Chernikov AuthorDate: 2023-03-27 11:53:34 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-27 11:53:34 +0000 netlink: make nlattr_add_in[6]_addr inline MFC after: 2 weeks --- sys/netlink/netlink_message_writer.c | 14 -------------- sys/netlink/netlink_message_writer.h | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/sys/netlink/netlink_message_writer.c b/sys/netlink/netlink_message_writer.c index 85cf5695643c..8a9315eedd1b 100644 --- a/sys/netlink/netlink_message_writer.c +++ b/sys/netlink/netlink_message_writer.c @@ -37,8 +37,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include #include @@ -688,15 +686,3 @@ nlmsg_end_dump(struct nl_writer *nw, int error, struct nlmsghdr *hdr) return (true); } - -bool -nlattr_add_in_addr(struct nl_writer *nw, int attrtype, const struct in_addr *in) -{ - return (nlattr_add(nw, attrtype, sizeof(*in), in)); -} - -bool -nlattr_add_in6_addr(struct nl_writer *nw, int attrtype, const struct in6_addr *in6) -{ - return (nlattr_add(nw, attrtype, sizeof(*in6), in6)); -} diff --git a/sys/netlink/netlink_message_writer.h b/sys/netlink/netlink_message_writer.h index 2f007e9a2b14..b86a755339c8 100644 --- a/sys/netlink/netlink_message_writer.h +++ b/sys/netlink/netlink_message_writer.h @@ -31,6 +31,8 @@ #ifdef _KERNEL +#include + /* * It is not meant to be included directly */ @@ -249,12 +251,6 @@ nlattr_add_s64(struct nl_writer *nw, int attrtype, int64_t value) return (nlattr_add(nw, attrtype, sizeof(int64_t), &value)); } -struct in_addr; -bool nlattr_add_in_addr(struct nl_writer *nw, int attrtype, const struct in_addr *in); - -struct in6_addr; -bool nlattr_add_in6_addr(struct nl_writer *nw, int attrtype, const struct in6_addr *in6); - static inline bool nlattr_add_flag(struct nl_writer *nw, int attrtype) { @@ -267,6 +263,16 @@ nlattr_add_string(struct nl_writer *nw, int attrtype, const char *str) return (nlattr_add(nw, attrtype, strlen(str) + 1, str)); } +static inline bool +nlattr_add_in_addr(struct nl_writer *nw, int attrtype, const struct in_addr *in) +{ + return (nlattr_add(nw, attrtype, sizeof(*in), in)); +} +static inline bool +nlattr_add_in6_addr(struct nl_writer *nw, int attrtype, const struct in6_addr *in6) +{ + return (nlattr_add(nw, attrtype, sizeof(*in6), in6)); +} #endif #endif From nobody Mon Mar 27 11:59: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 4PlWZr6xpCz42BD0; Mon, 27 Mar 2023 11:59: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 4PlWZr6PS1z3QQw; Mon, 27 Mar 2023 11:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679918388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CpN7VIth5NNHLZH3SYbVVwMIi6xC7uOD9I+EZ56hA4M=; b=i9Xth87MdfKlmPUIjZ0NEuFgCH9GS/ZJ0m6bdskr95RVfM7fyWpZGLcwepOeCEYBT9BHMu skkmstbvV3VXuB7HQwsMNCXXJeOmdzDn1cxjQpb5x/ZSXMmljOeE5NpGqRE1Ft0eACfb5a 0PHxGvDP8pv3kRWlm46di+QvqUkbbSFyeCXVDpjZQdTo9+0Fp69rY+FTESQeVsJ8gjLeOh txE/dPl5/iC6N8cQunNrzNI764MnBQjxsrxucbQhj1o/0j7h76x57FM+acQo2SopQPosXA ixXoeNunNDh7BcmF72yA+ryQcgTdrH7ujfmli/ZnQHgKP+uOgP0M6E9Yd5fIbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679918388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CpN7VIth5NNHLZH3SYbVVwMIi6xC7uOD9I+EZ56hA4M=; b=NnApXAE1VYbFLYin3WCtnsTqT4+muXLV8KACJL5YOUTEnSqmAG/Cg1Ldx/njw+D3OheaO0 XkISiYcxy58HgnLLVLijU1HsYhy/xp0kIn9A3I5EPk+VvCGZssYozNbjH3khGlEot/ea8L CXdPtCYRryBXcyW7VRx9cCmeKUClOpYOXfd0GdKRBE18VSI5xvcJw85XNEXoYAGVN9h5y3 E0gBu3bknxKM+IUlvEJuLg3j9UhDUfLYi3tbSXkbeRth62Y/i1okP4u+fxeMWhwnY4D8wF 3PmOR9ScsethQsHxfg+v2ERMXrqs+zlwr/GDuGL5/2I8I7j96J7+auEuIGAiKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679918388; a=rsa-sha256; cv=none; b=K0NXos0HMDd4yvs6dZVS7jjA6l4KIeEr5Gl+t6s0QTet0Z+ZG9f1mGlpRY0gbD2rFaMWI7 uW50ehi6lszpp72teyTOlqWGYceg50ZzyzbvN8i4xZocHAuYfQMdSqqtRPAvifJVU5rfsd K0F/Nsfgsu26Cpjl9pWrFyLhOesws9slozufXx/+YfukSw9DqEf/8OyWGpFC9inC0IOWQC y6wYpZS1G3tQQ73Lu+R97CIVzB067Yf1BSuk3fN93PTUgqza4/DKKZBVA4lW5npLHoDZ50 E+U55yOAWvK0HKVc2XiOdKA3CmPk3cvrXmeg00oXfvKnJi4CcnmJeJDkWqW+8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlWZr5LFFzLwr; Mon, 27 Mar 2023 11:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RBxm5D008905; Mon, 27 Mar 2023 11:59:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RBxmkj008904; Mon, 27 Mar 2023 11:59:48 GMT (envelope-from git) Date: Mon, 27 Mar 2023 11:59:48 GMT Message-Id: <202303271159.32RBxmkj008904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 12496806098d - main - kern.post.mk: fix PORTSDIR 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: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12496806098d9d9915817edcd0df17cdd27f60c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=12496806098d9d9915817edcd0df17cdd27f60c8 commit 12496806098d9d9915817edcd0df17cdd27f60c8 Author: Yuri Pankov AuthorDate: 2023-03-27 11:42:31 +0000 Commit: Yuri Pankov CommitDate: 2023-03-27 11:57:57 +0000 kern.post.mk: fix PORTSDIR handling Using subshell's PORTSDIR variable (via $${PORTSDIR}}) seems to be only working if PORTSDIR is specified directly on the make command line. Use ${PORTDIR} here instead so that setting the variable in /etc/{make,src,src-env}.conf would work (also works for variable being set on command line or in the environment). PR: 268299 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D37868 --- sys/conf/kern.post.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index da234d5b88a6..c368d5f40df8 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -133,7 +133,7 @@ PORTSMODULESENV=\ all: .for __i in ${PORTS_MODULES} @${ECHO} "===> Ports module ${__i} (all)" - cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean build + cd ${PORTSDIR:U/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean build .endfor .for __target in install reinstall clean @@ -141,7 +141,7 @@ ${__target}: ports-${__target} ports-${__target}: .for __i in ${PORTS_MODULES} @${ECHO} "===> Ports module ${__i} (${__target})" - cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/(re)?install/deinstall reinstall/} + cd ${PORTSDIR:U/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/(re)?install/deinstall reinstall/} .endfor .endfor .endif From nobody Mon Mar 27 12:51: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 4PlXkh5kqZz42Dlb; Mon, 27 Mar 2023 12:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PlXkh5GmZz3lkc; Mon, 27 Mar 2023 12:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=df40VVlMpYikuuXux63k+6AHg4ONjpKq62PvWREu8lM=; b=Y0JxwfEaRVUBZBSjECa9Ia9ChcZiEwWwH+wmihMu1jkBGJ120mB1Z4dsrR9ZekNwMZJFw/ 6PNzSDwriMHYd5YbYz/UNR9h2W7cK4CVb4aZk5I+axjNIPJZwfZc/3e/F+SYEXwxzcJDuj FI1MhaQF9TmGpvfyupnzH+fKTZeQ7+/0qvglMzmOVJARwUSzw5myHdtm96dGPrSgvi/PMo aA9pIsevH4XgLCcmW5LmAXAa/RWnSxPRWbKsNQMoJ3gSY9Y7D01+X0u1wBHCrQ4Qs8iuDH zvwP1y0ScPU5+5G4X5JXWkTzE79C4tTfr02YpecNV9F9GGt9lvmp/Mt0hy/HMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=df40VVlMpYikuuXux63k+6AHg4ONjpKq62PvWREu8lM=; b=CeUQR/zocWML5jQ3P0rLo3NIWdg83BLIUSs76jgukOTqrWwq3PTDG9ey4HHdPn+OgsQNNE MUqwYxfWh1obKFzPHbBX43d51kEQlp6vrS7A/gSqCXzeGpGEhKFQAzJEgln4p1Va5T4i+h IbNGtUcCDm5ze0X3fP/2tT9pmvMxcxeYwXDivXwJYUcp7q7G087d3fSxqBxpEIz98Hxk0B hSic4E+IOhBMgumOWNWg9W8YAlDQL2lYpqHgYueaLTCjuVX2CY94fUs+NonIhppP/PA/X6 Uk9YNZ7pn4IFBDhwwWwvyJrEVtCgQun9lVBhndFW9ECvSvkXx1soua4u7KUV5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679921500; a=rsa-sha256; cv=none; b=lysf9r2VhvNhy5TbhHgINeETb3ItYsI6HS6E3xrqXmog1GtrF4Khxr2Kl9rJYh/jQc9Q3+ HvWiXXYnp/c8ud80oL7OMTWfkTOkYPkUO1XbXsa3eIuaxWj4ya4mWsoH1Ha4mwcsERahiP Y+WqxFu7dNqDW78RPW7Y32drbFEF0nxyAnO829fQ8AhUlhzWklH8MDkxM8reAmd46gAxkw IAIQx2eSiazd5/YAkt/jA6EU3ptq7/wWblCSay+toqba2jG7CAQb+x8CvZt9N911fNVsee It6BnhEcNS0Ec/FUaubO/RPRRyguNXcJk4uchEhns6okllnnBAQ61JHtj9bajw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlXkh4M5nzN7n; Mon, 27 Mar 2023 12:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RCpe3o005772; Mon, 27 Mar 2023 12:51:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RCpe8D005771; Mon, 27 Mar 2023 12:51:40 GMT (envelope-from git) Date: Mon, 27 Mar 2023 12:51:40 GMT Message-Id: <202303271251.32RCpe8D005771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2d7021fa1846 - stable/13 - netipsec tests: Serialize List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2d7021fa184626ad01a86a96df755a1af45e6426 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2d7021fa184626ad01a86a96df755a1af45e6426 commit 2d7021fa184626ad01a86a96df755a1af45e6426 Author: Mark Johnston AuthorDate: 2023-03-20 16:15:32 +0000 Commit: Mark Johnston CommitDate: 2023-03-27 12:49:22 +0000 netipsec tests: Serialize The tunnel mode tests use VNET jails and reuse jail names. Until this is addressed, serialize them. MFC after: 1 week (cherry picked from commit cc9158d74d306fdbee2f5f014e5d267eca0aa6d1) --- tests/sys/netipsec/tunnel/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sys/netipsec/tunnel/Makefile b/tests/sys/netipsec/tunnel/Makefile index e80374940e95..3bac4d8cb0ab 100644 --- a/tests/sys/netipsec/tunnel/Makefile +++ b/tests/sys/netipsec/tunnel/Makefile @@ -14,6 +14,9 @@ ATF_TESTS_SH+= empty \ aesni_aes_gcm_128 \ aesni_aes_gcm_256 +# Each test uses the same names for its jails, so they must be run serially. +TEST_METADATA+= is_exclusive=true + ${PACKAGE}FILES+= utils.subr .include From nobody Mon Mar 27 12:51: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 4PlXkj6zkJz42DcS; Mon, 27 Mar 2023 12:51: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 4PlXkj6CPGz3lTG; Mon, 27 Mar 2023 12:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tMkFIwrELLjbflf2t14GM+ugFm1CpwYYmGRfXgLmLjc=; b=a19nUOQG5bT90TqXBqWE0lZaoGC/svLWIJ7++Hfdg2YVJEpa7aLUJwEzOD1nm9/f9oDe50 XbqzIGTAl4qS3WXCGCAkAhw1J4np6kDktD/m5dv9Vco+FUEWmYjYHmM1ldN2WOmpg9I4oZ 7gVM42Yx8qPBnDApY6rMv1uIEx1YQaiWTDVJUA2MttXzFcLry5fNBRJiRPd5X+avIsXllx IZJqcn6jlZNhNm2Uk3Yw1ExSUzLEUzYT3qPOqQQnAIJXEB/J0N/9RDGxZHDtZ6Oq1R+yYz vsZGJon+IZaw4Su4jc+Em6Egq27vFPGpgPA6MDGFB6wksSwxUs0UbP1j0cIKeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tMkFIwrELLjbflf2t14GM+ugFm1CpwYYmGRfXgLmLjc=; b=BHxiyNTsAe0YOm1feZhgs83LbJOnyCfmx/zWu56kWaSmEAbeSwfFoXN5HSqYkPs6aI84fW zs4eDiF+yMuV8oehXVUrORh/Q7jnLxdsXvrvIVqa4vu+0W+q3fHWzS7HM6zh+W8wVOKqGg bUWgxqKslqGSlvU6b1KxAAt3XaP7y7e5Z7ooAvet10HdJwddBgf7qed5jJ4gGi5KkdGzwz daA9Jh2TFkW44C+vYB2emyA0a6Z9Z2InWVuiXRdamDcsvGPNqJCJyBrYXhQLTXfLMp2MUy yrq7N/oS/WguiOctwNyMn2Gh8E0RltTV2od9QBEQ3TsIbVBJhcBpv8kI/KZ8bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679921501; a=rsa-sha256; cv=none; b=ee32Ik4wHgJMCRLKqCkZZgKC21IvuEOZYFGok24IZPsl9RXI1iNVjKQHbsQn6IjEpq7/uU 18F3oO1AKELR8zSmVPhDjJhfm6r7XNdp+TMudhUy8KvI7d5Y87FWVFyViNT6edHlC1bodV zzYALePzs7J7RxvWCm2zgdb/G32wlqG1zxp5K5F5hVvM7tUmz2G11vhwM7NmCjbPoLonzQ o3Z1pZc2Fxn6brGmPgCdjZ1BcwrrDbG6DVkJucf7VUfxXBPqVzlPP+gRykSpUnyQqcZZKT JAleyDZCG2h0wLn60ZNElBVX44Aq4ZSstOXdZss/jvJ7nVTf2LTafFAwg8iO5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlXkj5JQyzMrW; Mon, 27 Mar 2023 12:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RCpfDv005791; Mon, 27 Mar 2023 12:51:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RCpf9t005790; Mon, 27 Mar 2023 12:51:41 GMT (envelope-from git) Date: Mon, 27 Mar 2023 12:51:41 GMT Message-Id: <202303271251.32RCpf9t005790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3813808b1f2b - stable/13 - libdtrace: fix indendation in dt_printd() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3813808b1f2b492601031128179881434b930b5e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3813808b1f2b492601031128179881434b930b5e commit 3813808b1f2b492601031128179881434b930b5e Author: Christos Margiolis AuthorDate: 2023-03-20 13:34:20 +0000 Commit: Mark Johnston CommitDate: 2023-03-27 12:49:30 +0000 libdtrace: fix indendation in dt_printd() No functional change. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39145 (cherry picked from commit 3afba490c1266200e9fd899f2494aa47f71c6095) --- cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c index f028f99ccf64..2b85dd2b26b6 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c @@ -4767,8 +4767,8 @@ dt_printd(dt_node_t *dnp, FILE *fp, int depth) dt_printd(dnp->dn_pred, fp, 0); (void) fprintf(fp, "/\n"); } - (void) fprintf(fp, "{\n"); + (void) fprintf(fp, "{\n"); for (arg = dnp->dn_acts; arg != NULL; arg = arg->dn_list) dt_printd(arg, fp, depth + 1); (void) fprintf(fp, "}\n"); From nobody Mon Mar 27 12:51: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 4PlXkl0Dfcz42DnH; Mon, 27 Mar 2023 12:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PlXkk6nMmz3lt7; Mon, 27 Mar 2023 12:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQknzjTrng8HWo/5K4HCONWQlOJKq3BZkkNvzmpLwJI=; b=qy2YpKF4FahO8zOQOhzpvQ7YqZYiVdigMnfAzt7AtYDsQgtTZqymYmDxSIAci5idDNXqnQ 0mefAxRHkPJivHCDPbaFjJZwR1Ehh99a6M/nVDCHbXucGDKAUmrwBargz91OLZA3w19Cie AdThFDku64WufZIHCJSOzH5/vrGZ6Zj0kkQDKjzTbbjMWl6It4X5jcSs5oe5SdX4P7Dmrp unS0Oe8UJWZIv30JI/Fmh7fM3ez+u2Z6iVzum3HLiLOUQ2t0mnju6awvjpfbm/DwyCDGrJ T9RRdKACBxmvNQTpI/v22NY/lW5F9/MboPBfTMVcITe8bBSjivrpFFG64U2u3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQknzjTrng8HWo/5K4HCONWQlOJKq3BZkkNvzmpLwJI=; b=P5Nir4eDNte9lbv+jzTIXQE++nhiclHNIQMTc3JUZYkwrA8Kd3PfKjhcns4X58GdLIYhnW 2CmujgnvZzfalAlVMUXEpLgt67qU/vfnsTmEp8EwCaW7X3zP6uXOG9KuHbMz/cRXx46mw1 K4W2A/zT2BXx0TeBMASzzW2OcMWNqlHbar5g2loFpZSrj4zKV6ZaQVab0Xi8E8ujSdXS5y 6Mex9Og3MHwPKfoDRoEUw/G/VGD9PhT4G9qUqJFXdu5lhZlMtCrO5Vi4S1V0NpeVivrncU 43Xv1l7llC2DmQadP/DK85I6tUC3Jpksm3l1u8wyTFAl6bWXITJtTgIjOOEeNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679921503; a=rsa-sha256; cv=none; b=txcpGXzC1WUrpO8ysFaVk9092vkrosdjNTPuLXfYTA0eJm08dtoTk6ht9lMZEz3kIoov6j eJivo47CwFkrA43IqUCGb+gPnKv5zt75HS0lIPZqwH6Ib2GHT0jpbZFEaEzhn4A9C1fhG8 LDTEeuuR4RCbpJFDYyvtWIYUrW3Ckkmed9jcEXjuoH1DnKVy9KlAunRhoXgeHumltWRjV8 ZNbVu2PX++iogkduysZD4xR8ig3eyqDfF/TtfwYtuWIV33T2kTiMZYEIXY7Ft7R6xfgrgL d5P3TA1jc5hydhKPP5U3OXdUmBmW/LtJMZTj+2cF6nW/d6RkuoqJRHQ1FZxQ6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlXkk5qQXzNY7; Mon, 27 Mar 2023 12:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RCpgmp005810; Mon, 27 Mar 2023 12:51:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RCpg9X005809; Mon, 27 Mar 2023 12:51:42 GMT (envelope-from git) Date: Mon, 27 Mar 2023 12:51:42 GMT Message-Id: <202303271251.32RCpg9X005809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 743f4ba7e3bd - stable/13 - vmrun: Expose bhyve's -G 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 743f4ba7e3bd647f77f0e613de67005ade5db51f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=743f4ba7e3bd647f77f0e613de67005ade5db51f commit 743f4ba7e3bd647f77f0e613de67005ade5db51f Author: Mark Johnston AuthorDate: 2023-03-20 20:23:26 +0000 Commit: Mark Johnston CommitDate: 2023-03-27 12:49:39 +0000 vmrun: Expose bhyve's -G option MFC after: 1 week (cherry picked from commit b59f9d03cd87b721e22e1d2b37876d3d2a86a3f1) --- share/examples/bhyve/vmrun.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh index c3cd05356eea..9770ff459a67 100755 --- a/share/examples/bhyve/vmrun.sh +++ b/share/examples/bhyve/vmrun.sh @@ -58,7 +58,7 @@ usage() { "[-d ]" echo " [-e ] [-f ]" \ "[-F ]" - echo " [-H ]" + echo " [-G [w][address:]port] [-H ]" echo " [-I ] [-l ]" echo " [-L ]" echo " [-m ]" \ @@ -76,6 +76,7 @@ usage() { echo " -f: Use a specific UEFI firmware" echo " -F: Use a custom UEFI GOP framebuffer size" \ "(default: ${DEFAULT_VNCSIZE})" + echo " -G: bind the GDB stub to the specified address" echo " -H: host filesystem to export to the loader" echo " -i: force boot of the Installation CDROM image" echo " -I: Installation CDROM image location" \ @@ -132,7 +133,7 @@ vncport=${DEFAULT_VNCPORT} vncsize=${DEFAULT_VNCSIZE} tablet="" -while getopts aAc:C:d:e:Ef:F:g:hH:iI:l:L:m:n:p:P:t:Tuvw c ; do +while getopts aAc:C:d:e:Ef:F:G:hH:iI:l:L:m:n:p:P:t:Tuvw c ; do case $c in a) bhyverun_opt="${bhyverun_opt} -a" @@ -165,6 +166,9 @@ while getopts aAc:C:d:e:Ef:F:g:hH:iI:l:L:m:n:p:P:t:Tuvw c ; do F) vncsize="${OPTARG}" ;; + G) + bhyverun_opt="${bhyverun_opt} -G ${OPTARG}" + ;; H) host_base=`realpath ${OPTARG}` ;; From nobody Mon Mar 27 12:51: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 4PlXkm1BdPz42Dlh; Mon, 27 Mar 2023 12:51: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 4PlXkm0b6Tz3lqt; Mon, 27 Mar 2023 12:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/YcDFNyjdArFzxRPHgJKU073pa2flx6VUH+0WKi4LEc=; b=aJkf7svNVqAwHGKZ1j5N3GLWFu1A2I0KmNbKPPnh86RXzAuoiIGXxtjuAYqm9GcUSIJPZ+ 6AidiMRQ9tq4ddkgoZOWKPVbldB9MG/yhvTs7FwHbxALKzvHobsYgI67W4VyqzE1yecopO 2O+KyeMpbCbUzGUAATVPuEJ0RHQzfcN1P2hYCQyFOwQzfdKC+SEMJkFflol5w42uNCADT9 JvSrfTMW8jXI2KMqIAobRGkf8M3HyA44Ha/ll0DfjUHlfMMiW5D+XOowItw+Krx00CGg/u MD9H1wvAZRrjRgiuoXETi8jnENQajgYhbHKPpyQEGsd3jufNkzIIE4YXLXneEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/YcDFNyjdArFzxRPHgJKU073pa2flx6VUH+0WKi4LEc=; b=JMqJDt+o7U6+I3iTW69nAoBv2eCBklQyWa32yiLhNZNW7Xot7vL/Ggw9nC5tS+XjlU5o2d B9GfF7cOWp+X8/Bajs1XeNimbF5JxporDUxxjeo+RJ/8D0ex2vDZ2028xsmPd7DYzyXMfY szydHQ0AuT4Iccw33gnjR1N/wiwDT4l43sG8+jry0YZG+ZphWJxdE67iHr5d1hJRh8RYo4 A8dM6NzkT8nnCWbJM7yXS6gpVebs9flMbiVTrTwK/3nqV2vZf6lJYEUfG6NLWu1z5lvdwd 5Cj3kyPZM80Pt2Po588ovewxSShsou25dJ80QS3I3J/yhtM+QA1lVCdHtUAe7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679921504; a=rsa-sha256; cv=none; b=ng3HTNj40KYXYiHLcwJoL6tmJwcb074dstwTMzfmOnc5o1DEWArBo7YLdVRGFdfQJbQSVj LhB0vU6bl6AREI2hnL3LNd1z/pfosGilHrZL9I+q+zdeMNuMgc6EREYVFiJI2bdrddD0bE YAw7nh4bl5pIurs/ynt9Po/XbJZjOBzi9vaZxACaCEQGsM012pLUJeQRsqrtaHGPTfLoB/ VnYSRKLCSDzP9/49stwKSFt467O7Db5dlp3EpA2otiZJqeXcrW6gq/RolicRE2/f4Bm6El 0IHP8L9YsE/p16EN3RtkLerV4vkJ4WK6IS8+YsdKbRu96w1ZFvkzxrUwx0moPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlXkl6p3FzNSM; Mon, 27 Mar 2023 12:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RCphiV005829; Mon, 27 Mar 2023 12:51:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RCphUD005828; Mon, 27 Mar 2023 12:51:43 GMT (envelope-from git) Date: Mon, 27 Mar 2023 12:51:43 GMT Message-Id: <202303271251.32RCphUD005828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e6b1b944b5aa - stable/13 - netgraph tests: Serialize List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: e6b1b944b5aa1950834f27a8ab9188bcd736844d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e6b1b944b5aa1950834f27a8ab9188bcd736844d commit e6b1b944b5aa1950834f27a8ab9188bcd736844d Author: Mark Johnston AuthorDate: 2023-03-18 14:57:36 +0000 Commit: Mark Johnston CommitDate: 2023-03-27 12:49:58 +0000 netgraph tests: Serialize Some tests share names for netgraph nodes, so they cannot be run in parallel. MFC after: 1 week (cherry picked from commit bad8f86843fa34bf4d4d2bfb8183331c02ced87f) --- tests/sys/netgraph/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/sys/netgraph/Makefile b/tests/sys/netgraph/Makefile index f397e66a22bc..5a5e2ba13081 100644 --- a/tests/sys/netgraph/Makefile +++ b/tests/sys/netgraph/Makefile @@ -7,6 +7,8 @@ BINDIR= ${TESTSDIR} TAP_TESTS_SH+= ng_macfilter_test +# Serialize tests since some share netgraph node names. +TEST_METADATA+= is_exclusive=true TEST_METADATA.ng_macfilter_test+= required_user="root" TEST_METADATA.ng_macfilter_test+= required_programs="perl" From nobody Mon Mar 27 12:51: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 4PlXkn3YHJz42Dll; Mon, 27 Mar 2023 12:51: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 4PlXkn1cCTz3mJL; Mon, 27 Mar 2023 12:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y01ZkfQoaloapD+Ofky5J2IESwmkR4Sy23/xTFu0X4g=; b=P42dx4AnXB5OsJVPvvuiwi9c6WYIn0dbacbur+REaHaiB7OeNqt0AGPOLmIhg6y3pI8HPP zU4NNF5jrQSsGW5sHhVLrhSENgfgv5cSIbOdlXzobnTN3ebGV7iuGHLAKFNgYWrlnirNKE yf85PrVN200sTQZP54sDqeK07s9GjRa5JJ2px6au45WWsCdqWKmfjY9xnDS4IZoKjQ7cLs aCfb0gYv4M6VsFPX7shyTj/0L1ULS5eraSCW2qzx/u3dGyp0Ged00JZCExqt++2+V/eYlK vsZcH1m3nFlKM8tqQ97DJuvarx8u133qzeDfGFSGb7OUepiCRXSVFvO+eIWbpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y01ZkfQoaloapD+Ofky5J2IESwmkR4Sy23/xTFu0X4g=; b=hoe/dVJKLa99yjuhUA+E0TnnqbPKQopgPvW6AM3bN339WcOQKhSoQwGV6pixbWDkAxKMkV whDmmtSMKHvieEbXzX74OSAAo7PjgSCOvzezVpwMBqQSI9Klp8OBgtRieo2vnLSP5Z3BN4 xcrY/WDEMYziU94PQz1LJk7oVeqqq+OppE4nmDD7TscumhY6VOS2Hxb0952XKAYDAs1YWI vCutRUCysvmmpsepCY/2hnFtvJ/bwkuZzVLtzHAlHpW+VssQBo9rKmtzNTEU4zJR2ltrzU obpBjdd6GUgM2RVi3LAD43il3modHjkxz1DTDNxsz0niqllbowCphNxIljQf1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679921505; a=rsa-sha256; cv=none; b=M/8h/bTeLITaN4N2H8i7QEoOiEsMKEJC71YZFYV0J5COyyIDTPiqn3LDd66n5QeNsQbCuo /ObP8q1CnRVB8XgWlYzlekIWKJYnVu/RrBBo9BwLQk9tOZJGToP/VahsHpRGB+gXh6Yez2 dK8m9KJeOVTgZn6BD1JqXbH9rkpYj3HSOSyC4U0v9GwmG50naERxnfCA/uj7UGDTWZmwFU KE8hjTyG1nZ99F1cuHSz2q0HHZ38CqmgtDlC4Ipc154q7uXKTuk0kPG5/KQJIaTqNuB+hX 07sjN2AKbDi0jZkplwmmQm3zcMcIfBasTK88MYVzfVSqph1YzQNdI6v8tCiQDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlXkn0cGmzN7s; Mon, 27 Mar 2023 12:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RCpiTB005848; Mon, 27 Mar 2023 12:51:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RCpi1U005847; Mon, 27 Mar 2023 12:51:44 GMT (envelope-from git) Date: Mon, 27 Mar 2023 12:51:44 GMT Message-Id: <202303271251.32RCpi1U005847@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3b6598f8742c - stable/13 - bhyve: Sleep briefly in the VMEXIT_DEBUG handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b6598f8742cdab079cbce5485e9ddffbacdc1b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3b6598f8742cdab079cbce5485e9ddffbacdc1b4 commit 3b6598f8742cdab079cbce5485e9ddffbacdc1b4 Author: Mark Johnston AuthorDate: 2023-03-22 13:02:54 +0000 Commit: Mark Johnston CommitDate: 2023-03-27 12:50:12 +0000 bhyve: Sleep briefly in the VMEXIT_DEBUG handler As of commit 0bda8d3e9f7a ("vmm: permit some IPIs to be handled by userspace") and commit 9cc9abf409cc ("bhyve: create all vcpus on startup"), we have a misbehaviour where AP vCPU threads spin until they receive a SIPI. In particular, since they are "suspended", they simply call the VMEXIT_DEBUG handler in a loop, but the handler is a no-op by default. This is tricky to fix since the gdb stub isn't aware of whether a given vCPU is supposed to be running. For 13.2's sake, introduce a simple workaround wherein the VMEXIT_DEBUG handler sleeps for a short period. This ensures that host CPU usage remains sane when VMs are starting without penalizing users of VMEXIT_DEBUG too much. Reviewed by: corvink, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39174 (cherry picked from commit ef0ac973dbc8c54214ac8c61891abd832cd5b700) --- usr.sbin/bhyve/bhyverun.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 1becf998b976..5c8265571be9 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -911,6 +911,11 @@ vmexit_debug(struct vmctx *ctx __unused, struct vm_exit *vme __unused, #ifdef BHYVE_SNAPSHOT checkpoint_cpu_resume(*pvcpu); #endif + /* + * XXX-MJ sleep for a short period to avoid chewing up the CPU in the + * window between activation of the vCPU thread and the STARTUP IPI. + */ + usleep(1000); return (VMEXIT_CONTINUE); } From nobody Mon Mar 27 12:54: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 4PlXpF3k8qz42Dft; Mon, 27 Mar 2023 12:54: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 4PlXpF35TRz3njJ; Mon, 27 Mar 2023 12:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hAar9BPhvPqV5JZljdMpt7oBHYFxI6DgVkq7rQ+6uRo=; b=rtTpBlwVAPLnTAEgUqIVk6UNBU2lFPolYEALQ8U3fNWQDQxCC5Qb1j9UancPBqfW/D0orz +zpLN0PkNypwVprr3OTANiJUhdKB47O3PPx2CpuxX3uGxLH2p5FITR7ihjkTp0fzqCyc2O dFpfhGBz6WMgXBx06ob1qx+MDXXkaFA4dJYiqbp/C9BhgCGRofaI3YODCDmSKNoX9uYc0w 35PISosLOsfdejneeWikEAW2CHBdWFLkHaB7KFXT5t+1hy7lxS11eiPq4XNlvj5F+C7g5d nRaHIhTrzH5pJx+tEc0w1KHCnHrv/UssEJ2ACOVgQWlciy8JuFMgVdG75TO5ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hAar9BPhvPqV5JZljdMpt7oBHYFxI6DgVkq7rQ+6uRo=; b=TBnRF3fz4y2H13T9xqLxhYfhdm5jRwdVvrQLTHF7kXU3MhdjH8Awbuw7R3h1FBBXoAhFd1 XBFv1xYnZDQK3eeC6wUWVGXJcCSNCsGWEHLgkFN0Aeo90QBjke98sxqs5bt2Y/y3P/sLNr ytzlIOpfFCnfANuKT/bA+9tiPUjGLxHVNrCuPs2SwDTZ1+yrZBuLIkE140rAKBUJe/42Rx SIczn+ZbohaPLdYzCVfu3CnK+x0ZVrxw3VtoZbfeDbENlnF32LXWg9YfzRy4UyR110Zznn GgxdbHFbmo66wV0myDre82SXZvM3/4RxJDb3n1/DeEw9zca5mSBPgCLhllSFXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679921685; a=rsa-sha256; cv=none; b=KuIGRJwxUISO2vbh1V0tvz3s4xuk30insvlHhlfgjLfy04oTICIvRtuxSZ6aD+zoZOGd2X yKIQ+ISFAA/BENH2D5xsZ560VKKNygCLpKjsIF2hQl3ZZFGkhq+ZsK3Ext8Hik6mq1S7W8 acq5my7FAefBChTxcsQU/cEvW4LuMh+C0Kr3d/foflfgRZjAOSkQLIpbP+5Th6E+QNoPxp LQ4B8EJ61XofW8AERGBcPLwYG9jQB0ARxLyMFMLrA60+FVND0WZXoys+Qz3k7jZXR03rc/ HB/JN9/pa99tiMkCZ2MhElfJT6x9inLY+UD/WwKe1U0TXxxxnP3Kvm2FgUlCbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlXpF14pJzNSn; Mon, 27 Mar 2023 12:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RCsjc2007274; Mon, 27 Mar 2023 12:54:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RCsjJA007273; Mon, 27 Mar 2023 12:54:45 GMT (envelope-from git) Date: Mon, 27 Mar 2023 12:54:45 GMT Message-Id: <202303271254.32RCsjJA007273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 6aa5b10d0c24 - main - nvme: fix resv commands with nda 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: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6aa5b10d0c245eef2410e82a02920131f65f83a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=6aa5b10d0c245eef2410e82a02920131f65f83a3 commit 6aa5b10d0c245eef2410e82a02920131f65f83a3 Author: Yuri Pankov AuthorDate: 2023-03-27 12:11:59 +0000 Commit: Yuri Pankov CommitDate: 2023-03-27 12:53:24 +0000 nvme: fix resv commands with nda device - passing I/O commands through nda requires nsid field to be set (it was unused when going through nvme_ns_ioctl()) - ccb's status can be OR'ed with the flags, use CAM_STATUS_MASK Reviewed by: imp (cam) Differential Revision: https://reviews.freebsd.org/D37696 --- sbin/nvmecontrol/resv.c | 4 ++++ sys/cam/nvme/nvme_da.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/resv.c b/sbin/nvmecontrol/resv.c index adb3b64c9ec3..8649c0da8a91 100644 --- a/sbin/nvmecontrol/resv.c +++ b/sbin/nvmecontrol/resv.c @@ -255,6 +255,7 @@ resvacquire(const struct cmd *f, int argc, char *argv[]) memset(&pt, 0, sizeof(pt)); pt.cmd.opc = NVME_OPC_RESERVATION_ACQUIRE; + pt.cmd.nsid = htole32(nsid); pt.cmd.cdw10 = htole32((acquire_opt.racqa & 7) | (acquire_opt.rtype << 8)); pt.buf = &data; @@ -293,6 +294,7 @@ resvregister(const struct cmd *f, int argc, char *argv[]) memset(&pt, 0, sizeof(pt)); pt.cmd.opc = NVME_OPC_RESERVATION_REGISTER; + pt.cmd.nsid = htole32(nsid); pt.cmd.cdw10 = htole32((register_opt.rrega & 7) | (register_opt.iekey << 3) | (register_opt.cptpl << 30)); pt.buf = &data; @@ -330,6 +332,7 @@ resvrelease(const struct cmd *f, int argc, char *argv[]) memset(&pt, 0, sizeof(pt)); pt.cmd.opc = NVME_OPC_RESERVATION_RELEASE; + pt.cmd.nsid = htole32(nsid); pt.cmd.cdw10 = htole32((release_opt.rrela & 7) | (release_opt.rtype << 8)); pt.buf = &data; @@ -369,6 +372,7 @@ resvreport(const struct cmd *f, int argc, char *argv[]) bzero(data, sizeof(data)); memset(&pt, 0, sizeof(pt)); pt.cmd.opc = NVME_OPC_RESERVATION_REPORT; + pt.cmd.nsid = htole32(nsid); pt.cmd.cdw10 = htole32(sizeof(data) / 4 - 1); pt.cmd.cdw11 = htole32(report_opt.eds); /* EDS */ pt.buf = &data; diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 3e37abe0f6e4..51689d0e4a23 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -441,7 +441,8 @@ ndaioctl(struct disk *dp, u_long cmd, void *data, int fflag, */ cam_periph_unlock(periph); cam_periph_unmapmem(ccb, &mapinfo); - error = (ccb->ccb_h.status == CAM_REQ_CMP) ? 0 : EIO; + error = (ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP ? + 0 : EIO; out: cam_periph_lock(periph); xpt_release_ccb(ccb); From nobody Mon Mar 27 12:56: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 4PlXrG5Z0Gz42FGG; Mon, 27 Mar 2023 12:56: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 4PlXrG52hTz3ntL; Mon, 27 Mar 2023 12:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zhaj/PrS7O4pdHDTzQuE/fudkbQVj/aVIlH50C9UNno=; b=kj+ryrJ/CkWmKPCvGWPYqd77YpSSVJ9Q3Yw6BL1AS/IO10GTJ6YprruSI3SA1D5f/4fiUx PU44WhbnDb09xoKX4784GbrpnY4PLoZuuH6jfxUHJhyDOabHBOIMvDxmKvsmAT+ih1iGo+ woYzQa27hm2p93KWTEydKNJSnGlOU7MJWvt+FPfQ2Sr1HE9+CGF/w0VoqaXECqV2dTBO1+ E3xWqRBmUBRmBzkuzBv4ZPS+RSK3bdDBTV62/0TBJ9TbPkaQpWmFFvQPW0HrIzQa8z7bm1 H1Mon00s9KtpD3fd6XJXTI9n6zsJjDXhhv3Xe8MnaSjKGwmfSQ+jlOzXdQLcTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zhaj/PrS7O4pdHDTzQuE/fudkbQVj/aVIlH50C9UNno=; b=jBkKltIslfF1JnUuo5TesSqK08c0FDRJi1WdLAKODH7k02/bM9eKNrjWu10BqaUfSwdAPR Jw/WxHXUzBAYJHZuVH2BsNt59WPuwCRR960DTK6G/DTFRBEm+5vQo15HB2iRL+N3P37Ykk 82rr+ieNObOyZJO/JpqDB+8YAkR0zmYT2aSq5RCj2x+MwPPk2PzGmwnHewyrt81tqspfTi J+a6hSbbE0asKccL2Le/h2CPX9Gv7t51eyQmZirR2k53GGaNGBJ+p3WDDUphdoYSvEMmFm BAZ/4T97prePyCNdZf1ziCuO+i+N0jokXlwh+MdbOwn2WAtRoOoE6A0ZIdySRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679921790; a=rsa-sha256; cv=none; b=ic+KdZeqFeEF7LWdeV3qlAcShpmTu8IQPBL/WZQ5XX9rfGE3+KUr6c6e+8+sdnUbYsrB/c DQtRtlkQHk9+dNPXL8OIWyBDFlGyEasbXE+kleGdFF/0nfDEZ4RDN4Xu/6MFoGe2quS8Q6 cJPPR/uyxq+sM/PjgGADVdjuHxsPkKtRRZIVyydcAqM8LtL00RfRIqYaMCByTmz4xkP6y8 DP77W26toc6pgH6CaQJ7kmsLQ7T87x+790CHXoubpe7j4lU93EuMETcxBmwTV5HGy4hlQd Yh7xUlDLt5f6v3QZeo20DTKKNtCI3BDBU/NvUpC28DliGX69NH5o3/fbH/eS5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlXrG46hGzNbm; Mon, 27 Mar 2023 12:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RCuUdV007607; Mon, 27 Mar 2023 12:56:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RCuUCa007606; Mon, 27 Mar 2023 12:56:30 GMT (envelope-from git) Date: Mon, 27 Mar 2023 12:56:30 GMT Message-Id: <202303271256.32RCuUCa007606@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: ad2f2ee01543 - main - arm64: Remove duplicated function prototypes for PAC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: ad2f2ee01543e219b6af6a839d833a117806bad7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ad2f2ee01543e219b6af6a839d833a117806bad7 commit ad2f2ee01543e219b6af6a839d833a117806bad7 Author: Mark Johnston AuthorDate: 2023-03-26 18:33:33 +0000 Commit: Mark Johnston CommitDate: 2023-03-27 12:56:22 +0000 arm64: Remove duplicated function prototypes for PAC No functional change intended. Sponsored by: The FreeBSD Foundation --- sys/arm64/include/cpu.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 280a759a4f06..88a9ac18080b 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -209,17 +209,6 @@ void ptrauth_thread0(struct thread *); void ptrauth_mp_start(uint64_t); #endif -/* Pointer Authentication Code (PAC) support */ -void ptrauth_init(void); -void ptrauth_fork(struct thread *, struct thread *); -void ptrauth_exec(struct thread *); -void ptrauth_copy_thread(struct thread *, struct thread *); -void ptrauth_thread_alloc(struct thread *); -void ptrauth_thread0(struct thread *); -#ifdef SMP -void ptrauth_mp_start(uint64_t); -#endif - /* Functions to read the sanitised view of the special registers */ void update_special_regs(u_int); bool extract_user_id_field(u_int, u_int, uint8_t *); From nobody Mon Mar 27 12:56: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 4PlXrH6Yf1z42FBG; Mon, 27 Mar 2023 12:56: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 4PlXrH677Hz3p59; Mon, 27 Mar 2023 12:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pikq2JDsJ00JJiXISSuD9Zt4G2Tlg5M94wD8zNtxWho=; b=SJ5ky5umaiIZQqrarvaiQwl/a+z5UQYv5taQVUUtvofyPdIK1JPz/NAnMRGdsSTugkOXrr wy6oyUGjX0Spm+TJinA3Erk5aEypFGfWeFEpbReF7w7VZBtJ40Rw/SNjgE/rcbAq15ZZ9e wzTPNDXGCO0eTPCqZC1syu8iruh5XJ/tWUJZ2ZtdjkiWg2ktpRO9eNbNlqB45upQ5uhxrl xKHx0veSitJgV4F4XO4SkCMcUkvem62GaT0M5f+OUXR9oj1lY97gU6mKUaVqMDE/XrODuT iQ3dc8KMN4o4t8tfjG6Lp1O3sTARhqQ11jeg7qZ6wdEL+BWIRmMx+Q5BzkZhzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679921791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pikq2JDsJ00JJiXISSuD9Zt4G2Tlg5M94wD8zNtxWho=; b=edio1rpv34pCR0h6CDsyKjvdy8Saxuxzt7D0YjzdWxafW+aWNT3he/sTTw9chOdO7QSmJ/ zzfQsJQ/YqJIU+MZfyT6LUFcuDWRvLf4GpPUZBSBOJNcc6HG0NJat528VHna+azcs0kSJC sWAeIVAMB7pEl2mSjgaHnyTkooYSV4PfUe1DRw+KlFSrvw04b5sPQZYRVLEeqA06inaeV/ 2T4+Fb8GWzCCNtmtrPMZp+UEzjVlgWnjsHy5M4KHzMgnwXCfRVU749mhbzHFjAaDnkfxnb +KFIlqrWpL7FI8fFNIvvv4I+LJ1nF6ngUE4jFBMpjIg5qSDR7k0G5Slh0sRFrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679921791; a=rsa-sha256; cv=none; b=yW7+NMaM5/SoI2J5DcCtw8Tca+UbH6Phjx2TtJM0URJErVRy6og/WpIK+zREvnNI/gzNN8 0f9OIiH3VEzXbQ/peYcMEcZAKsTDUVIRwymh1i5pS6ULSCJr4lgjNuTE/P8nuXK/YBqLIi J6fQ6DX64/5UiSvJfWJauu5Sg3ihxc4cv9qk9Mf4OQWsY+Ru4q3mDwupgk81sFUE2fQ460 Obp6f20J4ApxRt89zK0dzkVURPke46fnkvKUDnoztsob98RVphYsWIXoiheYWpX95jhlGm l4dsPZ0nQgMOM+oDDDSj75GfdMOL4czK1Y8bTnA8HkaZkPWXsUA/1ZMWmdHELg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlXrH54wdzN8J; Mon, 27 Mar 2023 12:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RCuVBa007626; Mon, 27 Mar 2023 12:56:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RCuV1K007625; Mon, 27 Mar 2023 12:56:31 GMT (envelope-from git) Date: Mon, 27 Mar 2023 12:56:31 GMT Message-Id: <202303271256.32RCuV1K007625@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: 68ca8363c7a1 - main - libc: Use secure_getenv(3) where appropriate List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 68ca8363c7a19d5351dc2b10568cbf2403e07e33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=68ca8363c7a19d5351dc2b10568cbf2403e07e33 commit 68ca8363c7a19d5351dc2b10568cbf2403e07e33 Author: Mark Johnston AuthorDate: 2023-03-27 12:55:01 +0000 Commit: Mark Johnston CommitDate: 2023-03-27 12:56:22 +0000 libc: Use secure_getenv(3) where appropriate No functional change intended. Reviewed by: mjg, imp, kib Differential Revision: https://reviews.freebsd.org/D39278 --- lib/libc/db/btree/bt_open.c | 5 ++--- lib/libc/db/hash/hash_page.c | 5 ++--- lib/libc/gen/fstab.c | 8 ++------ lib/libc/gen/glob-compat11.c | 3 +-- lib/libc/gen/glob.c | 3 +-- lib/libc/iconv/citrus_iconv.c | 5 +++-- lib/libc/iconv/citrus_module.c | 4 ++-- lib/libc/locale/setlocale.c | 4 ++-- lib/libc/net/hesiod.c | 10 ++-------- lib/libc/net/rcmd.c | 2 +- lib/libc/nls/msgcat.c | 2 +- lib/libc/posix1e/mac.c | 5 ++--- lib/libc/resolv/res_init.c | 2 +- lib/libc/resolv/res_query.c | 4 +--- lib/libc/stdio/tempnam.c | 2 +- lib/libc/stdio/tmpfile.c | 4 +--- 16 files changed, 25 insertions(+), 43 deletions(-) diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c index ce3b8a1ecf1b..06bbd39f1842 100644 --- a/lib/libc/db/btree/bt_open.c +++ b/lib/libc/db/btree/bt_open.c @@ -391,11 +391,10 @@ tmp(void) { sigset_t set, oset; int fd, len; - char *envtmp = NULL; + char *envtmp; char path[MAXPATHLEN]; - if (issetugid() == 0) - envtmp = getenv("TMPDIR"); + envtmp = secure_getenv("TMPDIR"); len = snprintf(path, sizeof(path), "%s/bt.XXXXXXXXXX", envtmp ? envtmp : "/tmp"); if (len < 0 || len >= (int)sizeof(path)) { diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c index fba854b51f33..afcda6321133 100644 --- a/lib/libc/db/hash/hash_page.c +++ b/lib/libc/db/hash/hash_page.c @@ -855,11 +855,10 @@ open_temp(HTAB *hashp) { sigset_t set, oset; int len; - char *envtmp = NULL; + char *envtmp; char path[MAXPATHLEN]; - if (issetugid() == 0) - envtmp = getenv("TMPDIR"); + envtmp = secure_getenv("TMPDIR"); len = snprintf(path, sizeof(path), "%s/_hash.XXXXXX", envtmp ? envtmp : "/tmp"); if (len < 0 || len >= (int)sizeof(path)) { diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c index 3813202afb15..718373931757 100644 --- a/lib/libc/gen/fstab.c +++ b/lib/libc/gen/fstab.c @@ -259,12 +259,8 @@ setfsent(void) LineNo = 0; return (1); } - if (fsp_set == 0) { - if (issetugid()) - setfstab(NULL); - else - setfstab(getenv("PATH_FSTAB")); - } + if (fsp_set == 0) + setfstab(secure_getenv("PATH_FSTAB")); if ((_fs_fp = fopen(path_fstab, "re")) != NULL) { LineNo = 0; return (1); diff --git a/lib/libc/gen/glob-compat11.c b/lib/libc/gen/glob-compat11.c index 76a4553c922c..26dc9db9ff29 100644 --- a/lib/libc/gen/glob-compat11.c +++ b/lib/libc/gen/glob-compat11.c @@ -422,8 +422,7 @@ globtilde(const Char *pattern, Char *patbuf, size_t patbuf_len, glob11_t *pglob) * we're not running setuid or setgid) and then trying * the password file */ - if (issetugid() != 0 || - (h = getenv("HOME")) == NULL) { + if ((h = secure_getenv("HOME")) == NULL) { if (((h = getlogin()) != NULL && (pwd = getpwnam(h)) != NULL) || (pwd = getpwuid(getuid())) != NULL) diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c index 2e8bf6310641..43dd77df8119 100644 --- a/lib/libc/gen/glob.c +++ b/lib/libc/gen/glob.c @@ -453,8 +453,7 @@ globtilde(const Char *pattern, Char *patbuf, size_t patbuf_len, glob_t *pglob) * we're not running setuid or setgid) and then trying * the password file */ - if (issetugid() != 0 || - (h = getenv("HOME")) == NULL) { + if ((h = secure_getenv("HOME")) == NULL) { if (((h = getlogin()) != NULL && (pwd = getpwnam(h)) != NULL) || (pwd = getpwuid(getuid())) != NULL) diff --git a/lib/libc/iconv/citrus_iconv.c b/lib/libc/iconv/citrus_iconv.c index 88dfc2deca33..27f88c6a47ab 100644 --- a/lib/libc/iconv/citrus_iconv.c +++ b/lib/libc/iconv/citrus_iconv.c @@ -81,8 +81,9 @@ init_cache(void) _CITRUS_HASH_INIT(&shared_pool, CI_HASH_SIZE); TAILQ_INIT(&shared_unused); shared_max_reuse = -1; - if (!issetugid() && getenv(CI_ENV_MAX_REUSE)) - shared_max_reuse = atoi(getenv(CI_ENV_MAX_REUSE)); + if (secure_getenv(CI_ENV_MAX_REUSE) != NULL) + shared_max_reuse = + atoi(secure_getenv(CI_ENV_MAX_REUSE)); if (shared_max_reuse < 0) shared_max_reuse = CI_INITIAL_MAX_REUSE; isinit = true; diff --git a/lib/libc/iconv/citrus_module.c b/lib/libc/iconv/citrus_module.c index bd173b41bb04..76db1bc7df9c 100644 --- a/lib/libc/iconv/citrus_module.c +++ b/lib/libc/iconv/citrus_module.c @@ -282,8 +282,8 @@ _citrus_load_module(_citrus_module_t *rhandle, const char *encname) int maj, min; if (_pathI18nModule == NULL) { - p = getenv("PATH_I18NMODULE"); - if (p != NULL && !issetugid()) { + p = secure_getenv("PATH_I18NMODULE"); + if (p != NULL) { _pathI18nModule = strdup(p); if (_pathI18nModule == NULL) return (ENOMEM); diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c index e0ba66e0e35a..bb60418f3583 100644 --- a/lib/libc/locale/setlocale.c +++ b/lib/libc/locale/setlocale.c @@ -312,9 +312,9 @@ int __detect_path_locale(void) { if (_PathLocale == NULL) { - char *p = getenv("PATH_LOCALE"); + char *p = secure_getenv("PATH_LOCALE"); - if (p != NULL && !issetugid()) { + if (p != NULL) { if (strlen(p) + 1/*"/"*/ + ENCODING_LEN + 1/*"/"*/ + CATEGORY_LEN >= PATH_MAX) return (ENAMETOOLONG); diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c index 0966b6d7ef91..f456e76316a1 100644 --- a/lib/libc/net/hesiod.c +++ b/lib/libc/net/hesiod.c @@ -92,10 +92,7 @@ hesiod_init(context) ctx = malloc(sizeof(struct hesiod_p)); if (ctx) { *context = ctx; - if (!issetugid()) - configname = getenv("HESIOD_CONFIG"); - else - configname = NULL; + configname = secure_getenv("HESIOD_CONFIG"); if (!configname) configname = _PATH_HESIOD_CONF; if (read_config_file(ctx, configname) >= 0) { @@ -103,10 +100,7 @@ hesiod_init(context) * The default rhs can be overridden by an * environment variable. */ - if (!issetugid()) - p = getenv("HES_DOMAIN"); - else - p = NULL; + p = secure_getenv("HES_DOMAIN"); if (p) { if (ctx->rhs) free(ctx->rhs); diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c index e8b4ffd356c4..2a6edd66440c 100644 --- a/lib/libc/net/rcmd.c +++ b/lib/libc/net/rcmd.c @@ -97,7 +97,7 @@ rcmd_af(char **ahost, int rport, const char *locuser, const char *remuser, static char canonnamebuf[MAXDNAME]; /* is it proper here? */ /* call rcmdsh() with specified remote shell if appropriate. */ - if (!issetugid() && (p = getenv("RSH"))) { + if ((p = secure_getenv("RSH")) != NULL) { struct servent *sp = getservbyname("shell", "tcp"); if (sp && sp->s_port == rport) diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c index f27bf7918b88..7f687258e5c3 100644 --- a/lib/libc/nls/msgcat.c +++ b/lib/libc/nls/msgcat.c @@ -196,7 +196,7 @@ __catopen_l(const char *name, int type, locale_t locale) pcode = cptr; } - if ((nlspath = getenv("NLSPATH")) == NULL || issetugid()) + if ((nlspath = secure_getenv("NLSPATH")) == NULL) nlspath = _DEFAULT_NLS_PATH; if ((base = cptr = strdup(nlspath)) == NULL) { diff --git a/lib/libc/posix1e/mac.c b/lib/libc/posix1e/mac.c index a8e0abe7afff..7747b62b7c72 100644 --- a/lib/libc/posix1e/mac.c +++ b/lib/libc/posix1e/mac.c @@ -177,9 +177,8 @@ mac_init_internal(int ignore_errors) LIST_INIT(&label_default_head); - if (!issetugid() && getenv("MAC_CONFFILE") != NULL) - filename = getenv("MAC_CONFFILE"); - else + filename = secure_getenv("MAC_CONFFILE"); + if (filename == NULL) filename = MAC_CONFFILE; file = fopen(filename, "re"); if (file == NULL) diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c index 274ffbf999d6..40d3373e813d 100644 --- a/lib/libc/resolv/res_init.c +++ b/lib/libc/resolv/res_init.c @@ -277,7 +277,7 @@ __res_vinit(res_state statp, int preinit) { #endif /* SOLARIS2 */ /* Allow user to override the local domain definition */ - if (issetugid() == 0 && (cp = getenv("LOCALDOMAIN")) != NULL) { + if ((cp = secure_getenv("LOCALDOMAIN")) != NULL) { (void)strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1); statp->defdname[sizeof(statp->defdname) - 1] = '\0'; haveenv++; diff --git a/lib/libc/resolv/res_query.c b/lib/libc/resolv/res_query.c index 8270e26ecdfb..10ac46ced8af 100644 --- a/lib/libc/resolv/res_query.c +++ b/lib/libc/resolv/res_query.c @@ -457,9 +457,7 @@ res_hostalias(const res_state statp, const char *name, char *dst, size_t siz) { if (statp->options & RES_NOALIASES) return (NULL); - if (issetugid()) - return (NULL); - file = getenv("HOSTALIASES"); + file = secure_getenv("HOSTALIASES"); if (file == NULL || (fp = fopen(file, "re")) == NULL) return (NULL); setbuf(fp, NULL); diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c index 2d7bd90e08a4..4a720fd4c1cb 100644 --- a/lib/libc/stdio/tempnam.c +++ b/lib/libc/stdio/tempnam.c @@ -60,7 +60,7 @@ tempnam(const char *dir, const char *pfx) if (!pfx) pfx = "tmp."; - if (issetugid() == 0 && (f = getenv("TMPDIR"))) { + if ((f = secure_getenv("TMPDIR")) != NULL) { (void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXX", f, *(f + strlen(f) - 1) == '/'? "": "/", pfx); if ((f = _mktemp(name))) diff --git a/lib/libc/stdio/tmpfile.c b/lib/libc/stdio/tmpfile.c index e5ee1be2884e..aedaab6e1262 100644 --- a/lib/libc/stdio/tmpfile.c +++ b/lib/libc/stdio/tmpfile.c @@ -60,9 +60,7 @@ tmpfile(void) char *buf; const char *tmpdir; - tmpdir = NULL; - if (issetugid() == 0) - tmpdir = getenv("TMPDIR"); + tmpdir = secure_getenv("TMPDIR"); if (tmpdir == NULL) tmpdir = _PATH_TMP; From nobody Mon Mar 27 13:04: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 4PlY1D6ywTz42FKc; Mon, 27 Mar 2023 13:04: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 4PlY1D64Ftz3qjj; Mon, 27 Mar 2023 13:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679922256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0SdAd9zqt/tWOc/x4LgeTu5LzSpQlcdks9YAPwagly4=; b=EErrIvhXMksMC6M3MivHgMIfKtL8YB8bRD2K6P47HumpHm9NZ87UZyER/HZ+kbhKSSLDE3 ry5DSu5QXNE8oDMZQ6ZGTpcO1GWHkPUk19mA0qjFIraBrBo1QANp/8NuWzwkSQaWohVy/b 5T//3bsdQ59KcXcmhD9mljvMCA4ytPN63DG+YsMQqcMsz7fpvoSiYWuGuYGwAuOtyAtYge VT2dM6F97N8sGKcjhINWI2oLf0MtbTjQBzP4BseQ6AtTy4pVIWxJWnhLOI92mKHmBLJNGR Cs9V4ncNSBK8Xs7MP3/6bcafL4mLQSaEc/ubRgfzQ7eqK47ff7cSxnDOeDYwqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679922256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0SdAd9zqt/tWOc/x4LgeTu5LzSpQlcdks9YAPwagly4=; b=ydTUfW1iOvrklHFvwnbDqau4Wv/gAV4xiuBqLANQsmg7rw7MIfeiqEAMvbORTvIBT7GRhq EQn7II6jqsWfLSPDfCIaENE0XYhJzLxKP1sM09FId0khnm2aXVGIPDaBMgsIQ1l6aeDllI lRuuUihvO514Geh43E5ZGheaA7+p2siJiRTSUiB8ABWOEhJJWNGv8eucAWrijWsIyUXpx0 /CxxPz6ylSidxn3S+tuMuF/KEDIB8kZiwVcHl9JEFPRewiI4x8DkI+q/xhC/IFIKEFB1pm l5s2kcJYHQ046AdYcZYkXzHiXCT3m9bpQUJJoYLWhIBLAGnQia+V9rmDxsJP3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679922256; a=rsa-sha256; cv=none; b=eeFRPrVcS/xRDLlN5N1DTmzTHxdw3uhn4Z5khQxqw2q4GZF2iSvQyX4RYUaANECqfendXE C+DFuOtrTVq4alMCIkaMd1wg8bPNdI0Ulmc8vsCM3o7ZqGnesBjfqzmzUIIsQmOew07G2m vUj2ZGXTydnE1mYnoMxHjc4e9mUcPlluZPhvwzEbacuHln1wwOrrSfOikQkD1w7pb9GJg6 H/ly1KKJij3eZNkh4XfuX6ZibOxkHsYqwchLk+/yEUIyRha/blAEedMjZESobKb2xNuf8Y S25wmMngpQS+9voi9Cr8WzPXRUCDS3/Zt0KZ5qy74MI1YdIuz/GTsqYff8Vfng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlY1D57fQzNHk; Mon, 27 Mar 2023 13:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RD4GuX024523; Mon, 27 Mar 2023 13:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RD4GAL024522; Mon, 27 Mar 2023 13:04:16 GMT (envelope-from git) Date: Mon, 27 Mar 2023 13:04:16 GMT Message-Id: <202303271304.32RD4GAL024522@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 21af4e09f4e8 - main - nvmecontrol(8): fix resv register -i synopsis List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21af4e09f4e8b17eae6d617f6433e7116f6b17a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=21af4e09f4e8b17eae6d617f6433e7116f6b17a3 commit 21af4e09f4e8b17eae6d617f6433e7116f6b17a3 Author: Yuri Pankov AuthorDate: 2023-03-27 12:59:03 +0000 Commit: Yuri Pankov CommitDate: 2023-03-27 13:00:33 +0000 nvmecontrol(8): fix resv register -i synopsis -i is "ignore existing key" and does not take argument Reviewed by: pauamma (manpages) Differential Revision: https://reviews.freebsd.org/D37709 --- sbin/nvmecontrol/nvmecontrol.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/nvmecontrol/nvmecontrol.8 b/sbin/nvmecontrol/nvmecontrol.8 index 3d130497f1bb..4a1b9e73c199 100644 --- a/sbin/nvmecontrol/nvmecontrol.8 +++ b/sbin/nvmecontrol/nvmecontrol.8 @@ -35,7 +35,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 19, 2020 +.Dd December 14, 2022 .Dt NVMECONTROL 8 .Os .Sh NAME @@ -129,10 +129,10 @@ .Aq Ar namespace-id .Nm .Ic resv register +.Op Fl i .Op Fl c Ar crkey .Aq Fl k Ar nrkey .Aq Fl r Ar rrega -.Op Fl i Ar iekey .Op Fl p Ar cptpl .Aq Ar namespace-id .Nm From nobody Mon Mar 27 13:55: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 4PlZ8m4DKcz41Z4r; Mon, 27 Mar 2023 13: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 4PlZ8m3cYRz3w77; Mon, 27 Mar 2023 13:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679925352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=No4P4rfUMoV3/oJMpWHDerBczboVVXn2AwVyQ6I7c7Y=; b=lRO/TgKftgfqM/ZTuMI5olhGXSppGP5TSuFGOXPFrRij+V9LehjJOzus6XzmRVsmyxeRo9 wdggED9Sm0YbrkWWWh7WvqPljxZOqv9swt94EiwHiL74gjiiw2Wo+NMdsmX7/GpK0+4U1y I/bMtB7wgDjGNJc6IoCp000ikkCBCez1HwRwobBk3plS0jaOGZm1Obs9P6AwEGGcvR2iUL wKRFUN+/AtpHOXYCynnhj44XVWlaWwyqYfiLvLFZnJPJpI+aLeFbBR1vpF4sfYNZJNr17S Zbwja5JeAr7rhCLqS0Ww4UwCqJaCQYiZ0u0C+Z/1d/Evg8+m++bdV7o4kbQcuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679925352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=No4P4rfUMoV3/oJMpWHDerBczboVVXn2AwVyQ6I7c7Y=; b=FZWZur+eQLTWGso0b/X4Iki3j9JK3d4kzhYHoaaUb9hppejU6vBX+CT04+diyKIoP8tqRP MFX8764sPp/Wb3U/ugigT58XEPsmBzGPFVoGnga7oiKS9LeHobgBqWIHgp2gw25KZlvaqD l5m7q3L7vjrsZ5fLWJiQigHs6ItDaPD9e675A48PLZGqFj9CVX9I6hy7WO6WD/NexV2p14 4wVqe6IOc9A/tjYZ7sCb/nwrOC+eTkg3boidVWdmGhGPplEcJJXsX4C9PsLtnAlzpQAKhK wvDbtnAUIo+PlSWS5hsLm+R0ObA9MArY9gKx8MVMC1rFOT6Dxra4Qjty6BIiEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679925352; a=rsa-sha256; cv=none; b=l6XNBMzFg8jxIglFVzFLIhjOSx9234a3GBqT8X1iratHs0zNcr0hgJP1TAiVNylNXgdETI NM/kOtNx70V0H8rT4DShpCf1S7aFYMJmAq93IGf54UhUhEiezr2SyM+mw9zKTDxJk5oLpW O00zflLgiXIvN152kERHWihsfHGKADbpImD3R/X5v3DvNrTrmN3aC4j4zcMXWNtOHhetNa YvS+jSu7QVUSXxFWD4Z5HD/HlGq+IS2LJQYgpb5BFH1gf75bk3wlQpW7caO9Xc4ilw8EI+ Ge5vNqOnhrQaw1D3GAw03MIMbg7fIA9nYW4k+BbhnLHSatoHQowGuIU37cqQmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlZ8m2SVBzPQH; Mon, 27 Mar 2023 13:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RDtqnh006859; Mon, 27 Mar 2023 13:55:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RDtqJ9006858; Mon, 27 Mar 2023 13:55:52 GMT (envelope-from git) Date: Mon, 27 Mar 2023 13:55:52 GMT Message-Id: <202303271355.32RDtqJ9006858@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 19e43c163c64 - main - netlink: add netlink KPI to the kernel by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19e43c163c64636d2590dca006e22f18d22f48b2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=19e43c163c64636d2590dca006e22f18d22f48b2 commit 19e43c163c64636d2590dca006e22f18d22f48b2 Author: Alexander V. Chernikov AuthorDate: 2023-03-27 11:59:30 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-27 13:55:44 +0000 netlink: add netlink KPI to the kernel by default This change does the following: Base Netlink KPIs (ability to register the family, parse and/or write a Netlink message) are always present in the kernel. Specifically, * Implementation of genetlink family/group registration/removal, some base accessors (netlink_generic_kpi.c, 260 LoC) are compiled in unconditionally. * Basic TLV parser functions (netlink_message_parser.c, 507 LoC) are compiled in unconditionally. * Glue functions (netlink<>rtsock), malloc/core sysctl definitions (netlink_glue.c, 259 LoC) are compiled in unconditionally. * The rest of the KPI _functions_ are defined in the netlink_glue.c, but their implementation calls a pointer to either the stub function or the actual function, depending on whether the module is loaded or not. This approach allows to have only 1k LoC out of ~3.7k LoC (current sys/netlink implementation) in the kernel, which will not grow further. It also allows for the generic netlink kernel customers to load successfully without requiring Netlink module and operate correctly once Netlink module is loaded. Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D39269 --- sys/conf/files | 4 +- sys/conf/options | 2 +- sys/modules/carp/Makefile | 2 +- sys/modules/netlink/Makefile | 6 +- sys/net/route.c | 19 --- sys/netinet/ip_carp.c | 2 + sys/netlink/netlink_ctl.h | 10 +- sys/netlink/netlink_domain.c | 24 --- sys/netlink/netlink_generic.c | 282 +++-------------------------------- sys/netlink/netlink_generic_kpi.c | 279 ++++++++++++++++++++++++++++++++++ sys/netlink/netlink_io.c | 2 + sys/netlink/netlink_message_writer.c | 22 +-- sys/netlink/netlink_message_writer.h | 86 +++++++++++ sys/netlink/netlink_module.c | 26 +++- sys/netlink/netlink_var.h | 44 ++++++ sys/netlink/route/iface.c | 2 + sys/netlink/route/neigh.c | 2 + sys/netlink/route/nexthop.c | 2 + sys/netlink/route/rt.c | 2 + 19 files changed, 497 insertions(+), 321 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 629283f7c071..94cd7135b277 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4424,10 +4424,12 @@ netipsec/xform_ipcomp.c optional ipsec inet | ipsec inet6 netipsec/xform_tcp.c optional ipsec inet tcp_signature | \ ipsec inet6 tcp_signature | ipsec_support inet tcp_signature | \ ipsec_support inet6 tcp_signature +netlink/netlink_generic_kpi.c standard +netlink/netlink_glue.c standard +netlink/netlink_message_parser.c standard netlink/netlink_domain.c optional netlink netlink/netlink_generic.c optional netlink netlink/netlink_io.c optional netlink -netlink/netlink_message_parser.c optional netlink netlink/netlink_message_writer.c optional netlink netlink/netlink_module.c optional netlink netlink/netlink_route.c optional netlink diff --git a/sys/conf/options b/sys/conf/options index 6dd19582f346..173c56229084 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -463,7 +463,7 @@ MBUF_PROFILING MBUF_STRESS_TEST MROUTING opt_mrouting.h NFSLOCKD -NETLINK +NETLINK opt_netlink.h PF_DEFAULT_TO_DROP opt_pf.h ROUTE_MPATH opt_route.h ROUTETABLES opt_route.h diff --git a/sys/modules/carp/Makefile b/sys/modules/carp/Makefile index 052687381ba6..faf3af66ece1 100644 --- a/sys/modules/carp/Makefile +++ b/sys/modules/carp/Makefile @@ -6,6 +6,6 @@ KMOD= carp SRCS= ip_carp.c sha1.c SRCS+= device_if.h bus_if.h vnode_if.h -SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h +SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h opt_netlink.h .include diff --git a/sys/modules/netlink/Makefile b/sys/modules/netlink/Makefile index 791b953e5b84..667c0b2475fe 100644 --- a/sys/modules/netlink/Makefile +++ b/sys/modules/netlink/Makefile @@ -2,10 +2,12 @@ KMOD= netlink SRCS = netlink_module.c netlink_domain.c netlink_io.c \ - netlink_message_parser.c netlink_message_writer.c netlink_generic.c \ + netlink_message_writer.c netlink_generic.c \ netlink_route.c route/iface.c route/iface_drivers.c route/neigh.c \ route/nexthop.c route/rt.c -SRCS+= opt_inet.h opt_inet6.h opt_route.h +SRCS+= opt_inet.h opt_inet6.h opt_route.h opt_netlink.h + +CFLAGS+= -DNETLINK_MODULE EXPORT_SYMS= EXPORT_SYMS+= nlmsg_get_chain_writer diff --git a/sys/net/route.c b/sys/net/route.c index 1373b0986876..e8b2ca60da18 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -703,22 +703,3 @@ rt_ifmsg(struct ifnet *ifp, int if_flags_mask) netlink_callback_p->ifmsg_f(ifp, if_flags_mask); } -/* Netlink-related callbacks needed to glue rtsock, netlink and linuxolator */ -static void -ignore_route_event(uint32_t fibnum, const struct rib_cmd_info *rc) -{ -} - -static void -ignore_ifmsg_event(struct ifnet *ifp, int if_flags_mask) -{ -} - -static struct rtbridge ignore_cb = { - .route_f = ignore_route_event, - .ifmsg_f = ignore_ifmsg_event, -}; - -void *linux_netlink_p = NULL; /* Callback pointer for Linux translator functions */ -struct rtbridge *rtsock_callback_p = &ignore_cb; -struct rtbridge *netlink_callback_p = &ignore_cb; diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index a4ed121aeeb2..deb2f3f347d9 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -28,6 +28,8 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_netlink.h" + #include __FBSDID("$FreeBSD$"); diff --git a/sys/netlink/netlink_ctl.h b/sys/netlink/netlink_ctl.h index 9369194151af..6c195c0217a9 100644 --- a/sys/netlink/netlink_ctl.h +++ b/sys/netlink/netlink_ctl.h @@ -33,6 +33,7 @@ * This file provides headers for the public KPI of the netlink * subsystem */ +#include MALLOC_DECLARE(M_NETLINK); @@ -81,6 +82,7 @@ bool netlink_unregister_proto(int proto); bool nl_has_listeners(int netlink_family, uint32_t groups_mask); bool nlp_has_priv(struct nlpcb *nlp, int priv); struct ucred *nlp_get_cred(struct nlpcb *nlp); +uint32_t nlp_get_pid(const struct nlpcb *nlp); bool nlp_unconstrained_vnet(const struct nlpcb *nlp); /* netlink_generic.c */ @@ -99,8 +101,12 @@ bool genl_register_cmds(const char *family_name, const struct genl_cmd *cmds, int count); uint32_t genl_register_group(const char *family_name, const char *group_name); -/* Debug */ -uint32_t nlp_get_pid(const struct nlpcb *nlp); +struct genl_family; +const char *genl_get_family_name(const struct genl_family *gf); +uint32_t genl_get_family_id(const struct genl_family *gf); + +typedef void (*genl_family_event_handler_t)(void *arg, const struct genl_family *gf, int action); +EVENTHANDLER_DECLARE(genl_family_event, genl_family_event_handler_t); #endif #endif diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 24ca9de877f0..8b0d09ac0b66 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -84,12 +84,6 @@ SYSCTL_OID(_net_netlink, OID_AUTO, nl_maxsockbuf, sysctl_handle_nl_maxsockbuf, "LU", "Maximum Netlink socket buffer size"); -uint32_t -nlp_get_pid(const struct nlpcb *nlp) -{ - return (nlp->nl_process_id); -} - /* * Looks up a nlpcb struct based on the @portid. Need to claim nlsock_mtx. * Returns nlpcb pointer if present else NULL @@ -211,24 +205,6 @@ nl_has_listeners(int netlink_family, uint32_t groups_mask) return (V_nl_ctl != NULL); } -bool -nlp_has_priv(struct nlpcb *nlp, int priv) -{ - return (priv_check_cred(nlp->nl_cred, priv) == 0); -} - -bool -nlp_unconstrained_vnet(const struct nlpcb *nlp) -{ - return (nlp->nl_unconstrained_vnet); -} - -struct ucred * -nlp_get_cred(struct nlpcb *nlp) -{ - return (nlp->nl_cred); -} - static uint32_t nl_find_port(void) { diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index 16b49d5aa9ce..4595b3074d50 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -25,11 +25,14 @@ * SUCH DAMAGE. */ +#include "opt_netlink.h" + #include __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -41,242 +44,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define DEBUG_MOD_NAME nl_generic #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include _DECLARE_DEBUG(LOG_DEBUG); -#define CTRL_FAMILY_NAME "nlctrl" - -#define MAX_FAMILIES 20 -#define MAX_GROUPS 64 - -#define MIN_GROUP_NUM 48 - -static struct sx sx_lock; - -#define GENL_LOCK_INIT() sx_init(&sx_lock, "genetlink lock") -#define GENL_LOCK_DESTROY() sx_destroy(&sx_lock) -#define GENL_LOCK() sx_xlock(&sx_lock) -#define GENL_UNLOCK() sx_xunlock(&sx_lock) - -struct genl_family { - const char *family_name; - uint16_t family_hdrsize; - uint16_t family_id; - uint16_t family_version; - uint16_t family_attr_max; - uint16_t family_cmd_size; - uint16_t family_num_groups; - struct genl_cmd *family_cmds; -}; - -static struct genl_family families[MAX_FAMILIES]; - - -struct genl_group { - struct genl_family *group_family; - const char *group_name; -}; -static struct genl_group groups[MAX_GROUPS]; - - static int dump_family(struct nlmsghdr *hdr, struct genlmsghdr *ghdr, const struct genl_family *gf, struct nl_writer *nw); -static void nlctrl_notify(const struct genl_family *gf, int action); - -static struct genl_family * -find_family(const char *family_name) -{ - for (int i = 0; i < MAX_FAMILIES; i++) { - struct genl_family *gf = &families[i]; - if (gf->family_name != NULL && !strcmp(gf->family_name, family_name)) - return (gf); - } - - return (NULL); -} - -static struct genl_family * -find_empty_family_id(const char *family_name) -{ - struct genl_family *gf = NULL; - - if (!strcmp(family_name, CTRL_FAMILY_NAME)) { - gf = &families[0]; - gf->family_id = GENL_MIN_ID; - } else { - /* Index 0 is reserved for the control family */ - for (int i = 1; i < MAX_FAMILIES; i++) { - struct genl_family *gf = &families[i]; - if (gf->family_name == NULL) { - gf->family_id = GENL_MIN_ID + i; - break; - } - } - } - - return (gf); -} - -uint32_t -genl_register_family(const char *family_name, size_t hdrsize, int family_version, - int max_attr_idx) -{ - uint32_t family_id = 0; - - MPASS(family_name != NULL); - if (find_family(family_name) != NULL) - return (0); - - GENL_LOCK(); - - struct genl_family *gf = find_empty_family_id(family_name); - MPASS(gf != NULL); - - gf->family_name = family_name; - gf->family_version = family_version; - gf->family_hdrsize = hdrsize; - gf->family_attr_max = max_attr_idx; - NL_LOG(LOG_DEBUG2, "Registered family %s id %d", gf->family_name, gf->family_id); - family_id = gf->family_id; - nlctrl_notify(gf, CTRL_CMD_NEWFAMILY); - - GENL_UNLOCK(); - - return (family_id); -} - -static void -free_family(struct genl_family *gf) -{ - if (gf->family_cmds != NULL) - free(gf->family_cmds, M_NETLINK); -} - -/* - * unregister groups of a given family - */ -static void -unregister_groups(const struct genl_family *gf) -{ - - for (int i = 0; i < MAX_GROUPS; i++) { - struct genl_group *gg = &groups[i]; - if (gg->group_family == gf && gg->group_name != NULL) { - gg->group_family = NULL; - gg->group_name = NULL; - } - } -} - -/* - * Can sleep, I guess - */ -bool -genl_unregister_family(const char *family_name) -{ - bool found = false; - - GENL_LOCK(); - struct genl_family *gf = find_family(family_name); - - if (gf != NULL) { - nlctrl_notify(gf, CTRL_CMD_DELFAMILY); - found = true; - unregister_groups(gf); - /* TODO: zero pointer first */ - free_family(gf); - bzero(gf, sizeof(*gf)); - } - GENL_UNLOCK(); - - return (found); -} - -bool -genl_register_cmds(const char *family_name, const struct genl_cmd *cmds, int count) -{ - GENL_LOCK(); - struct genl_family *gf = find_family(family_name); - if (gf == NULL) { - GENL_UNLOCK(); - return (false); - } - - int cmd_size = gf->family_cmd_size; - - for (int i = 0; i < count; i++) { - MPASS(cmds[i].cmd_cb != NULL); - if (cmds[i].cmd_num >= cmd_size) - cmd_size = cmds[i].cmd_num + 1; - } - - if (cmd_size > gf->family_cmd_size) { - /* need to realloc */ - size_t sz = cmd_size * sizeof(struct genl_cmd); - void *data = malloc(sz, M_NETLINK, M_WAITOK | M_ZERO); - - memcpy(data, gf->family_cmds, gf->family_cmd_size * sizeof(struct genl_cmd)); - void *old_data = gf->family_cmds; - gf->family_cmds = data; - gf->family_cmd_size = cmd_size; - free(old_data, M_NETLINK); - } - - for (int i = 0; i < count; i++) { - const struct genl_cmd *cmd = &cmds[i]; - MPASS(gf->family_cmds[cmd->cmd_num].cmd_cb == NULL); - gf->family_cmds[cmd->cmd_num] = cmds[i]; - NL_LOG(LOG_DEBUG2, "Adding cmd %s(%d) to family %s", - cmd->cmd_name, cmd->cmd_num, gf->family_name); - } - GENL_UNLOCK(); - return (true); -} - -static struct genl_group * -find_group(const struct genl_family *gf, const char *group_name) -{ - for (int i = 0; i < MAX_GROUPS; i++) { - struct genl_group *gg = &groups[i]; - if (gg->group_family == gf && !strcmp(gg->group_name, group_name)) - return (gg); - } - return (NULL); -} - -uint32_t -genl_register_group(const char *family_name, const char *group_name) -{ - uint32_t group_id = 0; - - MPASS(family_name != NULL); - MPASS(group_name != NULL); - - GENL_LOCK(); - struct genl_family *gf = find_family(family_name); - - if (gf == NULL || find_group(gf, group_name) != NULL) { - GENL_UNLOCK(); - return (0); - } - - for (int i = 0; i < MAX_GROUPS; i++) { - struct genl_group *gg = &groups[i]; - if (gg->group_family == NULL) { - gf->family_num_groups++; - gg->group_family = gf; - gg->group_name = group_name; - group_id = i + MIN_GROUP_NUM; - break; - } - } - GENL_UNLOCK(); - - return (group_id); -} /* * Handler called by netlink subsystem when matching netlink message is received @@ -285,11 +61,12 @@ static int genl_handle_message(struct nlmsghdr *hdr, struct nl_pstate *npt) { struct nlpcb *nlp = npt->nlp; + struct genl_family *gf = NULL; int error = 0; int family_id = (int)hdr->nlmsg_type - GENL_MIN_ID; - if (__predict_false(family_id < 0 || family_id >= MAX_FAMILIES)) { + if (__predict_false(family_id < 0 || (gf = genl_get_family(family_id)) == NULL)) { NLP_LOG(LOG_DEBUG, nlp, "invalid message type: %d", hdr->nlmsg_type); return (ENOTSUP); } @@ -299,8 +76,6 @@ genl_handle_message(struct nlmsghdr *hdr, struct nl_pstate *npt) return (EINVAL); } - struct genl_family *gf = &families[family_id]; - struct genlmsghdr *ghdr = (struct genlmsghdr *)(hdr + 1); if (ghdr->cmd >= gf->family_cmd_size || gf->family_cmds[ghdr->cmd].cmd_cb == NULL) { @@ -375,8 +150,8 @@ dump_family(struct nlmsghdr *hdr, struct genlmsghdr *ghdr, if (off == 0) goto enomem; for (int i = 0, cnt = 0; i < MAX_GROUPS; i++) { - struct genl_group *gg = &groups[i]; - if (gg->group_family != gf) + struct genl_group *gg = genl_get_group(i); + if (gg == NULL || gg->group_family != gf) continue; int cmd_off = nlattr_add_nested(nw, ++cnt); @@ -398,6 +173,8 @@ enomem: /* Declare ourself as a user */ +static void nlctrl_notify(void *arg, const struct genl_family *gf, int action); +static eventhandler_tag family_event_tag; static uint32_t ctrl_family_id; static uint32_t ctrl_group_id; @@ -451,8 +228,8 @@ nlctrl_handle_getfamily(struct nlmsghdr *hdr, struct nl_pstate *npt) if (attrs.family_id != 0 || attrs.family_name != NULL) { /* Resolve request */ for (int i = 0; i < MAX_FAMILIES; i++) { - struct genl_family *gf = &families[i]; - if (match_family(gf, &attrs)) { + struct genl_family *gf = genl_get_family(i); + if (gf != NULL && match_family(gf, &attrs)) { error = dump_family(hdr, &ghdr, gf, npt->nw); return (error); } @@ -462,8 +239,8 @@ nlctrl_handle_getfamily(struct nlmsghdr *hdr, struct nl_pstate *npt) hdr->nlmsg_flags = hdr->nlmsg_flags | NLM_F_MULTI; for (int i = 0; i < MAX_FAMILIES; i++) { - struct genl_family *gf = &families[i]; - if (match_family(gf, &attrs)) { + struct genl_family *gf = genl_get_family(i); + if (gf != NULL && match_family(gf, &attrs)) { error = dump_family(hdr, &ghdr, gf, npt->nw); if (error != 0) break; @@ -479,7 +256,7 @@ nlctrl_handle_getfamily(struct nlmsghdr *hdr, struct nl_pstate *npt) } static void -nlctrl_notify(const struct genl_family *gf, int cmd) +nlctrl_notify(void *arg __unused, const struct genl_family *gf, int cmd) { struct nlmsghdr hdr = {.nlmsg_type = NETLINK_GENERIC }; struct genlmsghdr ghdr = { .cmd = cmd }; @@ -502,37 +279,26 @@ static const struct genl_cmd nlctrl_cmds[] = { }, }; -static void -genl_nlctrl_init(void) -{ - ctrl_family_id = genl_register_family(CTRL_FAMILY_NAME, 0, 2, CTRL_ATTR_MAX); - genl_register_cmds(CTRL_FAMILY_NAME, nlctrl_cmds, NL_ARRAY_LEN(nlctrl_cmds)); - ctrl_group_id = genl_register_group(CTRL_FAMILY_NAME, "notify"); -} - -static void -genl_nlctrl_destroy(void) -{ - genl_unregister_family(CTRL_FAMILY_NAME); -} - static const struct nlhdr_parser *all_parsers[] = { &genl_parser }; static void -genl_load(void *u __unused) +genl_load_all(void *u __unused) { - GENL_LOCK_INIT(); NL_VERIFY_PARSERS(all_parsers); + ctrl_family_id = genl_register_family(CTRL_FAMILY_NAME, 0, 2, CTRL_ATTR_MAX); + genl_register_cmds(CTRL_FAMILY_NAME, nlctrl_cmds, NL_ARRAY_LEN(nlctrl_cmds)); + ctrl_group_id = genl_register_group(CTRL_FAMILY_NAME, "notify"); + family_event_tag = EVENTHANDLER_REGISTER(genl_family_event, nlctrl_notify, NULL, + EVENTHANDLER_PRI_ANY); netlink_register_proto(NETLINK_GENERIC, "NETLINK_GENERIC", genl_handle_message); - genl_nlctrl_init(); } -SYSINIT(genl_load, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, genl_load, NULL); +SYSINIT(genl_load_all, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, genl_load_all, NULL); static void genl_unload(void *u __unused) { - genl_nlctrl_destroy(); - GENL_LOCK_DESTROY(); + EVENTHANDLER_DEREGISTER(genl_family_event, family_event_tag); + genl_unregister_family(CTRL_FAMILY_NAME); NET_EPOCH_WAIT(); } SYSUNINIT(genl_unload, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, genl_unload, NULL); diff --git a/sys/netlink/netlink_generic_kpi.c b/sys/netlink/netlink_generic_kpi.c new file mode 100644 index 000000000000..b64f6bd3f1b6 --- /dev/null +++ b/sys/netlink/netlink_generic_kpi.c @@ -0,0 +1,279 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2022 Alexander V. Chernikov + * + * 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 +__FBSDID("$FreeBSD$"); +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#define DEBUG_MOD_NAME nl_generic_kpi +#define DEBUG_MAX_LEVEL LOG_DEBUG3 +#include +_DECLARE_DEBUG(LOG_DEBUG3); + + +/* + * NETLINK_GENERIC families/groups registration logic + */ + +#define GENL_LOCK() sx_xlock(&sx_lock) +#define GENL_UNLOCK() sx_xunlock(&sx_lock) +static struct sx sx_lock; +SX_SYSINIT(genl_lock, &sx_lock, "genetlink lock"); + +static struct genl_family families[MAX_FAMILIES]; +static struct genl_group groups[MAX_GROUPS]; + +static struct genl_family * +find_family(const char *family_name) +{ + for (int i = 0; i < MAX_FAMILIES; i++) { + struct genl_family *gf = &families[i]; + if (gf->family_name != NULL && !strcmp(gf->family_name, family_name)) + return (gf); + } + + return (NULL); +} + +static struct genl_family * +find_empty_family_id(const char *family_name) +{ + struct genl_family *gf = NULL; + + if (!strcmp(family_name, CTRL_FAMILY_NAME)) { + gf = &families[0]; + gf->family_id = GENL_MIN_ID; + } else { + /* Index 0 is reserved for the control family */ + for (int i = 1; i < MAX_FAMILIES; i++) { + gf = &families[i]; + if (gf->family_name == NULL) { + gf->family_id = GENL_MIN_ID + i; + break; + } + } + } + + return (gf); +} + +uint32_t +genl_register_family(const char *family_name, size_t hdrsize, int family_version, + int max_attr_idx) +{ + uint32_t family_id = 0; + + MPASS(family_name != NULL); + if (find_family(family_name) != NULL) + return (0); + + GENL_LOCK(); + + struct genl_family *gf = find_empty_family_id(family_name); + MPASS(gf != NULL); + + gf->family_name = family_name; + gf->family_version = family_version; + gf->family_hdrsize = hdrsize; + gf->family_attr_max = max_attr_idx; + NL_LOG(LOG_DEBUG2, "Registered family %s id %d", gf->family_name, gf->family_id); + family_id = gf->family_id; + EVENTHANDLER_INVOKE(genl_family_event, gf, CTRL_CMD_NEWFAMILY); + + GENL_UNLOCK(); + + return (family_id); +} + +static void +free_family(struct genl_family *gf) +{ + if (gf->family_cmds != NULL) + free(gf->family_cmds, M_NETLINK); +} + +/* + * unregister groups of a given family + */ +static void +unregister_groups(const struct genl_family *gf) +{ + + for (int i = 0; i < MAX_GROUPS; i++) { + struct genl_group *gg = &groups[i]; + if (gg->group_family == gf && gg->group_name != NULL) { + gg->group_family = NULL; + gg->group_name = NULL; + } + } +} + +/* + * Can sleep, I guess + */ +bool +genl_unregister_family(const char *family_name) +{ + bool found = false; + + GENL_LOCK(); + struct genl_family *gf = find_family(family_name); + + if (gf != NULL) { + EVENTHANDLER_INVOKE(genl_family_event, gf, CTRL_CMD_DELFAMILY); + found = true; + unregister_groups(gf); + /* TODO: zero pointer first */ + free_family(gf); + bzero(gf, sizeof(*gf)); + } + GENL_UNLOCK(); + + return (found); +} + +bool +genl_register_cmds(const char *family_name, const struct genl_cmd *cmds, int count) +{ + GENL_LOCK(); + struct genl_family *gf = find_family(family_name); + if (gf == NULL) { + GENL_UNLOCK(); + return (false); + } + + int cmd_size = gf->family_cmd_size; + + for (int i = 0; i < count; i++) { + MPASS(cmds[i].cmd_cb != NULL); + if (cmds[i].cmd_num >= cmd_size) + cmd_size = cmds[i].cmd_num + 1; + } + + if (cmd_size > gf->family_cmd_size) { + /* need to realloc */ + size_t sz = cmd_size * sizeof(struct genl_cmd); + void *data = malloc(sz, M_NETLINK, M_WAITOK | M_ZERO); + + memcpy(data, gf->family_cmds, gf->family_cmd_size * sizeof(struct genl_cmd)); + void *old_data = gf->family_cmds; + gf->family_cmds = data; + gf->family_cmd_size = cmd_size; + free(old_data, M_NETLINK); + } + + for (int i = 0; i < count; i++) { + const struct genl_cmd *cmd = &cmds[i]; + MPASS(gf->family_cmds[cmd->cmd_num].cmd_cb == NULL); + gf->family_cmds[cmd->cmd_num] = cmds[i]; + NL_LOG(LOG_DEBUG2, "Adding cmd %s(%d) to family %s", + cmd->cmd_name, cmd->cmd_num, gf->family_name); + } + GENL_UNLOCK(); + return (true); +} + +static struct genl_group * +find_group(const struct genl_family *gf, const char *group_name) +{ + for (int i = 0; i < MAX_GROUPS; i++) { + struct genl_group *gg = &groups[i]; + if (gg->group_family == gf && !strcmp(gg->group_name, group_name)) + return (gg); + } + return (NULL); +} + +uint32_t +genl_register_group(const char *family_name, const char *group_name) +{ + uint32_t group_id = 0; + + MPASS(family_name != NULL); + MPASS(group_name != NULL); + + GENL_LOCK(); + struct genl_family *gf = find_family(family_name); + + if (gf == NULL || find_group(gf, group_name) != NULL) { + GENL_UNLOCK(); + return (0); + } + + for (int i = 0; i < MAX_GROUPS; i++) { + struct genl_group *gg = &groups[i]; + if (gg->group_family == NULL) { + gf->family_num_groups++; + gg->group_family = gf; + gg->group_name = group_name; + group_id = i + MIN_GROUP_NUM; + break; + } + } + GENL_UNLOCK(); + + return (group_id); +} + +/* accessors */ +struct genl_family * +genl_get_family(uint32_t family_id) +{ + return ((family_id < MAX_FAMILIES) ? &families[family_id] : NULL); +} + +const char * +genl_get_family_name(const struct genl_family *gf) +{ + return (gf->family_name); +} + +uint32_t +genl_get_family_id(const struct genl_family *gf) +{ + return (gf->family_id); +} + +struct genl_group * +genl_get_group(uint32_t group_id) +{ + return ((group_id < MAX_GROUPS) ? &groups[group_id] : NULL); +} + diff --git a/sys/netlink/netlink_io.c b/sys/netlink/netlink_io.c index 509065d04818..b40ffaab7dd9 100644 --- a/sys/netlink/netlink_io.c +++ b/sys/netlink/netlink_io.c @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#include "opt_netlink.h" + #include __FBSDID("$FreeBSD$"); #include diff --git a/sys/netlink/netlink_message_writer.c b/sys/netlink/netlink_message_writer.c index 8a9315eedd1b..884295939ce5 100644 --- a/sys/netlink/netlink_message_writer.c +++ b/sys/netlink/netlink_message_writer.c @@ -25,6 +25,8 @@ * SUCH DAMAGE. */ +#include "opt_netlink.h" + #include __FBSDID("$FreeBSD$"); #include @@ -434,7 +436,7 @@ nlmsg_get_buf(struct nl_writer *nw, int size, bool waitok, bool is_linux) } bool -nlmsg_get_unicast_writer(struct nl_writer *nw, int size, struct nlpcb *nlp) +_nlmsg_get_unicast_writer(struct nl_writer *nw, int size, struct nlpcb *nlp) { if (!nlmsg_get_buf(nw, size, false, nlp->nl_linux)) return (false); @@ -445,7 +447,7 @@ nlmsg_get_unicast_writer(struct nl_writer *nw, int size, struct nlpcb *nlp) } bool -nlmsg_get_group_writer(struct nl_writer *nw, int size, int protocol, int group_id) +_nlmsg_get_group_writer(struct nl_writer *nw, int size, int protocol, int group_id) { if (!nlmsg_get_buf(nw, size, false, false)) return (false); @@ -456,7 +458,7 @@ nlmsg_get_group_writer(struct nl_writer *nw, int size, int protocol, int group_i } bool -nlmsg_get_chain_writer(struct nl_writer *nw, int size, struct mbuf **pm) +_nlmsg_get_chain_writer(struct nl_writer *nw, int size, struct mbuf **pm) { if (!nlmsg_get_buf(nw, size, false, false)) return (false); @@ -469,13 +471,13 @@ nlmsg_get_chain_writer(struct nl_writer *nw, int size, struct mbuf **pm) } void -nlmsg_ignore_limit(struct nl_writer *nw) +_nlmsg_ignore_limit(struct nl_writer *nw) { nw->ignore_limit = true; } bool -nlmsg_flush(struct nl_writer *nw) +_nlmsg_flush(struct nl_writer *nw) { if (__predict_false(nw->hdr != NULL)) { @@ -503,7 +505,7 @@ nlmsg_flush(struct nl_writer *nw) * Return true on success. */ bool -nlmsg_refill_buffer(struct nl_writer *nw, int required_len) +_nlmsg_refill_buffer(struct nl_writer *nw, int required_len) { struct nl_writer ns_new = {}; int completed_len, new_len; @@ -561,7 +563,7 @@ nlmsg_refill_buffer(struct nl_writer *nw, int required_len) } *** 329 LINES SKIPPED *** From nobody Mon Mar 27 14:13: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 4PlZY50xWKz41bGn; Mon, 27 Mar 2023 14:13: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 4PlZY50MPYz40Lm; Mon, 27 Mar 2023 14:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679926409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6g2g1puWrkBfswk8qW+rmMFCPL11adeKzGvK1lYoPQ=; b=QKM9jEi+LnZmSUvLwP9kY9GrfgyRVDwJQKBUOquxF6jP23ULEyMulRbLfF6FMOQ2kn1j1i JhRMjVgk8apC59zZHoqcZERkpV3KnAq9xypOdcx3vu8dbYQWXRhCS2Az1F06wVy4dzalRE R0Rva2yxUZ7Woc6bloFfS5FpoIn8tX5qwfFY0bpD3LiaBfzzvVhb1bXopmj5Rlp9aLsXsy dUhoExffuKnaeLJ0vnD6OF6afW3Kk7bRrgtNFDOve1uOHNnc6mmhAEBLjvmYfIe1JHPoUq oZbmKXsd2Q0iuwWivIlEvi846lbeXGHP93XT5QLeisxh2VyCn1JxMLG5XdEpkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679926409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6g2g1puWrkBfswk8qW+rmMFCPL11adeKzGvK1lYoPQ=; b=E5GvvPphhE0+RYkf6P+LY6W7lo8I4v0REd7mWSfGAjc3wcOpEnHqlneGGC3dUEDu5dfJI1 NFZSFGbmwosYAPQgPIX+6i7YFl3e/x2KB95yAG8IJXMjqTC7tn4xHq2SxPL4ES+L2lEL4Z mA23Pe1HS1JTdcZ4X8mZaMqptLrwiXMJ1NQi+yZ9cMQjWfxnQ53gmQsI5ni3iioxwiAHwv hAVZe9AtisnNUdUsu93irABpxuXCmqAizOmK9eXT6pGtlk4genKDXsdnmpEVU4GuWOm7Lf an/BeKJ2YHhR1hivoG4WgIzx5m1C7P9eMGI0gKDnr0NbUB+KnVXSBUgj2EOykg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679926409; a=rsa-sha256; cv=none; b=apzO+jAboZ3xioEVCucm/KMXU4F1wME0KFNyGFSqi6+smqogSMtqRhduOwA7FgNPu2hUsG cZaqYLdpSf7sLT6jqOkPcyNIJsM21IRi5zm8FOWXRK2ZRpinSgviAvx3l7uXGzlBjyhi5a giYHBbOu85hEDGWg7LmvVHpx6vgVpOQR0DTMN9YICHaU+gIREmj0z6Fty3tsX94blrPQkF oV4UrCTat7x+i8mUrAvw/j15RwRciQ7XqCud0cSlUxY2gRUkaGiEodyP3B0elG7mhMUh4s pMQRXATHHDd6BG5X6bj5+9RckkqFZCGMvYBAz8EG8RPapfSWiJjyFqv1WRL07w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlZY46V1GzQW9; Mon, 27 Mar 2023 14:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32REDSDQ040588; Mon, 27 Mar 2023 14:13:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32REDSuI040587; Mon, 27 Mar 2023 14:13:28 GMT (envelope-from git) Date: Mon, 27 Mar 2023 14:13:28 GMT Message-Id: <202303271413.32REDSuI040587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: b44388ec0273 - stable/13 - pkg-stage.sh: update port trailing version information List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: b44388ec027311eb2ee163b86bc986d217a164b5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=b44388ec027311eb2ee163b86bc986d217a164b5 commit b44388ec027311eb2ee163b86bc986d217a164b5 Author: Glen Barber AuthorDate: 2023-03-20 14:36:51 +0000 Commit: Glen Barber CommitDate: 2023-03-27 14:11:24 +0000 pkg-stage.sh: update port trailing version information Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit e4e139b828a2278b44496653c1cd5e6298afb3c6) --- release/scripts/pkg-stage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 4e9617184243..e2a51e4ef2f0 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -14,7 +14,7 @@ export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES="archivers/unzip devel/git -emulators/linux_base-c6 +emulators/linux_base-c7 graphics/drm-legacy-kmod graphics/drm-stable-kmod misc/freebsd-doc-all @@ -30,7 +30,7 @@ sysutils/tmux www/firefox www/links x11-drivers/xf86-video-vmware -x11/gnome3 +x11/gnome x11/kde5 x11/xorg" From nobody Mon Mar 27 14:15: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 4PlZb04Llcz41b2n; Mon, 27 Mar 2023 14:15: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 4PlZb03cHQz40q9; Mon, 27 Mar 2023 14:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679926508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SbHO7bpbkG+LM7CZ4a/IRduUmjhFNiYNFXF99xYTMRA=; b=mOpVr3M8Qe11AFlC2vCAK85h8uoTx0TmP7VhyrU8SMoD6ONKleRXeJUysFTNBp017IV/O3 34hxYhVnzGWIie4otJoRQ2b6DKpMcjqCEF9tIv+nLn9dRuhhsv0b4bhGHZa1hhiDIbEJ8N JfYM2nIe832Phq4JlKKP01XoOVaXk6Xoyw25cV18VVPw/yH2xcbwr3tmf+3/hAs07VU+PB QpuAMEkcW1mpbQo0+6fZboIj8x/eZlukdwJ9GSCRsO1dZHXWxrZBH4VjsVhZytuxs4k9yH evOnf1/oYarD1RxyJmyqZ5nziKb9Oj2HJGHFZM6UP5+YGVZ+yuOYXEtsh+WRAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679926508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SbHO7bpbkG+LM7CZ4a/IRduUmjhFNiYNFXF99xYTMRA=; b=yuom8p9XA3V3fgFTXds8ZnFFdhxU+4jaUTYeUXO6jg/tsSW2U4rZHgXepoF+8n4RznajBF 5VM/AhOH9LltParMNQDiguOT8GdZ3Ti9s97spHu+3KHqq1U9jzZYgJ2U4h8BkNW3s37CKX 8uW1jFLTBFGkX5X873vEuWXuFi7W0RS0PSV/u5+3LErzLO1goDdE1rZivkXcgxPqYbKJTX Ip91JJ0JE9GXwq6+A7ouME7IaomABqpsdiMsdqTjAul62vsSISowiMfesEL33VhraVoOIk UM7Nz9Dee9Gq7KJl2qJHI4yNL+mXe3htpQOFNROsb/Zh3leIbu9Qj/MmzAzVeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679926508; a=rsa-sha256; cv=none; b=eA+lmU8SoI62YrFwWPpOhNqQrmEccZQo+FflrG4gVIZRrSu4VnvGiTVvCXzolziiqBsizt JYim9ehdB2dNsORnStTfPln94EzopbC0tORCNPtkXgLtZH+oR2TZ+SemYs+G+LjtoMvuNp PgCJmZYOIaQ3pDQkmYlD6EESp39BCgoXoaQmiT7jliwdulyTth8v/EgnzL+4fh5sMP4vZh jY0PIDp9ZpLoF2MN7FApCpV74SZrf4P1uthekwCJO39PuKuU+A8xwXXRGNFP+wjplzBt8t vOb4C57n8lkPBqJCQalHxIB0IAzDZ0W4PMsm4U8vF29tFQDS1KcSJgAu/UzIBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlZb02c0QzQZ6; Mon, 27 Mar 2023 14:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32REF8kV041015; Mon, 27 Mar 2023 14:15:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32REF8wg041014; Mon, 27 Mar 2023 14:15:08 GMT (envelope-from git) Date: Mon, 27 Mar 2023 14:15:08 GMT Message-Id: <202303271415.32REF8wg041014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 81b340dd5b2f - stable/12 - Replace subversion with git in the installation DVD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 81b340dd5b2fded442b0928d51b92be64b61a416 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=81b340dd5b2fded442b0928d51b92be64b61a416 commit 81b340dd5b2fded442b0928d51b92be64b61a416 Author: Alan Somers AuthorDate: 2022-05-26 19:08:34 +0000 Commit: Glen Barber CommitDate: 2023-03-27 14:14:06 +0000 Replace subversion with git in the installation DVD (cherry picked from commit 55c8093f733242cd72341ba1126637047cf16ca3) (cherry picked from commit 46856dbac668fd8258286c78c7192654ba00b723) --- release/scripts/pkg-stage.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index f1bb19636f75..4e9617184243 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -13,8 +13,7 @@ export PKGCMD="/usr/sbin/pkg -d" export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES="archivers/unzip -devel/subversion -devel/subversion-static +devel/git emulators/linux_base-c6 graphics/drm-legacy-kmod graphics/drm-stable-kmod From nobody Mon Mar 27 14:15: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 4PlZb15tBvz41bNt; Mon, 27 Mar 2023 14:15: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 4PlZb14tfNz4127; Mon, 27 Mar 2023 14:15:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679926509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IsGB3OJUNnwMtC6JyvGF/fWcZ+yTpDAeuebtNilGf9I=; b=wtYBFydgE5XYl1Mf0q+gYoHchTwSpQ1+yUN6j/S08kjQFdC5zAo8eXL2rmOkzJzqW3Z0s5 XyjCXgpnXKmkg769b8UbeQ7s+m3mm+5oymVZ3y4H5GkKxiN5UzGbjx1dYmqgmft/OOZG4L auyzErR7ATYlkHI+vwU+1FmpnT8LeiWMNm9UmGj4EZIgAUfQkGC4EytJEJ2GWYeL4PBmZc DC7rIqlKdtxn6ok6J8ndqTj7zqQAOfGnhwrG2iV/vbGxxDFlkLr+NNZ3w8ZAi2ubr4RkGX 0/5clrvrph8Ifn0BvEw301d4/eJgHPF/mY/YX7huIrWimtRmXCZ91pTS7B/keA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679926509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IsGB3OJUNnwMtC6JyvGF/fWcZ+yTpDAeuebtNilGf9I=; b=of/TyjQxjNTef1dceHbjiO7WDUFqPJvodsO5jPX8KzX4EV4VAwCxri3Q87afQGGTLMWRMk 1vB8sx9X7xCCy4WmvX8HxDclyy8x4RS0yWNSK6CID2onvx16y42rVXKZz+h+2VExbWLlvo jZog+fgNggQiV0ZfTXD4KSlJ6Ugc0uj2MkYi/w7OWR97LeJmUf0/7eTEWnqDxIv9DrFInU NlILi8gcu9h6P0haaGcrQT5lZRjoawFWyknptIgWtLRP8XS/gGSZ82T2kY2Q8UiAITrsWb Y1Na/E/jbxtCwpkia/csUU/SB4Dr7nnLjIuZ0RUpfB9KiJw1KmV9pLMkNUAg4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679926509; a=rsa-sha256; cv=none; b=y2uY1kO53rnVg3ApuVJYe1OciT+xkETOy4Y/uHhY3K1uX/rhV/5JbKglv1QkLLCuF1XzNf cFBflu5A3ddzD6bMbkE60yNw7twPJ15ymv/+tPrxn7CJ7onGHyQecPvyexbmVU4ztuTxt9 Rl26vDbvwKm8jSrIlDaAF6qpSvEbvvYf2CJgnlfF7nEZBAk2XY54cIYD6Anf3+KxtoNEa5 ENLH4eAdTz2Qk0ra0H6wisiVLzZ7JbLbiU306YVIXOQyaRhJx7+55+riYLM6pWitIM34Ew IKFEnZ0S4XwR3DflKVPVkEyDD2oOuxirNtgWL0VgyE7MbckB5Y0p9Wm+lCX9kQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlZb13mFLzQWp; Mon, 27 Mar 2023 14:15:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32REF9Pj041036; Mon, 27 Mar 2023 14:15:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32REF9bj041035; Mon, 27 Mar 2023 14:15:09 GMT (envelope-from git) Date: Mon, 27 Mar 2023 14:15:09 GMT Message-Id: <202303271415.32REF9bj041035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: d16d0db0107b - stable/12 - pkg-stage.sh: update port trailing version information List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/stable/12 X-Git-Reftype: branch X-Git-Commit: d16d0db0107bdf6acf9dfa9017e628a67cd033f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=d16d0db0107bdf6acf9dfa9017e628a67cd033f0 commit d16d0db0107bdf6acf9dfa9017e628a67cd033f0 Author: Glen Barber AuthorDate: 2023-03-20 14:36:51 +0000 Commit: Glen Barber CommitDate: 2023-03-27 14:14:20 +0000 pkg-stage.sh: update port trailing version information Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit e4e139b828a2278b44496653c1cd5e6298afb3c6) --- release/scripts/pkg-stage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 4e9617184243..e2a51e4ef2f0 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -14,7 +14,7 @@ export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES="archivers/unzip devel/git -emulators/linux_base-c6 +emulators/linux_base-c7 graphics/drm-legacy-kmod graphics/drm-stable-kmod misc/freebsd-doc-all @@ -30,7 +30,7 @@ sysutils/tmux www/firefox www/links x11-drivers/xf86-video-vmware -x11/gnome3 +x11/gnome x11/kde5 x11/xorg" From nobody Mon Mar 27 15:24: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 4Plc6S5d8rz41g1L for ; Mon, 27 Mar 2023 15:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Plc6S59X0z49yJ; Mon, 27 Mar 2023 15:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679930640; h=from:from:reply-to:subject:subject: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/AhBhjEf4+j3WmVhrsEiprypLfeQ8WNIgeNsadH13g=; b=cTKdypKnC8J16DL4yyUwF54KnoRdAGsMQQ6pgJGifmfKidXYYG3Js0yf2fZ7gRwAMnGOhj xoffwSl2DTY/js4QUYDO2GZtTGemvNVYubm551Q9D84DeM0STQJt50pVJQCc9aoZlUknua k+mEpnp+BzVf0YJjK4jlZleupnS5e6fxp3KsxxwHuJTcUBVSIPFzUJtd+9N4Jg8aiTV5Uv LcJz7UAlAIfhyUtQWZDcu0FZvkRNMZlkXuEt97uPPSfB6VEUVjjutI4BQTYW+gZhTPlGDE fKeKdbka9UVKWhbWu9NavEbr5pROXpitOggJGgp6SRhLbBGy4Oy76blObOvRmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679930640; h=from:from:reply-to:subject:subject: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/AhBhjEf4+j3WmVhrsEiprypLfeQ8WNIgeNsadH13g=; b=MObkoxTlppU5gWLYnayDd7mW+DO4rwqULBIZAGvcf0mknmiKr3HuW6GLSEuk2PjIMcWa/A 6syzU2v1kx7ysSO/KjPEjc1TBc2Gy/RvqFRpX0N0N7PV+wxdyjR+N6xqSbFjOO0zt7I0FZ fcn5HnnvEK31GvdjDvBB3P1+2VHoQEzGvktnxa+zO91yAAnFHpv06iFjxmAu1J0mQx8xgx JifhwOJF2GcWj+RYDxa3tF4rfCFsEVEKQi4JVjK885rRaXpotnSdQ0b6eD87y2QxZ71jjB /A3rMVsPDRePRvhFAugbqn/G+t1fUy8xd5pro8okA07gRHf3FVOfXM+1LervGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679930640; a=rsa-sha256; cv=none; b=dnrXgNTcbvdVGDFJBvQZULlxooW7PuEl7cRsXT0bWo3UNOiok05r6vBZTr7VGYxbUNkGZ5 CkWz7Or+XcEB2BY+F4W0It4/1gqOCjqaMQD5MUCy93aPfWbdJYjmmmxpBVNUhkddIGBLPn 9Jh7OP1PzAVr0bNEpNFGi1sru9BDxL3Mhl9fwPPvF+BcGNeGrFhdG3Hty2IlWNnsL5hAeX TNxNv7D9FTklscUGNoceTUd81SKdKscU7DWdD2dSMHgIJEsy9L6JNtzjJNgRkoUGVH2gOE wESv7gyaNerZ/cFPvQs7DL+NVx3pQUmAYx61hLPQDn+NmHcw7qdi1f0ThHfG4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Plc6S4DGvzRsY; Mon, 27 Mar 2023 15:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RFO0Bk055821; Mon, 27 Mar 2023 15:24:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RFO0WX055820; Mon, 27 Mar 2023 15:24:00 GMT (envelope-from git) Date: Mon, 27 Mar 2023 15:24:00 GMT Message-Id: <202303271524.32RFO0WX055820@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Ruslan Bukin Subject: git: d7590ef636ed - Create tag vendor/opencsd/v1.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: br X-Git-Repository: src X-Git-Refname: refs/tags/vendor/opencsd/v1.4.0 X-Git-Reftype: annotated tag X-Git-Commit: d7590ef636ed2132b4af5b9edafe7921ca0e80ac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The annotated tag vendor/opencsd/v1.4.0 has been created by br: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/opencsd/v1.4.0 tag vendor/opencsd/v1.4.0 Tagger: Ruslan Bukin TaggerDate: 2023-03-27 15:23:43 +0000 Tag OpenCSD v1.4.0. commit 974000f192f9f74654b8835361cf35e606a10a76 Author: Ruslan Bukin AuthorDate: 2023-03-27 15:14:10 +0000 Commit: Ruslan Bukin CommitDate: 2023-03-27 15:23:28 +0000 Update OpenCSD to v1.4.0. Sponsored by: UKRI From nobody Mon Mar 27 15:39: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 4PlcST43Fyz41gwj for ; Mon, 27 Mar 2023 15:39:37 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) (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 4PlcST1zJvz4D6n for ; Mon, 27 Mar 2023 15:39:37 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x82f.google.com with SMTP id p2so3887483qtw.13 for ; Mon, 27 Mar 2023 08:39:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1679931576; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ZNlWFqYNlflEd0gKtsuc4ObowCzuJq03RvwW/UcW37A=; b=ka7wgafskm1WhU9S5zwZk/cIidnDpR5gG/hEd0RvFns4NKCzH1/NakRt914iNJ6OCS jt4HCB2ZPM0Bez8hvJZVfXBrSR6c4EU5uC/N10576rw3mvpLSg+/9k83Sb/+H01o5PmQ 2NUHhdZm8laqyXJN7tDcnujgnTXNrNCduBBYf3PywHfgCm0DV8jjAk7aVxa6SDcQSXfw Tos+lC4S7K0UyjFIXoTkqoevoWwsPPfrSYI5R23+HGbpr4d/lFceO+9o+znFKiEHNnGK CEnTb5KTcsuzS/Fgu4V/ydQ4iElmChhnmvYiM5/ZGW12PtX6J1hN3ViKfe7KMKshq80f mqqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679931576; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ZNlWFqYNlflEd0gKtsuc4ObowCzuJq03RvwW/UcW37A=; b=tRhwTNdZqqqS9aJyORF2UOY6bpVcDVEF3AEobZVztRYXEh3dhrktluOVajrNVmt1/m izRbBvJzuDcEwydveuonrvYxodSAYmaPxbzKcnzz0Yw2v0r/Z3JtAdMs3Edd/TKlFzMV GpaqbW2dbHlD4fNOOAXNZ6yEdc68ThCIAm0nUrU7zSBEbDyTooxCirc4qCETZoXzCzAO uYicdrVrtu5z6evO70QkyiWTLsxlGZ1NiHCnGUILEv6SbmHI9MVUWJaxQSNtwX5dKLez FIsNiCkkeaZjDfz4m1LcXr/yHvovnTVPqoBBipGUkWFccb69rFXfhMwcgi4YVrHspZt8 3SWg== X-Gm-Message-State: AO0yUKWcNHCm5KyeasfS2yHmbgnQrLP0ac0+bhaCpL9I/6PixJ4AdFwU HMDKF2MNgCQiQRNseVOrNGo3pl0oE7o78fHlAK8= X-Google-Smtp-Source: AK7set8Pm6mtgqd9Era6s5Y1oG5wXa9WDqlFbj+zSITRkUMyhZm4fTkOEdFoqp6bVOo7CEfPSx9spQ== X-Received: by 2002:ac8:5f0b:0:b0:3e1:c341:f618 with SMTP id x11-20020ac85f0b000000b003e1c341f618mr19382390qta.65.1679931576375; Mon, 27 Mar 2023 08:39:36 -0700 (PDT) Received: from mutt-hbsd (pool-100-16-219-215.bltmmd.fios.verizon.net. [100.16.219.215]) by smtp.gmail.com with ESMTPSA id q43-20020a05620a2a6b00b0074860fcfc00sm1463055qkp.136.2023.03.27.08.39.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 08:39:35 -0700 (PDT) Date: Mon, 27 Mar 2023 11:39:34 -0400 From: Shawn Webb To: "Alexander V. Chernikov" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 19e43c163c64 - main - netlink: add netlink KPI to the kernel by default Message-ID: <20230327153934.6lghvi7cnqodhig3@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 14.0-CURRENT-HBSD FreeBSD 14.0-CURRENT-HBSD X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <202303271355.32RDtqJ9006858@gitrepo.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: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="a7lhvfo6fvqg6fvl" Content-Disposition: inline In-Reply-To: <202303271355.32RDtqJ9006858@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4PlcST1zJvz4D6n X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --a7lhvfo6fvqg6fvl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 27, 2023 at 01:55:52PM +0000, Alexander V. Chernikov wrote: > The branch main has been updated by melifaro: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D19e43c163c64636d2590dca006= e22f18d22f48b2 >=20 > commit 19e43c163c64636d2590dca006e22f18d22f48b2 > Author: Alexander V. Chernikov > AuthorDate: 2023-03-27 11:59:30 +0000 > Commit: Alexander V. Chernikov > CommitDate: 2023-03-27 13:55:44 +0000 >=20 > netlink: add netlink KPI to the kernel by default > =20 > This change does the following: > =20 > Base Netlink KPIs (ability to register the family, parse and/or > write a Netlink message) are always present in the kernel. Specifica= lly, > * Implementation of genetlink family/group registration/removal, > some base accessors (netlink_generic_kpi.c, 260 LoC) are compiled in > unconditionally. > * Basic TLV parser functions (netlink_message_parser.c, 507 LoC) are > compiled in unconditionally. > * Glue functions (netlink<>rtsock), malloc/core sysctl definitions > (netlink_glue.c, 259 LoC) are compiled in unconditionally. > * The rest of the KPI _functions_ are defined in the netlink_glue.c, > but their implementation calls a pointer to either the stub function > or the actual function, depending on whether the module is loaded or= not. > =20 > This approach allows to have only 1k LoC out of ~3.7k LoC (current > sys/netlink implementation) in the kernel, which will not grow furth= er. > It also allows for the generic netlink kernel customers to load > successfully without requiring Netlink module and operate correctly > once Netlink module is loaded. > =20 > Reviewed by: imp > MFC after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D39269 > --- > sys/conf/files | 4 +- > sys/conf/options | 2 +- > sys/modules/carp/Makefile | 2 +- > sys/modules/netlink/Makefile | 6 +- > sys/net/route.c | 19 --- > sys/netinet/ip_carp.c | 2 + > sys/netlink/netlink_ctl.h | 10 +- > sys/netlink/netlink_domain.c | 24 --- > sys/netlink/netlink_generic.c | 282 +++--------------------------= ------ > sys/netlink/netlink_generic_kpi.c | 279 +++++++++++++++++++++++++++++= +++++ > sys/netlink/netlink_io.c | 2 + > sys/netlink/netlink_message_writer.c | 22 +-- > sys/netlink/netlink_message_writer.h | 86 +++++++++++ > sys/netlink/netlink_module.c | 26 +++- > sys/netlink/netlink_var.h | 44 ++++++ > sys/netlink/route/iface.c | 2 + > sys/netlink/route/neigh.c | 2 + > sys/netlink/route/nexthop.c | 2 + > sys/netlink/route/rt.c | 2 + > 19 files changed, 497 insertions(+), 321 deletions(-) >=20 > diff --git a/sys/conf/files b/sys/conf/files > index 629283f7c071..94cd7135b277 100644 > --- a/sys/conf/files > +++ b/sys/conf/files > @@ -4424,10 +4424,12 @@ netipsec/xform_ipcomp.c optional ipsec inet | ip= sec inet6 > netipsec/xform_tcp.c optional ipsec inet tcp_signature | \ > ipsec inet6 tcp_signature | ipsec_support inet tcp_signature | \ > ipsec_support inet6 tcp_signature > +netlink/netlink_generic_kpi.c standard > +netlink/netlink_glue.c standard It appears netlink/netlink_glue.c was missed from this commit: cc: error: no such file or directory: '/usr/src/sys/netlink/netlink_glue.c' cc: error: no input files Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --a7lhvfo6fvqg6fvl Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmQhuLAACgkQ/y5nonf4 4frv3A//dsAJVKnPGvH1exicW85aL88IGZUtzMlns+z0gz5oaE5swn/Y2suo1h9p gbA5Ah29R01Know3qsRmxqhzA8EAXwoDqEeKydfpBKh2Yrl75a1RnPMnrUh2xdc8 nHsRtpSj7W3fhPDRF3SD/hXnmWlkuEsMWLW6i45kkzEBg1xs26ol8WOpTlXXYnPS VGqddTXqhU0oI9RM/8scaGSZYSirkIV4z30n+oo52tQrayJi/Gg5C/O+OZU6bLXM v2h9lmVJTsdVqKZs5Cq9V6Y4qGNK+xxMc4KUhetyEeJTcvPUrRbEXfFfdLfGW3q4 jOmFTV9iAqG3JdFPOw+N0ncJ5JChHe3u/R+BSSaxxgcEq2Vd6+G//O+I7L1lXr2j JklMJohXF45EGRHIplkuouujcO6YDkqDrfperQJ/PFIJPhE2n6fY0xQXtE+e4sAJ ohyyqpSu6m3IeE8In1VmKUTxGz4qoc4EJcgzkN0DESRTJJMIJn9Fcfibbh93FeS4 AfixY84LkmR+3L9IEZRF0wB32FUyCjUpmO0IUivdtra1t4zn8SbYnXhz7V+HH5Pk 09c3KQRNRfjqH5fWXyzadpLVnZhf9aBzy4YdWkuY6gLJM0oC3vrX+ImUFZfvZQrt sMwURdC7QrvBwaTK0QS6eO7W7qm1YBUDyJJ5lLIWzdFCWi+tKHY= =jfyF -----END PGP SIGNATURE----- --a7lhvfo6fvqg6fvl-- From nobody Mon Mar 27 15:45: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 4Plcbb3DbBz41hYB for ; Mon, 27 Mar 2023 15:45: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 4Plcbb2df1z4Dyg; Mon, 27 Mar 2023 15:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679931947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9STU+W6YBRL0Sajwg9afA8i2jaF1MZT2Nlt7bGRXGf4=; b=j0Bp0F5/tkPtnQ8caBROqW4ghqgXiDyWcUoKzZx83FQAsSMTICE+66/BJyCwh6f35+BB/m TrDJAKYYrmitr70w/BnbIV9EZKI4GMxGsFJF6b3aNWKMr4xsdjWHUYYLHjwZBV7cdC2TO+ XrrbfBXv1sjY79Zwe3JF9eA1jp0ke5s2AAGZbnt06BWuf04/Sd17wiCReB9UxGznZ6NHPb Z3E3zpHA6zbf938lxnhM7P5jBBbO0FqQRYYATMKrB3FyzmoH0woHjRctMmJ2oX13L1GB4Y xHC2L8OAF0a9S0lmMlhiFqt87/YiTLoMzfuyn9qi7X6kw9GZy97PtOM2tqk6yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679931947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9STU+W6YBRL0Sajwg9afA8i2jaF1MZT2Nlt7bGRXGf4=; b=ZPuP1nJna2F2lBNCYDPBI0T8NIapNb1v49luvUAg+/QCPTLNzz6nXMod+EP5J18FJEgcrF dgLUXtBJn+p8+u0mYUbf7ncqmgLiyEt5H89fOZfcbFAfW4/flAcgpiKd3DZ/6qzqkkMFjL mgO6/7l53WyucwzELba9O6z4yuwL3cWY0sxx7XZFajNevVeDBxtvWoO9h6S+SFZWYS13Iz Hk/gf96AY7MQIF4wrmPtVZGIGFkbXH+HkbWvq+ep+UNQNFiAvNwH1A6JG4eAS0b9bTfbpx q/qMkdWp6gKvDWU4OhEL+yzBdWxEzXSeEh5SMMJr+jfAGknJCibcdGaAQjMzWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679931947; a=rsa-sha256; cv=none; b=RykeLBY1n9aaWhiHYeUg7lfPbdZvsGun2Dq0PjSnT5O5sHR+veH7SIg/1x3oNdIJ+K39pT i7g5VTwfzylhDOMNPxXyrPM5OEXOSTnME0uOI4ZckBBFzSbfSx4ZopKeFMs5wuXXO3O0w4 glErRmGTjj+jQ7QAn0Em0scx3k6Fy/ztkWrAXpZ+kRsI3XVaxRjBfZbGQxs186ZaDMD1Vw A/WiGlmLowwoZw2/N5iUC/hteW/8jrP49VqQPdwv5ases+ayjV3kiAjmUjlik1ifHrNVwQ 5l5Zur6THoU6H1w31GY1dtLYVye2j7CWadd0hb91qtGr9y+ELEAYIUyMwhPpbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Plcbb1LldzSb2; Mon, 27 Mar 2023 15:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RFjlGk088408; Mon, 27 Mar 2023 15:45:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RFjl6x088407; Mon, 27 Mar 2023 15:45:47 GMT (envelope-from git) Date: Mon, 27 Mar 2023 15:45:47 GMT Message-Id: <202303271545.32RFjl6x088407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Ruslan Bukin Subject: git: d7aa8d0a1f11..974000f192f9 - vendor/opencsd - 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: br X-Git-Repository: src X-Git-Refname: refs/heads/vendor/opencsd X-Git-Reftype: branch X-Git-Commit: 974000f192f9f74654b8835361cf35e606a10a76 X-Git-Oldrev: d7aa8d0a1f110421252d79f5acfb72d89187ad1f X-Git-Newrev: 974000f192f9f74654b8835361cf35e606a10a76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch vendor/opencsd has been updated by br: URL: https://cgit.FreeBSD.org/src/log/?id=d7aa8d0a1f11..974000f192f9 974000f192f9 Update OpenCSD to v1.4.0. From nobody Mon Mar 27 16:04: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 4Pld1H3jV1z41jNV; Mon, 27 Mar 2023 16:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pld1H3CNzz4Fyl; Mon, 27 Mar 2023 16:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679933075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1xoiUSKQ8pf4kq7+DdSm5Z9VI6OB0VMxO7FxYQ8onS4=; b=TTZDM3rRG6MuiU/CEHNZCihyiGE1yS5vLNAdyjN0ttwxISXmIe6H4/HStEKPItOscb8nCM tPJqxdPObWO/PnKGRxfKr7QvdzrbKuGkEZt33jh8c6YJZXfpcDtdYopz4odzkrvFpq0M6v BXw/NW99am3woOlZhUzksayWNeHJ9o4naJc5chH9e6Be0iII44nWLC7rcp22+V79XbeXlE gZ5fuiT2TkyPNVwLSBRzzVeYwlftGOLAQIE4AbR9M+lGUwccvmE6ZBFxXzD9mg+W3tmogu 7mLi8z2jWwSg53wJ1Okk8W50M7kit1A0eY9nT2JJaCgdn5aLK0ZZiVC7DyMcAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679933075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1xoiUSKQ8pf4kq7+DdSm5Z9VI6OB0VMxO7FxYQ8onS4=; b=yWg/r6uqwu97zscv0m/6ChhFq6NevBMrRcEBJLd/4W+LulBxTvpzWAfONU4acZpadifcEu oGQ4t9nmODIYp7jNYsl6AiDWJ9kusIK53HWuziXpFrgTQx7IF7c4fzzfArNfpeNT/tB30K tImE7SASgXjOp2i4g+PzZa5sb/TtN1199vgX/42yPCsf7KIkajGpjMsq+AcqDtztzfVy/k /JTmBIQQytNOmtMr3RWIJ5HXD4cyVmYRGAVSlrkmRFyN3urE8zHnOZBHr10hNmSJpavxF0 6KsyHfBu/rH3a8k8W59kjOvtYFSrr8It+78euouchQdVzTmz9qYJUOGHiabyeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679933075; a=rsa-sha256; cv=none; b=ZtzdNJcO3W/Le4ciqUPaYGST6DWmYQ/VTJj7UPeF5SXq21QPNJEGe7fX6pg/hFrpaVBoec WEH7d407ti4n9XGblHHpZ64dwJcDQn/Ot2rCbA99c2qwMAOTVNg00+WYDSX3U96qnSqkeH X0Ode5f13TtUmrtwbSzHSB2ppEYh18Q136uwXU4Ua/iZwEOnqIvx09C9nqx2NUJNhG8K5z BQmmY1iXHmoo43KURgSpgjcRlAbHfBkI75BZuShVI9w95uxNifdyfFtV8rtN32r4003aKu Q+lAe4xkE+sa6lY0gs4myrLg3wctYdv7VJtb8UjcvSsT8vezLQy/5AMsWR3h+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pld1H2FxgzTBH; Mon, 27 Mar 2023 16:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RG4ZUW022064; Mon, 27 Mar 2023 16:04:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RG4Z1W022062; Mon, 27 Mar 2023 16:04:35 GMT (envelope-from git) Date: Mon, 27 Mar 2023 16:04:35 GMT Message-Id: <202303271604.32RG4Z1W022062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 46e6e290975f - main - Import OpenCSD v.1.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: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46e6e290975f19ea62d03f90ac3e523af4dae557 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=46e6e290975f19ea62d03f90ac3e523af4dae557 commit 46e6e290975f19ea62d03f90ac3e523af4dae557 Merge: 19e43c163c64 974000f192f9 Author: Ruslan Bukin AuthorDate: 2023-03-27 16:03:16 +0000 Commit: Ruslan Bukin CommitDate: 2023-03-27 16:03:16 +0000 Import OpenCSD v.1.4.0. Sponsored by: UKRI .../opencsd/decoder/include/common/ocsd_dcd_mngr.h | 49 +- .../opencsd/decoder/include/common/ocsd_dcd_tree.h | 29 +- .../opencsd/decoder/include/common/ocsd_error.h | 11 + .../decoder/include/common/trc_core_arch_map.h | 29 +- .../decoder/include/common/trc_frame_deformatter.h | 7 + .../opencsd/decoder/include/common/trc_gen_elem.h | 14 +- .../decoder/include/common/trc_pkt_decode_base.h | 9 + .../decoder/include/common/trc_pkt_proc_base.h | 48 +- .../decoder/include/i_dec/trc_idec_arminst.h | 5 +- .../decoder/include/interfaces/trc_pkt_raw_in_i.h | 2 +- .../include/interfaces/trc_tgt_mem_access_i.h | 8 + .../decoder/include/mem_acc/trc_mem_acc_mapper.h | 2 + contrib/opencsd/decoder/include/opencsd.h | 1 + .../include/opencsd/c_api/ocsd_c_api_types.h | 1 + .../decoder/include/opencsd/c_api/opencsd_c_api.h | 52 +- .../decoder/include/opencsd/ete/ete_decoder.h | 47 ++ .../decoder/include/opencsd/ete/trc_cmp_cfg_ete.h | 81 +++ .../decoder/include/opencsd/ete/trc_dcd_mngr_ete.h | 58 ++ .../include/opencsd/ete/trc_pkt_types_ete.h | 66 ++ .../include/opencsd/etmv4/trc_cmp_cfg_etmv4.h | 27 + .../include/opencsd/etmv4/trc_etmv4_stack_elem.h | 70 +++ .../include/opencsd/etmv4/trc_pkt_decode_etmv4i.h | 28 +- .../include/opencsd/etmv4/trc_pkt_elem_etmv4i.h | 20 +- .../include/opencsd/etmv4/trc_pkt_proc_etmv4i.h | 4 +- .../include/opencsd/etmv4/trc_pkt_types_etmv4.h | 47 +- .../decoder/include/opencsd/ocsd_if_types.h | 72 ++- .../decoder/include/opencsd/ocsd_if_version.h | 8 +- .../decoder/include/opencsd/stm/trc_pkt_proc_stm.h | 3 +- .../decoder/include/opencsd/trc_gen_elem_types.h | 29 +- .../opencsd/decoder/source/c_api/ocsd_c_api.cpp | 51 +- .../opencsd/decoder/source/ete/trc_cmp_cfg_ete.cpp | 98 +++ .../decoder/source/etmv3/trc_pkt_elem_etmv3.cpp | 2 +- .../decoder/source/etmv4/trc_cmp_cfg_etmv4.cpp | 2 +- .../decoder/source/etmv4/trc_etmv4_stack_elem.cpp | 38 ++ .../decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp | 680 ++++++++++++++++----- .../decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp | 86 ++- .../decoder/source/etmv4/trc_pkt_proc_etmv4i.cpp | 158 ++++- .../opencsd/decoder/source/i_dec/trc_i_decode.cpp | 17 +- .../decoder/source/i_dec/trc_idec_arminst.cpp | 30 +- .../decoder/source/mem_acc/trc_mem_acc_mapper.cpp | 8 + contrib/opencsd/decoder/source/ocsd_dcd_tree.cpp | 79 ++- contrib/opencsd/decoder/source/ocsd_error.cpp | 21 + .../opencsd/decoder/source/ocsd_gen_elem_stack.cpp | 1 + .../decoder/source/ocsd_lib_dcd_register.cpp | 5 +- .../decoder/source/pkt_printers/trc_print_fact.cpp | 3 +- .../decoder/source/ptm/trc_pkt_proc_ptm.cpp | 7 +- .../opencsd/decoder/source/trc_core_arch_map.cpp | 104 +++- .../decoder/source/trc_frame_deformatter.cpp | 259 +++++--- .../decoder/source/trc_frame_deformatter_impl.h | 28 +- contrib/opencsd/decoder/source/trc_gen_elem.cpp | 40 +- .../opencsd/decoder/source/trc_printable_elem.cpp | 2 - 51 files changed, 2200 insertions(+), 346 deletions(-) diff --cc contrib/opencsd/decoder/include/opencsd/ete/ete_decoder.h index 000000000000,ba0d718bfff1..ba0d718bfff1 mode 000000,100644..100644 --- a/contrib/opencsd/decoder/include/opencsd/ete/ete_decoder.h +++ b/contrib/opencsd/decoder/include/opencsd/ete/ete_decoder.h diff --cc contrib/opencsd/decoder/include/opencsd/ete/trc_cmp_cfg_ete.h index 000000000000,8365ffa88460..8365ffa88460 mode 000000,100644..100644 --- a/contrib/opencsd/decoder/include/opencsd/ete/trc_cmp_cfg_ete.h +++ b/contrib/opencsd/decoder/include/opencsd/ete/trc_cmp_cfg_ete.h diff --cc contrib/opencsd/decoder/include/opencsd/ete/trc_dcd_mngr_ete.h index 000000000000,7b0c134b20c5..7b0c134b20c5 mode 000000,100644..100644 --- a/contrib/opencsd/decoder/include/opencsd/ete/trc_dcd_mngr_ete.h +++ b/contrib/opencsd/decoder/include/opencsd/ete/trc_dcd_mngr_ete.h diff --cc contrib/opencsd/decoder/include/opencsd/ete/trc_pkt_types_ete.h index 000000000000,f87d454605fd..f87d454605fd mode 000000,100644..100644 --- a/contrib/opencsd/decoder/include/opencsd/ete/trc_pkt_types_ete.h +++ b/contrib/opencsd/decoder/include/opencsd/ete/trc_pkt_types_ete.h diff --cc contrib/opencsd/decoder/source/ete/trc_cmp_cfg_ete.cpp index 000000000000,474cb2f7914a..474cb2f7914a mode 000000,100644..100644 --- a/contrib/opencsd/decoder/source/ete/trc_cmp_cfg_ete.cpp +++ b/contrib/opencsd/decoder/source/ete/trc_cmp_cfg_ete.cpp From nobody Mon Mar 27 16:09: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 4Pld6g5WfTz41jxM; Mon, 27 Mar 2023 16:09: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 4Pld6g4zQGz4Gsn; Mon, 27 Mar 2023 16:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679933355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c43Jl0ImnUC7LR8Uctkvi6czIGvwglZb7SdHaF0OpOA=; b=RAz8RwmQ+9F9VCuwuFd7MVOVISBwwzPW3djz9Gs8WB5aAqTpgFGyZJN5/Dmez8heOTDSvA mYi2J07/fzBfpP/ZUt/KCUDbzRCCswFWVnKxVakCAWNIbLth0xQxOfslW9U8LMwOtvRpkE tpta+CrLyFk2gXYxOJ0HWbwi+B5EpaQ/04LuKp3ygy57rgjXalfBUcHDgKjekJnpTIGRT3 8juVh6dY8nrvuFB2AGc//34u2Bu5PExG/EnsUv2CQAg/vPyeuKHkBiOGq6l/aP+eG+Vc4j plDAyDf/Q10YR8gxRsF2QpIs+ozp4rm1AQkXFwxsGKtI10KTymfit0Ez2XhIPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679933355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c43Jl0ImnUC7LR8Uctkvi6czIGvwglZb7SdHaF0OpOA=; b=AUVJz+Eb2hotZzZ4bRjZVYTob+ER1SAMVq1TFXLvoH8jdP6pZilK+kyc+DrFYjb8JFybN+ DIe8ugXpGXuO40on3Di8kM3/qSQhxoI0tpq8T03zZdGWPtkVt9pST/wuDG66lLdQuXSFye JOLL6GxhhisAE2xw5KvjhDwHrW0qaR/ZcJ9+qI+gCUrIAHWptB8YJC6N+kZKYfJNF8BGgt +gWYxS43zYA/Hfqh0IBYZ+1r6L/TG3D6HXZiMmQ9xEsKXwpAhGMEzkUdi5n41ZdvrncIes VQbJhnrJoPVJ4g8UBIJIiSdw54kJ6nnKP5OZtOSCeilUyUXcT0ROme7Hdc7gSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679933355; a=rsa-sha256; cv=none; b=UzadHwZp4dzrj62AfAsJM+7XOc9CizjY7hD00IAAzfXZSoBlCjtI8Djq29L0+x22J41+4W nIlB3mj2NROKCZyw5QawLbYO7ZnCaRnnozm9lU80QR4vNlbKGb3OU5edUpN5GvTEYlYKme R7aTdejvw4v/j/QIip4WsQ3K4/jd2yYZ5B6N2SqZMY8VByO8iCwxWeKh7XwTnJW+FKkyP+ itiuZV68lcuLpGBp6pV3yy+R77loycjaXnkEO2G/ma+y8/cKZUomYYWq1CoHyQ4Ua/DpZJ rFRvVU/OR/pMP89Gl6fOisTQQkpbVj+HKSxECgw78d9zePu0qPo49IOxAI0o2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pld6g427jzSZq; Mon, 27 Mar 2023 16:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RG9Fxs022721; Mon, 27 Mar 2023 16:09:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RG9Fn1022720; Mon, 27 Mar 2023 16:09:15 GMT (envelope-from git) Date: Mon, 27 Mar 2023 16:09:15 GMT Message-Id: <202303271609.32RG9Fn1022720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: d3a49f62a284 - main - netlink: fix 19e43c163c64 by adding miseed netlinkg_glue.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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3a49f62a2848799a2e4cf205f44c4a0ca53b819 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=d3a49f62a2848799a2e4cf205f44c4a0ca53b819 commit d3a49f62a2848799a2e4cf205f44c4a0ca53b819 Author: Alexander V. Chernikov AuthorDate: 2023-03-27 16:08:24 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-27 16:09:02 +0000 netlink: fix 19e43c163c64 by adding miseed netlinkg_glue.c --- sys/netlink/netlink_glue.c | 266 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 266 insertions(+) diff --git a/sys/netlink/netlink_glue.c b/sys/netlink/netlink_glue.c new file mode 100644 index 000000000000..25b891036b5b --- /dev/null +++ b/sys/netlink/netlink_glue.c @@ -0,0 +1,266 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2023 Alexander V. Chernikov + * + * 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 "opt_netlink.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* priv_check */ + +#include +#include + +#include +#include +#include + +/* Standard bits: built-in the kernel */ +SYSCTL_NODE(_net, OID_AUTO, netlink, CTLFLAG_RD, 0, ""); +SYSCTL_NODE(_net_netlink, OID_AUTO, debug, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, ""); + +MALLOC_DEFINE(M_NETLINK, "netlink", "Memory used for netlink packets"); + +/* Netlink-related callbacks needed to glue rtsock, netlink and linuxolator */ +static void +ignore_route_event(uint32_t fibnum, const struct rib_cmd_info *rc) +{ +} + +static void +ignore_ifmsg_event(struct ifnet *ifp, int if_flags_mask) +{ +} + +static struct rtbridge ignore_cb = { + .route_f = ignore_route_event, + .ifmsg_f = ignore_ifmsg_event, +}; + +void *linux_netlink_p = NULL; /* Callback pointer for Linux translator functions */ +struct rtbridge *rtsock_callback_p = &ignore_cb; +struct rtbridge *netlink_callback_p = &ignore_cb; + + +/* + * nlp accessors. + * TODO: move to a separate file once the number grows. + */ +bool +nlp_has_priv(struct nlpcb *nlp, int priv) +{ + return (priv_check_cred(nlp->nl_cred, priv) == 0); +} + +struct ucred * +nlp_get_cred(struct nlpcb *nlp) +{ + return (nlp->nl_cred); +} + +uint32_t +nlp_get_pid(const struct nlpcb *nlp) +{ + return (nlp->nl_process_id); +} + +bool +nlp_unconstrained_vnet(const struct nlpcb *nlp) +{ + return (nlp->nl_unconstrained_vnet); +} + +#ifndef NETLINK +/* Stub implementations for the loadable functions */ + +static bool +get_stub_writer(struct nl_writer *nw) +{ + bzero(nw, sizeof(*nw)); + nw->writer_type = NS_WRITER_TYPE_STUB; + nw->enomem = true; + + return (false); +} + +static bool +nlmsg_get_unicast_writer_stub(struct nl_writer *nw, int size, struct nlpcb *nlp) +{ + return (get_stub_writer(nw)); +} + +static bool +nlmsg_get_group_writer_stub(struct nl_writer *nw, int size, int protocol, int group_id) +{ + return (get_stub_writer(nw)); +} + +static bool +nlmsg_get_chain_writer_stub(struct nl_writer *nw, int size, struct mbuf **pm) +{ + return (get_stub_writer(nw)); +} + +static bool +nlmsg_flush_stub(struct nl_writer *nw __unused) +{ + return (false); +} + +static void +nlmsg_ignore_limit_stub(struct nl_writer *nw __unused) +{ +} + +static bool +nlmsg_refill_buffer_stub(struct nl_writer *nw __unused, int required_len __unused) +{ + return (false); +} + +static bool +nlmsg_add_stub(struct nl_writer *nw, uint32_t portid, uint32_t seq, uint16_t type, + uint16_t flags, uint32_t len) +{ + return (false); +} + +static bool +nlmsg_end_stub(struct nl_writer *nw __unused) +{ + return (false); +} + +static void +nlmsg_abort_stub(struct nl_writer *nw __unused) +{ +} + +static bool +nlmsg_end_dump_stub(struct nl_writer *nw, int error, struct nlmsghdr *hdr) +{ + return (false); +} + +const static struct nl_function_wrapper nl_stub = { + .nlmsg_add = nlmsg_add_stub, + .nlmsg_refill_buffer = nlmsg_refill_buffer_stub, + .nlmsg_flush = nlmsg_flush_stub, + .nlmsg_end = nlmsg_end_stub, + .nlmsg_abort = nlmsg_abort_stub, + .nlmsg_ignore_limit = nlmsg_ignore_limit_stub, + .nlmsg_get_unicast_writer = nlmsg_get_unicast_writer_stub, + .nlmsg_get_group_writer = nlmsg_get_group_writer_stub, + .nlmsg_get_chain_writer = nlmsg_get_chain_writer_stub, + .nlmsg_end_dump = nlmsg_end_dump_stub, +}; + +/* + * If the kernel is compiled with netlink as a module, + * provide a way to introduce non-stub functioms + */ +static const struct nl_function_wrapper *_nl = &nl_stub; + +void +nl_set_functions(const struct nl_function_wrapper *nl) +{ + _nl = (nl != NULL) ? nl : &nl_stub; +} + +/* Function wrappers */ +bool +nlmsg_get_unicast_writer(struct nl_writer *nw, int size, struct nlpcb *nlp) +{ + return (_nl->nlmsg_get_unicast_writer(nw, size, nlp)); +} + +bool +nlmsg_get_group_writer(struct nl_writer *nw, int size, int protocol, int group_id) +{ + return (_nl->nlmsg_get_group_writer(nw, size, protocol, group_id)); +} + +bool +nlmsg_get_chain_writer(struct nl_writer *nw, int size, struct mbuf **pm) +{ + return (_nl->nlmsg_get_chain_writer(nw, size, pm)); +} + +bool +nlmsg_flush(struct nl_writer *nw) +{ + return (_nl->nlmsg_flush(nw)); +} + +void nlmsg_ignore_limit(struct nl_writer *nw) +{ + _nl->nlmsg_ignore_limit(nw); +} + +bool +nlmsg_refill_buffer(struct nl_writer *nw, int required_len) +{ + return (_nl->nlmsg_refill_buffer(nw, required_len)); +} + +bool +nlmsg_add(struct nl_writer *nw, uint32_t portid, uint32_t seq, uint16_t type, + uint16_t flags, uint32_t len) +{ + return (_nl->nlmsg_add(nw, portid, seq, type, flags, len)); +} + +bool +nlmsg_end(struct nl_writer *nw) +{ + return (_nl->nlmsg_end(nw)); +} + +void +nlmsg_abort(struct nl_writer *nw) +{ + _nl->nlmsg_abort(nw); +} + +bool +nlmsg_end_dump(struct nl_writer *nw, int error, struct nlmsghdr *hdr) +{ + return (_nl->nlmsg_end_dump(nw, error, hdr)); +} +#endif /* !NETLINK */ + From nobody Mon Mar 27 16:11: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 4Pld8n2fkkz41jvJ; Mon, 27 Mar 2023 16:11: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 4Pld8n29LJz4HDH; Mon, 27 Mar 2023 16:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679933465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSQQmjQJeRbSOtTeE8k77Iq65NWPZ4Rq7SitrHaQNM4=; b=nk7rifJCpuIyxARzc/whaUpRMQLWpwGBQLguvP1g07Sacsbb2/+N47ynx7zj4DQ0aOtmgZ mJWqpMRx4Czxj+Wmk0I76Upa3W/0grjlSX9oaopcVwx4Zd/DYe37Q8xyUgmAhwHAi9RDQb mSCe2f+YpW5U5IA2PZYlL2Kj1itGJQRR4tnGEnsA3TiLrtciou+sg8+sTgtknFRe/7SmSw mh2EGk0zaXVNgeS7Ex54CqoEuKV94QpjtG0DdveYlSfdT9gRsHxzfp0MqDMAXqhPWC/lHw BK1en4etyFxk130RRhBXaWXY0J4px+ed1zQVUeDZ1qkKgNqvjiQZqXA4qg28Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679933465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSQQmjQJeRbSOtTeE8k77Iq65NWPZ4Rq7SitrHaQNM4=; b=XEwgOemMADzNcA3x2iM4ZmssN1YSXcEozijRGhrXR1kj5aHhf+b5I+A1e+dAHKuEAw+YWT IbThL0gZfniTbGNwyolJajuivxLGcTkOov3lQ8W7xbp7EkuDiZ7qJAamGw7e8TevSWo4UL PwVb3+TBzQQDuRcQR60AsdD/2l1G48QxwDJ1+W/04iwiHYCI59/8QP+1xoSaBc7sumYzy8 UvPNPxTy3M8wC6jRvUeYkVfC4NgqOKPQ43hj7t2rRiZlTyOnNZ3YWespZc4Xbrt0SgXRkp Dii2dX2jKSyD6SXY4Is1f8/CZTxkrYHdPhGoID2CqN6CPirImv141TKEXeXHVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679933465; a=rsa-sha256; cv=none; b=IA2KFckzy9nUrc4aCY5ULI2xy8Ws98mS9WnF8u0DDBab3uQq+Xjbd405zS4tJk9jqzo7aS V/4KKHOac9XV2F709hUQVor+G8i1+kzypGAECNKTbdWBMfxs7ZHWWqGFukbMJ+Uhm33Qfi GB+CsvCLAhRSHbUSvtZtpYkHxOUPnxtwbpD4bX604gkIVDS/G86GO69D8C6bQhknzcqMrE kjiZCEnXgS6V73tUKxZdzfDcMjgcnUW7tLDWo3rg54tVM3MSC+VBhp1ROc8c5j9Xb9dOhV I6Jl79xtp9XqKXOQyY2oQdp+rUTblSQP4+YSB4u/pK0f7EqtS4ABuBE17ZRBBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pld8n1DtLzTDm; Mon, 27 Mar 2023 16:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RGB5dY031545; Mon, 27 Mar 2023 16:11:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RGB5F3031544; Mon, 27 Mar 2023 16:11:05 GMT (envelope-from git) Date: Mon, 27 Mar 2023 16:11:05 GMT Message-Id: <202303271611.32RGB5F3031544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 27c8d4851c15 - main - Include Embedded Trace Extensions (ETE) source code to the OpenCSD 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: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27c8d4851c15810fe4dc71dc12d343587f6ecdf2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=27c8d4851c15810fe4dc71dc12d343587f6ecdf2 commit 27c8d4851c15810fe4dc71dc12d343587f6ecdf2 Author: Ruslan Bukin AuthorDate: 2023-03-27 16:07:46 +0000 Commit: Ruslan Bukin CommitDate: 2023-03-27 16:10:26 +0000 Include Embedded Trace Extensions (ETE) source code to the OpenCSD build. Sponsored by: UKRI --- etc/mtree/BSD.include.dist | 2 ++ lib/libopencsd/Makefile | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index ac9edf6a8bcb..0ab456bcc224 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -302,6 +302,8 @@ opencsd c_api .. + ete + .. etmv3 .. etmv4 diff --git a/lib/libopencsd/Makefile b/lib/libopencsd/Makefile index f28b14977cfa..8919bbe5bfa1 100644 --- a/lib/libopencsd/Makefile +++ b/lib/libopencsd/Makefile @@ -7,7 +7,8 @@ SHLIBDIR?= /lib OPENCSDSRC= ${SRCTOP}/contrib/opencsd -.PATH: ${OPENCSDSRC}/decoder/source/etmv4/ \ +.PATH: ${OPENCSDSRC}/decoder/source/ete/ \ + ${OPENCSDSRC}/decoder/source/etmv4/ \ ${OPENCSDSRC}/decoder/source/etmv3/ \ ${OPENCSDSRC}/decoder/source/pkt_printers/ \ ${OPENCSDSRC}/decoder/source/mem_acc/ \ @@ -16,6 +17,7 @@ OPENCSDSRC= ${SRCTOP}/contrib/opencsd ${OPENCSDSRC}/decoder/source/ptm/ \ ${OPENCSDSRC}/decoder/source/stm/ \ ${OPENCSDSRC}/decoder/source/ \ + ${OPENCSDSRC}/decoder/include/opencsd/ete/ \ ${OPENCSDSRC}/decoder/include/opencsd/etmv4/ \ ${OPENCSDSRC}/decoder/include/opencsd/etmv3/ \ ${OPENCSDSRC}/decoder/include/opencsd/stm/ \ @@ -27,8 +29,12 @@ OPENCSDSRC= ${SRCTOP}/contrib/opencsd LIB= opencsd SHLIB_MAJOR=0 -# ETMv3 +# Embedded Trace Extensions (ETE) SRCS= \ + trc_cmp_cfg_ete.cpp + +# ETMv3 +SRCS+= \ trc_cmp_cfg_etmv3.cpp \ trc_pkt_decode_etmv3.cpp \ trc_pkt_elem_etmv3.cpp \ @@ -119,6 +125,14 @@ APIINCS= \ APIINCSDIR=${INCLUDEDIR}/opencsd/c_api/ +ETEINCS= \ + ete_decoder.h \ + trc_cmp_cfg_ete.h \ + trc_dcd_mngr_ete.h \ + trc_pkt_types_ete.h + +ETEINCSDIR=${INCLUDEDIR}/opencsd/ete/ + ETMV4INCS= \ etmv4_decoder.h \ trc_cmp_cfg_etmv4.h \ @@ -165,7 +179,7 @@ STMINCS= \ STMINCSDIR=${INCLUDEDIR}/opencsd/stm/ -INCSGROUPS=INCS APIINCS ETMV3INCS ETMV4INCS PTMINCS STMINCS +INCSGROUPS=INCS APIINCS ETEINCS ETMV3INCS ETMV4INCS PTMINCS STMINCS LIBADD= cxxrt From nobody Mon Mar 27 16:11: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 4Pld9Q1T6Tz41jvt; Mon, 27 Mar 2023 16:11:38 +0000 (UTC) (envelope-from melifaro@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 4Pld9Q1Kcwz4HRX; Mon, 27 Mar 2023 16:11:38 +0000 (UTC) (envelope-from melifaro@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679933498; 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=eKz3UtOLQFcDr1puMu8EOCEO+tpQRGNiEAs/vPvBzkE=; b=UaiFNbgUdYUJD5ftStJJpA8Mf7BAAz8p/9HTuqsWYOmdxfRe0NSZfoZZrJPil5dXuoXXVV dRdPJqJNUbxEGxDjwebg7nWsXOVyE+nk2zRyvoevfam5I+c0yQ3J0FjQu2tday9+BeBSfe XwB3KcigRd3FMs+WqQFCisP7yIXAknp787bL6wvVVja/v+jdsFBK9cOh6OmQ8243wSNQUA Y5FDWzqI6rmSiTxtBMuYwhq5OwnxcItvDc9BnbIY453KWNr6ivJijSlcjoNBjlPDrZEFN3 la0BW5197LdnZDHCJcT65B4bmeqxd7TVAARByk7nDDAxtVhwqWQUpOLfK1UggA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679933498; 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=eKz3UtOLQFcDr1puMu8EOCEO+tpQRGNiEAs/vPvBzkE=; b=tDCv9WER4iVb7CcBuF+4wMIHtoUmcE3QPrLWAbXgv/uSzxr9DCiSG16eJKalNx7S5v6zWK e9hxGrSXw9SPe3Uf+EsayXVCXGZudA6Z80CeBPCRf87z1v0iPDnS2zAwdzhF+Rjs0Wy9oU v0Qq8liEXn3KNKgMIr/anUccmhTgEnJw/jskt2X2UVsPFjcaEYPnkQytwIde98e8jCbCn3 KN7XddQ4OFKbqzKWVWjU0bzID8WMEZVNzngl7RNAOQJchQVEZltPdvuFFO/cVj9FRynYyt +LAic5p7UIQdok7hME5OCjpvtQJHMNsCsFnyxPBRToLs0V0nUV7tJQo7ao/DjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679933498; a=rsa-sha256; cv=none; b=GJO2m1XciikefqwJtuK6vnZr8PUjqE5NBu4BASI1xZ+a8zDWhHw7fnXuzlfJm9D3NRK7h9 w1MqvBZ7NFG2UYChlQwfC0aWkp3egBe3z2HYotSF30DaRB1OB5zO0Y1Sy1l3mV0ItmRU0A Mjnyj0GeN5po09E4g5M1nwEAzG1PISEfka/QMsxSBpx2k46MlQgfMFQLjaJEo/g9PctI2c r/1U068NCFn4wu+5DF5zX4kTskuEd1wK1rzsnGs75eFkx/NQw5BrvJwFNkHfi79mqmTKvY g4cktCaSV/E+vdr8sGJglehBmpD7glUx9MFfwYWXDZHEaH/PYxu+AD39RwxS6Q== Received: from smtpclient.apple (unknown [IPv6:2a02:8084:d6bb:510:198e:52cc:ae4c:3466]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: melifaro/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pld9P34DNzFtb; Mon, 27 Mar 2023 16:11:37 +0000 (UTC) (envelope-from melifaro@freebsd.org) From: Alexander Chernikov Message-Id: <4C61BC36-8977-48A6-9A51-EB6D415DB4CB@freebsd.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_6EA743A0-4A9D-41C1-9DDD-C211E8A11347" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: 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.400.51.1.1\)) Subject: Re: git: 19e43c163c64 - main - netlink: add netlink KPI to the kernel by default Date: Mon, 27 Mar 2023 17:11:25 +0100 In-Reply-To: <20230327153934.6lghvi7cnqodhig3@mutt-hbsd> Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Shawn Webb References: <202303271355.32RDtqJ9006858@gitrepo.freebsd.org> <20230327153934.6lghvi7cnqodhig3@mutt-hbsd> X-Mailer: Apple Mail (2.3731.400.51.1.1) X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail=_6EA743A0-4A9D-41C1-9DDD-C211E8A11347 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On 27 Mar 2023, at 16:39, Shawn Webb = wrote: >=20 > On Mon, Mar 27, 2023 at 01:55:52PM +0000, Alexander V. Chernikov = wrote: >> The branch main has been updated by melifaro: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D19e43c163c64636d2590dca006e22f18= d22f48b2 >>=20 >> commit 19e43c163c64636d2590dca006e22f18d22f48b2 >> Author: Alexander V. Chernikov >> AuthorDate: 2023-03-27 11:59:30 +0000 >> Commit: Alexander V. Chernikov >> CommitDate: 2023-03-27 13:55:44 +0000 >>=20 >> netlink: add netlink KPI to the kernel by default >>=20 >> This change does the following: >>=20 >> Base Netlink KPIs (ability to register the family, parse and/or >> write a Netlink message) are always present in the kernel. = Specifically, >> * Implementation of genetlink family/group registration/removal, >> some base accessors (netlink_generic_kpi.c, 260 LoC) are = compiled in >> unconditionally. >> * Basic TLV parser functions (netlink_message_parser.c, 507 LoC) = are >> compiled in unconditionally. >> * Glue functions (netlink<>rtsock), malloc/core sysctl definitions >> (netlink_glue.c, 259 LoC) are compiled in unconditionally. >> * The rest of the KPI _functions_ are defined in the = netlink_glue.c, >> but their implementation calls a pointer to either the stub = function >> or the actual function, depending on whether the module is loaded = or not. >>=20 >> This approach allows to have only 1k LoC out of ~3.7k LoC (current >> sys/netlink implementation) in the kernel, which will not grow = further. >> It also allows for the generic netlink kernel customers to load >> successfully without requiring Netlink module and operate = correctly >> once Netlink module is loaded. >>=20 >> Reviewed by: imp >> MFC after: 2 weeks >> Differential Revision: https://reviews.freebsd.org/D39269 >> --- >> sys/conf/files | 4 +- >> sys/conf/options | 2 +- >> sys/modules/carp/Makefile | 2 +- >> sys/modules/netlink/Makefile | 6 +- >> sys/net/route.c | 19 --- >> sys/netinet/ip_carp.c | 2 + >> sys/netlink/netlink_ctl.h | 10 +- >> sys/netlink/netlink_domain.c | 24 --- >> sys/netlink/netlink_generic.c | 282 = +++-------------------------------- >> sys/netlink/netlink_generic_kpi.c | 279 = ++++++++++++++++++++++++++++++++++ >> sys/netlink/netlink_io.c | 2 + >> sys/netlink/netlink_message_writer.c | 22 +-- >> sys/netlink/netlink_message_writer.h | 86 +++++++++++ >> sys/netlink/netlink_module.c | 26 +++- >> sys/netlink/netlink_var.h | 44 ++++++ >> sys/netlink/route/iface.c | 2 + >> sys/netlink/route/neigh.c | 2 + >> sys/netlink/route/nexthop.c | 2 + >> sys/netlink/route/rt.c | 2 + >> 19 files changed, 497 insertions(+), 321 deletions(-) >>=20 >> diff --git a/sys/conf/files b/sys/conf/files >> index 629283f7c071..94cd7135b277 100644 >> --- a/sys/conf/files >> +++ b/sys/conf/files >> @@ -4424,10 +4424,12 @@ netipsec/xform_ipcomp.c optional = ipsec inet | ipsec inet6 >> netipsec/xform_tcp.c optional ipsec inet tcp_signature | \ >> ipsec inet6 tcp_signature | ipsec_support inet tcp_signature | = \ >> ipsec_support inet6 tcp_signature >> +netlink/netlink_generic_kpi.c standard >> +netlink/netlink_glue.c standard >=20 > It appears netlink/netlink_glue.c was missed from this commit: Sorry for the breakage, should be fixed in d3a49f62a284. >=20 > cc: error: no such file or directory: = '/usr/src/sys/netlink/netlink_glue.c' > cc: error: no input files >=20 > Thanks, >=20 > --=20 > Shawn Webb > Cofounder / Security Engineer > HardenedBSD >=20 > = https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03= A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --Apple-Mail=_6EA743A0-4A9D-41C1-9DDD-C211E8A11347 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On 27 Mar 2023, at 16:39, Shawn Webb = <shawn.webb@hardenedbsd.org> wrote:

On Mon, Mar 27, 2023 at 01:55:52PM +0000, = Alexander V. Chernikov wrote:
The branch main = has been updated by melifaro:

URL: = https://cgit.FreeBSD.org/src/commit/?id=3D19e43c163c64636d2590dca006e22f18= d22f48b2

commit = 19e43c163c64636d2590dca006e22f18d22f48b2
Author: =     Alexander V. Chernikov = <melifaro@FreeBSD.org>
AuthorDate: 2023-03-27 11:59:30 = +0000
Commit:     Alexander V. Chernikov = <melifaro@FreeBSD.org>
CommitDate: 2023-03-27 13:55:44 = +0000

   netlink: add netlink KPI to the kernel by = default

   This change does the = following:

   Base Netlink KPIs (ability to = register the family, parse and/or
    write a = Netlink message) are always present in the kernel. = Specifically,
   * Implementation of genetlink = family/group registration/removal,
     some = base accessors (netlink_generic_kpi.c, 260 LoC) are compiled = in
     unconditionally.
   = * Basic TLV parser functions (netlink_message_parser.c, 507 LoC) = are
     compiled in = unconditionally.
   * Glue functions = (netlink<>rtsock), malloc/core sysctl = definitions
    (netlink_glue.c, 259 LoC) are = compiled in unconditionally.
   * The rest of the KPI = _functions_ are defined in the = netlink_glue.c,
    but their implementation = calls a pointer to either the stub = function
    or the actual function, depending on = whether the module is loaded or not.

   This = approach allows to have only 1k LoC out of ~3.7k LoC = (current
    sys/netlink implementation) in the = kernel, which will not grow further.
   It also allows = for the generic netlink kernel customers to = load
    successfully without requiring Netlink = module and operate correctly
    once Netlink = module is loaded.

   Reviewed by: =    imp
   MFC after: =      2 weeks
   Differential = Revision: =  https://reviews.freebsd.org/D39269
---
sys/conf/files =             &n= bsp;         | =   4 +-
sys/conf/options =             &n= bsp;       |   2 = +-
sys/modules/carp/Makefile =            | =   2 +-
sys/modules/netlink/Makefile =         |   6 = +-
sys/net/route.c =             &n= bsp;        |  19 = ---
sys/netinet/ip_carp.c =             &n= bsp;  |   2 +
sys/netlink/netlink_ctl.h =            | =  10 +-
sys/netlink/netlink_domain.c =         |  24 = ---
sys/netlink/netlink_generic.c =        | 282 = +++--------------------------------
sys/netlink/netlink_generic_kpi.c =    | 279 = ++++++++++++++++++++++++++++++++++
sys/netlink/netlink_io.c =             | =   2 +
sys/netlink/netlink_message_writer.c |  22 = +--
sys/netlink/netlink_message_writer.h |  86 = +++++++++++
sys/netlink/netlink_module.c =         |  26 = +++-
sys/netlink/netlink_var.h =            | =  44 ++++++
sys/netlink/route/iface.c =            | =   2 +
sys/netlink/route/neigh.c =            | =   2 +
sys/netlink/route/nexthop.c =          |   2 = +
sys/netlink/route/rt.c =             &n= bsp; |   2 +
19 files changed, 497 insertions(+), 321 = deletions(-)

diff --git a/sys/conf/files = b/sys/conf/files
index 629283f7c071..94cd7135b277 100644
--- = a/sys/conf/files
+++ b/sys/conf/files
@@ -4424,10 +4424,12 @@ = netipsec/xform_ipcomp.c optional ipsec inet | ipsec = inet6
netipsec/xform_tcp.c optional ipsec inet tcp_signature = | \
=  ipsec inet6 = tcp_signature | ipsec_support inet tcp_signature | \
 ipsec_support inet6 = tcp_signature
+netlink/netlink_generic_kpi.c = standard
+netlink/netlink_glue.c standard

It appears netlink/netlink_glue.c was = missed from this commit:
Sorry for the breakage, = should be fixed in d3a49f62a284.

cc: error: no such file = or directory: '/usr/src/sys/netlink/netlink_glue.c'
cc: error: no input files

Thanks,

-- 
Shawn Webb
Cofounder / Security Engineer
HardenedBSD

https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_W= ebb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc

= --Apple-Mail=_6EA743A0-4A9D-41C1-9DDD-C211E8A11347-- From nobody Mon Mar 27 17:21: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 4PlfkS2C2Wz41p8c; Mon, 27 Mar 2023 17:21: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 4PlfkS1mtyz4R1F; Mon, 27 Mar 2023 17:21:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679937712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tG7j1AveKiidRx73Kwtf9T4LoVRTOjsmqfqYBAuXIs=; b=OMkuwRqyF/d9qcKdmLoRzTY52F2NAZGzdzKe5eWKxo4e6buqw2cGVYV36+uXV2rrdyISB5 Jrn/KY4T7izukN8tpdkmfe9qMoJ6edjN42GNB5S4a7igRE898SUMw0pTpJCXMSqzHcbb0P H4pWU0NwUUIHR5aMSVniTN1sX1vqy3LPwIv62jJyre3SeJEpmqXhk3CUu6/TE4CxoPRGPm pRSVb4JHcmM3ODfXyBLkHv1YbEDBxGkgfuSQgxsZX468F7kJympa0yoaOqXAghX5n0SjHo G7r/RIq/6q2lyHlRDtZfO2s3njaoQ/XFXIxunfNDvIKRuYEM+zQLnyLwLJ8jBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679937712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tG7j1AveKiidRx73Kwtf9T4LoVRTOjsmqfqYBAuXIs=; b=KqEQVdbBi6+TZNwmYNddp3+a7GKFP4SR1UyKQvrersQVbejsc/shmqYRjSpjx7LTOHl9cu oTpRdIsjfpUoqGIfcMZ8liVMmdqeMQco1ZYgM+jJuvRzgJMUD30c85pkbwbCXjPC2yvdoH tzsJBviEactO5BSAivhGfkmaDXzhRWuM/ty14meYLLb1jXHVqqF+dZ228Yw3040ZsWckNJ iLg4i2RulpQwk7NhA6EdN4lKCBdCJokhijUHYOi08AF8udmLU/bG8nlBxG/mkDtMqYJEdf 3gE16iLHVv0kAgJbjWmsOrVErDCPz2PQTWhtdPg3i/vE7ozQ238IHCwXg34gxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679937712; a=rsa-sha256; cv=none; b=tsxsxZwVWISpmY4FrTqilfGwSXeHsi7AB937hxlV/qhKcZry1VRB6uA/WBSId6wxPiCM5j v15ZoL9w90S2u5J7MTYtBULAR2Ynrcl9M+nm5PW84nkfiJbXrUvqvQIBbhELGo7s4ltqz4 pwfUWYXWMmUxOd/bSfUlh9k1Sp/qYHCggpRGcVecDKSqIgU8D3X8bbceYqfwpiwhwf/VPf 8+oCyIin3aWlQw6zgzqZ2FumtcBEF1hqMTe0V1enI5PHmKH5L2BXuiPdskWfKeFOzaOGyh 4wxf5sk5B3nghEvTYMLZS5usLjCPUfjG8vNaIQgGKPJ/z0QIWFGERWtc5ai9VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlfkS0s3WzWG6; Mon, 27 Mar 2023 17:21:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RHLqf4049635; Mon, 27 Mar 2023 17:21:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RHLq0i049634; Mon, 27 Mar 2023 17:21:52 GMT (envelope-from git) Date: Mon, 27 Mar 2023 17:21:52 GMT Message-Id: <202303271721.32RHLq0i049634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: a979e5ca0b9d - stable/13 - critical(9): small updates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a979e5ca0b9dee32d11428a7a69066e7b64576bc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a979e5ca0b9dee32d11428a7a69066e7b64576bc commit a979e5ca0b9dee32d11428a7a69066e7b64576bc Author: Mitchell Horne AuthorDate: 2023-03-20 19:50:50 +0000 Commit: Mitchell Horne CommitDate: 2023-03-27 17:17:13 +0000 critical(9): small updates - Document CRITICAL_ASSERT() in this man page. - Clarify that a thread may also handle interrupts in a critical section, not only faults/exceptions. - Note the negative effects of critical section abuse - Some other minor clarifications - Add short SEE ALSO Reviewed by: kib, markj, rpokala, Pau Amma MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39130 (cherry picked from commit 43db15b16aa6ee24613d0b25cbf50f2aef5850d1) --- share/man/man9/Makefile | 3 ++- share/man/man9/critical_enter.9 | 48 +++++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 6aa1bcae3c40..ed6de288cfa4 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -926,7 +926,8 @@ MLINKS+=cpuset.9 CPUSET_T_INITIALIZER.9 \ cpuset.9 CPU_OR_ATOMIC.9 \ cpuset.9 CPU_COPY_STORE_REL.9 MLINKS+=critical_enter.9 critical.9 \ - critical_enter.9 critical_exit.9 + critical_enter.9 critical_exit.9 \ + critical_enter.9 CRITICAL_ASSERT.9 MLINKS+=crypto_asym.9 crypto_kdispatch.9 \ crypto_asym.9 crypto_kdone.9 \ crypto_asym.9 crypto_kregister.9 \ diff --git a/share/man/man9/critical_enter.9 b/share/man/man9/critical_enter.9 index 3da3ac1d96a1..8a702e3c44fd 100644 --- a/share/man/man9/critical_enter.9 +++ b/share/man/man9/critical_enter.9 @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 5, 2005 +.Dd March 20, 2023 .Dt CRITICAL_ENTER 9 .Os .Sh NAME @@ -37,15 +37,24 @@ .Fn critical_enter "void" .Ft void .Fn critical_exit "void" +.Fn CRITICAL_ASSERT "struct thread *td" .Sh DESCRIPTION These functions are used to prevent preemption in a critical region of code. All that is guaranteed is that the thread currently executing on a CPU will not be preempted. -Specifically, a thread in a critical region will not migrate to another -CPU while it is in a critical region. +Specifically, a thread in a critical region will not migrate to another CPU +while it is in a critical region, nor will the current CPU switch to a +different thread. The current CPU may still trigger faults and exceptions during a critical section; however, these faults are usually fatal. .Pp +The CPU might also receive and handle interrupts within a critical section. +When this occurs the interrupt exit will not result in a context switch, and +execution will continue in the critical section. +Thus, the net effect of a critical section on the current thread's execution is +similar to running with interrupts disabled, except that timer interrupts and +filtered interrupt handlers do not incur a latency penalty. +.Pp The .Fn critical_enter and @@ -56,18 +65,39 @@ while the current thread is in a critical section, then the preemption will be deferred until the current thread exits the outermost critical section. .Pp -Note that these functions are not required to provide any inter-CPU -synchronization, data protection, or memory ordering guarantees and thus -should +Note that these functions do not provide any inter-CPU synchronization, data +protection, or memory ordering guarantees, and thus should .Em not be used to protect shared data structures. .Pp -These functions should be used with care as an infinite loop within a -critical region will deadlock the CPU. +These functions should be used with care as an unbound or infinite loop within +a critical region will deadlock the CPU. Also, they should not be interlocked with operations on mutexes, sx locks, -semaphores, or other synchronization primitives. +semaphores, or other synchronization primitives, as these primitives may +require a context switch to operate. One exception to this is that spin mutexes include a critical section, so in certain cases critical sections may be interlocked with spin mutexes. +.Pp +Critical regions should be only as wide as necessary. +That is, code which does not require the critical section to operate correctly +should be excluded from its bounds whenever possible. +Abuse of critical sections has an effect on overall system latency and timer +precision, since disabling preemption will delay the execution of threaded +interrupt handlers and +.Xr callout 9 +events on the current CPU. +.Pp +The +.Fn CRITICAL_ASSERT +macro verifies that the provided thread +.Fa td +is currently executing in a critical section. +It is a wrapper around +.Xr KASSERT 9 . +.Sh SEE ALSO +.Xr callout 9 , +.Xr KASSERT 9 , +.Xr locking 9 .Sh HISTORY These functions were introduced in .Fx 5.0 . From nobody Mon Mar 27 17:21: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 4PlfkT31VHz41pTN; Mon, 27 Mar 2023 17:21: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 4PlfkT2Slvz4Qq4; Mon, 27 Mar 2023 17:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679937713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u7iPdQ1xc3F7elZPLaP8UisL8Cvjn2brhBqVy3f9RCA=; b=fvoi/8XhJXFESuDetcvWlkkdpI4cfqeSls1mAskRFZF5SuLJqX0sxCtEf4hmkddfSaMA5D T42AIdPQGxF7ltNPt6jukTw38WNZbNNEdegdKkCbqe1fM8SYmXtQiBU7A6ZMsOGDB91gYm lMkG2U3aj67rnDBYdtAIeBTknhe3/tCryAE8EDmQDGiZMolBkIPYHLCEa7WCDaGW57zxfa x0ywSbrj5NH2OPzAlNUDqrHAUL4NKLZV0t/n4KrSrdJvga+M95h88GVXoB8Ye/V8Y/eEjB r4iVWxwkCq0G69Y1+EeXTBLy9KZ0rTrfA7tBCQofByJ169mS1cKfYQ8F/cB+KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679937713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u7iPdQ1xc3F7elZPLaP8UisL8Cvjn2brhBqVy3f9RCA=; b=dCc0yNy1kJGPq/YtYzy2rJVtWhPpugKBPhIEh+L28tGMgsuob7z5gbZkTxje0X99n5nP/j rCTtgFw8RxmCmXFRzD38Df0aWDNhggqgrmxXFFLZvuPMpLNRJCzqlUgMBr8uFXAlNrwH0A gQWewYE9+XmpH8lPLvTs1ZjuH6E00wXzC0J4U8lPFM0wfGBRFcauFJnGf2b+fe1zr68+qx 6KXHqu/qSK/kM5wx7EYbbnQak6yWQKa1BZ72O0IbmiA9hoe11thhuLddyUOaW+zlVniNQ+ 4lotY4IeARTBUAUXArXxVmUlBtYIFy6gEKKrbhKVSGnnt7JdHEVGtVA4gyiEUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679937713; a=rsa-sha256; cv=none; b=SHbBXtcmho3ZwU2DzqHzDdnai4dwvS9MShZcEcb8/1MyFShcWESrGG1RUMylxPB4wUaDgz YUkdVqXxY52xT4ym5paD3gaDptL7L5lWp41c/T4CUMHtegkHd/m17losXeEef8tKji6o09 TRQHqR1KWd5AFZgXgjTAYvx1XFXoxkXv9/MI5amGKM9lsSRFxTch6eYC35ODPV5JZvhsad 0N1x8GKaI8K/GK1ALYqreyAF0mPqJ45cuvM/jTtIOS03oJZ+MevPwV5a+g8Pl0EGP0IAg9 pgUwqL/lnDqHfYxzp92gROKzg0QZOM9cB1NcRtQIjP7DXOlf4ac1/VavT/O2Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlfkT12B6zW5Q; Mon, 27 Mar 2023 17:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RHLrOt050459; Mon, 27 Mar 2023 17:21:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RHLrit050446; Mon, 27 Mar 2023 17:21:53 GMT (envelope-from git) Date: Mon, 27 Mar 2023 17:21:53 GMT Message-Id: <202303271721.32RHLrit050446@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: d85a53128792 - stable/13 - KASSERT(9): some updates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d85a5312879247569f9ca4e3a3ebab2833e6d84a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d85a5312879247569f9ca4e3a3ebab2833e6d84a commit d85a5312879247569f9ca4e3a3ebab2833e6d84a Author: Mitchell Horne AuthorDate: 2023-03-20 19:54:11 +0000 Commit: Mitchell Horne CommitDate: 2023-03-27 17:18:14 +0000 KASSERT(9): some updates - Add a little bit of introductory text - Improve the existing example: ANSI C, use a better assertion than a NULL check (which is discouraged) - Document the widely used MPASS macro in this page - Drop the cross-reference to config(8) Reviewed by: kib, markj, rpokala, Pau Amma MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39131 (cherry picked from commit 87132d1dce4b61c782871f450c17b818bf991ff6) --- share/man/man9/KASSERT.9 | 104 ++++++++++++++++++++++++++++++++++------------- share/man/man9/Makefile | 1 + 2 files changed, 76 insertions(+), 29 deletions(-) diff --git a/share/man/man9/KASSERT.9 b/share/man/man9/KASSERT.9 index 0c6898a7799b..de2b9ca8d2a8 100644 --- a/share/man/man9/KASSERT.9 +++ b/share/man/man9/KASSERT.9 @@ -1,8 +1,11 @@ -.\" -*- nroff -*- +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2000 Jonathan M. Bresler -.\" .\" All rights reserved. +.\" Copyright (c) 2023 The FreeBSD Foundation +.\" +.\" Portions of this documentation were written by Mitchell Horne +.\" under sponsorship from the FreeBSD Foundation. .\" .\" This program is free software. .\" @@ -28,59 +31,102 @@ .\" .\" $FreeBSD$ .\" -.Dd January 14, 2000 +.Dd March 16, 2023 .Dt KASSERT 9 .Os .Sh NAME .Nm KASSERT -.Nd kernel expression verification macro +.Nd kernel expression verification macros .Sh SYNOPSIS .Cd "options INVARIANTS" .Pp .In sys/param.h .In sys/systm.h .Fn KASSERT expression msg +.Fn MPASS expression .Sh DESCRIPTION -In a kernel compiled with -.Cd "options INVARIANTS" , -the -.Fn KASSERT -macro tests the given -.Fa expression -and if it is false, -calls the +Assertions are widely used within the +.Fx +kernel to verify programmatic assumptions. +For violations of run-time assumptions and invariants, it is desirable to fail +as soon and as loudly as possible. +Assertions are optional code; for non-recoverable error conditions an explicit +call to .Xr panic 9 -function, terminating the running system. +is usually preferred. .Pp -In a kernel that does not have +The +.Fn KASSERT +macro tests the given boolean +.Fa expression . +If +.Fa expression +evaluates to +.Dv false , +and the kernel is compiled with .Cd "options INVARIANTS" , the -.Fn KASSERT -macro is defined to be a no-op. -The -second argument is a +.Xr panic 9 +function is called. +This terminates the running system at the point of the error, possibly dropping +into the kernel debugger or initiating a kernel core dump. +The second argument, +.Fa msg , +is a .Xr printf 9 format string and its arguments, enclosed in parentheses. +The formatted string will become the panic string. +.Pp +In a kernel that is built without +.Cd "options INVARIANTS" , +the assertion macros are defined to be no-ops. +This eliminates the runtime overhead of widespread assertions from release +builds of the kernel. +Therefore, checks which can be performed in a constant amount of time can be +added as assertions without concern about their performance impact. +More expensive checks, such as those that output to console, or verify the +integrity of a chain of objects are generally best hidden behind the +.Cd DIAGNOSTIC +kernel option. +.Pp +The +.Fn MPASS +macro (read as: "must-pass") +is a convenience wrapper around +.Fn KASSERT +that automatically generates a sensible assertion message including file and +line information. .Sh EXAMPLES -The kernel function -.Fn vput -must not be called with a -.Dv NULL -pointer. +A hypothetical +.Vt struct foo +object must not have its 'active' flag set when calling +.Fn foo_dealloc : .Bd -literal -offset indent void -vput(vp) - struct vnode *vp; +foo_dealloc(struct foo *fp) { - struct proc *p = curproc; - KASSERT(vp != NULL, ("vput: null vp")); + + KASSERT((fp->foo_flags & FOO_ACTIVE) == 0, + ("%s: fp %p is still active", __func__, fp)); ... } .Ed +.Pp +The assertion +.Bd -literal -offset indent +MPASS(td == curthread); +.Ed +.Pp +located on line 87 of a file named foo.c would generate the following panic +message: +.Bd -literal -offset indent +panic: Assertion td == curthread failed at foo.c:87 +.Ed .Sh SEE ALSO -.Xr config 8 , .Xr panic 9 .Sh AUTHORS This manual page was written by -.An Jonathan M. Bresler Aq Mt jmb@FreeBSD.org . +.An Jonathan M. Bresler Aq Mt jmb@FreeBSD.org +and +.An Mitchell Horne Aq Mt mhorne@FreeBSD.org . diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index ed6de288cfa4..bab0cfb76134 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1338,6 +1338,7 @@ MLINKS+=intr_event.9 intr_event_add_handler.9 \ intr_event.9 intr_event_handle.9 \ intr_event.9 intr_event_remove_handler.9 \ intr_event.9 intr_priority.9 +MLINKS+=KASSERT.9 MPASS.9 MLINKS+=kernacc.9 useracc.9 MLINKS+=kernel_mount.9 free_mntarg.9 \ kernel_mount.9 kernel_vmount.9 \ From nobody Mon Mar 27 17:21: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 4PlfkV3qfCz41p8h; Mon, 27 Mar 2023 17:21: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 4PlfkV2v9Xz4Qss; Mon, 27 Mar 2023 17:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679937714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z6IgNjE3jkifOXq277Dt5shRabJ5HExRS/xtj5K2h0A=; b=AxZFckItTcndx41pQHc73quyryM2z+tXDOesTp53NtPzbFnt0+Cmr+tWLZgK+R1d3GCOqd vARXKoy45+qoRc+ypk0mY9/y8xKa6gmOugZ3qp+qgeyz+jf+uCBnjlelTEDq0tGO4Jz1m8 CP0FPRTr8yWgYrhRvHe5Ry0miu2Hav66DlUo2tgOgnxbrfDTv/VP0JIl5HWHxH7I0etqnq EYmjwZCA7trdGUUvlp01l5HC+Dho3dwOX+LeQ2a27ONFd153N1TH+l1dRMEOld0FUPU9IQ ZRf6a7lkRIT8mOsx5rxJu1xW85penxHb5kDpa18Wvb/Q4oL21Rva5qjCR8c32w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679937714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z6IgNjE3jkifOXq277Dt5shRabJ5HExRS/xtj5K2h0A=; b=ApuhqGjhkC36+pMb1S6ojGaQCchjWKhZuD54+PrqRcbFdV7PSlgIrpWWyKUqR5fq9yWCcJ 2+Ln8y8N/F4uInKXDr3STnW6jtfgTUVmOlKaPAxIFyFzxgF7y/1Y5MJLJvbNoW3wJ5NTMV /rbD4WvobqhQxnni2OXsZkPyTM3YQXUm66O/PLg1YzTxIDlsaVCi4oFV+JzwNfPmNINqOW RBv6S93qaJX8J1ZGCK9VgUtkGY9N2znSPo14NAXSgysp7ihMe/DceVMB7ekj7swfb+3yVv ymKQWvcpKIbL5QXSgXaez/7iglXrXTdap/tBz1C17EzSGs+rrCL3eeypcYvpYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679937714; a=rsa-sha256; cv=none; b=TY9qpIoUVZJHmZDyjV5t6xFm3sFzuN//HWfOAKREVz9yNr1NJYY5z0S2brO7YA7IZIYj6d arqjA/Hl7mpk60xApveazNqOO3c+XSTSUyvw0UVQIAbj+uOhi+GmmaNfaGVkBiixGfkCyO 5MtpbuL4QknPG0SXRU67C0NrMM5VkhnKnYknJ6x0I8N9H1hJbOR6tTS0EG77VtmKwAmOFE XtvTVN5QS0yWlyygA0H9pfCVfLfP6ScNVSm5z/oa85kD2JJsVGux3IdghelQ8IJ/BKIMgZ 0eHYdoCwOJqrZGS1LfPZ1gYDmxTI9d0h5Ws3cg4J+WwiqBTv27bRL39iuR0ssw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlfkV1rYNzW25; Mon, 27 Mar 2023 17:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RHLsX4051948; Mon, 27 Mar 2023 17:21:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RHLsew051947; Mon, 27 Mar 2023 17:21:54 GMT (envelope-from git) Date: Mon, 27 Mar 2023 17:21:54 GMT Message-Id: <202303271721.32RHLsew051947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 86e2335d10e5 - stable/13 - panic(9): some updates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 86e2335d10e560c6b1809df58ce03864c5d09431 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=86e2335d10e560c6b1809df58ce03864c5d09431 commit 86e2335d10e560c6b1809df58ce03864c5d09431 Author: Mitchell Horne AuthorDate: 2023-03-20 19:55:55 +0000 Commit: Mitchell Horne CommitDate: 2023-03-27 17:18:48 +0000 panic(9): some updates - Better description of what the panic() function does - Document KERNEL_PANICKED() - Add a section describing panic execution context - Add SEE ALSO Reviewed by: kib, markj, rpokala MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39132 (cherry picked from commit d5e105bf7e4cb7e80eb4a4f8960bd6dd12fc4885) --- share/man/man9/Makefile | 3 +- share/man/man9/panic.9 | 109 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 99 insertions(+), 13 deletions(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index bab0cfb76134..f9ace3802494 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1729,7 +1729,8 @@ MLINKS+=osd.9 osd_call.9 \ osd.9 osd_reserve.9 \ osd.9 osd_set.9 \ osd.9 osd_set_reserved.9 -MLINKS+=panic.9 vpanic.9 +MLINKS+=panic.9 vpanic.9 \ + panic.9 KERNEL_PANICKED.9 MLINKS+=PCBGROUP.9 in_pcbgroup_byhash.9 \ PCBGROUP.9 in_pcbgroup_byinpcb.9 \ PCBGROUP.9 in_pcbgroup_destroy.9 \ diff --git a/share/man/man9/panic.9 b/share/man/man9/panic.9 index c467b86dd5a1..bc9b1b9e85fb 100644 --- a/share/man/man9/panic.9 +++ b/share/man/man9/panic.9 @@ -1,7 +1,13 @@ .\" $NetBSD: panic.9,v 1.2 1996/10/09 17:20:04 explorer Exp $ .\" +.\" SPDX-License-Identifier: BSD-4-Clause +.\" .\" Copyright (c) 1996 Michael Graff. .\" All rights reserved. +.\" Copyright (c) 2023 The FreeBSD Foundation +.\" +.\" Portions of this documentation were written by Mitchell Horne +.\" under sponsorship from the FreeBSD Foundation. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -15,7 +21,7 @@ .\" must display the following acknowledgement: .\" This product includes software developed by Michael Graff .\" for the NetBSD Project. -.\" 3. The name of the author may not be used to endorse or promote products +.\" 4. The name of the author may not be used to endorse or promote products .\" derived from this software without specific prior written permission .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR @@ -31,7 +37,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 23, 2015 +.Dd March 17, 2023 .Dt PANIC 9 .Os .Sh NAME @@ -40,10 +46,12 @@ .Sh SYNOPSIS .In sys/types.h .In sys/systm.h +.Vt extern char *panicstr; .Ft void .Fn panic "const char *fmt" ... .Ft void .Fn vpanic "const char *fmt" "va_list ap" +.Fn KERNEL_PANICKED .Sh DESCRIPTION The .Fn panic @@ -55,20 +63,97 @@ The message is a .Xr printf 3 style format string. -The message is printed to the console and the location -.Fa panicstr -is set to the address of the message text for retrieval from the OS -core dump. +The message is printed to the console and +.Va panicstr +is set pointing to the address of the message text. +This can be retrieved from a core dump at a later time. .Pp -If the kernel debugger is installed control is passed to it, otherwise -an attempt to save a core dump of the OS to a configured dump device -is made. +Upon entering the +.Fn panic +function the panicking thread disables interrupts and calls +.Xr critical_enter 9 . +This prevents the thread from being preempted or interrupted while the system +is still in a running state. +Next, it will instruct the other CPUs in the system to stop. +This synchronizes with other threads to prevent concurrent panic conditions +from interfering with one another. +In the unlikely event of concurrent panics, only one panicking thread will proceed. .Pp +Control will be passed to the kernel debugger via +.Fn kdb_enter . +This is conditional on a debugger being installed and enabled by the +.Va debugger_on_panic +variable; see +.Xr ddb 4 +and +.Xr gdb 4 . +The debugger may initiate a system reset, or it may eventually return. +.Pp +Finally, +.Xr kern_reboot 9 +is called to restart the system, and a kernel dump will be requested. If .Fn panic -is called twice (from the disk sync routines, for example) the system is -rebooted without syncing the disks. +is called recursively (from the disk sync routines, for example), +.Fn kern_reboot +will be instructed not to sync the disks. +.Pp +The +.Fn vpanic +function implements the main body of +.Fn panic . +It is suitable to be called by functions which perform their own +variable-length argument processing. +In all other cases, +.Fn panic +is preferred. +.Pp +The +.Fn KERNEL_PANICKED +macro is the preferred way to determine if the system has panicked. +It returns a boolean value. +Most often this is used to avoid taking an action that cannot possibly succeed +in a panic context. +.Sh EXECUTION CONTEXT +.\" TODO: This text describes the kernel debugger / kernel dump execution +.\" context as well. It could be moved to a future kdb(9) page, and this +.\" section would become a pointer. +Once the panic has been initiated, code executing in a panic context is subject +to the following restrictions: +.Bl -bullet +.It +Single-threaded execution. +The scheduler is disabled, and other CPUs are stopped/forced idle. +Functions that manipulate the scheduler state must be avoided. +This includes, but is not limited to, +.Xr wakeup 9 +and +.Xr sleepqueue 9 +functions. +.It +Interrupts are disabled. +Device I/O (e.g. to the console) must be achieved with polling. +.It +Dynamic memory allocation cannot be relied on, and must be avoided. +.It +Lock acquisition/release will be ignored, meaning these operations will appear +to succeed. +.It +Sleeping on a resource is not strictly prohibited, but will result in an +immediate return from the sleep function. +Time-based sleeps such as +.Xr pause 9 +may be performed as a busy-wait. +.El .Sh RETURN VALUES The .Fn panic -function does not return. +and +.Fn vpanic +functions do not return. +.Sh SEE ALSO +.Xr printf 3 , +.Xr ddb 4 , +.Xr gdb 4 , +.Xr KASSERT 9 , +.Xr kern_reboot 9 From nobody Mon Mar 27 18:21: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 4Plh3L714wz41sXb; Mon, 27 Mar 2023 18:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Plh3L6S77z4Xv4; Mon, 27 Mar 2023 18:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679941294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BxAXm9OFM5hdMb2isvzAEDG8Gg9cmVx/GwcdMPjrTrU=; b=L7HZRxjrXotdKsM9l3KyGvTymZvEjx2Lktz3slyMfqSHFNpbTpUFnSOEPwQCWXgf/3k/mN N/wyWz7rYIgtw7QSRq9CMoYO+b0v9sLRhnGKAaj38KRTuITxs/7ZYgEqK58+fbLoXkOcqF TpxHU51manVE7N2uI+v686kw3o8QUjIfnrNanKODqeex3LNgBN0JWwncwLHWkt63bqU0Cz iGmO0QksA70aaa6dW8fQcZgObZ1CE1johsjzAktaM6p9s1rdmqq7p/UFX4gUYX60rcFqOX YqbpatTsDhii2ponEx+5IH1YXL90tGN9KjH/tTdyC4j628HT/62yLJM0csW/OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679941294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BxAXm9OFM5hdMb2isvzAEDG8Gg9cmVx/GwcdMPjrTrU=; b=f/uXJrnW1wlmx7c/V/m1NdujNTuZ9iECIm8H4uVNcZMrzOCTrcmAdgJDvpveqUQi8El9B0 TvzTWaSHQrRdpLtmMOZW6uKvbDPC7TH/AYmVWFg1f8vummmZVeL9sT9BdBIgdvjYxpprx+ 8V9Biv5iBhkQq30BYzBDQUlEH/zbuNBh/K1OpZGeWHn/Th6gGNsR8j2sN+IYu0hy0xWqyx IhT+n8JHCLqaAlOUlns2EiYHfRQfeiQEm87ycVecXnW3vDDT3lBewj4D0DjQB3f19M1Cbg VKxk3ylR0lHXHjZLpE0q1MsZUXr3IKbw9P7ujRqqwPBRlqVBlaCoUm3TM+AvuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679941294; a=rsa-sha256; cv=none; b=Pk0UeRzrLSU6ZEbw6bzaUn6ZmH0pkQQIrIMazYLR1TjBK+Ms332IOVW0DEPD1qBnRDIEEa 7QaSiPZTrGWeF9IOpNiuX1qmdtURDPAeLW6+rG7K9izj9rOpmrVcAbwV2kV6TialhNAMC7 /UIpo/49251bjAo97gSSU+Cr65T+wFxNbQi1af+fCpP0wAqsmcjVR3cGGMukcCkbbGTpTW ex1nOnbwKlqQUj+/UbkKkisid6doAkVg1X2Vn5kVumb0HKCycDMhMZ/AHJUByOAVFMzJSe A5XrUEO4kem3fL1AgTGXMS0WDfPNn2Z9d4OWvhifjBqhx/MJ8PowUekfo/TNlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Plh3L5Vf3zWyM; Mon, 27 Mar 2023 18:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RILYG9048055; Mon, 27 Mar 2023 18:21:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RILYvC048054; Mon, 27 Mar 2023 18:21:34 GMT (envelope-from git) Date: Mon, 27 Mar 2023 18:21:34 GMT Message-Id: <202303271821.32RILYvC048054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: b894193501a7 - main - netlink: fix linux module build w/ netlink. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b894193501a7cb6ce5eed3cf86be5dd773cbbb2d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=b894193501a7cb6ce5eed3cf86be5dd773cbbb2d commit b894193501a7cb6ce5eed3cf86be5dd773cbbb2d Author: Alexander V. Chernikov AuthorDate: 2023-03-27 18:20:38 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-27 18:21:26 +0000 netlink: fix linux module build w/ netlink. Reported by: Marek Zarychta MFC after: 2 weeks --- sys/compat/linux/linux_netlink.c | 1 + sys/modules/linux/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index 9edfbfc2c031..0e8188d4cdf6 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_netlink.h" #include #include diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index be2c60a42847..43d7f2c240b8 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -36,6 +36,7 @@ SRCS= linux${SFX}_dummy_machdep.c \ linux_vdso.c \ opt_inet6.h \ opt_ktrace.h \ + opt_netlink.h \ opt_posix.h \ bus_if.h \ device_if.h \ From nobody Mon Mar 27 18:57: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 4PlhsC54kCz41w0k; Mon, 27 Mar 2023 18:57:51 +0000 (UTC) (envelope-from des@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 4PlhsC4S2jz4ksH; Mon, 27 Mar 2023 18:57:51 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679943471; 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=Lt3puaWLySmuCJSvMkSONAIv7NizMSihV1swgPtXXWM=; b=bh4gfLMELhLPkv5T8DHH1bnepjWtyHpwqJTuu1ga8CReRFnPO/jN2pyBBA5iiMTlmkMV2J EajYYsKG5IjAdVPcD7gY5jPdssdGR/KKgtv3/9rJc0BFGLdbTii4vV4IObyWxJfk0AbJxv VoGILsOcxHrHPrCMZ3CxrAXCfJrz8UHLUBzGZ2MkS7J6FRzAJW2Zc/AtkTMGWF70v0/8Ib fUxIh4IDCK83ohLHu9dkn3RPrRkAmYuwrwbLn1QDaV+H0poHo2Nj+n9QInlf9HaGqqpdDP eavNi9qaVr8gtqL+lI7E/5oN/SXBeGmMgKc3QAVKIOZHhZZ/zUaKZX7xZ9f2ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679943471; 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=Lt3puaWLySmuCJSvMkSONAIv7NizMSihV1swgPtXXWM=; b=tPYnwoofhFx7DD44SvE1zsM5CFH52Kn10UEkvXPX3VD05lNqdxP4oIreM56mY6SNHY2GdH YOkR0h8aWbM2v/P/vKdka+DiNDhim3r66dg9eX0WM9zIBqJAA3lAwb4b1Sdbp7v16tj99Y Wel9b82PPSlavZX4hDGvTcaAUU4e6MIokucDAa6nL97mgzx/7mGDbMvDlaMBgSHLxgoD+i GJosJgtoPmzDSdL8HV8fQch6J9wDSb1cSBSN3lTcCd7JRSzf/1Kdu2lAG6PSQgDNjXqAfd 2XYodHEhtYyUuuMp6w5xBT15BNJpLKftFBFWl/3LkeInzpD20dpmvoRsIGqiDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679943471; a=rsa-sha256; cv=none; b=ml6VvFe8q8ZJxf0Ied/MHbJ7QtLYMR/bbM1ZtRmUEJXG/ewT74b2cJQPOsM3RHgF+ndZZK j/4S2qcgyUDmQmexLrp0om/1TzvomG0seQWBsS1uNP/m42dP08wdUybKoU5w8vMfFmeTqg ZEtTMg0ChNAc25Pp9vTqdxFE6TQtimOv5dPA5MKc6sEaQYSsd7YhPXze/YQKPlL8uqfmAG JA6JUqLySWJvThSgw6OI77vRIXG7r9G979L9r2NLmQfgBeP10Jq+Jn8+rRH2SuSPK1Gj7Z 6uti+4rznevRXLnynNCQyrf6RKwfhs9vgiheQEHFjHgx2FE12G3nBI0d9j3bqA== Received: from ltc.des.no (unknown [84.210.219.2]) (using TLSv1.3 with cipher TLS_AES_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 4PlhsC2g7BzHS5; Mon, 27 Mar 2023 18:57:51 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.no (Postfix, from userid 1001) id 8579438E99; Mon, 27 Mar 2023 20:57:48 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: "Alexander V. Chernikov" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: c597432e2297 - main - route(8): convert to netlink In-Reply-To: <202303261107.32QB7UZK058893@gitrepo.freebsd.org> (Alexander V. Chernikov's message of "Sun, 26 Mar 2023 11:07:30 GMT") References: <202303261107.32QB7UZK058893@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (berkeley-unix) Date: Mon, 27 Mar 2023 20:57:48 +0200 Message-ID: <86zg7yyqc3.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 X-ThisMailContainsUnwantedMimeParts: N "Alexander V. Chernikov" writes: > route(8): convert to netlink Did you make sure that netlink is either included in all kernel configurations or automatically loaded on first use? DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Mon Mar 27 19:45: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 4Pljvf3B5mz41yjx; Mon, 27 Mar 2023 19:45: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 4Pljvf2kCfz3G8C; Mon, 27 Mar 2023 19:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679946302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8B01Vksg/ZVfq5TDIEXLZaojuDUD0JwpI0jJGrMUHiQ=; b=BF2BP3Q9mtAcwevjdQUNribiU5HgM7hcWRV05TQDq7Olm3Bu3SJ0VsYCLMX9O0VmtWk7MW KGPk80oxFquQE+Ms0kQomru+Okm8pa8OAEbRndsW2uemJBvuviQfML5exuyLhdlFNUeH6n O9nCmfpnD+a8XY2EMtRSHtsFfs6SPDqgPSktT+VVSqfuoKu//tVbRJPHGkzPagAm7xrPIU zWVqD75rTig0tmx3V2CMcoPXQO1LaBHo0c+dQ9MarWrpLjmaspv3i+VThSSQ8VHtNxiwds 33eIhqe3/uO4xiiWPradDrPFG+aLSdi+O6HUq+QIUBqK6WwKkUauGRqzYdvekQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679946302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8B01Vksg/ZVfq5TDIEXLZaojuDUD0JwpI0jJGrMUHiQ=; b=xmrlEQ6e8do1NOCjIDylHu1OYTgZG5wSF3YcQ42lgF2aqz/ry6EmqUXTqQpxbWtEffPS8j c1VcUAl5MVQVMUIH3gI7IUTPIHnBYFIjXIWmipTlKvQ9X9TYyKCcsHjXTwfOtfM+aJnltE Koe8pgKWSC0OhnA1zIxOxAwNi9YNaOAyLO2SWHrjiWf9Hw/hbpBRv5cgUIhaT01Q8MV0ZM Pn82yBCZa0VpT1AwK2HyKo9/9+S63ljEMworJ6UREE7Z2rxBw1Zg0wJkSMB3erfANQ8Kox UBl9I+gITKzGxOLiQlfB2P2aEbxirMkzLVQrSnk++iPUgnb3hV2KZqRepNV6Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679946302; a=rsa-sha256; cv=none; b=LPMCdkSlg6hql2TrBJScK1sDF2CVXl4w+BxLLbkHRWA7dsdo65svvL9g38BHK3iEtffdZf +ER7Fx2Jzux/5Ycul1rqgrOU9/Of07Dr5EDfMVQB7yGeDgcDiKN4jITZvWfPyS1QYr6/++ +4j5fu0t+sU0iddzSrIZ5sHY2bf493aZ6Xw98xr6UPHTrKrcriABCaOJn4+OyZUixqsrWB aJiQgILgIHUQprO63mInfmZdfHiS0Ex5M6+zfFM9OneqjHQo0APbvlo+dr4Z0Pdx27my5O 3TKJ7M3xVaj99JiFLEwB9vsqW+3BtbXyQKIiJKnwEKPWdP5130sHlXw33NoYaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pljvf1nVmzZwM; Mon, 27 Mar 2023 19:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RJj2W4083615; Mon, 27 Mar 2023 19:45:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RJj2YV083614; Mon, 27 Mar 2023 19:45:02 GMT (envelope-from git) Date: Mon, 27 Mar 2023 19:45:02 GMT Message-Id: <202303271945.32RJj2YV083614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 57dc6f5e200b - main - sesutil: fix "fault all" with zoned jbods List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57dc6f5e200b10d34ccb97ccc18d06b3f0b9b933 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=57dc6f5e200b10d34ccb97ccc18d06b3f0b9b933 commit 57dc6f5e200b10d34ccb97ccc18d06b3f0b9b933 Author: Alan Somers AuthorDate: 2023-03-10 17:47:08 +0000 Commit: Alan Somers CommitDate: 2023-03-27 19:43:35 +0000 sesutil: fix "fault all" with zoned jbods Some SAS JBODs support zoning. This feature allows individual SAS targets to be accessible by only some initiator ports. One application would be connecting two servers to the same JBOD, but they wouldn't be able to see each other's disks. A zoned JBOD should also prohibit initiators from accessing SES elements corresponding to inaccessible SAS targets. It reports that by setting the element's status code to 0x8 (No Access Allowed). The bug is that when doing "sesutil (fault|locate) all ...", sesutil will attempt a ENCIOC_SETELMSTAT ioctl for every single element, even the inaccessible ones. The enclosure will reject the command, the kernel will return EINVAL, and sesutil will exit. The solution is to check the element's status, and skip trying to set it if the status is 0x8. But if the user actually supplied a ses ID, then assume that he knows what he's doing and try to set it anyway. PR: 270093 MFC after: 1 week Sponsored by: Axcient Reviewed by: mav, trasz Differential Revision: https://reviews.freebsd.org/D39017 --- usr.sbin/sesutil/sesutil.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/usr.sbin/sesutil/sesutil.c b/usr.sbin/sesutil/sesutil.c index 22bd0127a484..9c546f8ba210 100644 --- a/usr.sbin/sesutil/sesutil.c +++ b/usr.sbin/sesutil/sesutil.c @@ -281,6 +281,16 @@ sesled(int argc, char **argv, bool setfault) char devnames[devnames_size]; if (all) { + encioc_elm_status_t es; + memset(&es, 0, sizeof(es)); + es.elm_idx = objp[j].elm_idx; + if (ioctl(fd, ENCIOC_GETELMSTAT, &es) < 0) { + close(fd); + xo_err(EXIT_FAILURE, + "ENCIOC_GETELMSTAT"); + } + if ((es.cstat[0] & 0xf) == SES_OBJSTAT_NOACCESS) + continue; do_led(fd, objp[j].elm_idx, objp[j].elm_type, onoff, setfault); continue; From nobody Mon Mar 27 19:51: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 4Plk3Q3RXDz41yT7 for ; Mon, 27 Mar 2023 19:51: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 4Plk3Q30CBz3H2T; Mon, 27 Mar 2023 19:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679946706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SPOfbVsuuezz+OITa/tfAw+pdtKydw/nomwpppQTf6Q=; b=YUp/Gy9Q5uoDDOPq6HE2LVTtQM4aBVNzuRAy4meAt1/Rf7JdOSGvn1lV0eagtL2lJwBLLI 7vU4FU81fEP9NNlOHQlKcL2kdUi98PJjb/q41eTHoiI17641tSjQ6itb5mFukqBh7U8Tda O2flSdKjt1uGU/KTSl5mwcLEEt4qaHbiu+sn7lBlkucfhkU/iLETi6vKbMc/h2PxKJag3T 63gvcag4dz0psfNpy/tXNFBHQWVtncxeH35Ip7FsrIm8RMIC3oXOsTfgHGDMI3FAQTSEx/ xDuuhkanO9wlLiYcik9Y3XpzokRO0/sszivPNiyfJpxmNpKOXIs8VBcEQY7xnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679946706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SPOfbVsuuezz+OITa/tfAw+pdtKydw/nomwpppQTf6Q=; b=BNnWc7k7wwZP7qWr5sQrVf5jFzMkhvQo/EVZZOBuaGGJoQvDTTVBOOqUwjrl7ZxVCyYC15 BWeGho451BLkls8VLiQzR9GPuw1m3rsuyoTvveIFw+Er/AKMLzX2aG3TpmazDgjCOTByw4 W3T8xaEwMARXVAa39pXWAStymuPOKCk3/5BLIz7CMnPFnJmoP5hO70TpOQnsNNYWG3sqGz eC3Lzremxbh54XLefP5SZoAYI4gZhRJjdxZplIIfm4e/91twH+ZxI7wDxqtoaRqLn7loRc 9v0Cmz/ip2g7jbf+549n4wTOZ9RnnkRkjca/6cEfiUUAtoTr/h62CRmcp+JejQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679946706; a=rsa-sha256; cv=none; b=vuT8B19Nprdsxor5eG0ENN+AwYffp89Wflsr1JnqYy2jzBE4fUFkx+miyihc2s1iP5uh78 nflDmX/XGlQDiO5yI4ZNzCJw2WIzPzv5aWFJqIAVqkHLNhDXIqcO43mzPdNsHrrkcbk55c Qo4vemDgC7UDaF4Qz0gsRnbRSLdXi8hBJEqkOwXZFFhP6gKhzIvJCVWpZks7QiotiF+Zbk KaVGAzuXHDfF8pFPgtiyQy/BQxkYUvMPU1kOQ+OgZNj2OL0+xkd02z6N3va+dfW2DV2JZS OzpeWnAd6InfdvsvnyutceYdKy8UutdzwbcnCuHniW07YQHeRJU9H4Vc94rMVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Plk3Q1m8NzZp1; Mon, 27 Mar 2023 19:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RJpku7095941; Mon, 27 Mar 2023 19:51:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RJpkmS095940; Mon, 27 Mar 2023 19:51:46 GMT (envelope-from git) Date: Mon, 27 Mar 2023 19:51:46 GMT Message-Id: <202303271951.32RJpkmS095940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Joseph Mingrone Subject: git: 20616273d521..35af88c96350 - vendor/libpcap - 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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/libpcap X-Git-Reftype: branch X-Git-Commit: 35af88c96350eb786f1198dfb6b29a171016e6bf X-Git-Oldrev: 20616273d52132557e786a8aea1637be4c218a08 X-Git-Newrev: 35af88c96350eb786f1198dfb6b29a171016e6bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch vendor/libpcap has been updated by jrm: URL: https://cgit.FreeBSD.org/src/log/?id=20616273d521..35af88c96350 35af88c96350 Import libpcap 1.10.3 From nobody Mon Mar 27 19:51: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 4Plk3Q3YQNz41yT8 for ; Mon, 27 Mar 2023 19:51: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 4Plk3Q38hDz3H08; Mon, 27 Mar 2023 19:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679946706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B49BpNfylw6XegpUBD3DIsxc+kf8+uAWfi7hIMR0Drw=; b=XEW99kFp3YHLZocmYb+/yBlmXPgZJkvsTKE7I2keOT9wIs8EMcHLnXys18NQVZVelO3A6T VCibg0jgj/dgVj8Wcd6cTSxXOiqLlgTi2EbCl6As2VU/vpVPZ4gkAtoFbDEREJqFwf6SOQ rwNfa4AWUP430TCCbpiYgswYcEg3q0MJ1qqugxto3qxtCx73e6sI/SOVcM/xZJxdjmX9+c MJL17su3ZV/pO3UXn0Bl/h68eYB48M56i9KOnE6e7mCwOddKNzVB1ZagXUw902U+Wwlftf FWRDrHWm1ANpYzHw86UEOSIpcVfwpgwJUZ6NQ92q3M9kG+MrazI8uh+2e2dHYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679946706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B49BpNfylw6XegpUBD3DIsxc+kf8+uAWfi7hIMR0Drw=; b=TFZh4Sq9Qzvhbw8SQYa7WVijzKM4HezmFffFrijiyDdQ/WqOpZOy73GozKcj5Lfi9dp0KH 9JtRscg9d4LDDRAgfgJUiS32HTsCP64DxeKuGhTS/HU8y3KKaaaM2UUrozYuz/y9aL1Itn VtW9JWgpn/sF4LFP/joxo7tDMZCucqvPFpiQyBvnrpdTn+e7C6tikvlYRHEXurUBe0pdYr +hU3ovWSoiAGNpoHYv5vCVDq+TeYUp3aU0t2TviHBTJzdft5xL47K/tZJFYmYRAkLn+pCH VMD3ZR6DfYeO1EZAFJivmEWn1ts+/gcR2mHMh+awxqcmfeJCj0yV4ndZ9iFp7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679946706; a=rsa-sha256; cv=none; b=cyjziVMYrnzIow/aL//ui4D3M5QC7NejAxswGrD7qS30f/LKvJmfHvq84JOPMcshpBxySi ltacMfOjsaV+2MpH1Ur6WDEW9vUhJ2dxVoCLPNNBtN92YLDAGk+0chqDNArF0Uw4GTilSz GAW7CqqwQMoTaHwBUPfEdr1D961Y/6DJSzuhQLoPx57aRotU/BroF448mNLI09pniKXyuT spJa2HKikXW2w3gWFj/bDucPQRusW7czKaArrvBmdBVvodIkIUijJgXJdiWbNpjkN3S2b7 6bJAr32tEULsztg4DbfqBc1yYvtiYj8MP0d5vR64hodEAoMgBEKjZ7Plw4iaUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Plk3Q2CZKzZyl; Mon, 27 Mar 2023 19:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RJpk1x095960; Mon, 27 Mar 2023 19:51:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RJpkqC095959; Mon, 27 Mar 2023 19:51:46 GMT (envelope-from git) Date: Mon, 27 Mar 2023 19:51:46 GMT Message-Id: <202303271951.32RJpkqC095959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Joseph Mingrone Subject: git: 06e1219d54fc - Create tag vendor/libpcap/1.10.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: jrm X-Git-Repository: src X-Git-Refname: refs/tags/vendor/libpcap/1.10.3 X-Git-Reftype: annotated tag X-Git-Commit: 06e1219d54fc0abc8f21238128ce13a33a108e45 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The annotated tag vendor/libpcap/1.10.3 has been created by jrm: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/libpcap/1.10.3 tag vendor/libpcap/1.10.3 Tagger: Joseph Mingrone TaggerDate: 2023-03-27 18:47:43 +0000 Tag libpcap 1.10.3. commit 35af88c96350eb786f1198dfb6b29a171016e6bf Author: Joseph Mingrone AuthorDate: 2023-03-27 18:45:17 +0000 Commit: Joseph Mingrone CommitDate: 2023-03-27 18:45:17 +0000 Import libpcap 1.10.3 Reviewed by: emaste Sponsored by: The FreeBSD Foundation From nobody Mon Mar 27 20:11: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 4PlkVL6KGzz420hH; Mon, 27 Mar 2023 20:11: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 4PlkVL5qSpz3Kgm; Mon, 27 Mar 2023 20:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679947898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WecYCkfxX4nopEFNKY9Dknf1LXNZfXBlGI5g6RMbqmU=; b=V8DdYolLNtPDf7b/1QJQa5mjZ5KEzDH82M312cWIKZpWy6CJISaJe6C5gkacZQz2Mf5NMw q1OT4uFzGd3+y68y2+JV4sDqjRoT2R9cBfrmHkfdhjvAemDrJMWmv9Vp7bvGERS8nf1mI1 5iwXDiNotDryJLCvAjMEFpEtpB4Nw/dPE+zBU8owiX4bjNyc4BZSZZzVBbJ30wHj03njKz dSQwhbfKNCWinVN5lcggrAHudJXZsIv44vPNNKIhlxx4QE/8hPjeh3F80++4Or4B10oaie fxNAxWOj6w+DeZpwVvA8NXFdtgtSrx3i8WlJsZ4jJ73lfnIXXqEPSt08cZ6EOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679947898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WecYCkfxX4nopEFNKY9Dknf1LXNZfXBlGI5g6RMbqmU=; b=vgVkrWfg54HVdieawA6bbzR43EhUJ35/4U5W1QFoPUtawYXcgXfT/Qx/lI35X6TWPJD7Oh 4oFVkFCAhPtPNiFcokF/eT/+esC6kW95WmGY3mr0zYLWaA6omFRLS7kA++KKACwXwOTQCu Sp4aKi94F7rVh55b7pnq+11E6SAkslImCGNqbRaIS6Nvum8shEw82XWCerfm8d5O25QPkm SgYN63ns8RKq2R250BXIsUFinnL5qvbxvd3c/1opDwWTrupflvFiusODCJ2l8Yo0jMbUlM LQo3AWC0EJvRpwEQlsCyUsvHoJlLIu89cHEhcWtdLQ+oww9pET/LarffSVQwvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679947898; a=rsa-sha256; cv=none; b=hKfp4NdW8LA28NgJFpRQvv1ax2HX31Isvp1N+tMwDOptCjS+uz8h9/Z0gDwPe/y7yBnKpm OlQ70rYIR2OiBOaqii6/8WNtlBLcfWWBg11IF9V8bewV2B5N7VjCb5LeiSL6jwBsdqrhRN XjHnBuMBL/tkRMX468jUbIFQb94pKd5H6IcjinwtBT9uiJQKtkCmXDpEilaODLGR1v6/Cz me8X6Km/fKEbPyyvmxBS7WCScbXAvkSpvZpyNE4LcfNm252kXGGEJX/tYrUEiCeZ9oyHLN aeGIFNIDLezC+6puHeSp2yrsBnt+znjC6tlGV/ocD496uxAkj/P83paGoisr1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlkVL4t7ZzZqC; Mon, 27 Mar 2023 20:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RKBcAW028599; Mon, 27 Mar 2023 20:11:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RKBc1m028598; Mon, 27 Mar 2023 20:11:38 GMT (envelope-from git) Date: Mon, 27 Mar 2023 20:11:38 GMT Message-Id: <202303272011.32RKBc1m028598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: b37d1deb045d - main - ses: cleanup ses tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b37d1deb045d7bc7877fb1d9afdb39d43130dcc4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=b37d1deb045d7bc7877fb1d9afdb39d43130dcc4 commit b37d1deb045d7bc7877fb1d9afdb39d43130dcc4 Author: Alan Somers AuthorDate: 2022-01-19 21:33:43 +0000 Commit: Alan Somers CommitDate: 2023-03-27 20:06:51 +0000 ses: cleanup ses tests Address mav's feedback RE eea7c61590ae See also: https://reviews.freebsd.org/D31809 Reported by: mav MFC after: 2 weeks MFC with: eea7c61590ae8968b3f1f609cf0bc8633222a94f Sponsored by: Axcient Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D33954 --- tests/sys/ses/destructive.c | 33 ++++++++++++++++-------- tests/sys/ses/nondestructive.c | 58 +++++++++++++++++++++++++++--------------- 2 files changed, 60 insertions(+), 31 deletions(-) diff --git a/tests/sys/ses/destructive.c b/tests/sys/ses/destructive.c index 9b83009280cf..935cc7cff2cb 100644 --- a/tests/sys/ses/destructive.c +++ b/tests/sys/ses/destructive.c @@ -66,7 +66,9 @@ for_one_ses_dev(ses_cb cb) globfree(&g); } -static bool do_setelmstat(const char *devname __unused, int fd) { +static bool +do_setelmstat(const char *devname __unused, int fd) +{ encioc_element_t *map; unsigned elm_idx; unsigned nobj; @@ -96,6 +98,8 @@ static bool do_setelmstat(const char *devname __unused, int fd) { { r = ioctl(fd, ENCIOC_GETELMSTAT, (caddr_t)&elmstat); ATF_REQUIRE_EQ(r, 0); + ses_status_to_ctrl(map[elm_idx].elm_type, + &elmstat.cstat[0]); cslot = (struct ses_ctrl_dev_slot*)&elmstat.cstat[0]; @@ -110,7 +114,8 @@ static bool do_setelmstat(const char *devname __unused, int fd) { last_elm_type = -1; for (elm_idx = 0; elm_idx < nobj; elm_idx++) { encioc_elm_status_t elmstat; - struct ses_status_dev_slot *sslot; + struct ses_status_dev_slot *sslot = + (struct ses_status_dev_slot*)&elmstat.cstat[0]; if (last_elm_type != map[elm_idx].elm_type) { /* skip overall elements */ @@ -123,11 +128,6 @@ static bool do_setelmstat(const char *devname __unused, int fd) { { int i; - r = ioctl(fd, ENCIOC_GETELMSTAT, (caddr_t)&elmstat); - ATF_REQUIRE_EQ(r, 0); - - sslot = (struct ses_status_dev_slot*)&elmstat.cstat[0]; - for (i = 0; i < 10; i++) { r = ioctl(fd, ENCIOC_GETELMSTAT, (caddr_t)&elmstat); @@ -153,7 +153,8 @@ static bool do_setelmstat(const char *devname __unused, int fd) { * Instead, we'll just clear every ident bit. */ static bool -do_setelmstat_cleanup(const char *devname __unused, int fd __unused) { +do_setelmstat_cleanup(const char *devname __unused, int fd __unused) +{ encioc_element_t *map; unsigned elm_idx; unsigned nobj; @@ -166,6 +167,7 @@ do_setelmstat_cleanup(const char *devname __unused, int fd __unused) { map = calloc(nobj, sizeof(encioc_element_t)); ATF_REQUIRE(map != NULL); r = ioctl(fd, ENCIOC_GETELMMAP, (caddr_t) map); + ATF_REQUIRE_EQ(r, 0); /* Clear the IDENT bit for every disk slot */ for (elm_idx = 0; elm_idx < nobj; elm_idx++) { @@ -181,11 +183,17 @@ do_setelmstat_cleanup(const char *devname __unused, int fd __unused) { if (map[elm_idx].elm_type == ELMTYP_DEVICE || map[elm_idx].elm_type == ELMTYP_ARRAY_DEV) { + r = ioctl(fd, ENCIOC_GETELMSTAT, (caddr_t)&elmstat); + ATF_REQUIRE_EQ(r, 0); + ses_status_to_ctrl(map[elm_idx].elm_type, + &elmstat.cstat[0]); + cslot = (struct ses_ctrl_dev_slot*)&elmstat.cstat[0]; ses_ctrl_common_set_select(&cslot->common, 1); ses_ctrl_dev_slot_set_rqst_ident(cslot, 0); r = ioctl(fd, ENCIOC_SETELMSTAT, (caddr_t)&elmstat); + ATF_REQUIRE_EQ(r, 0); } } @@ -215,7 +223,9 @@ ATF_TC_CLEANUP(setelmstat, tc) } -static bool do_setencstat(const char *devname __unused, int fd) { +static bool +do_setencstat(const char *devname __unused, int fd) +{ unsigned char encstat; int r, i; bool worked = false; @@ -245,7 +255,9 @@ static bool do_setencstat(const char *devname __unused, int fd) { return (true); } -static bool do_setencstat_cleanup(const char *devname __unused, int fd) { +static bool +do_setencstat_cleanup(const char *devname __unused, int fd) +{ unsigned char encstat; /* @@ -290,7 +302,6 @@ ATF_TP_ADD_TCS(tp) */ ATF_TP_ADD_TC(tp, setelmstat); ATF_TP_ADD_TC(tp, setencstat); - // TODO ENCIOC_SETELMSTAT return (atf_no_error()); } diff --git a/tests/sys/ses/nondestructive.c b/tests/sys/ses/nondestructive.c index 47c7e5067239..4a731487b290 100644 --- a/tests/sys/ses/nondestructive.c +++ b/tests/sys/ses/nondestructive.c @@ -42,7 +42,9 @@ #include "common.h" -static bool do_getelmdesc(const char *devname, int fd) { +static bool +do_getelmdesc(const char *devname, int fd) +{ regex_t re; FILE *pipe; char cmd[256]; @@ -125,11 +127,13 @@ ATF_TC_BODY(getelmdesc, tc) for_each_ses_dev(do_getelmdesc, O_RDONLY); } -static bool do_getelmdevnames(const char *devname __unused, int fd) { +static bool +do_getelmdevnames(const char *devname __unused, int fd) +{ encioc_element_t *map; unsigned nobj; const size_t namesize = 128; - int r; + int r, status; char *namebuf; unsigned elm_idx; @@ -164,8 +168,10 @@ static bool do_getelmdevnames(const char *devname __unused, int fd) { elmdn.elm_devnames = namebuf; namebuf[0] = '\0'; r = ioctl(fd, ENCIOC_GETELMDEVNAMES, (caddr_t) &elmdn); - if (e_status.cstat[0] != SES_OBJSTAT_UNSUPPORTED && - e_status.cstat[0] != SES_OBJSTAT_NOTINSTALLED && + status = ses_status_common_get_element_status_code( + (struct ses_status_common*)&e_status.cstat[0]); + if (status != SES_OBJSTAT_UNSUPPORTED && + status != SES_OBJSTAT_NOTINSTALLED && (map[elm_idx].elm_type == ELMTYP_DEVICE || map[elm_idx].elm_type == ELMTYP_ARRAY_DEV)) { @@ -176,8 +182,7 @@ static bool do_getelmdevnames(const char *devname __unused, int fd) { if (r == 0) { size_t z = 0; - int da = 0, ada = 0, pass = 0, nvd = 0; - int nvme = 0, unknown = 0; + int da = 0, ada = 0, pass = 0, nda = 0, unknown = 0; while(elmdn.elm_devnames[z] != '\0') { size_t e; @@ -193,16 +198,14 @@ static bool do_getelmdevnames(const char *devname __unused, int fd) { ada++; else if (0 == strncmp("pass", s, e)) pass++; - else if (0 == strncmp("nvd", s, e)) - nvd++; - else if (0 == strncmp("nvme", s, e)) - nvme++; + else if (0 == strncmp("nda", s, e)) + nda++; else unknown++; z += strcspn(elmdn.elm_devnames + z, ","); } /* There should be one pass dev for each non-pass dev */ - ATF_CHECK_EQ(pass, da + ada + nvd + nvme); + ATF_CHECK_EQ(pass, da + ada + nda); ATF_CHECK_EQ_MSG(0, unknown, "Unknown device names %s", elmdn.elm_devnames); } @@ -229,7 +232,8 @@ ATF_TC_BODY(getelmdevnames, tc) } static int -elm_type_name2int(const char *name) { +elm_type_name2int(const char *name) +{ const char *elm_type_names[] = ELM_TYPE_NAMES; int i; @@ -241,7 +245,9 @@ elm_type_name2int(const char *name) { return (-1); } -static bool do_getelmmap(const char *devname, int fd) { +static bool +do_getelmmap(const char *devname, int fd) +{ encioc_element_t *map; FILE *pipe; char cmd[256]; @@ -320,7 +326,9 @@ ATF_TC_BODY(getelmmap, tc) for_each_ses_dev(do_getelmmap, O_RDONLY); } -static bool do_getelmstat(const char *devname, int fd) { +static bool +do_getelmstat(const char *devname, int fd) +{ encioc_element_t *map; unsigned elm_idx; unsigned nobj; @@ -391,7 +399,9 @@ ATF_TC_BODY(getelmstat, tc) for_each_ses_dev(do_getelmstat, O_RDONLY); } -static bool do_getencid(const char *devname, int fd) { +static bool +do_getencid(const char *devname, int fd) +{ encioc_string_t stri; FILE *pipe; char cmd[256]; @@ -441,7 +451,9 @@ ATF_TC_BODY(getencid, tc) for_each_ses_dev(do_getencid, O_RDONLY); } -static bool do_getencname(const char *devname, int fd) { +static bool +do_getencname(const char *devname, int fd) +{ encioc_string_t stri; FILE *pipe; char cmd[256]; @@ -487,7 +499,9 @@ ATF_TC_BODY(getencname, tc) for_each_ses_dev(do_getencname, O_RDONLY); } -static bool do_getencstat(const char *devname, int fd) { +static bool +do_getencstat(const char *devname, int fd) +{ FILE *pipe; char cmd[256]; unsigned char e, estat, invop, info, noncrit, crit, unrecov; @@ -530,7 +544,9 @@ ATF_TC_BODY(getencstat, tc) for_each_ses_dev(do_getencstat, O_RDONLY); } -static bool do_getnelm(const char *devname, int fd) { +static bool +do_getnelm(const char *devname, int fd) +{ FILE *pipe; char cmd[256]; char line[256]; @@ -578,7 +594,9 @@ ATF_TC_BODY(getnelm, tc) for_each_ses_dev(do_getnelm, O_RDONLY); } -static bool do_getstring(const char *devname, int fd) { +static bool +do_getstring(const char *devname, int fd) +{ FILE *pipe; char cmd[256]; char *sg_ses_buf, *ses_buf; From nobody Mon Mar 27 20:25: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 4Plkpl0ZSRz421TS; Mon, 27 Mar 2023 20:25: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 4Plkpl05vcz3MF9; Mon, 27 Mar 2023 20:25:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679948751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wsXS0sutvspC0bgivXX8ZHg9/wm8JHD/h+ZouF1XD6Q=; b=Uj7/K75XeA9EFfakvcm8jGnCGWf6iGrdlC0rvKBtF9Spu+Fh9RDj7wH7TBPEI7tOb5ceB0 tFKiP9P8SfmsZwYC238Ht05+wb7uT1Tc8ZO4fNcQWi9nFY9slgVKvn9M/8f7h2Eq+HOc9I Bsonvm/aHEn3Mf2xD+FdDlpQ4oVb+Ha7XAJierLyD6UhIjP9ZZSQLcCliQmG0MrOrWH/yd bjonn7GYFFPcjuCuaCEJ2p9BjNBhYnYjQ0RvO7FyR4fL0W2gaqU4NyplijlX9Qj5+/XcZ5 1gw6a4t3BrZNArfEOFJfveKIDAa5wobjltWeDH521tyXcx7QUIzXGxUcVSNRUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679948751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wsXS0sutvspC0bgivXX8ZHg9/wm8JHD/h+ZouF1XD6Q=; b=TZztWXzIbq8V3j31S/symLU/m2WBFnOVA89djOLe+LfKD5gUtj9QwCQADXYPYKmeMWIUwX OBL5KdGDDvQEWEE9gJzdqH/zt1A9DJi375PxNJPUZIVPuGE/0OTH0TdW5xVbiaad2Vacpn NplNgG6mF3M5gj+5gbpHRoSXfX0abvIvukFxWPRLy8tQOb+FGULF2jNC1tdrnIKdd5iEVZ 15OSwYjzKVjf5IBKBTwtKdUsKEiqIn9qYEq+aqsZ6usI9D3ttievPEB+O3/6Q7bvvLq1T4 wN4FxLhM+fSkF5FtucCIHAdoOFtZdKt5J26+PZbOgzDTmH+IJHBQSU+H3USG4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679948751; a=rsa-sha256; cv=none; b=k3QMECN2vo8jJ1XtQs43UgTxS9MBd4QtAm5kQv1aVxN88jNgvCLBIMCF81jHCs8p1hfLFb or13ASixWMvxobNSt46TRVq2sEt1ZL3B8rQp7yopzMYPVicRdSBViqdUhNruj8jI+puGS3 V8oCLOHksO5ohQtJm8f6oPYW0RSD4Ls+zp8RsyNCwVB9l7kHfZbFvGugLig4EnDRK1QYvA hJut82Wx/ZJXPfe09VuYRpMSngpRhg3fW1p3ibCYra/ZapWA3XxXLsl/18ymfbBpd62+/v tIqQ4jKMchYnzZzVs7Lbn9ltS6HMLhTQ5/LPQNUTX5efVRgnjySfJQSyHz/fHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Plkpk6JsYzc82; Mon, 27 Mar 2023 20:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RKPoGc050581; Mon, 27 Mar 2023 20:25:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RKPoFI050580; Mon, 27 Mar 2023 20:25:50 GMT (envelope-from git) Date: Mon, 27 Mar 2023 20:25:50 GMT Message-Id: <202303272025.32RKPoFI050580@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: f59727087b11 - main - CONTRIBUTING.md: Fix checkstyle9.pl 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f59727087b11731f8847ad752d31ebfed5a648fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f59727087b11731f8847ad752d31ebfed5a648fb commit f59727087b11731f8847ad752d31ebfed5a648fb Author: Tom Hukins AuthorDate: 2023-03-27 21:04:10 +0000 Commit: Ed Maste CommitDate: 2023-03-27 20:23:13 +0000 CONTRIBUTING.md: Fix checkstyle9.pl name Pull request: https://github.com/freebsd/freebsd-src/pull/703 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8aedda5f4e69..3bdcd587df24 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,7 +29,7 @@ A pull request will be considered if: * Fixup commits should be squashed with the commit they are fixing. Each commit in your branch should be suitable for FreeBSD's repository. * Commits should include one or more `Signed-off-by:` lines with full name and email address certifying [Developer Certificate of Origin](https://developercertificate.org/). * The commits follow FreeBSD's style guide. See [Style](#Style). -* Run tools/build/checkstlye9.pl on your git branch and eliminate all errors +* Run tools/build/checkstyle9.pl on your git branch and eliminate all errors * The commits should not introduce trailing white space. * If the commmit fixes a bug, please add 'PR: ' to the comment message. * If there's a code review in phabricator, please include a link as a 'Differential Revision: ' line. From nobody Mon Mar 27 20: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 4Pll985F4Xz422pG for ; Mon, 27 Mar 2023 20:41:48 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 4Pll9752N6z3NdH for ; Mon, 27 Mar 2023 20:41:47 +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.221.41 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=none Received: by mail-wr1-f41.google.com with SMTP id l12so10069038wrm.10 for ; Mon, 27 Mar 2023 13:41:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679949706; 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=wrj2GoCQBZFL18b6PiFwOeqWbUvwRVZB0C/WTMjD84s=; b=0kk/SB3RXxXg4vtOau/zMf1ARFwuGa5CiU5PPjJ7qoQSQp/RzUNu2LnqzCmX0qpQOT 4aleEvZq0hfKd/GSFQ5/LRoGAPgUuAEJmXzDRULo3lhzfxBoTWRtNA6UXlKJmV2W1mva JuVlka00Qz8Jv2k//E71V6FZAIdJLY7wqbVHkpEQRYaXE/pLYGne3+OKwsU2R6U10Y/4 u7aAX8P8wOpo+Qi2DTyhGsmrS4gOIHwAS3fqjYxKg0LAI/oQhiWfbLgVo3tCOQfSBtr1 84TqmTdI62SucMxb7Z1uJSES75EYber/HsoxIW9DBCP+zqgsgQv0jQDg7cKPH/njXBTh UJVA== X-Gm-Message-State: AAQBX9eZ4N6Z8Sq/RbEJICAYiWORLEMhzY7aIH7Dd+Tl+g8F5FlGaaFo H+lpgPkKw0HfOtJmDzcPUDPi5Q== X-Google-Smtp-Source: AKy350YMkjt8LT3jz+8Q6QiYEStIvwRXDyom1d+EOzmuwvBzhU0d2EMBWU0DmX0PDvNsDTRj5MrJ4g== X-Received: by 2002:adf:fa50:0:b0:2c7:d7ca:4c89 with SMTP id y16-20020adffa50000000b002c7d7ca4c89mr9877780wrr.58.1679949705808; Mon, 27 Mar 2023 13:41:45 -0700 (PDT) Received: from smtpclient.apple (global-5-144.n-2.net.cam.ac.uk. [131.111.5.144]) by smtp.gmail.com with ESMTPSA id o6-20020adfeac6000000b002c71a32394dsm25937964wrn.64.2023.03.27.13.41.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2023 13:41:45 -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 \(3696.120.41.1.1\)) Subject: Re: git: c597432e2297 - main - route(8): convert to netlink From: Jessica Clarke In-Reply-To: <202303261107.32QB7UZK058893@gitrepo.freebsd.org> Date: Mon, 27 Mar 2023 21:41:44 +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: <81A0DF64-F466-451F-83CB-86A9FC1EB300@freebsd.org> References: <202303261107.32QB7UZK058893@gitrepo.freebsd.org> To: "Alexander V. Chernikov" X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; 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]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; TO_DN_EQ_ADDR_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.41:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; MIME_TRACE(0.00)[0:+]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.41:from] X-Rspamd-Queue-Id: 4Pll9752N6z3NdH X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N On 26 Mar 2023, at 12:07, Alexander V. Chernikov = wrote: >=20 > The branch main has been updated by melifaro: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc597432e22975f4d409b845377996712= 9c6b57e9 >=20 > commit c597432e22975f4d409b8453779967129c6b57e9 > Author: Alexander V. Chernikov > AuthorDate: 2023-03-26 09:13:50 +0000 > Commit: Alexander V. Chernikov > CommitDate: 2023-03-26 11:06:56 +0000 >=20 > route(8): convert to netlink >=20 > This change converts all kernel rtsock interactions in route(8) > to Netlink. >=20 > Based on the WITHOUT_NETLINK_SUPPORT src.conf(5) variable, route(8) > now fully operates either via Netlink or via rtsock/sysctl. > The default (compile-time) is Netlink. >=20 > The output for route delete/add/get/flush is targeted to be exactly > the same (apart from some error handling cases). > The output for the route monitor has been changed to improve > readability and support netlink models. >=20 > Other behaviour changes: > * exact prefix lookup (route -n get a.b.c.d/e) is not yet = supported. > * route monitor does not show the change originator yet. If there are regressions then it should be off by default, *especially* when we=E2=80=99re just under a month out from the proposed 14 code = slush. Jess > Differential Revision: https://reviews.freebsd.org/D39007 > --- > sbin/route/Makefile | 6 + > sbin/route/route.c | 117 +++++-- > sbin/route/route_netlink.c | 835 = +++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 930 insertions(+), 28 deletions(-) >=20 > diff --git a/sbin/route/Makefile b/sbin/route/Makefile > index e65030f805bb..aec222310d46 100644 > --- a/sbin/route/Makefile > +++ b/sbin/route/Makefile > @@ -19,6 +19,12 @@ CFLAGS+=3D -DINET6 > .endif > CFLAGS+=3D -I. >=20 > +.if ${MK_NETLINK_SUPPORT} !=3D "no" > +SRCS+=3D route_netlink.c > +.else > +CFLAGS+=3D-DWITHOUT_NETLINK > +.endif > + > HAS_TESTS=3D > SUBDIR.${MK_TESTS}+=3D tests >=20 > diff --git a/sbin/route/route.c b/sbin/route/route.c > index 5f33cecb1b20..947c97ce794a 100644 > --- a/sbin/route/route.c > +++ b/sbin/route/route.c > @@ -90,12 +90,11 @@ static struct keytab { > {0, 0} > }; >=20 > +int verbose, debugonly; > static struct sockaddr_storage so[RTAX_MAX]; > static int pid, rtm_addrs; > -static int s; > -static int nflag, af, qflag, tflag; > -static int verbose, aflen; > -static int locking, lockrest, debugonly; > +static int nflag, af, aflen, qflag, tflag; > +static int locking, lockrest; > static struct rt_metrics rt_metrics; > static u_long rtm_inits; > static uid_t uid; > @@ -103,18 +102,30 @@ static int defaultfib; > static int numfibs; > static char domain[MAXHOSTNAMELEN + 1]; > static bool domain_initialized; > -static int rtm_seq; > static char rt_line[NI_MAXHOST]; > static char net_line[MAXHOSTNAMELEN + 1]; >=20 > +#ifdef WITHOUT_NETLINK > +static int s; > +static int rtm_seq; > + > static struct { > struct rt_msghdr m_rtm; > char m_space[512]; > } m_rtmsg; >=20 > +static int rtmsg_rtsock(int, int, int); > +static int flushroutes_fib_rtsock(int); > +static void monitor_rtsock(void); > +#else > +int rtmsg_nl(int, int, int, struct sockaddr_storage *, = struct rt_metrics *); > +int flushroutes_fib_nl(int, int); > +void monitor_nl(int); > +#endif > + > static TAILQ_HEAD(fibl_head_t, fibl) fibl_head; >=20 > -static void printb(int, const char *); > +void printb(int, const char *); > static void flushroutes(int argc, char *argv[]); > static int flushroutes_fib(int); > static int getaddr(int, char *, int); > @@ -127,7 +138,7 @@ static int inet6_makenetandmask(struct = sockaddr_in6 *, const char *); > #endif > static void interfaces(void); > static void monitor(int, char*[]); > -static const char *netname(struct sockaddr *); > +const char *netname(struct sockaddr *); > static void newroute(int, char **); > static int newroute_fib(int, char *, int); > static void pmsg_addrs(char *, int, size_t); > @@ -135,7 +146,7 @@ static void pmsg_common(struct rt_msghdr *, = size_t); > static int prefixlen(const char *); > static void print_getmsg(struct rt_msghdr *, int, int); > static void print_rtmsg(struct rt_msghdr *, size_t); > -static const char *routename(struct sockaddr *); > +const char *routename(struct sockaddr *); > static int rtmsg(int, int, int); > static void set_metric(char *, int); > static int set_sofib(int); > @@ -216,12 +227,14 @@ main(int argc, char **argv) >=20 > pid =3D getpid(); > uid =3D geteuid(); > +#ifdef WITHOUT_NETLINK > if (tflag) > s =3D open(_PATH_DEVNULL, O_WRONLY, 0); > else > s =3D socket(PF_ROUTE, SOCK_RAW, 0); > if (s < 0) > err(EX_OSERR, "socket"); > +#endif >=20 > len =3D sizeof(numfibs); > if (sysctlbyname("net.fibs", (void *)&numfibs, &len, NULL, 0) =3D=3D= -1) > @@ -264,10 +277,14 @@ static int > set_sofib(int fib) > { >=20 > +#ifdef WITHOUT_NETLINK > if (fib < 0) > return (0); > return (setsockopt(s, SOL_SOCKET, SO_SETFIB, (void *)&fib, > sizeof(fib))); > +#else > + return (0); > +#endif > } >=20 > static int > @@ -395,7 +412,9 @@ flushroutes(int argc, char *argv[]) >=20 > if (uid !=3D 0 && !debugonly && !tflag) > errx(EX_NOPERM, "must be root to alter routing table"); > +#ifdef WITHOUT_NETLINK > shutdown(s, SHUT_RD); /* Don't want to read back our messages */ > +#endif >=20 > TAILQ_INIT(&fibl_head); > while (argc > 1) { > @@ -441,6 +460,17 @@ flushroutes(int argc, char *argv[]) >=20 > static int > flushroutes_fib(int fib) > +{ > +#ifdef WITHOUT_NETLINK > + return (flushroutes_fib_rtsock(fib)); > +#else > + return (flushroutes_fib_nl(fib, af)); > +#endif > +} > + > +#ifdef WITHOUT_NETLINK > +static int > +flushroutes_fib_rtsock(int fib) > { > struct rt_msghdr *rtm; > size_t needed; > @@ -525,8 +555,9 @@ retry: > free(buf); > return (error); > } > +#endif >=20 > -static const char * > +const char * > routename(struct sockaddr *sa) > { > struct sockaddr_dl *sdl; > @@ -645,7 +676,7 @@ routename(struct sockaddr *sa) > * Return the name of the network whose address is given. > * The address is assumed to be that of a net, not a host. > */ > -static const char * > +const char * > netname(struct sockaddr *sa) > { > struct sockaddr_dl *sdl; > @@ -810,8 +841,10 @@ newroute(int argc, char **argv) > warn("sigaction SIGALRM"); >=20 > cmd =3D argv[0]; > +#ifdef WITHOUT_NETLINK > if (*cmd !=3D 'g' && *cmd !=3D 's') > shutdown(s, SHUT_RD); /* Don't want to read back our = messages */ > +#endif > while (--argc > 0) { > if (**(++argv)=3D=3D '-') { > switch (key =3D keyword(1 + *argv)) { > @@ -1398,8 +1431,8 @@ retry2: > static void > monitor(int argc, char *argv[]) > { > - int n, fib, error; > - char msg[2048], *endptr; > + int fib, error; > + char *endptr; >=20 > fib =3D defaultfib; > while (argc > 1) { > @@ -1435,6 +1468,19 @@ monitor(int argc, char *argv[]) > interfaces(); > exit(0); > } > +#ifdef WITHOUT_NETLINK > + monitor_rtsock(); > +#else > + monitor_nl(fib); > +#endif > +} > + > +#ifdef WITHOUT_NETLINK > +static void > +monitor_rtsock(void) > +{ > + char msg[2048]; > + int n; >=20 > #ifdef SO_RERROR > n =3D 1; > @@ -1454,25 +1500,12 @@ monitor(int argc, char *argv[]) > print_rtmsg((struct rt_msghdr *)(void *)msg, n); > } > } > +#endif >=20 > static int > rtmsg(int cmd, int flags, int fib) > { > - int rlen; > - char *cp =3D m_rtmsg.m_space; > - int l; > - > -#define NEXTADDR(w, u) = \ > - if (rtm_addrs & (w)) { = \ > - l =3D SA_SIZE(&(u)); = \ > - memmove(cp, (char *)&(u), l); = \ > - cp +=3D l; = \ > - if (verbose) = \ > - sodump((struct sockaddr *)&(u), #w); = \ > - } > - > errno =3D 0; > - memset(&m_rtmsg, 0, sizeof(m_rtmsg)); > if (cmd =3D=3D 'a') > cmd =3D RTM_ADD; > else if (cmd =3D=3D 'c') > @@ -1488,6 +1521,33 @@ rtmsg(int cmd, int flags, int fib) > cmd =3D RTM_DELETE; > flags |=3D RTF_PINNED; > } > +#ifdef WITHOUT_NETLINK > + return (rtmsg_rtsock(cmd, flags, fib)); > +#else > + errno =3D rtmsg_nl(cmd, flags, fib, so, &rt_metrics); > + return (errno =3D=3D 0 ? 0 : -1); > +#endif > +} > + > +#ifdef WITHOUT_NETLINK > +static int > +rtmsg_rtsock(int cmd, int flags, int fib) > +{ > + int rlen; > + char *cp =3D m_rtmsg.m_space; > + int l; > + > + memset(&m_rtmsg, 0, sizeof(m_rtmsg)); > + > +#define NEXTADDR(w, u) = \ > + if (rtm_addrs & (w)) { = \ > + l =3D SA_SIZE(&(u)); = \ > + memmove(cp, (char *)&(u), l); = \ > + cp +=3D l; = \ > + if (verbose) = \ > + sodump((struct sockaddr *)&(u), #w); = \ > + } > + > #define rtm m_rtmsg.m_rtm > rtm.rtm_type =3D cmd; > rtm.rtm_flags =3D flags; > @@ -1545,6 +1605,7 @@ rtmsg(int cmd, int flags, int fib) > #undef rtm > return (0); > } > +#endif >=20 > static const char *const msgtypes[] =3D { > "", > @@ -1571,7 +1632,7 @@ static const char *const msgtypes[] =3D { > static const char metricnames[] =3D > "\011weight\010rttvar\7rtt\6ssthresh\5sendpipe\4recvpipe\3expire" > "\1mtu"; > -static const char routeflags[] =3D > +const char routeflags[] =3D > "\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7DONE" > "\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE" > "\017PROTO2\020PROTO1\021PRCLONING\022WASCLONED\023PROTO3" > @@ -1812,7 +1873,7 @@ pmsg_addrs(char *cp, int addrs, size_t len) > (void)fflush(stdout); > } >=20 > -static void > +void > printb(int b, const char *str) > { > int i; > diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c > new file mode 100644 > index 000000000000..648d866670fc > --- /dev/null > +++ b/sbin/route/route_netlink.c > @@ -0,0 +1,835 @@ > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +const char *routename(struct sockaddr *); > +const char *netname(struct sockaddr *); > +void printb(int, const char *); > +extern const char routeflags[]; > +extern int verbose, debugonly; > + > +int rtmsg_nl(int cmd, int rtm_flags, int fib, struct sockaddr_storage = *so, > + struct rt_metrics *rt_metrics); > +int flushroutes_fib_nl(int fib, int af); > +void monitor_nl(int fib); > + > +struct nl_helper; > +static void print_getmsg(struct nl_helper *h, struct nlmsghdr *hdr, = struct sockaddr *dst); > +static void print_nlmsg(struct nl_helper *h, struct nlmsghdr *hdr); > + > +#define s6_addr32 __u6_addr.__u6_addr32 > +#define bitcount32(x) __bitcount32((uint32_t)(x)) > +static int > +inet6_get_plen(const struct in6_addr *addr) > +{ > + > + return (bitcount32(addr->s6_addr32[0]) + = bitcount32(addr->s6_addr32[1]) + > + bitcount32(addr->s6_addr32[2]) + = bitcount32(addr->s6_addr32[3])); > +} > + > +static void > +ip6_writemask(struct in6_addr *addr6, uint8_t mask) > +{ > + uint32_t *cp; > + > + for (cp =3D (uint32_t *)addr6; mask >=3D 32; mask -=3D 32) > + *cp++ =3D 0xFFFFFFFF; > + if (mask > 0) > + *cp =3D htonl(mask ? ~((1 << (32 - mask)) - 1) : 0); > +} > + > +static struct sockaddr * > +get_netmask(struct snl_state *ss, int family, int plen) > +{ > + if (family =3D=3D AF_INET) { > + if (plen =3D=3D 32) > + return (NULL); > + > + struct sockaddr_in *sin =3D snl_allocz(ss, = sizeof(*sin)); > + > + sin->sin_len =3D sizeof(*sin); > + sin->sin_family =3D family; > + sin->sin_addr.s_addr =3D htonl(plen ? ~((1 << (32 - = plen)) - 1) : 0); > + > + return (struct sockaddr *)sin; > + } else if (family =3D=3D AF_INET6) { > + if (plen =3D=3D 128) > + return (NULL); > + > + struct sockaddr_in6 *sin6 =3D snl_allocz(ss, = sizeof(*sin6)); > + > + sin6->sin6_len =3D sizeof(*sin6); > + sin6->sin6_family =3D family; > + ip6_writemask(&sin6->sin6_addr, plen); > + > + return (struct sockaddr *)sin6; > + } > + return (NULL); > +} > + > +struct nl_helper { > + struct snl_state ss_cmd; > +}; > + > +static void > +nl_helper_init(struct nl_helper *h) > +{ > + if (!snl_init(&h->ss_cmd, NETLINK_ROUTE)) > + err(1, "unable to open netlink socket"); > +} > + > +static void > +nl_helper_free(struct nl_helper *h) > +{ > + snl_free(&h->ss_cmd); > +} > + > +static int > +rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, > + struct sockaddr_storage *so, struct rt_metrics *rt_metrics) > +{ > + struct snl_state *ss =3D &h->ss_cmd; > + struct snl_writer nw; > + int nl_type =3D 0, nl_flags =3D 0; > + > + snl_init_writer(ss, &nw); > + > + switch (cmd) { > + case RTSOCK_RTM_ADD: > + nl_type =3D RTM_NEWROUTE; > + nl_flags =3D NLM_F_CREATE | NLM_F_APPEND; /* Do append = by default */ > + break; > + case RTSOCK_RTM_CHANGE: > + nl_type =3D RTM_NEWROUTE; > + nl_flags =3D NLM_F_REPLACE; > + break; > + case RTSOCK_RTM_DELETE: > + nl_type =3D RTM_DELROUTE; > + break; > + case RTSOCK_RTM_GET: > + nl_type =3D RTM_GETROUTE; > + break; > + default: > + exit(1); > + } > + > + struct sockaddr *dst =3D (struct sockaddr *)&so[RTAX_DST]; > + struct sockaddr *mask =3D (struct sockaddr *)&so[RTAX_NETMASK]; > + struct sockaddr *gw =3D (struct sockaddr *)&so[RTAX_GATEWAY]; > + > + if (dst =3D=3D NULL) > + return (EINVAL); > + > + struct nlmsghdr *hdr =3D snl_create_msg_request(&nw, nl_type); > + hdr->nlmsg_flags |=3D nl_flags; > + > + int plen =3D 0; > + int rtm_type =3D RTN_UNICAST; > + > + switch (dst->sa_family) { > + case AF_INET: > + { > + struct sockaddr_in *mask4 =3D (struct sockaddr_in = *)mask; > + > + plen =3D mask4 ? bitcount32(mask4->sin_addr.s_addr) : = 32; > + break; > + } > + case AF_INET6: > + { > + struct sockaddr_in6 *mask6 =3D (struct sockaddr_in6 = *)mask; > + > + plen =3D mask6 ? inet6_get_plen(&mask6->sin6_addr) : = 128; > + break; > + } > + default: > + return (ENOTSUP); > + } > + > + if (rtm_flags & RTF_REJECT) > + rtm_type =3D RTN_PROHIBIT; > + else if (rtm_flags & RTF_BLACKHOLE) > + rtm_type =3D RTN_BLACKHOLE; > + > + struct rtmsg *rtm =3D snl_reserve_msg_object(&nw, struct rtmsg); > + rtm->rtm_family =3D dst->sa_family; > + rtm->rtm_protocol =3D RTPROT_STATIC; > + rtm->rtm_type =3D rtm_type; > + rtm->rtm_dst_len =3D plen; > + > + snl_add_msg_attr_ip(&nw, RTA_DST, dst); > + snl_add_msg_attr_u32(&nw, RTA_TABLE, fib); > + > + if (rtm_flags & RTF_GATEWAY) { > + if (gw->sa_family =3D=3D dst->sa_family) > + snl_add_msg_attr_ip(&nw, RTA_GATEWAY, gw); > + else > + snl_add_msg_attr_ipvia(&nw, RTA_VIA, gw); > + } else if (gw !=3D NULL) { > + /* Should be AF_LINK */ > + struct sockaddr_dl *sdl =3D (struct sockaddr_dl *)gw; > + if (sdl->sdl_index !=3D 0) > + snl_add_msg_attr_u32(&nw, RTA_OIF, = sdl->sdl_index); > + } > + > + if (rtm_flags !=3D 0) > + snl_add_msg_attr_u32(&nw, NL_RTA_RTFLAGS, rtm_flags); > + > + if (rt_metrics->rmx_mtu > 0) { > + int off =3D snl_add_msg_attr_nested(&nw, RTA_METRICS); > + snl_add_msg_attr_u32(&nw, RTAX_MTU, = rt_metrics->rmx_mtu); > + snl_end_attr_nested(&nw, off); > + } > + > + if (rt_metrics->rmx_weight > 0) > + snl_add_msg_attr_u32(&nw, NL_RTA_WEIGHT, = rt_metrics->rmx_weight); > + > + if (snl_finalize_msg(&nw) && snl_send_message(ss, hdr)) { > + struct snl_errmsg_data e =3D {}; > + > + hdr =3D snl_read_reply(ss, hdr->nlmsg_seq); > + if (nl_type =3D=3D NL_RTM_GETROUTE) { > + if (hdr->nlmsg_type =3D=3D NL_RTM_NEWROUTE) > + print_getmsg(h, hdr, dst); > + else { > + snl_parse_errmsg(ss, hdr, &e); > + if (e.error =3D=3D ESRCH) > + warn("route has not been = found"); > + else > + warn("message indicates error = %d", e.error); > + } > + > + return (0); > + } > + > + if (snl_parse_errmsg(ss, hdr, &e)) > + return (e.error); > + } > + return (EINVAL); > +} > + > +int > +rtmsg_nl(int cmd, int rtm_flags, int fib, struct sockaddr_storage = *so, > + struct rt_metrics *rt_metrics) > +{ > + struct nl_helper h =3D {}; > + > + nl_helper_init(&h); > + int error =3D rtmsg_nl_int(&h, cmd, rtm_flags, fib, so, = rt_metrics); > + nl_helper_free(&h); > + > + return (error); > +} > + > +static void > +get_ifdata(struct nl_helper *h, uint32_t ifindex, struct = snl_parsed_link_simple *link) > +{ > + struct snl_state *ss =3D &h->ss_cmd; > + struct snl_writer nw; > + > + snl_init_writer(ss, &nw); > + struct nlmsghdr *hdr =3D snl_create_msg_request(&nw, = NL_RTM_GETLINK); > + struct ifinfomsg *ifmsg =3D snl_reserve_msg_object(&nw, struct = ifinfomsg); > + if (ifmsg !=3D NULL) > + ifmsg->ifi_index =3D ifindex; > + if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) > + return; > + > + hdr =3D snl_read_reply(ss, hdr->nlmsg_seq); > + > + if (hdr !=3D NULL && hdr->nlmsg_type =3D=3D RTM_NEWLINK) { > + snl_parse_nlmsg(ss, hdr, &snl_rtm_link_parser_simple, = link); > + } > + > + if (link->ifla_ifname =3D=3D NULL) { > + char ifname[16]; > + > + snprintf(ifname, sizeof(ifname), "if#%u", ifindex); > + int len =3D strlen(ifname); > + char *buf =3D snl_allocz(ss, len + 1); > + strlcpy(buf, ifname, len + 1); > + link->ifla_ifname =3D buf; > + } > +} > + > +static void > +print_getmsg(struct nl_helper *h, struct nlmsghdr *hdr, struct = sockaddr *dst) > +{ > + struct snl_state *ss =3D &h->ss_cmd; > + struct timespec ts; > + struct snl_parsed_route r =3D { .rtax_weight =3D = RT_DEFAULT_WEIGHT }; > + > + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_route_parser, &r)) > + return; > + > + struct snl_parsed_link_simple link =3D {}; > + get_ifdata(h, r.rta_oif, &link); > + > + if (r.rtax_mtu =3D=3D 0) > + r.rtax_mtu =3D link.ifla_mtu; > + r.rta_rtflags |=3D (RTF_UP | RTF_DONE); > + > + (void)printf(" route to: %s\n", routename(dst)); > + > + if (r.rta_dst) > + (void)printf("destination: %s\n", routename(r.rta_dst)); > + struct sockaddr *mask =3D get_netmask(ss, r.rtm_family, = r.rtm_dst_len); > + if (mask) > + (void)printf(" mask: %s\n", routename(mask)); > + if (r.rta_gw && (r.rta_rtflags & RTF_GATEWAY)) > + (void)printf(" gateway: %s\n", routename(r.rta_gw)); > + (void)printf(" fib: %u\n", (unsigned int)r.rta_table); > + if (link.ifla_ifname) > + (void)printf(" interface: %s\n", link.ifla_ifname); > + (void)printf(" flags: "); > + printb(r.rta_rtflags, routeflags); > + > + struct rt_metrics rmx =3D { > + .rmx_mtu =3D r.rtax_mtu, > + .rmx_weight =3D r.rtax_weight, > + .rmx_expire =3D r.rta_expire, > + }; > + > + printf("\n%9s %9s %9s %9s %9s %10s %9s\n", "recvpipe", > + "sendpipe", "ssthresh", "rtt,msec", "mtu ", "weight", = "expire"); > + printf("%8lu ", rmx.rmx_recvpipe); > + printf("%8lu ", rmx.rmx_sendpipe); > + printf("%8lu ", rmx.rmx_ssthresh); > + printf("%8lu ", 0UL); > + printf("%8lu ", rmx.rmx_mtu); > + printf("%8lu ", rmx.rmx_weight); > + if (rmx.rmx_expire > 0) > + clock_gettime(CLOCK_REALTIME_FAST, &ts); > + else > + ts.tv_sec =3D 0; > + printf("%8ld \n", (long)(rmx.rmx_expire - ts.tv_sec)); > +} > + > +static void > +print_prefix(struct nl_helper *h, char *buf, int bufsize, struct = sockaddr *sa, int plen) > +{ > + int sz =3D 0; > + > + if (sa =3D=3D NULL) { > + snprintf(buf, bufsize, ""); > + return; > + } > + > + switch (sa->sa_family) { > + case AF_INET: > + { > + struct sockaddr_in *sin =3D (struct sockaddr_in = *)sa; > + char abuf[INET_ADDRSTRLEN]; > + > + inet_ntop(AF_INET, &sin->sin_addr, abuf, = sizeof(abuf)); > + sz =3D snprintf(buf, bufsize, "%s", abuf); > + break; > + } > + case AF_INET6: > + { > + struct sockaddr_in6 *sin6 =3D (struct = sockaddr_in6 *)sa; > + char abuf[INET6_ADDRSTRLEN]; > + char *ifname =3D NULL; > + > + inet_ntop(AF_INET6, &sin6->sin6_addr, abuf, = sizeof(abuf)); > + if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { > + struct snl_parsed_link_simple link =3D = {}; > + > + if (sin6->sin6_scope_id !=3D 0) { > + get_ifdata(h, = sin6->sin6_scope_id, &link); > + ifname =3D link.ifla_ifname; > + } > + } > + if (ifname =3D=3D NULL) > + sz =3D snprintf(buf, bufsize, "%s", = abuf); > + else > + sz =3D snprintf(buf, bufsize, "%s%%%s", = abuf, ifname); > + break; > + } > + default: > + snprintf(buf, bufsize, "unknown_af#%d", sa->sa_family); > + plen =3D -1; > + } > + > + if (plen >=3D 0) > + snprintf(buf + sz, bufsize - sz, "/%d", plen); > +} > + > + > +static int > +print_line_prefix(const char *cmd, const char *name) > +{ > + struct timespec tp; > + struct tm tm; > + char buf[32]; > + > + clock_gettime(CLOCK_REALTIME, &tp); > + localtime_r(&tp.tv_sec, &tm); > + > + strftime(buf, sizeof(buf), "%T", &tm); > + int len =3D printf("%s.%03ld %s %s ", buf, tp.tv_nsec / 1000000, = cmd, name); > + > + return (len); > +} > + > +static const char * > +get_action_name(struct nlmsghdr *hdr, int new_cmd) > +{ > + if (hdr->nlmsg_type =3D=3D new_cmd) { > + //return ((hdr->nlmsg_flags & NLM_F_REPLACE) ? "replace" = : "add"); > + return ("add/repl"); > + } else > + return ("delete"); > +} > + > +static void > +print_nlmsg_route_nhop(struct nl_helper *h, struct snl_parsed_route = *r, > + struct rta_mpath_nh *nh, bool first) > +{ > + // gw 10.0.0.1 ifp vtnet0 mtu 1500 table inet.0 > + if (nh->gw !=3D NULL) { > + char gwbuf[128]; > + print_prefix(h, gwbuf, sizeof(gwbuf), nh->gw, -1); > + printf("gw %s ", gwbuf); > + } > + > + if (nh->ifindex !=3D 0) { > + struct snl_parsed_link_simple link =3D {}; > + > + get_ifdata(h, nh->ifindex, &link); > + if (nh->rtax_mtu =3D=3D 0) > + nh->rtax_mtu =3D link.ifla_mtu; > + printf("iface %s ", link.ifla_ifname); > + if (nh->rtax_mtu !=3D 0) > + printf("mtu %d ", nh->rtax_mtu); > + } > + > + if (first) { > + switch (r->rtm_family) { > + case AF_INET: > + printf("table inet.%d", r->rta_table); > + break; > + case AF_INET6: > + printf("table inet6.%d", r->rta_table); > + break; > + } > + } > + > + printf("\n"); > +} > + > +static void > +print_nlmsg_route(struct nl_helper *h, struct nlmsghdr *hdr) > +{ > + struct snl_parsed_route r =3D { .rtax_weight =3D = RT_DEFAULT_WEIGHT }; > + struct snl_state *ss =3D &h->ss_cmd; > + > + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_route_parser, &r)) > + return; > + > + // 20:19:41.333 add route 10.0.0.0/24 gw 10.0.0.1 ifp vtnet0 mtu = 1500 table inet.0 > + > + const char *cmd =3D get_action_name(hdr, RTM_NEWROUTE); > + int len =3D print_line_prefix(cmd, "route"); > + > + char buf[128]; > + print_prefix(h, buf, sizeof(buf), r.rta_dst, r.rtm_dst_len); > + len +=3D strlen(buf) + 1; > + printf("%s ", buf); > + > + switch (r.rtm_type) { > + case RTN_BLACKHOLE: > + printf("blackhole\n"); > + return; > + case RTN_UNREACHABLE: > + printf("unreach(reject)\n"); > + return; > + case RTN_PROHIBIT: > + printf("prohibit(reject)\n"); > + return; > + } > + > + if (r.rta_multipath !=3D NULL) { > + bool first =3D true; > + > + memset(buf, ' ', sizeof(buf)); > + buf[len] =3D '\0'; > + > + for (int i =3D 0; i < r.rta_multipath->num_nhops; i++) { > + struct rta_mpath_nh *nh =3D = &r.rta_multipath->nhops[i]; > + > + if (!first) > + printf("%s", buf); > + print_nlmsg_route_nhop(h, &r, nh, first); > + first =3D false; > + } > + } else { > + struct rta_mpath_nh nh =3D { > + .gw =3D r.rta_gw, > + .ifindex =3D r.rta_oif, > + .rtax_mtu =3D r.rtax_mtu, > + }; > + > + print_nlmsg_route_nhop(h, &r, &nh, true); > + } > +} > + > +static const char *operstate[] =3D { > + "UNKNOWN", /* 0, IF_OPER_UNKNOWN */ > + "NOTPRESENT", /* 1, IF_OPER_NOTPRESENT */ > + "DOWN", /* 2, IF_OPER_DOWN */ > + "LLDOWN", /* 3, IF_OPER_LOWERLAYERDOWN */ > + "TESTING", /* 4, IF_OPER_TESTING */ > + "DORMANT", /* 5, IF_OPER_DORMANT */ > + "UP", /* 6, IF_OPER_UP */ > +}; > + > +static void > +print_nlmsg_link(struct nl_helper *h, struct nlmsghdr *hdr) > +{ > + struct snl_parsed_link l =3D {}; > + struct snl_state *ss =3D &h->ss_cmd; > + > + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_link_parser, &l)) > + return; > + > + // 20:19:41.333 add iface#3 vtnet0 admin UP oper UP mtu 1500 = table inet.0 > + const char *cmd =3D get_action_name(hdr, RTM_NEWLINK); > + print_line_prefix(cmd, "iface"); > + > + printf("iface#%u %s ", l.ifi_index, l.ifla_ifname); > + printf("admin %s ", (l.ifi_flags & IFF_UP) ? "UP" : "DOWN"); > + if (l.ifla_operstate < NL_ARRAY_LEN(operstate)) > + printf("oper %s ", operstate[l.ifla_operstate]); > + if (l.ifla_mtu > 0) > + printf("mtu %u ", l.ifla_mtu); > + > + printf("\n"); > +} > + > +static void > +print_nlmsg_addr(struct nl_helper *h, struct nlmsghdr *hdr) > +{ > + struct snl_parsed_addr attrs =3D {}; > + struct snl_state *ss =3D &h->ss_cmd; > + > + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_addr_parser, &attrs)) > + return; > + > + // add addr 192.168.1.1/24 iface vtnet0 > + const char *cmd =3D get_action_name(hdr, RTM_NEWADDR); > + print_line_prefix(cmd, "addr"); > + > + char buf[128]; > + struct sockaddr *addr =3D attrs.ifa_local ? attrs.ifa_local : = attrs.ifa_address; > + print_prefix(h, buf, sizeof(buf), addr, attrs.ifa_prefixlen); > + printf("%s ", buf); > + > + struct snl_parsed_link_simple link =3D {}; > + get_ifdata(h, attrs.ifa_index, &link); > + > + if (link.ifi_flags & IFF_POINTOPOINT) { > + char buf[64]; > + print_prefix(h, buf, sizeof(buf), attrs.ifa_address, = -1); > + printf("-> %s ", buf); > + } > + > + printf("iface %s ", link.ifla_ifname); > + > + printf("\n"); > +} > + > +static const char *nudstate[] =3D { > + "INCOMPLETE", /* 0x01(0) */ > + "REACHABLE", /* 0x02(1) */ > + "STALE", /* 0x04(2) */ > + "DELAY", /* 0x08(3) */ > + "PROBE", /* 0x10(4) */ > + "FAILED", /* 0x20(5) */ > +}; > + > +#define NUD_INCOMPLETE 0x01 /* No lladdr, address = resolution in progress */ > +#define NUD_REACHABLE 0x02 /* reachable & recently = resolved */ > +#define NUD_STALE 0x04 /* has lladdr but it's = stale */ > +#define NUD_DELAY 0x08 /* has lladdr, is stale, = probes delayed */ > +#define NUD_PROBE 0x10 /* has lladdr, is stale, = probes sent */ > +#define NUD_FAILED 0x20 /* unused */ > + > + > +static void > +print_nlmsg_neigh(struct nl_helper *h, struct nlmsghdr *hdr) > +{ > + struct snl_parsed_neigh attrs =3D {}; > + struct snl_state *ss =3D &h->ss_cmd; > + > + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_neigh_parser, &attrs)) > + return; > + > + // add addr 192.168.1.1 state %s lladdr %s iface vtnet0 > + const char *cmd =3D get_action_name(hdr, RTM_NEWNEIGH); > + print_line_prefix(cmd, "neigh"); > + > + char buf[128]; > + print_prefix(h, buf, sizeof(buf), attrs.nda_dst, -1); > + printf("%s ", buf); > + > + struct snl_parsed_link_simple link =3D {}; > + get_ifdata(h, attrs.nda_ifindex, &link); > + > + for (unsigned int i =3D 0; i < NL_ARRAY_LEN(nudstate); i++) { > + if ((1 << i) & attrs.ndm_state) { > + printf("state %s ", nudstate[i]); > + break; > + } > + } > + > + if (attrs.nda_lladdr !=3D NULL) { > + int if_type =3D link.ifi_type; > + > + if ((if_type =3D=3D IFT_ETHER || if_type =3D=3D = IFT_L2VLAN || if_type =3D=3D IFT_BRIDGE) && > + NLA_DATA_LEN(attrs.nda_lladdr) =3D=3D = ETHER_ADDR_LEN) { > + struct ether_addr *ll; > + > + ll =3D (struct ether_addr = *)NLA_DATA(attrs.nda_lladdr); > + printf("lladdr %s ", ether_ntoa(ll)); > + } else { > + struct sockaddr_dl sdl =3D { > + .sdl_len =3D sizeof(sdl), > + .sdl_family =3D AF_LINK, > + .sdl_index =3D attrs.nda_ifindex, > + .sdl_type =3D if_type, > + .sdl_alen =3D = NLA_DATA_LEN(attrs.nda_lladdr), > + }; > + if (sdl.sdl_alen < sizeof(sdl.sdl_data)) { > + void *ll =3D NLA_DATA(attrs.nda_lladdr); > + > + memcpy(sdl.sdl_data, ll, sdl.sdl_alen); > + printf("lladdr %s ", link_ntoa(&sdl)); > + } > + } > + } > + > + if (link.ifla_ifname !=3D NULL) > + printf("iface %s ", link.ifla_ifname); > + printf("\n"); > +} > + > +static void > +print_nlmsg_generic(struct nl_helper *h, struct nlmsghdr *hdr) > +{ > +} > + > +static void > +print_nlmsg(struct nl_helper *h, struct nlmsghdr *hdr) > +{ > + switch (hdr->nlmsg_type) { > + case RTM_NEWLINK: > + case RTM_DELLINK: > + print_nlmsg_link(h, hdr); > + break; > *** 184 LINES SKIPPED *** From nobody Mon Mar 27 21:09: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 4PllnM1JcGz424Rg; Mon, 27 Mar 2023 21:09:43 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (heemeyer.club [195.93.173.158]) (using TLSv1.3 with cipher TLS_AES_256_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 4PllnL52LBz3j7K; Mon, 27 Mar 2023 21:09:42 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.1/8.16.1) with ESMTP id 32RL9XDi044155; Tue, 28 Mar 2023 00:09:33 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.1/8.16.1/Submit) id 32RL9XGa044154; Tue, 28 Mar 2023 00:09:33 +0300 (MSK) (envelope-from dchagin) Date: Tue, 28 Mar 2023 00:09:33 +0300 From: Dmitry Chagin To: "Alexander V. Chernikov" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b894193501a7 - main - netlink: fix linux module build w/ netlink. Message-ID: References: <202303271821.32RILYvC048054@gitrepo.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: <202303271821.32RILYvC048054@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4PllnL52LBz3j7K X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Mon, Mar 27, 2023 at 06:21:34PM +0000, Alexander V. Chernikov wrote: > The branch main has been updated by melifaro: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b894193501a7cb6ce5eed3cf86be5dd773cbbb2d > > commit b894193501a7cb6ce5eed3cf86be5dd773cbbb2d > Author: Alexander V. Chernikov > AuthorDate: 2023-03-27 18:20:38 +0000 > Commit: Alexander V. Chernikov > CommitDate: 2023-03-27 18:21:26 +0000 > > netlink: fix linux module build w/ netlink. > > Reported by: Marek Zarychta > MFC after: 2 weeks > --- > sys/compat/linux/linux_netlink.c | 1 + > sys/modules/linux/Makefile | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c > index 9edfbfc2c031..0e8188d4cdf6 100644 > --- a/sys/compat/linux/linux_netlink.c > +++ b/sys/compat/linux/linux_netlink.c > @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); > > #include "opt_inet.h" > #include "opt_inet6.h" > +#include "opt_netlink.h" > > #include > #include > diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile > index be2c60a42847..43d7f2c240b8 100644 > --- a/sys/modules/linux/Makefile > +++ b/sys/modules/linux/Makefile > @@ -36,6 +36,7 @@ SRCS= linux${SFX}_dummy_machdep.c \ > linux_vdso.c \ > opt_inet6.h \ > opt_ktrace.h \ > + opt_netlink.h \ > opt_posix.h \ > bus_if.h \ > device_if.h \ Hi, I think this is wrong, and should be near SRCS+= linux_netlink.c and also unconditionally included in the linux_common module From nobody Mon Mar 27 21:28: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 4PlmBf01f3z425mm; Mon, 27 Mar 2023 21: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 4PlmBd6fFfz3lr9; Mon, 27 Mar 2023 21:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679952489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2P10X0f8QJ7RcAssCT0fg5iY9tni11vs+jyVHaGSnh8=; b=WSmg+hYmqYqaoDkmzoZY+KKggl2LUBEO7xOuDn4GRiav4PvgbtQ4ftfyUXBjOs5neA/4he 7cMEILH7gGWbfkpqAPK+//cmqs5lMjuyF2BqS3OviUJxVPOjIOjtmn/+H4JqAzC4fzHMKS lqzeYRL7vvGxlp5/bGmM5Nu3EDUCoMMyAJCyUaijlAsvSTNt1HzQKyBWzEyhnhjk9+5+mk Xr+sFV4VXgTCmPM1k+rJBy88vzN4jqrIChUdCkOR4n0xxKfMBSj7BlZmRQFDrz1k5wS/RP zCQ3Io6nuFvdKAGaZlS1yLEKhX0V5GpcMD2BbtVo7GzAG6qthBmkwb80rGlTng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679952489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2P10X0f8QJ7RcAssCT0fg5iY9tni11vs+jyVHaGSnh8=; b=GkOx2VjkBu+8zTxrR0woUNtya77IWh3aP4aaMcYwzLAZnmkpHyeJ68aC9U/+O4yqRURU04 6YUCW+qRoYi+lPtOQik8RF0GjEVG/QVluSTfMtCRxYan+d8xsMXVFVo8AE/DGO+lIDvXMZ gHGn6RsXuEGrMHN2s+M7c0QMiigbLlFnLWyXdIPKTDyvbWO+Yj5QWEbuuG53ymCCSxeWjW RDSOaD8c8pu+pUvB2bA6mEgD+KWbiBrIMqSvAnAkXEvNIPFQV0/dRhmFehElgnYFPQADtq rvaw7SboqHUy5MGLPYqaICB6jYpxrfrUNZMvLBq1il1bXYYt/RIexx3wtxtIXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679952489; a=rsa-sha256; cv=none; b=EoPnE+YJvbT1bXxxPl/TRfdP8veGHmyJ5ehFr9Ye43aRLAVPhuNItrWCJranK+GOAeDwJs xF/F+zuLTSa3HWNoSl3E2JI9Xtvm7f+sVaQ3xEePMgXJEGjZW097nJESkdWcEnvWP4phQz 96wpROi2aSSwgjSzqo6gj+IV/p80smYIsDoXFQRgzk38yg9Ks0LHwkC+iwCfGWBNCqnV3v xiKAvC5JEA96cYaFAvLNDqH56vaVZonsqBBrVo4kzaCsa2kO8SqZbXtpfphqLQeEUVpvap FnHF2fMp1ou212pnfJS0xZyziNI3q5+TuAhKwo0lc2PN4dnf6t11znkeXVfMyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlmBd5hd0zdbW; Mon, 27 Mar 2023 21:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RLS9P9050253; Mon, 27 Mar 2023 21:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RLS9E1050252; Mon, 27 Mar 2023 21:28:09 GMT (envelope-from git) Date: Mon, 27 Mar 2023 21:28:09 GMT Message-Id: <202303272128.32RLS9E1050252@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: ac6b2b4344cd - main - build: glibc on Linux defines explicit_bzero in . List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: ac6b2b4344cd586847fe4318c776e1213b09e6de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ac6b2b4344cd586847fe4318c776e1213b09e6de commit ac6b2b4344cd586847fe4318c776e1213b09e6de Author: John Baldwin AuthorDate: 2023-03-27 21:27:16 +0000 Commit: John Baldwin CommitDate: 2023-03-27 21:27:16 +0000 build: glibc on Linux defines explicit_bzero in . Don't install strings.h on such systems. The local prototype doesn't match the native Linux one when built as C++ breaking the build of config(8) as a bootstrap tool on some Linux systems. If the missing prototype becomes a problem in the future, tools/build/cross-build/include/linux/strings.h can be patched to add it. Reviewed by: imp, emaste Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D39289 --- tools/build/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/Makefile b/tools/build/Makefile index c7875622b042..71a38534f7ac 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -78,7 +78,7 @@ SYSINCS+= stat.h SRCS+= futimens.c utimensat.c .endif -_WITH_EXPLICIT_BZERO!= grep -c explicit_bzero ${HOST_INCLUDE_ROOT}/strings.h || true +_WITH_EXPLICIT_BZERO!= cat ${HOST_INCLUDE_ROOT}/strings.h ${HOST_INCLUDE_ROOT}/string.h | grep -c explicit_bzero || true .if ${_WITH_EXPLICIT_BZERO} == 0 # .PATH: ${SRCTOP}/sys/libkern # Adding sys/libkern to .PATH breaks building the cross-build compat library From nobody Mon Mar 27 23:39: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 4Plq6F06c9z42FrG; Mon, 27 Mar 2023 23:39: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 4Plq6D6JWXz43CN; Mon, 27 Mar 2023 23:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679960372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hRo1diDcFN0rQ59kOkuv03LPWL22FlTSwVkd8otWTic=; b=a58tRpwedI5EDZ4cna11xR0bZfSVMQQ7vRBr5sfi7hymEBpGSQSYtNbCrhb4F5L65PdlgJ 7+1LuSWPsAtcpPMk76Rn10g9dSXTUL3N2JSWyNWsXe1KRI3hoxvVB3vTh06Gm+CugTXJm+ WMZs7mI/jTXZUqcRB9AQMh1gSnFrrxQMezdfX08UFeXTqAsedi3lYUh8NGR9KAIkSspzgO Pz/8sUqHd6VP8Xi66OmNWcB8RneHKTFBrtjEtNe/NQCjEqeeimzk+walslXrCFgYd45w2x KdBjSVWWp1TPgNbDGssh9MCVZwNI3fmJEI/tf+zKuWntp2A9fKMx6doUiWWAPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679960372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hRo1diDcFN0rQ59kOkuv03LPWL22FlTSwVkd8otWTic=; b=Cn5TdX84wbePpOWyoomWiG1gTShZCsdks3edO0reafA+xN17rZp09F1Y5E2cV+90Re5NQi HAEZLtU1t1+bOXuf5HaKjq5zTjOai+/eDfVY6bE9T582wfGawu/BIoowXjrNIW3vNpiQ1i FVJphHrLSucxwwPbr1ft9thbjSevNGs8qRZTL/blfBDidhsJQQUe1S8RHHpHwqdDQ4saGp et+i4OEkLc5l69R4O5IKoM4Q+Sm1wHGuYiEcrYKbl8lxeL+CPRnqjP9tz65sRRbXQSM1oK Tyky6Gkd0/jQ+CtzDL16lDLXo2LZ5aPEk0XM9pGl2rG8CuoZHNSl8rjds5L+0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679960372; a=rsa-sha256; cv=none; b=vwjGaPQdt6Ag6a13m6vSHiHulaGOoc+F8xl9MKYMnSxxY74c4hV8jxRMcKuNEVjqpzxq/s nIBQLuhLnl2KzYSWu/Y2effrsgl6OQuqFdmiNYK7FgDH6/lbAHaaggsqEOpaVEvSaXGqkj SSjL91t89enWitpPrMk63b9XJ7vqgfgqBbvp+aeWFIOVZl3bcZJtSAtRcQ0fDXRhgc/AEo vshunzYLuFr5JjhqqUOfWY2lZyaJAdNSTU4XeQ+UUMMEPAEQe82IhSQfZkItxURbhMiPak gHDF58JGhDs8+ph+qTNg5l3qWCTV/V4J9/5Mu4K/uRd+pyZizJ6P9f7Oj7k6uQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Plq6D3Z2qzh5p; Mon, 27 Mar 2023 23:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RNdWPX063668; Mon, 27 Mar 2023 23:39:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RNdWPD063667; Mon, 27 Mar 2023 23:39:32 GMT (envelope-from git) Date: Mon, 27 Mar 2023 23:39:32 GMT Message-Id: <202303272339.32RNdWPD063667@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: 61194e9852e6 - main - Add kqueue1() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61194e9852e641d1533cd04a5679d6042ff975d3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=61194e9852e641d1533cd04a5679d6042ff975d3 commit 61194e9852e641d1533cd04a5679d6042ff975d3 Author: Konstantin Belousov AuthorDate: 2023-03-25 23:39:02 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-27 23:39:26 +0000 Add kqueue1() syscall It takes the flags argument. Immediate use is to provide the KQUEUE_CLOEXEC flag for kqueue(2). Reviewed by: emaste, jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39271 --- sys/kern/kern_event.c | 13 +++++++++++++ sys/kern/syscalls.master | 5 +++++ sys/sys/event.h | 3 +++ 3 files changed, 21 insertions(+) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index f952a5f00340..0da4325ccd6a 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1057,6 +1057,19 @@ sys_kqueue(struct thread *td, struct kqueue_args *uap) return (kern_kqueue(td, 0, NULL)); } +int +sys_kqueue1(struct thread *td, struct kqueue1_args *uap) +{ + int flags; + + if ((uap->flags & ~(KQUEUE_CLOEXEC)) != 0) + return (EINVAL); + flags = 0; + if ((uap->flags & KQUEUE_CLOEXEC) != 0) + flags |= O_CLOEXEC; + return (kern_kqueue(td, flags, NULL)); +} + static void kqueue_init(struct kqueue *kq) { diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index c6dce5366219..52ae6bda5a16 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3306,5 +3306,10 @@ u_int flags, ); } +583 AUE_KQUEUE STD|CAPENABLED { + int kqueue1( + u_int flags + ); + } ; vim: syntax=off diff --git a/sys/sys/event.h b/sys/sys/event.h index 1007b88828ae..e91ccbb31ae8 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -218,6 +218,9 @@ struct freebsd11_kevent32 { #define NOTE_NSECONDS 0x00000008 /* data is nanoseconds */ #define NOTE_ABSTIME 0x00000010 /* timeout is absolute */ +/* Flags for kqueue1(2) */ +#define KQUEUE_CLOEXEC 0x00000001 /* close on exec */ + struct knote; SLIST_HEAD(klist, knote); struct kqueue; From nobody Mon Mar 27 23:39: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 4Plq6G17Rcz42FvC; Mon, 27 Mar 2023 23:39: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 4Plq6F52Jvz4398; Mon, 27 Mar 2023 23:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679960373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pal5+lpkXejXaX8l1DCWcBWZe7QjpNpIn5vG55CS6Pk=; b=JiNieL4wNUpkS5D66tCg1inj7x96r3OvKFKvcchsex06zPc1s2BhYfvR8gKnswS7yhRoVs luxHmskB+9U584Qd+lZ1O7SI2b6SEDNKJ4RTtBrctdDlY+ePinfnJIVgDletvaAV+iODMt 8FCsRcNp6jfpVPDYk5KtSOZMR7gY64UNk+ezij42/47OqyDUKvloUPNYTfgGO6IijVAmNS DHibr2paAJ7VgEn9sqZKoh5RoQzA/ycXDj6jwDs9fCdiSSoqpdZX8DXcVk+xWVNgKdafmd pBNwb/pmDSeUrfMnibXBXB6XDXkNZ0rYWIGh9mivjYuLyMNcDUaQMEnMQiysuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679960373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pal5+lpkXejXaX8l1DCWcBWZe7QjpNpIn5vG55CS6Pk=; b=S+w0UiWcaq6VaZszTIkg4IloT6Dytb/Sq7fao5335LTp+kUq/OzDTkqL+a9ybDOKYD3w41 y4fYPqv9bQB5DHGvHFyJUrJMrzO/LzRJydsxZjSFvOySaVLjsbibXPEq/dPCMnP6PkFGcr VjDIt6y6QHXzsYgMBxzBw5SqorqzSc27WrKJHWbb78tTMp7MtdsMd4DKuODlACJvfzao0m 1UKx9WOpyZFDQL5GtbYSn1VoPZaBJoLZhuqDPe2m6r2FuEVneYXAhg4c9SPhDgz+xA1tuG G400eqQWfnF6Gi0Gyv77coyUnZ6H1ef1ukSBdzD3aALP0ItgqMWNv5vpRjjACg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679960373; a=rsa-sha256; cv=none; b=HSs/3AR06+oitLgoe/PwMfCc6kuMdBOCykYFQNSlg0aXz5I1p82BoVudE+qYOC81wJsWGv CO6fffuOmHB1maihgszCpC9JjyNQpWMg6SlUagTFz6X9phfHD51x+jTetDPwB8FlKIJlsW qq1zDV8AdBUxbZb/zzI26YfmG9fdei/ceOwlPMXUufVHnJmDXUujOMR2/CXvmpgCNRlnCb U6KLqRh3Sfj3ztDyyBmrNjb6z5EzIYz+BIFbY5Wfa69ScTsQsi5yllPtgb8clnBk5QTlTT VyuwaAMFbgoJm3gajZfcKuu32A8sTCq4jF2C3NS+Ut31OdaFhNgGcA8NsPJ/qQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Plq6F47t0zhQm; Mon, 27 Mar 2023 23:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RNdXDZ063695; Mon, 27 Mar 2023 23:39:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RNdXCe063694; Mon, 27 Mar 2023 23:39:33 GMT (envelope-from git) Date: Mon, 27 Mar 2023 23:39:33 GMT Message-Id: <202303272339.32RNdXCe063694@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: 375732cc6e46 - main - kqueue1(2): export the symbol from libc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 375732cc6e462ca160654886f0411d2950768a8b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=375732cc6e462ca160654886f0411d2950768a8b commit 375732cc6e462ca160654886f0411d2950768a8b Author: Konstantin Belousov AuthorDate: 2023-03-25 23:40:39 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-27 23:39:26 +0000 kqueue1(2): export the symbol from libc Reviewed by: emaste, jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39271 --- lib/libc/sys/Symbol.map | 1 + sys/sys/event.h | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index 7984f54da697..7f6afd7b298b 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -419,6 +419,7 @@ FBSD_1.6 { FBSD_1.7 { _Fork; fspacectl; + kqueue1; swapoff; }; diff --git a/sys/sys/event.h b/sys/sys/event.h index e91ccbb31ae8..a2c0d481ebb2 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -361,6 +361,7 @@ struct timespec; __BEGIN_DECLS int kqueue(void); +int kqueue1(unsigned flags); int kevent(int kq, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); From nobody Mon Mar 27 23:39: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 4Plq6G6gmvz42FvD; Mon, 27 Mar 2023 23:39: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 4Plq6G5yHyz43YZ; Mon, 27 Mar 2023 23:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679960374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=stf8yGL+tpjiAta06cHIQAACdHmCHDLWfSfvMnAW3Mo=; b=gM23VVo0rJPmuP1SHd8EdIWQWVn1RWsU4143jsIUTkUKGUxRhEw6WsJaruJ05MTNkvMcfT zowhoA65AAXUbuGRoYdPIAqreQCuJO+02tRjPGhINPXWCXtfRIzAalUYXAC486squTvtVf lK1wuX7i0xK71FrlyD9O6bpyNtXDhcnOFNgGjfHemQYu8Pcd2g0MOudBJsibozcuiYchtt 1xtJ1EaHTtXV9V/hJ6RpzON8IIJ+O3teyu52ScJPqJ9aq+Ut/b+QgeMSkVF0YgtlNIjd9y OQyAKs6MVJBWqbZUrRjv65Xurb+jPv+6JaMAvuX612alBLbvrr8LU/NTW9qPhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679960374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=stf8yGL+tpjiAta06cHIQAACdHmCHDLWfSfvMnAW3Mo=; b=HVMT9xP4ZlVSJvfwF9EsjO2PRfMIqSuld4jinkDAzohz8ryqCSP30u5wyOipAGvLGkilAC OmIbn/HYA0Pu5YfEyCXYmB5CdwgZqjodFSo7sv9+uz4hIiwAop/Ae01OwnphRcOylUwyxI 39BfSuyaMTq8tYwVq2vheWioePB28/drXGQHq8hQhrrLiGY0DNfHGPuggybBW2Vu1FTBke sp4XVJzTUHMfyV2AYyEbHku0Qzxur5x7+aN/BKqQrsbP3d3NiBYUXT0UhlsjtKwEc+9zhS 3RR4H4dQjWw1pafy13sDbdVumoAy5mK3YfhSO6eYEQQVXf/7lb1dIOnvv7/vQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679960374; a=rsa-sha256; cv=none; b=VtYIaFo/PzgU/clCQ1OC+N+wNX/CAbiyLDmyq+5JScdyUfv6srMe8eI61jRBT/s/Uekq8N lfV47+9hFBzqLS1KCxQHybB5biac6lsUGQCUNozQayjQnYeKx+PqnmuTO8mM0HT0G6cDXF 5wXEt+IwTNJjYcQ61qOF8yzeXvtAD9oIf6tTwgiG+EumcgIOslrcqMksZPWh7UDl9w+hy5 H2R3qkl76Br6l5cXXjmaYf6pk+JjjdmXnEwm3ksuQMrVVtv3DxWllfTsM5i6GSy3tBgZc6 YL/Lfs0k6dP8N+4nMhDUZqnShqYbrhtaFAiYDzXWAokRo/qOKRhLKWtxisUzeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Plq6G53TPzhhN; Mon, 27 Mar 2023 23:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RNdYgA063715; Mon, 27 Mar 2023 23:39:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RNdYIx063714; Mon, 27 Mar 2023 23:39:34 GMT (envelope-from git) Date: Mon, 27 Mar 2023 23:39:34 GMT Message-Id: <202303272339.32RNdYIx063714@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: f2ec444be523 - main - kqueue1(2): document List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: f2ec444be523d3d00808ff82a7c690c75defe953 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f2ec444be523d3d00808ff82a7c690c75defe953 commit f2ec444be523d3d00808ff82a7c690c75defe953 Author: Konstantin Belousov AuthorDate: 2023-03-25 23:41:21 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-27 23:39:26 +0000 kqueue1(2): document Reviewed by: emaste, jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39271 --- lib/libc/sys/Makefile.inc | 1 + lib/libc/sys/kqueue.2 | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 45287813fe13..54143b288dc4 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -430,6 +430,7 @@ MLINKS+=jail.2 jail_attach.2 \ jail.2 jail_set.2 MLINKS+=kldunload.2 kldunloadf.2 MLINKS+=kqueue.2 kevent.2 \ + kqueue.2 kqueue1.2 \ kqueue.2 EV_SET.3 MLINKS+=link.2 linkat.2 MLINKS+=madvise.2 posix_madvise.2 diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2 index c8d39d092b4d..c263fa550244 100644 --- a/lib/libc/sys/kqueue.2 +++ b/lib/libc/sys/kqueue.2 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 14, 2022 +.Dd March 26, 2023 .Dt KQUEUE 2 .Os .Sh NAME @@ -38,6 +38,8 @@ .Ft int .Fn kqueue "void" .Ft int +.Fn kqueue1 "u_int flags" +.Ft int .Fo kevent .Fa "int kq" .Fa "const struct kevent *changelist" @@ -90,6 +92,22 @@ flag, then the descriptor table is shared, which will allow sharing of the kqueue between two processes. .Pp The +.Fn kqueue1 +system call also creates a new kernel event queue, and additionally takes +the +.Fa flags +argument, which is a bitwise-inclusive OR of the following flags: +.Bl -tag -width "KQUEUE_CLOEXEC" +.It Fa KQUEUE_CLOEXEC +The returned file descriptor is automatically closed on +.Xr execve 2 +.El +The +.Ql fd = kqueue() +call is equivalent to +.Ql fd = kqueue1(0) . +.Pp +The .Fn kevent system call is used to register events with the queue, and return any pending From nobody Mon Mar 27 23:39: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 4Plq6J0d48z42Fxh; Mon, 27 Mar 2023 23:39: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 4Plq6H72w9z43ZN; Mon, 27 Mar 2023 23:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679960376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=niwuSV56u6Zg8WPmr86SMAkJOrk45uCArwHiT1ucW5Y=; b=x6GPzkCTJwmNxTUauVY+DmpzKVgoXwCp3oCZu8vGHBwwi1nyUZSsyESAgojM8zDX33gC26 MH3u3jHakdpl3Cxp2QUZHSlOODiMZP8PdZuCtvw8fawa2/+FirhTMgABX8rBCF0w1rcNjG s8LGbr3SRByNUMJUfUxXnIDLa3HGzYZr0Q1gQV4In40sAsfu5eO6mwDr5JzWEHzlkZA1Cb eIV1MWvLAz7PeO2XZl7OuR/VeHxlKc8Z226mRNZQ9GJRTD2FKC2HOM2sUNJkzhC6eN8Tzz bgbn69TyKv9WnodytLdh8ZxSwoCWVU41sZxoyr/PWIDSePD+9jnE2aBsp0Fjag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679960376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=niwuSV56u6Zg8WPmr86SMAkJOrk45uCArwHiT1ucW5Y=; b=mHuK4GYVKqjScyXrg5h3KsXmaVh35v/u+ybOFSm7LaLjEynLxyL/ifZMVqoQvukNNTFZi9 bgOLH7/F/FERXNqSWGy8UJh9Bi+Y6QZ+1ECW3CV7QnLRET5GhxQ/OWJEbkkujyPnS7Q7ae ePFv6/LUyO8BQoBi96QEU1c6yh0FlGfRcBbA5OLq69Ula9RySgFZfGqvgDKcFroWdNG/St fbU2COGz4KN0JHCbDr+UKxizOWxmWhLOEv40lbpB3dqkqlhMvcScX/mY3/jBY0Aq75/hRX 4YFAOsawdLJI1y9W46LIuO0jUr8n69Ue5gG0qaOirUCJY83KPwp0IYlUX5pWLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679960376; a=rsa-sha256; cv=none; b=HUpu9sjVFuiD0cEzcYB43y5YNrZ1O9OTP7vQ8S+A10178QE7wKj0SlCRd2N4+RYdQUakE4 y8Tzp19ObubqLATnJp9mRumfDfPMVU2g58oy/6yXUYlLtHRalJi83Jb7Pyk0Y78JiGE6vh zVAWcJSkFfyXikMWhkGEK73ayd8/k8PPSzmb2Q2bj3XFIBa9NGg5d0Nb/WrWyB+b22Ge0A 9n9Sxh6yKBv5tlhqQfYiH8YhU/VSPVdvpNW9FEoOR/2xTZLp3+P6RhwoVDtL/IZrTPXXkh xGrmWaEMbuicZpvPvxMNfMtqEMxj8xKV7u6bscx9hrpmbKAQO7Auft1XypDPdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Plq6H671vzhhP; Mon, 27 Mar 2023 23:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RNdZnr063737; Mon, 27 Mar 2023 23:39:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RNdZJL063736; Mon, 27 Mar 2023 23:39:35 GMT (envelope-from git) Date: Mon, 27 Mar 2023 23:39:35 GMT Message-Id: <202303272339.32RNdZJL063736@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: 6a0a634590e4 - main - Regen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 6a0a634590e44851b9915634f370e0d547b9012f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a0a634590e44851b9915634f370e0d547b9012f commit 6a0a634590e44851b9915634f370e0d547b9012f Author: Konstantin Belousov AuthorDate: 2023-03-25 23:45:16 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-27 23:39:26 +0000 Regen --- sys/compat/freebsd32/freebsd32_syscall.h | 3 ++- sys/compat/freebsd32/freebsd32_syscalls.c | 1 + sys/compat/freebsd32/freebsd32_sysent.c | 1 + sys/compat/freebsd32/freebsd32_systrace_args.c | 22 ++++++++++++++++++++++ sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 22 ++++++++++++++++++++++ sys/sys/syscall.h | 3 ++- sys/sys/syscall.mk | 3 ++- sys/sys/sysproto.h | 5 +++++ 10 files changed, 59 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 4e055a27f3c6..604a41ad80ed 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -501,4 +501,5 @@ #define FREEBSD32_SYS_fspacectl 580 #define FREEBSD32_SYS_sched_getcpu 581 #define FREEBSD32_SYS_swapoff 582 -#define FREEBSD32_SYS_MAXSYSCALL 583 +#define FREEBSD32_SYS_kqueue1 583 +#define FREEBSD32_SYS_MAXSYSCALL 584 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index d52c197b8f26..512cee44bfd8 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -589,4 +589,5 @@ const char *freebsd32_syscallnames[] = { "fspacectl", /* 580 = fspacectl */ "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ + "kqueue1", /* 583 = kqueue1 */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index ee9630ff3783..172138cc3d99 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -645,4 +645,5 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(fspacectl_args), .sy_call = (sy_call_t *)sys_fspacectl, .sy_auevent = AUE_FSPACECTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 580 = fspacectl */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sched_getcpu, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 581 = sched_getcpu */ { .sy_narg = AS(swapoff_args), .sy_call = (sy_call_t *)sys_swapoff, .sy_auevent = AUE_SWAPOFF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 582 = swapoff */ + { .sy_narg = AS(kqueue1_args), .sy_call = (sy_call_t *)sys_kqueue1, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueue1 */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 92ea09104a26..0436fc807ea2 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3321,6 +3321,13 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } + /* kqueue1 */ + case 583: { + struct kqueue1_args *p = params; + uarg[a++] = p->flags; /* u_int */ + *n_args = 1; + break; + } default: *n_args = 0; break; @@ -8964,6 +8971,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* kqueue1 */ + case 583: + switch (ndx) { + case 0: + p = "u_int"; + break; + default: + break; + }; + break; default: break; }; @@ -10822,6 +10839,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* kqueue1 */ + case 583: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 392fe231604e..6d0db175ecd2 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -644,4 +644,5 @@ struct sysent sysent[] = { { .sy_narg = AS(fspacectl_args), .sy_call = (sy_call_t *)sys_fspacectl, .sy_auevent = AUE_FSPACECTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 580 = fspacectl */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sched_getcpu, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 581 = sched_getcpu */ { .sy_narg = AS(swapoff_args), .sy_call = (sy_call_t *)sys_swapoff, .sy_auevent = AUE_SWAPOFF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 582 = swapoff */ + { .sy_narg = AS(kqueue1_args), .sy_call = (sy_call_t *)sys_kqueue1, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueue1 */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index aa4792ccff8a..88b6dfe2f602 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -589,4 +589,5 @@ const char *syscallnames[] = { "fspacectl", /* 580 = fspacectl */ "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ + "kqueue1", /* 583 = kqueue1 */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 8464a214548c..a278632e1d79 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3417,6 +3417,13 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } + /* kqueue1 */ + case 583: { + struct kqueue1_args *p = params; + uarg[a++] = p->flags; /* u_int */ + *n_args = 1; + break; + } default: *n_args = 0; break; @@ -9134,6 +9141,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* kqueue1 */ + case 583: + switch (ndx) { + case 0: + p = "u_int"; + break; + default: + break; + }; + break; default: break; }; @@ -11087,6 +11104,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* kqueue1 */ + case 583: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 081437449b70..2378497a96c0 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -520,4 +520,5 @@ #define SYS_fspacectl 580 #define SYS_sched_getcpu 581 #define SYS_swapoff 582 -#define SYS_MAXSYSCALL 583 +#define SYS_kqueue1 583 +#define SYS_MAXSYSCALL 584 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 56518e94d30d..10093a5f4942 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -425,4 +425,5 @@ MIASM = \ aio_readv.o \ fspacectl.o \ sched_getcpu.o \ - swapoff.o + swapoff.o \ + kqueue1.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index e062eaf8c0e6..e3c7b473258a 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1855,6 +1855,9 @@ struct swapoff_args { char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)]; char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; }; +struct kqueue1_args { + char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; +}; int sys_exit(struct thread *, struct exit_args *); int sys_fork(struct thread *, struct fork_args *); int sys_read(struct thread *, struct read_args *); @@ -2250,6 +2253,7 @@ int sys_aio_readv(struct thread *, struct aio_readv_args *); int sys_fspacectl(struct thread *, struct fspacectl_args *); int sys_sched_getcpu(struct thread *, struct sched_getcpu_args *); int sys_swapoff(struct thread *, struct swapoff_args *); +int sys_kqueue1(struct thread *, struct kqueue1_args *); #ifdef COMPAT_43 @@ -3219,6 +3223,7 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #define SYS_AUE_fspacectl AUE_FSPACECTL #define SYS_AUE_sched_getcpu AUE_NULL #define SYS_AUE_swapoff AUE_SWAPOFF +#define SYS_AUE_kqueue1 AUE_KQUEUE #undef PAD_ #undef PADL_ From nobody Mon Mar 27 23:45: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 4PlqF56rBqz42G2B; Mon, 27 Mar 2023 23:45:29 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-vs1-f46.google.com (mail-vs1-f46.google.com [209.85.217.46]) (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 4PlqF54xFHz44jr; Mon, 27 Mar 2023 23:45:29 +0000 (UTC) (envelope-from asomers@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-vs1-f46.google.com with SMTP id g17so8954918vst.10; Mon, 27 Mar 2023 16:45:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679960728; 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=olf9BYBVMOQ2Kj5SWDYxfRLyT6Y89s4V3AoWUo2nn2I=; b=T+a45eEbrnKkMRCFl3YkfM0uHRdE+n667PCVOPouZRLj/fXjzeuvboCJWOW4FlagrX wZRgb22ybAo/w2OPRF5dZCpJed4hm4OPZFysQ5OO4/mdgy3HuqRf8iw/NkfV+g9vGNVk HhmijBQxtUwnq+yKm1EZBFesZqTt6l9Pb+MTzHzRRpWVTlmiUBkeMe0SWRG3S8L4KZI1 vYIgAin0bu8EWHxufjNAC84Q1Kqf29wl+KI/ApWndFKN2K4PznGOKBz3myDLzKzrZ3Vg WkEzv9GbJXr2CV4ERfCUulo/bXmeFpRx7oYtGe8qIo3eSXEW6muZF+yVZEXXg4wEqbj2 gLDA== X-Gm-Message-State: AAQBX9fNGt75KaQEgxEVXCbgwojRSEi6022VBL81aF3ZOrSrXHHahpxu TL+gY6zhK4UMIn1w3zPS40Wa2fNqGsW7hYcoCWfdzDDb X-Google-Smtp-Source: AKy350apVYVye66uQBW3q9rMo4v1JEtfX37a/UCQCCFAWaLMhBwalIQncksbUOm4i5Uv1sfC8LEfi5xYJHnc9E+A0e8= X-Received: by 2002:a67:c11a:0:b0:425:d6a1:1738 with SMTP id d26-20020a67c11a000000b00425d6a11738mr6723837vsj.4.1679960728581; Mon, 27 Mar 2023 16:45:28 -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: <202303272339.32RNdWPD063667@gitrepo.freebsd.org> In-Reply-To: <202303272339.32RNdWPD063667@gitrepo.freebsd.org> From: Alan Somers Date: Mon, 27 Mar 2023 16:45:17 -0700 Message-ID: Subject: Re: git: 61194e9852e6 - main - Add kqueue1() syscall To: Konstantin Belousov 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: 4PlqF54xFHz44jr X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Mon, Mar 27, 2023 at 4:39=E2=80=AFPM Konstantin Belousov wrote: > > The branch main has been updated by kib: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D61194e9852e641d1533cd04a56= 79d6042ff975d3 > > commit 61194e9852e641d1533cd04a5679d6042ff975d3 > Author: Konstantin Belousov > AuthorDate: 2023-03-25 23:39:02 +0000 > Commit: Konstantin Belousov > CommitDate: 2023-03-27 23:39:26 +0000 > > Add kqueue1() syscall > > It takes the flags argument. Immediate use is to provide the KQUEUE_= CLOEXEC > flag for kqueue(2). > > Reviewed by: emaste, jhb > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D39271 We already have abort2(2), dup2(2), pipe2(2), and thr_kill2(2) that are similar to other syscalls but with a flags argument. Additionally, Linux has a renameat(2). But I'm not aware of any syscalls named xxx1. Should we call this new one kqueue2 to follow the existing convention? -Alan From nobody Mon Mar 27 23:47: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 4PlqHC31QYz42GG6; Mon, 27 Mar 2023 23: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 4PlqHC2W80z45CC; Mon, 27 Mar 2023 23: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=1679960839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tX98V3d+YYt0n6zyua9bjYGHL4up4KfvEXiubmFEyT4=; b=yTT3P3Inv5xoDxYNSWyHN7iuvKlaae515Rmgvy3Seby1stHcRNnlF1tg0GUNT0nY4V2Swe TtEWn4HegoQzSS5SymctKOIEXLUcqAegd7naKf50loWC31K3yqBgpYOJRuTXATFXg1IDCY nnP0ggjlG32OFUqjFnSF8VYGI0gnNH4To/6C+51W/fp3s5mSJ6HFQK2ZLwHIcUHq7iP4O6 eCY9Wy4tgseMLqculmiZIRF8yScXzMjW4oFlGxlGbRl/a5ZL//hiT92uZictdmb+CUyH/7 GWe7QtkMq7/PTbaKb75jRH55uTRJEHHoPfjg8qzSmwp6iAv/Bf0vbQOaJcX7iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679960839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tX98V3d+YYt0n6zyua9bjYGHL4up4KfvEXiubmFEyT4=; b=nlhS9ENM2hMot7xfsQ7Lo5Mf2dpZEkz2YoTdq1Pbd72T0hEJo/HcnS9KBtt8+ViGatb3He 9ymABkndZ86nM8EMqmmvlJbeRHhJlk+DKCQ+lAx0qagH1VlPghHaJ9rXTyiiivB16CxCuh 9dY66kvU+o+5wKK7+NHYpD0jG1syVKQ2Q4tuEZWr54jjdLnxXTKeXaIV4GgRQyVNEHiTr6 K8lEX5v1XXIZq3KnJ53GuG0s1NSl85pxGjJvhGRd2s42TI0PXU+xIT/LvQ4AY+i6wmIW44 952TOchoDOaNwt9SyTiIzGmu2yOZjnT8EOpPdhQPY/5cECPnFl+MWfgv+as1ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679960839; a=rsa-sha256; cv=none; b=y0u/Dbrm9wLK4PzNLpq3REGEYS1CRqpFd5na6qNyTlLUGwigg2Ogu0jESGRUj4SoR7J/zW jpEXSXp85G0nOT7zolDvk+M7US6er9Ydij612Vz/3VSFw3TDiLZd1Lr2sGJ/+NGCtgS1Hn rYz+vdgAty0p4EeI58w22HZrm/OQ5IWnacPRa7Sr3BV4Lb73D2xhHJqRBmxmJ1o5564XmK 6wV9PAzGN/hwN0ZS1a58NIny+FXE5sYHFil6wLKwMsJH+3xPohf33RGxsTCoKC9IjjKjEO 9/ZuPyJl4li5htBIvYE9Wx+IEqnem5FkB8FshGlFTdsLlt7dyQgKGI+D4/Wwyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlqHC1Zt6zhrL; Mon, 27 Mar 2023 23:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RNlJVF080196; Mon, 27 Mar 2023 23:47:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RNlJVI080195; Mon, 27 Mar 2023 23:47:19 GMT (envelope-from git) Date: Mon, 27 Mar 2023 23:47:19 GMT Message-Id: <202303272347.32RNlJVI080195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 4660b60a00c3 - stable/13 - Updates to UFS/FFS superblock integrity checks when reading a superblock. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4660b60a00c3120ddecd94b3f308d39bcb6d085a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=4660b60a00c3120ddecd94b3f308d39bcb6d085a commit 4660b60a00c3120ddecd94b3f308d39bcb6d085a Author: Kirk McKusick AuthorDate: 2023-03-27 23:45:59 +0000 Commit: Kirk McKusick CommitDate: 2023-03-27 23:46:40 +0000 Updates to UFS/FFS superblock integrity checks when reading a superblock. Have to add a check that the computed cylinder group size does not exceed the block size of the filesystem. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38668 (cherry picked from commit 0eabe33087d8cb69ae800daae322f12a8f16bd10) --- sys/ufs/ffs/ffs_subr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index d847373a8cde..2f69965aba7e 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -446,6 +446,7 @@ validate_sblock(struct fs *fs, int isaltsblk) CHK(fs->fs_old_cgoffset, <, 0, %jd); CHK2(fs->fs_old_cgoffset, >, 0, ~fs->fs_old_cgmask, <, 0, %jd); CHK(fs->fs_old_cgoffset * (~fs->fs_old_cgmask), >, fs->fs_fpg, %jd); + CHK(CGSIZE(fs), >, fs->fs_bsize, %jd); /* * If anything has failed up to this point, it is usafe to proceed * as checks below may divide by zero or make other fatal calculations. From nobody Mon Mar 27 23:54: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 4PlqRg4x3rz42GMt; Mon, 27 Mar 2023 23:54: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 4PlqRg4NwWz45xH; Mon, 27 Mar 2023 23:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679961279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GTU7CLl70cSBFaPR8sIvzUD5xjtFf50zVHFN9bdHXZM=; b=CGySmuV9VOOpvKSDzno2NrhMbGiADk2U9X+Y4AVWyU1AZX4B0p33Anobw1pv08bGg1dVS6 4E8UreuAPdPYx9nESsLHOGiMZqYjJWmrXFnqfIW2bTfzQenPF5F4W7lh55YQ9IyJfhQ78i 8OgFNsgh9Bc/g8ObBHNsMXL1MPA75BVUpn6kerOXkxZnB+3qfX253/E30aCMBQaAx51MmF 1imOMWIbUes2hb/QPJw99u1L+usIsgw5T2ZUxFJ7blrsiuDe0hJ9cCghY4V+Z4zKS02jAc I6+FRuMiUFyUIZZ8ZKkUxAq5d6RRjkT34UFaUdw7eL1+2qIgLshV9LX1wZ/Now== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679961279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GTU7CLl70cSBFaPR8sIvzUD5xjtFf50zVHFN9bdHXZM=; b=jKyW9naJzGFlJdjv6L+qfk0H/kF1NLvVDY+gucSPjXui0ITznrnSMmMb/YV+ZJflCJZGOz A0AtpLCS8NWplsJKC5i7F2l4fTDJHdJtyJxic7FH6h+b4BSfjN//oKoevCFXiPVc7WcEMv 8q+ZnOmiSuXkGEldVCv+/z0F5WLCbMHobfa+W1FRO5rzsXrWFdjQgfX55LgjdwT313g3BE m9P3E9Rr12zN2PegFcNB/FWQeIXMIHpwTeffauG3u7jhGlFRI1VP0UDAud1ySqoa59q/ds 3O9UPs8mLqmaPd0sLje9okKySZeZVsonHg05YJXI0AZoynj1YLYlIgNEMFDngA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679961279; a=rsa-sha256; cv=none; b=jevc4uc1vqaWvAF0opdaoglHgQYcyZcFaC3aAbntxeZ+twZBZHv8jcO0pDPAaA7nphXhMX 9h0o+6iAHWbH//qKKGUZ99IBOaD8aTGOKwXKgF9F53sYqP1prDx0QvYsmFSzWHc+J4OKkw 1PZMAuVsdVCP19dzmDNuIsjt+vsVvEgJnrvE+tEO+8tRDgl+PmvboHg7y/SwghcSZl51pB 0+yc0rQvuN7JUgUWNnHt4AkVUJxsPFk47Z+JzBeWxUmfgcElO6laBCWtlAGSZTQsgjSxKg 3pksBasyAJhNOuQ/z8QgpA8X/io4qEOeAc7qselMAWzGq4OXCY3C/2f4j3ZOVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlqRg3SFCzjBR; Mon, 27 Mar 2023 23:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RNsdF6095766; Mon, 27 Mar 2023 23:54:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RNsdQ8095765; Mon, 27 Mar 2023 23:54:39 GMT (envelope-from git) Date: Mon, 27 Mar 2023 23:54:39 GMT Message-Id: <202303272354.32RNsdQ8095765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 1512579adcf3 - main - nfscl: Make coverity happy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1512579adcf3a2dee3f13efd702204c1390ccea7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=1512579adcf3a2dee3f13efd702204c1390ccea7 commit 1512579adcf3a2dee3f13efd702204c1390ccea7 Author: Rick Macklem AuthorDate: 2023-03-27 23:53:30 +0000 Commit: Rick Macklem CommitDate: 2023-03-27 23:53:30 +0000 nfscl: Make coverity happy Coverity does not like code that checks a function's return value sometimes. Add "(void)" in front of the function when the return value does not matter to try and make it happy. Reported by: emaste MFC after: 3 months --- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- sys/fs/nfsclient/nfs_clvnops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 559bf8646625..9a8e7436f620 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -9245,7 +9245,7 @@ nfscl_statfs(struct vnode *vp, struct ucred *cred, NFSPROC_T *td) error = nfsrpc_statfs(vp, &sb, &fs, &lease, cred, td, &nfsva, &attrflag); if (attrflag != 0) - nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); + (void) nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); if (error == 0) { NFSLOCKCLSTATE(); if (nmp->nm_clp != NULL) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 39409852e86f..ea493e668dc2 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -4542,7 +4542,7 @@ nfs_pathconf(struct vop_pathconf_args *ap) NFSV4CONTENT_HOLE, td->td_ucred, &nfsva, &attrflag); if (attrflag != 0) - nfscl_loadattrcache(&vp, &nfsva, + (void) nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); mtx_lock(&nmp->nm_mtx); if (error == NFSERR_NOTSUPP) From nobody Tue Mar 28 00:07: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 4Plqkm5nn8z42H4q for ; Tue, 28 Mar 2023 00:07:44 +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 4Plqkm3vHnz4712 for ; Tue, 28 Mar 2023 00:07:44 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f43.google.com with SMTP id t17-20020a05600c451100b003edc906aeeaso70537wmo.1 for ; Mon, 27 Mar 2023 17:07:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679962063; 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=t0Dc1Fg4Bm5RRvIbfTmuvdHPG9Pxu+X5x1kSo4TSja4=; b=mfX8fxns1oylmkh9/P4UqWAMuwoYv0vFkt77RoZlH+ojw+6EL5XPnpTr2l43+omSyI eVMesW9lSyGQuNdMpDD//+hKCCIpCbctiQ0ErEPOnIw+cegIA1ZqYTn6a0DE8BY/Qnck 2KjtmQviKV5D1oVQxwTmx9JIKRM4D/XcgQjSlKEpwAqvsFQHST7qPB3lUbQb1XADv31j 3z0CQW619o+N04i/0kt+NmUgLB7vFzziCexZtTAIFubmbqPgIOhxeuvpKS7ol9Jm+E68 HrNAdeo7RQ13ijo5fAxrXNhELjcsUDzN328BG2cNr4EDB8TFq49mTTODDpyRkitBv3uc vQ7g== X-Gm-Message-State: AO0yUKUfA6u2Fgf4fYyeNXdAPWjMpw9dDo32jeU/wvsHL4J+2jX9Nqy8 OtWXrsG4qKUbPQNNNH1mDXDWNg== X-Google-Smtp-Source: AK7set8NFsM2RFwz+gdbUNIUc5LMOlx39KBnVgkshlTMiR5Wjs2m1cTstP6N6g7K9Puihg9N/JVgJQ== X-Received: by 2002:a7b:c448:0:b0:3ef:294c:de50 with SMTP id l8-20020a7bc448000000b003ef294cde50mr10885248wmi.29.1679962062903; Mon, 27 Mar 2023 17:07:42 -0700 (PDT) Received: from smtpclient.apple (global-5-144.n-2.net.cam.ac.uk. [131.111.5.144]) by smtp.gmail.com with ESMTPSA id m1-20020a05600c4f4100b003ee1e07a14asm10402122wmq.45.2023.03.27.17.07.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2023 17:07:42 -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 \(3696.120.41.1.1\)) Subject: Re: git: 61194e9852e6 - main - Add kqueue1() syscall From: Jessica Clarke In-Reply-To: Date: Tue, 28 Mar 2023 01:07:41 +0100 Cc: Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <930C69C9-64E3-4399-BE35-ABB137F06EC2@freebsd.org> References: <202303272339.32RNdWPD063667@gitrepo.freebsd.org> To: Alan Somers X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Rspamd-Queue-Id: 4Plqkm3vHnz4712 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 28 Mar 2023, at 00:45, Alan Somers wrote: >=20 > On Mon, Mar 27, 2023 at 4:39=E2=80=AFPM Konstantin Belousov = wrote: >>=20 >> The branch main has been updated by kib: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D61194e9852e641d1533cd04a5679d604= 2ff975d3 >>=20 >> commit 61194e9852e641d1533cd04a5679d6042ff975d3 >> Author: Konstantin Belousov >> AuthorDate: 2023-03-25 23:39:02 +0000 >> Commit: Konstantin Belousov >> CommitDate: 2023-03-27 23:39:26 +0000 >>=20 >> Add kqueue1() syscall >>=20 >> It takes the flags argument. Immediate use is to provide the = KQUEUE_CLOEXEC >> flag for kqueue(2). >>=20 >> Reviewed by: emaste, jhb >> Sponsored by: The FreeBSD Foundation >> MFC after: 1 week >> Differential revision: https://reviews.freebsd.org/D39271 >=20 > We already have abort2(2), dup2(2), pipe2(2), and thr_kill2(2) that > are similar to other syscalls but with a flags argument. > Additionally, Linux has a renameat(2). But I'm not aware of any > syscalls named xxx1. Should we call this new one kqueue2 to follow > the existing convention? This was discussed on the linked review. Jess From nobody Tue Mar 28 00:26: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 4Plr8J1sfjz42JW8; Tue, 28 Mar 2023 00:26: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 4Plr8J1c5Nz488Y; Tue, 28 Mar 2023 00:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679963184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9bRnVq39b5heGxYX7PFTWRdVWuX9xg/ETslfuDItoq0=; b=da+WetwigLvECuG8JrMaTgCdB0psNWrFFYIsbQ1hO89k2M2/XJH3r5gAGR9tfcRSNBipKz kueiiOtQUMx2Vf5ZU3WoV5xkEaYcGs2n8P9PyBkAtY7CaS8IzK/yHQRLGxetGKg5VjvkBx 7vA2WbuMfm9o0BdMGHJNStHrtK9mIZWiFfPvktNH4i1oqdkbusjtfA7q84MfgusX76UhCM vd8DlblUFyyOwncgBv7rkKPrJPYw+q0QfTDqLDYWz2jPFhJ+PEhnhx8koEzbucXNLTbbEK yHIthZJFwTmbYM2uLvnAO6T4HODKIVkTIUdoTbi0nbvhDMnEvDyV3y3jBlWFYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679963184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9bRnVq39b5heGxYX7PFTWRdVWuX9xg/ETslfuDItoq0=; b=rWm7Dx2xrldQWPzDKSRYlCoLPcVWoM+ulLrlrXx0nJQDykqTwami7PYoC0JUMaL+32Tugm 3jGvn7A8gLwrHOn5pPA+EdyPbvaZY6OQH06nQNrAcEREXwOGJn7VzLQ6GuxeU+DSfNCkgU 6AWNkc8GHBRlsNDgN4xO+rhjoffmN/cAMzrBzj7stBcqkq46+UrNamhMdUy1kmCjnhRB3U ivFQmFXkFX5/wSm6NsPmOGOds8BtsSxPol+fSVbO/nBIWDkTZsyJd2Pd0hntOrrFxBFpyZ mGGQ0IbwsN5IpeL/4pIPS6BD/XQli2qcMDrWE2rL7Op8UZ8/1JhhI9gYtge8DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679963184; a=rsa-sha256; cv=none; b=b84vloXdK4HFiKcPYOpMslQNV9ndiiWZsI2LV5TtG0sGdNIDMcsIAtcI9lYPx4CVTTVYbg b0YCJLjWZWgXpP+L/XJ4uDy5FEm82x5laerSIwRPWdi/hRiLNWTc17a1TEFu+yTj5P05F5 9Y+ZBMQ9PXHtoXvKeTS6uPVBTAKNh/pFJFf3bQmrvbob+NbVighQL4GnXFUv72dnStOBVD 9vhXlknhBqcC/eKA0NxBqbYJWIGzV/FtL22UPWX73vgkZ8zzWT/i7YzDcmJqcVAOZOwWXG 1MINgTnfsKXW5NDCv1YdnG2/CECKNuyLyfXujMCFsZuMIkCk8Rvy7UBmntOxjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Plr8J0fNrzjDB; Tue, 28 Mar 2023 00:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32S0QOuX046084; Tue, 28 Mar 2023 00:26:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S0QOZo046083; Tue, 28 Mar 2023 00:26:24 GMT (envelope-from git) Date: Tue, 28 Mar 2023 00:26:24 GMT Message-Id: <202303280026.32S0QOZo046083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: a0cd0329512f - stable/13 - Correct several bugs in fsck_ffs(8) triggered by corrupted filesystems. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a0cd0329512fe5fadeab745f2d1bae236e3e4aca Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=a0cd0329512fe5fadeab745f2d1bae236e3e4aca commit a0cd0329512fe5fadeab745f2d1bae236e3e4aca Author: Kirk McKusick AuthorDate: 2023-03-07 23:12:37 +0000 Commit: Kirk McKusick CommitDate: 2023-03-28 00:05:10 +0000 Correct several bugs in fsck_ffs(8) triggered by corrupted filesystems. If a directory entry has an illegal inode number (less than zero or greater than the last inode in the filesystem) the entry is removed. If a directory '.' or '..' entry had an illegal inode number they were being removed. Since fsck_ffs knows what the correct value is for these two entries fix them rather deleting them. Add much more extensive cylinder group checks and use them to be more careful about rebuilding a cylinder group. Check for out-of-range block numbers before trying to free them. When a directory is deleted also remove its cache entry created in pass1 so that later passes do not try to operate on a deleted directory. Check for ctime(3) returning NULL before trying to use its return. When freeing a directory inode, do not try to interpret it as a directory. Reserve space in the inostatlist to have room to allocate a lost+found directory. If an invalid block number is found past the end of an inode simply remove it rather than clearing and removing the inode. Modernize the inoinfo structure to use queue(3) LIST rather than a handrolled linked list implementation. Reported by: Bob Prohaska, John-Mark Gurney, and Mark Millard Tested by: Peter Holm Reviewed by: Peter Holm Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38668 (cherry picked from commit 52f9710412ee6a5bfacae125e24399634d71288d) --- sbin/fsck_ffs/dir.c | 25 +++++++++--------- sbin/fsck_ffs/fsck.h | 10 ++++--- sbin/fsck_ffs/fsutil.c | 71 +++++++++++++++++++++++++++++++++++--------------- sbin/fsck_ffs/inode.c | 63 ++++++++++++++++++++++++++++++++------------ sbin/fsck_ffs/pass1.c | 47 +++++++++++++++++++++------------ sbin/fsck_ffs/pass2.c | 18 ++++++++++--- sbin/fsck_ffs/setup.c | 19 +++++++------- sbin/fsck_ffs/suj.c | 2 ++ 8 files changed, 174 insertions(+), 81 deletions(-) diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index d09e6940f812..18229ab96fb6 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -63,7 +63,6 @@ static struct dirtemplate dirhead = { static int chgino(struct inodesc *); static int dircheck(struct inodesc *, struct bufarea *, struct direct *); static int expanddir(struct inode *ip, char *name); -static void freedir(ino_t ino, ino_t parent); static struct direct *fsck_readdir(struct inodesc *); static struct bufarea *getdirblk(ufs2_daddr_t blkno, long size); static int lftempname(char *bufp, ino_t ino); @@ -517,7 +516,7 @@ linkup(ino_t orphan, ino_t parentdir, char *name) if (preen) printf(" (CREATED)\n"); } else { - freedir(lfdir, UFS_ROOTINO); + freedirino(lfdir, UFS_ROOTINO); lfdir = 0; if (preen) printf("\n"); @@ -583,8 +582,7 @@ linkup(ino_t orphan, ino_t parentdir, char *name) inoinfo(lfdir)->ino_linkcnt++; pwarn("DIR I=%lu CONNECTED. ", (u_long)orphan); inp = getinoinfo(parentdir); - if (parentdir != (ino_t)-1 && inp != NULL && - (inp->i_flags & INFO_NEW) == 0) { + if (parentdir != (ino_t)-1 && inp != NULL) { printf("PARENT WAS I=%lu\n", (u_long)parentdir); /* * If the parent directory did not have to @@ -594,7 +592,8 @@ linkup(ino_t orphan, ino_t parentdir, char *name) * fixes the parent link count so that fsck does * not need to be rerun. */ - inoinfo(parentdir)->ino_linkcnt++; + if ((inp->i_flags & INFO_NEW) != 0) + inoinfo(parentdir)->ino_linkcnt++; } if (preen == 0) printf("\n"); @@ -837,13 +836,12 @@ allocdir(ino_t parent, ino_t request, int mode) DIP_SET(dp, di_nlink, 2); inodirty(&ip); if (ino == UFS_ROOTINO) { - inoinfo(ino)->ino_linkcnt = DIP(dp, di_nlink); - if ((inp = getinoinfo(ino)) == NULL) - inp = cacheino(dp, ino); - else - inp->i_flags = INFO_NEW; + inp = cacheino(dp, ino); inp->i_parent = parent; inp->i_dotdot = parent; + inp->i_flags |= INFO_NEW; + inoinfo(ino)->ino_type = DT_DIR; + inoinfo(ino)->ino_linkcnt = DIP(dp, di_nlink); irelse(&ip); return(ino); } @@ -855,6 +853,8 @@ allocdir(ino_t parent, ino_t request, int mode) inp = cacheino(dp, ino); inp->i_parent = parent; inp->i_dotdot = parent; + inp->i_flags |= INFO_NEW; + inoinfo(ino)->ino_type = DT_DIR; inoinfo(ino)->ino_state = inoinfo(parent)->ino_state; if (inoinfo(ino)->ino_state == DSTATE) { inoinfo(ino)->ino_linkcnt = DIP(dp, di_nlink); @@ -872,8 +872,8 @@ allocdir(ino_t parent, ino_t request, int mode) /* * free a directory inode */ -static void -freedir(ino_t ino, ino_t parent) +void +freedirino(ino_t ino, ino_t parent) { struct inode ip; union dinode *dp; @@ -885,6 +885,7 @@ freedir(ino_t ino, ino_t parent) inodirty(&ip); irelse(&ip); } + removecachedino(ino); freeino(ino); } diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index c70febdd4e80..94ec59004b86 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -303,8 +303,8 @@ extern struct dups *muldup; /* end of unique duplicate dup block numbers */ /* * Inode cache data structures. */ -extern struct inoinfo { - struct inoinfo *i_nexthash; /* next entry in hash chain */ +struct inoinfo { + SLIST_ENTRY(inoinfo) i_hash; /* hash list */ ino_t i_number; /* inode number of this entry */ ino_t i_parent; /* inode number of parent */ ino_t i_dotdot; /* inode number of `..' */ @@ -312,7 +312,9 @@ extern struct inoinfo { u_int i_flags; /* flags, see below */ u_int i_numblks; /* size of block array in bytes */ ufs2_daddr_t i_blks[1]; /* actually longer */ -} **inphead, **inpsort; +}; +extern SLIST_HEAD(inohash, inoinfo) *inphash; +extern struct inoinfo **inpsort; /* * flags for struct inoinfo */ @@ -481,6 +483,7 @@ int findino(struct inodesc *); int findname(struct inodesc *); void flush(int fd, struct bufarea *bp); int freeblock(struct inodesc *); +void freedirino(ino_t ino, ino_t parent); void freeino(ino_t ino); void freeinodebuf(void); void fsckinit(void); @@ -518,6 +521,7 @@ void prtbuf(struct bufarea *, const char *, ...) __printflike(2, 3); void prtinode(struct inode *); void pwarn(const char *fmt, ...) __printflike(1, 2); int readsb(int listerr); +int removecachedino(ino_t); int reply(const char *question); void rwerror(const char *mesg, ufs2_daddr_t blk); void sblock_init(void); diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 277d50f87fb7..d8842e7d41f2 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -165,7 +165,7 @@ reply(const char *question) struct inostat * inoinfo(ino_t inum) { - static struct inostat unallocated = { USTATE, 0, 0 }; + static struct inostat unallocated = { USTATE, 0, 0, 0 }; struct inostatlist *ilp; int iloff; @@ -612,8 +612,7 @@ void ckfini(int markclean) { struct bufarea *bp, *nbp; - struct inoinfo *inp, *ninp; - int ofsmodified, cnt, cg, i; + int ofsmodified, cnt, cg; if (bkgrdflag) { unlink(snapname); @@ -781,19 +780,7 @@ ckfini(int markclean) free(inostathead); } inostathead = NULL; - if (inpsort != NULL) - free(inpsort); - inpsort = NULL; - if (inphead != NULL) { - for (i = 0; i < dirhash; i++) { - for (inp = inphead[i]; inp != NULL; inp = ninp) { - ninp = inp->i_nexthash; - free(inp); - } - } - free(inphead); - } - inphead = NULL; + inocleanup(); finalIOstats(); (void)close(fsreadfd); (void)close(fswritefd); @@ -1014,6 +1001,7 @@ check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild) struct cg *cgp = cgbp->b_un.b_cg; uint32_t cghash, calchash; static int prevfailcg = -1; + long start; int error; /* @@ -1039,6 +1027,43 @@ check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild) CHK(cgp->cg_niblk, !=, sblock.fs_ipg, "%jd"); CHK(cgp->cg_initediblk, >, sblock.fs_ipg, "%jd"); } + if (cgbase(&sblock, cg) + sblock.fs_fpg < sblock.fs_size) { + CHK(cgp->cg_ndblk, !=, sblock.fs_fpg, "%jd"); + } else { + CHK(cgp->cg_ndblk, !=, sblock.fs_size - cgbase(&sblock, cg), + "%jd"); + } + start = &cgp->cg_space[0] - (u_char *)(&cgp->cg_firstfield); + if (sblock.fs_magic == FS_UFS2_MAGIC) { + CHK(cgp->cg_iusedoff, !=, start, "%jd"); + } else if (sblock.fs_magic == FS_UFS1_MAGIC) { + CHK(cgp->cg_niblk, !=, 0, "%jd"); + CHK(cgp->cg_initediblk, !=, 0, "%jd"); + CHK(cgp->cg_old_ncyl, !=, sblock.fs_old_cpg, "%jd"); + CHK(cgp->cg_old_niblk, !=, sblock.fs_ipg, "%jd"); + CHK(cgp->cg_old_btotoff, !=, start, "%jd"); + CHK(cgp->cg_old_boff, !=, cgp->cg_old_btotoff + + sblock.fs_old_cpg * sizeof(int32_t), "%jd"); + CHK(cgp->cg_iusedoff, !=, cgp->cg_old_boff + + sblock.fs_old_cpg * sizeof(u_int16_t), "%jd"); + } + CHK(cgp->cg_freeoff, !=, + cgp->cg_iusedoff + howmany(sblock.fs_ipg, CHAR_BIT), "%jd"); + if (sblock.fs_contigsumsize == 0) { + CHK(cgp->cg_nextfreeoff, !=, + cgp->cg_freeoff + howmany(sblock.fs_fpg, CHAR_BIT), "%jd"); + } else { + CHK(cgp->cg_nclusterblks, !=, cgp->cg_ndblk / sblock.fs_frag, + "%jd"); + CHK(cgp->cg_clustersumoff, !=, + roundup(cgp->cg_freeoff + howmany(sblock.fs_fpg, CHAR_BIT), + sizeof(u_int32_t)) - sizeof(u_int32_t), "%jd"); + CHK(cgp->cg_clusteroff, !=, cgp->cg_clustersumoff + + (sblock.fs_contigsumsize + 1) * sizeof(u_int32_t), "%jd"); + CHK(cgp->cg_nextfreeoff, !=, cgp->cg_clusteroff + + howmany(fragstoblks(&sblock, sblock.fs_fpg), CHAR_BIT), + "%jd"); + } if (error == 0) return (1); if (prevfailcg == cg) @@ -1067,13 +1092,15 @@ check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild) cgp->cg_ndblk = sblock.fs_fpg; else cgp->cg_ndblk = sblock.fs_size - cgbase(&sblock, cg); - cgp->cg_iusedoff = &cgp->cg_space[0] - (u_char *)(&cgp->cg_firstfield); - if (sblock.fs_magic == FS_UFS1_MAGIC) { + start = &cgp->cg_space[0] - (u_char *)(&cgp->cg_firstfield); + if (sblock.fs_magic == FS_UFS2_MAGIC) { + cgp->cg_iusedoff = start; + } else if (sblock.fs_magic == FS_UFS1_MAGIC) { cgp->cg_niblk = 0; cgp->cg_initediblk = 0; cgp->cg_old_ncyl = sblock.fs_old_cpg; cgp->cg_old_niblk = sblock.fs_ipg; - cgp->cg_old_btotoff = cgp->cg_iusedoff; + cgp->cg_old_btotoff = start; cgp->cg_old_boff = cgp->cg_old_btotoff + sblock.fs_old_cpg * sizeof(int32_t); cgp->cg_iusedoff = cgp->cg_old_boff + @@ -1111,7 +1138,7 @@ allocblk(long startcg, long frags, } if (frags <= 0 || frags > sblock.fs_frag) return (0); - for (blkno = cgdata(&sblock, startcg); + for (blkno = MAX(cgdata(&sblock, startcg), 0); blkno < maxfsblock - sblock.fs_frag; blkno += sblock.fs_frag) { if ((newblk = (*checkblkavail)(blkno, frags)) == 0) @@ -1121,7 +1148,7 @@ allocblk(long startcg, long frags, if (newblk < 0) blkno = -newblk; } - for (blkno = cgdata(&sblock, 0); + for (blkno = MAX(cgdata(&sblock, 0), 0); blkno < cgbase(&sblock, startcg) - sblock.fs_frag; blkno += sblock.fs_frag) { if ((newblk = (*checkblkavail)(blkno, frags)) == 0) @@ -1144,6 +1171,8 @@ std_checkblkavail(blkno, frags) ufs2_daddr_t j, k, baseblk; long cg; + if ((u_int64_t)blkno > sblock.fs_size) + return (0); for (j = 0; j <= sblock.fs_frag - frags; j++) { if (testbmap(blkno + j)) continue; diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 82338f4f8c08..057d49a1ea18 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -661,9 +661,8 @@ freeblock(struct inodesc *idesc) struct bufarea *cgbp; struct cg *cgp; ufs2_daddr_t blkno; - long size, nfrags, res; + long size, nfrags; - res = KEEPON; blkno = idesc->id_blkno; if (idesc->id_type == SNAP) { pfatal("clearing a snapshot dinode\n"); @@ -672,10 +671,10 @@ freeblock(struct inodesc *idesc) size = lfragtosize(&sblock, idesc->id_numfrags); if (snapblkfree(&sblock, blkno, size, idesc->id_number, std_checkblkavail)) - return (res); + return (KEEPON); for (nfrags = idesc->id_numfrags; nfrags > 0; blkno++, nfrags--) { if (chkrange(blkno, 1)) { - res = SKIP; + return (SKIP); } else if (testbmap(blkno)) { for (dlp = duplist; dlp; dlp = dlp->next) { if (dlp->dup != blkno) @@ -704,7 +703,7 @@ freeblock(struct inodesc *idesc) cgp->cg_cs.cs_nffree += idesc->id_numfrags; cgdirty(cgbp); } - return (res); + return (KEEPON); } /* @@ -1122,7 +1121,7 @@ freeinodebuf(void) struct inoinfo * cacheino(union dinode *dp, ino_t inumber) { - struct inoinfo *inp, **inpp; + struct inoinfo *inp; int i, blks; if (getinoinfo(inumber) != NULL) @@ -1138,9 +1137,7 @@ cacheino(union dinode *dp, ino_t inumber) Malloc(sizeof(*inp) + (blks - 1) * sizeof(ufs2_daddr_t)); if (inp == NULL) errx(EEXIT, "cannot increase directory list"); - inpp = &inphead[inumber % dirhash]; - inp->i_nexthash = *inpp; - *inpp = inp; + SLIST_INSERT_HEAD(&inphash[inumber % dirhash], inp, i_hash); inp->i_flags = 0; inp->i_parent = inumber == UFS_ROOTINO ? UFS_ROOTINO : (ino_t)0; inp->i_dotdot = (ino_t)0; @@ -1171,12 +1168,43 @@ getinoinfo(ino_t inumber) { struct inoinfo *inp; - for (inp = inphead[inumber % dirhash]; inp; inp = inp->i_nexthash) { + SLIST_FOREACH(inp, &inphash[inumber % dirhash], i_hash) { if (inp->i_number != inumber) continue; return (inp); } - return ((struct inoinfo *)0); + return (NULL); +} + +/* + * Remove an entry from the inode cache and disk-order sorted list. + * Return 0 on success and 1 on failure. + */ +int +removecachedino(ino_t inumber) +{ + struct inoinfo *inp, **inpp; + char *listtype; + + listtype = "hash"; + SLIST_FOREACH(inp, &inphash[inumber % dirhash], i_hash) { + if (inp->i_number != inumber) + continue; + SLIST_REMOVE(&inphash[inumber % dirhash], inp, inoinfo, i_hash); + for (inpp = &inpsort[inplast - 1]; inpp >= inpsort; inpp--) { + if (*inpp != inp) + continue; + *inpp = inpsort[inplast - 1]; + inplast--; + free(inp); + return (0); + } + listtype = "sort"; + break; + } + pfatal("removecachedino: entry for ino %jd not found on %s list\n", + (intmax_t)inumber, listtype); + return (1); } /* @@ -1187,13 +1215,14 @@ inocleanup(void) { struct inoinfo **inpp; - if (inphead == NULL) + if (inphash == NULL) return; for (inpp = &inpsort[inplast - 1]; inpp >= inpsort; inpp--) free((char *)(*inpp)); - free((char *)inphead); + free((char *)inphash); + inphash = NULL; free((char *)inpsort); - inphead = inpsort = NULL; + inpsort = NULL; } void @@ -1310,8 +1339,8 @@ prtinode(struct inode *ip) printf("%s: ", cdevname); printf("SIZE=%ju ", (uintmax_t)DIP(dp, di_size)); t = DIP(dp, di_mtime); - p = ctime(&t); - printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]); + if ((p = ctime(&t)) != NULL) + printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]); } void @@ -1428,7 +1457,7 @@ freeino(ino_t ino) struct inode ip; memset(&idesc, 0, sizeof(struct inodesc)); - idesc.id_type = inoinfo(ino)->ino_idtype; + idesc.id_type = ADDR; idesc.id_func = freeblock; idesc.id_number = ino; ginode(ino, &ip); diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 49418ec38e4b..5f1ad8ecb686 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -219,9 +219,10 @@ pass1(void) * If we were not able to determine in advance which inodes * were in use, then reduce the size of the inoinfo structure * to the size necessary to describe the inodes that we - * really found. + * really found. Always leave map space in the first cylinder + * group in case we need to a root or lost+found directory. */ - if (inumber == lastino) + if (inumber == lastino || c == 0) continue; inostathead[c].il_numalloced = inosused; if (inosused == 0) { @@ -348,24 +349,38 @@ checkinode(ino_t inumber, struct inodesc *idesc, int rebuildcg) } } } - for (j = ndb; ndb < UFS_NDADDR && j < UFS_NDADDR; j++) - if (DIP(dp, di_db[j]) != 0) { - if (debug) - printf("invalid direct addr[%d]: %ju\n", j, - (uintmax_t)DIP(dp, di_db[j])); - pfatal("INVALID DIRECT BLOCK"); - goto unknown; + for (j = ndb; ndb < UFS_NDADDR && j < UFS_NDADDR; j++) { + if (DIP(dp, di_db[j]) == 0) + continue; + if (debug) + printf("invalid direct addr[%d]: %ju\n", j, + (uintmax_t)DIP(dp, di_db[j])); + pfatal("INVALID DIRECT BLOCK"); + ginode(inumber, &ip); + prtinode(&ip); + if (reply("CLEAR") == 1) { + DIP_SET(ip.i_dp, di_db[j], 0); + inodirty(&ip); } + irelse(&ip); + } for (j = 0, ndb -= UFS_NDADDR; ndb > 0; j++) ndb /= NINDIR(&sblock); - for (; j < UFS_NIADDR; j++) - if (DIP(dp, di_ib[j]) != 0) { - if (debug) - printf("invalid indirect addr: %ju\n", - (uintmax_t)DIP(dp, di_ib[j])); - pfatal("INVALID INDIRECT BLOCK"); - goto unknown; + for (; j < UFS_NIADDR; j++) { + if (DIP(dp, di_ib[j]) == 0) + continue; + if (debug) + printf("invalid indirect addr: %ju\n", + (uintmax_t)DIP(dp, di_ib[j])); + pfatal("INVALID INDIRECT BLOCK"); + ginode(inumber, &ip); + prtinode(&ip); + if (reply("CLEAR") == 1) { + DIP_SET(ip.i_dp, di_ib[j], 0); + inodirty(&ip); } + irelse(&ip); + } if (ftypeok(dp) == 0) { pfatal("UNKNOWN FILE TYPE"); goto unknown; diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index 78815493fba8..4e17863ef04c 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -85,7 +85,7 @@ pass2(void) case DCLEAR: pfatal("DUPS/BAD IN ROOT INODE"); if (reply("REALLOCATE")) { - freeino(UFS_ROOTINO); + freedirino(UFS_ROOTINO, UFS_ROOTINO); if (allocdir(UFS_ROOTINO, UFS_ROOTINO, 0755) != UFS_ROOTINO) errx(EEXIT, "CANNOT ALLOCATE ROOT INODE"); @@ -294,8 +294,6 @@ pass2check(struct inodesc *idesc) /* * check for "." */ - if (dirp->d_ino > maxino) - goto chk2; if (idesc->id_entryno != 0) goto chk1; if (dirp->d_ino != 0 && strcmp(dirp->d_name, ".") == 0) { @@ -370,6 +368,20 @@ chk1: dirp->d_reclen = proto.d_reclen; } if (dirp->d_ino != 0 && strcmp(dirp->d_name, "..") == 0) { + if (dirp->d_ino > maxino) { + direrror(idesc->id_number, "BAD INODE NUMBER FOR '..'"); + /* + * If we know parent set it now, otherwise let it + * point to the root inode and it will get cleaned + * up later if that is not correct. + */ + if (inp->i_parent != 0) + dirp->d_ino = inp->i_parent; + else + dirp->d_ino = UFS_ROOTINO; + if (reply("FIX") == 1) + ret |= ALTERED; + } inp->i_dotdot = dirp->d_ino; if (dirp->d_type != DT_DIR) { direrror(idesc->id_number, "BAD TYPE VALUE FOR '..'"); diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index f06424558cf4..1442e5da77d2 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -58,10 +58,11 @@ __FBSDID("$FreeBSD$"); #include "fsck.h" -struct inoinfo **inphead, **inpsort; /* info about all inodes */ -struct inode snaplist[FSMAXSNAP + 1]; /* list of active snapshots */ -int snapcnt; /* number of active snapshots */ -char *copybuf; /* buffer to copy snapshot blocks */ +struct inohash *inphash; /* hash list of directory inode info */ +struct inoinfo **inpsort; /* disk order list of directory inodes */ +struct inode snaplist[FSMAXSNAP + 1]; /* list of active snapshots */ +int snapcnt; /* number of active snapshots */ +char *copybuf; /* buffer to copy snapshot blocks */ #define POWEROF2(num) (((num) & ((num) - 1)) == 0) @@ -188,14 +189,14 @@ setup(char *dev) (unsigned)(sizeof(struct inostatlist) * (sblock.fs_ncg))); goto badsb; } - numdirs = MAX(sblock.fs_cstotal.cs_ndir, 128); - dirhash = numdirs; + numdirs = sblock.fs_cstotal.cs_ndir; + dirhash = MAX(numdirs / 2, 1); inplast = 0; listmax = numdirs + 10; inpsort = (struct inoinfo **)Calloc(listmax, sizeof(struct inoinfo *)); - inphead = (struct inoinfo **)Calloc(numdirs, sizeof(struct inoinfo *)); - if (inpsort == NULL || inphead == NULL) { - printf("cannot alloc %ju bytes for inphead\n", + inphash = (struct inohash *)Calloc(dirhash, sizeof(struct inohash)); + if (inpsort == NULL || inphash == NULL) { + printf("cannot alloc %ju bytes for inphash\n", (uintmax_t)numdirs * sizeof(struct inoinfo *)); goto badsb; } diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index 7e7ffbd2b038..e9f5bbd421b1 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -391,6 +391,8 @@ suj_checkblkavail(blkno, frags) ufs2_daddr_t j, k, baseblk; long cg; + if ((u_int64_t)blkno > sblock.fs_size) + return (0); cg = dtog(&sblock, blkno); cgbp = cglookup(cg); cgp = cgbp->b_un.b_cg; From nobody Tue Mar 28 01:18: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 4PlsJS4hW6z42MC2; Tue, 28 Mar 2023 01:18: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 4PlsJS48tRz4FPg; Tue, 28 Mar 2023 01:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679966312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e277UKAKcoGSayIYcCjEUESnR4Yyw9leHCJJvYDhJkc=; b=BpzCiUUxaQ2vypree+yWZisPr+en2lMdHlNzHjItR1iGdW8iTVNwNY/wZ3USwD0cTivuqm 2X247W4YN6LLiiuqWMC3docs5at2GwkCgFqbJxW8GuGuFFGJiO9RmJ5nLv/dc0jk206Rxo MAd7Q13bbaHeulfQv/5267kph4qlM/H3nvYIbTfSZuFlomvihy7T+KgrH21ay+8tBNje9N Y6K7GRYqvQflF3BjYu20rWW4jlezS+CQrpmq+L4MxGdxZxxCFVDzGGP/FLz0RUu/PL8+d8 IjBzrqcl4FZ+MFwr58pmSh/pdCnoLHORZLWcoYkvWFlLrmeOSvNstOh3658jdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679966312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e277UKAKcoGSayIYcCjEUESnR4Yyw9leHCJJvYDhJkc=; b=ZamHNcGrQFeQjuroSSCPANsTR2Go+v/20nA/krDgwb91eaYX6NhLgDwB4tQgGhylTn9Kmh 7QX5BUxNexpMQKyEkMtGFFVmQ6400qZTKbpj4VVmHBzgPRb8I2qPduwn9TOK0lgayQ0BOr dFrxPAaZi7yHzyIGOZTRydFtsCd471LR9IJNmv2viIDZsKEowOTcfRmkO28V53rCnXK3Sb vyxWPSGLxtP9emAUCUaJR35jHQH5e9RasYEbmPgjZgtKpjoiztwliRVo5ekihXRnncDGvy VCKTsXyXz+TNbW/JkPfwwbXlGIJf6qW6vaylVbMXS8yysqDqUz2bJeT5kXFrUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679966312; a=rsa-sha256; cv=none; b=S1GjLy6MdyPV6B6zfiFMFxWWWpvIGrCpxHNBqRO8GVvC9PROQy7Yp6TlA9W9e3uYrtCUBg TQyOy38o4vYu4P6b/DpQ3lFPWYd2H0ScoqyREiwCdrWJtvsoEcadRq+J1iQ/lrAEcONihs IG8KkRbyaE3objkSXHI1yYOItvKYSt0OvnkYFydNJTkQo3/3vFOCrVTDykqKKUwd24r67a o43NQxuAt/s8ZK51HL3wd93sZjJSlW63BkDrdHNMol5Xl/RLqta/YCQ9dCXfM7qqmZmMdK T2+6dfCmLlDnmCooAA30r7UiUBubwWWNGoK3Ctvr19gZCQc9VCc5SIfGc32Wzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlsJS3CBgzksy; Tue, 28 Mar 2023 01:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32S1IWen028136; Tue, 28 Mar 2023 01:18:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S1IWKj028135; Tue, 28 Mar 2023 01:18:32 GMT (envelope-from git) Date: Tue, 28 Mar 2023 01:18:32 GMT Message-Id: <202303280118.32S1IWKj028135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 01194da28a21 - main - pfsync: hold b_mtx for callout_stop(pd_tmo) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/main X-Git-Reftype: branch X-Git-Commit: 01194da28a2123a2aa09808319f152fa115f60f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=01194da28a2123a2aa09808319f152fa115f60f1 commit 01194da28a2123a2aa09808319f152fa115f60f1 Author: Kristof Provost AuthorDate: 2023-03-22 13:46:25 +0000 Commit: Kristof Provost CommitDate: 2023-03-27 23:17:55 +0000 pfsync: hold b_mtx for callout_stop(pd_tmo) The pd_tmo callout has an associated mutex, which we must hold while calling callout_stop(). Reported by: markj Reviewed by: markj MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39223 --- sys/netpfil/pf/if_pfsync.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index ae3a2e46e26b..4e4bbc9bc8b7 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -402,7 +402,7 @@ pfsync_clone_destroy(struct ifnet *ifp) { struct pfsync_softc *sc = ifp->if_softc; struct pfsync_bucket *b; - int c; + int c, ret; for (c = 0; c < pfsync_buckets; c++) { b = &sc->sc_buckets[c]; @@ -411,22 +411,25 @@ pfsync_clone_destroy(struct ifnet *ifp) * cleared by pfsync_uninit(), and we have only to * drain callouts. */ + PFSYNC_BUCKET_LOCK(b); while (b->b_deferred > 0) { struct pfsync_deferral *pd = TAILQ_FIRST(&b->b_deferrals); - TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry); - b->b_deferred--; - if (callout_stop(&pd->pd_tmo) > 0) { - pf_release_state(pd->pd_st); - m_freem(pd->pd_m); - free(pd, M_PFSYNC); + ret = callout_stop(&pd->pd_tmo); + PFSYNC_BUCKET_UNLOCK(b); + if (ret > 0) { + pfsync_undefer(pd, 1); } else { pd->pd_refs++; callout_drain(&pd->pd_tmo); - free(pd, M_PFSYNC); } + free(pd, M_PFSYNC); + PFSYNC_BUCKET_LOCK(b); } + MPASS(b->b_deferred == 0); + MPASS(TAILQ_EMPTY(&b->b_deferrals)); + PFSYNC_BUCKET_UNLOCK(b); callout_drain(&b->b_tmo); } From nobody Tue Mar 28 01:18: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 4PlsJT5sNBz42M3V; Tue, 28 Mar 2023 01:18: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 4PlsJT59tqz4FVk; Tue, 28 Mar 2023 01:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679966313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V64lmMn3V9Us85FG1mp0UHXSnPbmWZ4WxT7lqs+5a5Y=; b=qA0r+lxjx7s4Dn1E0FZ8x6TtQ4Rs4eoTYdSKfC4f2XNRbKl9/9Fc0jflLtoRK2PG5lLp2b QVpPMHE/7ddDQr+z4tPAxpHlEQrAk6CWGaxh6Bd8OerzVpuNBXlb1alLZHTW/HW7DxRPQF Edg+AQ9fITXf9qzvMnT6sjZNouvCVXJB23XRBsF1jo1+RaMeGlriV77CruvrCV5qqq0mLX 2Xife+qWcyHW0x5Ce+q5TXvNKtmLhiSFWe4+U+vZZrMTzTOAsXqitO9+M0TdA2vdJhWcP3 Rho67Qjw2TwuIMlUP3Tr/1KFjDMJrq6HjOHtj+3uL5lE7Od9K6vDs8EeBFg9TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679966313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V64lmMn3V9Us85FG1mp0UHXSnPbmWZ4WxT7lqs+5a5Y=; b=KrePG6tJOcApyMxZ1N67yOTh1uQHecB4Ed4PdnklldRH2PDV4zqSiOTrc3eBXqz1fNkuoQ SR8mlAmdMFoben++EPS4T2CcqiOZ4dJc5TyWwxlaqD5ftmbgGvv8BljtYJ1hWdADYR9KMf rjLfMRQj52pjELL26Kj55DjHJ2PGuVSvqdpsGXuKaXxv9eQXwWn3CEFPlAXZw7xWVkhqTu kwisf2lAmgtsF7FcAvYNgyBSXFKm1gQy847KTH8/1pK/qWDVx+dT80xk+Ske1NTx1VrBH7 59vECzVxiWMHACp5H4Jb/irp5jHVtlhlso8pIzIiEk0qCIQpQ1xHTQdPz4gLWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679966313; a=rsa-sha256; cv=none; b=rj0B8WIrBdNvQ31nJfHyZeROONsC8AgLCDHoIKktKDPl3NA5NsWeRFp9Wk7h/B2a3m6tfs 01cqhxNv667MGo39O1o+3w7+y+hT/DydYnRE8O3LNeeQ82OK1CNZGT2tpxegEek5ta7o+K GwesrkfJ62HaaPGkMbBB+tHGfE0rQLFdxPZdMhTpDthVYYKxL4AMX+9//rcoxnT69tSQx2 JF5QL9XYlKAgobJ0LBV+UTu5kymWUOcxXAfPBiZL1NFotfA3CU4TtNs7rOrgeekNey5JP3 y7raa5M2AbGcqn0Ri+vtLRRSDW1+kdHAP5fYDhNvlKf+H1Rq6ii8OkZ9UQIkfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlsJT4H85zkgc; Tue, 28 Mar 2023 01:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32S1IXGN028155; Tue, 28 Mar 2023 01:18:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S1IXdq028154; Tue, 28 Mar 2023 01:18:33 GMT (envelope-from git) Date: Tue, 28 Mar 2023 01:18:33 GMT Message-Id: <202303280118.32S1IXdq028154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 27b23cdec9d1 - main - pf: remove pd_refs from pfsync List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/main X-Git-Reftype: branch X-Git-Commit: 27b23cdec9d1255e014ea0decac42a5be8d00735 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=27b23cdec9d1255e014ea0decac42a5be8d00735 commit 27b23cdec9d1255e014ea0decac42a5be8d00735 Author: Kristof Provost AuthorDate: 2023-03-24 06:04:56 +0000 Commit: Kristof Provost CommitDate: 2023-03-27 23:18:07 +0000 pf: remove pd_refs from pfsync It only served to complicate cleanup, and added no value. While here drop packets in pfsync_defer_tmo() if we don't have a syncif, rather than just leaving them on the queue. Reviewed by: markj Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39248 --- sys/netpfil/pf/if_pfsync.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 4e4bbc9bc8b7..c9d214d73470 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -185,7 +185,6 @@ struct pfsync_upd_req_item { struct pfsync_deferral { struct pfsync_softc *pd_sc; TAILQ_ENTRY(pfsync_deferral) pd_entry; - u_int pd_refs; struct callout pd_tmo; struct pf_kstate *pd_st; @@ -421,10 +420,8 @@ pfsync_clone_destroy(struct ifnet *ifp) if (ret > 0) { pfsync_undefer(pd, 1); } else { - pd->pd_refs++; callout_drain(&pd->pd_tmo); } - free(pd, M_PFSYNC); PFSYNC_BUCKET_LOCK(b); } MPASS(b->b_deferred == 0); @@ -1780,7 +1777,6 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m) st->state_flags |= PFSTATE_ACK; pd->pd_sc = sc; - pd->pd_refs = 0; pd->pd_st = st; pf_ref_state(st); pd->pd_m = m; @@ -1831,21 +1827,21 @@ pfsync_defer_tmo(void *arg) PFSYNC_BUCKET_LOCK_ASSERT(b); + TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry); + b->b_deferred--; + pd->pd_st->state_flags &= ~PFSTATE_ACK; /* XXX: locking! */ + PFSYNC_BUCKET_UNLOCK(b); + free(pd, M_PFSYNC); + if (sc->sc_sync_if == NULL) { - PFSYNC_BUCKET_UNLOCK(b); + pf_release_state(st); + m_freem(m); return; } NET_EPOCH_ENTER(et); CURVNET_SET(sc->sc_sync_if->if_vnet); - TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry); - b->b_deferred--; - pd->pd_st->state_flags &= ~PFSTATE_ACK; /* XXX: locking! */ - if (pd->pd_refs == 0) - free(pd, M_PFSYNC); - PFSYNC_BUCKET_UNLOCK(b); - pfsync_tx(sc, m); pf_release_state(st); From nobody Tue Mar 28 01:18: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 4PlsJV6XlKz42MF5; Tue, 28 Mar 2023 01:18: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 4PlsJV67qqz4FQn; Tue, 28 Mar 2023 01:18:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679966314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WRBacscvjE8vzUHigWkEYbNv8Dfad964cpNNksVLMM=; b=vfkllbD5qrFHuTZ2GTIC5Xz7CHSS1cP627iXWk1trRm/3lymQnGkGAbdGdper2Kdzn2t3S pE751BUYiI/YydfTvAVXKzobypGiBUA/C7nkMXiigJQMGjvUmwtJscCjoQXETQI4fIozBe bCU3KbE7ptJgtVttBacvCgNPCAo0gUfHw4xpEXOWiUoq7+MlXH8oc+fhXKCyLISGiExhau GmBkF3qn5vid31o5JKMwYfs3UVngsYzAM64X4XQZqMHzpA9Nitj7iVGPs+U5fqBTsxdt+z dv6J42L9sZqxRQhJoVQYtrGDG+FSO1vemmgVsxuBLkpLQZ27+l6ujv2hNtubjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679966314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WRBacscvjE8vzUHigWkEYbNv8Dfad964cpNNksVLMM=; b=K7M+O+71xM+O1/jsXzKlRs4UJoSuPtRFHSunrCYYAqGpB8mKP6nORx599lwjbSX/8EtAvX 5LD/6wXQYQGtScmHENlhCW0vnDb04gwsdfI4v0V4vvUw1jG3enp9HijqxZNoXpYrfdX/1V L2GNwc/iHJkcsMi0flDHubytjGUJ2MfpRG/lTIqUVPLWmyeQjHbauLQGdsTJJeooPdkpwY Q83bVnu8+Xx/O5qAbIYCbLj4oRrAHloyiWX3NJwtFKOy0ZmXUzcRfAf0G1jxXKbrBZSQV1 CZFbVJkSsuw04v4xZ1q4GVU3nRyWT+hxVSBtBInhMGidNjVd/890LOw8BLufFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679966314; a=rsa-sha256; cv=none; b=o1Sz/hNq8Pj1O/7KVsWVwhpbT7UoEUq++vs3qiPnfkY4CAp95/hyWF95yCdbLnqGNfTFqm gOEItX/HL+0fxLGRgU6x/P8g1I4liBTDMklqtk/AQ1x2+CeE8hz0SqJFmopyUEAPaMqwu4 5p/o8XP1KAsmKwoF+tfqgxsiGqW9aL1RdrQxBARCaU3lwdx2vLhh/miQcI9yW88Fo2yd8x hcGg1wz2RJ5Re0fw5Hj84ZOBPBN9BVaV56mNwCWgGzSXA2A8SK52+1B0TBfrm15ZEND/+n ViZ1eYv3W91icDqew/DR7qxNo4TfyAM085hHORo5bkh7gNOoUxddQkkVCzzHUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlsJV55vTzkRc; Tue, 28 Mar 2023 01:18:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32S1IYFJ028174; Tue, 28 Mar 2023 01:18:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S1IY1N028173; Tue, 28 Mar 2023 01:18:34 GMT (envelope-from git) Date: Tue, 28 Mar 2023 01:18:34 GMT Message-Id: <202303280118.32S1IY1N028173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: ccff2078af42 - main - carp: fix source MAC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/main X-Git-Reftype: branch X-Git-Commit: ccff2078af42dc066e1c38d25fcb83d960c3c22b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ccff2078af42dc066e1c38d25fcb83d960c3c22b commit ccff2078af42dc066e1c38d25fcb83d960c3c22b Author: Kristof Provost AuthorDate: 2023-03-27 22:01:37 +0000 Commit: Kristof Provost CommitDate: 2023-03-27 23:18:18 +0000 carp: fix source MAC When we're not in unicast mode we need to change the source MAC address. The check for this was wrong, because IN_MULTICAST() assumes host endianness and the address in sc_carpaddr is in network endianness. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netinet/ip_carp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index deb2f3f347d9..2e1c8e084b4b 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1588,7 +1588,7 @@ carp_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *sa) switch (sa->sa_family) { case AF_INET: - if (! IN_MULTICAST(sc->sc_carpaddr.s_addr)) + if (! IN_MULTICAST(ntohl(sc->sc_carpaddr.s_addr))) return (0); break; case AF_INET6: From nobody Tue Mar 28 01:37: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 4Plskg0xlbz42NVh; Tue, 28 Mar 2023 01:37: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 4Plskg0QzCz4Hp5; Tue, 28 Mar 2023 01:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679967467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dxpiJpw7QQAD5nF7y5aPunuIDzm5vjK1r/hxPl3cvAI=; b=h8eDUX51+Tx/W1ry2Pyk5hMxIuLAtOCIeYwPJEOrtpLAsroC5UpKdov8j+3ksUjp8iiaOf jXEjtQffnwGOV94bGNHNWohFNBZj9a1J1HREJWeM2IkMnsrbFJqnrLFl9kIQoMOKJRvkjo 2t6Se8HdQUUDFvqAB1lqJqOMYKcpPTHCmLDbq+phG96C65Oh7tC7yjN2Epfp6ax+MUrzJD +kN3UcVnDMcpz6se2/vxAjI9bmxUz9NW06+sY/+5lAwPGSN/mceDmoH2LqR/7RCCoAjqFc Jb5RJgFElYwMUWvcXwXTJXUP2dkcUXJIjgS4qlFdpjtFRZLMS4xexwXt6LHtNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679967467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dxpiJpw7QQAD5nF7y5aPunuIDzm5vjK1r/hxPl3cvAI=; b=tfUz3YiqRxMlxt0Wnsirayb5KZ+iyXwqenc1285m2se+fMI9uWPQEDXJRRhdTVICJF+u2c DobDv/3RpurUaF0UfksVQrVXz1L3pxi03CW4fgZspmNrT2JKB3MgNI8STbvzc3DAEJgoH/ RN5tf3bUOwSGLlYrO8cVqf7uRyU6QopVWnoq+k9chCi+TkK0JoMjvkLnkATyn5KKeKseKb qOKwTZzEzCW8VIJTWUe2DIS+uwnLdvFYY2VuzaPVqNDAdDKrhFimdNxM6j/qyqiG7trQEv jDP5ZKUBW7a9UH/3/7tZqeaGJHr2BcMCgwupcyGkuUN8Ycj1TbpBlhyb/4YYjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679967467; a=rsa-sha256; cv=none; b=xLhFjWK2KZGiIR+PyotKu8Mn56CvmGsdWNEScEslRyGEQU3D05JuK6kJM3TmW+zBq86G5h hehyrKCA7dCduhiivYnMiZJAYCehlO7Bh5ATbrn5Mi6GpO9oJp7y5dMwvNwobzJTSAIQWw EB1+qw2wxHxkbqbe70gjoY/YwNawUmTfADTDZUOav9LkvQDmXfQ8XYN6JyPewtx62k4Mef bdiEHVM5F3fDEqkA1tU3NbLHGgWD2aXTS7dwAi8duKeHSC8v4CZM69nTFlQ9RlWSGrbyNL tUfjcKMmpA7XiklthMVwodrmxZOEVFSQU6bC6AKVclb7FVIkcs+UOA+0pyJToQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Plskf6cDlzlNK; Tue, 28 Mar 2023 01:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32S1bkGe061236; Tue, 28 Mar 2023 01:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S1bkED061235; Tue, 28 Mar 2023 01:37:46 GMT (envelope-from git) Date: Tue, 28 Mar 2023 01:37:46 GMT Message-Id: <202303280137.32S1bkED061235@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: 78e6c3aacc7f - main - tcp: update error counter when dropping a packet due to bad source List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 78e6c3aacc7fb9181a0fd77dc0bdf4b29e2f1d3f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=78e6c3aacc7fb9181a0fd77dc0bdf4b29e2f1d3f commit 78e6c3aacc7fb9181a0fd77dc0bdf4b29e2f1d3f Author: Gleb Smirnoff AuthorDate: 2023-03-28 01:37:15 +0000 Commit: Gleb Smirnoff CommitDate: 2023-03-28 01:37:15 +0000 tcp: update error counter when dropping a packet due to bad source Use the same counter that ip_input()/ip6_input() use for bad destination address. For IPv6 this is already heavily abused ip6s_badscope, which needs to be split into several separate error counters. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D39234 --- sys/netinet/tcp_input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 992f8ea16e3d..6cf14f2f1f7f 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -675,7 +675,7 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) KASSERT(!IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_dst), ("%s: unspecified destination v6 address", __func__)); if (IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_src)) { - /* XXX stat */ + IP6STAT_INC(ip6s_badscope); /* XXX */ goto drop; } iptos = IPV6_TRAFFIC_CLASS(ip6); @@ -745,7 +745,7 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) KASSERT(ip->ip_dst.s_addr != INADDR_ANY, ("%s: unspecified destination v4 address", __func__)); if (__predict_false(ip->ip_src.s_addr == INADDR_ANY)) { - /* XXX stat */ + IPSTAT_INC(ips_badaddr); goto drop; } } From nobody Tue Mar 28 02:48: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 4PlvHw09cxz42Sdc; Tue, 28 Mar 2023 02:48: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 4PlvHv6kvhz4NGk; Tue, 28 Mar 2023 02:48:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679971691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NhgHSRohPj1ExcoC0nRSWTUIqn8xdBLhuIryUo3yuww=; b=Rb954e0OsmOz9ch1+DR/FwYrYDe9PidyRozA3rJzTNGiFxD9D0JX2nHFCaYVV+8AygJI4m DgFqWBZSynooDiMxndCkWCzm33lNwtjg4drGbTbdfjG1EJbhBG7JuxVEuVzxi1CI5Ut/Xi UXnJMF0lnbmXBnx/fHqB1pogY9phIB2w59Kf3S/C7KtfMfl6PT6fTobmYJNlfiCkSw+rwq zDJUCOvRM+DLQxALcdh9fgW4j5Ae0yWov3Nlkp9v6/FN7OFOAtQ4BIe3ySP/Pu1a0bkgEJ dg8WG8tmuNW53lR3QKnLIINit1ff/LoREL2NtZj1bOKcNJorSkH0rThrqZF79A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679971691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NhgHSRohPj1ExcoC0nRSWTUIqn8xdBLhuIryUo3yuww=; b=bax+W21WvPrqoLjrfSJ2VvSz4GPFCB46r/YarpkDFYNN2rBaT4ArSyvQKpg4vgxVYozrA4 dRXSURAypZpW65zua/c0tY7z8de7C0AUHM1+nST+yisqg5Ur4sUrNV0ym5QsoTSDnSi3pq py+t9mY+DyTbJP/51IiYx4dC0BA7gxW//dCo10AU2K8fHCT1iAq2diYnCurMfvUriK6f7z 7fT/JQEMf6UDkNTlxlTk1T1OyzGgFaDZtlu779/n0uyuwznWOUy7Xq95NNUMwT1cwj31wF TB+IbzGCuiUrmXc/XnUozZ84eOvBGT58X2S/KlyOYsSPBokGw8p4gNHEr78UUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679971691; a=rsa-sha256; cv=none; b=YaQ3uaE0WLnEdqOGz0GqRspy+orp38gziDP/h69qiIKEep643eg+K05tM+jyyxUERxsWcT T8AE0rrqguzE5R2SY6MBNUAIBowWbOaj6IXt7uxU7TGWBtCZwCjdJBMJjQYqLSsUtv8nFR ACqplMe2fvTXM4VljrQE/M150SkXHMBbPS5aJClRoWqWb4hXWgBjK6V05QMLqSUYrDiX8f udKamOb+GXa1LpBtc33EBVIiKvTsa5qxSnPGRPrceuTn1mfVyozMIbOFbzsi9xwpRdfbAC +Ht+sCtUQ2CeaEcd/+d4qz/pPmWfYYygqNGD8pe5O4iIsRSA38AbS1kD9UNmBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlvHv5n5VznH4; Tue, 28 Mar 2023 02:48:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32S2mBOd075687; Tue, 28 Mar 2023 02:48:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S2mB2F075686; Tue, 28 Mar 2023 02:48:11 GMT (envelope-from git) Date: Tue, 28 Mar 2023 02:48:11 GMT Message-Id: <202303280248.32S2mB2F075686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: f858eb916fd2 - main - tcp: send SACK rescue retransmission also mid-stream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/main X-Git-Reftype: branch X-Git-Commit: f858eb916fd263f696c290798d4a260b6e55af60 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=f858eb916fd263f696c290798d4a260b6e55af60 commit f858eb916fd263f696c290798d4a260b6e55af60 Author: Richard Scheffenegger AuthorDate: 2023-03-28 02:01:48 +0000 Commit: Richard Scheffenegger CommitDate: 2023-03-28 02:47:01 +0000 tcp: send SACK rescue retransmission also mid-stream Previously, SACK rescue retransmissions would only happen on a loss recovery at the tail end of the send buffer. This extends the mechanism such that partial ACKs without SACK mid-stream also trigger a rescue retransmission to try avoid an otherwise unavoidable retransmission timeout. Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D39274 --- sys/netinet/tcp_sack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 558773f91228..5900bc19e2e0 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -879,7 +879,6 @@ tcp_sack_partialack(struct tcpcb *tp, struct tcphdr *th) */ if ((V_tcp_do_newsack) && SEQ_LT(th->th_ack, tp->snd_recover) && - (tp->snd_recover == tp->snd_max) && TAILQ_EMPTY(&tp->snd_holes) && (tp->sackhint.delivered_data > 0)) { /* @@ -891,6 +890,7 @@ tcp_sack_partialack(struct tcpcb *tp, struct tcphdr *th) tcp_seq highdata = tp->snd_max; if (tp->t_flags & TF_SENTFIN) highdata--; + highdata = SEQ_MIN(highdata, tp->snd_recover); if (th->th_ack != highdata) { tp->snd_fack = th->th_ack; (void)tcp_sackhole_insert(tp, SEQ_MAX(th->th_ack, From nobody Tue Mar 28 06:53: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 4Pm0ks1LyKz42jqP; Tue, 28 Mar 2023 06:53:25 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 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 4Pm0ks0rXcz3nJJ; Tue, 28 Mar 2023 06:53:25 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679986405; 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=iPWdXSvRcdc+okkNz22bTiIy7qFCu+M0kD+XLqPpXck=; b=oGZ+YhhLXV1mVSx5uSF3ZzbL4/wxAH+cA+h3h1xBVyUzjwzzmdvdA5YHqI9E91WlZVns+0 H7Myl5hRj69pwrwVW6IVUD3oZTeWYWIJCi5KEz6fmXldumYXkqo2VbLnLRquV27dAoUYIx YbjWMPty7OHCyuJFoqCDf2PoKdiOZv1C3Mj8fPL/6NcRZ4XI8bzRJXXhL0KakjgVF9AV3m vfR5p+iJFPjAErxSoQ2DErcBNrzcOcT7ECOfHqqdhmHG0leB/0q2lSMO8HRSWfFtG78aId Cgoh+/CWntjMOXJMXOrT+CU9D3Ze2MTx+rZa9OmMnlb2X7gY7oqcjyYnd4/lYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679986405; 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=iPWdXSvRcdc+okkNz22bTiIy7qFCu+M0kD+XLqPpXck=; b=G8X/TW3T0IEsX9MQD6Gfq02I3XrrCLVpjXH/UtJc2ThlfULCf08rVV/A90JsPVaW0z2e+O 6FDUT1LRPXEtmwhqUZlmxiIA0FLNcJyKVEJ4UlIraasS/mO9Z8q/pT9xARbT5CNnFStWGC sCK3PCi0YBG4M1oFSMewZfFxLmBPx34TESKD/NanL1mghcs3CGt3V/GlCpcQgyqglyeu2F Z84BgWl+IuNjmhrp8cpfGryTuntMR6op5cja4mJ/7lKCg2soLh2m0FzbjI0azQe0YZbCoR uso3LN79cFrjUyrdq/QfRNqcr8TPRIaYps91M+IEgRfRgYLa3AC6AtoCtBHkdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679986405; a=rsa-sha256; cv=none; b=j8x1+79sKSlkRl/9UkQciGHFfq2ODRBubKPqZvCxH03QSNcli0mt+CcFjywR+HNnf+A4+U 2qTJ+jPWXiYVscy51zPfks2yFSSk59ZH/KUDnlmjQNd6ZYHbkcnVJPOZf/PdwJ3AxDZuj8 n2IFhlhvk3Vl3vkQ4bMDUHQOZRY/JQ20QlYaO54+JWicYnEYzOxJP0wjJqHmqYXYbnsDO2 xxcZ96KTh+6jl6cVGOpJgdReIonoLKYe2Q+7jOq1zx5zto+f3L4ERjurnhwJsATUImSKMe xYCRzCQePZxVwc12jQ6g0FjN6BsCMjoheb2yOMQCIb3bE1m1/cSbgaBDE/SZNQ== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 02AA21FCD4; Tue, 28 Mar 2023 06:53:24 +0000 (UTC) Date: Tue, 28 Mar 2023 06:53:24 +0000 From: Alexey Dokuchaev To: Jessica Clarke Cc: Alan Somers , Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 61194e9852e6 - main - Add kqueue1() syscall Message-ID: References: <202303272339.32RNdWPD063667@gitrepo.freebsd.org> <930C69C9-64E3-4399-BE35-ABB137F06EC2@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: <930C69C9-64E3-4399-BE35-ABB137F06EC2@freebsd.org> X-ThisMailContainsUnwantedMimeParts: N On Tue, Mar 28, 2023 at 01:07:41AM +0100, Jessica Clarke wrote: > On 28 Mar 2023, at 00:45, Alan Somers wrote: > > On Mon, Mar 27, 2023 at 4:39???PM Konstantin Belousov wrote: > >> commit 61194e9852e641d1533cd04a5679d6042ff975d3 > >> > >> Add kqueue1() syscall > >> > >> It takes the flags argument. Immediate use is to provide the > >> KQUEUE_CLOEXEC flag for kqueue(2). > >> > >> Differential revision: https://reviews.freebsd.org/D39271 > > > > We already have abort2(2), dup2(2), pipe2(2), and thr_kill2(2) that > > are similar to other syscalls but with a flags argument. > > Additionally, Linux has a renameat(2). But I'm not aware of any > > syscalls named xxx1. Should we call this new one kqueue2 to follow > > the existing convention? > > This was discussed on the linked review. I'm with Alan here, all needed knownledge (results of discussions) should be part of the commit log, making commit itself sufficiently understandable and judgeable. ./danfe From nobody Tue Mar 28 07:16: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 4Pm1FC2RXRz41VmF for ; Tue, 28 Mar 2023 07:16:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) (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 4Pm1FC1yPtz3pFF for ; Tue, 28 Mar 2023 07:16:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x531.google.com with SMTP id w9so45688419edc.3 for ; Tue, 28 Mar 2023 00:16:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; t=1679987774; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=zfbf6bx039j7CdNFzyrQI8eFD7T7tChLukK++MS4t2A=; b=LuyB8gBdiNjNoljq0nFj7Blu7e0tgyuAWgIMG3W73yFFaTNGRDseucmoRjOalMDIwN teMCwnLc57YpSJzMeLTIA4c0z/pLdTBsgSNWwqUI/Cs7Tew2QnmjUIkYo32kvJT3SnUW 9lxncBJM01CrXBD1AtHOFMESaG8KlG2jVcWnUCXS0rtJGWl2xhcfHZTcnEg2RPFVq2mu aNrWIISWtvEHhlYBk46icL4QQki4JyzAIZF4Al+qiuEPgoSH1q5ElvZ2cTmG5Wxc9Nav FP+fnUy3xzar1dgpU7IsYKifUowQqwImdLRf6rzCIOfSe59gh86qGH4JjWcltMgLaro2 a+dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679987774; 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=zfbf6bx039j7CdNFzyrQI8eFD7T7tChLukK++MS4t2A=; b=wnrgbz2n7TLu9aiVMBTKup0gVewnCsmSP4rj6K0ElIacyHoV7vWQZbjhwjTb3sJox6 IuAV8xoctfWvX4yppMTeaUw9hM+dAYbaIYhmkALvoF7jtJwv7T1dqoPFYDXJeQSrgWfR XxGNYFvlE1HwPZW/HBC331MFUGPHPOnngMLNm7xjIBSQAFnFsR+fZuwmTA2X4T+a4MVT KNfMVTOc3dOmDL/hN7ECpgtfci/b066MWcaQ0zcSuOm8ZFTcGLW0iXp1wSRpaB5UkjHA 4dwexAI5rsDRWv1vYc9r02Wb3FLj2RpzRpHmpLtSTMMQWEnEM1VHHcaWqPjKhGZbQZWI N2Ow== X-Gm-Message-State: AAQBX9cagTzCS1/9TWVRDFbfhFKd3lcKtJcRICaGvARJhL1tUTssj2ei PRp3LRfWUMFTl+8xjTslH0CkK8SlDm8rjzrJKiNdFg== X-Google-Smtp-Source: AKy350Yg41YJK9eBWCQSSSdBn81rurUlD6m6M5v22lSuDqEaDp0tBye8xOLohi5Kcyc3+efo8JQ04YQlZkRRIeVgLk8= X-Received: by 2002:a50:d68c:0:b0:4fb:80cf:898b with SMTP id r12-20020a50d68c000000b004fb80cf898bmr6720627edi.7.1679987773914; Tue, 28 Mar 2023 00:16:13 -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: <202303272339.32RNdWPD063667@gitrepo.freebsd.org> <930C69C9-64E3-4399-BE35-ABB137F06EC2@freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 28 Mar 2023 09:16:03 +0200 Message-ID: Subject: Re: git: 61194e9852e6 - main - Add kqueue1() syscall To: Alexey Dokuchaev Cc: Jessica Clarke , Alan Somers , Konstantin Belousov , src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000007ddd3905f7f0a251" X-Rspamd-Queue-Id: 4Pm1FC1yPtz3pFF X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --0000000000007ddd3905f7f0a251 Content-Type: text/plain; charset="UTF-8" On Tue, Mar 28, 2023, 8:53 AM Alexey Dokuchaev wrote: > On Tue, Mar 28, 2023 at 01:07:41AM +0100, Jessica Clarke wrote: > > On 28 Mar 2023, at 00:45, Alan Somers wrote: > > > On Mon, Mar 27, 2023 at 4:39???PM Konstantin Belousov wrote: > > >> commit 61194e9852e641d1533cd04a5679d6042ff975d3 > > >> > > >> Add kqueue1() syscall > > >> > > >> It takes the flags argument. Immediate use is to provide the > > >> KQUEUE_CLOEXEC flag for kqueue(2). > > >> > > >> Differential revision: https://reviews.freebsd.org/D39271 > > > > > > We already have abort2(2), dup2(2), pipe2(2), and thr_kill2(2) that > > > are similar to other syscalls but with a flags argument. > > > Additionally, Linux has a renameat(2). But I'm not aware of any > > > syscalls named xxx1. Should we call this new one kqueue2 to follow > > > the existing convention? > > > > This was discussed on the linked review. > > I'm with Alan here, all needed knownledge (results of discussions) > should be part of the commit log, making commit itself sufficiently > understandable and judgeable. > But this is the existing convention.. and has been for decades since like wait4 or earlier. At best it is borderline information... Warner > --0000000000007ddd3905f7f0a251 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Tue, Mar 28, 2023, 8:53 AM Alexey Dokuchaev <danfe@freebsd.org> wrote:
On Tue, Mar 28, 2023 at 01:07:41AM +0100, J= essica Clarke wrote:
> On 28 Mar 2023, at 00:45, Alan Somers wrote:
> > On Mon, Mar 27, 2023 at 4:39???PM Konstantin Belousov wrote:
> >> commit 61194e9852e641d1533cd04a5679d6042ff975d3
> >>
> >>=C2=A0 Add kqueue1() syscall
> >>
> >>=C2=A0 It takes the flags argument.=C2=A0 Immediate use is to = provide the
> >>=C2=A0 KQUEUE_CLOEXEC flag for kqueue(2).
> >>
> >>=C2=A0 Differential revision:=C2=A0 https:= //reviews.freebsd.org/D39271
> >
> > We already have abort2(2), dup2(2), pipe2(2), and thr_kill2(2) th= at
> > are similar to other syscalls but with a flags argument.
> > Additionally, Linux has a renameat(2).=C2=A0 But I'm not awar= e of any
> > syscalls named xxx1.=C2=A0 Should we call this new one kqueue2 to= follow
> > the existing convention?
>
> This was discussed on the linked review.

I'm with Alan here, all needed knownledge (results of discussions)
should be part of the commit log, making commit itself sufficiently
understandable and judgeable.

But this is the existing convention..=C2=A0 an= d has been for decades since like wait4 or earlier.=C2=A0 At best it is bor= derline information...

W= arner
--0000000000007ddd3905f7f0a251-- From nobody Tue Mar 28 07:25: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 4Pm1RP6qTKz41WTx; Tue, 28 Mar 2023 07:25: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 4Pm1RP2TMYz3qF3; Tue, 28 Mar 2023 07:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679988305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bfAFuXYdNi0hpN5n0qKfa7MDQJyb1mUBrbeSvXMwaUI=; b=ryskxlvNPaBBf+za/GjriWDuTiAB6C03d/tjXR+F42tXQM7zhSBV//ukOHnVS5xmpoZsgc xLie8qXSwhp5vh95cbpc9efTSWNqDM1/JInyUixIghnWxr7mLlIVRXgBK/LhWqAoEpidev VFD4OU70xwvA5/f/TY37pYrP0HixMa4LtHxBWko4+yNAiZ5KmE7EMRdR5YhrxkJdNQYunt 5S8pmjtQ447Z0A/6NoYxKkYex7r3ESk9jJTiSrY3da9YKbC3Xq1X703FLFP2SqyDacQ2yz Sv46M57PKdW+Mm60kf+x/cMNduuBg4Ksidtt6TC2MUPOu1VY2Ovd7aXdfjHXgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679988305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bfAFuXYdNi0hpN5n0qKfa7MDQJyb1mUBrbeSvXMwaUI=; b=FLaQ6p3Yd6GpiMAEIZDPRaAflKCouylmz3Qr7Nc28i7jNR807HE7M49D9m6i8daqs8dtZ/ /HnMaVfDCKrPXWHQAgXRL0z1LUHtGIGBIb0k+cYZgdMyV1GL9Qsi65+6rCwR2VXx4bzNSJ BmVuOpwOEpEakSWArYPLEQ8oL6/naGjWbpwms1dc50sMcQZTB0SmH2AzI5wElU4w0CK5pL tb+vN9zbjByQ3dBNFF1tfamoH0ltiIeIxvUAU2uTIBBpLfgwvy+3nI13enrz952ihEgdqu I4sPsR+i8YvGgTxAB6mdcD+cspgDDF4DRbRaO10XAoS2BQ/n7Eue14ZUyU8jpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679988305; a=rsa-sha256; cv=none; b=yZFvK0EJ0hjvjHOpCROXrAhlvPBdDNDFDx9WCVWqBHYID8luCwi7ySUpE7RjYiJE0Xrx3+ ook+VyZRpyUCJRnJA9EBoGmdnsLtHJSBbHrVXGVpR7H7gAXPM+LnEn1QJ7bpI7EHu6ReD5 6F3OhtWxDc6Y7st5Esf2czNSSMsmbUkrpryftN1u99NZ3uSRbgRpKPG3e1PihIXf2HXaWM /6xEp1dwu9l6L5GoyOKu2I5X24y/Nbpp0AvANySEZZGX4+Smmrmhb429fgIocBbRZOtJ1H R+D2AcifgF3mwoRuk1KYikRaH2ALPwoAUEkxBNdUB10H9XzSyzGEq4pcOsJylQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pm1RP1Wt4zvkS; Tue, 28 Mar 2023 07:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32S7P5ni036508; Tue, 28 Mar 2023 07:25:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S7P5eF036507; Tue, 28 Mar 2023 07:25:05 GMT (envelope-from git) Date: Tue, 28 Mar 2023 07:25:05 GMT Message-Id: <202303280725.32S7P5eF036507@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: f1d7ae31d4aa - main - linuxkpi: Add hdmi helpers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: f1d7ae31d4aa7b352611c43a9fb3b04986cff622 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=f1d7ae31d4aa7b352611c43a9fb3b04986cff622 commit f1d7ae31d4aa7b352611c43a9fb3b04986cff622 Author: Emmanuel Vadot AuthorDate: 2023-03-16 15:12:12 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-28 07:11:06 +0000 linuxkpi: Add hdmi helpers This is a direct port of the Linux code as the licence allows it, so style(9) isn't respected to allow applying directly the upstream commits. Do not add it to linuxkpi directly but add a new linuxkpi_hdmi module that drm modules will require later, no need to bloat linuxkpi more. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39122 --- sys/compat/linuxkpi/common/include/linux/hdmi.h | 440 ++++++ sys/compat/linuxkpi/common/src/linux_hdmi.c | 1922 +++++++++++++++++++++++ sys/modules/Makefile | 1 + sys/modules/linuxkpi_hdmi/Makefile | 13 + 4 files changed, 2376 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/hdmi.h b/sys/compat/linuxkpi/common/include/linux/hdmi.h new file mode 100644 index 000000000000..c8ec982ff498 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/hdmi.h @@ -0,0 +1,440 @@ +/* + * Copyright (C) 2012 Avionic Design GmbH + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sub license, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef __LINUX_HDMI_H_ +#define __LINUX_HDMI_H_ + +#include +#include + +enum hdmi_packet_type { + HDMI_PACKET_TYPE_NULL = 0x00, + HDMI_PACKET_TYPE_AUDIO_CLOCK_REGEN = 0x01, + HDMI_PACKET_TYPE_AUDIO_SAMPLE = 0x02, + HDMI_PACKET_TYPE_GENERAL_CONTROL = 0x03, + HDMI_PACKET_TYPE_ACP = 0x04, + HDMI_PACKET_TYPE_ISRC1 = 0x05, + HDMI_PACKET_TYPE_ISRC2 = 0x06, + HDMI_PACKET_TYPE_ONE_BIT_AUDIO_SAMPLE = 0x07, + HDMI_PACKET_TYPE_DST_AUDIO = 0x08, + HDMI_PACKET_TYPE_HBR_AUDIO_STREAM = 0x09, + HDMI_PACKET_TYPE_GAMUT_METADATA = 0x0a, + /* + enum hdmi_infoframe_type */ +}; + +enum hdmi_infoframe_type { + HDMI_INFOFRAME_TYPE_VENDOR = 0x81, + HDMI_INFOFRAME_TYPE_AVI = 0x82, + HDMI_INFOFRAME_TYPE_SPD = 0x83, + HDMI_INFOFRAME_TYPE_AUDIO = 0x84, + HDMI_INFOFRAME_TYPE_DRM = 0x87, +}; + +#define HDMI_IEEE_OUI 0x000c03 +#define HDMI_FORUM_IEEE_OUI 0xc45dd8 +#define HDMI_INFOFRAME_HEADER_SIZE 4 +#define HDMI_AVI_INFOFRAME_SIZE 13 +#define HDMI_SPD_INFOFRAME_SIZE 25 +#define HDMI_AUDIO_INFOFRAME_SIZE 10 +#define HDMI_DRM_INFOFRAME_SIZE 26 +#define HDMI_VENDOR_INFOFRAME_SIZE 4 + +#define HDMI_INFOFRAME_SIZE(type) \ + (HDMI_INFOFRAME_HEADER_SIZE + HDMI_ ## type ## _INFOFRAME_SIZE) + +struct hdmi_any_infoframe { + enum hdmi_infoframe_type type; + unsigned char version; + unsigned char length; +}; + +enum hdmi_colorspace { + HDMI_COLORSPACE_RGB, + HDMI_COLORSPACE_YUV422, + HDMI_COLORSPACE_YUV444, + HDMI_COLORSPACE_YUV420, + HDMI_COLORSPACE_RESERVED4, + HDMI_COLORSPACE_RESERVED5, + HDMI_COLORSPACE_RESERVED6, + HDMI_COLORSPACE_IDO_DEFINED, +}; + +enum hdmi_scan_mode { + HDMI_SCAN_MODE_NONE, + HDMI_SCAN_MODE_OVERSCAN, + HDMI_SCAN_MODE_UNDERSCAN, + HDMI_SCAN_MODE_RESERVED, +}; + +enum hdmi_colorimetry { + HDMI_COLORIMETRY_NONE, + HDMI_COLORIMETRY_ITU_601, + HDMI_COLORIMETRY_ITU_709, + HDMI_COLORIMETRY_EXTENDED, +}; + +enum hdmi_picture_aspect { + HDMI_PICTURE_ASPECT_NONE, + HDMI_PICTURE_ASPECT_4_3, + HDMI_PICTURE_ASPECT_16_9, + HDMI_PICTURE_ASPECT_64_27, + HDMI_PICTURE_ASPECT_256_135, + HDMI_PICTURE_ASPECT_RESERVED, +}; + +enum hdmi_active_aspect { + HDMI_ACTIVE_ASPECT_16_9_TOP = 2, + HDMI_ACTIVE_ASPECT_14_9_TOP = 3, + HDMI_ACTIVE_ASPECT_16_9_CENTER = 4, + HDMI_ACTIVE_ASPECT_PICTURE = 8, + HDMI_ACTIVE_ASPECT_4_3 = 9, + HDMI_ACTIVE_ASPECT_16_9 = 10, + HDMI_ACTIVE_ASPECT_14_9 = 11, + HDMI_ACTIVE_ASPECT_4_3_SP_14_9 = 13, + HDMI_ACTIVE_ASPECT_16_9_SP_14_9 = 14, + HDMI_ACTIVE_ASPECT_16_9_SP_4_3 = 15, +}; + +enum hdmi_extended_colorimetry { + HDMI_EXTENDED_COLORIMETRY_XV_YCC_601, + HDMI_EXTENDED_COLORIMETRY_XV_YCC_709, + HDMI_EXTENDED_COLORIMETRY_S_YCC_601, + HDMI_EXTENDED_COLORIMETRY_OPYCC_601, + HDMI_EXTENDED_COLORIMETRY_OPRGB, + + /* The following EC values are only defined in CEA-861-F. */ + HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM, + HDMI_EXTENDED_COLORIMETRY_BT2020, + HDMI_EXTENDED_COLORIMETRY_RESERVED, +}; + +enum hdmi_quantization_range { + HDMI_QUANTIZATION_RANGE_DEFAULT, + HDMI_QUANTIZATION_RANGE_LIMITED, + HDMI_QUANTIZATION_RANGE_FULL, + HDMI_QUANTIZATION_RANGE_RESERVED, +}; + +/* non-uniform picture scaling */ +enum hdmi_nups { + HDMI_NUPS_UNKNOWN, + HDMI_NUPS_HORIZONTAL, + HDMI_NUPS_VERTICAL, + HDMI_NUPS_BOTH, +}; + +enum hdmi_ycc_quantization_range { + HDMI_YCC_QUANTIZATION_RANGE_LIMITED, + HDMI_YCC_QUANTIZATION_RANGE_FULL, +}; + +enum hdmi_content_type { + HDMI_CONTENT_TYPE_GRAPHICS, + HDMI_CONTENT_TYPE_PHOTO, + HDMI_CONTENT_TYPE_CINEMA, + HDMI_CONTENT_TYPE_GAME, +}; + +enum hdmi_metadata_type { + HDMI_STATIC_METADATA_TYPE1 = 0, +}; + +enum hdmi_eotf { + HDMI_EOTF_TRADITIONAL_GAMMA_SDR, + HDMI_EOTF_TRADITIONAL_GAMMA_HDR, + HDMI_EOTF_SMPTE_ST2084, + HDMI_EOTF_BT_2100_HLG, +}; + +struct hdmi_avi_infoframe { + enum hdmi_infoframe_type type; + unsigned char version; + unsigned char length; + enum hdmi_colorspace colorspace; + enum hdmi_scan_mode scan_mode; + enum hdmi_colorimetry colorimetry; + enum hdmi_picture_aspect picture_aspect; + enum hdmi_active_aspect active_aspect; + bool itc; + enum hdmi_extended_colorimetry extended_colorimetry; + enum hdmi_quantization_range quantization_range; + enum hdmi_nups nups; + unsigned char video_code; + enum hdmi_ycc_quantization_range ycc_quantization_range; + enum hdmi_content_type content_type; + unsigned char pixel_repeat; + unsigned short top_bar; + unsigned short bottom_bar; + unsigned short left_bar; + unsigned short right_bar; +}; + +/* DRM Infoframe as per CTA 861.G spec */ +struct hdmi_drm_infoframe { + enum hdmi_infoframe_type type; + unsigned char version; + unsigned char length; + enum hdmi_eotf eotf; + enum hdmi_metadata_type metadata_type; + struct { + u16 x, y; + } display_primaries[3]; + struct { + u16 x, y; + } white_point; + u16 max_display_mastering_luminance; + u16 min_display_mastering_luminance; + u16 max_cll; + u16 max_fall; +}; + +void hdmi_avi_infoframe_init(struct hdmi_avi_infoframe *frame); +ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, void *buffer, + size_t size); +ssize_t hdmi_avi_infoframe_pack_only(const struct hdmi_avi_infoframe *frame, + void *buffer, size_t size); +int hdmi_avi_infoframe_check(struct hdmi_avi_infoframe *frame); +int hdmi_drm_infoframe_init(struct hdmi_drm_infoframe *frame); +ssize_t hdmi_drm_infoframe_pack(struct hdmi_drm_infoframe *frame, void *buffer, + size_t size); +ssize_t hdmi_drm_infoframe_pack_only(const struct hdmi_drm_infoframe *frame, + void *buffer, size_t size); +int hdmi_drm_infoframe_check(struct hdmi_drm_infoframe *frame); +int hdmi_drm_infoframe_unpack_only(struct hdmi_drm_infoframe *frame, + const void *buffer, size_t size); + +enum hdmi_spd_sdi { + HDMI_SPD_SDI_UNKNOWN, + HDMI_SPD_SDI_DSTB, + HDMI_SPD_SDI_DVDP, + HDMI_SPD_SDI_DVHS, + HDMI_SPD_SDI_HDDVR, + HDMI_SPD_SDI_DVC, + HDMI_SPD_SDI_DSC, + HDMI_SPD_SDI_VCD, + HDMI_SPD_SDI_GAME, + HDMI_SPD_SDI_PC, + HDMI_SPD_SDI_BD, + HDMI_SPD_SDI_SACD, + HDMI_SPD_SDI_HDDVD, + HDMI_SPD_SDI_PMP, +}; + +struct hdmi_spd_infoframe { + enum hdmi_infoframe_type type; + unsigned char version; + unsigned char length; + char vendor[8]; + char product[16]; + enum hdmi_spd_sdi sdi; +}; + +int hdmi_spd_infoframe_init(struct hdmi_spd_infoframe *frame, + const char *vendor, const char *product); +ssize_t hdmi_spd_infoframe_pack(struct hdmi_spd_infoframe *frame, void *buffer, + size_t size); +ssize_t hdmi_spd_infoframe_pack_only(const struct hdmi_spd_infoframe *frame, + void *buffer, size_t size); +int hdmi_spd_infoframe_check(struct hdmi_spd_infoframe *frame); + +enum hdmi_audio_coding_type { + HDMI_AUDIO_CODING_TYPE_STREAM, + HDMI_AUDIO_CODING_TYPE_PCM, + HDMI_AUDIO_CODING_TYPE_AC3, + HDMI_AUDIO_CODING_TYPE_MPEG1, + HDMI_AUDIO_CODING_TYPE_MP3, + HDMI_AUDIO_CODING_TYPE_MPEG2, + HDMI_AUDIO_CODING_TYPE_AAC_LC, + HDMI_AUDIO_CODING_TYPE_DTS, + HDMI_AUDIO_CODING_TYPE_ATRAC, + HDMI_AUDIO_CODING_TYPE_DSD, + HDMI_AUDIO_CODING_TYPE_EAC3, + HDMI_AUDIO_CODING_TYPE_DTS_HD, + HDMI_AUDIO_CODING_TYPE_MLP, + HDMI_AUDIO_CODING_TYPE_DST, + HDMI_AUDIO_CODING_TYPE_WMA_PRO, + HDMI_AUDIO_CODING_TYPE_CXT, +}; + +enum hdmi_audio_sample_size { + HDMI_AUDIO_SAMPLE_SIZE_STREAM, + HDMI_AUDIO_SAMPLE_SIZE_16, + HDMI_AUDIO_SAMPLE_SIZE_20, + HDMI_AUDIO_SAMPLE_SIZE_24, +}; + +enum hdmi_audio_sample_frequency { + HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM, + HDMI_AUDIO_SAMPLE_FREQUENCY_32000, + HDMI_AUDIO_SAMPLE_FREQUENCY_44100, + HDMI_AUDIO_SAMPLE_FREQUENCY_48000, + HDMI_AUDIO_SAMPLE_FREQUENCY_88200, + HDMI_AUDIO_SAMPLE_FREQUENCY_96000, + HDMI_AUDIO_SAMPLE_FREQUENCY_176400, + HDMI_AUDIO_SAMPLE_FREQUENCY_192000, +}; + +enum hdmi_audio_coding_type_ext { + /* Refer to Audio Coding Type (CT) field in Data Byte 1 */ + HDMI_AUDIO_CODING_TYPE_EXT_CT, + + /* + * The next three CXT values are defined in CEA-861-E only. + * They do not exist in older versions, and in CEA-861-F they are + * defined as 'Not in use'. + */ + HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC, + HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC_V2, + HDMI_AUDIO_CODING_TYPE_EXT_MPEG_SURROUND, + + /* The following CXT values are only defined in CEA-861-F. */ + HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC, + HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_V2, + HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC, + HDMI_AUDIO_CODING_TYPE_EXT_DRA, + HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_SURROUND, + HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC_SURROUND = 10, +}; + +struct hdmi_audio_infoframe { + enum hdmi_infoframe_type type; + unsigned char version; + unsigned char length; + unsigned char channels; + enum hdmi_audio_coding_type coding_type; + enum hdmi_audio_sample_size sample_size; + enum hdmi_audio_sample_frequency sample_frequency; + enum hdmi_audio_coding_type_ext coding_type_ext; + unsigned char channel_allocation; + unsigned char level_shift_value; + bool downmix_inhibit; + +}; + +int hdmi_audio_infoframe_init(struct hdmi_audio_infoframe *frame); +ssize_t hdmi_audio_infoframe_pack(struct hdmi_audio_infoframe *frame, + void *buffer, size_t size); +ssize_t hdmi_audio_infoframe_pack_only(const struct hdmi_audio_infoframe *frame, + void *buffer, size_t size); +int hdmi_audio_infoframe_check(struct hdmi_audio_infoframe *frame); + +enum hdmi_3d_structure { + HDMI_3D_STRUCTURE_INVALID = -1, + HDMI_3D_STRUCTURE_FRAME_PACKING = 0, + HDMI_3D_STRUCTURE_FIELD_ALTERNATIVE, + HDMI_3D_STRUCTURE_LINE_ALTERNATIVE, + HDMI_3D_STRUCTURE_SIDE_BY_SIDE_FULL, + HDMI_3D_STRUCTURE_L_DEPTH, + HDMI_3D_STRUCTURE_L_DEPTH_GFX_GFX_DEPTH, + HDMI_3D_STRUCTURE_TOP_AND_BOTTOM, + HDMI_3D_STRUCTURE_SIDE_BY_SIDE_HALF = 8, +}; + + +struct hdmi_vendor_infoframe { + enum hdmi_infoframe_type type; + unsigned char version; + unsigned char length; + unsigned int oui; + u8 vic; + enum hdmi_3d_structure s3d_struct; + unsigned int s3d_ext_data; +}; + +/* HDR Metadata as per 861.G spec */ +struct hdr_static_metadata { + __u8 eotf; + __u8 metadata_type; + __u16 max_cll; + __u16 max_fall; + __u16 min_cll; +}; + +/** + * struct hdr_sink_metadata - HDR sink metadata + * + * Metadata Information read from Sink's EDID + */ +struct hdr_sink_metadata { + /** + * @metadata_type: Static_Metadata_Descriptor_ID. + */ + __u32 metadata_type; + /** + * @hdmi_type1: HDR Metadata Infoframe. + */ + union { + struct hdr_static_metadata hdmi_type1; + }; +}; + +int hdmi_vendor_infoframe_init(struct hdmi_vendor_infoframe *frame); +ssize_t hdmi_vendor_infoframe_pack(struct hdmi_vendor_infoframe *frame, + void *buffer, size_t size); +ssize_t hdmi_vendor_infoframe_pack_only(const struct hdmi_vendor_infoframe *frame, + void *buffer, size_t size); +int hdmi_vendor_infoframe_check(struct hdmi_vendor_infoframe *frame); + +union hdmi_vendor_any_infoframe { + struct { + enum hdmi_infoframe_type type; + unsigned char version; + unsigned char length; + unsigned int oui; + } any; + struct hdmi_vendor_infoframe hdmi; +}; + +/** + * union hdmi_infoframe - overall union of all abstract infoframe representations + * @any: generic infoframe + * @avi: avi infoframe + * @spd: spd infoframe + * @vendor: union of all vendor infoframes + * @audio: audio infoframe + * @drm: Dynamic Range and Mastering infoframe + * + * This is used by the generic pack function. This works since all infoframes + * have the same header which also indicates which type of infoframe should be + * packed. + */ +union hdmi_infoframe { + struct hdmi_any_infoframe any; + struct hdmi_avi_infoframe avi; + struct hdmi_spd_infoframe spd; + union hdmi_vendor_any_infoframe vendor; + struct hdmi_audio_infoframe audio; + struct hdmi_drm_infoframe drm; +}; + +ssize_t hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, + size_t size); +ssize_t hdmi_infoframe_pack_only(const union hdmi_infoframe *frame, + void *buffer, size_t size); +int hdmi_infoframe_check(union hdmi_infoframe *frame); +int hdmi_infoframe_unpack(union hdmi_infoframe *frame, + const void *buffer, size_t size); +void hdmi_infoframe_log(const char *level, struct device *dev, + const union hdmi_infoframe *frame); + +#endif /* _DRM_HDMI_H */ diff --git a/sys/compat/linuxkpi/common/src/linux_hdmi.c b/sys/compat/linuxkpi/common/src/linux_hdmi.c new file mode 100644 index 000000000000..5a9b5c552e49 --- /dev/null +++ b/sys/compat/linuxkpi/common/src/linux_hdmi.c @@ -0,0 +1,1922 @@ +/* + * Copyright (C) 2012 Avionic Design GmbH + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sub license, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifdef __FreeBSD__ +#include +#include +#include +#endif + +#include +#include +#include +#include +#include +#include +#include + +#define hdmi_log(fmt, ...) dev_printk(level, dev, fmt, ##__VA_ARGS__) + +static u8 hdmi_infoframe_checksum(const u8 *ptr, size_t size) +{ + u8 csum = 0; + size_t i; + + /* compute checksum */ + for (i = 0; i < size; i++) + csum += ptr[i]; + + return 256 - csum; +} + +static void hdmi_infoframe_set_checksum(void *buffer, size_t size) +{ + u8 *ptr = buffer; + + ptr[3] = hdmi_infoframe_checksum(buffer, size); +} + +/** + * hdmi_avi_infoframe_init() - initialize an HDMI AVI infoframe + * @frame: HDMI AVI infoframe + */ +void hdmi_avi_infoframe_init(struct hdmi_avi_infoframe *frame) +{ + memset(frame, 0, sizeof(*frame)); + + frame->type = HDMI_INFOFRAME_TYPE_AVI; + frame->version = 2; + frame->length = HDMI_AVI_INFOFRAME_SIZE; +} +EXPORT_SYMBOL(hdmi_avi_infoframe_init); + +static int hdmi_avi_infoframe_check_only(const struct hdmi_avi_infoframe *frame) +{ + if (frame->type != HDMI_INFOFRAME_TYPE_AVI || + frame->version != 2 || + frame->length != HDMI_AVI_INFOFRAME_SIZE) + return -EINVAL; + + if (frame->picture_aspect > HDMI_PICTURE_ASPECT_16_9) + return -EINVAL; + + return 0; +} + +/** + * hdmi_avi_infoframe_check() - check a HDMI AVI infoframe + * @frame: HDMI AVI infoframe + * + * Validates that the infoframe is consistent and updates derived fields + * (eg. length) based on other fields. + * + * Returns 0 on success or a negative error code on failure. + */ +int hdmi_avi_infoframe_check(struct hdmi_avi_infoframe *frame) +{ + return hdmi_avi_infoframe_check_only(frame); +} +EXPORT_SYMBOL(hdmi_avi_infoframe_check); + +/** + * hdmi_avi_infoframe_pack_only() - write HDMI AVI infoframe to binary buffer + * @frame: HDMI AVI infoframe + * @buffer: destination buffer + * @size: size of buffer + * + * Packs the information contained in the @frame structure into a binary + * representation that can be written into the corresponding controller + * registers. Also computes the checksum as required by section 5.3.5 of + * the HDMI 1.4 specification. + * + * Returns the number of bytes packed into the binary buffer or a negative + * error code on failure. + */ +ssize_t hdmi_avi_infoframe_pack_only(const struct hdmi_avi_infoframe *frame, + void *buffer, size_t size) +{ + u8 *ptr = buffer; + size_t length; + int ret; + + ret = hdmi_avi_infoframe_check_only(frame); + if (ret) + return ret; + + length = HDMI_INFOFRAME_HEADER_SIZE + frame->length; + + if (size < length) + return -ENOSPC; + + memset(buffer, 0, size); + + ptr[0] = frame->type; + ptr[1] = frame->version; + ptr[2] = frame->length; + ptr[3] = 0; /* checksum */ + + /* start infoframe payload */ + ptr += HDMI_INFOFRAME_HEADER_SIZE; + + ptr[0] = ((frame->colorspace & 0x3) << 5) | (frame->scan_mode & 0x3); + + /* + * Data byte 1, bit 4 has to be set if we provide the active format + * aspect ratio + */ + if (frame->active_aspect & 0xf) + ptr[0] |= BIT(4); + + /* Bit 3 and 2 indicate if we transmit horizontal/vertical bar data */ + if (frame->top_bar || frame->bottom_bar) + ptr[0] |= BIT(3); + + if (frame->left_bar || frame->right_bar) + ptr[0] |= BIT(2); + + ptr[1] = ((frame->colorimetry & 0x3) << 6) | + ((frame->picture_aspect & 0x3) << 4) | + (frame->active_aspect & 0xf); + + ptr[2] = ((frame->extended_colorimetry & 0x7) << 4) | + ((frame->quantization_range & 0x3) << 2) | + (frame->nups & 0x3); + + if (frame->itc) + ptr[2] |= BIT(7); + + ptr[3] = frame->video_code & 0x7f; + + ptr[4] = ((frame->ycc_quantization_range & 0x3) << 6) | + ((frame->content_type & 0x3) << 4) | + (frame->pixel_repeat & 0xf); + + ptr[5] = frame->top_bar & 0xff; + ptr[6] = (frame->top_bar >> 8) & 0xff; + ptr[7] = frame->bottom_bar & 0xff; + ptr[8] = (frame->bottom_bar >> 8) & 0xff; + ptr[9] = frame->left_bar & 0xff; + ptr[10] = (frame->left_bar >> 8) & 0xff; + ptr[11] = frame->right_bar & 0xff; + ptr[12] = (frame->right_bar >> 8) & 0xff; + + hdmi_infoframe_set_checksum(buffer, length); + + return length; +} +EXPORT_SYMBOL(hdmi_avi_infoframe_pack_only); + +/** + * hdmi_avi_infoframe_pack() - check a HDMI AVI infoframe, + * and write it to binary buffer + * @frame: HDMI AVI infoframe + * @buffer: destination buffer + * @size: size of buffer + * + * Validates that the infoframe is consistent and updates derived fields + * (eg. length) based on other fields, after which it packs the information + * contained in the @frame structure into a binary representation that + * can be written into the corresponding controller registers. This function + * also computes the checksum as required by section 5.3.5 of the HDMI 1.4 + * specification. + * + * Returns the number of bytes packed into the binary buffer or a negative + * error code on failure. + */ +ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, + void *buffer, size_t size) +{ + int ret; + + ret = hdmi_avi_infoframe_check(frame); + if (ret) + return ret; + + return hdmi_avi_infoframe_pack_only(frame, buffer, size); +} +EXPORT_SYMBOL(hdmi_avi_infoframe_pack); + +/** + * hdmi_spd_infoframe_init() - initialize an HDMI SPD infoframe + * @frame: HDMI SPD infoframe + * @vendor: vendor string + * @product: product string + * + * Returns 0 on success or a negative error code on failure. + */ +int hdmi_spd_infoframe_init(struct hdmi_spd_infoframe *frame, + const char *vendor, const char *product) +{ + size_t len; + + memset(frame, 0, sizeof(*frame)); + + frame->type = HDMI_INFOFRAME_TYPE_SPD; + frame->version = 1; + frame->length = HDMI_SPD_INFOFRAME_SIZE; + + len = strlen(vendor); + memcpy(frame->vendor, vendor, min(len, sizeof(frame->vendor))); + len = strlen(product); + memcpy(frame->product, product, min(len, sizeof(frame->product))); + + return 0; +} +EXPORT_SYMBOL(hdmi_spd_infoframe_init); + +static int hdmi_spd_infoframe_check_only(const struct hdmi_spd_infoframe *frame) +{ + if (frame->type != HDMI_INFOFRAME_TYPE_SPD || + frame->version != 1 || + frame->length != HDMI_SPD_INFOFRAME_SIZE) + return -EINVAL; + + return 0; +} + +/** + * hdmi_spd_infoframe_check() - check a HDMI SPD infoframe + * @frame: HDMI SPD infoframe + * + * Validates that the infoframe is consistent and updates derived fields + * (eg. length) based on other fields. + * + * Returns 0 on success or a negative error code on failure. + */ +int hdmi_spd_infoframe_check(struct hdmi_spd_infoframe *frame) +{ + return hdmi_spd_infoframe_check_only(frame); +} +EXPORT_SYMBOL(hdmi_spd_infoframe_check); + +/** + * hdmi_spd_infoframe_pack_only() - write HDMI SPD infoframe to binary buffer + * @frame: HDMI SPD infoframe + * @buffer: destination buffer + * @size: size of buffer + * + * Packs the information contained in the @frame structure into a binary + * representation that can be written into the corresponding controller + * registers. Also computes the checksum as required by section 5.3.5 of + * the HDMI 1.4 specification. + * + * Returns the number of bytes packed into the binary buffer or a negative + * error code on failure. + */ +ssize_t hdmi_spd_infoframe_pack_only(const struct hdmi_spd_infoframe *frame, + void *buffer, size_t size) +{ + u8 *ptr = buffer; + size_t length; + int ret; + + ret = hdmi_spd_infoframe_check_only(frame); + if (ret) + return ret; + + length = HDMI_INFOFRAME_HEADER_SIZE + frame->length; + + if (size < length) + return -ENOSPC; + + memset(buffer, 0, size); + + ptr[0] = frame->type; + ptr[1] = frame->version; + ptr[2] = frame->length; + ptr[3] = 0; /* checksum */ + + /* start infoframe payload */ + ptr += HDMI_INFOFRAME_HEADER_SIZE; + + memcpy(ptr, frame->vendor, sizeof(frame->vendor)); + memcpy(ptr + 8, frame->product, sizeof(frame->product)); + + ptr[24] = frame->sdi; + + hdmi_infoframe_set_checksum(buffer, length); + + return length; +} +EXPORT_SYMBOL(hdmi_spd_infoframe_pack_only); + +/** + * hdmi_spd_infoframe_pack() - check a HDMI SPD infoframe, + * and write it to binary buffer + * @frame: HDMI SPD infoframe + * @buffer: destination buffer + * @size: size of buffer + * + * Validates that the infoframe is consistent and updates derived fields + * (eg. length) based on other fields, after which it packs the information + * contained in the @frame structure into a binary representation that + * can be written into the corresponding controller registers. This function + * also computes the checksum as required by section 5.3.5 of the HDMI 1.4 + * specification. + * + * Returns the number of bytes packed into the binary buffer or a negative + * error code on failure. + */ +ssize_t hdmi_spd_infoframe_pack(struct hdmi_spd_infoframe *frame, + void *buffer, size_t size) +{ + int ret; + + ret = hdmi_spd_infoframe_check(frame); + if (ret) + return ret; + + return hdmi_spd_infoframe_pack_only(frame, buffer, size); +} +EXPORT_SYMBOL(hdmi_spd_infoframe_pack); + +/** + * hdmi_audio_infoframe_init() - initialize an HDMI audio infoframe + * @frame: HDMI audio infoframe + * + * Returns 0 on success or a negative error code on failure. + */ +int hdmi_audio_infoframe_init(struct hdmi_audio_infoframe *frame) +{ + memset(frame, 0, sizeof(*frame)); + + frame->type = HDMI_INFOFRAME_TYPE_AUDIO; + frame->version = 1; + frame->length = HDMI_AUDIO_INFOFRAME_SIZE; + + return 0; +} +EXPORT_SYMBOL(hdmi_audio_infoframe_init); + +static int hdmi_audio_infoframe_check_only(const struct hdmi_audio_infoframe *frame) +{ + if (frame->type != HDMI_INFOFRAME_TYPE_AUDIO || + frame->version != 1 || + frame->length != HDMI_AUDIO_INFOFRAME_SIZE) + return -EINVAL; + + return 0; +} + +/** + * hdmi_audio_infoframe_check() - check a HDMI audio infoframe + * @frame: HDMI audio infoframe + * + * Validates that the infoframe is consistent and updates derived fields + * (eg. length) based on other fields. + * + * Returns 0 on success or a negative error code on failure. + */ +int hdmi_audio_infoframe_check(struct hdmi_audio_infoframe *frame) +{ + return hdmi_audio_infoframe_check_only(frame); +} +EXPORT_SYMBOL(hdmi_audio_infoframe_check); + +/** + * hdmi_audio_infoframe_pack_only() - write HDMI audio infoframe to binary buffer + * @frame: HDMI audio infoframe + * @buffer: destination buffer + * @size: size of buffer + * + * Packs the information contained in the @frame structure into a binary + * representation that can be written into the corresponding controller + * registers. Also computes the checksum as required by section 5.3.5 of + * the HDMI 1.4 specification. + * + * Returns the number of bytes packed into the binary buffer or a negative + * error code on failure. + */ +ssize_t hdmi_audio_infoframe_pack_only(const struct hdmi_audio_infoframe *frame, + void *buffer, size_t size) +{ + unsigned char channels; + u8 *ptr = buffer; + size_t length; + int ret; + + ret = hdmi_audio_infoframe_check_only(frame); + if (ret) + return ret; + + length = HDMI_INFOFRAME_HEADER_SIZE + frame->length; + + if (size < length) + return -ENOSPC; + + memset(buffer, 0, size); + + if (frame->channels >= 2) + channels = frame->channels - 1; + else + channels = 0; + + ptr[0] = frame->type; + ptr[1] = frame->version; + ptr[2] = frame->length; + ptr[3] = 0; /* checksum */ + + /* start infoframe payload */ + ptr += HDMI_INFOFRAME_HEADER_SIZE; + + ptr[0] = ((frame->coding_type & 0xf) << 4) | (channels & 0x7); + ptr[1] = ((frame->sample_frequency & 0x7) << 2) | + (frame->sample_size & 0x3); + ptr[2] = frame->coding_type_ext & 0x1f; + ptr[3] = frame->channel_allocation; + ptr[4] = (frame->level_shift_value & 0xf) << 3; + + if (frame->downmix_inhibit) + ptr[4] |= BIT(7); + + hdmi_infoframe_set_checksum(buffer, length); + + return length; +} +EXPORT_SYMBOL(hdmi_audio_infoframe_pack_only); + +/** + * hdmi_audio_infoframe_pack() - check a HDMI Audio infoframe, + * and write it to binary buffer + * @frame: HDMI Audio infoframe + * @buffer: destination buffer + * @size: size of buffer + * + * Validates that the infoframe is consistent and updates derived fields + * (eg. length) based on other fields, after which it packs the information + * contained in the @frame structure into a binary representation that + * can be written into the corresponding controller registers. This function + * also computes the checksum as required by section 5.3.5 of the HDMI 1.4 + * specification. + * + * Returns the number of bytes packed into the binary buffer or a negative + * error code on failure. + */ +ssize_t hdmi_audio_infoframe_pack(struct hdmi_audio_infoframe *frame, + void *buffer, size_t size) +{ + int ret; + + ret = hdmi_audio_infoframe_check(frame); + if (ret) + return ret; + + return hdmi_audio_infoframe_pack_only(frame, buffer, size); +} +EXPORT_SYMBOL(hdmi_audio_infoframe_pack); + +/** + * hdmi_vendor_infoframe_init() - initialize an HDMI vendor infoframe + * @frame: HDMI vendor infoframe + * + * Returns 0 on success or a negative error code on failure. + */ +int hdmi_vendor_infoframe_init(struct hdmi_vendor_infoframe *frame) +{ + memset(frame, 0, sizeof(*frame)); + + frame->type = HDMI_INFOFRAME_TYPE_VENDOR; + frame->version = 1; + + frame->oui = HDMI_IEEE_OUI; + + /* + * 0 is a valid value for s3d_struct, so we use a special "not set" + * value + */ + frame->s3d_struct = HDMI_3D_STRUCTURE_INVALID; + frame->length = HDMI_VENDOR_INFOFRAME_SIZE; + *** 1444 LINES SKIPPED *** From nobody Tue Mar 28 07:25: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 4Pm1RQ4hJQz41WV2; Tue, 28 Mar 2023 07:25: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 4Pm1RQ3jdYz3qGp; Tue, 28 Mar 2023 07:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679988306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OhcXr2K3zfd0bShnJXtL1xjZxYgbEWiVNa3ScAcYAVo=; b=K6UNleLrBWUdqCRXZBeDIs6m9EMY+sMiygEpFKjuQX+2+tw8JgBC86dlDyhJEu2r3/4xXi SODgwYERV/hsnxQdhUPWGgM5PkvGNovL6BGdn1ceFjflKUxjZ0maDQqm2VAZyrIXbm8UcM MdNFqOJ/w2kolJeX/3tT9MWYCfS5xagiy+ncOSRxnkgzQ9MneTj9QWLJcVoLg9LfuCyETi pGKJIhtmtX0HYjp2V8Hkbs2HLl9U9cCf6mEniXiFPp6IsUDc91yLiInqVw0SaX4Iz1nuoB msJ5lc90PynU3ZTlBTGek+Ycab6T2DbVMhJsyXeC6sN57KC6wbIU4fuujk5kyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679988306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OhcXr2K3zfd0bShnJXtL1xjZxYgbEWiVNa3ScAcYAVo=; b=PYVJPThb+2y/94ZrmHQdlmNrgfc0OnseakcT9XK4qOCPX/sCmZvqQ1CqUtwHKiBZXyTAt+ 4ivHwZg1x+/KkC9EXQ8H/M444bmsLA+3wfqwqeK7iJvDRJiusgz2RMk5kLbdcwZFPOy+nW Lg1O/4NvKKFE5+vF9GULsFdOXvq37M7knDzbfim/0HWKURbt9vPyh+ix0RUrDzcsuEPL6q mGmrozYbFefiCCVU4t/b2EtfZcyQe6IkGD9AZR7kB+Dk6abuZ+6Bbgt+AN1vPFMLq8EPXf LzOY00qC8BxgNtUwolFUsIqLrvhVm4BiuDFMJ9ZG9uGGejt1vK4E8VkGpl1jCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679988306; a=rsa-sha256; cv=none; b=tnCUgXxhrzf8yAfaWuUHEt9bUkjuW+QgB24sRDwmj5HdCsDqiYgcvkXeOJrpFq0NOh9hXB 2tCKMph+fTyqrGbb4R/knbBLhd42cn1YEWE+r/0ruxS3oWdGxCQTqqH2zMW2VsAp37/Dil R3YxasjzA5n1pidBrHO2pjugu2frds8UwbkHTL3OuG2swWh1m4n2lcDyXlmjiK0vHU2Q0m 31OuDKcmRA4+XsQVNrXmov7idEinJTFYAXPSwuNFaMhctbNRErhBA1pUXMQPSKc+V86Ok8 8wZZY/LObC7diFD08TQownqnUgyC/Ms3PG+bA7Jbt7Fo+CM0nzhzn4EM6C6IEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pm1RQ2SW1zvyc; Tue, 28 Mar 2023 07:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32S7P64H036534; Tue, 28 Mar 2023 07:25:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S7P60m036533; Tue, 28 Mar 2023 07:25:06 GMT (envelope-from git) Date: Tue, 28 Mar 2023 07:25:06 GMT Message-Id: <202303280725.32S7P60m036533@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: aaf6129c9dcd - main - linuxkpi: Add devm_add_action and devm_add_action_or_reset List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: aaf6129c9dcde5eb020f585901a6f32d850d8cf6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=aaf6129c9dcde5eb020f585901a6f32d850d8cf6 commit aaf6129c9dcde5eb020f585901a6f32d850d8cf6 Author: Emmanuel Vadot AuthorDate: 2023-03-17 11:22:06 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-28 07:19:05 +0000 linuxkpi: Add devm_add_action and devm_add_action_or_reset Those adds a new devres and will exectute some function on release. Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D39142 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/compat/linuxkpi/common/include/linux/device.h | 7 ++++ sys/compat/linuxkpi/common/src/linux_devres.c | 43 +++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index 4b665e8db8d1..df6f10bd573b 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -680,4 +680,11 @@ devm_kmemdup(struct device *dev, const void *src, size_t len, gfp_t gfp) #define devm_kcalloc(_dev, _sizen, _size, _gfp) \ devm_kmalloc((_dev), ((_sizen) * (_size)), (_gfp) | __GFP_ZERO) +int lkpi_devm_add_action(struct device *dev, void (*action)(void *), void *data); +#define devm_add_action(dev, action, data) \ + lkpi_devm_add_action(dev, action, data); +int lkpi_devm_add_action_or_reset(struct device *dev, void (*action)(void *), void *data); +#define devm_add_action_or_reset(dev, action, data) \ + lkpi_devm_add_action_or_reset(dev, action, data) + #endif /* _LINUXKPI_LINUX_DEVICE_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_devres.c b/sys/compat/linuxkpi/common/src/linux_devres.c index 96ff3e486d1d..0072713af322 100644 --- a/sys/compat/linuxkpi/common/src/linux_devres.c +++ b/sys/compat/linuxkpi/common/src/linux_devres.c @@ -224,3 +224,46 @@ lkpi_devm_kmalloc_release(struct device *dev __unused, void *p __unused) /* Nothing to do. Freed with the devres. */ } + +struct devres_action { + void *data; + void (*action)(void *); +}; + +static void +lkpi_devm_action_release(struct device *dev, void *res) +{ + struct devres_action *devres; + + devres = (struct devres_action *)res; + devres->action(devres->data); +} + +int +lkpi_devm_add_action(struct device *dev, void (*action)(void *), void *data) +{ + struct devres_action *devres; + + KASSERT(action != NULL, ("%s: action is NULL\n", __func__)); + devres = lkpi_devres_alloc(lkpi_devm_action_release, + sizeof(struct devres_action), GFP_KERNEL); + if (devres == NULL) + return (-ENOMEM); + devres->data = data; + devres->action = action; + devres_add(dev, devres); + + return (0); +} + +int +lkpi_devm_add_action_or_reset(struct device *dev, void (*action)(void *), void *data) +{ + int rv; + + rv = lkpi_devm_add_action(dev, action, data); + if (rv != 0) + action(data); + + return (rv); +} From nobody Tue Mar 28 07:25: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 4Pm1RR5XXCz41WYL; Tue, 28 Mar 2023 07:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pm1RR4scFz3qHB; Tue, 28 Mar 2023 07:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679988307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2CeVsroY65xVVjNT+uqiDv84ryLjoxgA0J6ssWNgJEc=; b=X+l5Cy456VRqquTCOPVg+IX9EAizxx4rKmBD3Ki/4ZDdqNfy1q0vuFum5H/O2QGA77pcXv Zz+w7R6cxTNp+DFEIPb8f1165WdQPrytlZ3H5BZx7WvhLmo3GNoIcCiqg/FsN2+xZwv468 LgXmx8FBK0DIfK6HHAV5gwZH7XCqbvZB245uSRaLudr67BDifbJCh46eTu9Zbn4iPFTXC9 5ikhz2byy9Dw4K/z0KKhW7jcXk1wyKpjf1IzVucb1SsxZnreK7ch7Yb65hyBWC41b9/21W iER62pSd/Uq+tlUPGT95qAWC3wr8kZjZhuVFRbx/ot9HWm1Qf0co0JZ9cBcPWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679988307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2CeVsroY65xVVjNT+uqiDv84ryLjoxgA0J6ssWNgJEc=; b=HAEFcg+r7NzV7MMCyr9VXXWLQ0FF2ank6IXpPXAzv1JQMd3dI4ojLU2gl2kHCrI0E72iBH zD6aVLxASrr3L0QvdZENzCgeH9DU3Rktj6qyw5/468m9lQMCU1gOgJfrGBOgjY9QhelPsU dcJdV8Le2WMavm8iGMvnd2kydQysihr8cEUxVhnr2GaJ/gAIW7GgjTMCnQZbCg4Br8d8ho W/jORvZXQi1r1GrvTt1A07eeLc4fKtiB6AUlI+Ek8Eio2yMy2RtCkajuepIMcT7jFFt5S+ UNHp8uYVjEudGgZ2+O9AX0Lzai7QCPOTIJG8nrtAutsjXeLR4JQk/H5V0afDOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679988307; a=rsa-sha256; cv=none; b=JbkGPse0/AhUMS37TIsaeW4Jwl8stzS51V3gBU6pZ4by0wYhtT91b67Uy/BAt0orMDmalJ jOY7kV8LvUxQC6tL2inzEfZDJk3lgrQZmQ2EKa3JwvZHjmcElOY6cOO/yfoNHFCnBdbokp drT7Asj+RFfUTr09bJTCO87tjGE2w6f6o3qeu8S2RzqP4ebx8MgSAC4eLrlZZFglVL7lYE OwNvBVn1SVbi/189IsdHnHWINVOp8M63nqv/LcJDS32AVDJWWZhxjiUUmDDQ//16XRLALG ltFDHyrL7bZn3Iv8Vv5ev4WIjFNywCAvAOFrgfY4G3csFDKwVm8NRJaWBfk1pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pm1RR3NzVzv6s; Tue, 28 Mar 2023 07:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32S7P7BJ036556; Tue, 28 Mar 2023 07:25:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S7P7uC036555; Tue, 28 Mar 2023 07:25:07 GMT (envelope-from git) Date: Tue, 28 Mar 2023 07:25:07 GMT Message-Id: <202303280725.32S7P7uC036555@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: 1cebc9298cf2 - main - Bump __FreeBSD_version after linuxkpi updates. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 1cebc9298cf2272da46c3c574d06a80ce59854aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=1cebc9298cf2272da46c3c574d06a80ce59854aa commit 1cebc9298cf2272da46c3c574d06a80ce59854aa Author: Emmanuel Vadot AuthorDate: 2023-03-28 07:19:53 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-28 07:19:53 +0000 Bump __FreeBSD_version after linuxkpi updates. Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index cf8755f2ac99..a40003c1d688 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -76,7 +76,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400084 +#define __FreeBSD_version 1400085 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Tue Mar 28 08:56: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 4Pm3T40pTjz41crb; Tue, 28 Mar 2023 08:56: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 4Pm3T40Hxvz4384; Tue, 28 Mar 2023 08:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679993800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DM6ix2BjyzJpn3PfuxPJwPlXrQP+ieADetBPWvOgbzA=; b=l1oYBatvPwY5x0tvKM+CYGl3qRIoNx2N2x/0V5F8PgyORbjCwJqqREIjemiHEEQ6N7Fw96 cn5GEFVYb+Jl9H95hEppvdoQb7Fl/pXxkiuGd3DGST3r6xt8Aufh2eirGPRMs0DYh8MMGY 0UUK/QWFs37piCTFaFgaTwxCbr4dO2nKo8TH39W9vpfDYnSx/66udDPNST6pF1pmWT2WPA G2dIQ8AOV0XPGNyiKXa4C5h6rgWjV81DMS8K2FyDVirT/XzDHwgWRyNzSKfPLwfEwcQU9j nahNdO787FBu2pNRuuFwCwY0yfwdEqILaIkKyPn/ri1ppWV4y3Lur+tgcXDjow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679993800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DM6ix2BjyzJpn3PfuxPJwPlXrQP+ieADetBPWvOgbzA=; b=lorFCmF76qCl8QFNkHqfiTOtNy9I4Mnld9oVD+8g1ZVyOjOXEBGn1ikBkZpn+gRLLe8DL8 96R3tmQkXEUqc3Q+53UorXeHBWNnrERwod5uvxtEevrVep1FiIFBra8pqQAMazQb3BuUu5 kIIBw63dQpyuUuSbqSyYQHcVxiHjLQcy5FBSZvAb52QK2RybEyAjqDL2//wiJb/6Cha+bs HApWKNoHAThYDPN+CCIcrJa4deZMciDxHctkmpex9cG8V60MDBzkauh7F/2pcj3L2B7qjJ +NW8dZDwpDbIEfwKV9aCIxkOhi3hrCq9dmgdD9drLm9ZX+ndGwUIy6s+5Y5P9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679993800; a=rsa-sha256; cv=none; b=xNYdMhsREYpqR9BOPgHat4eLgZOZyIzks3HGqwZY1AdWRAkinc+ke3BPvHt7O0W7nTxrlh ZtMZ8PrPrTEuIuaK5cHLrqqthiS324MjalK8OsJr9pXH497l7I2I3kA5Hjdcat4U/atfmF aXG7tYLT1PJ0jJ/qNW2jrulUw8GwJzYhIYQ+TO9JVQdjCRYBbRXnc6IfxUiR8Bte+CMKgb g/HqXRD5bCENehZkOnH2mla59eU7k2sNuztWQbjjjKi85M95GTj8xtH4Nr7By4L43VklkA 0LFqPihLbAPMQX3G9bN/SN2EQOhf46tA+vIyGBjLq5P+c31JxJb9h7cqPf8jEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pm3T36SnrzxtZ; Tue, 28 Mar 2023 08:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32S8udNi084997; Tue, 28 Mar 2023 08:56:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S8udUK084996; Tue, 28 Mar 2023 08:56:39 GMT (envelope-from git) Date: Tue, 28 Mar 2023 08:56:39 GMT Message-Id: <202303280856.32S8udUK084996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: bd9d75e49fab - main - route: revert transport to rtsock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd9d75e49fab817965fe8c52807f268c357314f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=bd9d75e49fab817965fe8c52807f268c357314f3 commit bd9d75e49fab817965fe8c52807f268c357314f3 Author: Alexander V. Chernikov AuthorDate: 2023-03-28 08:54:33 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-28 08:56:18 +0000 route: revert transport to rtsock Temporary switch route(8) back to using rtsock to address the discovered issues. --- sbin/route/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sbin/route/Makefile b/sbin/route/Makefile index aec222310d46..6bae363375a9 100644 --- a/sbin/route/Makefile +++ b/sbin/route/Makefile @@ -19,11 +19,7 @@ CFLAGS+= -DINET6 .endif CFLAGS+= -I. -.if ${MK_NETLINK_SUPPORT} != "no" -SRCS+= route_netlink.c -.else CFLAGS+=-DWITHOUT_NETLINK -.endif HAS_TESTS= SUBDIR.${MK_TESTS}+= tests From nobody Tue Mar 28 08: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 4Pm3Tq3PCmz41d2g; Tue, 28 Mar 2023 08: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 4Pm3Tq2rCCz43jV; Tue, 28 Mar 2023 08: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=1679993839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GeOHMIQO/IJbBs2CzbOkr2FRCZ4PVXHY1nqpYnFwoTw=; b=ZOUrGQ5OlseLJZDX0uRFGTfCsXgxx0170eP+zqoYv8NOaZtUBExlk/e441UnyPOiDf8pSQ 07HgYkPJ6li3n6Hx2F6BAkHEtgStao1EWu0UESo+i4lRGbpt0w3W/x2JDTp5/55pJZgLHm ywFlc7YtcKjsomADyzT8gJgci3WL97FHJ5lMDnz7whFTa6gleJKisSYQ0k6K8oHAhvuxyv lKcdeT8QoUBLF+2DvqC1Ag0s8UJlkehADsc8TjWRA3zMCtT0wRe7iqp9iXX1XS7HJegrpA 0uSs1P1PBN42Fx4lJ3DO+VPiCdUp4KYvI91URsxmhamgOSSg8nlvuDpkh7x7ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679993839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GeOHMIQO/IJbBs2CzbOkr2FRCZ4PVXHY1nqpYnFwoTw=; b=qLhAhtZjCcTGmMEYq4qUHkm44OYjXG1VnX8L/uDdp/lXnpZYFvzqikK4Mej2gIy28/qrd6 JwIueHWeng8X6ZmtJsc7LA3yq7+VwLiPbpEesOfpMoH+yKbkKqAmFj9p4kUN8EdX7tEFKJ zXpaA5zDqVa5u1J13Y7MkBEFAJKydjrCEObH8NMzgbG5TrddEYSCwedXLaRh5nU76EzQwr sfKGi75GcK31GSw4DTmpPvICxE2WljV08Ax9inMlM6CTsBoKbyTbxnn6wDuLAq29ruboSJ rjy13lqrVAm2fOjqkJ1br7W8piGmxeftJ3vKfKvRb1AGM5lYO1serXIj2ShrWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679993839; a=rsa-sha256; cv=none; b=NS3lAbYXziFpfSsAz+SVtHozxhJWk0RLnnBE1D1Ur1yMm1Zu7fv78Hp9IYjUi/uEUekQgx 2+f29vDoRVpcaKA1tlaAE33SrhDIyaKhhFlE+AhtxHqgqvCuadUXhpA7OAJd5aMxbhulus 3VySjS8Dz7zDhlWd0juI2grGE64CmkFkaYK0xm3Kw9nGrJPa9x/KD3TxYCuJYtS5ge+b2J 2EJ0eSuyrNDMeUYpR+YlHjxLVkZd2sdI0G5Cgy9Qr6CQ48y4+JOP2IAoM6AZFXInoBowym fHRHgcndE1E+pMWQIPjEiLYpTuCSLWQgVPPrwcL9JnIHMHTIORwuxw83KYe/pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pm3Tq1vgpzyH5; Tue, 28 Mar 2023 08:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32S8vJJ1085203; Tue, 28 Mar 2023 08:57:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S8vJUX085202; Tue, 28 Mar 2023 08:57:19 GMT (envelope-from git) Date: Tue, 28 Mar 2023 08:57:19 GMT Message-Id: <202303280857.32S8vJUX085202@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: 51d07956cf22 - main - linuxkpi: Add alderlake defines in intel-family List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 51d07956cf224654347b04f361c2e6eaef4a4aa8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=51d07956cf224654347b04f361c2e6eaef4a4aa8 commit 51d07956cf224654347b04f361c2e6eaef4a4aa8 Author: Emmanuel Vadot AuthorDate: 2023-03-28 08:56:18 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-28 08:57:13 +0000 linuxkpi: Add alderlake defines in intel-family Needed by drm-kmod. Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/compat/linuxkpi/common/include/asm/intel-family.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/asm/intel-family.h b/sys/compat/linuxkpi/common/include/asm/intel-family.h index 1dae979b3c5e..91ad1d1a8ff3 100644 --- a/sys/compat/linuxkpi/common/include/asm/intel-family.h +++ b/sys/compat/linuxkpi/common/include/asm/intel-family.h @@ -1,3 +1,6 @@ /* Public domain. */ +#define INTEL_FAM6_ALDERLAKE 0x97 +#define INTEL_FAM6_ALDERLAKE_L 0x9A + #define INTEL_FAM6_ROCKETLAKE 0xA7 From nobody Tue Mar 28 09:01: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 4Pm3Zx1WKtz41d8B; Tue, 28 Mar 2023 09:01:45 +0000 (UTC) (envelope-from melifaro@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 4Pm3Zx12qwz44Ct; Tue, 28 Mar 2023 09:01:45 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679994105; 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=LarF+u4VN5e42XEOLJj/vFyt6PuzvWHkFxWdO5lPs3A=; b=Gs72tNGsN8BIKhkW7OvMt93c751CribN2/+BhbMp5O5BKQbNC06o6fMkMj7tURDtGIQFeh x6bGfKoKqFUmcY+h58K8g6+Xhi0FAkMNCe0nYqZtsKZzKMdI0RWF7DPb5bOGe+OmdyRiDg TiH0mpAMdhJ+hHxXw5yqXLuadw7SF4nhYOqjs0mSf2Ig8qWdP0+unqNBUAWoqDmzwyagtP TR0AyyyYZn5StfR67vyR2Mft9N8752UkEc+Hz2sjS0eiCNMDGwYj7ZnxjmD3Cv2oBOhhGp UiBItwQ/gN54WVFzMs0v59szOjcX0A2uttAhwXRCzjHncnNxZqy0W/VwKdFIPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679994105; 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=LarF+u4VN5e42XEOLJj/vFyt6PuzvWHkFxWdO5lPs3A=; b=dM/Q8hRppKnuH2VWuoRpR4T1X1CVQ8L5dU9Sx0dfxkGDlKjE+DhR8xSEQopqZh7XC8/0P5 gv+Z3TpUaJ3ak3dnHvS05b8ZmjtKsFDDmyg4gPSDouwLdJMZl5eBTFD9DkS3TVWJYOXxJ9 pjQi4LLLTyGTWDqTQ39DaPZk0O20AgP8dZquSp2jGlPx9k3A3CAv+T7ZQ04WZxfPP+/y54 FwlBDnQDIvCJ+8BcgBiT6o6O9LN1DNuUAaWNelbZMmuj4IE8s6Otjc153fQJSMyaXXwAfU 6+a7KUA0kZrDaB7gdq8YJzHjTjW7MSXWF/zmzkbDKMttfOERDxMy3853aiVfhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679994105; a=rsa-sha256; cv=none; b=kKH0tYFXIJL/p9omha7YS8KHAT8ULL5uXZdD4G8qY68AnyftQZ6pyZl/0B+X/xPSSJ4CPv qLz9XBagsDnUfrWSmLYAYeB7ZY9TjyK9+7WpAjhpDWvF79rf3TPAPJEPLVP10+1+NAal2A C8+xtnXqcU+9NY9duyHoZMR1lYA49jcSR/8/PgazngVMRCJ4v96ebeypil8tyShIqH7B1X biugB8bBoitPWWhYcxUstXcpaB8HqlDU+3PpsSD8r4AvF2dzqWIGnx/LJdyLCAF6WfdSrS ghoCMZ7t6pqELu53/hFIT5MHbU60qu4NqOqPimS7X9mzhJA3YR7J1xM71piiyw== Received: from smtpclient.apple (unknown [IPv6:2a02:8084:d6bb:510:198e:52cc:ae4c:3466]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: melifaro/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pm3Zw3YZCzYdQ; Tue, 28 Mar 2023 09:01:44 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) 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.400.51.1.1\)) Subject: Re: git: c597432e2297 - main - route(8): convert to netlink From: Alexander Chernikov In-Reply-To: <86zg7yyqc3.fsf@ltc.des.no> Date: Tue, 28 Mar 2023 10:01:32 +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: References: <202303261107.32QB7UZK058893@gitrepo.freebsd.org> <86zg7yyqc3.fsf@ltc.des.no> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: Apple Mail (2.3731.400.51.1.1) X-ThisMailContainsUnwantedMimeParts: N > On 27 Mar 2023, at 19:57, Dag-Erling Sm=C3=B8rgrav = wrote: >=20 > "Alexander V. Chernikov" writes: >> route(8): convert to netlink >=20 > Did you make sure that netlink is either included in all kernel > configurations or automatically loaded on first use? Not exactly. Sorry for the breakage, I reverted route(8) back to rtsock = till I address all the issues. /Alexander=20 >=20 > DES > --=20 > Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Tue Mar 28 09:08: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 4Pm3lP71WNz41dr5; Tue, 28 Mar 2023 09:09:05 +0000 (UTC) (envelope-from melifaro@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 4Pm3lP5V7kz45f1; Tue, 28 Mar 2023 09:09:05 +0000 (UTC) (envelope-from melifaro@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679994545; 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=u0aS1zbuHVDAhIbrl6k3MvxBsLWGW331futebHNN180=; b=SD5h/Q6T5LmXOj5aBYlhU2cEayXvXCntHxWCsgGRZ2XSrJxrNm0dYSlzTZ/9LGcL+9vH5D UFLF7kyvTWaLRFnEluspVZz5xnXYs2UH8LjPpMGnhwRinZJT3NTVAmrVzbDIbz6YBliBR4 pu+gdsfMTwqckFnbpRys77Ad388ATIpa9JpUNol5Is5KjKcq3N54Ddrb/8nAsozWtbUQiJ QYkRVhh4EfIhctE/Wg9G1njPsapcW8xTARirExnBTxB6SNM4ouqts0YSoiNPAXM436H8dY sJQkxYBzSWEQ0XyxJ7KuUhzGSMVaihyNvrxJ7FDAsjPbxrGY0IxT4ovx65IabQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679994545; 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=u0aS1zbuHVDAhIbrl6k3MvxBsLWGW331futebHNN180=; b=eovpuNQIS7rL7HRCRtqt8mD0ntoAVWmUpQl3w7f6nvbV5eOL8eN6Hp1I9Hf62OuR2/5ULd XNLEPD6uSSXoucAvOw46cPh+dRqtP0HmRSQCSx5QrM6e39TZms8YRvg+bbhPhjvtetbeqf 0DunVyPehC1kRVj2UFxJVM31t8gzb8VOZXYDiZUO7Yng6q3YTIVLUDCjydol7EF23ry0QB jsCWHIJRdVn3kIflSs+bTAsmYvDIxoGn63pPW1byqzcaC0O3P3cz0CIOhGgKuvnqGPEnWE 4oBMI5naR5bFj1pQRn3NXj+uQXTF+RlcXtIlJimYfvr35HCMAhRC4I22p5bMYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679994545; a=rsa-sha256; cv=none; b=yXkQAax6PwfERi/EYgRP+MUnXuYtJRE2QajLES5Q0zvDCemhOTn8QQZ95insAkKF5KKmHC xWpcxlV1U7xfnzCPyW5exYJdmoYQJFvP9Iz6gkLHFjhIFjGfAr1WFoDzKQGohWoUIHTHFv XuVAeEBVwfWN5gmJmZq0Vs7yRTHxsAymd0v5H+HApZIjR6/wdAzcShaCrpLFQYxIixSvP0 ewFOTcKyfFmdRcYcp6cEtrnK0FKMNxupAY4CH3Seq0uVkRGqS3xSHn5GsdvPHSJFIbI2GY gwXeOXbwGQEB6K+11kg0flZpsx6/89mAK7Hsn4AYqSDqasWds1Uoo3UkEbgMsg== Received: from smtpclient.apple (unknown [IPv6:2a02:8084:d6bb:510:198e:52cc:ae4c:3466]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: melifaro/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pm3lN5k16zXYN; Tue, 28 Mar 2023 09:09:04 +0000 (UTC) (envelope-from melifaro@freebsd.org) From: Alexander Chernikov Message-Id: Content-Type: multipart/alternative; boundary="Apple-Mail=_AE460F85-A90B-4D1C-9453-E5B4D7CEC4B9" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: 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.400.51.1.1\)) Subject: Re: git: c597432e2297 - main - route(8): convert to netlink Date: Tue, 28 Mar 2023 10:08:53 +0100 In-Reply-To: <81A0DF64-F466-451F-83CB-86A9FC1EB300@freebsd.org> Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Jessica Clarke References: <202303261107.32QB7UZK058893@gitrepo.freebsd.org> <81A0DF64-F466-451F-83CB-86A9FC1EB300@freebsd.org> X-Mailer: Apple Mail (2.3731.400.51.1.1) X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail=_AE460F85-A90B-4D1C-9453-E5B4D7CEC4B9 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 27 Mar 2023, at 21:41, Jessica Clarke wrote: >=20 > On 26 Mar 2023, at 12:07, Alexander V. Chernikov > wrote: >>=20 >> The branch main has been updated by melifaro: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc597432e22975f4d409b845377996712= 9c6b57e9 >>=20 >> commit c597432e22975f4d409b8453779967129c6b57e9 >> Author: Alexander V. Chernikov >> AuthorDate: 2023-03-26 09:13:50 +0000 >> Commit: Alexander V. Chernikov >> CommitDate: 2023-03-26 11:06:56 +0000 >>=20 >> route(8): convert to netlink >>=20 >> This change converts all kernel rtsock interactions in route(8) >> to Netlink. >>=20 >> Based on the WITHOUT_NETLINK_SUPPORT src.conf(5) variable, route(8) >> now fully operates either via Netlink or via rtsock/sysctl. >> The default (compile-time) is Netlink. >>=20 >> The output for route delete/add/get/flush is targeted to be exactly >> the same (apart from some error handling cases). >> The output for the route monitor has been changed to improve >> readability and support netlink models. >>=20 >> Other behaviour changes: >> * exact prefix lookup (route -n get a.b.c.d/e) is not yet = supported. >> * route monitor does not show the change originator yet. >=20 > If there are regressions then it should be off by default, = *especially* Hi Jessica, I have a plan to fix both this week. I=E2=80=99d also want to note that = these two are not the documented / often used features. > when we=E2=80=99re just under a month out from the proposed 14 code = slush. >=20 > Jess >=20 >> Differential Revision: https://reviews.freebsd.org/D39007 >> --- >> sbin/route/Makefile | 6 + >> sbin/route/route.c | 117 +++++-- >> sbin/route/route_netlink.c | 835 = +++++++++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 930 insertions(+), 28 deletions(-) >>=20 >> diff --git a/sbin/route/Makefile b/sbin/route/Makefile >> index e65030f805bb..aec222310d46 100644 >> --- a/sbin/route/Makefile >> +++ b/sbin/route/Makefile >> @@ -19,6 +19,12 @@ CFLAGS+=3D -DINET6 >> .endif >> CFLAGS+=3D -I. >>=20 >> +.if ${MK_NETLINK_SUPPORT} !=3D "no" >> +SRCS+=3D route_netlink.c >> +.else >> +CFLAGS+=3D-DWITHOUT_NETLINK >> +.endif >> + >> HAS_TESTS=3D >> SUBDIR.${MK_TESTS}+=3D tests >>=20 >> diff --git a/sbin/route/route.c b/sbin/route/route.c >> index 5f33cecb1b20..947c97ce794a 100644 >> --- a/sbin/route/route.c >> +++ b/sbin/route/route.c >> @@ -90,12 +90,11 @@ static struct keytab { >> {0, 0} >> }; >>=20 >> +int verbose, debugonly; >> static struct sockaddr_storage so[RTAX_MAX]; >> static int pid, rtm_addrs; >> -static int s; >> -static int nflag, af, qflag, tflag; >> -static int verbose, aflen; >> -static int locking, lockrest, debugonly; >> +static int nflag, af, aflen, qflag, tflag; >> +static int locking, lockrest; >> static struct rt_metrics rt_metrics; >> static u_long rtm_inits; >> static uid_t uid; >> @@ -103,18 +102,30 @@ static int defaultfib; >> static int numfibs; >> static char domain[MAXHOSTNAMELEN + 1]; >> static bool domain_initialized; >> -static int rtm_seq; >> static char rt_line[NI_MAXHOST]; >> static char net_line[MAXHOSTNAMELEN + 1]; >>=20 >> +#ifdef WITHOUT_NETLINK >> +static int s; >> +static int rtm_seq; >> + >> static struct { >> struct rt_msghdr m_rtm; >> char m_space[512]; >> } m_rtmsg; >>=20 >> +static int rtmsg_rtsock(int, int, int); >> +static int flushroutes_fib_rtsock(int); >> +static void monitor_rtsock(void); >> +#else >> +int rtmsg_nl(int, int, int, struct sockaddr_storage *, = struct rt_metrics *); >> +int flushroutes_fib_nl(int, int); >> +void monitor_nl(int); >> +#endif >> + >> static TAILQ_HEAD(fibl_head_t, fibl) fibl_head; >>=20 >> -static void printb(int, const char *); >> +void printb(int, const char *); >> static void flushroutes(int argc, char *argv[]); >> static int flushroutes_fib(int); >> static int getaddr(int, char *, int); >> @@ -127,7 +138,7 @@ static int inet6_makenetandmask(struct = sockaddr_in6 *, const char *); >> #endif >> static void interfaces(void); >> static void monitor(int, char*[]); >> -static const char *netname(struct sockaddr *); >> +const char *netname(struct sockaddr *); >> static void newroute(int, char **); >> static int newroute_fib(int, char *, int); >> static void pmsg_addrs(char *, int, size_t); >> @@ -135,7 +146,7 @@ static void pmsg_common(struct rt_msghdr *, = size_t); >> static int prefixlen(const char *); >> static void print_getmsg(struct rt_msghdr *, int, int); >> static void print_rtmsg(struct rt_msghdr *, size_t); >> -static const char *routename(struct sockaddr *); >> +const char *routename(struct sockaddr *); >> static int rtmsg(int, int, int); >> static void set_metric(char *, int); >> static int set_sofib(int); >> @@ -216,12 +227,14 @@ main(int argc, char **argv) >>=20 >> pid =3D getpid(); >> uid =3D geteuid(); >> +#ifdef WITHOUT_NETLINK >> if (tflag) >> s =3D open(_PATH_DEVNULL, O_WRONLY, 0); >> else >> s =3D socket(PF_ROUTE, SOCK_RAW, 0); >> if (s < 0) >> err(EX_OSERR, "socket"); >> +#endif >>=20 >> len =3D sizeof(numfibs); >> if (sysctlbyname("net.fibs", (void *)&numfibs, &len, NULL, 0) =3D=3D= -1) >> @@ -264,10 +277,14 @@ static int >> set_sofib(int fib) >> { >>=20 >> +#ifdef WITHOUT_NETLINK >> if (fib < 0) >> return (0); >> return (setsockopt(s, SOL_SOCKET, SO_SETFIB, (void *)&fib, >> sizeof(fib))); >> +#else >> + return (0); >> +#endif >> } >>=20 >> static int >> @@ -395,7 +412,9 @@ flushroutes(int argc, char *argv[]) >>=20 >> if (uid !=3D 0 && !debugonly && !tflag) >> errx(EX_NOPERM, "must be root to alter routing table"); >> +#ifdef WITHOUT_NETLINK >> shutdown(s, SHUT_RD); /* Don't want to read back our messages */ >> +#endif >>=20 >> TAILQ_INIT(&fibl_head); >> while (argc > 1) { >> @@ -441,6 +460,17 @@ flushroutes(int argc, char *argv[]) >>=20 >> static int >> flushroutes_fib(int fib) >> +{ >> +#ifdef WITHOUT_NETLINK >> + return (flushroutes_fib_rtsock(fib)); >> +#else >> + return (flushroutes_fib_nl(fib, af)); >> +#endif >> +} >> + >> +#ifdef WITHOUT_NETLINK >> +static int >> +flushroutes_fib_rtsock(int fib) >> { >> struct rt_msghdr *rtm; >> size_t needed; >> @@ -525,8 +555,9 @@ retry: >> free(buf); >> return (error); >> } >> +#endif >>=20 >> -static const char * >> +const char * >> routename(struct sockaddr *sa) >> { >> struct sockaddr_dl *sdl; >> @@ -645,7 +676,7 @@ routename(struct sockaddr *sa) >> * Return the name of the network whose address is given. >> * The address is assumed to be that of a net, not a host. >> */ >> -static const char * >> +const char * >> netname(struct sockaddr *sa) >> { >> struct sockaddr_dl *sdl; >> @@ -810,8 +841,10 @@ newroute(int argc, char **argv) >> warn("sigaction SIGALRM"); >>=20 >> cmd =3D argv[0]; >> +#ifdef WITHOUT_NETLINK >> if (*cmd !=3D 'g' && *cmd !=3D 's') >> shutdown(s, SHUT_RD); /* Don't want to read back our = messages */ >> +#endif >> while (--argc > 0) { >> if (**(++argv)=3D=3D '-') { >> switch (key =3D keyword(1 + *argv)) { >> @@ -1398,8 +1431,8 @@ retry2: >> static void >> monitor(int argc, char *argv[]) >> { >> - int n, fib, error; >> - char msg[2048], *endptr; >> + int fib, error; >> + char *endptr; >>=20 >> fib =3D defaultfib; >> while (argc > 1) { >> @@ -1435,6 +1468,19 @@ monitor(int argc, char *argv[]) >> interfaces(); >> exit(0); >> } >> +#ifdef WITHOUT_NETLINK >> + monitor_rtsock(); >> +#else >> + monitor_nl(fib); >> +#endif >> +} >> + >> +#ifdef WITHOUT_NETLINK >> +static void >> +monitor_rtsock(void) >> +{ >> + char msg[2048]; >> + int n; >>=20 >> #ifdef SO_RERROR >> n =3D 1; >> @@ -1454,25 +1500,12 @@ monitor(int argc, char *argv[]) >> print_rtmsg((struct rt_msghdr *)(void *)msg, n); >> } >> } >> +#endif >>=20 >> static int >> rtmsg(int cmd, int flags, int fib) >> { >> - int rlen; >> - char *cp =3D m_rtmsg.m_space; >> - int l; >> - >> -#define NEXTADDR(w, u) = \ >> - if (rtm_addrs & (w)) { = \ >> - l =3D SA_SIZE(&(u)); = \ >> - memmove(cp, (char *)&(u), l); = \ >> - cp +=3D l; = \ >> - if (verbose) = \ >> - sodump((struct sockaddr *)&(u), #w); = \ >> - } >> - >> errno =3D 0; >> - memset(&m_rtmsg, 0, sizeof(m_rtmsg)); >> if (cmd =3D=3D 'a') >> cmd =3D RTM_ADD; >> else if (cmd =3D=3D 'c') >> @@ -1488,6 +1521,33 @@ rtmsg(int cmd, int flags, int fib) >> cmd =3D RTM_DELETE; >> flags |=3D RTF_PINNED; >> } >> +#ifdef WITHOUT_NETLINK >> + return (rtmsg_rtsock(cmd, flags, fib)); >> +#else >> + errno =3D rtmsg_nl(cmd, flags, fib, so, &rt_metrics); >> + return (errno =3D=3D 0 ? 0 : -1); >> +#endif >> +} >> + >> +#ifdef WITHOUT_NETLINK >> +static int >> +rtmsg_rtsock(int cmd, int flags, int fib) >> +{ >> + int rlen; >> + char *cp =3D m_rtmsg.m_space; >> + int l; >> + >> + memset(&m_rtmsg, 0, sizeof(m_rtmsg)); >> + >> +#define NEXTADDR(w, u) = \ >> + if (rtm_addrs & (w)) { = \ >> + l =3D SA_SIZE(&(u)); = \ >> + memmove(cp, (char *)&(u), l); = \ >> + cp +=3D l; = \ >> + if (verbose) = \ >> + sodump((struct sockaddr *)&(u), #w); = \ >> + } >> + >> #define rtm m_rtmsg.m_rtm >> rtm.rtm_type =3D cmd; >> rtm.rtm_flags =3D flags; >> @@ -1545,6 +1605,7 @@ rtmsg(int cmd, int flags, int fib) >> #undef rtm >> return (0); >> } >> +#endif >>=20 >> static const char *const msgtypes[] =3D { >> "", >> @@ -1571,7 +1632,7 @@ static const char *const msgtypes[] =3D { >> static const char metricnames[] =3D >> "\011weight\010rttvar\7rtt\6ssthresh\5sendpipe\4recvpipe\3expire" >> "\1mtu"; >> -static const char routeflags[] =3D >> +const char routeflags[] =3D >> "\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7DONE" >> "\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE" >> "\017PROTO2\020PROTO1\021PRCLONING\022WASCLONED\023PROTO3" >> @@ -1812,7 +1873,7 @@ pmsg_addrs(char *cp, int addrs, size_t len) >> (void)fflush(stdout); >> } >>=20 >> -static void >> +void >> printb(int b, const char *str) >> { >> int i; >> diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c >> new file mode 100644 >> index 000000000000..648d866670fc >> --- /dev/null >> +++ b/sbin/route/route_netlink.c >> @@ -0,0 +1,835 @@ >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +#include >> +#include >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +const char *routename(struct sockaddr *); >> +const char *netname(struct sockaddr *); >> +void printb(int, const char *); >> +extern const char routeflags[]; >> +extern int verbose, debugonly; >> + >> +int rtmsg_nl(int cmd, int rtm_flags, int fib, struct = sockaddr_storage *so, >> + struct rt_metrics *rt_metrics); >> +int flushroutes_fib_nl(int fib, int af); >> +void monitor_nl(int fib); >> + >> +struct nl_helper; >> +static void print_getmsg(struct nl_helper *h, struct nlmsghdr *hdr, = struct sockaddr *dst); >> +static void print_nlmsg(struct nl_helper *h, struct nlmsghdr *hdr); >> + >> +#define s6_addr32 __u6_addr.__u6_addr32 >> +#define bitcount32(x) __bitcount32((uint32_t)(x)) >> +static int >> +inet6_get_plen(const struct in6_addr *addr) >> +{ >> + >> + return (bitcount32(addr->s6_addr32[0]) + = bitcount32(addr->s6_addr32[1]) + >> + bitcount32(addr->s6_addr32[2]) + = bitcount32(addr->s6_addr32[3])); >> +} >> + >> +static void >> +ip6_writemask(struct in6_addr *addr6, uint8_t mask) >> +{ >> + uint32_t *cp; >> + >> + for (cp =3D (uint32_t *)addr6; mask >=3D 32; mask -=3D 32) >> + *cp++ =3D 0xFFFFFFFF; >> + if (mask > 0) >> + *cp =3D htonl(mask ? ~((1 << (32 - mask)) - 1) : 0); >> +} >> + >> +static struct sockaddr * >> +get_netmask(struct snl_state *ss, int family, int plen) >> +{ >> + if (family =3D=3D AF_INET) { >> + if (plen =3D=3D 32) >> + return (NULL); >> + >> + struct sockaddr_in *sin =3D snl_allocz(ss, = sizeof(*sin)); >> + >> + sin->sin_len =3D sizeof(*sin); >> + sin->sin_family =3D family; >> + sin->sin_addr.s_addr =3D htonl(plen ? ~((1 << (32 - = plen)) - 1) : 0); >> + >> + return (struct sockaddr *)sin; >> + } else if (family =3D=3D AF_INET6) { >> + if (plen =3D=3D 128) >> + return (NULL); >> + >> + struct sockaddr_in6 *sin6 =3D snl_allocz(ss, = sizeof(*sin6)); >> + >> + sin6->sin6_len =3D sizeof(*sin6); >> + sin6->sin6_family =3D family; >> + ip6_writemask(&sin6->sin6_addr, plen); >> + >> + return (struct sockaddr *)sin6; >> + } >> + return (NULL); >> +} >> + >> +struct nl_helper { >> + struct snl_state ss_cmd; >> +}; >> + >> +static void >> +nl_helper_init(struct nl_helper *h) >> +{ >> + if (!snl_init(&h->ss_cmd, NETLINK_ROUTE)) >> + err(1, "unable to open netlink socket"); >> +} >> + >> +static void >> +nl_helper_free(struct nl_helper *h) >> +{ >> + snl_free(&h->ss_cmd); >> +} >> + >> +static int >> +rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, >> + struct sockaddr_storage *so, struct rt_metrics *rt_metrics) >> +{ >> + struct snl_state *ss =3D &h->ss_cmd; >> + struct snl_writer nw; >> + int nl_type =3D 0, nl_flags =3D 0; >> + >> + snl_init_writer(ss, &nw); >> + >> + switch (cmd) { >> + case RTSOCK_RTM_ADD: >> + nl_type =3D RTM_NEWROUTE; >> + nl_flags =3D NLM_F_CREATE | NLM_F_APPEND; /* Do append = by default */ >> + break; >> + case RTSOCK_RTM_CHANGE: >> + nl_type =3D RTM_NEWROUTE; >> + nl_flags =3D NLM_F_REPLACE; >> + break; >> + case RTSOCK_RTM_DELETE: >> + nl_type =3D RTM_DELROUTE; >> + break; >> + case RTSOCK_RTM_GET: >> + nl_type =3D RTM_GETROUTE; >> + break; >> + default: >> + exit(1); >> + } >> + >> + struct sockaddr *dst =3D (struct sockaddr *)&so[RTAX_DST]; >> + struct sockaddr *mask =3D (struct sockaddr *)&so[RTAX_NETMASK]; >> + struct sockaddr *gw =3D (struct sockaddr *)&so[RTAX_GATEWAY]; >> + >> + if (dst =3D=3D NULL) >> + return (EINVAL); >> + >> + struct nlmsghdr *hdr =3D snl_create_msg_request(&nw, nl_type); >> + hdr->nlmsg_flags |=3D nl_flags; >> + >> + int plen =3D 0; >> + int rtm_type =3D RTN_UNICAST; >> + >> + switch (dst->sa_family) { >> + case AF_INET: >> + { >> + struct sockaddr_in *mask4 =3D (struct sockaddr_in = *)mask; >> + >> + plen =3D mask4 ? bitcount32(mask4->sin_addr.s_addr) : = 32; >> + break; >> + } >> + case AF_INET6: >> + { >> + struct sockaddr_in6 *mask6 =3D (struct sockaddr_in6 = *)mask; >> + >> + plen =3D mask6 ? inet6_get_plen(&mask6->sin6_addr) : = 128; >> + break; >> + } >> + default: >> + return (ENOTSUP); >> + } >> + >> + if (rtm_flags & RTF_REJECT) >> + rtm_type =3D RTN_PROHIBIT; >> + else if (rtm_flags & RTF_BLACKHOLE) >> + rtm_type =3D RTN_BLACKHOLE; >> + >> + struct rtmsg *rtm =3D snl_reserve_msg_object(&nw, struct rtmsg); >> + rtm->rtm_family =3D dst->sa_family; >> + rtm->rtm_protocol =3D RTPROT_STATIC; >> + rtm->rtm_type =3D rtm_type; >> + rtm->rtm_dst_len =3D plen; >> + >> + snl_add_msg_attr_ip(&nw, RTA_DST, dst); >> + snl_add_msg_attr_u32(&nw, RTA_TABLE, fib); >> + >> + if (rtm_flags & RTF_GATEWAY) { >> + if (gw->sa_family =3D=3D dst->sa_family) >> + snl_add_msg_attr_ip(&nw, RTA_GATEWAY, gw); >> + else >> + snl_add_msg_attr_ipvia(&nw, RTA_VIA, gw); >> + } else if (gw !=3D NULL) { >> + /* Should be AF_LINK */ >> + struct sockaddr_dl *sdl =3D (struct sockaddr_dl *)gw; >> + if (sdl->sdl_index !=3D 0) >> + snl_add_msg_attr_u32(&nw, RTA_OIF, = sdl->sdl_index); >> + } >> + >> + if (rtm_flags !=3D 0) >> + snl_add_msg_attr_u32(&nw, NL_RTA_RTFLAGS, rtm_flags); >> + >> + if (rt_metrics->rmx_mtu > 0) { >> + int off =3D snl_add_msg_attr_nested(&nw, RTA_METRICS); >> + snl_add_msg_attr_u32(&nw, RTAX_MTU, = rt_metrics->rmx_mtu); >> + snl_end_attr_nested(&nw, off); >> + } >> + >> + if (rt_metrics->rmx_weight > 0) >> + snl_add_msg_attr_u32(&nw, NL_RTA_WEIGHT, = rt_metrics->rmx_weight); >> + >> + if (snl_finalize_msg(&nw) && snl_send_message(ss, hdr)) { >> + struct snl_errmsg_data e =3D {}; >> + >> + hdr =3D snl_read_reply(ss, hdr->nlmsg_seq); >> + if (nl_type =3D=3D NL_RTM_GETROUTE) { >> + if (hdr->nlmsg_type =3D=3D NL_RTM_NEWROUTE) >> + print_getmsg(h, hdr, dst); >> + else { >> + snl_parse_errmsg(ss, hdr, &e); >> + if (e.error =3D=3D ESRCH) >> + warn("route has not been = found"); >> + else >> + warn("message indicates error = %d", e.error); >> + } >> + >> + return (0); >> + } >> + >> + if (snl_parse_errmsg(ss, hdr, &e)) >> + return (e.error); >> + } >> + return (EINVAL); >> +} >> + >> +int >> +rtmsg_nl(int cmd, int rtm_flags, int fib, struct sockaddr_storage = *so, >> + struct rt_metrics *rt_metrics) >> +{ >> + struct nl_helper h =3D {}; >> + >> + nl_helper_init(&h); >> + int error =3D rtmsg_nl_int(&h, cmd, rtm_flags, fib, so, = rt_metrics); >> + nl_helper_free(&h); >> + >> + return (error); >> +} >> + >> +static void >> +get_ifdata(struct nl_helper *h, uint32_t ifindex, struct = snl_parsed_link_simple *link) >> +{ >> + struct snl_state *ss =3D &h->ss_cmd; >> + struct snl_writer nw; >> + >> + snl_init_writer(ss, &nw); >> + struct nlmsghdr *hdr =3D snl_create_msg_request(&nw, = NL_RTM_GETLINK); >> + struct ifinfomsg *ifmsg =3D snl_reserve_msg_object(&nw, struct = ifinfomsg); >> + if (ifmsg !=3D NULL) >> + ifmsg->ifi_index =3D ifindex; >> + if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) >> + return; >> + >> + hdr =3D snl_read_reply(ss, hdr->nlmsg_seq); >> + >> + if (hdr !=3D NULL && hdr->nlmsg_type =3D=3D RTM_NEWLINK) { >> + snl_parse_nlmsg(ss, hdr, &snl_rtm_link_parser_simple, = link); >> + } >> + >> + if (link->ifla_ifname =3D=3D NULL) { >> + char ifname[16]; >> + >> + snprintf(ifname, sizeof(ifname), "if#%u", ifindex); >> + int len =3D strlen(ifname); >> + char *buf =3D snl_allocz(ss, len + 1); >> + strlcpy(buf, ifname, len + 1); >> + link->ifla_ifname =3D buf; >> + } >> +} >> + >> +static void >> +print_getmsg(struct nl_helper *h, struct nlmsghdr *hdr, struct = sockaddr *dst) >> +{ >> + struct snl_state *ss =3D &h->ss_cmd; >> + struct timespec ts; >> + struct snl_parsed_route r =3D { .rtax_weight =3D = RT_DEFAULT_WEIGHT }; >> + >> + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_route_parser, &r)) >> + return; >> + >> + struct snl_parsed_link_simple link =3D {}; >> + get_ifdata(h, r.rta_oif, &link); >> + >> + if (r.rtax_mtu =3D=3D 0) >> + r.rtax_mtu =3D link.ifla_mtu; >> + r.rta_rtflags |=3D (RTF_UP | RTF_DONE); >> + >> + (void)printf(" route to: %s\n", routename(dst)); >> + >> + if (r.rta_dst) >> + (void)printf("destination: %s\n", routename(r.rta_dst)); >> + struct sockaddr *mask =3D get_netmask(ss, r.rtm_family, = r.rtm_dst_len); >> + if (mask) >> + (void)printf(" mask: %s\n", routename(mask)); >> + if (r.rta_gw && (r.rta_rtflags & RTF_GATEWAY)) >> + (void)printf(" gateway: %s\n", routename(r.rta_gw)); >> + (void)printf(" fib: %u\n", (unsigned int)r.rta_table); >> + if (link.ifla_ifname) >> + (void)printf(" interface: %s\n", link.ifla_ifname); >> + (void)printf(" flags: "); >> + printb(r.rta_rtflags, routeflags); >> + >> + struct rt_metrics rmx =3D { >> + .rmx_mtu =3D r.rtax_mtu, >> + .rmx_weight =3D r.rtax_weight, >> + .rmx_expire =3D r.rta_expire, >> + }; >> + >> + printf("\n%9s %9s %9s %9s %9s %10s %9s\n", "recvpipe", >> + "sendpipe", "ssthresh", "rtt,msec", "mtu ", "weight", = "expire"); >> + printf("%8lu ", rmx.rmx_recvpipe); >> + printf("%8lu ", rmx.rmx_sendpipe); >> + printf("%8lu ", rmx.rmx_ssthresh); >> + printf("%8lu ", 0UL); >> + printf("%8lu ", rmx.rmx_mtu); >> + printf("%8lu ", rmx.rmx_weight); >> + if (rmx.rmx_expire > 0) >> + clock_gettime(CLOCK_REALTIME_FAST, &ts); >> + else >> + ts.tv_sec =3D 0; >> + printf("%8ld \n", (long)(rmx.rmx_expire - ts.tv_sec)); >> +} >> + >> +static void >> +print_prefix(struct nl_helper *h, char *buf, int bufsize, struct = sockaddr *sa, int plen) >> +{ >> + int sz =3D 0; >> + >> + if (sa =3D=3D NULL) { >> + snprintf(buf, bufsize, ""); >> + return; >> + } >> + >> + switch (sa->sa_family) { >> + case AF_INET: >> + { >> + struct sockaddr_in *sin =3D (struct sockaddr_in = *)sa; >> + char abuf[INET_ADDRSTRLEN]; >> + >> + inet_ntop(AF_INET, &sin->sin_addr, abuf, = sizeof(abuf)); >> + sz =3D snprintf(buf, bufsize, "%s", abuf); >> + break; >> + } >> + case AF_INET6: >> + { >> + struct sockaddr_in6 *sin6 =3D (struct = sockaddr_in6 *)sa; >> + char abuf[INET6_ADDRSTRLEN]; >> + char *ifname =3D NULL; >> + >> + inet_ntop(AF_INET6, &sin6->sin6_addr, abuf, = sizeof(abuf)); >> + if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { >> + struct snl_parsed_link_simple link =3D = {}; >> + >> + if (sin6->sin6_scope_id !=3D 0) { >> + get_ifdata(h, = sin6->sin6_scope_id, &link); >> + ifname =3D link.ifla_ifname; >> + } >> + } >> + if (ifname =3D=3D NULL) >> + sz =3D snprintf(buf, bufsize, "%s", = abuf); >> + else >> + sz =3D snprintf(buf, bufsize, "%s%%%s", = abuf, ifname); >> + break; >> + } >> + default: >> + snprintf(buf, bufsize, "unknown_af#%d", sa->sa_family); >> + plen =3D -1; >> + } >> + >> + if (plen >=3D 0) >> + snprintf(buf + sz, bufsize - sz, "/%d", plen); >> +} >> + >> + >> +static int >> +print_line_prefix(const char *cmd, const char *name) >> +{ >> + struct timespec tp; >> + struct tm tm; >> + char buf[32]; >> + >> + clock_gettime(CLOCK_REALTIME, &tp); >> + localtime_r(&tp.tv_sec, &tm); >> + >> + strftime(buf, sizeof(buf), "%T", &tm); >> + int len =3D printf("%s.%03ld %s %s ", buf, tp.tv_nsec / 1000000, = cmd, name); >> + >> + return (len); >> +} >> + >> +static const char * >> +get_action_name(struct nlmsghdr *hdr, int new_cmd) >> +{ >> + if (hdr->nlmsg_type =3D=3D new_cmd) { >> + //return ((hdr->nlmsg_flags & NLM_F_REPLACE) ? "replace" = : "add"); >> + return ("add/repl"); >> + } else >> + return ("delete"); >> +} >> + >> +static void >> +print_nlmsg_route_nhop(struct nl_helper *h, struct snl_parsed_route = *r, >> + struct rta_mpath_nh *nh, bool first) >> +{ >> + // gw 10.0.0.1 ifp vtnet0 mtu 1500 table inet.0 >> + if (nh->gw !=3D NULL) { >> + char gwbuf[128]; >> + print_prefix(h, gwbuf, sizeof(gwbuf), nh->gw, -1); >> + printf("gw %s ", gwbuf); >> + } >> + >> + if (nh->ifindex !=3D 0) { >> + struct snl_parsed_link_simple link =3D {}; >> + >> + get_ifdata(h, nh->ifindex, &link); >> + if (nh->rtax_mtu =3D=3D 0) >> + nh->rtax_mtu =3D link.ifla_mtu; >> + printf("iface %s ", link.ifla_ifname); >> + if (nh->rtax_mtu !=3D 0) >> + printf("mtu %d ", nh->rtax_mtu); >> + } >> + >> + if (first) { >> + switch (r->rtm_family) { >> + case AF_INET: >> + printf("table inet.%d", r->rta_table); >> + break; >> + case AF_INET6: >> + printf("table inet6.%d", r->rta_table); >> + break; >> + } >> + } >> + >> + printf("\n"); >> +} >> + >> +static void >> +print_nlmsg_route(struct nl_helper *h, struct nlmsghdr *hdr) >> +{ >> + struct snl_parsed_route r =3D { .rtax_weight =3D = RT_DEFAULT_WEIGHT }; >> + struct snl_state *ss =3D &h->ss_cmd; >> + >> + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_route_parser, &r)) >> + return; >> + >> + // 20:19:41.333 add route 10.0.0.0/24 gw 10.0.0.1 ifp vtnet0 mtu = 1500 table inet.0 >> + >> + const char *cmd =3D get_action_name(hdr, RTM_NEWROUTE); >> + int len =3D print_line_prefix(cmd, "route"); >> + >> + char buf[128]; >> + print_prefix(h, buf, sizeof(buf), r.rta_dst, r.rtm_dst_len); >> + len +=3D strlen(buf) + 1; >> + printf("%s ", buf); >> + >> + switch (r.rtm_type) { >> + case RTN_BLACKHOLE: >> + printf("blackhole\n"); >> + return; >> + case RTN_UNREACHABLE: >> + printf("unreach(reject)\n"); >> + return; >> + case RTN_PROHIBIT: >> + printf("prohibit(reject)\n"); >> + return; >> + } >> + >> + if (r.rta_multipath !=3D NULL) { >> + bool first =3D true; >> + >> + memset(buf, ' ', sizeof(buf)); >> + buf[len] =3D '\0'; >> + >> + for (int i =3D 0; i < r.rta_multipath->num_nhops; i++) { >> + struct rta_mpath_nh *nh =3D = &r.rta_multipath->nhops[i]; >> + >> + if (!first) >> + printf("%s", buf); >> + print_nlmsg_route_nhop(h, &r, nh, first); >> + first =3D false; >> + } >> + } else { >> + struct rta_mpath_nh nh =3D { >> + .gw =3D r.rta_gw, >> + .ifindex =3D r.rta_oif, >> + .rtax_mtu =3D r.rtax_mtu, >> + }; >> + >> + print_nlmsg_route_nhop(h, &r, &nh, true); >> + } >> +} >> + >> +static const char *operstate[] =3D { >> + "UNKNOWN", /* 0, IF_OPER_UNKNOWN */ >> + "NOTPRESENT", /* 1, IF_OPER_NOTPRESENT */ >> + "DOWN", /* 2, IF_OPER_DOWN */ >> + "LLDOWN", /* 3, IF_OPER_LOWERLAYERDOWN */ >> + "TESTING", /* 4, IF_OPER_TESTING */ >> + "DORMANT", /* 5, IF_OPER_DORMANT */ >> + "UP", /* 6, IF_OPER_UP */ >> +}; >> + >> +static void >> +print_nlmsg_link(struct nl_helper *h, struct nlmsghdr *hdr) >> +{ >> + struct snl_parsed_link l =3D {}; >> + struct snl_state *ss =3D &h->ss_cmd; >> + >> + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_link_parser, &l)) >> + return; >> + >> + // 20:19:41.333 add iface#3 vtnet0 admin UP oper UP mtu 1500 = table inet.0 >> + const char *cmd =3D get_action_name(hdr, RTM_NEWLINK); >> + print_line_prefix(cmd, "iface"); >> + >> + printf("iface#%u %s ", l.ifi_index, l.ifla_ifname); >> + printf("admin %s ", (l.ifi_flags & IFF_UP) ? "UP" : "DOWN"); >> + if (l.ifla_operstate < NL_ARRAY_LEN(operstate)) >> + printf("oper %s ", operstate[l.ifla_operstate]); >> + if (l.ifla_mtu > 0) >> + printf("mtu %u ", l.ifla_mtu); >> + >> + printf("\n"); >> +} >> + >> +static void >> +print_nlmsg_addr(struct nl_helper *h, struct nlmsghdr *hdr) >> +{ >> + struct snl_parsed_addr attrs =3D {}; >> + struct snl_state *ss =3D &h->ss_cmd; >> + >> + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_addr_parser, &attrs)) >> + return; >> + >> + // add addr 192.168.1.1/24 iface vtnet0 >> + const char *cmd =3D get_action_name(hdr, RTM_NEWADDR); >> + print_line_prefix(cmd, "addr"); >> + >> + char buf[128]; >> + struct sockaddr *addr =3D attrs.ifa_local ? attrs.ifa_local : = attrs.ifa_address; >> + print_prefix(h, buf, sizeof(buf), addr, attrs.ifa_prefixlen); >> + printf("%s ", buf); >> + >> + struct snl_parsed_link_simple link =3D {}; >> + get_ifdata(h, attrs.ifa_index, &link); >> + >> + if (link.ifi_flags & IFF_POINTOPOINT) { >> + char buf[64]; >> + print_prefix(h, buf, sizeof(buf), attrs.ifa_address, = -1); >> + printf("-> %s ", buf); >> + } >> + >> + printf("iface %s ", link.ifla_ifname); >> + >> + printf("\n"); >> +} >> + >> +static const char *nudstate[] =3D { >> + "INCOMPLETE", /* 0x01(0) */ >> + "REACHABLE", /* 0x02(1) */ >> + "STALE", /* 0x04(2) */ >> + "DELAY", /* 0x08(3) */ >> + "PROBE", /* 0x10(4) */ >> + "FAILED", /* 0x20(5) */ >> +}; >> + >> +#define NUD_INCOMPLETE 0x01 /* No lladdr, address = resolution in progress */ >> +#define NUD_REACHABLE 0x02 /* reachable & recently = resolved */ >> +#define NUD_STALE 0x04 /* has lladdr but it's = stale */ >> +#define NUD_DELAY 0x08 /* has lladdr, is stale, = probes delayed */ >> +#define NUD_PROBE 0x10 /* has lladdr, is stale, = probes sent */ >> +#define NUD_FAILED 0x20 /* unused */ >> + >> + >> +static void >> +print_nlmsg_neigh(struct nl_helper *h, struct nlmsghdr *hdr) >> +{ >> + struct snl_parsed_neigh attrs =3D {}; >> + struct snl_state *ss =3D &h->ss_cmd; >> + >> + if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_neigh_parser, &attrs)) >> + return; >> + >> + // add addr 192.168.1.1 state %s lladdr %s iface vtnet0 >> + const char *cmd =3D get_action_name(hdr, RTM_NEWNEIGH); >> + print_line_prefix(cmd, "neigh"); >> + >> + char buf[128]; >> + print_prefix(h, buf, sizeof(buf), attrs.nda_dst, -1); >> + printf("%s ", buf); >> + >> + struct snl_parsed_link_simple link =3D {}; >> + get_ifdata(h, attrs.nda_ifindex, &link); >> + >> + for (unsigned int i =3D 0; i < NL_ARRAY_LEN(nudstate); i++) { >> + if ((1 << i) & attrs.ndm_state) { >> + printf("state %s ", nudstate[i]); >> + break; >> + } >> + } >> + >> + if (attrs.nda_lladdr !=3D NULL) { >> + int if_type =3D link.ifi_type; >> + >> + if ((if_type =3D=3D IFT_ETHER || if_type =3D=3D = IFT_L2VLAN || if_type =3D=3D IFT_BRIDGE) && >> + NLA_DATA_LEN(attrs.nda_lladdr) =3D=3D = ETHER_ADDR_LEN) { >> + struct ether_addr *ll; >> + >> + ll =3D (struct ether_addr = *)NLA_DATA(attrs.nda_lladdr); >> + printf("lladdr %s ", ether_ntoa(ll)); >> + } else { >> + struct sockaddr_dl sdl =3D { >> + .sdl_len =3D sizeof(sdl), >> + .sdl_family =3D AF_LINK, >> + .sdl_index =3D attrs.nda_ifindex, >> + .sdl_type =3D if_type, >> + .sdl_alen =3D = NLA_DATA_LEN(attrs.nda_lladdr), >> + }; >> + if (sdl.sdl_alen < sizeof(sdl.sdl_data)) { >> + void *ll =3D NLA_DATA(attrs.nda_lladdr); >> + >> + memcpy(sdl.sdl_data, ll, sdl.sdl_alen); >> + printf("lladdr %s ", link_ntoa(&sdl)); >> + } >> + } >> + } >> + >> + if (link.ifla_ifname !=3D NULL) >> + printf("iface %s ", link.ifla_ifname); >> + printf("\n"); >> +} >> + >> +static void >> +print_nlmsg_generic(struct nl_helper *h, struct nlmsghdr *hdr) >> +{ >> +} >> + >> +static void >> +print_nlmsg(struct nl_helper *h, struct nlmsghdr *hdr) >> +{ >> + switch (hdr->nlmsg_type) { >> + case RTM_NEWLINK: >> + case RTM_DELLINK: >> + print_nlmsg_link(h, hdr); >> + break; >> *** 184 LINES SKIPPED *** --Apple-Mail=_AE460F85-A90B-4D1C-9453-E5B4D7CEC4B9 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

On 27 = Mar 2023, at 21:41, Jessica Clarke <jrtc27@freebsd.org> = wrote:

On 26 Mar 2023, at = 12:07, Alexander V. Chernikov <melifaro@FreeBSD.org> wrote:

The branch = main has been updated by melifaro:

URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc597432e22975f4d409b845377996712= 9c6b57e9

commit = c597432e22975f4d409b8453779967129c6b57e9
Author: =     Alexander V. Chernikov = <melifaro@FreeBSD.org>
AuthorDate: 2023-03-26 09:13:50 = +0000
Commit:     Alexander V. Chernikov = <melifaro@FreeBSD.org>
CommitDate: 2023-03-26 11:06:56 = +0000

  route(8): convert to = netlink

  This change converts all kernel rtsock = interactions in route(8)
   to = Netlink.

  Based on the WITHOUT_NETLINK_SUPPORT = src.conf(5) variable, route(8)
   now fully operates = either via Netlink or via rtsock/sysctl.
  The default = (compile-time) is Netlink.

  The output for route = delete/add/get/flush is targeted to be exactly
   the = same (apart from some error handling cases).
  The output = for the route monitor has been changed to = improve
   readability and support netlink = models.

  Other behaviour changes:
  * = exact prefix lookup (route -n get a.b.c.d/e) is not yet = supported.
  * route monitor does not show the change = originator yet.

If = there are regressions then it should be off by default, = *especially*
Hi Jessica,
I have a plan to fix = both this week. I=E2=80=99d also want to note that these two are not the = documented / often used features.
when = we=E2=80=99re just under a month out from the proposed 14 code = slush.

Jess

  Differential Revision: =  https://reviews.freebsd.org/D39007
---
sbin/route/Makefile =        |   6 = +
sbin/route/route.c =         | 117 = +++++--
sbin/route/route_netlink.c | 835 = +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 930 = insertions(+), 28 deletions(-)

diff --git a/sbin/route/Makefile = b/sbin/route/Makefile
index e65030f805bb..aec222310d46 100644
--- = a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -19,6 +19,12 @@ = CFLAGS+=3D -DINET6
.endif
CFLAGS+=3D -I.

+.if = ${MK_NETLINK_SUPPORT} !=3D "no"
+SRCS+=3D = route_netlink.c
+.else
+CFLAGS+=3D-DWITHOUT_NETLINK
+.endi= f
+
HAS_TESTS=3D
SUBDIR.${MK_TESTS}+=3D tests

diff --git = a/sbin/route/route.c b/sbin/route/route.c
index = 5f33cecb1b20..947c97ce794a 100644
--- a/sbin/route/route.c
+++ = b/sbin/route/route.c
@@ -90,12 +90,11 @@ static struct keytab = {
= {0, 0}
};

+int verbose, debugonly;
static = struct sockaddr_storage so[RTAX_MAX];
static int pid, = rtm_addrs;
-static int s;
-static int nflag, = af, qflag, tflag;
-static int verbose, aflen;
-static = int = locking, lockrest, debugonly;
+static int nflag, = af, aflen, qflag, tflag;
+static int locking, lockrest;
static = struct rt_metrics rt_metrics;
static u_long =  rtm_inits;
static uid_t uid;
@@ -103,18 +102,30 @@ = static int = defaultfib;
static int numfibs;
static char = domain[MAXHOSTNAMELEN + 1];
static bool = domain_initialized;
-static int rtm_seq;
static char = rt_line[NI_MAXHOST];
static char net_line[MAXHOSTNAMELEN + = 1];

+#ifdef WITHOUT_NETLINK
+static int = s;
+static int rtm_seq;
+
static struct = {
= struct = rt_msghdr m_rtm;
char m_space[512];
} = m_rtmsg;

+static int rtmsg_rtsock(int, int, = int);
+static int flushroutes_fib_rtsock(int);
+static void = monitor_rtsock(void);
+#else
+int = rtmsg_nl(int, int, int, struct sockaddr_storage *, struct = rt_metrics *);
+int flushroutes_fib_nl(int, int);
+void = monitor_nl(int);
+#endif
+
static = TAILQ_HEAD(fibl_head_t, fibl) fibl_head;

-static void = printb(int, const char *);
+void printb(int, const char = *);
static void flushroutes(int argc, char *argv[]);
static int = flushroutes_fib(int);
static int getaddr(int, char *, int);
@@ = -127,7 +138,7 @@ static int inet6_makenetandmask(struct = sockaddr_in6 *, const char *);
#endif
static void = interfaces(void);
static void monitor(int, char*[]);
-static = const char = *netname(struct sockaddr *);
+const char = *netname(struct sockaddr *);
static void = newroute(int, char **);
static int newroute_fib(int, char *, = int);
static void pmsg_addrs(char *, int, size_t);
@@ -135,7 +146,7 @@ = static void = pmsg_common(struct rt_msghdr *, size_t);
static int = prefixlen(const char *);
static void = print_getmsg(struct rt_msghdr *, int, int);
static void = print_rtmsg(struct rt_msghdr *, size_t);
-static const = char = *routename(struct sockaddr *);
+const char = *routename(struct sockaddr *);
static int = rtmsg(int, int, int);
static void set_metric(char *, = int);
static int set_sofib(int);
@@ -216,12 +227,14 @@ main(int argc, = char **argv)

pid =3D getpid();
uid =3D geteuid();
+#ifdef = WITHOUT_NETLINK
if (tflag)
s =3D open(_PATH_DEVNULL, = O_WRONLY, 0);
else
s =3D socket(PF_ROUTE, SOCK_RAW, = 0);
= if (s < 0)
err(EX_OSERR, = "socket");
+#endif

len =3D sizeof(numfibs);
if = (sysctlbyname("net.fibs", (void *)&numfibs, &len, NULL, 0) =3D=3D = -1)
@@ -264,10 +277,14 @@ static int
set_sofib(int = fib)
{

+#ifdef WITHOUT_NETLINK
if (fib < 0)
return = (0);
= return (setsockopt(s, SOL_SOCKET, SO_SETFIB, (void = *)&fib,
    sizeof(fib)= ));
+#else
+ return (0);
+#endif
}

static int
@@ = -395,7 +412,9 @@ flushroutes(int argc, char *argv[])

if (uid = !=3D 0 && !debugonly && !tflag)
= errx(EX_NOPERM, "must be root to alter routing = table");
+#ifdef WITHOUT_NETLINK
shutdown(s, SHUT_RD); /* Don't = want to read back our messages */
+#endif

= TAILQ_INIT(&fibl_head);
while (argc > 1) {
@@ = -441,6 +460,17 @@ flushroutes(int argc, char *argv[])

static = int
flushroutes_fib(int fib)
+{
+#ifdef = WITHOUT_NETLINK
+ return (flushroutes_fib_rtsock(fib));
+#else
+ return = (flushroutes_fib_nl(fib, af));
+#endif
+}
+
+#ifdef = WITHOUT_NETLINK
+static int
+flushroutes_fib_rtsock(int = fib)
{
= struct rt_msghdr *rtm;
size_t needed;
@@ -525,8 = +555,9 @@ retry:
free(buf);
return = (error);
}
+#endif

-static const char *
+const char = *
routename(struct sockaddr *sa)
{
struct sockaddr_dl *sdl;
@@ = -645,7 +676,7 @@ routename(struct sockaddr *sa)
* Return the name of = the network whose address is given.
* The address is assumed to be = that of a net, not a host.
*/
-static const char *
+const char = *
netname(struct sockaddr *sa)
{
struct sockaddr_dl *sdl;
@@ = -810,8 +841,10 @@ newroute(int argc, char **argv)
= warn("sigaction SIGALRM");

cmd =3D argv[0];
+#ifdef = WITHOUT_NETLINK
if (*cmd !=3D 'g' && *cmd !=3D 's')
= shutdown(s, SHUT_RD); /* Don't want to read back our messages = */
+#endif
while (--argc > 0) {
if (**(++argv)=3D=3D '-') = {
= = = switch (key =3D keyword(1 + *argv)) {
@@ -1398,8 +1431,8 @@ = retry2:
static void
monitor(int argc, char *argv[])
{
- int n, = fib, error;
- char msg[2048], *endptr;
+ int fib, error;
+ char = *endptr;

fib =3D defaultfib;
while (argc > 1) {
@@ = -1435,6 +1468,19 @@ monitor(int argc, char *argv[])
= interfaces();
exit(0);
= }
+#ifdef WITHOUT_NETLINK
+ = monitor_rtsock();
+#else
+ = monitor_nl(fib);
+#endif
+}
+
+#ifdef = WITHOUT_NETLINK
+static void
+monitor_rtsock(void)
+{
+ char = msg[2048];
+ int n;

#ifdef SO_RERROR
n =3D = 1;
@@ -1454,25 +1500,12 @@ monitor(int argc, char *argv[])
= print_rtmsg((struct rt_msghdr *)(void *)msg, n);
= }
}
+#endif

static int
rtmsg(int cmd, int flags, = int fib)
{
- int rlen;
- char *cp =3D = m_rtmsg.m_space;
- int l;
-
-#define NEXTADDR(w, u) = \
- = if (rtm_addrs & (w)) { \
- l =3D = SA_SIZE(&(u)); \
- memmove(cp, (char *)&(u), l); = \
- = = cp +=3D l; \
- if (verbose) \
- = sodump((struct sockaddr *)&(u), #w); = \
- = }
-
errno =3D 0;
- memset(&m_rtmsg, 0, = sizeof(m_rtmsg));
if (cmd =3D=3D 'a')
cmd =3D RTM_ADD;
else if = (cmd =3D=3D 'c')
@@ -1488,6 +1521,33 @@ rtmsg(int cmd, int flags, int = fib)
= = cmd =3D RTM_DELETE;
flags |=3D RTF_PINNED;
= }
+#ifdef WITHOUT_NETLINK
+ return (rtmsg_rtsock(cmd, flags, = fib));
+#else
+ errno =3D rtmsg_nl(cmd, flags, fib, so, = &rt_metrics);
+ return (errno =3D=3D 0 ? 0 : = -1);
+#endif
+}
+
+#ifdef WITHOUT_NETLINK
+static = int
+rtmsg_rtsock(int cmd, int flags, int fib)
+{
+ int = rlen;
+ = char *cp =3D m_rtmsg.m_space;
+ int l;
+
+ = memset(&m_rtmsg, 0, sizeof(m_rtmsg));
+
+#define = NEXTADDR(w, u) \
+ if (rtm_addrs & (w)) { \
+ l =3D = SA_SIZE(&(u)); \
+ memmove(cp, (char *)&(u), l); = \
+ = = cp +=3D l; \
+ if (verbose) \
+ = sodump((struct sockaddr *)&(u), #w); = \
+ = }
+
#define rtm m_rtmsg.m_rtm
= rtm.rtm_type =3D cmd;
rtm.rtm_flags =3D flags;
@@ = -1545,6 +1605,7 @@ rtmsg(int cmd, int flags, int fib)
#undef = rtm
= return (0);
}
+#endif

static const char *const = msgtypes[] =3D {
"",
@@ -1571,7 +1632,7 @@ static const char *const = msgtypes[] =3D {
static const char metricnames[] = =3D
   "\011weight\010rttvar\7rtt\6ssthresh\5sendpipe\4r= ecvpipe\3expire"
   "\1mtu";
-static const char = routeflags[] =3D
+const char routeflags[] = =3D
   "\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7= DONE"
   "\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE"=
   "\017PROTO2\020PROTO1\021PRCLONING\022WASCLONED\023P= ROTO3"
@@ -1812,7 +1873,7 @@ pmsg_addrs(char *cp, int addrs, size_t = len)
= (void)fflush(stdout);
}

-static = void
+void
printb(int b, const char *str)
{
int = i;
diff --git a/sbin/route/route_netlink.c = b/sbin/route/route_netlink.c
new file mode 100644
index = 000000000000..648d866670fc
--- /dev/null
+++ = b/sbin/route/route_netlink.c
@@ -0,0 +1,835 @@
+#include = <stdio.h>
+#include <stdlib.h>
+#include = <string.h>
+#include <err.h>
+#include = <errno.h>
+
+#include <sys/bitcount.h>
+#include = <sys/param.h>
+#include <sys/socket.h>
+#include = <sys/sysctl.h>
+#include <sys/time.h>
+#include = <sys/types.h>
+
+#include <netinet/in.h>
+#include = <arpa/inet.h>
+
+#include = <net/ethernet.h>
+#include <net/if.h>
+#include = <net/if_dl.h>
+#include <net/if_types.h>
+#include = <netlink/netlink.h>
+#include = <netlink/netlink_route.h>
+#include = <netlink/netlink_snl.h>
+#include = <netlink/netlink_snl_route.h>
+#include = <netlink/netlink_snl_route_compat.h>
+#include = <netlink/netlink_snl_route_parsers.h>
+
+const char = *routename(struct sockaddr *);
+const char *netname(struct sockaddr = *);
+void printb(int, const char *);
+extern const char = routeflags[];
+extern int verbose, debugonly;
+
+int = rtmsg_nl(int cmd, int rtm_flags, int fib, struct sockaddr_storage = *so,
+    struct rt_metrics *rt_metrics);
+int = flushroutes_fib_nl(int fib, int af);
+void monitor_nl(int = fib);
+
+struct nl_helper;
+static void print_getmsg(struct = nl_helper *h, struct nlmsghdr *hdr, struct sockaddr *dst);
+static = void print_nlmsg(struct nl_helper *h, struct nlmsghdr = *hdr);
+
+#define s6_addr32 __u6_addr.__u6_addr32
+#define = bitcount32(x) __bitcount32((uint32_t)(x))
+static = int
+inet6_get_plen(const struct in6_addr *addr)
+{
+
+ return = (bitcount32(addr->s6_addr32[0]) + bitcount32(addr->s6_addr32[1]) = +
+ =     bitcount32(= addr->s6_addr32[2]) + = bitcount32(addr->s6_addr32[3]));
+}
+
+static = void
+ip6_writemask(struct in6_addr *addr6, uint8_t = mask)
+{
+ uint32_t *cp;
+
+ for (cp =3D (uint32_t *)addr6; = mask >=3D 32; mask -=3D 32)
+ *cp++ =3D 0xFFFFFFFF;
+ if (mask = > 0)
+ = = *cp =3D htonl(mask ? ~((1 << (32 - mask)) - 1) : = 0);
+}
+
+static struct sockaddr *
+get_netmask(struct = snl_state *ss, int family, int plen)
+{
+ if = (family =3D=3D AF_INET) {
+ if (plen =3D=3D 32)
+ return = (NULL);
+
+ struct sockaddr_in *sin =3D snl_allocz(ss, = sizeof(*sin));
+
+ sin->sin_len =3D = sizeof(*sin);
+ sin->sin_family =3D family;
+ = sin->sin_addr.s_addr =3D htonl(plen ? ~((1 << (32 - = plen)) - 1) : 0);
+
+ return (struct sockaddr = *)sin;
+ = } else if (family =3D=3D AF_INET6) {
+ if (plen = =3D=3D 128)
+ return (NULL);
+
+ struct sockaddr_in6 *sin6 =3D = snl_allocz(ss, sizeof(*sin6));
+
+ sin6->sin6_len =3D = sizeof(*sin6);
+ sin6->sin6_family =3D family;
+ = ip6_writemask(&sin6->sin6_addr, plen);
+
+ return = (struct sockaddr *)sin6;
+ }
+ return = (NULL);
+}
+
+struct nl_helper {
+ struct = snl_state ss_cmd;
+};
+
+static void
+nl_helper_init(struct = nl_helper *h)
+{
+ if (!snl_init(&h->ss_cmd, = NETLINK_ROUTE))
+ err(1, "unable to open netlink = socket");
+}
+
+static void
+nl_helper_free(struct nl_helper = *h)
+{
+ snl_free(&h->ss_cmd);
+}
+
+static = int
+rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int = fib,
+    struct sockaddr_storage *so, struct = rt_metrics *rt_metrics)
+{
+ struct snl_state *ss =3D = &h->ss_cmd;
+ struct snl_writer nw;
+ int = nl_type =3D 0, nl_flags =3D 0;
+
+ snl_init_writer(ss, = &nw);
+
+ switch (cmd) {
+ case RTSOCK_RTM_ADD:
+ nl_type =3D= RTM_NEWROUTE;
+ nl_flags =3D NLM_F_CREATE | NLM_F_APPEND; /* Do append by = default */
+ break;
+ case RTSOCK_RTM_CHANGE:
+ nl_type =3D= RTM_NEWROUTE;
+ nl_flags =3D NLM_F_REPLACE;
+ = break;
+ case RTSOCK_RTM_DELETE:
+ nl_type =3D = RTM_DELROUTE;
+ break;
+ case RTSOCK_RTM_GET:
+ nl_type =3D= RTM_GETROUTE;
+ break;
+ default:
+ = exit(1);
+ }
+
+ struct sockaddr *dst =3D (struct = sockaddr *)&so[RTAX_DST];
+ struct sockaddr *mask =3D (struct = sockaddr *)&so[RTAX_NETMASK];
+ struct sockaddr *gw =3D (struct = sockaddr *)&so[RTAX_GATEWAY];
+
+ if (dst =3D=3D NULL)
+ return = (EINVAL);
+
+ struct nlmsghdr *hdr =3D snl_create_msg_request(&nw, = nl_type);
+ hdr->nlmsg_flags |=3D nl_flags;
+
+ int plen = =3D 0;
+ = int rtm_type =3D RTN_UNICAST;
+
+ switch = (dst->sa_family) {
+ case AF_INET:
+     {
+ struct = sockaddr_in *mask4 =3D (struct sockaddr_in *)mask;
+
+ plen =3D = mask4 ? bitcount32(mask4->sin_addr.s_addr) : 32;
+ = break;
+     }
+ case = AF_INET6:
+     {
+ struct = sockaddr_in6 *mask6 =3D (struct sockaddr_in6 *)mask;
+
+ plen =3D = mask6 ? inet6_get_plen(&mask6->sin6_addr) : 128;
+ = break;
+     }
+ = default:
+ return (ENOTSUP);
+ }
+
+ if = (rtm_flags & RTF_REJECT)
+ rtm_type =3D = RTN_PROHIBIT;
+ else if (rtm_flags & RTF_BLACKHOLE)
+ rtm_type = =3D RTN_BLACKHOLE;
+
+ struct rtmsg *rtm =3D = snl_reserve_msg_object(&nw, struct rtmsg);
+ = rtm->rtm_family =3D dst->sa_family;
+ = rtm->rtm_protocol =3D RTPROT_STATIC;
+ = rtm->rtm_type =3D rtm_type;
+ rtm->rtm_dst_len =3D = plen;
+
+ snl_add_msg_attr_ip(&nw, RTA_DST, dst);
+ = snl_add_msg_attr_u32(&nw, RTA_TABLE, fib);
+
+ if = (rtm_flags & RTF_GATEWAY) {
+ if (gw->sa_family =3D=3D = dst->sa_family)
+ snl_add_msg_attr_ip(&nw, = RTA_GATEWAY, gw);
+ else
+ snl_add_msg_attr_ipvia(&nw, = RTA_VIA, gw);
+ } else if (gw !=3D NULL) {
+ /* Should = be AF_LINK */
+ struct sockaddr_dl *sdl =3D (struct sockaddr_dl = *)gw;
+ = = if (sdl->sdl_index !=3D 0)
+ snl_add_msg_attr_u32(&nw, = RTA_OIF, sdl->sdl_index);
+ }
+
+ if = (rtm_flags !=3D 0)
+ snl_add_msg_attr_u32(&nw, = NL_RTA_RTFLAGS, rtm_flags);
+
+ if (rt_metrics->rmx_mtu > = 0) {
+ = = int off =3D snl_add_msg_attr_nested(&nw, = RTA_METRICS);
+ snl_add_msg_attr_u32(&nw, RTAX_MTU, = rt_metrics->rmx_mtu);
+ snl_end_attr_nested(&nw, = off);
+ = }
+
+ if (rt_metrics->rmx_weight > 0)
+ = snl_add_msg_attr_u32(&nw, NL_RTA_WEIGHT, = rt_metrics->rmx_weight);
+
+ if (snl_finalize_msg(&nw) = && snl_send_message(ss, hdr)) {
+ struct snl_errmsg_data e =3D = {};
+
+ = = hdr =3D snl_read_reply(ss, hdr->nlmsg_seq);
+ if = (nl_type =3D=3D NL_RTM_GETROUTE) {
+ if (hdr->nlmsg_type =3D=3D = NL_RTM_NEWROUTE)
+ print_getmsg(h, hdr, dst);
+ else = {
+ = = = = snl_parse_errmsg(ss, hdr, &e);
+ if = (e.error =3D=3D ESRCH)
+ warn("route has not been = found");
+ = = = = else
+ warn("message indicates error %d", e.error);
+ = }
+
+ return (0);
+ }
+
+ if = (snl_parse_errmsg(ss, hdr, &e))
+ return (e.error);
+ = }
+ = return (EINVAL);
+}
+
+int
+rtmsg_nl(int cmd, int = rtm_flags, int fib, struct sockaddr_storage *so,
+ =    struct rt_metrics *rt_metrics)
+{
+ struct = nl_helper h =3D {};
+
+ nl_helper_init(&h);
+ int error = =3D rtmsg_nl_int(&h, cmd, rtm_flags, fib, so, rt_metrics);
+ = nl_helper_free(&h);
+
+ return = (error);
+}
+
+static void
+get_ifdata(struct nl_helper *h, = uint32_t ifindex, struct snl_parsed_link_simple *link)
+{
+ struct = snl_state *ss =3D &h->ss_cmd;
+ struct snl_writer = nw;
+
+ = snl_init_writer(ss, &nw);
+ struct nlmsghdr *hdr =3D = snl_create_msg_request(&nw, NL_RTM_GETLINK);
+ struct = ifinfomsg *ifmsg =3D snl_reserve_msg_object(&nw, struct = ifinfomsg);
+ if (ifmsg !=3D NULL)
+ ifmsg->ifi_index =3D = ifindex;
+ = if (!snl_finalize_msg(&nw) || !snl_send_message(ss, = hdr))
+ = = return;
+
+ hdr =3D snl_read_reply(ss, = hdr->nlmsg_seq);
+
+ if (hdr !=3D NULL && = hdr->nlmsg_type =3D=3D RTM_NEWLINK) {
+ = snl_parse_nlmsg(ss, hdr, &snl_rtm_link_parser_simple, = link);
+ = }
+
+ if (link->ifla_ifname =3D=3D NULL) {
+ char = ifname[16];
+
+ snprintf(ifname, sizeof(ifname), "if#%u", = ifindex);
+ int len =3D strlen(ifname);
+ char *buf = =3D snl_allocz(ss, len + 1);
+ strlcpy(buf, ifname, len + = 1);
+ = = link->ifla_ifname =3D buf;
+ }
+}
+
+static = void
+print_getmsg(struct nl_helper *h, struct nlmsghdr *hdr, struct = sockaddr *dst)
+{
+ struct snl_state *ss =3D = &h->ss_cmd;
+ struct timespec ts;
+ struct = snl_parsed_route r =3D { .rtax_weight =3D RT_DEFAULT_WEIGHT = };
+
+ = if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_route_parser, = &r))
+ = = return;
+
+ struct snl_parsed_link_simple = link =3D {};
+ get_ifdata(h, r.rta_oif, &link);
+
+ if = (r.rtax_mtu =3D=3D 0)
+ r.rtax_mtu =3D = link.ifla_mtu;
+ r.rta_rtflags |=3D (RTF_UP | RTF_DONE);
+
+ = (void)printf("   route to: %s\n", = routename(dst));
+
+ if (r.rta_dst)
+ = (void)printf("destination: %s\n", = routename(r.rta_dst));
+ struct sockaddr *mask =3D = get_netmask(ss, r.rtm_family, r.rtm_dst_len);
+ if = (mask)
+ = = (void)printf("       mask: %s\n", = routename(mask));
+ if (r.rta_gw && (r.rta_rtflags & = RTF_GATEWAY))
+ (void)printf("    gateway: %s\n", = routename(r.rta_gw));
+ (void)printf(" =        fib: %u\n", (unsigned = int)r.rta_table);
+ if (link.ifla_ifname)
+ (void)printf("  interface: = %s\n", link.ifla_ifname);
+ (void)printf(" =      flags: ");
+ = printb(r.rta_rtflags, routeflags);
+
+ struct = rt_metrics rmx =3D {
+ .rmx_mtu =3D = r.rtax_mtu,
+ .rmx_weight =3D r.rtax_weight,
+ = .rmx_expire =3D r.rta_expire,
+ };
+
+ = printf("\n%9s %9s %9s %9s %9s %10s %9s\n", "recvpipe",
+     "sendpipe",= "ssthresh", "rtt,msec", "mtu   ", "weight", = "expire");
+ printf("%8lu  ", rmx.rmx_recvpipe);
+ = printf("%8lu  ", rmx.rmx_sendpipe);
+ = printf("%8lu  ", rmx.rmx_ssthresh);
+ = printf("%8lu  ", 0UL);
+ printf("%8lu  ", = rmx.rmx_mtu);
+ printf("%8lu  ", rmx.rmx_weight);
+ if = (rmx.rmx_expire > 0)
+ = clock_gettime(CLOCK_REALTIME_FAST, &ts);
+ = else
+ ts.tv_sec =3D 0;
+ printf("%8ld \n", = (long)(rmx.rmx_expire - ts.tv_sec));
+}
+
+static = void
+print_prefix(struct nl_helper *h, char *buf, int bufsize, = struct sockaddr *sa, int plen)
+{
+ int sz =3D 0;
+
+ if (sa =3D=3D= NULL) {
+ = = snprintf(buf, bufsize, "<NULL>");
+ = return;
+ }
+
+ switch (sa->sa_family) = {
+ = case AF_INET:
+ {
+ struct = sockaddr_in *sin =3D (struct sockaddr_in *)sa;
+ char = abuf[INET_ADDRSTRLEN];
+
+ inet_ntop(AF_INET, = &sin->sin_addr, abuf, sizeof(abuf));
+ sz =3D = snprintf(buf, bufsize, "%s", abuf);
+ break;
+ = }
+ = case AF_INET6:
+ {
+ struct = sockaddr_in6 *sin6 =3D (struct sockaddr_in6 *)sa;
+ char = abuf[INET6_ADDRSTRLEN];
+ char *ifname =3D = NULL;
+
+ inet_ntop(AF_INET6, &sin6->sin6_addr, abuf, = sizeof(abuf));
+ if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) = {
+ = = = = struct snl_parsed_link_simple link =3D {};
+
+ if = (sin6->sin6_scope_id !=3D 0) {
+ get_ifdata(h, = sin6->sin6_scope_id, &link);
+ ifname =3D = link.ifla_ifname;
+ }
+ }
+ if (ifname =3D=3D NULL)
+ sz =3D snprintf(buf, bufsize, = "%s", abuf);
+ else
+ sz =3D snprintf(buf, bufsize, = "%s%%%s", abuf, ifname);
+ break;
+ = }
+ = default:
+ snprintf(buf, bufsize, "unknown_af#%d", = sa->sa_family);
+ plen =3D -1;
+ = }
+
+ if (plen >=3D 0)
+ snprintf(buf + sz, bufsize - sz, = "/%d", plen);
+}
+
+
+static int
+print_line_prefix(const = char *cmd, const char *name)
+{
+ struct timespec tp;
+ struct tm = tm;
+ = char buf[32];
+
+ clock_gettime(CLOCK_REALTIME, = &tp);
+ localtime_r(&tp.tv_sec, &tm);
+
+ = strftime(buf, sizeof(buf), "%T", &tm);
+ int len =3D= printf("%s.%03ld %s %s ", buf, tp.tv_nsec / 1000000, cmd, = name);
+
+ return (len);
+}
+
+static const char = *
+get_action_name(struct nlmsghdr *hdr, int new_cmd)
+{
+ if = (hdr->nlmsg_type =3D=3D new_cmd) {
+ //return ((hdr->nlmsg_flags = & NLM_F_REPLACE) ? "replace" : "add");
+ return = ("add/repl");
+ } else
+ return = ("delete");
+}
+
+static void
+print_nlmsg_route_nhop(struct = nl_helper *h, struct snl_parsed_route *r,
+    struct = rta_mpath_nh *nh, bool first)
+{
+ // gw 10.0.0.1 ifp vtnet0 mtu = 1500 table inet.0
+ if (nh->gw !=3D NULL) {
+ char = gwbuf[128];
+ print_prefix(h, gwbuf, sizeof(gwbuf), nh->gw, = -1);
+ = = printf("gw %s ", gwbuf);
+ }
+
+ if = (nh->ifindex !=3D 0) {
+ struct snl_parsed_link_simple = link =3D {};
+
+ get_ifdata(h, nh->ifindex, &link);
+ if = (nh->rtax_mtu =3D=3D 0)
+ nh->rtax_mtu =3D = link.ifla_mtu;
+ printf("iface %s ", link.ifla_ifname);
+ if = (nh->rtax_mtu !=3D 0)
+ printf("mtu %d ", = nh->rtax_mtu);
+ }
+
+ if (first) {
+ switch = (r->rtm_family) {
+ case AF_INET:
+ = printf("table inet.%d", r->rta_table);
+ = break;
+ case AF_INET6:
+ printf("table inet6.%d", = r->rta_table);
+ break;
+ }
+ = }
+
+ printf("\n");
+}
+
+static = void
+print_nlmsg_route(struct nl_helper *h, struct nlmsghdr = *hdr)
+{
+ struct snl_parsed_route r =3D { .rtax_weight =3D = RT_DEFAULT_WEIGHT };
+ struct snl_state *ss =3D = &h->ss_cmd;
+
+ if (!snl_parse_nlmsg(ss, hdr, = &snl_rtm_route_parser, &r))
+ return;
+
+ // = 20:19:41.333 add route 10.0.0.0/24 gw 10.0.0.1 ifp vtnet0 mtu 1500 table = inet.0
+
+ const char *cmd =3D get_action_name(hdr, = RTM_NEWROUTE);
+ int len =3D print_line_prefix(cmd, = "route");
+
+ char buf[128];
+ print_prefix(h, buf, sizeof(buf), = r.rta_dst, r.rtm_dst_len);
+ len +=3D strlen(buf) + = 1;
+ = printf("%s ", buf);
+
+ switch (r.rtm_type) {
+ case = RTN_BLACKHOLE:
+ printf("blackhole\n");
+ return;
+ case = RTN_UNREACHABLE:
+ printf("unreach(reject)\n");
+ = return;
+ case RTN_PROHIBIT:
+ = printf("prohibit(reject)\n");
+ return;
+ = }
+
+ if (r.rta_multipath !=3D NULL) {
+ bool = first =3D true;
+
+ memset(buf, ' ', = sizeof(buf));
+ buf[len] =3D '\0';
+
+ for (int i =3D 0; i < = r.rta_multipath->num_nhops; i++) {
+ struct rta_mpath_nh *nh =3D = &r.rta_multipath->nhops[i];
+
+ if (!first)
+ = printf("%s", buf);
+ print_nlmsg_route_nhop(h, &r, = nh, first);
+ first =3D false;
+ }
+ } else = {
+ = = struct rta_mpath_nh nh =3D {
+ .gw =3D r.rta_gw,
+ .ifindex = =3D r.rta_oif,
+ .rtax_mtu =3D r.rtax_mtu,
+ = };
+
+ print_nlmsg_route_nhop(h, &r, &nh, = true);
+ = }
+}
+
+static const char *operstate[] =3D {
+ = "UNKNOWN", /* 0, IF_OPER_UNKNOWN */
+ "NOTPRESENT", /* 1, = IF_OPER_NOTPRESENT */
+ "DOWN", /* 2, = IF_OPER_DOWN */
+ "LLDOWN", /* 3, IF_OPER_LOWERLAYERDOWN = */
+ = "TESTING", /* 4, IF_OPER_TESTING */
+ "DORMANT", /* 5, = IF_OPER_DORMANT */
+ "UP", /* 6, IF_OPER_UP = */
+};
+
+static void
+print_nlmsg_link(struct nl_helper *h, = struct nlmsghdr *hdr)
+{
+ struct snl_parsed_link l =3D = {};
+ = struct snl_state *ss =3D &h->ss_cmd;
+
+ if = (!snl_parse_nlmsg(ss, hdr, &snl_rtm_link_parser, &l))
+ = return;
+
+ // 20:19:41.333 add iface#3 = vtnet0 admin UP oper UP mtu 1500 table inet.0
+ const = char *cmd =3D get_action_name(hdr, RTM_NEWLINK);
+ = print_line_prefix(cmd, "iface");
+
+ = printf("iface#%u %s ", l.ifi_index, l.ifla_ifname);
+ = printf("admin %s ", (l.ifi_flags & IFF_UP) ? "UP" : = "DOWN");
+ = if (l.ifla_operstate < NL_ARRAY_LEN(operstate))
+ = printf("oper %s ", operstate[l.ifla_operstate]);
+ if = (l.ifla_mtu > 0)
+ printf("mtu %u ", = l.ifla_mtu);
+
+ printf("\n");
+}
+
+static = void
+print_nlmsg_addr(struct nl_helper *h, struct nlmsghdr = *hdr)
+{
+ struct snl_parsed_addr attrs =3D {};
+ struct = snl_state *ss =3D &h->ss_cmd;
+
+ if = (!snl_parse_nlmsg(ss, hdr, &snl_rtm_addr_parser, = &attrs))
+ return;
+
+ // add addr 192.168.1.1/24 iface = vtnet0
+ = const char *cmd =3D get_action_name(hdr, RTM_NEWADDR);
+ = print_line_prefix(cmd, "addr");
+
+ char = buf[128];
+ struct sockaddr *addr =3D attrs.ifa_local ? = attrs.ifa_local : attrs.ifa_address;
+ print_prefix(h, buf, sizeof(buf), = addr, attrs.ifa_prefixlen);
+ printf("%s ", = buf);
+
+ struct snl_parsed_link_simple link =3D {};
+ = get_ifdata(h, attrs.ifa_index, &link);
+
+ if = (link.ifi_flags & IFF_POINTOPOINT) {
+ char = buf[64];
+ = = print_prefix(h, buf, sizeof(buf), attrs.ifa_address, = -1);
+ = = printf("-> %s ", buf);
+ }
+
+ = printf("iface %s ", link.ifla_ifname);
+
+ = printf("\n");
+}
+
+static const char *nudstate[] =3D = {
+ = "INCOMPLETE", /* 0x01(0) */
+ "REACHABLE", /* = 0x02(1) */
+ "STALE", /* 0x04(2) */
+ = "DELAY", /* 0x08(3) */
+ "PROBE", /* = 0x10(4) */
+ "FAILED", /* 0x20(5) = */
+};
+
+#define NUD_INCOMPLETE 0x01 /* No = lladdr, address resolution in progress */
+#define = NUD_REACHABLE 0x02 /* reachable & recently resolved */
+#define = NUD_STALE 0x04 /* has lladdr but it's stale */
+#define = NUD_DELAY 0x08 /* has lladdr, is stale, probes delayed = */
+#define NUD_PROBE 0x10 /* has lladdr, is stale, probes = sent */
+#define NUD_FAILED 0x20 /* unused */
+
+
+static = void
+print_nlmsg_neigh(struct nl_helper *h, struct nlmsghdr = *hdr)
+{
+ struct snl_parsed_neigh attrs =3D {};
+ struct = snl_state *ss =3D &h->ss_cmd;
+
+ if = (!snl_parse_nlmsg(ss, hdr, &snl_rtm_neigh_parser, = &attrs))
+ return;
+
+ // add addr 192.168.1.1 state %s = lladdr %s iface vtnet0
+ const char *cmd =3D = get_action_name(hdr, RTM_NEWNEIGH);
+ print_line_prefix(cmd, = "neigh");
+
+ char buf[128];
+ print_prefix(h, buf, sizeof(buf), = attrs.nda_dst, -1);
+ printf("%s ", = buf);
+
+ struct snl_parsed_link_simple link =3D {};
+ = get_ifdata(h, attrs.nda_ifindex, &link);
+
+ for = (unsigned int i =3D 0; i < NL_ARRAY_LEN(nudstate); i++) {
+ if ((1 = << i) & attrs.ndm_state) {
+ printf("state %s ", = nudstate[i]);
+ break;
+ }
+ = }
+
+ if (attrs.nda_lladdr !=3D NULL) {
+ int = if_type =3D link.ifi_type;
+
+ if ((if_type =3D=3D IFT_ETHER || = if_type =3D=3D IFT_L2VLAN || if_type =3D=3D IFT_BRIDGE) = &&
+     NLA_DATA_LE= N(attrs.nda_lladdr) =3D=3D ETHER_ADDR_LEN) {
+ struct = ether_addr *ll;
+
+ ll =3D (struct ether_addr = *)NLA_DATA(attrs.nda_lladdr);
+ printf("lladdr %s ", = ether_ntoa(ll));
+ } else {
+ struct sockaddr_dl sdl =3D = {
+ = = = = .sdl_len =3D sizeof(sdl),
+ .sdl_family =3D = AF_LINK,
+ = = = = .sdl_index =3D attrs.nda_ifindex,
+ .sdl_type = =3D if_type,
+ .sdl_alen =3D NLA_DATA_LEN(attrs.nda_lladdr),
+ = };
+ if (sdl.sdl_alen < sizeof(sdl.sdl_data)) {
+ void *ll = =3D NLA_DATA(attrs.nda_lladdr);
+
+ memcpy(sdl.sdl_data, ll, = sdl.sdl_alen);
+ printf("lladdr %s ", link_ntoa(&sdl));
+ = }
+ = = }
+ = }
+
+ if (link.ifla_ifname !=3D NULL)
+ = printf("iface %s ", link.ifla_ifname);
+ = printf("\n");
+}
+
+static = void
+print_nlmsg_generic(struct nl_helper *h, struct nlmsghdr = *hdr)
+{
+}
+
+static void
+print_nlmsg(struct nl_helper = *h, struct nlmsghdr *hdr)
+{
+ switch (hdr->nlmsg_type) = {
+ = case RTM_NEWLINK:
+ case RTM_DELLINK:
+ = print_nlmsg_link(h, hdr);
+ break;
*** 184 LINES SKIPPED = ***

= --Apple-Mail=_AE460F85-A90B-4D1C-9453-E5B4D7CEC4B9-- From nobody Tue Mar 28 09:35: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 4Pm4Kc35K2z41fxZ; Tue, 28 Mar 2023 09:35:16 +0000 (UTC) (envelope-from freebsd@oldach.net) Received: from nuc.oldach.net (hmo.in-vpn.de [IPv6:2001:67c:1407:60::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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "hmo.in-vpn.de", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pm4Kb005rz46wD; Tue, 28 Mar 2023 09:35:14 +0000 (UTC) (envelope-from freebsd@oldach.net) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of freebsd@oldach.net designates 2001:67c:1407:60::1 as permitted sender) smtp.mailfrom=freebsd@oldach.net; dmarc=none Received: from nuc.oldach.net (localhost [127.0.0.1]) by nuc.oldach.net (8.17.1/8.17.1/hmo04jun22) with ESMTPS id 32S9Z4JH089455 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 28 Mar 2023 11:35:04 +0200 (CEST) (envelope-from freebsd@oldach.net) Received: (from hmo@localhost) by nuc.oldach.net (8.17.1/8.17.1/hmo01feb23/Submit) id 32S9Z4gc089454; Tue, 28 Mar 2023 11:35:04 +0200 (CEST) (envelope-from freebsd@oldach.net) Message-Id: <202303280935.32S9Z4gc089454@nuc.oldach.net> Subject: Re: git: 4660b60a00c3 - stable/13 - Updates to UFS/FFS superblock integrity checks when reading a superblock. In-Reply-To: <202303272347.32RNlJVI080195@gitrepo.freebsd.org> from Kirk McKusick at "27 Mar 2023 23:47:19" To: mckusick@FreeBSD.org (Kirk McKusick) Date: Tue, 28 Mar 2023 11:35:04 +0200 (CEST) Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: freebsd@oldach.net (Helge Oldach) X-No-Archive: Yes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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-Greylist: inspected by milter-greylist-4.6.4 (nuc.oldach.net [0.0.0.0]); Tue, 28 Mar 2023 11:35:04 +0200 (CEST) for IP:127.0.0.1 DOMAIN:localhost HELO:nuc.oldach.net FROM:freebsd@oldach.net RCPT: X-Spamd-Result: default: False [-3.28 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.981]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; FROM_NO_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-branches@FreeBSD.org]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; ASN(0.00)[asn:29670, ipnet:2001:67c:1400::/45, country:DE]; RCPT_COUNT_THREE(0.00)[4]; MID_RHS_MATCH_FROMTLD(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[oldach.net]; TO_DN_NONE(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Queue-Id: 4Pm4Kb005rz46wD X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N Kirk McKusick wrote on Tue, 28 Mar 2023 01:47:19 +0200 (CEST): > The branch stable/13 has been updated by mckusick: > > URL: https://cgit.FreeBSD.org/src/commit/?id=4660b60a00c3120ddecd94b3f308d39bcb6d085a > > commit 4660b60a00c3120ddecd94b3f308d39bcb6d085a > Author: Kirk McKusick > AuthorDate: 2023-03-27 23:45:59 +0000 > Commit: Kirk McKusick > CommitDate: 2023-03-27 23:46:40 +0000 > > Updates to UFS/FFS superblock integrity checks when reading a superblock. > > Have to add a check that the computed cylinder group size does not > exceed the block size of the filesystem. > > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D38668 > > (cherry picked from commit 0eabe33087d8cb69ae800daae322f12a8f16bd10) > --- > sys/ufs/ffs/ffs_subr.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c > index d847373a8cde..2f69965aba7e 100644 > --- a/sys/ufs/ffs/ffs_subr.c > +++ b/sys/ufs/ffs/ffs_subr.c > @@ -446,6 +446,7 @@ validate_sblock(struct fs *fs, int isaltsblk) > CHK(fs->fs_old_cgoffset, <, 0, %jd); > CHK2(fs->fs_old_cgoffset, >, 0, ~fs->fs_old_cgmask, <, 0, %jd); > CHK(fs->fs_old_cgoffset * (~fs->fs_old_cgmask), >, fs->fs_fpg, %jd); > + CHK(CGSIZE(fs), >, fs->fs_bsize, %jd); > /* > * If anything has failed up to this point, it is usafe to proceed > * as checks below may divide by zero or make other fatal calculations. > With this check added, my -STABLE VM fails to boot with lots of "UFS2 superblock failed" messages. Trying to repair the (apparently broken) file system by booting kernel.old/kernel single-user yields: root@ / # fsck -y /dev/ufs/latitude UFS2 superblock failed: CGSIZE(fs) (32772) > fs->fs_bsize (32768) Cannot find file system superblock UFS2 superblock failed: CGSIZE(fs) (32772) > fs->fs_bsize (32768) Cannot find file system superblock LOOK FOR ALTERNATE SUPERBLOCKS? no root@ / # Removing the committed extra check and all is fine again. Kind regards Helge From nobody Tue Mar 28 15:17: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 4PmCwj4lxxz423Vq; Tue, 28 Mar 2023 15: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 4PmCwj4GxZz3LlP; Tue, 28 Mar 2023 15: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=1680016661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7LBg7lObib1EfcSucaVv0nlsRyVqzY8mDvksyTjbpX8=; b=oZSEjLRQo2zV/Uyv+xKoNfxizJq+GWZL2baa9JyKOKligksSyZ+Uux+nSLRifuGHOwxwxU UqXOzAQh2pU6o/sZORBEjj8FAfb01P8VNAgEG6AfB3QypkWQY+ilKGLq0Ebp6t1aRfZM9p N441ig1YBGrJuMa5ztRRlwGZAMXpr4BdUjXnaUXQ0pe+8fUvJH4z5qbwbg7aUmzzjNQAGX EHl8NttKpYONFDs7gILxZzqP6Bg2yC81i+hjQXii/wl8eHg10+n7qxpnI5T8t0G0SlNdY0 vCUjYzWHe6+blORc1J7Scv57YHdyfCVt8fz/2UgO+WLwVb8rD6RFTcIdaPVHJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680016661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7LBg7lObib1EfcSucaVv0nlsRyVqzY8mDvksyTjbpX8=; b=iZDvbN0IuAUoqRuo2rS/M91UmmtFCWIVlXt/lSHLNQNCOfLHv/PmJ0I6Ztij0vLSBOwyOz pNMoZrJpvH6+uplFdf0EXOEwlt7JzSOUfTKjCrOJIXMGwyP9g5JsENdrTNJo16DGsdhLp9 0EVG40kBPkvkbo5tbGMFvuQ7yNtp9sV09iVL+2TyCmYli0BDvxyv4Fiszu9adFGYAIH7GC 5mppKp0joGyoDG4AiMTtZrFbt2vok3I6bne60cS6m5pRRzv7mOpQ0zjX7Ud+FLkn/h+3Tv cHhTUpsC6+jwmkWzKCBjoB8DFFeImiYIGYt2MbZOMkjQpzaWniqVtUQwSnqW0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680016661; a=rsa-sha256; cv=none; b=aNXxYtX15qT3Svp2SyVk4i7xXWs4DezbJhkF16IGmqJYM00q+2IMCJUZUhifuXcH2LOttm Huy0C4t8odTpB9Q3c7609aUjAaP8DnM0HO5afOkZl5yV1xLKhRbtJbdDfJzGX9yPusoyUe tHDg1H907AWTr0z72l1MLSTOo2kxN5Jc0JjYcstHU8IDo5YTIctVpB28omKda7uHkdwKsP tAvYSokKebDwyojQijrlAbFY7nP71thOqokom3wtq5nB6dPna4pqMQLHLWTqKPXUqAC/uH I+h2KTWf2cN/LVM85BynBUZm0PLbTpsp/a0SwgNO9Y5A+Z31yZ2gwohkzwJBHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmCwj3B6Xz18Kv; Tue, 28 Mar 2023 15:17:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32SFHf9F008724; Tue, 28 Mar 2023 15:17:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32SFHf46008723; Tue, 28 Mar 2023 15:17:41 GMT (envelope-from git) Date: Tue, 28 Mar 2023 15:17:41 GMT Message-Id: <202303281517.32SFHf46008723@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 269dea90d6eb - main - libc: use separate collate objects for C, POSIX, and C.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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 269dea90d6eb32690730b0f6a17fb41170483104 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=269dea90d6eb32690730b0f6a17fb41170483104 commit 269dea90d6eb32690730b0f6a17fb41170483104 Author: Yuri Pankov AuthorDate: 2023-03-28 15:10:47 +0000 Commit: Yuri Pankov CommitDate: 2023-03-28 15:16:30 +0000 libc: use separate collate objects for C, POSIX, and C.UTF-8 Fix newlocale() overwriting the locale name in collate object when same instance was used for those locales, and querylocale() reporting unexpected value for LC_COLLATE_MASK. PR: 255646, 269375 Reviewed by: markj, bapt (previous version) Differential Revision: https://reviews.freebsd.org/D30146 --- lib/libc/locale/collate.c | 17 ++++- lib/libc/tests/locale/Makefile | 1 + lib/libc/tests/locale/newlocale_test.c | 111 +++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 3 deletions(-) diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c index 4a5512998438..bc2f4edccd09 100644 --- a/lib/libc/locale/collate.c +++ b/lib/libc/locale/collate.c @@ -68,6 +68,14 @@ struct xlocale_collate __xlocale_C_collate = { {{0}, "C"}, 1, 0, 0, 0 }; +struct xlocale_collate __xlocale_POSIX_collate = { + {{0}, "POSIX"}, 1, 0, 0, 0 +}; + +struct xlocale_collate __xlocale_CUTF8_collate = { + {{0}, "C.UTF-8"}, 1, 0, 0, 0 +}; + static int __collate_load_tables_l(const char *encoding, struct xlocale_collate *table); @@ -84,10 +92,13 @@ destruct_collate(void *t) void * __collate_load(const char *encoding, __unused locale_t unused) { - if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0 || - strncmp(encoding, "C.", 2) == 0) { + if (strcmp(encoding, "C") == 0) return (&__xlocale_C_collate); - } + else if (strcmp(encoding, "POSIX") == 0) + return (&__xlocale_POSIX_collate); + else if (strcmp(encoding, "C.UTF-8") == 0) + return (&__xlocale_CUTF8_collate); + struct xlocale_collate *table = calloc(sizeof(struct xlocale_collate), 1); if (table == NULL) diff --git a/lib/libc/tests/locale/Makefile b/lib/libc/tests/locale/Makefile index 83caf8cb3bd3..86ff742b2c87 100644 --- a/lib/libc/tests/locale/Makefile +++ b/lib/libc/tests/locale/Makefile @@ -13,6 +13,7 @@ ATF_TESTS_C+= mbsnrtowcs_2_test ATF_TESTS_C+= mbsrtowcs_test ATF_TESTS_C+= mbstowcs_2_test ATF_TESTS_C+= mbtowc_2_test +ATF_TESTS_C+= newlocale_test ATF_TESTS_C+= towctrans_test ATF_TESTS_C+= wcrtomb_test ATF_TESTS_C+= wcsnrtombs_test diff --git a/lib/libc/tests/locale/newlocale_test.c b/lib/libc/tests/locale/newlocale_test.c new file mode 100644 index 000000000000..cb0ebb323a42 --- /dev/null +++ b/lib/libc/tests/locale/newlocale_test.c @@ -0,0 +1,111 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2023 Yuri Pankov + * + * 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 + +#include + +#include + +struct { + int lpmask; + const char *lpname; +} lparts[] = { + { LC_COLLATE_MASK, "LC_COLLATE" }, + { LC_CTYPE_MASK, "LC_CTYPE" }, + { LC_MONETARY_MASK, "LC_MONETARY" }, + { LC_NUMERIC_MASK, "LC_NUMERIC" }, + { LC_TIME_MASK, "LC_TIME" }, + { LC_MESSAGES_MASK, "LC_MESSAGES" }, +}; + +static void +check_lparts(const char *expected) +{ + int i; + + for (i = 0; i < nitems(lparts); i++) { + const char *actual; + + actual = querylocale(lparts[i].lpmask, uselocale(NULL)); + ATF_CHECK_STREQ_MSG(expected, actual, "wrong value for %s", + lparts[i].lpname); + } +} + +static void +do_locale_switch(const char *loc1, const char *loc2) +{ + locale_t l1, l2; + + /* Create and use the first locale */ + l1 = newlocale(LC_ALL_MASK, loc1, NULL); + ATF_REQUIRE(l1 != NULL); + ATF_REQUIRE(uselocale(l1) != NULL); + check_lparts(loc1); + /* + * Create and use second locale, creation deliberately done only after + * the first locale check as newlocale() call would previously clobber + * the first locale contents. + */ + l2 = newlocale(LC_ALL_MASK, loc2, NULL); + ATF_REQUIRE(l2 != NULL); + ATF_REQUIRE(uselocale(l2) != NULL); + check_lparts(loc2); + /* Switch back to first locale */ + ATF_REQUIRE(uselocale(l1) != NULL); + check_lparts(loc1); + + freelocale(l1); + freelocale(l2); +} + +/* + * PR 255646, 269375: Check that newlocale()/uselocale() used to switch between + * C, POSIX, and C.UTF-8 locales (and only these) do not stomp on other locale + * contents (collate part specifically). + * The issue is cosmetic only as all three have empty collate parts, but we need + * to correctly report the one in use in any case. + */ + +ATF_TC_WITHOUT_HEAD(newlocale_c_posix_cu8_test); +ATF_TC_BODY(newlocale_c_posix_cu8_test, tc) +{ + do_locale_switch("C", "POSIX"); + do_locale_switch("C", "C.UTF-8"); + do_locale_switch("POSIX", "C"); + do_locale_switch("POSIX", "C.UTF-8"); + do_locale_switch("C.UTF-8", "C"); + do_locale_switch("C.UTF-8", "POSIX"); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, newlocale_c_posix_cu8_test); + + return (atf_no_error()); +} From nobody Tue Mar 28 15:23: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 4PmD382tmqz424Ft; Tue, 28 Mar 2023 15:23:16 +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 4PmD382Lkzz3NMK; Tue, 28 Mar 2023 15:23:16 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680016996; 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=peNEkC63sgz3wLU6+iqMu9YZ+WrSLd6rDMZf9mdew2M=; b=gQ+Ih/BXvXP5uWjSp+Mq5/Knzl+Azi0Cy+iAokA0zeXyhCqRuqkWiXQd+QWrGCk+M5l7te ARjnPcRQlDOBkc/4cBdabp++DS1E4oxX7A08zkfiO1C2Ke9pvOdAZqVUq5TOzUphFfibKv 5W0/twTNT5HuJ2Q8ljpktSpppfuUf/GD9NuXOTidKvXJsup6ef8+C7VeCLb16doaKD4n8f whRjdfiQJzztKtuzQk9ZLP7Jg3TCAvqh8vDAOTQWQOypfv9zd1EDAmV8SDBHoeFKH9SVio Uu50DP4YISQk06tgEQTuO/YPId3i6tvj2+h8Z2fl/tCLINIXj1vRR39AQHaIdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680016996; 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=peNEkC63sgz3wLU6+iqMu9YZ+WrSLd6rDMZf9mdew2M=; b=XBbT9pY4gvkneem77JcXBhw+VZXofszf15EuwO6p2tmTjrPL31jYMSHg9t7xbdJLUchoAh pRF2vSYX6XikBv0S6i68XQ6BL4bGqGgi5kbJ+Z3S9/NcUFXNRfVKsE3zGcSIeZKyy4bPKU +o4kWLJ9M/JL9vLbhP1Cf9xN3voZcdTv9OCJpc7idIF/HeUJB807hmBBv7LLmAlc/s8R+X npeKwOmQphT/Ung4aEv8JTm3dJxLUZzdfRrx8ocJXczX/ueF/URlhq7H9qbA4UZJkKZa5m RAKFKZ9tk7GhhDLJFdqi2Bw3uEGetBhonKYmc9Ip23z4BQqFatOMlC918Esz7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680016996; a=rsa-sha256; cv=none; b=Lw3Twv93B9FsGvhoezsiptpKda7RmQ9ZYlWFQFivlenOIwHe9k1AmEVVt/iFjsbOPQ9a+x JVeC/w/5M9sI/Rzy6eaYwbCEykPyEvbtqTZxRzisIOuQbIef5fFjef0os+TKEX/JoYMdM/ 2v56EKTxvwOzUO48+sWZJ4Ky5mYR25n5gKGfj0CqocgxhPaJWt81oGUE4MJBcvkdzsin6d 4IXJLHOzzRMkFSQCeXPXryJ4PMEdDE1lh9/Nwpwx01IHQlBXasAqSNbbm8GNDSyCVpxfCc 5Mv3gikJUKrkUOfJSSEV3Fnhq5m2Dv1OcwN5jfbcNSoMv464YbCAvuZli8TksA== Received: from [IPV6:2601:648:8680:16b0:2d4e:165:cff:1385] (unknown [IPv6:2601:648:8680:16b0:2d4e:165:cff:1385]) (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 4PmD37550Jzg47; Tue, 28 Mar 2023 15:23:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Tue, 28 Mar 2023 08:23:14 -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.9.0 Subject: Re: git: 61194e9852e6 - main - Add kqueue1() syscall Content-Language: en-US To: Alan Somers , Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202303272339.32RNdWPD063667@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N On 3/27/23 4:45 PM, Alan Somers wrote: > On Mon, Mar 27, 2023 at 4:39 PM Konstantin Belousov wrote: >> >> The branch main has been updated by kib: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=61194e9852e641d1533cd04a5679d6042ff975d3 >> >> commit 61194e9852e641d1533cd04a5679d6042ff975d3 >> Author: Konstantin Belousov >> AuthorDate: 2023-03-25 23:39:02 +0000 >> Commit: Konstantin Belousov >> CommitDate: 2023-03-27 23:39:26 +0000 >> >> Add kqueue1() syscall >> >> It takes the flags argument. Immediate use is to provide the KQUEUE_CLOEXEC >> flag for kqueue(2). >> >> Reviewed by: emaste, jhb >> Sponsored by: The FreeBSD Foundation >> MFC after: 1 week >> Differential revision: https://reviews.freebsd.org/D39271 > > We already have abort2(2), dup2(2), pipe2(2), and thr_kill2(2) that > are similar to other syscalls but with a flags argument. > Additionally, Linux has a renameat(2). But I'm not aware of any > syscalls named xxx1. Should we call this new one kqueue2 to follow > the existing convention? See the review, this is consistent with pipe2, accept4 (which is not accept2), and dup3. The number is not a version, but a count of arguments. That is a convention also used in other systems. -- John Baldwin From nobody Tue Mar 28 17:47: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 4PmHFC0cPCz42CpQ; Tue, 28 Mar 2023 17:47:11 +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 4PmHFC0661z3q8L; Tue, 28 Mar 2023 17:47:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680025631; 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=0Lc7D/7KYrX+wfdqjpk4rpyu4WIa1wEV3HAmJrYzdDU=; b=vCXYKhL2uqbYIlvZD2XJUJ+nAqntY0gncSJ8krBk0VH1Xyg7M82dYCFrXc5nTE+CH/Fm3e UQnlXq3Haf6wVHCIKZj4NvW7yUD8wwfZXoLmJK/0h+2njPZohKSSQ4J2GsQ+rTutaqleFk yhlJwefl3rhf6bAQJzDfJqwxaKSKsibJaqxe98ju8gDiaG4QoymWNFLHjOq23HHxyzcIny KOu/PFX7fzJQgVov4p9CE0ylM2u7BnXqc86lgFUU2tl4R/ewyNzJXANCPSfW36YZ0FxnDi JmzD5eRNw1Vp2bdMmrCSPYe51FytWBEUcA//M/USrqw1KD23ok5rDdi6F05c7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680025631; 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=0Lc7D/7KYrX+wfdqjpk4rpyu4WIa1wEV3HAmJrYzdDU=; b=IqksJDJC0fnWuS2qNF+x5M+nTee3ut9Fc2/9u4MOU6fij6mySOVEm0kphOfuFy0AKKVVn8 AD5+zDhJ5V4LqpA1qMDfyZHh5ywK62EoxZSstRPcSVCnkvRei/s+DqwZMb7juMM7CPE8Gy cQY3bduMVmNTPUDyrMbc55VSIrHi8SueqYM976I6ihaY4BJ6EMd8qL2ORTN5HVygtFXwkU 53I7Kkkccx1XPTBZrWemgZdX4UXa2A9Vrz7nTpUlklN2J8/xNCOJQ5ATdqMt/uTYLokMs0 L+Nvw0zin3II9neea11JCerZjRR99meEErSbowffS2mrFEVd8rYWEQ7vGkYUQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680025631; a=rsa-sha256; cv=none; b=qfnpFIlMs8BVex9OP6RTrxUMS9g5WdUhHBBmpjL7kvC/PniYUyaJuVmZCNm1qVqSxkfQrQ 1d8l+FJgORCsOabViJv8nK/0PWrnQ1S5mANvkldV0MVqxlKm2le5/xS02mID/mxOT/peZa UuMugJoK285y6cpdwMlXCi4KolIPdshL/EcqQDz1sWYxta81lI74nA4oIL/LeaaluT5nJb NuPcGsaeoN1jBjUIkVS/Ik/DJSF5yY3b7jBbJwRXwXzAfOAqQOxyZ99vaCK7jcrJ/1NhdC 1tnCmt6jpY3BnUJP50d/rJOv0V4SUD3fFinkL8xT3584m3i344tFowLqpi8OSw== Received: from [IPV6:2601:648:8680:16b0:cc93:2ec:c80c:1599] (unknown [IPv6:2601:648:8680:16b0:cc93:2ec:c80c:1599]) (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 4PmHFB2QHGzk3J; Tue, 28 Mar 2023 17:47:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <37ed5b12-0528-2fd0-1b00-5da29961f122@FreeBSD.org> Date: Tue, 28 Mar 2023 10:47:08 -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.9.0 Subject: Re: git: c597432e2297 - main - route(8): convert to netlink Content-Language: en-US To: Alexander Chernikov , =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202303261107.32QB7UZK058893@gitrepo.freebsd.org> <86zg7yyqc3.fsf@ltc.des.no> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N On 3/28/23 2:01 AM, Alexander Chernikov wrote: > >> On 27 Mar 2023, at 19:57, Dag-Erling Smørgrav wrote: >> >> "Alexander V. Chernikov" writes: >>> route(8): convert to netlink >> >> Did you make sure that netlink is either included in all kernel >> configurations or automatically loaded on first use? > Not exactly. Sorry for the breakage, I reverted route(8) back to rtsock till I address all the issues. > /Alexander I would encourage you btw to add NETLINK to GENERIC on all arches and maybe try to autoload netlink.ko in tools that default to using netlink. There's nothing inherently MD about netlink, so I would switch all arches at once. I think it's also good to do it soon in main so we can get some testing in now before 14.0. -- John Baldwin From nobody Tue Mar 28 17:56: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 4PmHRh1PQMz42DVF; Tue, 28 Mar 2023 17:56:16 +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 4PmHRg0ppKz3rPF; Tue, 28 Mar 2023 17:56:15 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by glebi.us (Postfix, from userid 1000) id 6959A591D3; Tue, 28 Mar 2023 10:56:07 -0700 (PDT) Date: Tue, 28 Mar 2023 10:56:07 -0700 From: Gleb Smirnoff To: John Baldwin Cc: Alexander Chernikov , Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: c597432e2297 - main - route(8): convert to netlink Message-ID: References: <202303261107.32QB7UZK058893@gitrepo.freebsd.org> <86zg7yyqc3.fsf@ltc.des.no> <37ed5b12-0528-2fd0-1b00-5da29961f122@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: <37ed5b12-0528-2fd0-1b00-5da29961f122@FreeBSD.org> X-Rspamd-Queue-Id: 4PmHRg0ppKz3rPF X-Spamd-Bar: ---- 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] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Tue, Mar 28, 2023 at 10:47:08AM -0700, John Baldwin wrote: J> >> Did you make sure that netlink is either included in all kernel J> >> configurations or automatically loaded on first use? J> > Not exactly. Sorry for the breakage, I reverted route(8) back to rtsock till I address all the issues. J> > /Alexander J> J> I would encourage you btw to add NETLINK to GENERIC on all arches and J> maybe try to autoload netlink.ko in tools that default to using J> netlink. There's nothing inherently MD about netlink, so I would J> switch all arches at once. I think it's also good to do it soon J> in main so we can get some testing in now before 14.0. The netlink.ko is being autoloaded correctly. The issue is within the route(8) patch itself. -- Gleb Smirnoff From nobody Tue Mar 28 17:58: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 4PmHV96GwDz42DVj; Tue, 28 Mar 2023 17:58: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 4PmHV95qDlz3svp; Tue, 28 Mar 2023 17:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680026305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Khe9YncGwTjGhgJ16g+zSVMyFi1vaiDqbhuAy7AG4nI=; b=dy50MYUfjGVtMF3G9rY8OM39q65IXR4YeS5pqdBe68lHchT5EP8G2XdqzyhuF7UfSrFe33 0VIaIBn7LLtD7H1Zkx6BNGiMaNJCTDb21XkL/G4LLvwUS550GcRYHstL1mUsY0l5zJrDgL +NlhpKZKaf6nsCQoLRabTsVjpHBHyKRh3DvUcZsvWJ2/iWUxhQslCy9IIgInSy7CVv14C6 oTzAvpev7GCyhRhSwWugDDsW1lz262/xEiNb3SU83dgiKnsUtOFLlvBAaaxq8fzInft0sN PfaAGiLFTAOV71fkg2sLqGuXLf/D9UAzu7eLzIjbJ2mGroAK2AdRFe8N8Cq5wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680026305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Khe9YncGwTjGhgJ16g+zSVMyFi1vaiDqbhuAy7AG4nI=; b=IMzF89ACIIgjLtKyGJW1/xK77bWqEaor/Y4CPsdCgyCthJDDckYta+AdnY4TpQozss+Fyn dm24HGMydgqff1eSJ456V0UOtRfn0RtQB9Ew1Jg7m6hOIsITASieKeZ2XFb+7O2m1Ajk1v ezg4D0gnKjrzQt8WKlx4LNL1fX0J6KDvba9dh4jUiSc/FctBGNbC19AJQntlGy53v/7/Cz 6pIJ/y21p4Z6UGeyW8oQ7t2ZM+lSh4pR74x/FYIYpyxGbfgStJMWRhPEPNM0O7uM5ef/pM N0aZlpQDAclU1pRRPpIqE8wL5diKm6ilwSALrhOKpRrd/IbvMqEE8wpu5ktwmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680026305; a=rsa-sha256; cv=none; b=T6Bd2mnpMgP9UfgsX5ef2GDv+xadDQUIHGa4dmxteFGpAuZCrsBEhSIQdeIThpt2XShZMu +vD6YlqeMyHXmlc8KY9fM7BimQGhwO3DTEISnn/3GFoAU8+JqmI1MDxGCVAqjaUDutRnta zfvRIZXYtZ7hock6QPTFrCFH3XSmjPet1Y8XXyBuGC94P+p11YvEQJ0eCwjjDaUiby3wzG BoDoZ4FvdXoXyJ30HTVbr8OX9euHmmdYKn+1qu+IXDT4dawNfOFuxaJ8P2htcTOrC7OEfN oLGF2yKF4kYjNy7gQxqFKSyIbUeUpVxG+c+gNUe4Nbd+wmtSg2A5vMs+3mzu1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmHV94t47z1Cht; Tue, 28 Mar 2023 17:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32SHwPbA071175; Tue, 28 Mar 2023 17:58:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32SHwPLt071174; Tue, 28 Mar 2023 17:58:25 GMT (envelope-from git) Date: Tue, 28 Mar 2023 17:58:25 GMT Message-Id: <202303281758.32SHwPLt071174@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: a02d9cad77c1 - main - tarfs_mount allow control of vfs_mountedfrom List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: a02d9cad77c1207eb809ba49fc1595c8ebb2da26 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a02d9cad77c1207eb809ba49fc1595c8ebb2da26 commit a02d9cad77c1207eb809ba49fc1595c8ebb2da26 Author: Simon J. Gerraty AuthorDate: 2023-03-28 17:57:26 +0000 Commit: Simon J. Gerraty CommitDate: 2023-03-28 17:57:26 +0000 tarfs_mount allow control of vfs_mountedfrom We default to passing the path of the tar file to vfs_mountedfrom so we can tell where a filesystem was mounted from. However this can make the output of mount(8) hard to read. Allow things like: mount -t tarfs -o as=`basename $tar` $tar /mnt so "as" is recorded instead of $tar Reviewed by: des Sponsored by: Juniper Networks Differential Revision: https://reviews.freebsd.org/D39273 --- sys/fs/tarfs/tarfs_vfsops.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index 17d6814ba973..4489b41699ec 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -108,7 +108,7 @@ static vfs_statfs_t tarfs_statfs; static vfs_fhtovp_t tarfs_fhtovp; static const char *tarfs_opts[] = { - "from", "gid", "mode", "uid", "verify", + "as", "from", "gid", "mode", "uid", "verify", NULL }; @@ -905,11 +905,11 @@ tarfs_mount(struct mount *mp) struct tarfs_mount *tmp = NULL; struct thread *td = curthread; struct vnode *vp; - char *from; + char *as, *from; uid_t root_uid; gid_t root_gid; mode_t root_mode; - int error, flags, len; + int error, flags, aslen, len; if (mp->mnt_flag & MNT_UPDATE) return (EOPNOTSUPP); @@ -936,10 +936,14 @@ tarfs_mount(struct mount *mp) error = vfs_getopt(mp->mnt_optnew, "from", (void **)&from, &len); if (error != 0 || from[len - 1] != '\0') return (EINVAL); + error = vfs_getopt(mp->mnt_optnew, "as", (void **)&as, &aslen); + if (error != 0 || as[aslen - 1] != '\0') + as = from; /* Find the source tarball */ - TARFS_DPF(FS, "%s(%s, uid=%u, gid=%u, mode=%o)\n", __func__, - from, root_uid, root_gid, root_mode); + TARFS_DPF(FS, "%s(%s%s%s, uid=%u, gid=%u, mode=%o)\n", __func__, + from, (as != from) ? " as " : "", (as != from) ? as : "", + root_uid, root_gid, root_mode); flags = FREAD; if (vfs_flagopt(mp->mnt_optnew, "verify", NULL, 0)) { flags |= O_VERIFY; @@ -995,7 +999,7 @@ tarfs_mount(struct mount *mp) MNT_IUNLOCK(mp); vfs_getnewfsid(mp); - vfs_mountedfrom(mp, from); + vfs_mountedfrom(mp, as); TARFS_DPF(FS, "%s: success\n", __func__); return (0); From nobody Tue Mar 28 19:47: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 4PmKw00wx5z42LYF; Tue, 28 Mar 2023 19:47: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 4PmKw00P0dz49P4; Tue, 28 Mar 2023 19:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680032848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r3R9G0xy8OK64/FkPRSZM+8pimfD2OptGGfaW5Lsit4=; b=Qgl4A2wsEVtpGRl1/cTi3T5OM8poo7iFajgThY32jZT8Zfaz674ysrWX+HaUzwq7LY1NDu xTMroYv0mA6aIfu8nsX6UR+FqXSjadd3Yy9i5ElZI6+NaFYiXP2PIK1gtNIr5085bN7SuL Nr8crqe0epjb3ONoTZyyWWiTkQbI1ml5a8FSo3r+RFZBabAlX9HnRY4DN8rUSlJfOD7cH9 T/+cyArILfblfEmcAkoCR/IHWHAuED0xV7I/niQXY8JXRP2D3YuNhU6Iytt33sXdLmO42w R1srhYROo15oPWKvcCz7rGZQRsTNTaeERhO3FIgdO/SlNYhZtuJ39RhsCbPjyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680032848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r3R9G0xy8OK64/FkPRSZM+8pimfD2OptGGfaW5Lsit4=; b=UAaFD6ld6oMWOWc0MLYM+r28RB4P5b1+9kLFQ5pDD9/s6Yn+iUn9EnWocB96FP494HaPl8 kqVt2aNJrP3i3CdME6vKw3Fin7QDb+Lsb0cy8K/1ug9+m3IAB34SScuWcicGHsVPVsXI9s o1eCn5HemuE/8M7Aoqtl0OPkIX8g+IrNuUKqqpIFVaG2R84EjbR34wRHMV9f4cFma+qm/Z jHplvFZUma9TbD6P3Hmy0Sz2hRuCsY1sLHPh/l6RUtMW7r3Qs8NR6zeA/aPon7rM0M90vW yqYn7mvBetlwg/Hp7NFJqbj3lxi8OzV4VPZSzfZsDw0eK1KsEEMhRxnr7nKasg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680032848; a=rsa-sha256; cv=none; b=TRQ2pAAXObBoRRJqp6MFtYGjpNIep5dXHFkoO8oRTJUQ0tE85V34joRqNtrAstbpHntCCT kZtYW23P8OUXlbenko/niwpkG2TAjTc30FutYNsfDKdmZyGECoNuAfRjc69/eDngoj9vcN boIfvNnxe6M8qAMCWX+GpIHVq0g104Jacje1TrBTsTQULYBeX9XSt4LV9TqdgC+O/IIdRE 3SozMOc6f6V/S+C8U0N1Fa3edgy+fiBdzViR325FULkgyMqaauHFWQ5UW4t6XcZZ+UBoBj pgjXbzfL/QRqBaP2ErTdOr1wdrLaa8MvqiIuHx2gLcgpYtpGaHMyB0Cfjf3EWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmKvz6WQDz1GY2; Tue, 28 Mar 2023 19:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32SJlRvU051733; Tue, 28 Mar 2023 19:47:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32SJlRYp051732; Tue, 28 Mar 2023 19:47:27 GMT (envelope-from git) Date: Tue, 28 Mar 2023 19:47:27 GMT Message-Id: <202303281947.32SJlRYp051732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: b674303707ea - main - MAINTAINERS: Remove myself from OpenSSL maintenance List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b674303707eac904f5bc83b5648177519684dd0e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=b674303707eac904f5bc83b5648177519684dd0e commit b674303707eac904f5bc83b5648177519684dd0e Author: Jung-uk Kim AuthorDate: 2023-03-28 19:44:26 +0000 Commit: Jung-uk Kim CommitDate: 2023-03-28 19:44:26 +0000 MAINTAINERS: Remove myself from OpenSSL maintenance --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 936c6ada9532..04232b7a26e3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -77,7 +77,7 @@ nvme(4) jimharris Pre-commit review requested. nvmecontrol(8) jimharris Pre-commit review requested. opencrypto jmg Pre-commit review requested. Documentation Required. openssh des Pre-commit review requested, email only. -openssl benl,jkim Pre-commit review requested. +openssl benl Pre-commit review requested. otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org pci bus imp,jhb Pre-commit review requested. pmcstudy(8) rrs Pre-commit review requested. From nobody Tue Mar 28 20:08: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 4PmLNh73GTz42MvS for ; Tue, 28 Mar 2023 20:08:52 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) (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 4PmLNh5KBVz4FD5 for ; Tue, 28 Mar 2023 20:08:52 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-qv1-xf34.google.com with SMTP id qh28so10075391qvb.7 for ; Tue, 28 Mar 2023 13:08:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1680034132; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=/yDg9WrHcNwVRdlNg0jY7QzJ+6mBdd4ZbnQL2mwLDaA=; b=dU4LoDiLtFOnWrovawsa/z7/kyn9+AS0ybnWVzmw8sPFoQrEhe0tIBinQQekpzhQAz cfs8YSbbTSZojyDqiJL2v3rL8cQLJ6lT7dwuIoVjHV5t1ra9/rg5FOB7fPuRNtJfFxgF Ww9n3VJ/PYOS8UFGqnokfwNyzToZDeckafZYRve2mouxzsD416MX8GZndZSOk8LNIfk8 Oq5SHtRVfOCIQZq6L6CQfKpyD69Szga12hICW6QeLoS1wuvMqnhZfjZ95DKKM8m4gvce kle26EkOjrSP7tJXirdzkfh6esFay/la17QVLp3yc1XRgKSFv84+5ssdv9Ct7vrsf/kZ b25Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680034132; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/yDg9WrHcNwVRdlNg0jY7QzJ+6mBdd4ZbnQL2mwLDaA=; b=CMJqY2HN+ERcrk+5vBjj7EWmONQe1KQ/3Z3EHAvst3regssGdcgwT3egZUNSrKEGfO 91dneBRFEuE5IIllXuOtIWgTjrf4hMz+U6C0T09HZc2hyp1eHsiEws+oNpD6I/VVnayM hwkLFKiGf9pYt+gQj7+EZCz0agUcwBV02XL7aAByUCCgEkJSm/+qr4mP0xFRTU7pvGxz XTkxmaXUq2iB5mmulqBfYfG7wpf/AuysIjsXhjr9mD7EyBir+wvsdxtuVFyRvYPYeKo+ bwqAnboARVybv5yzf1Pei3+1+2dNKDxpQHzfU0EpPKEP9C7dE3m3dTSEP1ZaSvLHW0eo HN3g== X-Gm-Message-State: AAQBX9e2T/sX6gTcgOGxZG7T86VQdU+AkEl+BsPJ7iqmnI5cuhZ+OPxH VBhvitoGgPGYwPwrhJGZVNqZ+A== X-Google-Smtp-Source: AKy350YXsl8jOW/PuXfKZ3dxmwFMWVZBtsOIZ4Q/Lf9QTWHLNxzaG0Tlfqqj7VbmehZ42cn+Vx9wjA== X-Received: by 2002:a05:6214:e4d:b0:56f:b28f:cc30 with SMTP id o13-20020a0562140e4d00b0056fb28fcc30mr24122062qvc.4.1680034131725; Tue, 28 Mar 2023 13:08:51 -0700 (PDT) Received: from mutt-hbsd (pool-100-16-219-215.bltmmd.fios.verizon.net. [100.16.219.215]) by smtp.gmail.com with ESMTPSA id x16-20020ad440d0000000b005dd8b9345b2sm4057780qvp.74.2023.03.28.13.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 13:08:49 -0700 (PDT) Date: Tue, 28 Mar 2023 16:08:49 -0400 From: Shawn Webb To: Jung-uk Kim Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b674303707ea - main - MAINTAINERS: Remove myself from OpenSSL maintenance Message-ID: <20230328200849.sjfvoljduzyyxsjf@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 14.0-CURRENT-HBSD FreeBSD 14.0-CURRENT-HBSD X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <202303281947.32SJlRYp051732@gitrepo.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: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ok75lfviix7azwqi" Content-Disposition: inline In-Reply-To: <202303281947.32SJlRYp051732@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4PmLNh5KBVz4FD5 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --ok75lfviix7azwqi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 28, 2023 at 07:47:27PM +0000, Jung-uk Kim wrote: > The branch main has been updated by jkim: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Db674303707eac904f5bc83b564= 8177519684dd0e >=20 > commit b674303707eac904f5bc83b5648177519684dd0e > Author: Jung-uk Kim > AuthorDate: 2023-03-28 19:44:26 +0000 > Commit: Jung-uk Kim > CommitDate: 2023-03-28 19:44:26 +0000 >=20 > MAINTAINERS: Remove myself from OpenSSL maintenance > --- > MAINTAINERS | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/MAINTAINERS b/MAINTAINERS > index 936c6ada9532..04232b7a26e3 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -77,7 +77,7 @@ nvme(4) jimharris Pre-commit review requested. > nvmecontrol(8) jimharris Pre-commit review requested. > opencrypto jmg Pre-commit review requested. Documentation Required. > openssh des Pre-commit review requested, email only. > -openssl benl,jkim Pre-commit review requested. > +openssl benl Pre-commit review requested. `git log --author=3Dbenl` and `git log --committer=3Dbenl` show that Ben Laurie's last commit to FreeBSD was in 2011. Does this mean that in-base OpenSSL effectively has no official maintainer? Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --ok75lfviix7azwqi Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmQjSUgACgkQ/y5nonf4 4fpyQg//eKQN+DZG42d066m0qqeQH3ohWp+yEa6X0xhR67DGnsl4o7GDHKilLSA8 7cCAvymWexgec/V+cBXqA5axVvxd9hkeX7y7qQPzCQq1kx9DCk0JP8K07v7x27Cx bk0AAsYwwhwPlS4vaygp3Vc+QJNArFjmUaglH7LM+UO6axIvyiOVGvoVF8083N0y jIH/S0WVsqLXPt1LjYw6GZvdekdQTw1iwm97eg+B807VaI+nS1FMzPcDEwUwN33a rs6TTKuut2ITIzI0whzS7IDxBfA90BSy96hpbCppw/IFYyl/E1Nsrg07ECvxiYju tJckkj65Sdt2xy+RdMb0G1gyWklKSKJ/sgPkAR7RqP1wdOpTQBwyG5H9X/1ssSmG A9YqQBh86nbSlwVhjrJvoiCeKFNHiVopHvQo7Dxm4Nr5OAH+UEbGgfcZoLxCekGW nXdrTuRl81+d+jyUWcenvyn4qPinGK5oN9NQSz6S/V1AV7+RzJ+FCF/8o1DhroZn WBhWWV3441NjjOBAp1n6zSyVA0pxTxtiPSgtQ0bp4cGaErVeBbr21i0WOf57rN5T MtKZamPhFOmqChLmqsvPbYYluUyfU5YEiWd6myIidB8RC6Z+OKCXaKECLjNdjYNp VjM8zJ6CWQNZwv3xpZWr9ZJm1muqk7zji8xdsQlDGrkgVVK5rHU= =lQJV -----END PGP SIGNATURE----- --ok75lfviix7azwqi-- From nobody Tue Mar 28 21:29: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 4PmN9m6wC7z42SVD; Tue, 28 Mar 2023 21: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 4PmN9m6LVbz3CJK; Tue, 28 Mar 2023 21: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=1680038972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ahChAXpIoX0qapPJJOAU47Pvtal6cBVanDKP7Ss22DY=; b=hPMwiJauMlF/tiejYF1MHpcLU3ydQzC6+XJoUkWBMKavwhfUOnHhAjYMzoqgz5YzbKrd3P UsactNcUQFN34ol4pALX7HXefHJE9CQcsiva7MglT8ZisSurGjKgui/C+5UrlCR5VcaO/v sRPpbrRCQ3yvbPhPFMqF4m/aYDKK8T4TVrVJXppqy0xr9USNZ3GvCncHG80pIcKUTe3EH8 jh1xeZpeoAHa7SalRFf+jk/9lRl45xSgepCbwvY1lPn2vrM9WQ9aiQi3Z6X0JshqVBjBkG vRwP50w5n0BLMzR6s8h6VpRiLjY+K771R2yHVgShp501ByDkW5onbg1FQ1Nz3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680038972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ahChAXpIoX0qapPJJOAU47Pvtal6cBVanDKP7Ss22DY=; b=A6ZbH4gOB9GRrELrD72mjFUo94JYv/N+dcoteJpJKKskCByXRoaTZNImfmLoLQDzEqFMl/ Y3jKbEaJ1zttjjXqXNIhXdFMeaVzXbHtp6amE+sWzhL1t6vpD2GeXQz0wdVyWGZNLkJtgD k/1hPOj0PPoL84kYUmSnyg0nRIOBTY4ltoXMnElSLlMw96AxiNW54Dqli/ULaVD28E7vXK YryI4xdnQJ7ObhZPSdzvSA25EZEA1Isy3jCaNEooETvnmN0z0mZy0e7anwDSKERRNLGIIm saKFIe5+gzbHKr9W/W7clcOID3GvbnIRFpm7fYb+Qle3GAhLTN8zoDVwKo1iPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680038972; a=rsa-sha256; cv=none; b=IZ6mr4YQXFE2kb5IoL9I/Dw88G6pSD/hW/L7zIXSeYc4DkVSzleYQ0zm0Pd9xEPJvvIpu8 oxPsf2rR/plaUp23lUzznUZGMnrbZZ8iKI4dmjrC4S6CIa6kjY+ERJ49c45eLsWzJrEB9z ZBp80l7DGy4QUUUW1GwOoTBtoTQFbnkyY9pQORJnPU3H9LpjqnrRbd+4Ul2KMloO7ifq2k NNbWNohopugvCd/+WSuEtauSSB/u5VDfou7QO2xNB5N7/yvkHyDKIvGt3VoecJyFfBq0RK Sxa8k/Bq5TBbXY1dGAF+++QP1EnY55nVGoagqlDxKXuTKc8FNgLulRWF74E4vQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmN9m5N0kz1Hrd; Tue, 28 Mar 2023 21:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32SLTW9g016503; Tue, 28 Mar 2023 21:29:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32SLTWoo016501; Tue, 28 Mar 2023 21:29:32 GMT (envelope-from git) Date: Tue, 28 Mar 2023 21:29:32 GMT Message-Id: <202303282129.32SLTWoo016501@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: 35105900c65b - main - irdma(4): Upgrade the driver to 1.1.11-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: 35105900c65bb5adcde05d37ae34ad006970d4f9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=35105900c65bb5adcde05d37ae34ad006970d4f9 commit 35105900c65bb5adcde05d37ae34ad006970d4f9 Author: Bartosz Sobczak AuthorDate: 2023-03-28 21:15:15 +0000 Commit: Eric Joyner CommitDate: 2023-03-28 21:29:07 +0000 irdma(4): Upgrade the driver to 1.1.11-k Summary of changes: - postpone mtu size assignment during load to avoid race condition - refactor some of the debug prints - add request reset handler - refactor flush scheduler to increase efficiency and avoid racing - put correct vlan_tag for UD traffic with PFC - suspend QP before going to ERROR state to avoid CQP timout - fix arithmetic error on irdma_debug_bugf - allow debug flag to be settable during driver load - introduce meaningful default values for DCQCN algorithm - interrupt naming convention improvements - skip unsignaled completions in poll_cmpl Signed-off-by: Bartosz Sobczak bartosz.sobczak@intel.com Signed-off-by: Eric Joyner Reviewed by: hselasky@ MFC after: 1 week Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D39173 --- contrib/ofed/libirdma/abi.h | 2 + contrib/ofed/libirdma/i40iw_hw.h | 4 +- contrib/ofed/libirdma/irdma-abi.h | 8 +- contrib/ofed/libirdma/irdma_defs.h | 18 +- contrib/ofed/libirdma/irdma_uk.c | 13 +- contrib/ofed/libirdma/irdma_umain.c | 4 +- contrib/ofed/libirdma/irdma_umain.h | 3 +- contrib/ofed/libirdma/irdma_user.h | 2 - contrib/ofed/libirdma/irdma_uverbs.c | 7 +- contrib/ofed/libirdma/osdep.h | 9 +- sys/dev/irdma/fbsd_kcompat.c | 58 ++++- sys/dev/irdma/fbsd_kcompat.h | 16 +- sys/dev/irdma/icrdma.c | 30 ++- sys/dev/irdma/icrdma_hw.h | 2 +- sys/dev/irdma/irdma-abi.h | 6 + sys/dev/irdma/irdma_cm.c | 402 ++++++++++++++++++++++------------- sys/dev/irdma/irdma_cm.h | 3 - sys/dev/irdma/irdma_ctrl.c | 49 +++-- sys/dev/irdma/irdma_defs.h | 15 ++ sys/dev/irdma/irdma_hw.c | 173 ++++++++------- sys/dev/irdma/irdma_kcompat.c | 219 ++++++++++++------- sys/dev/irdma/irdma_main.h | 8 +- sys/dev/irdma/irdma_pble.c | 18 +- sys/dev/irdma/irdma_pble.h | 4 +- sys/dev/irdma/irdma_protos.h | 2 - sys/dev/irdma/irdma_puda.c | 10 +- sys/dev/irdma/irdma_puda.h | 6 +- sys/dev/irdma/irdma_type.h | 8 +- sys/dev/irdma/irdma_uda.c | 11 +- sys/dev/irdma/irdma_uk.c | 127 +++++------ sys/dev/irdma/irdma_user.h | 4 - sys/dev/irdma/irdma_utils.c | 131 +++++++----- sys/dev/irdma/irdma_verbs.c | 225 ++++++++++---------- sys/dev/irdma/irdma_verbs.h | 22 +- sys/dev/irdma/irdma_ws.c | 2 - sys/dev/irdma/irdma_ws.h | 3 +- sys/dev/irdma/osdep.h | 11 +- 37 files changed, 994 insertions(+), 641 deletions(-) diff --git a/contrib/ofed/libirdma/abi.h b/contrib/ofed/libirdma/abi.h index e45a7b49caf8..6553ebcbcaca 100644 --- a/contrib/ofed/libirdma/abi.h +++ b/contrib/ofed/libirdma/abi.h @@ -115,6 +115,7 @@ struct irdma_get_context { __u32 rsvd32; __u8 userspace_ver; __u8 rsvd8[3]; + __aligned_u64 comp_mask; }; struct irdma_get_context_resp { @@ -136,6 +137,7 @@ struct irdma_get_context_resp { __u16 max_hw_sq_chunk; __u8 hw_rev; __u8 rsvd2; + __aligned_u64 comp_mask; }; struct irdma_ureg_mr { diff --git a/contrib/ofed/libirdma/i40iw_hw.h b/contrib/ofed/libirdma/i40iw_hw.h index c51d89a0fcb2..d04c37d689cb 100644 --- a/contrib/ofed/libirdma/i40iw_hw.h +++ b/contrib/ofed/libirdma/i40iw_hw.h @@ -41,8 +41,8 @@ enum i40iw_device_caps_const { I40IW_MAX_SGE_RD = 1, I40IW_MAX_PUSH_PAGE_COUNT = 0, I40IW_MAX_INLINE_DATA_SIZE = 48, - I40IW_MAX_IRD_SIZE = 63, - I40IW_MAX_ORD_SIZE = 127, + I40IW_MAX_IRD_SIZE = 64, + I40IW_MAX_ORD_SIZE = 64, I40IW_MAX_WQ_ENTRIES = 2048, I40IW_MAX_WQE_SIZE_RQ = 128, I40IW_MAX_PDS = 32768, diff --git a/contrib/ofed/libirdma/irdma-abi.h b/contrib/ofed/libirdma/irdma-abi.h index 8a06198608e2..b7d4b61c162d 100644 --- a/contrib/ofed/libirdma/irdma-abi.h +++ b/contrib/ofed/libirdma/irdma-abi.h @@ -2,7 +2,7 @@ * SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) * * - * Copyright (c) 2006 - 2021 Intel Corporation. All rights reserved. + * Copyright (c) 2006 - 2022 Intel Corporation. All rights reserved. * Copyright (c) 2005 Topspin Communications. All rights reserved. * Copyright (c) 2005 Cisco Systems. All rights reserved. * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. @@ -53,10 +53,15 @@ enum irdma_memreg_type { IRDMA_MEMREG_TYPE_CQ = 2, }; +enum { + IRDMA_ALLOC_UCTX_USE_RAW_ATTR = 1 << 0, +}; + struct irdma_alloc_ucontext_req { __u32 rsvd32; __u8 userspace_ver; __u8 rsvd8[3]; + __aligned_u64 comp_mask; }; struct irdma_alloc_ucontext_resp { @@ -77,6 +82,7 @@ struct irdma_alloc_ucontext_resp { __u16 max_hw_sq_chunk; __u8 hw_rev; __u8 rsvd2; + __aligned_u64 comp_mask; }; struct irdma_alloc_pd_resp { diff --git a/contrib/ofed/libirdma/irdma_defs.h b/contrib/ofed/libirdma/irdma_defs.h index 932993fd44ce..3d8b59c4b78e 100644 --- a/contrib/ofed/libirdma/irdma_defs.h +++ b/contrib/ofed/libirdma/irdma_defs.h @@ -75,6 +75,7 @@ #define IRDMA_CQE_QTYPE_RQ 0 #define IRDMA_CQE_QTYPE_SQ 1 +#define IRDMA_QP_SW_MIN_WQSIZE 8 /* in WRs*/ #define IRDMA_QP_WQE_MIN_SIZE 32 #define IRDMA_QP_WQE_MAX_SIZE 256 #define IRDMA_QP_WQE_MIN_QUANTA 1 @@ -304,6 +305,17 @@ #define IRDMAPFINT_OICR_PE_PUSH_M BIT(27) #define IRDMAPFINT_OICR_PE_CRITERR_M BIT(28) +#define IRDMA_GET_RING_OFFSET(_ring, _i) \ + ( \ + ((_ring).head + (_i)) % (_ring).size \ + ) + +#define IRDMA_GET_CQ_ELEM_AT_OFFSET(_cq, _i, _cqe) \ + { \ + register __u32 offset; \ + offset = IRDMA_GET_RING_OFFSET((_cq)->cq_ring, _i); \ + (_cqe) = (_cq)->cq_base[offset].buf; \ + } #define IRDMA_GET_CURRENT_CQ_ELEM(_cq) \ ( \ (_cq)->cq_base[IRDMA_RING_CURRENT_HEAD((_cq)->cq_ring)].buf \ @@ -437,12 +449,6 @@ IRDMA_RING_MOVE_HEAD(_ring, _retcode); \ } -enum irdma_protocol_used { - IRDMA_ANY_PROTOCOL = 0, - IRDMA_IWARP_PROTOCOL_ONLY = 1, - IRDMA_ROCE_PROTOCOL_ONLY = 2, -}; - enum irdma_qp_wqe_size { IRDMA_WQE_SIZE_32 = 32, IRDMA_WQE_SIZE_64 = 64, diff --git a/contrib/ofed/libirdma/irdma_uk.c b/contrib/ofed/libirdma/irdma_uk.c index 5201ad692dc1..97e3ac553c26 100644 --- a/contrib/ofed/libirdma/irdma_uk.c +++ b/contrib/ofed/libirdma/irdma_uk.c @@ -641,7 +641,7 @@ irdma_copy_inline_data_gen_1(u8 *wqe, struct irdma_sge *sge_list, sge_len -= bytes_copied; if (!quanta_bytes_remaining) { - /* Remaining inline bytes reside after the hdr */ + /* Remaining inline bytes reside after hdr */ wqe += 16; quanta_bytes_remaining = 32; } @@ -710,7 +710,7 @@ irdma_copy_inline_data(u8 *wqe, struct irdma_sge *sge_list, u32 num_sges, if (!quanta_bytes_remaining) { quanta_bytes_remaining = 31; - /* Remaining inline bytes reside after the hdr */ + /* Remaining inline bytes reside after hdr */ if (first_quanta) { first_quanta = false; wqe += 16; @@ -1111,7 +1111,6 @@ irdma_uk_cq_request_notification(struct irdma_cq_uk *cq, u8 arm_next = 0; u8 arm_seq_num; - cq->armed = true; get_64bit_val(cq->shadow_area, IRDMA_BYTE_32, &temp_val); arm_seq_num = (u8)FIELD_GET(IRDMA_CQ_DBSA_ARM_SEQ_NUM, temp_val); arm_seq_num++; @@ -1338,6 +1337,8 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, info->error = (bool)FIELD_GET(IRDMA_CQ_ERROR, qword3); info->push_dropped = (bool)FIELD_GET(IRDMACQ_PSHDROP, qword3); info->ipv4 = (bool)FIELD_GET(IRDMACQ_IPV4, qword3); + get_64bit_val(cqe, IRDMA_BYTE_8, &comp_ctx); + qp = (struct irdma_qp_uk *)(irdma_uintptr) comp_ctx; if (info->error) { info->major_err = FIELD_GET(IRDMA_CQ_MAJERR, qword3); info->minor_err = FIELD_GET(IRDMA_CQ_MINERR, qword3); @@ -1366,10 +1367,7 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, info->qp_id = (u32)FIELD_GET(IRDMACQ_QPID, qword2); info->ud_src_qpn = (u32)FIELD_GET(IRDMACQ_UDSRCQPN, qword2); - get_64bit_val(cqe, IRDMA_BYTE_8, &comp_ctx); - info->solicited_event = (bool)FIELD_GET(IRDMACQ_SOEVENT, qword3); - qp = (struct irdma_qp_uk *)(irdma_uintptr) comp_ctx; if (!qp || qp->destroy_pending) { ret_code = EFAULT; goto exit; @@ -1493,7 +1491,8 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, } } while (1); - if (info->op_type == IRDMA_OP_TYPE_BIND_MW && info->minor_err == FLUSH_PROT_ERR) + if (info->op_type == IRDMA_OP_TYPE_BIND_MW && + info->minor_err == FLUSH_PROT_ERR) info->minor_err = FLUSH_MW_BIND_ERR; qp->sq_flush_seen = true; if (!IRDMA_RING_MORE_WORK(qp->sq_ring)) diff --git a/contrib/ofed/libirdma/irdma_umain.c b/contrib/ofed/libirdma/irdma_umain.c index 8d27f648f969..6c823646b375 100644 --- a/contrib/ofed/libirdma/irdma_umain.c +++ b/contrib/ofed/libirdma/irdma_umain.c @@ -49,7 +49,7 @@ /** * Driver version */ -char libirdma_version[] = "1.1.5-k"; +char libirdma_version[] = "1.1.11-k"; unsigned int irdma_dbg; @@ -170,7 +170,7 @@ irdma_init_context(struct verbs_device *vdev, iwvctx->uk_attrs.max_hw_sq_chunk = resp.max_hw_sq_chunk; iwvctx->uk_attrs.max_hw_cq_size = resp.max_hw_cq_size; iwvctx->uk_attrs.min_hw_cq_size = resp.min_hw_cq_size; - iwvctx->uk_attrs.min_hw_wq_size = IRDMA_MIN_WQ_SIZE_GEN2; + iwvctx->uk_attrs.min_hw_wq_size = IRDMA_QP_SW_MIN_WQSIZE; iwvctx->abi_ver = IRDMA_ABI_VER; mmap_key = resp.db_mmap_key; diff --git a/contrib/ofed/libirdma/irdma_umain.h b/contrib/ofed/libirdma/irdma_umain.h index f6dafc6bf39a..c67c5d7076f9 100644 --- a/contrib/ofed/libirdma/irdma_umain.h +++ b/contrib/ofed/libirdma/irdma_umain.h @@ -87,7 +87,8 @@ struct irdma_uvcontext { struct irdma_uk_attrs uk_attrs; void *db; int abi_ver; - bool legacy_mode; + bool legacy_mode:1; + bool use_raw_attrs:1; }; struct irdma_uqp; diff --git a/contrib/ofed/libirdma/irdma_user.h b/contrib/ofed/libirdma/irdma_user.h index 089619e1e3b1..8eb9ae7990e7 100644 --- a/contrib/ofed/libirdma/irdma_user.h +++ b/contrib/ofed/libirdma/irdma_user.h @@ -211,7 +211,6 @@ enum irdma_device_caps_const { IRDMA_Q2_BUF_SIZE = 256, IRDMA_QP_CTX_SIZE = 256, IRDMA_MAX_PDS = 262144, - IRDMA_MIN_WQ_SIZE_GEN2 = 8, }; enum irdma_addressing_type { @@ -521,7 +520,6 @@ struct irdma_cq_uk { u32 cq_size; struct irdma_ring cq_ring; u8 polarity; - bool armed:1; bool avoid_mem_cflct:1; }; diff --git a/contrib/ofed/libirdma/irdma_uverbs.c b/contrib/ofed/libirdma/irdma_uverbs.c index 58c5c6cf617c..14efab96a107 100644 --- a/contrib/ofed/libirdma/irdma_uverbs.c +++ b/contrib/ofed/libirdma/irdma_uverbs.c @@ -1566,11 +1566,10 @@ irdma_ucreate_qp(struct ibv_pd *pd, info.sq_size = info.sq_depth >> info.sq_shift; info.rq_size = info.rq_depth >> info.rq_shift; /** - * For older ABI version (less than 6) passes raw sq and rq - * quanta in cap.max_send_wr and cap.max_recv_wr. - * But then kernel had no way of calculating the actual qp size. + * Maintain backward compatibility with older ABI which pass sq + * and rq depth (in quanta) in cap.max_send_wr a cap.max_recv_wr */ - if (iwvctx->abi_ver <= 5) { + if (!iwvctx->use_raw_attrs) { attr->cap.max_send_wr = info.sq_size; attr->cap.max_recv_wr = info.rq_size; } diff --git a/contrib/ofed/libirdma/osdep.h b/contrib/ofed/libirdma/osdep.h index 2cb4f8d57cb5..1bbf6573b800 100644 --- a/contrib/ofed/libirdma/osdep.h +++ b/contrib/ofed/libirdma/osdep.h @@ -119,7 +119,7 @@ do { \ irdma_debug(dev, mask, "%s\n", desc); \ irdma_debug(dev, mask, "starting address virt=%p phy=%lxh\n", buf, irdma_get_virt_to_phy(buf)); \ for (i = 0; i < size ; i += 8) \ - irdma_debug(dev, mask, "index %03d val: %016lx\n", i, ((unsigned long *)buf)[i / 8]); \ + irdma_debug(dev, mask, "index %03d val: %016lx\n", i, ((unsigned long *)(buf))[i / 8]); \ } while(0) #define irdma_debug(h, m, s, ...) \ @@ -137,11 +137,12 @@ do { \ if (irdma_dbg) \ printf("libirdma-%s: " fmt, __func__, ##args); \ } while (0) -#define irdma_dev_err(a, b, ...) printf(b, ##__VA_ARGS__) -#define irdma_dev_warn(a, b, ...) printf(b, ##__VA_ARGS__) /*dev_warn(a, b)*/ +#define irdma_dev_err(ibdev, fmt, ...) \ + pr_err("%s:%s:%d ERR "fmt, (ibdev)->name, __func__, __LINE__, ##__VA_ARGS__) +#define irdma_dev_warn(ibdev, fmt, ...) \ + pr_warn("%s:%s:%d WARN "fmt, (ibdev)->name, __func__, __LINE__, ##__VA_ARGS__) #define irdma_dev_info(a, b, ...) printf(b, ##__VA_ARGS__) #define irdma_pr_warn printf -#define ibdev_err(ibdev, fmt, ...) printf("%s:"fmt, (ibdev)->name, ##__VA_ARGS__) #define dump_struct(s, sz, name) \ do { \ diff --git a/sys/dev/irdma/fbsd_kcompat.c b/sys/dev/irdma/fbsd_kcompat.c index e0b3bce5ec4f..7a17b7e5f0f0 100644 --- a/sys/dev/irdma/fbsd_kcompat.c +++ b/sys/dev/irdma/fbsd_kcompat.c @@ -93,6 +93,18 @@ irdma_wr64(struct irdma_dev_ctx *dev_ctx, u32 reg, u64 value) } +void +irdma_request_reset(struct irdma_pci_f *rf) +{ + struct ice_rdma_peer *peer = rf->peer_info; + struct ice_rdma_request req = {0}; + + req.type = ICE_RDMA_EVENT_RESET; + + printf("%s:%d requesting pf-reset\n", __func__, __LINE__); + IRDMA_DI_REQ_HANDLER(peer, &req); +} + int irdma_register_qset(struct irdma_sc_vsi *vsi, struct irdma_ws_node *tc_node) { @@ -611,32 +623,38 @@ irdma_dcqcn_tunables_init(struct irdma_pci_f *rf) &rf->dcqcn_params.min_rate, 0, "set minimum rate limit value, in MBits per second, default=0"); + rf->dcqcn_params.dcqcn_f = 5; SYSCTL_ADD_U8(&rf->tun_info.irdma_sysctl_ctx, irdma_sysctl_oid_list, OID_AUTO, "dcqcn_F", CTLFLAG_RDTUN, &rf->dcqcn_params.dcqcn_f, 0, - "set number of times to stay in each stage of bandwidth recovery, default=0"); + "set number of times to stay in each stage of bandwidth recovery, default=5"); + rf->dcqcn_params.dcqcn_t = 0x37; SYSCTL_ADD_U16(&rf->tun_info.irdma_sysctl_ctx, irdma_sysctl_oid_list, OID_AUTO, "dcqcn_T", CTLFLAG_RDTUN, &rf->dcqcn_params.dcqcn_t, 0, - "set number of usecs that should elapse before increasing the CWND in DCQCN mode, default=0"); + "set number of usecs that should elapse before increasing the CWND in DCQCN mode, default=0x37"); + rf->dcqcn_params.dcqcn_b = 0x249f0; SYSCTL_ADD_U32(&rf->tun_info.irdma_sysctl_ctx, irdma_sysctl_oid_list, OID_AUTO, "dcqcn_B", CTLFLAG_RDTUN, &rf->dcqcn_params.dcqcn_b, 0, - "set number of MSS to add to the congestion window in additive increase mode, default=0"); + "set number of MSS to add to the congestion window in additive increase mode, default=0x249f0"); + rf->dcqcn_params.rai_factor = 1; SYSCTL_ADD_U16(&rf->tun_info.irdma_sysctl_ctx, irdma_sysctl_oid_list, OID_AUTO, "dcqcn_rai_factor", CTLFLAG_RDTUN, &rf->dcqcn_params.rai_factor, 0, - "set number of MSS to add to the congestion window in additive increase mode, default=0"); + "set number of MSS to add to the congestion window in additive increase mode, default=1"); + rf->dcqcn_params.hai_factor = 5; SYSCTL_ADD_U16(&rf->tun_info.irdma_sysctl_ctx, irdma_sysctl_oid_list, OID_AUTO, "dcqcn_hai_factor", CTLFLAG_RDTUN, &rf->dcqcn_params.hai_factor, 0, - "set number of MSS to add to the congestion window in hyperactive increase mode, default=0"); + "set number of MSS to add to the congestion window in hyperactive increase mode, default=5"); + rf->dcqcn_params.rreduce_mperiod = 50; SYSCTL_ADD_U32(&rf->tun_info.irdma_sysctl_ctx, irdma_sysctl_oid_list, OID_AUTO, "dcqcn_rreduce_mperiod", CTLFLAG_RDTUN, &rf->dcqcn_params.rreduce_mperiod, 0, - "set minimum time between 2 consecutive rate reductions for a single flow, default=0"); + "set minimum time between 2 consecutive rate reductions for a single flow, default=50"); } /** @@ -743,3 +761,31 @@ irdma_prm_rem_bitmapmem(struct irdma_hw *hw, struct irdma_chunk *chunk) { kfree(chunk->bitmapmem.va); } + +void +irdma_cleanup_dead_qps(struct irdma_sc_vsi *vsi) +{ + struct irdma_sc_qp *qp = NULL; + struct irdma_qp *iwqp; + struct irdma_pci_f *rf; + u8 i; + + for (i = 0; i < IRDMA_MAX_USER_PRIORITY; i++) { + qp = irdma_get_qp_from_list(&vsi->qos[i].qplist, qp); + while (qp) { + if (qp->qp_uk.qp_type == IRDMA_QP_TYPE_UDA) { + qp = irdma_get_qp_from_list(&vsi->qos[i].qplist, qp); + continue; + } + iwqp = qp->qp_uk.back_qp; + rf = iwqp->iwdev->rf; + irdma_free_dma_mem(rf->sc_dev.hw, &iwqp->q2_ctx_mem); + irdma_free_dma_mem(rf->sc_dev.hw, &iwqp->kqp.dma_mem); + + kfree(iwqp->kqp.sq_wrid_mem); + kfree(iwqp->kqp.rq_wrid_mem); + qp = irdma_get_qp_from_list(&vsi->qos[i].qplist, qp); + kfree(iwqp); + } + } +} diff --git a/sys/dev/irdma/fbsd_kcompat.h b/sys/dev/irdma/fbsd_kcompat.h index 1fb83f0ac663..0b264b763f7e 100644 --- a/sys/dev/irdma/fbsd_kcompat.h +++ b/sys/dev/irdma/fbsd_kcompat.h @@ -40,10 +40,11 @@ #define TASKLET_DATA_TYPE unsigned long #define TASKLET_FUNC_TYPE void (*)(TASKLET_DATA_TYPE) +#ifndef tasklet_setup #define tasklet_setup(tasklet, callback) \ tasklet_init((tasklet), (TASKLET_FUNC_TYPE)(callback), \ (TASKLET_DATA_TYPE)(tasklet)) - +#endif #ifndef from_tasklet #define from_tasklet(var, callback_tasklet, tasklet_fieldname) \ container_of(callback_tasklet, typeof(*var), tasklet_fieldname) @@ -176,8 +177,7 @@ int irdma_dereg_mr(struct ib_mr *ib_mr); #else int irdma_dereg_mr(struct ib_mr *ib_mr, struct ib_udata *udata); #endif -void irdma_get_eth_speed_and_width(u32 link_speed, u8 *active_speed, - u8 *active_width); +int ib_get_eth_speed(struct ib_device *dev, u32 port_num, u8 *speed, u8 *width); enum rdma_link_layer irdma_get_link_layer(struct ib_device *ibdev, u8 port_num); int irdma_roce_port_immutable(struct ib_device *ibdev, u8 port_num, @@ -197,6 +197,7 @@ int irdma_get_hw_stats(struct ib_device *ibdev, struct rdma_hw_stats *stats, u8 port_num, int index); +void irdma_request_reset(struct irdma_pci_f *rf); int irdma_register_qset(struct irdma_sc_vsi *vsi, struct irdma_ws_node *tc_node); void irdma_unregister_qset(struct irdma_sc_vsi *vsi, @@ -337,4 +338,13 @@ static inline size_t irdma_ib_umem_num_dma_blocks(struct ib_umem *umem, unsigned ALIGN_DOWN(iova, pgsz))) / pgsz; } +static inline void addrconf_addr_eui48(u8 *deui, const char *const addr) +{ + memcpy(deui, addr, 3); + deui[3] = 0xFF; + deui[4] = 0xFE; + memcpy(deui + 5, addr + 3, 3); + deui[0] ^= 2; +} + #endif /* FBSD_KCOMPAT_H */ diff --git a/sys/dev/irdma/icrdma.c b/sys/dev/irdma/icrdma.c index ed67dfdb8847..a3dee284adce 100644 --- a/sys/dev/irdma/icrdma.c +++ b/sys/dev/irdma/icrdma.c @@ -53,7 +53,7 @@ /** * Driver version */ -char irdma_driver_version[] = "1.1.5-k"; +char irdma_driver_version[] = "1.1.11-k"; #define pf_if_d(peer) peer->ifp->if_dunit @@ -223,9 +223,13 @@ static void irdma_log_invalid_mtu(u16 mtu, struct irdma_sc_dev *dev) { if (mtu < IRDMA_MIN_MTU_IPV4) - irdma_dev_warn(dev, "MTU setting [%d] too low for RDMA traffic. Minimum MTU is 576 for IPv4\n", mtu); + irdma_dev_warn(to_ibdev(dev), + "MTU setting [%d] too low for RDMA traffic. Minimum MTU is 576 for IPv4\n", + mtu); else if (mtu < IRDMA_MIN_MTU_IPV6) - irdma_dev_warn(dev, "MTU setting [%d] too low for RDMA traffic. Minimum MTU is 1280 for IPv6\\n", mtu); + irdma_dev_warn(to_ibdev(dev), + "MTU setting [%d] too low for RDMA traffic. Minimum MTU is 1280 for IPv6\\n", + mtu); } /** @@ -336,22 +340,25 @@ irdma_finalize_task(void *context, int pending) int status = 0; if (iwdev->iw_status) { - irdma_debug(&rf->sc_dev, IRDMA_DEBUG_INIT, "Starting deferred closing %d (%d)\n", + irdma_debug(&rf->sc_dev, IRDMA_DEBUG_INIT, + "Starting deferred closing %d (%d)\n", rf->peer_info->pf_id, pf_if_d(peer)); irdma_dereg_ipaddr_event_cb(rf); irdma_ib_unregister_device(iwdev); req.type = ICE_RDMA_EVENT_VSI_FILTER_UPDATE; req.enable_filter = false; IRDMA_DI_REQ_HANDLER(peer, &req); + irdma_cleanup_dead_qps(&iwdev->vsi); irdma_rt_deinit_hw(iwdev); } else { - irdma_debug(&rf->sc_dev, IRDMA_DEBUG_INIT, "Starting deferred opening %d (%d)\n", + irdma_debug(&rf->sc_dev, IRDMA_DEBUG_INIT, + "Starting deferred opening %d (%d)\n", rf->peer_info->pf_id, pf_if_d(peer)); - l2params.mtu = peer->mtu; irdma_get_qos_info(&l2params, &peer->initial_qos_info); if (iwdev->rf->protocol_used != IRDMA_IWARP_PROTOCOL_ONLY) iwdev->dcb_vlan_mode = l2params.num_tc > 1 && !l2params.dscp_mode; + l2params.mtu = peer->mtu; status = irdma_rt_init_hw(iwdev, &l2params); if (status) { irdma_pr_err("RT init failed %d\n", status); @@ -368,7 +375,8 @@ irdma_finalize_task(void *context, int pending) req.enable_filter = true; IRDMA_DI_REQ_HANDLER(peer, &req); irdma_reg_ipaddr_event_cb(rf); - irdma_debug(&rf->sc_dev, IRDMA_DEBUG_INIT, "Deferred opening finished %d (%d)\n", + irdma_debug(&rf->sc_dev, IRDMA_DEBUG_INIT, + "Deferred opening finished %d (%d)\n", rf->peer_info->pf_id, pf_if_d(peer)); } } @@ -459,6 +467,7 @@ irdma_fill_device_info(struct irdma_device *iwdev, rf->rsrc_profile = IRDMA_HMC_PROFILE_DEFAULT; rf->rst_to = IRDMA_RST_TIMEOUT_HZ; rf->check_fc = irdma_check_fc_for_qp; + rf->gen_ops.request_reset = irdma_request_reset; irdma_set_rf_user_cfg_params(rf); rf->default_vsi.vsi_idx = peer->pf_vsi_num; @@ -483,6 +492,7 @@ irdma_fill_device_info(struct irdma_device *iwdev, iwdev->rcv_wscale = IRDMA_CM_DEFAULT_RCV_WND_SCALE; iwdev->roce_cwnd = IRDMA_ROCE_CWND_DEFAULT; iwdev->roce_ackcreds = IRDMA_ROCE_ACKCREDS_DEFAULT; + iwdev->roce_rtomin = 5; if (rf->protocol_used == IRDMA_ROCE_PROTOCOL_ONLY) { iwdev->roce_mode = true; @@ -583,7 +593,8 @@ irdma_remove(struct ice_rdma_peer *peer) struct irdma_handler *hdl; struct irdma_device *iwdev; - irdma_debug((struct irdma_sc_dev *)NULL, IRDMA_DEBUG_INIT, "removing %s\n", __FUNCTION__); + irdma_debug((struct irdma_sc_dev *)NULL, IRDMA_DEBUG_INIT, + "removing %s irdma%d\n", __func__, pf_if_d(peer)); hdl = irdma_find_handler(peer); if (!hdl) @@ -614,7 +625,8 @@ irdma_remove(struct ice_rdma_peer *peer) kfree(iwdev->hdl); kfree(iwdev->rf); ib_dealloc_device(&iwdev->ibdev); - irdma_pr_info("IRDMA hardware deinitialization complete\n"); + irdma_pr_info("IRDMA hardware deinitialization complete irdma%d\n", + pf_if_d(peer)); return 0; } diff --git a/sys/dev/irdma/icrdma_hw.h b/sys/dev/irdma/icrdma_hw.h index 0b0b46c0d567..bbaf13bde63c 100644 --- a/sys/dev/irdma/icrdma_hw.h +++ b/sys/dev/irdma/icrdma_hw.h @@ -122,7 +122,7 @@ enum icrdma_device_caps_const { ICRDMA_MAX_STATS_COUNT = 128, ICRDMA_MAX_IRD_SIZE = 32, - ICRDMA_MAX_ORD_SIZE = 64, + ICRDMA_MAX_ORD_SIZE = 32, ICRDMA_MIN_WQ_SIZE = 8 /* WQEs */, }; diff --git a/sys/dev/irdma/irdma-abi.h b/sys/dev/irdma/irdma-abi.h index 4e4d8e63a9d0..176c838fce95 100644 --- a/sys/dev/irdma/irdma-abi.h +++ b/sys/dev/irdma/irdma-abi.h @@ -53,10 +53,15 @@ enum irdma_memreg_type { IRDMA_MEMREG_TYPE_CQ = 2, }; +enum { + IRDMA_ALLOC_UCTX_USE_RAW_ATTR = 1 << 0, +}; + struct irdma_alloc_ucontext_req { __u32 rsvd32; __u8 userspace_ver; __u8 rsvd8[3]; + __aligned_u64 comp_mask; }; struct irdma_alloc_ucontext_resp { @@ -77,6 +82,7 @@ struct irdma_alloc_ucontext_resp { __u16 max_hw_sq_chunk; __u8 hw_rev; __u8 rsvd2; + __aligned_u64 comp_mask; }; struct irdma_alloc_pd_resp { diff --git a/sys/dev/irdma/irdma_cm.c b/sys/dev/irdma/irdma_cm.c index 8cfd62a790ab..daf116065596 100644 --- a/sys/dev/irdma/irdma_cm.c +++ b/sys/dev/irdma/irdma_cm.c @@ -206,9 +206,10 @@ irdma_send_cm_event(struct irdma_cm_node *cm_node, event.event = type; event.status = status; - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "cm_node %p cm_id=%p state=%d accel=%d event_type=%d status=%d\n", - cm_node, cm_id, cm_node->accelerated, cm_node->state, type, status); + cm_node, cm_id, cm_node->accelerated, cm_node->state, type, + status); switch (type) { case IW_CM_EVENT_CONNECT_REQUEST: @@ -288,8 +289,9 @@ irdma_create_event(struct irdma_cm_node *cm_node, event->cm_info.rem_port = cm_node->rem_port; event->cm_info.loc_port = cm_node->loc_port; event->cm_info.cm_id = cm_node->cm_id; - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "node=%p event=%p type=%u dst=%pI4 src=%pI4\n", cm_node, + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, + "node=%p event=%p type=%u dst=%pI4 src=%pI4\n", + cm_node, event, type, event->cm_info.loc_addr, event->cm_info.rem_addr); irdma_cm_post_event(event); @@ -356,15 +358,13 @@ irdma_form_ah_cm_frame(struct irdma_cm_node *cm_node, u32 hdr_len = 0; if (!cm_node->ah || !cm_node->ah->ah_info.ah_valid) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "AH invalid\n"); + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "AH invalid\n"); return NULL; } sqbuf = irdma_puda_get_bufpool(vsi->ilq); if (!sqbuf) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "SQ buf NULL\n"); + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "SQ buf NULL\n"); return NULL; } @@ -645,7 +645,7 @@ irdma_send_reset(struct irdma_cm_node *cm_node) if (!sqbuf) return -ENOMEM; - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "caller: %pS cm_node %p cm_id=%p accel=%d state=%d rem_port=0x%04x, loc_port=0x%04x rem_addr=%pI4 loc_addr=%pI4\n", __builtin_return_address(0), cm_node, cm_node->cm_id, cm_node->accelerated, cm_node->state, cm_node->rem_port, @@ -666,8 +666,9 @@ irdma_active_open_err(struct irdma_cm_node *cm_node, bool reset) irdma_cleanup_retrans_entry(cm_node); cm_node->cm_core->stats_connect_errs++; if (reset) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "cm_node=%p state=%d\n", cm_node, cm_node->state); + irdma_debug(&cm_node->iwdev->rf->sc_dev, + IRDMA_DEBUG_CM, "cm_node=%p state=%d\n", cm_node, + cm_node->state); atomic_inc(&cm_node->refcnt); irdma_send_reset(cm_node); } @@ -687,8 +688,9 @@ irdma_passive_open_err(struct irdma_cm_node *cm_node, bool reset) irdma_cleanup_retrans_entry(cm_node); cm_node->cm_core->stats_passive_errs++; cm_node->state = IRDMA_CM_STATE_CLOSED; - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "cm_node=%p state =%d\n", cm_node, cm_node->state); + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, + "cm_node=%p state =%d\n", + cm_node, cm_node->state); if (reset) irdma_send_reset(cm_node); else @@ -747,8 +749,7 @@ irdma_process_options(struct irdma_cm_node *cm_node, u8 *optionsloc, offset += 1; continue; case OPTION_NUM_MSS: - irdma_debug(iwdev_to_idev(cm_node->iwdev), - IRDMA_DEBUG_CM, + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "MSS Length: %d Offset: %d Size: %d\n", all_options->mss.len, offset, optionsize); got_mss_option = 1; @@ -768,8 +769,7 @@ irdma_process_options(struct irdma_cm_node *cm_node, u8 *optionsloc, all_options->windowscale.shiftcount; break; default: - irdma_debug(iwdev_to_idev(cm_node->iwdev), - IRDMA_DEBUG_CM, + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "Unsupported TCP Option: %x\n", all_options->base.optionnum); break; @@ -801,9 +801,9 @@ irdma_handle_tcp_options(struct irdma_cm_node *cm_node, ret = irdma_process_options(cm_node, optionsloc, optionsize, (u32)tcph->th_flags & TH_SYN); if (ret) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), - IRDMA_DEBUG_CM, - "Node %p, Sending Reset\n", cm_node); + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, + "Node %p, Sending Reset\n", + cm_node); if (passive) irdma_passive_open_err(cm_node, true); else @@ -950,8 +950,9 @@ irdma_send_mpa_request(struct irdma_cm_node *cm_node) &cm_node->mpa_hdr, MPA_KEY_REQUEST); if (!cm_node->mpa_hdr.size) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "mpa size = %d\n", cm_node->mpa_hdr.size); + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, + "mpa size = %d\n", + cm_node->mpa_hdr.size); return -EINVAL; } @@ -1061,9 +1062,9 @@ negotiate_done: /* Not supported RDMA0 operation */ return -EOPNOTSUPP; - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "MPAV2 Negotiated ORD: %d, IRD: %d\n", cm_node->ord_size, - cm_node->ird_size); + irdma_debug(&cm_node->iwdev->rf->sc_dev, + IRDMA_DEBUG_CM, "MPAV2 Negotiated ORD: %d, IRD: %d\n", + cm_node->ord_size, cm_node->ird_size); return 0; } @@ -1084,8 +1085,8 @@ irdma_parse_mpa(struct irdma_cm_node *cm_node, u8 *buf, u32 *type, *type = IRDMA_MPA_REQUEST_ACCEPT; if (len < sizeof(struct ietf_mpa_v1)) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "ietf buffer small (%x)\n", len); + irdma_debug(&cm_node->iwdev->rf->sc_dev, + IRDMA_DEBUG_CM, "ietf buffer small (%x)\n", len); return -EINVAL; } @@ -1094,20 +1095,23 @@ irdma_parse_mpa(struct irdma_cm_node *cm_node, u8 *buf, u32 *type, priv_data_len = ntohs(mpa_frame->priv_data_len); if (priv_data_len > IETF_MAX_PRIV_DATA_LEN) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "private_data too big %d\n", priv_data_len); + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, + "private_data too big %d\n", + priv_data_len); return -EOVERFLOW; } if (mpa_frame->rev != IETF_MPA_V1 && mpa_frame->rev != IETF_MPA_V2) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "unsupported mpa rev = %d\n", mpa_frame->rev); + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, + "unsupported mpa rev = %d\n", + mpa_frame->rev); return -EINVAL; } if (mpa_frame->rev > cm_node->mpa_frame_rev) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "rev %d\n", mpa_frame->rev); + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, + "rev %d\n", + mpa_frame->rev); return -EINVAL; } @@ -1115,31 +1119,29 @@ irdma_parse_mpa(struct irdma_cm_node *cm_node, u8 *buf, u32 *type, if (cm_node->state != IRDMA_CM_STATE_MPAREQ_SENT) { if (memcmp(mpa_frame->key, IEFT_MPA_KEY_REQ, IETF_MPA_KEY_SIZE)) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), - IRDMA_DEBUG_CM, - "Unexpected MPA Key received\n"); + irdma_debug(&cm_node->iwdev->rf->sc_dev, + IRDMA_DEBUG_CM, "Unexpected MPA Key received\n"); return -EINVAL; } } else { if (memcmp(mpa_frame->key, IEFT_MPA_KEY_REP, IETF_MPA_KEY_SIZE)) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), - IRDMA_DEBUG_CM, - "Unexpected MPA Key received\n"); + irdma_debug(&cm_node->iwdev->rf->sc_dev, + IRDMA_DEBUG_CM, "Unexpected MPA Key received\n"); return -EINVAL; } } if (priv_data_len + mpa_hdr_len > len) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "ietf buffer len(%x + %x != %x)\n", priv_data_len, - mpa_hdr_len, len); + irdma_debug(&cm_node->iwdev->rf->sc_dev, + IRDMA_DEBUG_CM, "ietf buffer len(%x + %x != %x)\n", + priv_data_len, mpa_hdr_len, len); return -EOVERFLOW; } if (len > IRDMA_MAX_CM_BUF) { - irdma_debug(iwdev_to_idev(cm_node->iwdev), IRDMA_DEBUG_CM, - "ietf buffer large len = %d\n", len); + irdma_debug(&cm_node->iwdev->rf->sc_dev, + IRDMA_DEBUG_CM, "ietf buffer large len = %d\n", len); return -EOVERFLOW; } @@ -1211,7 +1213,7 @@ irdma_schedule_cm_timer(struct irdma_cm_node *cm_node, new_send->timetosend += (HZ / 10); if (cm_node->close_entry) { kfree(new_send); - irdma_debug(iwdev_to_idev(cm_node->iwdev), + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "already close entry\n"); return -EINVAL; } @@ -1520,12 +1522,13 @@ irdma_send_fin(struct irdma_cm_node *cm_node) * irdma_find_listener - find a cm node listening on this addr-port pair * @cm_core: cm's core * @dst_addr: listener ip addr + * @ipv4: flag indicating IPv4 when true * @dst_port: listener tcp port num * @vlan_id: virtual LAN ID * @listener_state: state to match with listen node's */ static struct irdma_cm_listener * -irdma_find_listener(struct irdma_cm_core *cm_core, u32 *dst_addr, u16 dst_port, +irdma_find_listener(struct irdma_cm_core *cm_core, u32 *dst_addr, bool ipv4, u16 dst_port, u16 vlan_id, enum irdma_cm_listener_state listener_state) { struct irdma_cm_listener *listen_node; @@ -1539,7 +1542,7 @@ irdma_find_listener(struct irdma_cm_core *cm_core, u32 *dst_addr, u16 dst_port, list_for_each_entry(listen_node, &cm_core->listen_list, list) { memcpy(listen_addr, listen_node->loc_addr, sizeof(listen_addr)); listen_port = listen_node->loc_port; - if (listen_port != dst_port || + if (listen_node->ipv4 != ipv4 || listen_port != dst_port || !(listener_state & listen_node->listener_state)) continue; /* compare node pair, return node handle if a match */ @@ -1579,13 +1582,13 @@ irdma_del_multiple_qhash(struct irdma_device *iwdev, child_listen_node = list_entry(pos, struct irdma_cm_listener, child_listen_list); if (child_listen_node->ipv4) - irdma_debug(iwdev_to_idev(iwdev), IRDMA_DEBUG_CM, + irdma_debug(&iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "removing child listen for IP=%pI4, port=%d, vlan=%d\n", child_listen_node->loc_addr, child_listen_node->loc_port, child_listen_node->vlan_id); else - irdma_debug(iwdev_to_idev(iwdev), IRDMA_DEBUG_CM, + irdma_debug(&iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "removing child listen for IP=%pI6, port=%d, vlan=%d\n", child_listen_node->loc_addr, child_listen_node->loc_port, @@ -1603,8 +1606,8 @@ irdma_del_multiple_qhash(struct irdma_device *iwdev, } else { ret = 0; } - irdma_debug(iwdev_to_idev(iwdev), IRDMA_DEBUG_CM, - "Child listen node freed = %p\n", + irdma_debug(&iwdev->rf->sc_dev, + IRDMA_DEBUG_CM, "Child listen node freed = %p\n", child_listen_node); kfree(child_listen_node); cm_parent_listen_node->cm_core->stats_listen_nodes_destroyed++; @@ -1614,6 +1617,10 @@ irdma_del_multiple_qhash(struct irdma_device *iwdev, return ret; } +static u8 irdma_get_egress_vlan_prio(u32 *loc_addr, u8 prio, bool ipv4){ + return prio; +} + /** * irdma_netdev_vlan_ipv6 - Gets the netdev and mac * @addr: local IPv6 address @@ -1702,20 +1709,18 @@ irdma_add_mqh_6(struct irdma_device *iwdev, if_addr_rlock(ip_dev); IRDMA_TAILQ_FOREACH(ifp, &ip_dev->if_addrhead, ifa_link) { - irdma_debug(iwdev_to_idev(iwdev), IRDMA_DEBUG_CM, + irdma_debug(&iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "IP=%pI6, vlan_id=%d, MAC=%pM\n", &((struct sockaddr_in6 *)ifp->ifa_addr)->sin6_addr, rdma_vlan_dev_vlan_id(ip_dev), IF_LLADDR(ip_dev)); if (((struct sockaddr_in6 *)ifp->ifa_addr)->sin6_family != AF_INET6) continue; child_listen_node = kzalloc(sizeof(*child_listen_node), GFP_KERNEL); - irdma_debug(iwdev_to_idev(iwdev), IRDMA_DEBUG_CM, + irdma_debug(&iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "Allocating child listener %p\n", child_listen_node); if (!child_listen_node) { - irdma_debug(iwdev_to_idev(iwdev), - IRDMA_DEBUG_CM, - "listener memory allocation\n"); + irdma_debug(&iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "listener memory allocation\n"); ret = -ENOMEM; if_addr_runlock(ip_dev); goto exit; @@ -1729,6 +1734,11 @@ irdma_add_mqh_6(struct irdma_device *iwdev, ((struct sockaddr_in6 *)ifp->ifa_addr)->sin6_addr.__u6_addr.__u6_addr32); memcpy(cm_info->loc_addr, child_listen_node->loc_addr, sizeof(cm_info->loc_addr)); + if (!iwdev->vsi.dscp_mode) + cm_info->user_pri = + irdma_get_egress_vlan_prio(child_listen_node->loc_addr, + cm_info->user_pri, + false); ret = irdma_manage_qhash(iwdev, cm_info, IRDMA_QHASH_TYPE_TCP_SYN, IRDMA_QHASH_MANAGE_TYPE_ADD, @@ -1785,20 +1795,19 @@ irdma_add_mqh_4(struct irdma_device *iwdev, if_addr_rlock(ip_dev); IRDMA_TAILQ_FOREACH(ifa, &ip_dev->if_addrhead, ifa_link) { - irdma_debug(iwdev_to_idev(iwdev), IRDMA_DEBUG_CM, + irdma_debug(&iwdev->rf->sc_dev, IRDMA_DEBUG_CM, "Allocating child CM Listener forIP=%pI4, vlan_id=%d, MAC=%pM\n", - &ifa->ifa_addr, - rdma_vlan_dev_vlan_id(ip_dev), IF_LLADDR(ip_dev)); + &ifa->ifa_addr, rdma_vlan_dev_vlan_id(ip_dev), + IF_LLADDR(ip_dev)); if (((struct sockaddr_in *)ifa->ifa_addr)->sin_family != AF_INET) continue; child_listen_node = kzalloc(sizeof(*child_listen_node), GFP_KERNEL); cm_parent_listen_node->cm_core->stats_listen_nodes_created++; *** 3438 LINES SKIPPED *** From nobody Tue Mar 28 21:58: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 4PmNqN3jKMz42V33; Tue, 28 Mar 2023 21: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 4PmNqN3Bpqz3GMN; Tue, 28 Mar 2023 21: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=1680040720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o9TIdmVyWV0/bkUSp/AMpYMzWilJw8ACyOVnuAnqhz0=; b=XI/kEIjv5mkYbm+rRhMjA9ZeAc/xxW/rBWn1QrJdttroccHpnvvpZwogNKat0TD2DduWkZ pTtkFcaWzFjkH2+jJXWM1FGt5zl9g7TTDJ6NrmGyhcvYvBC9TqLtmQVstRkfkB+Luig0x1 g7uVoSTgrGMARSmRIuBZ+3i8PcoHBVUmwYtDc/rIFgKuLdo/cQYCwy5aBaEAMkwcEEIrso Pds0SafPIR5kGluR7I8txUlZDJRflFlGKFF4Gw2T8Muz144BON9E9a0y9VSMY7h4fqp85G cDy19qazLk+4kZIZECGJ2XUnQiLxrWpIqrRw5SWKq+R+Hd2pXvC+Qb7LPmvR0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680040720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o9TIdmVyWV0/bkUSp/AMpYMzWilJw8ACyOVnuAnqhz0=; b=cFZJgNglvJeO9HrkzZBJuxlFvdV3+51GyUDNx/+2zZ+80gAnoB/T+B2gKhizz08Qu5a/Nu iL/jVpHGdZHdfpPSzfskHTiZYZJmGx8Y0dFjopRTzyUteL61slfOVut4cX8TmmLm+wFrMT c1VoZIScbpuqknFAejHnAj3jyFv9iB35uV9xD63yRyJyBRCqbB5n0HVuoGN9ll1rOm6FMn PUucSUYzg33vqtKsAPta5LSBp+4Q44K2L4BBdSUymJG7UFwIw/76QJukqm0vIS8I5m+8eU 4AzAyZfG8V8E6tA+PGIvLC/muxgN/AZXQAmL72OCUuEYT6dHF7klTjOjIIcjTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680040720; a=rsa-sha256; cv=none; b=UDlmqj8MnbxT5q4eFRF3mkCfWs39mczfGIIKSHKRxFKRfcW02hNhsU2koR/MYIXxwPWZwP 52Wv13SfalXo6kaTcQHkU2ObcD57q+U2PQbGWWowicYXlBSmBvKoCmeSH1nL0CXzZB/Uxg BlOP7nOGW9EWxYgH5H9mZT8w+NNM/N4W54obazYTfQ3BdLeUi8PQ++mshQCh2bnmnYF9iX FVY63LaPdjjUYzzxUP+6gd9Gc0jzWqu4VwLPXnAkaZoyOjVeOF2706LwHrL8ZXbtM7TwxE g2IvNRZg/o0NG9v/DQHTnyg93tJl37GYDTjCa1NMQpMO4aTqBGRISkQA5IgZvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmNqN1xRDz1Jyt; Tue, 28 Mar 2023 21:58:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32SLwe8f064794; Tue, 28 Mar 2023 21:58:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32SLwegO064793; Tue, 28 Mar 2023 21:58:40 GMT (envelope-from git) Date: Tue, 28 Mar 2023 21:58:40 GMT Message-Id: <202303282158.32SLwegO064793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vincenzo Maffione Subject: git: 1e01c7ed6281 - stable/13 - netmap: get rid of save_if_input for emulated adapters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1e01c7ed628161e1eb46dfb97b3a8c74dbb7e8db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=1e01c7ed628161e1eb46dfb97b3a8c74dbb7e8db commit 1e01c7ed628161e1eb46dfb97b3a8c74dbb7e8db Author: Vincenzo Maffione AuthorDate: 2023-03-14 21:59:23 +0000 Commit: Vincenzo Maffione CommitDate: 2023-03-28 21:58:26 +0000 netmap: get rid of save_if_input for emulated adapters The save_if_input function pointer was meant to save the previous value of ifp->if_input before replacing it with the emulated adapter hook. However, the same pointer value is already stored in the if_input field of the netmap_adapter struct, to be used for host TX ring processing. Reuse the netmap_adapter if_input field to simplify the code and save some space. MFC after: 14 days (cherry picked from commit 6c9fe357435db6408ec6b01221b9ff9e7e9b0ff1) --- sys/dev/netmap/netmap_freebsd.c | 20 ++------------------ sys/dev/netmap/netmap_kern.h | 3 --- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c index b9055d589df1..19708406dc93 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -327,9 +327,7 @@ freebsd_generic_rx_handler(struct ifnet *ifp, struct mbuf *m) stolen = generic_rx_handler(ifp, m); if (!stolen) { - struct netmap_generic_adapter *gna = - (struct netmap_generic_adapter *)NA(ifp); - gna->save_if_input(ifp, m); + NA(ifp)->if_input(ifp, m); } } @@ -346,24 +344,10 @@ nm_os_catch_rx(struct netmap_generic_adapter *gna, int intercept) nm_os_ifnet_lock(); if (intercept) { - if (gna->save_if_input) { - nm_prerr("RX on %s already intercepted", na->name); - ret = EBUSY; /* already set */ - goto out; - } - gna->save_if_input = ifp->if_input; ifp->if_input = freebsd_generic_rx_handler; } else { - if (!gna->save_if_input) { - nm_prerr("Failed to undo RX intercept on %s", - na->name); - ret = EINVAL; /* not saved */ - goto out; - } - ifp->if_input = gna->save_if_input; - gna->save_if_input = NULL; + ifp->if_input = na->if_input; } -out: nm_os_ifnet_unlock(); return ret; diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h index 195b5de7a502..237b2b39047a 100644 --- a/sys/dev/netmap/netmap_kern.h +++ b/sys/dev/netmap/netmap_kern.h @@ -987,11 +987,8 @@ struct netmap_generic_adapter { /* emulated device */ struct netmap_adapter *prev; /* Emulated netmap adapters support: - * - save_if_input saves the if_input hook (FreeBSD); * - mit implements rx interrupt mitigation; */ - void (*save_if_input)(struct ifnet *, struct mbuf *); - struct nm_generic_mit *mit; #ifdef linux netdev_tx_t (*save_start_xmit)(struct mbuf *, struct ifnet *); From nobody Tue Mar 28 22:50: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 4PmPzY3Khsz42Y2j; Tue, 28 Mar 2023 22:50: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 4PmPzY2vlpz3MFX; Tue, 28 Mar 2023 22:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680043849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nI6sZ9JLYJ7WSKYT76sXyiD20ChK/d/rTV+RhWpv5uU=; b=XX5ROyb0Ol0H1zXx3pdddswnPDqm7TEDbdJbFa0B3xB5+tozFvPhpfr+FCZNP04aGVgLeI D+3ZHf7ZMnjZ79fF3/xksF/XJFuLhaH4DFNzkG77FOUB7VLxBj9gAjr+4QwvhWCLw2U+Xm WxwdEG1kXZ07AgAZu0suSBv0IF7ilSUfH+a5ce4lj1j1WepWCeFH3uLcNAGvFpnwyAMsdm oeAUi6RNx3Jgz7gZc13X+wOSOpSdLYNzyDBUes8v0L41dfRAzPNgFjahXEnLmBoN08m66o cSAqNHQi4a3/z2p8h4I421WToHfabygKaWhPrsuQIpDC/mHz1ckCvhKdp4/DFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680043849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nI6sZ9JLYJ7WSKYT76sXyiD20ChK/d/rTV+RhWpv5uU=; b=JprcwAPWq9Fsu5Y3q2KmYa2Pq3AQB8DfD4qG2nKq+ft2hWpu62MW5iq7eLtT3l2MYaPQEL uOdGdo/1f9Zuhu6ZUYeKfHz+ZXO4Y4e9tZGdo2mGe/+pS/E2ltgmqeIRIvRlS7gttXZjsX HlOI/Sa1bzc3tgjd+48dermmI2kbOduIFjhLWqgLpnRRTxC8MVg85ogzr6GrHGsfZPYA81 rnt6t1NESDYDUT9mrYn/LiFZztw37hKW6pJCJbubXB0AzDtobMeBgtd3kr58Q7yJb5lT1m BF7rmjUqUgnbT+nyhRNemy5dO9gWXq4GB8GBNm5iI5TNGVka/orimDz3kiKhxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680043849; a=rsa-sha256; cv=none; b=dYj+2t9+zQfweSQZmqZ9PVceqXEoMmXeqC1g9CvVOBducAWwdHCcH7XAyFWgrKNRTSxITy gJlbWBoz7SNOMuTgyqVV2zUV9/fX1vb3NWQFUUA40puul2ebvNhFU8fg5Gq3TT/ctbLrjH 52mnd7cWvc6FYufH2qi92LrlWu9IsonQhS7eqO/4QW47FCNfudeQyLkELfCZ9iRkINb+az H1wCUfOkzt/vpg9oQnmpgPR9d8nRnzDMxPf7h4XJGYANxxVtpQGg8SHZJUalYqFt496W7B TPGSpqB/c9NA/YQSWSMqMPZZSPjS8V3+DVf2roFqGJ866v5f1NFoyWu0jf2iwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmPzY1zSXz1L21; Tue, 28 Mar 2023 22:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32SMon1E057436; Tue, 28 Mar 2023 22:50:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32SMonEg057435; Tue, 28 Mar 2023 22:50:49 GMT (envelope-from git) Date: Tue, 28 Mar 2023 22:50:49 GMT Message-Id: <202303282250.32SMonEg057435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: bfd32571efc7 - stable/13 - Updates to UFS/FFS superblock integrity checks when reading a superblock. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bfd32571efc73fdb7f0614dd94f86402680983b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=bfd32571efc73fdb7f0614dd94f86402680983b3 commit bfd32571efc73fdb7f0614dd94f86402680983b3 Author: Kirk McKusick AuthorDate: 2023-03-28 22:49:49 +0000 Commit: Kirk McKusick CommitDate: 2023-03-28 22:50:38 +0000 Updates to UFS/FFS superblock integrity checks when reading a superblock. Back out MFC commit 4660b60a00c3120ddecd94b3f308d39bcb6d085a as it has had reported problems. --- sys/ufs/ffs/ffs_subr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 2f69965aba7e..d847373a8cde 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -446,7 +446,6 @@ validate_sblock(struct fs *fs, int isaltsblk) CHK(fs->fs_old_cgoffset, <, 0, %jd); CHK2(fs->fs_old_cgoffset, >, 0, ~fs->fs_old_cgmask, <, 0, %jd); CHK(fs->fs_old_cgoffset * (~fs->fs_old_cgmask), >, fs->fs_fpg, %jd); - CHK(CGSIZE(fs), >, fs->fs_bsize, %jd); /* * If anything has failed up to this point, it is usafe to proceed * as checks below may divide by zero or make other fatal calculations. From nobody Wed Mar 29 00:11: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 4PmRm76j75z42d0N; Wed, 29 Mar 2023 00:11: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 4PmRm74nr8z3R8S; Wed, 29 Mar 2023 00:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680048663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6TamDH7/ZQgMqMpvWgJccPucf3y6jgOhh+bpNQY865M=; b=h+Q16CivMqeYlxKJXjqP2WP5DAfSN9+Pklm0q107Y4uh+i1KK5oVHqipNQDlhZkVftvsF/ R1FBKjos/B57lBAzXhhVPIkpK697VM/molYR9TCQMo9bBjVGgwpeiGRodaQ0xsGw7458+R YRRXpMQs2W0vskuZmGsTN+7lGhMD+ajaMN+nbvd6OyqgwVq7MdugQLheB3zNijpd1Gt471 eWuE4qonK87J0tK0DwbI6o0ksAVAOdGvHsVcYnslo+oz5AAclexRwNdX0m44nFUiLRbiwM R5aD9+/wACA4O1jJMadGq7milys74xbkB9faaRv4nuOcCVxKG434kDYub/pSWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680048663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6TamDH7/ZQgMqMpvWgJccPucf3y6jgOhh+bpNQY865M=; b=gnD+qCS83E0BomskT4qSsNOVc8TobGHVAy9fLxFE+8MM+ff8/Wm/Q3sqQXrMQ9gZT/FxgA yhpX0He3MHH9Gk9sGRa/cr+Wsr1/6XvVlSek7zqKg/XbABfspgE4wJhJ6xNlnH8SwbI5w/ s2OO59Ea1UERaboYPySxo35GJYv4QnPIlUn0QLUz+YbrlRBZsV3ITGcx4m4S8aene/DsIC iBPAP4L6vAeOTGU+GBcqmpblSrgHuV37eySrZV+iGkbljUKBAIS7DmNRknbdF14HhomJYJ lSxd5E4EelwbPU/D7xIWix/VzumJmT0boLTk13L+PbswHxxmJcZc+rb98v/8mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680048663; a=rsa-sha256; cv=none; b=cCq/OmaCqjfz/f3uv4p8aX+m7FkcZYHzV5z6YFYU3UKEttCDBhznE4gsijceN2KGhmg709 ubxH9xz4L/hbp/kNIlFV9PtZV6So09gCZ4aZT9IOqv8H7PgrOIV3ZxDAtnee+5rQ+ugzQ9 yrt5vNCiA8AAPNUcoMj8CckkqcNgRNU4P1+DD4smghoeV70WZaSclbR56cytj5iJhwBCRV bp87J+RkBlKrIn1L2GSVpcEPl2ut60046/Loi4J2lz/7lNUGlzE7ghgsyn444418F5plEg oBlL5rU2UB4MO/1gZwPR87ym2QQTsgN4r08a6qtPDYD69UFk1JrrqbyYJbHc6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmRm73rLMz1NKN; Wed, 29 Mar 2023 00:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T0B3Nw087671; Wed, 29 Mar 2023 00:11:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T0B36T087670; Wed, 29 Mar 2023 00:11:03 GMT (envelope-from git) Date: Wed, 29 Mar 2023 00:11:03 GMT Message-Id: <202303290011.32T0B36T087670@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 695d87bae1ec - main - nfscl: Make coverity happy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 695d87bae1ec826fcf796f99b9de9cdd8c37fb8c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=695d87bae1ec826fcf796f99b9de9cdd8c37fb8c commit 695d87bae1ec826fcf796f99b9de9cdd8c37fb8c Author: Rick Macklem AuthorDate: 2023-03-29 00:08:45 +0000 Commit: Rick Macklem CommitDate: 2023-03-29 00:08:45 +0000 nfscl: Make coverity happy Coverity does not like code that checks a function's return value sometimes. Add "(void)" in front of the function when the return value does not matter to try and make it happy. A recent commit deleted "(void)"s in front of nfsm_fhtom(). This commit puts them back in. Reported by: emaste MFC after: 3 months --- sys/fs/nfs/nfs_commonsubs.c | 4 ++-- sys/fs/nfsclient/nfs_clrpcops.c | 20 ++++++++++---------- sys/fs/nfsserver/nfs_nfsdserv.c | 18 +++++++++--------- sys/fs/nfsserver/nfs_nfsdstate.c | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 9e70eea522c4..48798087b177 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -437,7 +437,7 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp, if (nfsv4_opflag[nfsv4_opmap[procnum].op].needscfh > 0) { NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_PUTFH); - nfsm_fhtom(nmp, nd, nfhp, fhlen, 0); + (void)nfsm_fhtom(nmp, nd, nfhp, fhlen, 0); if (nfsv4_opflag[nfsv4_opmap[procnum].op].needscfh == 2 && procnum != NFSPROC_WRITEDS && procnum != NFSPROC_COMMITDS) { @@ -468,7 +468,7 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp, *tl = txdr_unsigned(nfsv4_opmap[procnum].op); } } else { - nfsm_fhtom(NULL, nd, nfhp, fhlen, 0); + (void)nfsm_fhtom(NULL, nd, nfhp, fhlen, 0); } if (procnum < NFSV42_NPROCS) NFSINCRGLOBAL(nfsstatsv1.rpccnt[procnum]); diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 9a8e7436f620..70c7619e679a 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -2585,7 +2585,7 @@ nfsrpc_createv4(vnode_t dvp, char *name, int namelen, struct vattr *vap, /* Get the directory's post-op attributes. */ NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_PUTFH); - nfsm_fhtom(nmp, nd, np->n_fhp->nfh_fh, np->n_fhp->nfh_len, 0); + (void)nfsm_fhtom(nmp, nd, np->n_fhp->nfh_fh, np->n_fhp->nfh_len, 0); NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_GETATTR); (void) nfsrv_putattrbit(nd, &attrbits); @@ -2785,7 +2785,7 @@ tryagain: *tl++ = dstateid.other[2]; *tl = txdr_unsigned(NFSV4OP_PUTFH); np = VTONFS(dvp); - nfsm_fhtom(nmp, nd, np->n_fhp->nfh_fh, + (void)nfsm_fhtom(nmp, nd, np->n_fhp->nfh_fh, np->n_fhp->nfh_len, 0); NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_REMOVE); @@ -2873,7 +2873,7 @@ tryagain: NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_PUTFH); np = VTONFS(tvp); - nfsm_fhtom(nmp, nd, np->n_fhp->nfh_fh, + (void)nfsm_fhtom(nmp, nd, np->n_fhp->nfh_fh, np->n_fhp->nfh_len, 0); NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_DELEGRETURN); @@ -2893,7 +2893,7 @@ tryagain: NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_PUTFH); np = VTONFS(fdvp); - nfsm_fhtom(nmp, nd, np->n_fhp->nfh_fh, + (void)nfsm_fhtom(nmp, nd, np->n_fhp->nfh_fh, np->n_fhp->nfh_len, 0); NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_SAVEFH); @@ -2910,7 +2910,7 @@ tryagain: (void) nfsrv_putattrbit(nd, &attrbits); NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_PUTFH); - nfsm_fhtom(nmp, nd, VTONFS(tdvp)->n_fhp->nfh_fh, + (void)nfsm_fhtom(nmp, nd, VTONFS(tdvp)->n_fhp->nfh_fh, VTONFS(tdvp)->n_fhp->nfh_len, 0); NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_GETATTR); @@ -2921,7 +2921,7 @@ tryagain: } (void) nfsm_strtom(nd, fnameptr, fnamelen); if (!(nd->nd_flag & ND_NFSV4)) - nfsm_fhtom(nmp, nd, VTONFS(tdvp)->n_fhp->nfh_fh, + (void)nfsm_fhtom(nmp, nd, VTONFS(tdvp)->n_fhp->nfh_fh, VTONFS(tdvp)->n_fhp->nfh_len, 0); (void) nfsm_strtom(nd, tnameptr, tnamelen); error = nfscl_request(nd, fdvp, p, cred); @@ -3006,7 +3006,7 @@ nfsrpc_link(vnode_t dvp, vnode_t vp, char *name, int namelen, NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_PUTFH); } - nfsm_fhtom(VFSTONFS(dvp->v_mount), nd, VTONFS(dvp)->n_fhp->nfh_fh, + (void)nfsm_fhtom(VFSTONFS(dvp->v_mount), nd, VTONFS(dvp)->n_fhp->nfh_fh, VTONFS(dvp)->n_fhp->nfh_len, 0); if (nd->nd_flag & ND_NFSV4) { NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); @@ -3146,7 +3146,7 @@ nfsrpc_mkdir(vnode_t dvp, char *name, int namelen, struct vattr *vap, (void) nfsrv_putattrbit(nd, &attrbits); NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_PUTFH); - nfsm_fhtom(nmp, nd, fhp->nfh_fh, fhp->nfh_len, 0); + (void)nfsm_fhtom(nmp, nd, fhp->nfh_fh, fhp->nfh_len, 0); NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_GETATTR); (void) nfsrv_putattrbit(nd, &attrbits); @@ -8230,7 +8230,7 @@ nfsrpc_createlayout(vnode_t dvp, char *name, int namelen, struct vattr *vap, /* Get the directory's post-op attributes. */ NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_PUTFH); - nfsm_fhtom(nmp, nd, np->n_fhp->nfh_fh, np->n_fhp->nfh_len, 0); + (void)nfsm_fhtom(nmp, nd, np->n_fhp->nfh_fh, np->n_fhp->nfh_len, 0); NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_GETATTR); nfsrv_putattrbit(nd, &attrbits); @@ -8635,7 +8635,7 @@ nfsrpc_copyrpc(vnode_t invp, off_t inoff, vnode_t outvp, off_t outoff, nfsrv_putattrbit(nd, &attrbits); NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_PUTFH); - nfsm_fhtom(nmp, nd, VTONFS(outvp)->n_fhp->nfh_fh, + (void)nfsm_fhtom(nmp, nd, VTONFS(outvp)->n_fhp->nfh_fh, VTONFS(outvp)->n_fhp->nfh_len, 0); NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_COPY); diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index cf88e5ea4ebe..01ecf0b09ebd 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -672,10 +672,10 @@ nfsrvd_lookup(struct nfsrv_descript *nd, __unused int isdgram, goto out; } if (nd->nd_flag & ND_NFSV2) { - nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 0); + (void)nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 0); nfsrv_fillattr(nd, &nva); } else if (nd->nd_flag & ND_NFSV3) { - nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 0); + (void)nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 0); nfsrv_postopattr(nd, 0, &nva); nfsrv_postopattr(nd, dattr_ret, &dattr); } @@ -1282,7 +1282,7 @@ nfsrvd_create(struct nfsrv_descript *nd, __unused int isdgram, } if (nd->nd_flag & ND_NFSV2) { if (!nd->nd_repstat) { - nfsm_fhtom(NULL, nd, (u_int8_t *)&fh, 0, 0); + (void)nfsm_fhtom(NULL, nd, (u_int8_t *)&fh, 0, 0); nfsrv_fillattr(nd, &nva); } } else { @@ -1292,7 +1292,7 @@ nfsrvd_create(struct nfsrv_descript *nd, __unused int isdgram, diraft_ret = nfsvno_getattr(dirp, &diraft, nd, p, 0, NULL); vrele(dirp); if (!nd->nd_repstat) { - nfsm_fhtom(NULL, nd, (u_int8_t *)&fh, 0, 1); + (void)nfsm_fhtom(NULL, nd, (u_int8_t *)&fh, 0, 1); nfsrv_postopattr(nd, 0, &nva); } nfsrv_wcc(nd, dirfor_ret, &dirfor, diraft_ret, &diraft); @@ -1492,7 +1492,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, vrele(dirp); if (!nd->nd_repstat) { if (nd->nd_flag & ND_NFSV3) { - nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 1); + (void)nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 1); nfsrv_postopattr(nd, 0, &nva); } else { NFSM_BUILD(tl, u_int32_t *, 5 * NFSX_UNSIGNED); @@ -1946,7 +1946,7 @@ nfsrvd_symlink(struct nfsrv_descript *nd, __unused int isdgram, if (nd->nd_flag & ND_NFSV3) { if (!nd->nd_repstat) { - nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 1); + (void)nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 1); nfsrv_postopattr(nd, 0, &nva); } nfsrv_wcc(nd, dirfor_ret, &dirfor, diraft_ret, &diraft); @@ -2070,12 +2070,12 @@ nfsrvd_mkdir(struct nfsrv_descript *nd, __unused int isdgram, if (nd->nd_flag & ND_NFSV3) { if (!nd->nd_repstat) { - nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 1); + (void)nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 1); nfsrv_postopattr(nd, 0, &nva); } nfsrv_wcc(nd, dirfor_ret, &dirfor, diraft_ret, &diraft); } else if (!nd->nd_repstat) { - nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 0); + (void)nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, 0, 0); nfsrv_fillattr(nd, &nva); } @@ -3462,7 +3462,7 @@ nfsrvd_getfh(struct nfsrv_descript *nd, __unused int isdgram, nd->nd_repstat = nfsvno_getfh(vp, &fh, p); vput(vp); if (!nd->nd_repstat) - nfsm_fhtom(NULL, nd, (u_int8_t *)&fh, 0, 0); + (void)nfsm_fhtom(NULL, nd, (u_int8_t *)&fh, 0, 0); NFSEXITCODE2(0, nd); return (0); } diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 267b030d8d65..4a552298671e 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -4529,7 +4529,7 @@ nfsrv_docallback(struct nfsclient *clp, int procnum, nfsv4stateid_t *stateidp, m_freem(nd->nd_mreq); goto errout; } - nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, NFSX_MYFH, 0); + (void)nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, NFSX_MYFH, 0); (void)nfsrv_putattrbit(nd, attrbitp); } else if (procnum == NFSV4OP_CBRECALL) { nd->nd_procnum = NFSV4PROC_CBCOMPOUND; @@ -4548,7 +4548,7 @@ nfsrv_docallback(struct nfsclient *clp, int procnum, nfsv4stateid_t *stateidp, *tl = newnfs_true; else *tl = newnfs_false; - nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, NFSX_MYFH, 0); + (void)nfsm_fhtom(NULL, nd, (u_int8_t *)fhp, NFSX_MYFH, 0); } else if (procnum == NFSV4OP_CBLAYOUTRECALL) { NFSD_DEBUG(4, "docallback layout recall\n"); nd->nd_procnum = NFSV4PROC_CBCOMPOUND; @@ -4567,7 +4567,7 @@ nfsrv_docallback(struct nfsclient *clp, int procnum, nfsv4stateid_t *stateidp, else *tl++ = newnfs_false; *tl = txdr_unsigned(NFSV4LAYOUTRET_FILE); - nfsm_fhtom(NULL, nd, (uint8_t *)fhp, NFSX_MYFH, 0); + (void)nfsm_fhtom(NULL, nd, (uint8_t *)fhp, NFSX_MYFH, 0); NFSM_BUILD(tl, u_int32_t *, 2 * NFSX_HYPER + NFSX_STATEID); tval = 0; txdr_hyper(tval, tl); tl += 2; From nobody Wed Mar 29 01:09: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 4PmT351sKBz42h1d for ; Wed, 29 Mar 2023 01:09: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 4PmT351PCMz3mb5; Wed, 29 Mar 2023 01:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680052145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+seKm1MKCCIS45Ob9sLrks+gT3b1TrORtQpUAhPokGc=; b=BYzwi1N6okhCQjnz9xMSmYpTRWy7eMgcS6e9O97laSm3CgPuDfQWcp1vhOG+5/NxlV/7O9 5X41OpJ59PBLmeU61HIoOsixJwdYwLMM53ecYOg0GXu1/D330KImiM6XaKUDLyyjfuXBW/ p4ZxJqNXNo1CrtoZvEVO7+YwNRJLqJLV2Qly0CcDIIL/qw5fglqcJKllr+DgLSbdTVTPzc yM815slD1HEAKSCdGWYp8uurFJ5iuO8PeIiX1g5Yn48KmhX+LJ65qdBr+4rlogu8shYGpN 5L65PSeUibfIAtEZoo+f16mywuhxE6LkjIhIWpHNJaFSJoUU5gC3wLjOy616oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680052145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+seKm1MKCCIS45Ob9sLrks+gT3b1TrORtQpUAhPokGc=; b=f5WaLyu5O6ZWaVIwzXNQrtqGnkt5Y33UMpSS7JpibvYnYPgPym06o0JTfjYpnGAj0kUhQJ aIBkxPwvSokMOOHKBk2j6yFTivs+SVM7NA2+U1nra9s5toLJTNMbc+giTqA/L/lcX3SqNp JlAHxLNKsVW2Ua1nLYZsNFCB74vqh60DuDKdQ3vSacnP7JuupA/khdJ8X4ymNhlqJHHZkA P7crSTN5d7JkSHDMTdPcA9y21RKyX3bNxRmI82IcEHp3+MPUfIOhETaoPSos8Fk24mNQuF V6wkXT0Di9Nz2uJCp9Rd/wcEJLwKXL3uL8XkdehpcwBL2uHjkyQFP+yIxWDVfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680052145; a=rsa-sha256; cv=none; b=cdD+jL80aHrx5ma6N7JAD68I0O9th75a/CaFtliRCHGano8ss2wvHRI5WjbaYlwI9AJTvB R8b6wfZjqLN/u42ziDyriWc3u9lF/ZkRVYHqk3GEafMCX9r15n7bAKviRL+zIQEYnHYhHa WE0FiK2Sp4E5NZqmui03UlG7G9gQAOZxnbiVLjq1Zr6VL3qrQlWsIYUDdtuwLEB+otdemD rw1W3Srxc9XU1z22Nq+Jbe34SCnOeHaXGXvtZyZg9tNqOZnkKkRdOmqgt0kU4ql9dQWo2W L0BK3yweBAjVBCow6oLFHymgpaTAExieAxf/QlD+/NsCIJG/s8aif8C66MPk0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmT3509yZz1PwQ; Wed, 29 Mar 2023 01:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T194jO077737; Wed, 29 Mar 2023 01:09:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T194qL077736; Wed, 29 Mar 2023 01:09:04 GMT (envelope-from git) Date: Wed, 29 Mar 2023 01:09:04 GMT Message-Id: <202303290109.32T194qL077736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Philip Paeps Subject: git: 4071c87100b8..1bb5a589a9a5 - vendor/tzdata - 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/vendor/tzdata X-Git-Reftype: branch X-Git-Commit: 1bb5a589a9a527291b12fcb2ff5e6b6dda73cad1 X-Git-Oldrev: 4071c87100b8ad6a15275c3f530ad2a10ff548a8 X-Git-Newrev: 1bb5a589a9a527291b12fcb2ff5e6b6dda73cad1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch vendor/tzdata has been updated by philip: URL: https://cgit.FreeBSD.org/src/log/?id=4071c87100b8..1bb5a589a9a5 1bb5a589a9a5 Import tzdata 2023c From nobody Wed Mar 29 01:09: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 4PmT351yJBz42h3j for ; Wed, 29 Mar 2023 01:09: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 4PmT351YnNz3mKd; Wed, 29 Mar 2023 01:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680052145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fn4F7WEx6ysduzRM8LZhGA3WPTvfEx78LtIPqMV4ySc=; b=klJu/RV0r4k+TQy7ExjNE/O4ZN2JQVVv4EHz8zgwGTRPNje/PagiQT3LFbq0pMFD/Ef7VH uA0pNocu9aweZFkkdy4w37EwJOSkl5Yqma5AmtJV+d9IktA2zGGOVEX3N7OompUAQHSFcV FrT3iabD19ZaAR9RMVBnzyq2Te4ZGfbqBZlgrOHmY7vUgVrSmVlFJsExtuaDiv15zI2CKG +TdJty9ZolUHeBd5sYLsK6bDvHYt2S0/u/rIg50GqoPcWN9fdsaQpkpqgNIIVmataMVIzl dWDdvMn3SlOnSz/qZy1unrNOcfLpzyaf7RbsQ58wIVLvRgBkZFijhuwTdOLkRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680052145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fn4F7WEx6ysduzRM8LZhGA3WPTvfEx78LtIPqMV4ySc=; b=Zo4DCfpBojfKXvbrGPZWsbh+nU485XqF4UGZA5AN0+3XhGQyhYEb4BAb8iKZO6/1sftakF SPRzx9XePhnzU/VKIsD3iI6oqIHo/VmvhNc8xluUB4TuBQiNd1oK6QWobnALjJbC1EiwWN crLN+owsSn/sBznaFf57zl1p4NILKqinCoyR/iIhmAPCPL7MNdUPEKsti9Z/gTLBdCKxCL cqWKSZoy/AfYzWJQVBAgqraQuCrhJ2C8RSMDbP9MnUFOrjoE1pt/3ihPVdQ0weQc0b4Rxy GfB6gFs1oGE66RuT7L8WNbXI6UztGAM2NC5j7j8SuNU81HETzzvd3NXWU3ifzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680052145; a=rsa-sha256; cv=none; b=kJMkjNfoSRcE10hmfEatZzp6yFQwdcM9qFscaEC0r0F3oDWhSwAVdK25GwX1S7j8XPymmG e+tRCqH3yyvX+1f1SnVh8SqfbiO7mu78Ge4E7XqKxYVJc8+akSBCepjAoWQenGZkl+8qX6 zid9OVh42ovpZst1iIaL1a1+TW6ZPV5W3TJS6vQDwwmQwPvdQCgq+S74wEbnMTpxIxB9YB 4HM7xLoBZdnlFhNEtzZKmmmHbK585G5LEom1eaqTpfpP3oSH/YLFMPM5Az+fotzuUW5/G/ KqjNB5bJFhURP/rXlP2BHTX7fyXzAmhXdKIKV7GYqNKpG9snxeJuwNobvMOEAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmT350XBLz1PK5; Wed, 29 Mar 2023 01:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T1944q077756; Wed, 29 Mar 2023 01:09:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T194qX077755; Wed, 29 Mar 2023 01:09:04 GMT (envelope-from git) Date: Wed, 29 Mar 2023 01:09:04 GMT Message-Id: <202303290109.32T194qX077755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Philip Paeps Subject: git: 467cc84e1fc4 - Create tag vendor/tzdata/tzdata2023c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: philip X-Git-Repository: src X-Git-Refname: refs/tags/vendor/tzdata/tzdata2023c X-Git-Reftype: annotated tag X-Git-Commit: 467cc84e1fc44dea6441eef866551a7741263fa7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The annotated tag vendor/tzdata/tzdata2023c has been created by philip: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/tzdata/tzdata2023c tag vendor/tzdata/tzdata2023c Tagger: Philip Paeps TaggerDate: 2023-03-29 01:08:40 +0000 Tag import of tzdata 2023c commit 1bb5a589a9a527291b12fcb2ff5e6b6dda73cad1 Author: Philip Paeps AuthorDate: 2023-03-29 01:08:40 +0000 Commit: Philip Paeps CommitDate: 2023-03-29 01:08:40 +0000 Import tzdata 2023c From nobody Wed Mar 29 01:18: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 4PmTGT55Dtz42j4y; Wed, 29 Mar 2023 01:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PmTGT42hXz3q1R; Wed, 29 Mar 2023 01:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680052737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OWBZwFfELp6FeELwyZdG2sAlcG9SR7AXsT2zANhBy3o=; b=tqCi6c6HU8K6YudTSpopJdba5SinTcQpujBlppK7p3LUbqVEX3dy3zRzjoagBbOQJlCWXz 5gUb/IT7xVkqs3Lol3+GA9iyJlf2f/DX7Z6l9gXyWYpOKQLUgvdvVTgdgpoTB1E9Tkq0U6 YvG128sV6CveqkAo0wBCSRQ1gj6H3a+8K5MAMG4pcehgVGwhbEHJvOJWmNV29GIcY/suGh xrVJG0WoHP3K9+BkDJhTWqKXapYMX0JlZ0nICsyRZWFevV650dqAF9vxcxmH4bbm0hcCk6 LATxO2lGJYhABaZ01Bu2iWyXY03IiGM6UPON9Nj1iB3mOwEVp4GOFXUFa4rNOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680052737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OWBZwFfELp6FeELwyZdG2sAlcG9SR7AXsT2zANhBy3o=; b=KqDfWgfAkwegUiB59WfhWi5giqg1LBpps0mqTvOmusgEJjx3Oa+oUHOFQNSRDZUIPT3SOi qcdziVznRVZ4p49pGFgXGA/DF5nHodHhGnZNVChZD5KN9CFwSOx8E3tjLt5sZNC1dfafaV klILPyoJWPZSSnUEIPmy0w4fcNFMaLl0xCKzEh7TVWCy4H0jtmrlhisd6N5oLeovcI6jJ1 cVCx8ghmh+E/9syI1zgiYtyREp+m2CH6IPsIS7iedN20iaymTBphSHUZ13HIc1GP7tAYOF uOA4lyMYDkwbrLNyyxE1iDxIxXEqkGFa4U5ebNZMGyik5DpYVpv5D3ztfoKqBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680052737; a=rsa-sha256; cv=none; b=DLKKHa2h9CUNZ8oN0wITNsq4Lm+GHpOJCrJsJQfGO63Yo629lSrQa+iB9nYFm5ic5ozPpe 7U6HvMS42Unx3xeHFdHQnOtXip1rDW7fKYJ20JPF8TRY2DotNHk1Qy6beRXcgW6NUB9KmF 7xPSC/Hc24na0swCoCnadtvoi6VeKKvFD9Y4YYD8kAmIEmEkMA6YkF9JRX88ILCzqFYTly e7V0IWyXQWtVo69giBedYlC808Zsscg4gK6H9YAHp2168puD4N76JbEGX+mSsgk7/9IA2x L5mWdJ2w5HytAuERydekJb3OdqkJjhNNVOgn+x3g5V1YZ31wGcENacNARPtUdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmTGT19JFz1Q09; Wed, 29 Mar 2023 01:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T1Iuf0094696; Wed, 29 Mar 2023 01:18:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T1IsFG094693; Wed, 29 Mar 2023 01:18:54 GMT (envelope-from git) Date: Wed, 29 Mar 2023 01:18:54 GMT Message-Id: <202303290118.32T1IsFG094693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: 9fbeeb6e3831 - main - contrib/tzdata: import tzdata 2023c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fbeeb6e38310b4f42a14c4b043bbee82c5e4752 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=9fbeeb6e38310b4f42a14c4b043bbee82c5e4752 commit 9fbeeb6e38310b4f42a14c4b043bbee82c5e4752 Merge: 695d87bae1ec 1bb5a589a9a5 Author: Philip Paeps AuthorDate: 2023-03-29 01:09:54 +0000 Commit: Philip Paeps CommitDate: 2023-03-29 01:09:54 +0000 contrib/tzdata: import tzdata 2023c Changes: https://github.com/eggert/tz/blob/2023c/NEWS The tzdata 2023c release reverts all changes made in 2023b other than commentary, as that appears to be the best of a bad set of short-notice choices for modeling this week's daylight saving chaos in Lebanon. MFC after: insta-MFC contrib/tzdata/NEWS | 13 +++++++++---- contrib/tzdata/asia | 40 +++++++++++++++++++++++++++++++++++----- contrib/tzdata/version | 2 +- 3 files changed, 45 insertions(+), 10 deletions(-) From nobody Wed Mar 29 01:19: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 4PmTHS2tT6z42hqC; Wed, 29 Mar 2023 01:19: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 4PmTHS2HZ7z3qGF; Wed, 29 Mar 2023 01:19:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680052788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qqTYQyJR95bGq/oOoDjGLegtE1lWnioyQIjpOdfNNqE=; b=y05eHkL3BHPfaBCK2BC0EJXZ3YHUKqf81CyrLAszUKb/qq9j2rRTE8tA2rgzVjLVEilBQ7 WTJ2sDr3RNNEOg9wt/DVJ0HQ9X4Q0XlDhQCx+Y1y1mCHE6fA9fyoCpFn5BsIqtE67yamFv tzx7TDJpaE5khhWO3i42GH+Cw7IzpUaSDeYjzvKbCuRieXbAYzQIxZZn6PAoR25Rx++Zqt NsFFvVDYWlnEztkVSfpupvoF3XfLxB2AUqnCTcuVSL3cvHbsPQkwGVnzjLmhETjCAHKFlC IEW/OB1S3U/4rPDwhqA+geY6derfzNgKvaBDWsZcV/suZVH8r4jTbf+uFbtNYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680052788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qqTYQyJR95bGq/oOoDjGLegtE1lWnioyQIjpOdfNNqE=; b=qZWZbHNFnBvjravwo9G0ivYLtnvX8uFQ7yGFI+57n3s6r/WEv1DtuQVWDj+mPo3H87wLWH sahg8Y6EW1X4RxfvF9DkWqfEUC8inlTM4oVczYzxuNBucxDW+CyaDuWIJpbu9Frvk1YCns y6bj4l7Uq6BV+sAQP7bqozKlbHAOvxB5NVvdmKD5TpC/fMrGbi+3mSE1yVjpjCiMk8GTdL zLkZMbR+kYRqegADJsbOSpm1tXd768+T7FmB/En0C/P/j9guxvcPsI40l61NbzELd4JkG3 6GzJ5h3Mz9KFgHBhmnoP4dtEaJMMGf9aZIkPEkZnT+oizDHusLd6WbodlwBWMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680052788; a=rsa-sha256; cv=none; b=wR9vND4El5c9GMfamDYjKPPJ0wtmOKXwlRLqYbtQmOKyiLD3MzA3h0GRAAmK2UG75oNXxg BO2YAgJ0z9qzxF5hk7nJVsno8gn+G8tYig5qFQdfpBUuSzMYgyXDVi55fzaZfH97l+ATRl ikPn5bOPfXUvK4SGST9OMZQJRj3ZzSGvWOTbRH5G2x75cvWbQXKgCZ2htp6AYMH9wW5yLG I+y3lFyKfTO9tIxjFA5SBbKRzQ6LOnWvG4N3S2SQWOm1CO5AlaE3QIZQePntBqzTOEhKYC esM+RX5P1B85rBWj5PmlAuJgaGlZi/wWhX14PyVTHWO7aallOxB2PNeAQ2N5zQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmTHS1Lhdz1QNx; Wed, 29 Mar 2023 01:19:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T1Jm0d094921; Wed, 29 Mar 2023 01:19:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T1Jmsd094920; Wed, 29 Mar 2023 01:19:48 GMT (envelope-from git) Date: Wed, 29 Mar 2023 01:19:48 GMT Message-Id: <202303290119.32T1Jmsd094920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: bb7b15831531 - stable/13 - contrib/tzdata: import tzdata 2023c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bb7b15831531a85b1d29e80358e3b80cc799094a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=bb7b15831531a85b1d29e80358e3b80cc799094a commit bb7b15831531a85b1d29e80358e3b80cc799094a Author: Philip Paeps AuthorDate: 2023-03-29 01:09:54 +0000 Commit: Philip Paeps CommitDate: 2023-03-29 01:19:25 +0000 contrib/tzdata: import tzdata 2023c Changes: https://github.com/eggert/tz/blob/2023c/NEWS The tzdata 2023c release reverts all changes made in 2023b other than commentary, as that appears to be the best of a bad set of short-notice choices for modeling this week's daylight saving chaos in Lebanon. (cherry picked from commit 9fbeeb6e38310b4f42a14c4b043bbee82c5e4752) --- contrib/tzdata/NEWS | 13 +++++++++---- contrib/tzdata/asia | 40 +++++++++++++++++++++++++++++++++++----- contrib/tzdata/version | 2 +- 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS index 9b235a293962..b54538aa4a82 100644 --- a/contrib/tzdata/NEWS +++ b/contrib/tzdata/NEWS @@ -1,14 +1,19 @@ News for the tz database -Release 2023b - 2023-03-23 19:50:38 -0700 +Release 2023c - 2023-03-28 12:42:14 -0700 - Briefly: - Lebanon delays the start of DST this year. + Changes to past and future timestamps + + Model Lebanon's DST chaos by reverting data to tzdb 2023a. + (Thanks to Rany Hany for the heads-up.) + + +Release 2023b - 2023-03-23 19:50:38 -0700 Changes to future timestamps This year Lebanon springs forward April 20/21 not March 25/26. - (Thanks to Saadallah Itani.) + (Thanks to Saadallah Itani.) [This was reverted in 2023c.] Release 2023a - 2023-03-22 12:39:33 -0700 diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia index dd06a5fd21fe..a29a4dc0c4de 100644 --- a/contrib/tzdata/asia +++ b/contrib/tzdata/asia @@ -2693,9 +2693,37 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1 # Lebanon # # From Saadallah Itani (2023-03-23): -# Lebanon too announced today delay of Spring forward from March 25 to April 20. -# From Paul Eggert (2023-03-23): +# Lebanon ... announced today delay of Spring forward from March 25 to April 20. +# +# From Paul Eggert (2023-03-27): +# This announcement was by the Lebanese caretaker prime minister Najib Mikati. # https://www.mtv.com.lb/en/News/Local/1352516/lebanon-postpones-daylight-saving-time-adoption +# A video was later leaked to the media of parliament speaker Nabih Berri +# asking Mikati to postpone DST to aid observance of Ramadan, Mikati objecting +# that this would cause problems such as scheduling airline flights, to which +# Berri interjected, "What flights?" +# +# The change was controversial and led to a partly-sectarian divide. +# Many Lebanese institutions, including the education ministry, the Maronite +# church, and two news channels LCBI and MTV, ignored the announcement and +# went ahead with the long-scheduled spring-forward on March 25/26, some +# arguing that the prime minister had not followed the law because the change +# had not been approved by the cabinet. Google went with the announcement; +# Apple ignored it. At least one bank followed the announcement for its doors, +# but ignored the announcement in internal computer systems. +# Beirut international airport listed two times for each departure. +# Dan Azzi wrote "My view is that this whole thing is a Dumb and Dumber movie." +# Eventually the prime minister backed down, said the cabinet had decided to +# stick with its 1998 decision, and that DST would begin midnight March 29/30. +# https://www.nna-leb.gov.lb/en/miscellaneous/604093/lebanon-has-two-times-of-day-amid-daylight-savings +# https://www.cnbc.com/2023/03/27/lebanon-in-two-different-time-zones-as-government-disagrees-on-daylight-savings.html +# +# Although we could model the chaos with two Zones, that would likely cause +# more trouble than it would cure. Since so many manual clocks and +# computer-based timestamps ignored the announcement, stick with official +# cabinet resolutions in the data while recording the prime minister's +# announcement as a comment. This is how we treated a similar situation in +# Rio de Janeiro in spring 1993. # # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Lebanon 1920 only - Mar 28 0:00 1:00 S @@ -2719,11 +2747,13 @@ Rule Lebanon 1988 only - Jun 1 0:00 1:00 S Rule Lebanon 1989 only - May 10 0:00 1:00 S Rule Lebanon 1990 1992 - May 1 0:00 1:00 S Rule Lebanon 1992 only - Oct 4 0:00 0 - -Rule Lebanon 1993 2022 - Mar lastSun 0:00 1:00 S +Rule Lebanon 1993 max - Mar lastSun 0:00 1:00 S Rule Lebanon 1993 1998 - Sep lastSun 0:00 0 - Rule Lebanon 1999 max - Oct lastSun 0:00 0 - -Rule Lebanon 2023 only - Apr 21 0:00 1:00 S -Rule Lebanon 2024 max - Mar lastSun 0:00 1:00 S +# This one-time rule, announced by the prime minister first for April 21 +# then for March 30, is commented out for reasons described above. +#Rule Lebanon 2023 only - Mar 30 0:00 1:00 S + # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Beirut 2:22:00 - LMT 1880 2:00 Lebanon EE%sT diff --git a/contrib/tzdata/version b/contrib/tzdata/version index 74a7fa8ae9e6..7daa77e00d99 100644 --- a/contrib/tzdata/version +++ b/contrib/tzdata/version @@ -1 +1 @@ -2023b +2023c From nobody Wed Mar 29 01:20: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 4PmTJD6yRlz42jDP; Wed, 29 Mar 2023 01:20: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 4PmTJD6MHDz3qdW; Wed, 29 Mar 2023 01:20:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680052828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7TmlS4Z++cHBamBXwfSBfEWTMKYXfXSTbtIsEfsM22w=; b=gXWFEF7vuk0LysH0SP4eo1AzkHrP8EKYCI7tc5SLjho2cNeoyIl9rBNaeAXDgvdhEZyYGx G8vZsyk4nokYelGHJnbIfFcJiiH92K8NHy5figNJBnv7l5A55uYPUqltPk5pISr8uJa0mK l2nz5d9ST6REmBCW+jSyfrCiaVpBlgfbwa28I+hyKnWwPbBwMWmaq1t1ZrIMgNqIkSSN2S sSVXyX+l2US+bf9T8GG+PvmtDxyVswccQSiel26ZUOByReooVNdXbIyMZbOkx/t1284ycd r3JYEVGLGOQhG9tVmIIBlQfCqdZ+NLfYQTfOAABb++1655JhQ3wt227PHzYcfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680052828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7TmlS4Z++cHBamBXwfSBfEWTMKYXfXSTbtIsEfsM22w=; b=blEcC5/gbs/5Luotn+nxnkPuTGWfGK25rnRtGusZ0cQpbSLKx7DkgKZDgE/1g4krZ5EnzB OJgMeYfRMrhyaA4GusIXoL4Z3oOk2nJXL2HrDdoDrq1lRd9Q6Jhv+qaxyKVZVa5XFLf3m/ YIRLOEhBOBI1eM/FLEUPVvztaY9LqfFi5e5LddhAHGEHjoryA+I+b4XRaOT0aocYsf3cNx oj4v1J/JI/NmNUmT+ifW8WJMcQQEq5e/w1ORkmqC4nFqCeELMn1sd2Jb00VVGkLz8tkLFl YkqjgeVFWUmSRRQUSTkFckEvRUqiasSDk8XvT+ulPN1Ua/XylJRMOz8yFpW3yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680052828; a=rsa-sha256; cv=none; b=euPmrfcriGlmb83Lro86ACWYpmi+cmZcEOQwRVnwUJW9NXFu/QJlerCaBsEtTLhnLuXCYZ HXjA/tmsK83xg9L273KBhQ76O7GkdFXAJtaBXhcVTRvuAZwB9cS8D2awUPutU5EhucjmNP GoICpCgOjYABCILuSl1dVaOpThrkEeMfLHFYQka6ZpZ9iYKRzC9zcqdN7tdWopgNcHm637 ay0qTESCwkUoYxnojRYbyIxBVcaGIFpdK3wMV8ZbSoTrLpjGwe0ay2iXV6FRp7fSpah/Nr pz8HEH28JCSOiyqTODEWVlRSJBSnSZ2n+JMBcVMRFV+BfDSPCN4xkugX7uOINw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmTJD4zh1z1Pty; Wed, 29 Mar 2023 01:20:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T1KS4q003609; Wed, 29 Mar 2023 01:20:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T1KS86003608; Wed, 29 Mar 2023 01:20:28 GMT (envelope-from git) Date: Wed, 29 Mar 2023 01:20:28 GMT Message-Id: <202303290120.32T1KS86003608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: 7da23e6521d1 - stable/12 - contrib/tzdata: import tzdata 2023c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 7da23e6521d171845311817bac904f252a3b4478 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=7da23e6521d171845311817bac904f252a3b4478 commit 7da23e6521d171845311817bac904f252a3b4478 Author: Philip Paeps AuthorDate: 2023-03-29 01:09:54 +0000 Commit: Philip Paeps CommitDate: 2023-03-29 01:20:06 +0000 contrib/tzdata: import tzdata 2023c Changes: https://github.com/eggert/tz/blob/2023c/NEWS The tzdata 2023c release reverts all changes made in 2023b other than commentary, as that appears to be the best of a bad set of short-notice choices for modeling this week's daylight saving chaos in Lebanon. (cherry picked from commit 9fbeeb6e38310b4f42a14c4b043bbee82c5e4752) --- contrib/tzdata/NEWS | 13 +++++++++---- contrib/tzdata/asia | 40 +++++++++++++++++++++++++++++++++++----- contrib/tzdata/version | 2 +- 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS index 9b235a293962..b54538aa4a82 100644 --- a/contrib/tzdata/NEWS +++ b/contrib/tzdata/NEWS @@ -1,14 +1,19 @@ News for the tz database -Release 2023b - 2023-03-23 19:50:38 -0700 +Release 2023c - 2023-03-28 12:42:14 -0700 - Briefly: - Lebanon delays the start of DST this year. + Changes to past and future timestamps + + Model Lebanon's DST chaos by reverting data to tzdb 2023a. + (Thanks to Rany Hany for the heads-up.) + + +Release 2023b - 2023-03-23 19:50:38 -0700 Changes to future timestamps This year Lebanon springs forward April 20/21 not March 25/26. - (Thanks to Saadallah Itani.) + (Thanks to Saadallah Itani.) [This was reverted in 2023c.] Release 2023a - 2023-03-22 12:39:33 -0700 diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia index dd06a5fd21fe..a29a4dc0c4de 100644 --- a/contrib/tzdata/asia +++ b/contrib/tzdata/asia @@ -2693,9 +2693,37 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1 # Lebanon # # From Saadallah Itani (2023-03-23): -# Lebanon too announced today delay of Spring forward from March 25 to April 20. -# From Paul Eggert (2023-03-23): +# Lebanon ... announced today delay of Spring forward from March 25 to April 20. +# +# From Paul Eggert (2023-03-27): +# This announcement was by the Lebanese caretaker prime minister Najib Mikati. # https://www.mtv.com.lb/en/News/Local/1352516/lebanon-postpones-daylight-saving-time-adoption +# A video was later leaked to the media of parliament speaker Nabih Berri +# asking Mikati to postpone DST to aid observance of Ramadan, Mikati objecting +# that this would cause problems such as scheduling airline flights, to which +# Berri interjected, "What flights?" +# +# The change was controversial and led to a partly-sectarian divide. +# Many Lebanese institutions, including the education ministry, the Maronite +# church, and two news channels LCBI and MTV, ignored the announcement and +# went ahead with the long-scheduled spring-forward on March 25/26, some +# arguing that the prime minister had not followed the law because the change +# had not been approved by the cabinet. Google went with the announcement; +# Apple ignored it. At least one bank followed the announcement for its doors, +# but ignored the announcement in internal computer systems. +# Beirut international airport listed two times for each departure. +# Dan Azzi wrote "My view is that this whole thing is a Dumb and Dumber movie." +# Eventually the prime minister backed down, said the cabinet had decided to +# stick with its 1998 decision, and that DST would begin midnight March 29/30. +# https://www.nna-leb.gov.lb/en/miscellaneous/604093/lebanon-has-two-times-of-day-amid-daylight-savings +# https://www.cnbc.com/2023/03/27/lebanon-in-two-different-time-zones-as-government-disagrees-on-daylight-savings.html +# +# Although we could model the chaos with two Zones, that would likely cause +# more trouble than it would cure. Since so many manual clocks and +# computer-based timestamps ignored the announcement, stick with official +# cabinet resolutions in the data while recording the prime minister's +# announcement as a comment. This is how we treated a similar situation in +# Rio de Janeiro in spring 1993. # # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Lebanon 1920 only - Mar 28 0:00 1:00 S @@ -2719,11 +2747,13 @@ Rule Lebanon 1988 only - Jun 1 0:00 1:00 S Rule Lebanon 1989 only - May 10 0:00 1:00 S Rule Lebanon 1990 1992 - May 1 0:00 1:00 S Rule Lebanon 1992 only - Oct 4 0:00 0 - -Rule Lebanon 1993 2022 - Mar lastSun 0:00 1:00 S +Rule Lebanon 1993 max - Mar lastSun 0:00 1:00 S Rule Lebanon 1993 1998 - Sep lastSun 0:00 0 - Rule Lebanon 1999 max - Oct lastSun 0:00 0 - -Rule Lebanon 2023 only - Apr 21 0:00 1:00 S -Rule Lebanon 2024 max - Mar lastSun 0:00 1:00 S +# This one-time rule, announced by the prime minister first for April 21 +# then for March 30, is commented out for reasons described above. +#Rule Lebanon 2023 only - Mar 30 0:00 1:00 S + # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Beirut 2:22:00 - LMT 1880 2:00 Lebanon EE%sT diff --git a/contrib/tzdata/version b/contrib/tzdata/version index 74a7fa8ae9e6..7daa77e00d99 100644 --- a/contrib/tzdata/version +++ b/contrib/tzdata/version @@ -1 +1 @@ -2023b +2023c From nobody Wed Mar 29 01: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 4PmTT45GPRz42jCs; Wed, 29 Mar 2023 01:28:08 +0000 (UTC) (envelope-from philip@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 4PmTT44JyNz3rHg; Wed, 29 Mar 2023 01:28:08 +0000 (UTC) (envelope-from philip@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680053288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=DOMz5u4NYK07qQ8qsBm2lnHnnzY1BWkYbkJ+Kj9VIjM=; b=j2NhCEQCbtxKufrqIYPrg7Xsyi46XLOKAkp5Wuyi/bSzPs416FYi94hQlawaJoGm4SXrw/ fcNYNGboLxL9mFnH1vZH3ly+vsYRW5gil6fJO8IsyIoGx+GH4bNrytmCOPJX0ZsYnpDeds NmVMTfem5rZ0eY5uefVy+he4kQK0CGL/YZLlVl7DNFMC+d+BQ67+zyt7IX/1qO1C1rjAH3 DpdbG9OHXj2r1/yqpc21mUKhQwlnBKrLMtY8DtBEXmVXcG5D+jsmMuCWwLOTwBz+KehhPT mPvrTRg3ylkpI9noeIau5V5+hH9mWJrk8jMO9DZUIW3Hn7DJqhoKr+/Xh/aorg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680053288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=DOMz5u4NYK07qQ8qsBm2lnHnnzY1BWkYbkJ+Kj9VIjM=; b=IiTngZzi6BWm7+IbV5svpO5FfeWZBnaVH+gqNYPh0fuxTQaejo/GDwAx6Fy298PzWjVrsG MAKvDYYf5eC9CSLAU/U2fsLt4M5kEqQB2oSPl2C3HhsDUwQjBPOvbltXFzcAL/8UYnGWfu 9xx6iLYxb8r9eEu/yx8VapCj9Mk6zLWBGSyzoaiMS3L3CgE6fr5TYP00DNa6BJ7/jPFqVN +MsdTy00JYqSaeA7GpvPLGZ+8MZUgPJCNwJvE+8lauVS7QLeqgArPA1ygTihJVyxp48CyP aNmSSRwd/CZkvZEj30hljYKhyOcm9JbQx1WAlngb0CLB9WWavWDuJxMX9bDGuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680053288; a=rsa-sha256; cv=none; b=jZZ4wCgn0dS7pxtXSwli5VsE6TnoKEj71294mKyyxqnek/JArlYMJOhFov0ks0eG2spUAh jcF1QZHLkxwJbHC/bia7uEgk//lpscIN8Po6mRh1ykpp51MNo1x7xXGyAtfauL1JSkCS3z U2RdRUpJPViiiLJT0eWMueWnQevbOGDEl70jK+t51ABWIf+BXxkyWHoGKh6ZajZWUSWCSd xVEdel3FDbO1qsbWU46PZyl1Vnkwy7qNM9WgFgjvyoNCpBEPIa0CMSwhE+uzINaLSvNeqY /OT5QndntP7UUEskzWYGVdNJ8qvSDtuA5L6gDmevN1tpHHamzgjZHpuxPXP1UQ== Received: from auth2-smtp.messagingengine.com (auth2-smtp.messagingengine.com [66.111.4.228]) (using TLSv1.3 with cipher TLS_AES_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: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PmTT435w2zvGl; Wed, 29 Mar 2023 01:28:08 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailauth.nyi.internal (Postfix) with ESMTP id 4B16227C005A; Tue, 28 Mar 2023 21:28:08 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 28 Mar 2023 21:28:08 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehhedggeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggujghofgesth dtredttdervdenucfhrhhomheprfhhihhlihhpucfrrggvphhsuceophhhihhlihhpsehf rhgvvggsshgurdhorhhgqeenucggtffrrghtthgvrhhnpeekffdtfeeuudehveduudeife eiieefffevgeekteeikeejgeeiudeiieduuedvffenucffohhmrghinhepghhithhhuhgs rdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epphhhihhlihhpodhmvghsmhhtphgruhhthhhpvghrshhonhgrlhhithihqdduudeiiedv iedvgeekqddvfeehudektddtkedqphhhihhlihhppeepfhhrvggvsghsugdrohhrghesth hrohhusghlvgdrihhs X-ME-Proxy: Feedback-ID: ia691475d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 28 Mar 2023 21:28:06 -0400 (EDT) Date: Wed, 29 Mar 2023 09:28:04 +0800 From: Philip Paeps To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 9fbeeb6e3831 - main - contrib/tzdata: import tzdata 2023c Message-ID: Mail-Followup-To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202303290118.32T1IsFG094693@gitrepo.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; format=flowed Content-Disposition: inline In-Reply-To: <202303290118.32T1IsFG094693@gitrepo.freebsd.org> X-PGP-Fingerprint: B851 CD3A C248 F2ED 3E2C C18C BB6D 8A14 AFE7 D96B X-Date: Today is Pungenday, the 15th day of Discord in the YOLD 3189 X-Phase-of-Moon: The Moon is Waxing Crescent (49% of Full) X-Clacks-Overhead: GNU Terry Pratchett Organization: Happily Disorganized User-Agent: Mutt/2.2.9 (2022-11-12) X-ThisMailContainsUnwantedMimeParts: N On 2023-03-29 01:18:54 (+0000), Philip Paeps wrote: >contrib/tzdata: import tzdata 2023c > >Changes: https://github.com/eggert/tz/blob/2023c/NEWS > >The tzdata 2023c release reverts all changes made in 2023b other than >commentary, as that appears to be the best of a bad set of short-notice >choices for modeling this week's daylight saving chaos in Lebanon. It's been an interesting week in Lebanon. There will be an errata notice and freebsd-update patches combining the tzdata 2023a-2023c releases. While the dust will have settled by the time that comes out, it will ensure we return "correct" past timestamps. (Or at least the same "wrong" past timestamps as everyone else.) Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From nobody Wed Mar 29 04:35: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 4PmYdD0K0Nz41x9P; Wed, 29 Mar 2023 04:35: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 4PmYdC6wBPz4FJw; Wed, 29 Mar 2023 04:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680064528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i8Bd7Y8Z9GOgPD4A81KVtuw3QcMqLj+V/a0UdkxFtFo=; b=OIgHD66MsYeD4UVj92l2Y8ynGlrS6+bqd7Umvh/T5U1Bq18wYuBrUbz5um/xDSzITDVUjA cB46zAxLH/726EUx/ZHY7THaEeAZvuScXzoWaWbuP1NynmWq7G3yj2aHQmx9JzVIkwBRgr 3/E2rErPPE9lv0M8BB9iw5mKfKg1MmUmKn1ScwZqGSBwW0KqGNj2GVmkMtIlnnjZs7ZlAe iZouR9Azjbj5wcHxz+UgGoixwa6NuRPGVolZhgul0+dSMQBigL3R69PWD5ptj9m/ncgLMj JMQHCRvbH7Zo6RDyuIiGyDBbmK3/OUqtx/+Wyq0fFOKLqTw0mZK/tPTiCCtTEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680064528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i8Bd7Y8Z9GOgPD4A81KVtuw3QcMqLj+V/a0UdkxFtFo=; b=e81hl4SgdR0Mb5KbEcRChSrG8x/dvFEPpfY+zSf25KZtAaUkzTUixYwJc4pvptXItD6lbt ULfyzJR1hNAzRmLehmZ39DEORFztXliUekklErfaZZspNHS+SDQQido9QUVz96kqD8b++m l79rEbUvqLNIgVdNbg5/zXKIWFhwn4Je0lSh6RcQ2Sl+m9amGjtLzcwRMpUE3srE2iNSY9 xP12EyLyQusrjXXkBkNiyEWm04BQQk5XOz9w0GbNSplR7I38HcihUkRjpbK3GX/9MINx9E BbNMZN0dt/2imDOIBn+t/UAaD4AEP1ua2o5py0XxLSk0rpsp5D/yM0w+n17BXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680064528; a=rsa-sha256; cv=none; b=f6WxsPD0bsTY0ovRReqgC8e+74V8GIdp06XmfyTHOO/TwYnJUQiKZ4SPV3BwX5TN2+JNEJ CaUdFsaslbutxPbGKUqKwOYP/My6S4APxUJtGqIoLot6yjvO/CykTeJ0s3/C9VOvUUjHBr KSFSng+gUyrU61JwAp0GCeJmYwTLqB24Yi5RTM95QGrmrIhNzgmxDvPgT7kBMlEsPxQoKT Gj4PDi67P/b1AUPtRgy2LCsOev+bvtWS2EgiWyzeT1YxNKdMRUCqBzeHXOOTypWoAM3VLC /fkM+zPpKqpGFQnqlTVIidbJMuJ16Ea1jMGIDwCx0xALpAlQFqkUt0keAVmYGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmYdC5zkXzGpZ; Wed, 29 Mar 2023 04:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T4ZRnc024861; Wed, 29 Mar 2023 04:35:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T4ZRpL024860; Wed, 29 Mar 2023 04:35:27 GMT (envelope-from git) Date: Wed, 29 Mar 2023 04:35:27 GMT Message-Id: <202303290435.32T4ZRpL024860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: 57472c9a30ab - releng/13.2 - contrib/tzdata: import tzdata 2023c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 57472c9a30abce230797fcf1e9435fb603d7425e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=57472c9a30abce230797fcf1e9435fb603d7425e commit 57472c9a30abce230797fcf1e9435fb603d7425e Author: Philip Paeps AuthorDate: 2023-03-29 01:09:54 +0000 Commit: Philip Paeps CommitDate: 2023-03-29 02:32:25 +0000 contrib/tzdata: import tzdata 2023c Changes: https://github.com/eggert/tz/blob/2023c/NEWS The tzdata 2023c release reverts all changes made in 2023b other than commentary, as that appears to be the best of a bad set of short-notice choices for modeling this week's daylight saving chaos in Lebanon. Approved by: re (cperciva) (cherry picked from commit 9fbeeb6e38310b4f42a14c4b043bbee82c5e4752) (cherry picked from commit bb7b15831531a85b1d29e80358e3b80cc799094a) --- contrib/tzdata/NEWS | 13 +++++++++---- contrib/tzdata/asia | 40 +++++++++++++++++++++++++++++++++++----- contrib/tzdata/version | 2 +- 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS index 9b235a293962..b54538aa4a82 100644 --- a/contrib/tzdata/NEWS +++ b/contrib/tzdata/NEWS @@ -1,14 +1,19 @@ News for the tz database -Release 2023b - 2023-03-23 19:50:38 -0700 +Release 2023c - 2023-03-28 12:42:14 -0700 - Briefly: - Lebanon delays the start of DST this year. + Changes to past and future timestamps + + Model Lebanon's DST chaos by reverting data to tzdb 2023a. + (Thanks to Rany Hany for the heads-up.) + + +Release 2023b - 2023-03-23 19:50:38 -0700 Changes to future timestamps This year Lebanon springs forward April 20/21 not March 25/26. - (Thanks to Saadallah Itani.) + (Thanks to Saadallah Itani.) [This was reverted in 2023c.] Release 2023a - 2023-03-22 12:39:33 -0700 diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia index dd06a5fd21fe..a29a4dc0c4de 100644 --- a/contrib/tzdata/asia +++ b/contrib/tzdata/asia @@ -2693,9 +2693,37 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1 # Lebanon # # From Saadallah Itani (2023-03-23): -# Lebanon too announced today delay of Spring forward from March 25 to April 20. -# From Paul Eggert (2023-03-23): +# Lebanon ... announced today delay of Spring forward from March 25 to April 20. +# +# From Paul Eggert (2023-03-27): +# This announcement was by the Lebanese caretaker prime minister Najib Mikati. # https://www.mtv.com.lb/en/News/Local/1352516/lebanon-postpones-daylight-saving-time-adoption +# A video was later leaked to the media of parliament speaker Nabih Berri +# asking Mikati to postpone DST to aid observance of Ramadan, Mikati objecting +# that this would cause problems such as scheduling airline flights, to which +# Berri interjected, "What flights?" +# +# The change was controversial and led to a partly-sectarian divide. +# Many Lebanese institutions, including the education ministry, the Maronite +# church, and two news channels LCBI and MTV, ignored the announcement and +# went ahead with the long-scheduled spring-forward on March 25/26, some +# arguing that the prime minister had not followed the law because the change +# had not been approved by the cabinet. Google went with the announcement; +# Apple ignored it. At least one bank followed the announcement for its doors, +# but ignored the announcement in internal computer systems. +# Beirut international airport listed two times for each departure. +# Dan Azzi wrote "My view is that this whole thing is a Dumb and Dumber movie." +# Eventually the prime minister backed down, said the cabinet had decided to +# stick with its 1998 decision, and that DST would begin midnight March 29/30. +# https://www.nna-leb.gov.lb/en/miscellaneous/604093/lebanon-has-two-times-of-day-amid-daylight-savings +# https://www.cnbc.com/2023/03/27/lebanon-in-two-different-time-zones-as-government-disagrees-on-daylight-savings.html +# +# Although we could model the chaos with two Zones, that would likely cause +# more trouble than it would cure. Since so many manual clocks and +# computer-based timestamps ignored the announcement, stick with official +# cabinet resolutions in the data while recording the prime minister's +# announcement as a comment. This is how we treated a similar situation in +# Rio de Janeiro in spring 1993. # # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Lebanon 1920 only - Mar 28 0:00 1:00 S @@ -2719,11 +2747,13 @@ Rule Lebanon 1988 only - Jun 1 0:00 1:00 S Rule Lebanon 1989 only - May 10 0:00 1:00 S Rule Lebanon 1990 1992 - May 1 0:00 1:00 S Rule Lebanon 1992 only - Oct 4 0:00 0 - -Rule Lebanon 1993 2022 - Mar lastSun 0:00 1:00 S +Rule Lebanon 1993 max - Mar lastSun 0:00 1:00 S Rule Lebanon 1993 1998 - Sep lastSun 0:00 0 - Rule Lebanon 1999 max - Oct lastSun 0:00 0 - -Rule Lebanon 2023 only - Apr 21 0:00 1:00 S -Rule Lebanon 2024 max - Mar lastSun 0:00 1:00 S +# This one-time rule, announced by the prime minister first for April 21 +# then for March 30, is commented out for reasons described above. +#Rule Lebanon 2023 only - Mar 30 0:00 1:00 S + # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Beirut 2:22:00 - LMT 1880 2:00 Lebanon EE%sT diff --git a/contrib/tzdata/version b/contrib/tzdata/version index 74a7fa8ae9e6..7daa77e00d99 100644 --- a/contrib/tzdata/version +++ b/contrib/tzdata/version @@ -1 +1 @@ -2023b +2023c From nobody Wed Mar 29 05:04: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 4PmZGY5yK9z41ykg; Wed, 29 Mar 2023 05:04: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 4PmZGY5Jkmz4HPp; Wed, 29 Mar 2023 05:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680066261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NnwY0dj1nNOH9zw7dCaZRs75d9gAvtoy68xvPJeUHGQ=; b=BGx+WfyadkRz2CQusJHMpkFXD8qWQi5MTwlw8WMrIEmrLls2vCPzETmkHgge4a7rCSD0Ht ZLoQlcyCm1MO7a7U+mRwHKr+v/tSaU8eQejPMTNphAgZVMsXA/u27hnbMm9ArD3UKUGUVW 89HPkaHFmI7FfQTYJuOfTGvKRbZE33ioewE1PIwYG2CShCyIH8DM3OZ2//OqVOg1iPT1xN JbvxLubibc/kgGaB2wgYKUl0XzGDNFREVA5gxIn+YMzaD1bqNzDxBKSO176e8MPfMwoP+X G+dJzPHZkapHVo5SwcW74i5WLFYQ6+H57s+0fMUMQuWgUTGiSjRPmNBMmjTFmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680066261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NnwY0dj1nNOH9zw7dCaZRs75d9gAvtoy68xvPJeUHGQ=; b=SAufDDNjnesDbDnm/tLGLtch1ufU0t/Z91AfBVozQfFnYWkb/gc7CCxqlST0luX0dz/sQb PTB35/mxc11OoajsO+81iLC13QH6tClV0z8yEl9OGxYoT+Vsp+4rXazpFEkXf0mc9Ypo4q c7iGg769OgQNX74V20Wf0gb8PvJkz8zVGplad/HsaCQeNqb5UWB/mX1JdomKrvDmZmWHP9 T4XvCLV+E1ltF5S3BBfSOaVk/sRB/p1US5lQQ2YsCnY2yzqkd1eSWq5oq8+J27kwRRntIL nX6TSbREG/rEG14g4pcEG+65VSvHTCAN5+bXE9FIo/BD6YhZFUoqI8oHQ7aAZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680066261; a=rsa-sha256; cv=none; b=JXVuCajkxHOt4+T0+eIuMmvWhiQM70NJCesQtD5d+t64WAlOofxOIqrE5BNQag4TTVpF9h zyS9DGWbf7tqu9Sy3CCHYbluaifq3CCAoZ7Lid1Lt3Ts1NR4FlnzfTzmeO3+VnDiUBxAWk E75CA0xPHcv3TgPhvpI3g1D01fuiFodb47W3pL+3Ngwz613z3nOVw6bin0Vv7At/kNiJP9 ZtvIFNtFO2QAo3BZ/hUlqHCVI9+y/1lfktgBhTDhHl+G65Iy7GciHBiR6Hw040DaQUHXxO dsQbj1vAD2K7+43Ngl3As9hslkTUjo04toKj8CfEdzLymVTOvU3G9qbfsuZkDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmZGY4NDgzHQh; Wed, 29 Mar 2023 05:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T54L7q074307; Wed, 29 Mar 2023 05:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T54LtN074306; Wed, 29 Mar 2023 05:04:21 GMT (envelope-from git) Date: Wed, 29 Mar 2023 05:04:21 GMT Message-Id: <202303290504.32T54LtN074306@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: 21d29c519221 - main - cred: make the refcount signed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 21d29c51922141ff26a4d0e47efe6b551eb03e0e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=21d29c51922141ff26a4d0e47efe6b551eb03e0e commit 21d29c51922141ff26a4d0e47efe6b551eb03e0e Author: Mateusz Guzik AuthorDate: 2023-03-22 21:44:55 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-29 05:02:04 +0000 cred: make the refcount signed There are asserts on the count being > 0, but they are less useful than they can be because the type itself is unsigned. The kernel is compiled with -frapv, making wraparound perfectly defined. Differential Revision: https://reviews.freebsd.org/D39220 --- sys/sys/ucred.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 6a9becb54c75..5ec54be70c2e 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -61,7 +61,7 @@ struct loginclass; #if defined(_KERNEL) || defined(_WANT_UCRED) struct ucred { struct mtx cr_mtx; - u_int cr_ref; /* (c) reference count */ + int cr_ref; /* (c) reference count */ u_int cr_users; /* (c) proc + thread using this cred */ struct auditinfo_addr cr_audit; /* Audit properties. */ #define cr_startcopy cr_uid From nobody Wed Mar 29 05:04: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 4PmZGZ6n8Pz41ynS; Wed, 29 Mar 2023 05:04: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 4PmZGZ6DTKz4Hgn; Wed, 29 Mar 2023 05:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680066262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VucduRQCSxpKvfym/1eAzJU/2tMabD5BCemDd6/YbaY=; b=Buh/FQuWtDx1v+osG8KFS3b1mhtCwgiMa4B+qSUKtbmELnq4if6CTQ50kWVxnwqdM52IIb Rd8CgUtaQ1ek5346jgPo7zGJkh7rhML+eHKsYM/TxEXdvu84+IXLtyOCiSmlb5jhQE+RT2 q2tqIZvm7Ad/cfj8ikm2iIBqoCtGDAcQfea/eja6Wj6hLo+HDtphQOfsfj8LiYZmJeHuav Xmk8a1lfN95Raz3x5BHrcl5QNum8t62R+zREfNzQNBDirrqgs7K8h7CHRxUVulAlPT/Kul /ZDtm/352/jgki8XRjXmMQssjCAlAHN24GnhA1eewR0INNMdnsul3MG986NmmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680066262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VucduRQCSxpKvfym/1eAzJU/2tMabD5BCemDd6/YbaY=; b=FL8kY7jkajkhNOh9f9JV2dV8G8K1YBkiC3nolaYerA9wYMfUGfS96MUlo3h4ifiSB5wiOk Pevh5BEO5XVr7Cd/R+c9ON8pNMyb6Y67KbFIQ777zJgEv5bhJUhkxCogVsQKXNPx6TdbP7 tweDojsSn2zA8Nrr2GqaYLl5panh4k+meYWEAeZRe7/qerBbHN+N/qbDNLj842VuVVejuh v7HgVZieT1AgKJ/90o++/ZbItS8Nmjc2FqOTMK5yNxN9b+smrby5dWUYI2uee7PFkobr8K Ca6GyjlyE4N8hx6Eed0dOo5l74rdd/f4Iw2yAE+tiiJXlNWfLp7DYujLy4Ke3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680066262; a=rsa-sha256; cv=none; b=Hxzx83XKHGMY646ARINVfuR5oH97OWUwEE3LfSvGH7sJ6m4uUX2OXOXAB/XPupmqrRvlJm dAT9Vh4iF+B0JCxm2txWMhallM8vF+lx3YP33kMAH5wrIgoZZHr4i5IkHh/VOHQz77mQuy 1659Z4EVdl9Mpc06XOMsIk6BLhn1OaD5DGb99Mi+RKXbA1v3On7RZKiBNhSJce2enKXu1z lpzdyj4fRpEsukcjdok/Cr0xTR8B25YIwoQMZb78NsqNGw12oqOt6inWv2fUsPNxR2VfPu EKYIBzVwuZo0yb/1LONH4BIGcjXoqmeDWpDeHLvEoR31W4U+81NEMpeLci48nA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmZGZ5LQPzHGX; Wed, 29 Mar 2023 05:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T54MKA074326; Wed, 29 Mar 2023 05:04:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T54MaU074325; Wed, 29 Mar 2023 05:04:22 GMT (envelope-from git) Date: Wed, 29 Mar 2023 05:04:22 GMT Message-Id: <202303290504.32T54MaU074325@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: 37337709d333 - main - cred: convert the refcount from int to long List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 37337709d3334f32650ba3a7c529fa013ed5e1f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=37337709d3334f32650ba3a7c529fa013ed5e1f2 commit 37337709d3334f32650ba3a7c529fa013ed5e1f2 Author: Mateusz Guzik AuthorDate: 2023-03-22 20:42:04 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-29 05:02:32 +0000 cred: convert the refcount from int to long On 64-bit platforms this sorts out worries about mitigating bugs which overflow the counter, all while not pessimizng anything -- most notably it avoids whacking per-thread operation in favor of refcount(9) API. The struct already had two instances of 4 byte padding with 256 bytes in size, cr_flags gets moved around to avoid growing it. 32-bit platforms could also get the extended counter, but I did not do it as one day(tm) the mutex protecting centralized operation should be replaced with atomics and 64-bit ops on 32-bit platforms remain quite penalizing. While worries of counter overflow are addressed, the following is not (just like it would not be with conversion to refcount(9)): - counter *underflows* - buffer overruns from adjacent allocations - UAF due to stale cred pointer - .. and other goodies As such, while lipstick was placed, the pig should not be participating in any beauty pageants. Prodded by: emaste Differential Revision: https://reviews.freebsd.org/D39220 --- sys/kern/kern_prot.c | 11 ++++++----- sys/sys/proc.h | 2 +- sys/sys/ucred.h | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 983e6ae21493..3d8f3e222b4c 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1877,7 +1877,7 @@ crunuse(struct thread *td) __func__, cr->cr_users, cr)); cr->cr_users--; if (cr->cr_users == 0) { - KASSERT(cr->cr_ref > 0, ("%s: ref %d not > 0 on cred %p", + KASSERT(cr->cr_ref > 0, ("%s: ref %ld not > 0 on cred %p", __func__, cr->cr_ref, cr)); crold = cr; } else { @@ -1905,7 +1905,7 @@ crunusebatch(struct ucred *cr, int users, int ref) mtx_unlock(&cr->cr_mtx); return; } - KASSERT(cr->cr_ref >= 0, ("%s: ref %d not >= 0 on cred %p", + KASSERT(cr->cr_ref >= 0, ("%s: ref %ld not >= 0 on cred %p", __func__, cr->cr_ref, cr)); if (cr->cr_ref > 0) { mtx_unlock(&cr->cr_mtx); @@ -2051,7 +2051,7 @@ crfree(struct ucred *cr) mtx_unlock(&cr->cr_mtx); return; } - KASSERT(cr->cr_ref >= 0, ("%s: ref %d not >= 0 on cred %p", + KASSERT(cr->cr_ref >= 0, ("%s: ref %ld not >= 0 on cred %p", __func__, cr->cr_ref, cr)); if (cr->cr_ref > 0) { mtx_unlock(&cr->cr_mtx); @@ -2066,7 +2066,7 @@ crfree_final(struct ucred *cr) KASSERT(cr->cr_users == 0, ("%s: users %d not == 0 on cred %p", __func__, cr->cr_users, cr)); - KASSERT(cr->cr_ref == 0, ("%s: ref %d not == 0 on cred %p", + KASSERT(cr->cr_ref == 0, ("%s: ref %ld not == 0 on cred %p", __func__, cr->cr_ref, cr)); /* @@ -2104,6 +2104,7 @@ crcopy(struct ucred *dest, struct ucred *src) bcopy(&src->cr_startcopy, &dest->cr_startcopy, (unsigned)((caddr_t)&src->cr_endcopy - (caddr_t)&src->cr_startcopy)); + dest->cr_flags = src->cr_flags; crsetgroups(dest, src->cr_ngroups, src->cr_groups); uihold(dest->cr_uidinfo); uihold(dest->cr_ruidinfo); @@ -2210,7 +2211,7 @@ proc_unset_cred(struct proc *p) mtx_lock(&cr->cr_mtx); cr->cr_users--; if (cr->cr_users == 0) - KASSERT(cr->cr_ref > 0, ("%s: ref %d not > 0 on cred %p", + KASSERT(cr->cr_ref > 0, ("%s: ref %ld not > 0 on cred %p", __func__, cr->cr_ref, cr)); mtx_unlock(&cr->cr_mtx); crfree(cr); diff --git a/sys/sys/proc.h b/sys/sys/proc.h index c6670bdc96f8..172e716d8785 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -321,7 +321,7 @@ struct thread { int td_errno; /* (k) Error from last syscall. */ size_t td_vslock_sz; /* (k) amount of vslock-ed space */ struct kcov_info *td_kcov_info; /* (*) Kernel code coverage data */ - u_int td_ucredref; /* (k) references on td_realucred */ + long td_ucredref; /* (k) references on td_realucred */ #define td_endzero td_sigmask /* Copied during fork1(), thread_create(), or kthread_add(). */ diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 5ec54be70c2e..73b5fb7ab118 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -61,8 +61,9 @@ struct loginclass; #if defined(_KERNEL) || defined(_WANT_UCRED) struct ucred { struct mtx cr_mtx; - int cr_ref; /* (c) reference count */ + long cr_ref; /* (c) reference count */ u_int cr_users; /* (c) proc + thread using this cred */ + u_int cr_flags; /* credential flags */ struct auditinfo_addr cr_audit; /* Audit properties. */ #define cr_startcopy cr_uid uid_t cr_uid; /* effective user id */ @@ -75,7 +76,6 @@ struct ucred { struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */ struct prison *cr_prison; /* jail(2) */ struct loginclass *cr_loginclass; /* login class */ - u_int cr_flags; /* credential flags */ void *cr_pspare2[2]; /* general use 2 */ #define cr_endcopy cr_label struct label *cr_label; /* MAC label */ From nobody Wed Mar 29 07:50: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 4Pmdyh1XtWz429S0; Wed, 29 Mar 2023 07:50: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 4Pmdyh0rqtz3NvR; Wed, 29 Mar 2023 07:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SIiK6SqhgeC1R7HkfXVRopS0Q99IGFapfsC3HPLRWjc=; b=euf3NpHbEpI0XWXZ7h6NduixWGaosm6jWQqEk89vcZn8yZ9ludqQ+og0IEooTk/r1pf9EN vgmyxvQm3dysUWptI0yFR/9nEbMh18Q4EFeoY7JTdHtAfh+Ml4MrWYk6pWebNloKUQxJ0Q oSjb9EClqMltpJ5eG92EGFMHmM/5hhF4LAPW1sddQEToMEgEsh582RsgT7d9yB5p5/5Zm5 yLpl1PQQp0V6snsyi2Jm6CQlHqAnDY1d05j/Qj+UgGttELbDjhLzwyV7SizSimTP/uotpK kykK5xrV9U+Pm/dBt41gFSM1KxQM1VpkN3wWwK4Ig/Ty1E0CEkIKL+tWvIm2Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SIiK6SqhgeC1R7HkfXVRopS0Q99IGFapfsC3HPLRWjc=; b=n7GQFr4NNmZZh9OMpYrFS1ajnVgPS4XoDECOFGQMNVkK+bdweJs68KElpsPbUufKbiYEUb VifDUvsx9sJcVfM4xn8licVjwH6LX30q028Me3rskoHiiyGxYZYoUBEjQnP96kd0sRvYVI 53pUsRLwREjxHndmtSHsPEuHAqC58BAlr8d/1i4qxTrzq9bp0eB1WQq6qNB56vA4X6AEWJ h+0bMvyYqvoKFp+TUWq5ik1wx+4iaUpz9Ft3lA8T+W4kkSyXx5+a5bC743OY+r70QQXtk2 K43N4HgLgHtp6qPWp077QnSh/JwdZbDR7X53DpA3EY4zHTDRM4kUrD5Jx+mVSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076252; a=rsa-sha256; cv=none; b=ozf5GiPSOpoHLhcOYbznRAerOQ5QeFhzRH4MaxrwFJD7ZlNZU65ldbfuCmTxIZUcdToJ8C hNF0ePNcB1qixYIZurBGfKVImT3tc3qTK7TjfvfL0fI2PXvY4Cy4k8ddx4ex4PX+7KjMlV w78t3ePmQc8t0YhQiT4uIicYORWFttyPlLQEu1akg/GriwTJhQLBzTcA33GQFIHIGAkWe3 pSZaWIfg6DRZ9tOPRhoez2bPKwgwxk/OQqD96IrQ3ZWHwXUbe2G4RWGJ59sdRyQ8yWGa2d AmJDuBd/jf7syhYk3g1tl8Kg2j0xU6uOxYFPsyfd1Zk32XHeNj1uxpJmm6ST/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmdyg6y3KzMq4; Wed, 29 Mar 2023 07:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T7op9p045071; Wed, 29 Mar 2023 07:50:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7opKd045070; Wed, 29 Mar 2023 07:50:51 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:50:51 GMT Message-Id: <202303290750.32T7opKd045070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: c33db74b5323 - main - fs/msdosfs: add tracking of free root directory entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c33db74b5323480fba7adef58e8aa88f6091d134 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=c33db74b5323480fba7adef58e8aa88f6091d134 commit c33db74b5323480fba7adef58e8aa88f6091d134 Author: Stefan Eßer AuthorDate: 2023-03-29 06:46:01 +0000 Commit: Stefan Eßer CommitDate: 2023-03-29 06:46:01 +0000 fs/msdosfs: add tracking of free root directory entries This update implements tallying of free directory entries during create, delete, or rename operations on FAT12 and FAT16 file systems. Prior to this change, the total number of root directory entries was reported as number of inodes, but 0 as the number of free inodes, causing system health monitoring software to warn about a suspected disk full issue. The FAT12 and FAT16 file systems provide a limited number of root directory entries, e.g. 512 on typical hard disk formats. The valid range of values is 1 to 65535, but the msdosfs code will effectively round up "odd" values to the next multiple of 16 (e.g. 513 would allow for 528 root directory entries). This update implements tracking of directory entries during create, delete, or rename operations, with initial values determined by scanning the directory when the file system is mounted. Total and free directory entries are reported in the f_files and f_ffree elements of struct statfs, despite differences in semantics of these values: - There is no limit on the number of files and directories that can be created on a FAT file system. Only the root directory of FAT12 and FAT16 file systems is limited, any number of files can still be created in sub-directories, even when 0 free "inodes" are reported. - A single file can require 1 to 21 directory entries, depending on the character set, structure, and length of the name. The DOS 8.3 style file name takes up 1 entry, and if the name does not comply with the syntax of a DOS 8.3 file name, 1 additional entry is used for each 13 characters of the file name. Since all these entries have to be contiguous, it is possible that a file or directory with a long name can not be created, despite a sufficient total number of free directory entries. - Renaming a file can require more directory entries than currently allocated to store its long name, which may prevent an in-place update of the name if more entries are needed. This may cause a rename operation to fail if no contiguous range of free entries for the new name can be found. - The volume label is stored in a directory entry. An empty FAT file system with a volume label will therefore show 1 used "inode" in df. - The perceentage of free inodes shown in df or monitoring tools does only represent the state of the root directory of a FAT12 or FAT16 file system. Neither does a reported value of 0% free inodes does prevent files from being created in sub-directories, nor does a value of 50% free inodes guarantee that even a single file with a "long" name can be created in the root directory (if every other directory entry is occupied and there are no 2 contiguous entries). The statfs(2) and df(1) man pages have been updated with a notice regarding the possibly different semantics of values reported as total and free inodes for non-Unix file systems. PR: 270053 Reported by: Ben Woods Approved by: mckusick MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D38987 --- bin/df/df.1 | 13 ++++- lib/libc/sys/statfs.2 | 18 ++++++- sys/fs/msdosfs/msdosfs_lookup.c | 3 ++ sys/fs/msdosfs/msdosfs_vfsops.c | 105 +++++++++++++++++++++++++++++++++++++++- sys/fs/msdosfs/msdosfsmount.h | 17 +++++++ 5 files changed, 152 insertions(+), 4 deletions(-) diff --git a/bin/df/df.1 b/bin/df/df.1 index 64e471fedc42..aa35318c2c65 100644 --- a/bin/df/df.1 +++ b/bin/df/df.1 @@ -29,7 +29,7 @@ .\" @(#)df.1 8.3 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd March 11, 2022 +.Dd March 29, 2023 .Dt DF 1 .Os .Sh NAME @@ -246,6 +246,17 @@ $ df -h /dev/ada1p2 Filesystem Size Used Avail Capacity Mounted on /dev/ada1p2 213G 152G 44G 78% / .Ed +.Sh NOTES +For non-Unix file systems, the reported values of used and free inodes +may have a different meaning than that of used and available files and +directories. +An example is msdosfs, which in the case of FAT12 or FAT16 file systems +reports the number of available and free root directory entries instead +of inodes +.Po +where 1 to 21 such directory entries are required to store +each file or directory name or disk label +.Pc . .Sh SEE ALSO .Xr lsvfs 1 , .Xr quota 1 , diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2 index a865652022bd..4df0e801e418 100644 --- a/lib/libc/sys/statfs.2 +++ b/lib/libc/sys/statfs.2 @@ -28,7 +28,7 @@ .\" @(#)statfs.2 8.5 (Berkeley) 5/24/95 .\" $FreeBSD$ .\" -.Dd March 30, 2020 +.Dd March 29, 2023 .Dt STATFS 2 .Os .Sh NAME @@ -230,6 +230,22 @@ error occurred while reading from or writing to the file system. .It Bq Er EINTEGRITY Corrupted data was detected while reading from the file system. .El +.Sh NOTES +The fields in the +.Vt statfs +structure have been defined to provide the parameters relevant for +traditional +.Tm UNIX +file systems. +For some other file systems, values that have similar, but not +identical, semantics to those described above may be returned. +An example is msdosfs, which in case of FAT12 or FAT13 file systems +reports the number of available and of free root directory entries +instead of inodes +.Po +where 1 to 21 such directory entries are required to store +each file or directory name or disk label +.Pc . .Sh SEE ALSO .Xr fhstatfs 2 , .Xr getfsstat 2 diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c index d67a96ad11c5..0a6f141903c1 100644 --- a/sys/fs/msdosfs/msdosfs_lookup.c +++ b/sys/fs/msdosfs/msdosfs_lookup.c @@ -684,6 +684,7 @@ createde(struct denode *dep, struct denode *ddep, struct denode **depp, return error; } ndep = bptoep(pmp, bp, ddep->de_fndoffset); + rootde_alloced(ddep); DE_EXTERNALIZE(ndep, dep); @@ -721,6 +722,7 @@ createde(struct denode *dep, struct denode *ddep, struct denode **depp, ndep--; ddep->de_fndoffset -= sizeof(struct direntry); } + rootde_alloced(ddep); if (!unix2winfn(un, unlen, (struct winentry *)ndep, cnt++, chksum, pmp)) break; @@ -1015,6 +1017,7 @@ removede(struct denode *pdep, struct denode *dep) */ offset -= sizeof(struct direntry); ep--->deName[0] = SLOT_DELETED; + rootde_freed(pdep); if ((pmp->pm_flags & MSDOSFSMNT_NOWIN95) || !(offset & pmp->pm_crbomask) || ep->deAttributes != ATTR_WIN95) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 37e5c4d4500a..e2b1fd6b91f5 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -409,6 +409,97 @@ msdosfs_mount(struct mount *mp) return (0); } +/* + * The FAT12 and FAT16 file systems use a limited size root directory that + * can be created with 1 to 65535 entries for files, directories, or a disk + * label (but DOS or Windows creates at most 512 root directory entries). + * This function calculates the number of free root directory entries by + * counting the non-deleted entries (not starting with 0xE5) and by adding + * the amount of never used entries (with the position indicated by an + * entry that starts with 0x00). + */ +static int +rootdir_free(struct msdosfsmount* pmp) +{ + struct buf *bp; + struct direntry *dep; + u_long readsize; + int dirclu; + int diridx; + int dirmax; + int dirleft; + int ffree; + + dirclu = pmp->pm_rootdirblk; + + /* + * The msdosfs code ignores pm_RootDirEnts and uses pm_rootdirsize + * (measured in DEV_BSIZE) to prevent excess root dir allocations. + */ + dirleft = howmany(pmp->pm_rootdirsize * DEV_BSIZE, + sizeof(struct direntry)); + + /* Read in chunks of default maximum root directory size */ + readsize = 512 * sizeof(struct direntry); + +#ifdef MSDOSFS_DEBUG + printf("rootdir_free: blkpersec=%lu fatblksize=%lu dirsize=%lu " + "firstclu=%lu dirclu=%d entries=%d rootdirsize=%lu " + "bytespersector=%hu bytepercluster=%lu\n", + pmp->pm_BlkPerSec, pmp->pm_fatblocksize, readsize, + pmp->pm_firstcluster, dirclu, dirleft, pmp->pm_rootdirsize, + pmp->pm_BytesPerSec, pmp->pm_bpcluster); +#endif + ffree = dirleft; + while (dirleft > 0 && ffree > 0) { + if (readsize > dirleft * sizeof(struct direntry)) + readsize = dirleft * sizeof(struct direntry); +#ifdef MSDOSFS_DEBUG + printf("rootdir_free: dirclu=%d dirleft=%d readsize=%lu\n", + dirclu, dirleft, readsize); +#endif + if (bread(pmp->pm_devvp, dirclu, readsize, NOCRED, &bp) != 0) { + printf("rootdir_free: read error\n"); + if (bp != NULL) + brelse(bp); + return (-1); + } + dirmax = readsize / sizeof(struct direntry); + for (diridx = 0; diridx < dirmax && dirleft > 0; + diridx++, dirleft--) { + dep = (struct direntry*)bp->b_data + diridx; +#ifdef MSDOSFS_DEBUG + if (dep->deName[0] == SLOT_DELETED) + printf("rootdir_free: idx=%d \n", + diridx); + else if (dep->deName[0] == SLOT_EMPTY) + printf("rootdir_free: idx=%d \n", + diridx); + else if (dep->deAttributes == ATTR_WIN95) + printf("rootdir_free: idx=%d \n", + diridx, (dep->deName[0] & 0x1f) + 1); + else if (dep->deAttributes & ATTR_VOLUME) + printf("rootdir_free: idx=%d label='%11.11s'\n", + diridx, dep->deName); + else if (dep->deAttributes & ATTR_DIRECTORY) + printf("rootdir_free: idx=%d dir='%11.11s'\n", + diridx, dep->deName); + else + printf("rootdir_free: idx=%d file='%11.11s'\n", + diridx, dep->deName); +#endif + if (dep->deName[0] == SLOT_EMPTY) + dirleft = 0; + else if (dep->deName[0] != SLOT_DELETED) + ffree--; + } + brelse(bp); + bp = NULL; + dirclu += readsize / DEV_BSIZE; + } + return (ffree); +} + static int mountmsdosfs(struct vnode *odevvp, struct mount *mp) { @@ -747,6 +838,15 @@ mountmsdosfs(struct vnode *odevvp, struct mount *mp) goto error_exit; pmp->pm_fmod = 1; } + + if (FAT32(pmp)) { + pmp->pm_rootdirfree = 0; + } else { + pmp->pm_rootdirfree = rootdir_free(pmp); + if (pmp->pm_rootdirfree < 0) + goto error_exit; + } + mp->mnt_data = pmp; mp->mnt_stat.f_fsid.val[0] = dev2udev(dev); mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; @@ -948,8 +1048,9 @@ msdosfs_statfs(struct mount *mp, struct statfs *sbp) sbp->f_blocks = pmp->pm_maxcluster + 1; sbp->f_bfree = pmp->pm_freeclustercount; sbp->f_bavail = pmp->pm_freeclustercount; - sbp->f_files = pmp->pm_RootDirEnts; /* XXX */ - sbp->f_ffree = 0; /* what to put in here? */ + sbp->f_files = howmany(pmp->pm_rootdirsize * DEV_BSIZE, + sizeof(struct direntry)); + sbp->f_ffree = pmp->pm_rootdirfree; return (0); } diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h index 5caa40f2b648..5afbfc44dc0a 100644 --- a/sys/fs/msdosfs/msdosfsmount.h +++ b/sys/fs/msdosfs/msdosfsmount.h @@ -108,6 +108,7 @@ struct msdosfsmount { u_int pm_fatmult; /* these 2 values are used in FAT */ u_int pm_fatdiv; /* offset computation */ u_int pm_curfat; /* current FAT for FAT32 (0 otherwise) */ + int pm_rootdirfree; /* number of free slots in FAT12/16 root directory */ u_int *pm_inusemap; /* ptr to bitmap of in-use clusters */ uint64_t pm_flags; /* see below */ void *pm_u2w; /* Local->Unicode iconv handle */ @@ -222,6 +223,22 @@ struct msdosfs_fileno { ? roottobn((pmp), (dirofs)) \ : cntobn((pmp), (dirclu))) +/* + * Increment the number of used entries in a fixed size FAT12/16 root + * directory + */ +#define rootde_alloced(dep) \ + if ((dep)->de_StartCluster == MSDOSFSROOT) \ + (dep)->de_pmp->pm_rootdirfree--; + +/* + * Decrement the number of used entries in a fixed size FAT12/16 root + * directory + */ +#define rootde_freed(dep) \ + if ((dep)->de_StartCluster == MSDOSFSROOT) \ + (dep)->de_pmp->pm_rootdirfree++; + #define MSDOSFS_LOCK_MP(pmp) \ lockmgr(&(pmp)->pm_fatlock, LK_EXCLUSIVE, NULL) #define MSDOSFS_UNLOCK_MP(pmp) \ From nobody Wed Mar 29 07:52: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 4Pmf0V43jqz429WH; Wed, 29 Mar 2023 07:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pmf0V3cXBz3PQh; Wed, 29 Mar 2023 07:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ljm45tdAKfIYecQyqkTl35m9qjka30FwgN9YFDXYTTs=; b=EZbmMX7DACa9YjGMtG6zFFL/6AGwy1774wxHBqw1qpH6N/37wmnsrFmwlMhloF7X25Z4X4 Ud/lzyFSH1n6NCucH5FxFHyLBrkneJwPou7rWEm+ZizR2IV27C0oxOjBa919Cixdfbbx7X TICUKRorsbB4iIT1WFEVtgPT2U/egEP+0kj9aM7Bd4NB1iIOWHAXohfiTEUoTmSl0+Et46 toQXVErcOGke/CgPEPnhOaFmKCKP769sI/AjC3+G2rZgqdBGVouD+24CAjPPuAUD9nauNg BhYJr50gN2lbV1l0tgjL6yE9VAz1TpgPpyXEAw+88LUhXrLSRl/J118ueWCVVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ljm45tdAKfIYecQyqkTl35m9qjka30FwgN9YFDXYTTs=; b=BMujmUtwPIpe0vxLwiFs3EaJpnfg7Jb+Ic/ffDaueHTKJ2u0GxctWNsEP2koydCiXOiTZL scOzons4JA2ExbZ3YGpV4mrdYkdvt0/vrir8Poosl4TDNx4Vsn/CXTqMvTihLgyTo9Pfws +uZruy18uJ8fkZ4F1wWQO9HRehhrPilqbC4+TDwW6N8jvyt8hEEZXVWyHcZFiSytMOzEup guD4DY1jbsHD0qtecJVnQeU3+QFO1FfsJvjjcOOQUgWXu6gD8+LNRB5AzkDbyJfP8yKdhH E+XT1uxbNU78W0jo8JKn/rMUtE+XLpQtthAUqNYMo0XT/lahxHhGkb/EQOr1kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076346; a=rsa-sha256; cv=none; b=UPtUx+SrXs7RunPUikLyiG7JxW9NP6qpRPw1npJhOv13r0AZD88pcAd3VhlYqX784vX80E 1Mn6EwAQr1wRuLITWZRHLr1Teuw3pmoIFQIkEICv3+JWomRJN8yaMNrnhFkg1tVcKZcebn wxgqhqJKToMTigyqhQ7EZxCE0GWUMZ2Yt3uGOZMmHZrKw/GXQxNPXE89pPB26WOfhcTYBU 9chFMFaR78rBvjqAVHpUIfjalOr2HUQrY/80F+XDvIFaASe6PpnhaGyvY925ZnvNt+9fmu KHG8RGi6Mzzr9TeC2YaHoMPQlT2n77Xug/Cw2NLcqDh0sByuE3MPMsa1GzUMCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmf0V2h1QzMqZ; Wed, 29 Mar 2023 07:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T7qQxT050781; Wed, 29 Mar 2023 07:52:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qQY6050780; Wed, 29 Mar 2023 07:52:26 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:26 GMT Message-Id: <202303290752.32T7qQY6050780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 2d5e325303cf - main - xen/intr: always set xi_close in xen_intr_bind_isrc() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d5e325303cf9e7470b7846deba30af33046c31a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=2d5e325303cf9e7470b7846deba30af33046c31a commit 2d5e325303cf9e7470b7846deba30af33046c31a Author: Elliott Mitchell AuthorDate: 2022-10-11 19:25:12 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:39 +0000 xen/intr: always set xi_close in xen_intr_bind_isrc() Appears errors are uncommon since calling xen_intr_release_isrc() on a xenisrc with xi_close in an undefined state could be bad. Fix this problematic lurking nasty. Reviewed by: royger MFC after: 1 week --- sys/x86/xen/xen_intr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 262df1cefeea..37b18c05b8a6 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -6,6 +6,7 @@ * Copyright (c) 2002-2005, K A Fraser * Copyright (c) 2005, Intel Corporation * Copyright (c) 2012, Spectra Logic Corporation + * Copyright © 2021-2023, Elliott Mitchell * * This file may be distributed separately from the Linux kernel, or * incorporated into other software packages, subject to the following license: @@ -420,6 +421,7 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, } } isrc->xi_port = local_port; + isrc->xi_close = 0; xen_intr_port_to_isrc[local_port] = isrc; refcount_init(&isrc->xi_refcount, 1); mtx_unlock(&xen_intr_isrc_lock); From nobody Wed Mar 29 07:52: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 4Pmf0W5Hlvz429Sf; Wed, 29 Mar 2023 07:52: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 4Pmf0W4VYkz3Pkn; Wed, 29 Mar 2023 07:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jkw7/d4OacDp40JwM9YLyWq0MhJroM82SjbF0zKNSQw=; b=nON50mHMUPMx6GS3J1QRmGeHPlDS0rRKIS2ZDGm7bON2bra+RVSOaqY+v2kgfpGE3+bP5G jFFTBBpORfJ/VaPP1dN6NK1FGSyA0zDo88mt2Za9sJHWfqhB2BWHnfu2BFg6HYWfzvGlzM arS+y/9gtXCghhKl6Ft8yuPdDuukW994c6c16Dyf4FITj961fI42EeLvqiOVlZJ/bixHwL tgfUZX+iqNH+YFtbHJAtbP8p5EryIV7UqYpfddfaWDeCGbFgNqRB5u1uVMxZQjdYiF5Fh/ rmPOUqo0L0wWj6nicQULOX926C7jk/8cdzaX22yrBBYpxqaTEixC8Yvjov/AwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jkw7/d4OacDp40JwM9YLyWq0MhJroM82SjbF0zKNSQw=; b=HVMpnguYolmA2EFCPzFpqVRqBbTRmkWbp1bUAij4WP3i93bHIhb/r7RNqBlekNoBv2uA8s CCzp5Y9AZaGGEfBBCMOpRJxVT6PDbjOw/1Vzckj5uCXf1W4F7+d4OZqwx/qGBTfsqTDS3p RoG8BZk0xP/es3bxgpubdeCkIy9yqbI2TA3QxXf9d7k6X93J3eUyM8lAlYEscWfCUqTDEF +dic9OPO6JxrmhXa+yZiUC42BHAEftV8AyZL+Vd5Sup6c2WCiovAMWWshWk4ikOH1CyU18 09j0yJDkqMWGgVfZxblM3MMl5fGWcbrHQvcRo9gJyBWUslt+QCYSd9eT+EF5aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076347; a=rsa-sha256; cv=none; b=rLnf5m3nkz7uveRFUBsiyVzYodZMLBJo0Yi2ZbvcOnuTt3HUxa390h2haOpnuOT6yKiBOb YcpA42PlvQQNUish0xB7MnrqU6ZUv8Csauyu4n5Ks9uaD/mFHhwT7K0NAslvUYahBMFunt abKiSXA0lLfa+pWustmN6Eh+ti3ERy/oVtPnjEfTgf0DKNYxZstR+WZ/tznJjAfD6s4eWY DlYcDcAnzVSK4HCLa7nakqI7DpRHazsFFZIuU/kBGqRztm9cwgWynq5umk0oRpUQNOded5 zsyD9M6SNvmjL+CSZM3Ok7apmNwDZpBqvWLDByJD8lRj3F8DO12eCXxM59N2UA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmf0W3bS1zN6v; Wed, 29 Mar 2023 07:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T7qRjS050815; Wed, 29 Mar 2023 07:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qR7t050811; Wed, 29 Mar 2023 07:52:27 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:27 GMT Message-Id: <202303290752.32T7qR7t050811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 0ebf9bb42d7c - main - xen/intr: fix overflow of Xen interrupt range List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ebf9bb42d7cb94e28a69cfc8efeb17dc9468955 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=0ebf9bb42d7cb94e28a69cfc8efeb17dc9468955 commit 0ebf9bb42d7cb94e28a69cfc8efeb17dc9468955 Author: Elliott Mitchell AuthorDate: 2021-05-11 22:11:06 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:39 +0000 xen/intr: fix overflow of Xen interrupt range The comparison was wrong. Hopefully this never occurred in the wild, but now ensure the error message will occur before damage is caused. This appears non-exploitable as exploitation would require a guest to force Domain 0 to allocate all event channels, which a guest shouldn't be able to do. Adjust the error message to better describe what has occurred. Reviewed by: royger MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D30743 --- sys/x86/xen/xen_intr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 37b18c05b8a6..ca0f56a8546a 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -314,10 +314,10 @@ xen_intr_alloc_isrc(enum evtchn_type type) KASSERT(mtx_owned(&xen_intr_isrc_lock), ("Evtchn alloc lock not held")); - if (xen_intr_auto_vector_count > NR_EVENT_CHANNELS) { + if (xen_intr_auto_vector_count >= NR_EVENT_CHANNELS) { if (!warned) { warned = 1; - printf("%s: Event channels exhausted.\n", __func__); + printf("%s: Xen interrupts exhausted.\n", __func__); } return (NULL); } From nobody Wed Mar 29 07:52: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 4Pmf0X65GJz42B1d; Wed, 29 Mar 2023 07:52: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 4Pmf0X54xfz3PjP; Wed, 29 Mar 2023 07:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7IK3w+WiIWvck2SPMMFpPtsYAkFF/A3uTK3+xOE010=; b=jStz0QDUBdtVknp7HGEo3USwQa81rVFZdbbDzWJQhNP5Bd6LDjSQo4I8+OiFS1VImT9E4j fUleGC2Dlbo3a42a1t2wwLZ0U28qUfXQBLz9XkZh6MwIHPq90dffHlcXx3YNiR/APRotIM X7dVPoMWF7OP7md0lfvQ7QXtoiu85iPaq2oJhrbkcigN9bt1LcUG8tvw/Te6gDS6BQHGVw kCOL7a/duRG6TYzHj3Sz+z5Q4wgNYQepo+2iLaGdNV6if4vm8JFilcb2cx/eAnWTnOpajq Rz68bXumuhsMtFqP8IM/KLOg1ceCKBGX9O5+FNNKMo0z7Kw7AB13YRcivT8ZPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7IK3w+WiIWvck2SPMMFpPtsYAkFF/A3uTK3+xOE010=; b=RJFfQQs/SDJu/KtkhIW1pNHuDso48kcEf50Hwg4TIy/p+JT3JxM+yudJGCGjeH7rQ+fjiV XtDDTJm70k7o4kD+Ff5wTv8nt7HMtneWW0y7mOfJ5d0/oeIq+nx398QQPoMzSRaIuXSZAQ FPC4TmhEPwJn7Q787NPxDGOc3XAPytaNCrcMM6jHsUMgl8yndtcHqtp7VjI8ILnUuvFF65 BJ7ZA3jKB6o/xcej07ngzfWbPnOZPvxqXfDNV3khNU75iW3V5+5/Cf2nIMNgw1i08Z48Fu 2LNzwZtu/F3v2tuEirmxdHfmbffYXbKRBl1imUsGGAFLguFYbOoUDRr41baq5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076348; a=rsa-sha256; cv=none; b=QtE33Q4HppgBswuUtS2/RFUlz52YujYAcGF5SUf2X6IRhyT1VZWM/vXGu0QNtFNUCXtnYA iwLgZAD4BlJE5SYk4FKQGYajWW6YzXI+fFOLxgw8HY3/pp4jwphAR4HztBXgOuz3/oiAx9 BXIpkzjIdfVBuq90E/3LqA232I6G+6n2mEuelzF8zSl5flo+A8aisxKJht5/d2vqNJbw4c oLjc6wZWAafq8gc0m7kYmD5uVFqo/TMbhuVUZIX7/Nl+SOTodxNMn1a1osmqgb76c/ptC1 jfBzPTeiqRfoZBHQqwfochqi/Gl8ilvV4cwmpp30JiAj9RLWAejzQUB9zFd0Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmf0X3z21zMSr; Wed, 29 Mar 2023 07:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T7qS5o051983; Wed, 29 Mar 2023 07:52:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qSGm051982; Wed, 29 Mar 2023 07:52:28 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:28 GMT Message-Id: <202303290752.32T7qSGm051982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 2b2415bafa0d - main - xen/intr: fix corruption of event channel table List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b2415bafa0dda36244f0fedef9f8750b2868dea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=2b2415bafa0dda36244f0fedef9f8750b2868dea commit 2b2415bafa0dda36244f0fedef9f8750b2868dea Author: Elliott Mitchell AuthorDate: 2021-08-27 23:00:05 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:40 +0000 xen/intr: fix corruption of event channel table In xen_intr_release_isrc(), the isrc should only be removed if it is assigned to a valid port. This had been mitigated by using 0 for not having a port, but this is actually corrupting the table. Fix this bug as modifying the code would cause this bug to manifest as kernel memory corruption. Similar issue for the vCPU bitmap masks. The KASSERT() doesn't need lock protection. Reviewed by: royger MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D30743 --- sys/x86/xen/xen_intr.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index ca0f56a8546a..4e16778874b5 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -350,23 +350,26 @@ static int xen_intr_release_isrc(struct xenisrc *isrc) { - mtx_lock(&xen_intr_isrc_lock); KASSERT(isrc->xi_intsrc.is_handlers == 0, ("Release called, but xenisrc still in use")); - evtchn_mask_port(isrc->xi_port); - evtchn_clear_port(isrc->xi_port); + mtx_lock(&xen_intr_isrc_lock); + if (is_valid_evtchn(isrc->xi_port)) { + evtchn_mask_port(isrc->xi_port); + evtchn_clear_port(isrc->xi_port); - /* Rebind port to CPU 0. */ - evtchn_cpu_mask_port(isrc->xi_cpu, isrc->xi_port); - evtchn_cpu_unmask_port(0, isrc->xi_port); + /* Rebind port to CPU 0. */ + evtchn_cpu_mask_port(isrc->xi_cpu, isrc->xi_port); + evtchn_cpu_unmask_port(0, isrc->xi_port); - if (isrc->xi_close != 0 && is_valid_evtchn(isrc->xi_port)) { - struct evtchn_close close = { .port = isrc->xi_port }; - if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close)) - panic("EVTCHNOP_close failed"); - } + if (isrc->xi_close != 0) { + struct evtchn_close close = { .port = isrc->xi_port }; - xen_intr_port_to_isrc[isrc->xi_port] = NULL; + if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close)) + panic("EVTCHNOP_close failed"); + } + + xen_intr_port_to_isrc[isrc->xi_port] = NULL; + } isrc->xi_cpu = 0; isrc->xi_type = EVTCHN_TYPE_UNBOUND; isrc->xi_port = 0; From nobody Wed Mar 29 07:52: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 4Pmf0Y6q38z42B40; Wed, 29 Mar 2023 07:52: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 4Pmf0Y5vYjz3Q02; Wed, 29 Mar 2023 07:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EFoLzbBaFCWzi03yuu0JTHBRglWka2ZtRfFsUPSeodA=; b=hjfjAQROXOARrgY9uVL65DOo6ZkeM+A4epjhBgQLu0kUlHfabzFxSaHPksIM2clCF48T8J Qvl8kG26+7i2mGCCQaj60zGhJXxAsGjGXVylyaZSFySDmR+t2gXcjdx+bsToR1irNkLQ3M QP1cDcmt2ddr8oyj9I59cB92OOKQ3tA/aWdV91vnzbVlA+QNf/+09++m8B2wU4zL6IaD2b pqLXf60VarIOCQSoAM7BK8VtQFijapkdHa3EYpFY6BSD52s39MZj/mRRu+LPKOQ1x2PTuw oplQLDojxAGNZbDeGcMEvtAWzMd9eBdmKNuuGNJFGPBS9E1jxUd4lZ7ziSfGog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EFoLzbBaFCWzi03yuu0JTHBRglWka2ZtRfFsUPSeodA=; b=yP4laRNvraa54wz6CvWz+kAW2el0eS4IMUaA+cZ2P7koTRfkemaCO2HuPSAjtjOgA0VKWE sG1mUVnDr/EtvChjt/Xe4XNcKKNpWdjU7S46kKzhlM94rhBNreuHdkgfRdiu4IqzlXom/q 9O8PEsjkRYXU+iKoc9ua2GTBk98c07tMwZYCZ+v29knKggIYNqXyyn7Cyev0Hkgkug44hx 3Ob06efGpR2hy5rtEWNj4PHk9PUrG2KidsYGIPJXmb+DYm94kPmh7doBIvRaq1/tMfntJJ /iS739XumcPSHhlqcynmKw3wtoh6yuYa8KzNiUhDB8XZuCalcbEusa8wPE/Q/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076349; a=rsa-sha256; cv=none; b=m8SEWvZUjkT0K4e5OibdFOrar4nnQ3BzYgv+WC6IuYE4+G3KjzVN4FPWkTJ1M89qLm0kKS UGZwNclmkTVmHo5HTkUKiAxl38JBJaWAYhatwyJJE0znC5LEbfKjgFIcC9y0QVo/rS26hM iTsC5fc1TN5BXgy1jZVXHRMEZqfGTRLk1rjrfr011TvTflhm9tIpTz0PpfrqP6sPiDmcwc MJwsVwHGnwR+/NDzeAyq3n7/NlZbUc00ukMVD6FuoweD4v1+Ra1994apsUdTG1vL1YkDYF j5bW3xY/DHHhHiMcDuARuQ5fRjjdGDCnYtxnIkON3rU0MBTqxbjrvDaKsCpuRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmf0Y4zV6zN6y; Wed, 29 Mar 2023 07:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T7qTYF052014; Wed, 29 Mar 2023 07:52:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qTfB052013; Wed, 29 Mar 2023 07:52:29 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:29 GMT Message-Id: <202303290752.32T7qTfB052013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 1797ff962769 - main - xen/intr: cleanup event channel number use List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1797ff962769aac6822cde45719ed02c18d6cdb8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=1797ff962769aac6822cde45719ed02c18d6cdb8 commit 1797ff962769aac6822cde45719ed02c18d6cdb8 Author: Elliott Mitchell AuthorDate: 2021-06-06 00:43:13 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:41 +0000 xen/intr: cleanup event channel number use Consistently use ~0 instead of 0 when clearing xenisrc structures. 0 is a valid event channel number, even though it is reserved by Xen. Whereas ~0 is guaranteed invalid. Reviewed by: royger MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D30743 --- sys/x86/xen/xen_intr.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 4e16778874b5..3a053b10f915 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -117,9 +117,8 @@ DPCPU_DEFINE_STATIC(struct xen_intr_pcpu_data, xen_intr_pcpu) = { DPCPU_DECLARE(struct vcpu_info *, vcpu_info); -#define XEN_INVALID_EVTCHN 0 /* Invalid event channel */ - -#define is_valid_evtchn(x) ((x) != XEN_INVALID_EVTCHN) +#define INVALID_EVTCHN (~(evtchn_port_t)0) /* Invalid event channel */ +#define is_valid_evtchn(x) ((uintmax_t)(x) < NR_EVENT_CHANNELS) struct xenisrc { struct intsrc xi_intsrc; @@ -372,7 +371,7 @@ xen_intr_release_isrc(struct xenisrc *isrc) } isrc->xi_cpu = 0; isrc->xi_type = EVTCHN_TYPE_UNBOUND; - isrc->xi_port = 0; + isrc->xi_port = INVALID_EVTCHN; isrc->xi_cookie = NULL; mtx_unlock(&xen_intr_isrc_lock); return (0); @@ -613,6 +612,19 @@ xen_intr_init(void *dummy __unused) if (!xen_domain()) return (0); + _Static_assert(is_valid_evtchn(0), + "is_valid_evtchn(0) fails (unused by Xen, but valid by interface"); + _Static_assert(is_valid_evtchn(NR_EVENT_CHANNELS - 1), + "is_valid_evtchn(max) fails (is a valid channel)"); + _Static_assert(!is_valid_evtchn(NR_EVENT_CHANNELS), + "is_valid_evtchn(>max) fails (NOT a valid channel)"); + _Static_assert(!is_valid_evtchn(~(evtchn_port_t)0), + "is_valid_evtchn(maxint) fails (overflow?)"); + _Static_assert(!is_valid_evtchn(INVALID_EVTCHN), + "is_valid_evtchn(INVALID_EVTCHN) fails (must be invalid!)"); + _Static_assert(!is_valid_evtchn(-1), + "is_valid_evtchn(-1) fails (negative are invalid)"); + mtx_init(&xen_intr_isrc_lock, "xen-irq-lock", NULL, MTX_DEF); /* @@ -769,7 +781,7 @@ xen_intr_resume(struct pic *unused, bool suspend_cancelled) vector = first_evtchn_irq + isrc_idx; isrc = (struct xenisrc *)intr_lookup_source(vector); if (isrc != NULL) { - isrc->xi_port = 0; + isrc->xi_port = INVALID_EVTCHN; switch (isrc->xi_type) { case EVTCHN_TYPE_IPI: xen_rebind_ipi(isrc); @@ -1292,7 +1304,7 @@ int xen_intr_get_evtchn_from_port(evtchn_port_t port, xen_intr_handle_t *handlep) { - if (!is_valid_evtchn(port) || port >= NR_EVENT_CHANNELS) + if (!is_valid_evtchn(port)) return (EINVAL); if (handlep == NULL) { From nobody Wed Mar 29 07:52: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 4Pmf0b2wJLz429hw; Wed, 29 Mar 2023 07:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pmf0Z6Sckz3Ptf; Wed, 29 Mar 2023 07:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ulz0NcIqw/wcMZpJSPRotFBO5n4FREDBKdjTebVqVA=; b=J14P0hkS4xput48WEk0ovaOchE+rC38hLH7zngf0gT1Ek+5Dp0ZOMqFSFhhLtoNkb9p5ny ztXWKEP9AzMJnVKJYQ13b7WHhGzra4HmeFqV+sq3G/sMDi1zc4O0VJu7Ds6s4BUv2p4Q0w IC/XfWNafICQsT1ew5xcZz1NVoDdmzcLrDd52fy6PkyNpV3DsG3AfOtbCm7QbN5f9lJeVG GWF0tCkEx5nBboGH8K6LXvpucjr7sBPx00OEItxBncz8OLY7Pzk+6VKLRz/sIUu8cyQmDV /4ccuvvF0nknP36DM9b3TuKw62Yq6vKZYJiJsAQhbn9VS1a96tcZkKSPMH8Ubg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ulz0NcIqw/wcMZpJSPRotFBO5n4FREDBKdjTebVqVA=; b=A21QNQ2aLQn2yiybiwogkNQda+Gjoj07bHcgqT1eLstq+Xj6tWtsXWfmO33DFspze/TCbn RBmwTFoYqTuCUMTkMWwKc6H3NPv0a1P4GImIOZOO00SABe8Cb9WOMk2NUYHb1XQ88Uv8tg 23qox3y+HrKf9F2eecoeWgbUN3oyNcvuIAvfwK/pRK1sBbkayt+NkLSRFmrOKoviGE0AAR vwQ+FP+6hHGPyKb2Um/VZLGeIYfFOTPLF/2qHK7BLlQ9dBy110A3xpDmeGkGRBRGRd7WHq RvpQRBdiQjVDmWwc2c6y77wRapJxLBhfyzAxY/SayCsy7ztUnPcswaP8mjZG/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076350; a=rsa-sha256; cv=none; b=QvdOBcRBrEc1swPbyVx7dBFn5gSexuq/54wSOymN6xvXfe3q14M3H/PfxGjSeUnBnHhe3A NBDIuGPwEcW2+PcycIHBWtxT0s2OvA/SRNup6x/bAGOmot9KnVyBF01Bzo9sniEm+FR7Bv eMOlvV8Jh/2Qay5x/2yS6lZNKbvOwHzxULGJ1fZ1UZlj/xPgK9E2VnILdM1+5mjqDz5xXL v01elycQU50SCUnt5z/3gX3esKMXKFzoYaZk0O9GaFVA/RWKfm8Q34KiudKuNr/4Qqmjy3 bvBD4Qv9RlIKwXkx3lwL1EGPfqEhHtT4uGoikXvaEAbSeJKnqghB9X6GY3gPKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmf0Z5YVFzMgn; Wed, 29 Mar 2023 07:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T7qUQX052038; Wed, 29 Mar 2023 07:52:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qU1t052037; Wed, 29 Mar 2023 07:52:30 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:30 GMT Message-Id: <202303290752.32T7qU1t052037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 49ca3167b7be - main - xen/intr: add check for intr_register_source() errors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49ca3167b7be6145b238588573673a0f14f9e7e2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=49ca3167b7be6145b238588573673a0f14f9e7e2 commit 49ca3167b7be6145b238588573673a0f14f9e7e2 Author: Elliott Mitchell AuthorDate: 2021-09-13 06:12:08 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:41 +0000 xen/intr: add check for intr_register_source() errors While unusual, intr_register_source() can return failure. A likely cause might be another device grabbing from Xen's interrupt range. This should NOT happen, but could happen due to a bug. As such check for this and fail if it occurs. This theoretical situation also effects xen_intr_find_unused_isrc(). There, .is_pic must be tested to ensure such an intrusion doesn't cause misbehavior. Reviewed by: royger MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D31995 --- sys/x86/xen/xen_intr.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 3a053b10f915..cf4560b6b5fb 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -285,8 +285,16 @@ xen_intr_find_unused_isrc(enum evtchn_type type) vector = first_evtchn_irq + isrc_idx; isrc = (struct xenisrc *)intr_lookup_source(vector); - if (isrc != NULL - && isrc->xi_type == EVTCHN_TYPE_UNBOUND) { + /* + * Since intr_register_source() must be called while unlocked, + * isrc == NULL *will* occur, though very infrequently. + * + * This also allows a very small gap where a foreign intrusion + * into Xen's interrupt range could be examined by this test. + */ + if (__predict_true(isrc != NULL) && + __predict_true(isrc->xi_intsrc.is_pic == &xen_intr_pic) && + isrc->xi_type == EVTCHN_TYPE_UNBOUND) { KASSERT(isrc->xi_intsrc.is_handlers == 0, ("Free evtchn still has handlers")); isrc->xi_type = type; @@ -310,6 +318,7 @@ xen_intr_alloc_isrc(enum evtchn_type type) static int warned; struct xenisrc *isrc; unsigned int vector; + int error; KASSERT(mtx_owned(&xen_intr_isrc_lock), ("Evtchn alloc lock not held")); @@ -332,7 +341,10 @@ xen_intr_alloc_isrc(enum evtchn_type type) isrc->xi_intsrc.is_pic = &xen_intr_pic; isrc->xi_vector = vector; isrc->xi_type = type; - intr_register_source(&isrc->xi_intsrc); + error = intr_register_source(&isrc->xi_intsrc); + if (error != 0) + panic("%s(): failed registering interrupt %u, error=%d\n", + __func__, vector, error); mtx_lock(&xen_intr_isrc_lock); return (isrc); From nobody Wed Mar 29 07:52: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 4Pmf0c4bjVz429hy; Wed, 29 Mar 2023 07:52: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 4Pmf0c2nNCz3Q5f; Wed, 29 Mar 2023 07:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MHfA19BlBYUHWZdDeeQENmMeKgPweFkJdy4FrgR5uJ4=; b=VL4BZpv0s+vdyhimeRGhcxZTZg7CiiDVBIrGSAc+rzIX9ACPlGT93AVOh+He6O7rrnVY79 7n5O8M6z9lJheOP0SvY2AQaxyI3UKG53oN+Og+16rt98oigtSIaRuG3StUNTA2TosELZJg uc/gdfgia41N/08de/gvbXskdb/7p3u7FCvP6SGZmdKqbcnF0IoUigHI4bVCTuyfInAyxO 1VfwtUuJlqtF6FV2surzkh8HkD5J1gHDggM6wf3ShrZDeYGO9Opo/YKJSs4jyuQW30z+jf MmBw00O7V1OuUzdh7lQbN3U4K191ysV+MtlGNenJ/jN/rlyGeFmfqCLCyVc0nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MHfA19BlBYUHWZdDeeQENmMeKgPweFkJdy4FrgR5uJ4=; b=s9f1jcyyVqVcCie6B//OHCNGYW7B8KriAAvqOk+UycV254K65iunuiAeIuWLNQBG+eUqgy cABTjCCNVhx1hha+iRk6txkAj0EQHq0qgNsuCGX7Tub/rz7P++Pb2ao2FvbJLpV6GRMixQ C5/eW9ipY4tH5I11TkZhtugHlorcwyIFFKgr5RV8+uTlnXoivMRYyBGAgjkKR0meUn30LF xABbhAUwQt3iK/HrBqhZIyhIKTLA1KaRIJAma3TcWtJ1ykmz2w9Ni9ahhQC0NENLZkINek WCEflUUhqz4QdL4dLbCznpj9MndPoiEQOBu1K7Rk0QhljJ2+CyFr2Fnccu7KdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076352; a=rsa-sha256; cv=none; b=ftLXsHYTYLswKbEjfEVE44zc4NWGbzaLqIDxR35KL5feo2Ydcceny9bvCrFB1HwAwT23y/ mTlJCd9TQE6b661oLekqsBlmrJBktqmAv83u6jXJST8suX2ICRw0jftzoPDsO0wiEVINbM OLlOZVG7r8SkHF2GbL+Pf5czWAxqAoPEr+wH7SfXsw9/9Eg/tAvu1YvhfrF2V5MMKccv3Y dOSa7Obdj/SwzWLm6o7vCjSEwIwBdPZM7NBHVf+E9I0UDx6tciZ3BelKaxwB70XC/4KPzq 5hvfQyFTqoZtb/3pLZStf9OzLRqpSBqOr8v/iBYz6c9ia4Hddd4erxEc+8OwAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmf0b6lr5zN70; Wed, 29 Mar 2023 07:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T7qVtP052069; Wed, 29 Mar 2023 07:52:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qVDv052068; Wed, 29 Mar 2023 07:52:31 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:31 GMT Message-Id: <202303290752.32T7qVDv052068@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 9f3be3a6ec8e - main - xen: switch to using core atomics for synchronization List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f3be3a6ec8ec6096e3d6c715695a6560aabbb80 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=9f3be3a6ec8ec6096e3d6c715695a6560aabbb80 commit 9f3be3a6ec8ec6096e3d6c715695a6560aabbb80 Author: Elliott Mitchell AuthorDate: 2022-01-24 01:19:16 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:42 +0000 xen: switch to using core atomics for synchronization Now that the atomic macros are always genuinely atomic on x86, they can be used for synchronization with Xen. A single core VM isn't too unusual, but actual single core hardware is uncommon. Replace an open-coding of evtchn_clear_port() with the inline. Substantially inspired by work done by Julien Grall , 2014-01-13 17:40:58. Reviewed by: royger MFC after: 1 week --- sys/amd64/include/xen/synch_bitops.h | 129 ------------------------------- sys/dev/xen/evtchn/evtchn_dev.c | 2 - sys/dev/xen/grant_table/grant_table.c | 34 ++++----- sys/i386/include/xen/synch_bitops.h | 138 ---------------------------------- sys/x86/xen/xen_intr.c | 4 +- sys/xen/evtchn/evtchnvar.h | 19 +++-- 6 files changed, 30 insertions(+), 296 deletions(-) diff --git a/sys/amd64/include/xen/synch_bitops.h b/sys/amd64/include/xen/synch_bitops.h deleted file mode 100644 index 746687aa91bd..000000000000 --- a/sys/amd64/include/xen/synch_bitops.h +++ /dev/null @@ -1,129 +0,0 @@ -#ifndef __XEN_SYNCH_BITOPS_H__ -#define __XEN_SYNCH_BITOPS_H__ - -/* - * Copyright 1992, Linus Torvalds. - * Heavily modified to provide guaranteed strong synchronisation - * when communicating with Xen or other guest OSes running on other CPUs. - */ - - -#define ADDR (*(volatile long *) addr) - -static __inline__ void synch_set_bit(int nr, volatile void * addr) -{ - __asm__ __volatile__ ( - "lock btsl %1,%0" - : "=m" (ADDR) : "Ir" (nr) : "memory" ); -} - -static __inline__ void synch_clear_bit(int nr, volatile void * addr) -{ - __asm__ __volatile__ ( - "lock btrl %1,%0" - : "=m" (ADDR) : "Ir" (nr) : "memory" ); -} - -static __inline__ void synch_change_bit(int nr, volatile void * addr) -{ - __asm__ __volatile__ ( - "lock btcl %1,%0" - : "=m" (ADDR) : "Ir" (nr) : "memory" ); -} - -static __inline__ int synch_test_and_set_bit(int nr, volatile void * addr) -{ - int oldbit; - __asm__ __volatile__ ( - "lock btsl %2,%1\n\tsbbl %0,%0" - : "=r" (oldbit), "=m" (ADDR) : "Ir" (nr) : "memory"); - return oldbit; -} - -static __inline__ int synch_test_and_clear_bit(int nr, volatile void * addr) -{ - int oldbit; - __asm__ __volatile__ ( - "lock btrl %2,%1\n\tsbbl %0,%0" - : "=r" (oldbit), "=m" (ADDR) : "Ir" (nr) : "memory"); - return oldbit; -} - -static __inline__ int synch_test_and_change_bit(int nr, volatile void * addr) -{ - int oldbit; - - __asm__ __volatile__ ( - "lock btcl %2,%1\n\tsbbl %0,%0" - : "=r" (oldbit), "=m" (ADDR) : "Ir" (nr) : "memory"); - return oldbit; -} - -struct __synch_xchg_dummy { unsigned long a[100]; }; -#define __synch_xg(x) ((volatile struct __synch_xchg_dummy *)(x)) - -#define synch_cmpxchg(ptr, old, new) \ -((__typeof__(*(ptr)))__synch_cmpxchg((ptr),\ - (unsigned long)(old), \ - (unsigned long)(new), \ - sizeof(*(ptr)))) - -static inline unsigned long __synch_cmpxchg(volatile void *ptr, - unsigned long old, - unsigned long new, int size) -{ - unsigned long prev; - switch (size) { - case 1: - __asm__ __volatile__("lock; cmpxchgb %b1,%2" - : "=a"(prev) - : "q"(new), "m"(*__synch_xg(ptr)), - "0"(old) - : "memory"); - return prev; - case 2: - __asm__ __volatile__("lock; cmpxchgw %w1,%2" - : "=a"(prev) - : "q"(new), "m"(*__synch_xg(ptr)), - "0"(old) - : "memory"); - return prev; - case 4: - __asm__ __volatile__("lock; cmpxchgl %k1,%2" - : "=a"(prev) - : "q"(new), "m"(*__synch_xg(ptr)), - "0"(old) - : "memory"); - return prev; - case 8: - __asm__ __volatile__("lock; cmpxchgq %1,%2" - : "=a"(prev) - : "q"(new), "m"(*__synch_xg(ptr)), - "0"(old) - : "memory"); - return prev; - } - return old; -} - -static __inline__ int synch_const_test_bit(int nr, const volatile void * addr) -{ - return ((1UL << (nr & 31)) & - (((const volatile unsigned int *) addr)[nr >> 5])) != 0; -} - -static __inline__ int synch_var_test_bit(int nr, volatile void * addr) -{ - int oldbit; - __asm__ __volatile__ ( - "btl %2,%1\n\tsbbl %0,%0" - : "=r" (oldbit) : "m" (ADDR), "Ir" (nr) ); - return oldbit; -} - -#define synch_test_bit(nr,addr) \ -(__builtin_constant_p(nr) ? \ - synch_const_test_bit((nr),(addr)) : \ - synch_var_test_bit((nr),(addr))) - -#endif /* __XEN_SYNCH_BITOPS_H__ */ diff --git a/sys/dev/xen/evtchn/evtchn_dev.c b/sys/dev/xen/evtchn/evtchn_dev.c index 34f481358008..a217120222e6 100644 --- a/sys/dev/xen/evtchn/evtchn_dev.c +++ b/sys/dev/xen/evtchn/evtchn_dev.c @@ -58,8 +58,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include #include diff --git a/sys/dev/xen/grant_table/grant_table.c b/sys/dev/xen/grant_table/grant_table.c index fdbec8ac14e8..b5bbe04977a2 100644 --- a/sys/dev/xen/grant_table/grant_table.c +++ b/sys/dev/xen/grant_table/grant_table.c @@ -28,9 +28,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include - #include #include @@ -182,18 +179,15 @@ gnttab_query_foreign_access(grant_ref_t ref) int gnttab_end_foreign_access_ref(grant_ref_t ref) { - uint16_t flags, nflags; + uint16_t flags; - nflags = shared[ref].flags; - do { - if ( (flags = nflags) & (GTF_reading|GTF_writing) ) { - printf("%s: WARNING: g.e. still in use!\n", __func__); - return (0); - } - } while ((nflags = synch_cmpxchg(&shared[ref].flags, flags, 0)) != - flags); + while (!((flags = atomic_load_16(&shared[ref].flags)) & + (GTF_reading|GTF_writing))) + if (atomic_cmpset_16(&shared[ref].flags, flags, 0)) + return (1); - return (1); + printf("%s: WARNING: g.e. still in use!\n", __func__); + return (0); } void @@ -284,17 +278,21 @@ gnttab_end_foreign_transfer_ref(grant_ref_t ref) /* * If a transfer is not even yet started, try to reclaim the grant * reference and return failure (== 0). + * + * NOTE: This is a loop since the atomic cmpset can fail multiple + * times. In normal operation it will be rare to execute more than + * twice. Attempting an attack would consume a great deal of + * attacker resources and be unlikely to prolong the loop very much. */ - while (!((flags = shared[ref].flags) & GTF_transfer_committed)) { - if ( synch_cmpxchg(&shared[ref].flags, flags, 0) == flags ) + while (!((flags = atomic_load_16(&shared[ref].flags)) & + GTF_transfer_committed)) + if (atomic_cmpset_16(&shared[ref].flags, flags, 0)) return (0); - cpu_spinwait(); - } /* If a transfer is in progress then wait until it is completed. */ while (!(flags & GTF_transfer_completed)) { - flags = shared[ref].flags; cpu_spinwait(); + flags = atomic_load_16(&shared[ref].flags); } /* Read the frame number /after/ reading completion status. */ diff --git a/sys/i386/include/xen/synch_bitops.h b/sys/i386/include/xen/synch_bitops.h deleted file mode 100644 index 696bc6fa43f4..000000000000 --- a/sys/i386/include/xen/synch_bitops.h +++ /dev/null @@ -1,138 +0,0 @@ -#ifndef __XEN_SYNCH_BITOPS_H__ -#define __XEN_SYNCH_BITOPS_H__ - -/* - * Copyright 1992, Linus Torvalds. - * Heavily modified to provide guaranteed strong synchronisation - * when communicating with Xen or other guest OSes running on other CPUs. - */ - -#define ADDR (*(volatile long *) addr) - -static __inline__ void synch_set_bit(int nr, volatile void * addr) -{ - __asm__ __volatile__ ( - "lock btsl %1,%0" - : "=m" (ADDR) : "Ir" (nr) : "memory" ); -} - -static __inline__ void synch_clear_bit(int nr, volatile void * addr) -{ - __asm__ __volatile__ ( - "lock btrl %1,%0" - : "=m" (ADDR) : "Ir" (nr) : "memory" ); -} - -static __inline__ void synch_change_bit(int nr, volatile void * addr) -{ - __asm__ __volatile__ ( - "lock btcl %1,%0" - : "=m" (ADDR) : "Ir" (nr) : "memory" ); -} - -static __inline__ int synch_test_and_set_bit(int nr, volatile void * addr) -{ - int oldbit; - __asm__ __volatile__ ( - "lock btsl %2,%1\n\tsbbl %0,%0" - : "=r" (oldbit), "=m" (ADDR) : "Ir" (nr) : "memory"); - return oldbit; -} - -static __inline__ int synch_test_and_clear_bit(int nr, volatile void * addr) -{ - int oldbit; - __asm__ __volatile__ ( - "lock btrl %2,%1\n\tsbbl %0,%0" - : "=r" (oldbit), "=m" (ADDR) : "Ir" (nr) : "memory"); - return oldbit; -} - -static __inline__ int synch_test_and_change_bit(int nr, volatile void * addr) -{ - int oldbit; - - __asm__ __volatile__ ( - "lock btcl %2,%1\n\tsbbl %0,%0" - : "=r" (oldbit), "=m" (ADDR) : "Ir" (nr) : "memory"); - return oldbit; -} - -struct __synch_xchg_dummy { unsigned long a[100]; }; -#define __synch_xg(x) ((volatile struct __synch_xchg_dummy *)(x)) - -#define synch_cmpxchg(ptr, old, new) \ -((__typeof__(*(ptr)))__synch_cmpxchg((ptr),\ - (unsigned long)(old), \ - (unsigned long)(new), \ - sizeof(*(ptr)))) - -static inline unsigned long __synch_cmpxchg(volatile void *ptr, - unsigned long old, - unsigned long new, int size) -{ - unsigned long prev; - switch (size) { - case 1: - __asm__ __volatile__("lock; cmpxchgb %b1,%2" - : "=a"(prev) - : "q"(new), "m"(*__synch_xg(ptr)), - "0"(old) - : "memory"); - return prev; - case 2: - __asm__ __volatile__("lock; cmpxchgw %w1,%2" - : "=a"(prev) - : "q"(new), "m"(*__synch_xg(ptr)), - "0"(old) - : "memory"); - return prev; -#ifdef CONFIG_X86_64 - case 4: - __asm__ __volatile__("lock; cmpxchgl %k1,%2" - : "=a"(prev) - : "q"(new), "m"(*__synch_xg(ptr)), - "0"(old) - : "memory"); - return prev; - case 8: - __asm__ __volatile__("lock; cmpxchgq %1,%2" - : "=a"(prev) - : "q"(new), "m"(*__synch_xg(ptr)), - "0"(old) - : "memory"); - return prev; -#else - case 4: - __asm__ __volatile__("lock; cmpxchgl %1,%2" - : "=a"(prev) - : "q"(new), "m"(*__synch_xg(ptr)), - "0"(old) - : "memory"); - return prev; -#endif - } - return old; -} - -static __inline__ int synch_const_test_bit(int nr, const volatile void * addr) -{ - return ((1UL << (nr & 31)) & - (((const volatile unsigned int *) addr)[nr >> 5])) != 0; -} - -static __inline__ int synch_var_test_bit(int nr, volatile void * addr) -{ - int oldbit; - __asm__ __volatile__ ( - "btl %2,%1\n\tsbbl %0,%0" - : "=r" (oldbit) : "m" (ADDR), "Ir" (nr) ); - return oldbit; -} - -#define synch_test_bit(nr,addr) \ -(__builtin_constant_p(nr) ? \ - synch_const_test_bit((nr),(addr)) : \ - synch_var_test_bit((nr),(addr))) - -#endif /* __XEN_SYNCH_BITOPS_H__ */ diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index cf4560b6b5fb..8d5562e21018 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -57,8 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include #include @@ -576,7 +574,7 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) /* process port */ port = (l1i * LONG_BIT) + l2i; - synch_clear_bit(port, &s->evtchn_pending[0]); + evtchn_clear_port(port); isrc = xen_intr_port_to_isrc[port]; if (__predict_false(isrc == NULL)) diff --git a/sys/xen/evtchn/evtchnvar.h b/sys/xen/evtchn/evtchnvar.h index 1f78755115ac..d1438846594f 100644 --- a/sys/xen/evtchn/evtchnvar.h +++ b/sys/xen/evtchn/evtchnvar.h @@ -6,6 +6,7 @@ * * Copyright (c) 2004, K A Fraser * Copyright (c) 2012, Spectra Logic Corporation + * Copyright © 2022, Elliott Mitchell * * This file may be distributed separately from the Linux kernel, or * incorporated into other software packages, subject to the following license: @@ -48,6 +49,12 @@ enum evtchn_type { /** Submit a port notification for delivery to a userland evtchn consumer */ void evtchn_device_upcall(evtchn_port_t port); +/* Macros for accessing event channel values */ +#define EVTCHN_PTR(type, port) \ + (HYPERVISOR_shared_info->evtchn_##type + ((port) / __LONG_BIT)) +#define EVTCHN_BIT(port) ((port) & (__LONG_BIT - 1)) +#define EVTCHN_MASK(port) (1UL << EVTCHN_BIT(port)) + /** * Disable signal delivery for an event channel port, returning its * previous mask state. @@ -59,8 +66,9 @@ void evtchn_device_upcall(evtchn_port_t port); static inline int evtchn_test_and_set_mask(evtchn_port_t port) { - shared_info_t *s = HYPERVISOR_shared_info; - return synch_test_and_set_bit(port, s->evtchn_mask); + + return (atomic_testandset_long(EVTCHN_PTR(mask, port), + EVTCHN_BIT(port))); } /** @@ -71,8 +79,8 @@ evtchn_test_and_set_mask(evtchn_port_t port) static inline void evtchn_clear_port(evtchn_port_t port) { - shared_info_t *s = HYPERVISOR_shared_info; - synch_clear_bit(port, &s->evtchn_pending[0]); + + atomic_clear_long(EVTCHN_PTR(pending, port), EVTCHN_MASK(port)); } /** @@ -83,9 +91,8 @@ evtchn_clear_port(evtchn_port_t port) static inline void evtchn_mask_port(evtchn_port_t port) { - shared_info_t *s = HYPERVISOR_shared_info; - synch_set_bit(port, &s->evtchn_mask[0]); + atomic_set_long(EVTCHN_PTR(mask, port), EVTCHN_MASK(port)); } /** From nobody Wed Mar 29 07:52: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 4Pmf0d2X0yz42BCY; Wed, 29 Mar 2023 07:52: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 4Pmf0d20Pdz3Q16; Wed, 29 Mar 2023 07:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IRFw3F86JNd6SrYOuN6UGdayGeOyyGpWP7sjxqbR1qE=; b=QXbrnpWeAF8/VNlLfbw712dSGCE+U1Pf4FFTFxESZpJZPu0ew+FovvJIY2rhBvcbpS/ETe Sk6joq9HrJ+VIYs2pVewDNibdMLDLY5Zrc3QGBL2/KoTvcWTqCp0PE1u5+4SMDeWb10dM+ o9otqCDcepXjsvUe53d7vs38GkG3LqyhpPXL+IOC5FLOprVKb8Whu9gnaYZpta+htF1JYH Wd3RD6VbxCExjAZZvb3Y85EC4Kc6pKo3gjS3sQ/4eAOmFXKd8Gsn2J4/Ncx0rkg+WOfBiT wyEr/2iI+QLq90rJCUWUQJvkzcAjzE+QBgZ6VFHCERy0/bAvhtuzs4rZnv1RKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IRFw3F86JNd6SrYOuN6UGdayGeOyyGpWP7sjxqbR1qE=; b=vvUxevvOEu3diToGhTt2+UUigBMo4HbhCPYX9BEPuMNywJhrnTDvtEMn2FFDv/e2q6TERR oxII5J+ttz5v1pVh1RwnypsqNHh+qHdLRGxVGi+S05OKWvUUtqPL8qD3T3M+c0HYREDzzL XuMBwhq1A0Jb3jqDBa2zsYfOUhQOxahJ952ot4Q0kR/j1rXy17bim0TTuMq2apS6w7Zldc A3FzdBVIv/Ktcf90W7rqhh+ZzxfGnbPHBjvjtihxy5L6PWJuqe18wLkgRIjl3TQuM2b77q iXW1yzPgNYmPFyJ2YW9Ph2oWUFhfmivK8EIPMneGT/qTmz2L701A0hquYvlsVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076353; a=rsa-sha256; cv=none; b=KciQ2q29XH70HxV5DcQ9IIni9fB4En59ZgfPgVXsRXDgqTI8uTAm3XC6PqZD5PP2C16Dgq lsFk48tKJY6R8LC1hzgH4028VN3KEx7gDvy1FKm48eGZkr2mwh+mB/MnmyLZuichrNraKo 90thezWuHYbLJW52lhApTlFPqGlWa7h3fnIItbYAkskwApt+WI5K+7/OoxYCYpYANG5slk 5HTrGhesiYZf4VQi9NxBoSCkaR39mDLqi1vGjJXbBmNx2AWvkUft9AMMSTvcVqUpF0TpEd kq/w96G/S/f8T+zsAZdvs2EvUyOcCdmRJxJWyPsqJ5MCQikV7KMUo9y23h7ASg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmf0d0YHKzLsj; Wed, 29 Mar 2023 07:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T7qWg8052093; Wed, 29 Mar 2023 07:52:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qWr4052092; Wed, 29 Mar 2023 07:52:32 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:32 GMT Message-Id: <202303290752.32T7qWr4052092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 40ad9aaa880c - main - xen/intr: stop passing shared_info_t to xen_intr_active_ports() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40ad9aaa880c7eefa3c16786beb19320afdc8903 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=40ad9aaa880c7eefa3c16786beb19320afdc8903 commit 40ad9aaa880c7eefa3c16786beb19320afdc8903 Author: Elliott Mitchell AuthorDate: 2022-02-23 16:47:18 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:43 +0000 xen/intr: stop passing shared_info_t to xen_intr_active_ports() There is only a single global HYPERVISOR_shared_info pointer, so directly use the global pointer. Reviewed by: royger MFC after: 1 week --- sys/x86/xen/xen_intr.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 8d5562e21018..129252044da9 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -485,9 +485,10 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, * events. */ static inline u_long -xen_intr_active_ports(struct xen_intr_pcpu_data *pcpu, shared_info_t *sh, - u_int idx) +xen_intr_active_ports(const struct xen_intr_pcpu_data *const pcpu, + const u_int idx) { + volatile const shared_info_t *const sh = HYPERVISOR_shared_info; CTASSERT(sizeof(sh->evtchn_mask[0]) == sizeof(sh->evtchn_pending[0])); CTASSERT(sizeof(sh->evtchn_mask[0]) == sizeof(pcpu->evtchn_enabled[0])); @@ -509,7 +510,6 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) u_int l1i, l2i, port, cpu __diagused; u_long masked_l1, masked_l2; struct xenisrc *isrc; - shared_info_t *s; vcpu_info_t *v; struct xen_intr_pcpu_data *pc; u_long l1, l2; @@ -522,7 +522,6 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) cpu = PCPU_GET(cpuid); pc = DPCPU_PTR(xen_intr_pcpu); - s = HYPERVISOR_shared_info; v = DPCPU_GET(vcpu_info); if (!xen_has_percpu_evtchn()) { @@ -560,7 +559,7 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) l1i = ffsl(masked_l1) - 1; do { - l2 = xen_intr_active_ports(pc, s, l1i); + l2 = xen_intr_active_ports(pc, l1i); l2i = (l2i + 1) % LONG_BIT; masked_l2 = l2 & ((~0UL) << l2i); @@ -596,7 +595,7 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) } while (l2i != LONG_BIT - 1); - l2 = xen_intr_active_ports(pc, s, l1i); + l2 = xen_intr_active_ports(pc, l1i); if (l2 == 0) { /* * We handled all ports, so we can clear the From nobody Wed Mar 29 07:52: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 4Pmf0f5CrYz429n8; Wed, 29 Mar 2023 07:52: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 4Pmf0f2Lscz3PsC; Wed, 29 Mar 2023 07:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UHODjyErnIJRiDrCaGKEFZi0RzYyj3Y9TdHwq4TjAZ4=; b=BEMqTY2T8qBcovigCLO+Fe+BgFlguTtWHj+ZI1XWD8/rSx0J1y6D9E1WW4HbNEzVFlQePp uNx64QVF9GKrcOOHKPebse8YtDFR88MEQR7nMnFsaVSjSz1L3qfbv0+BK8sNwLmxvDYv+/ rzvhcIrHBJHoVRiBhR6NB+TTbnj4ckBmGQeJVDvrjymjlYtmW7Leg7JIqAjkcBYLpx0xrt I/tP+ROvRlqkrCHgm0U8wyY6Xw2UZKn7L1SiqjTMxVG0L5KbtsR9P6/P6by74qTy54Wabg 1z66+H3J0bRqbAarA9uPrEt7kzb07p8CDsLkjo8CMHCJ8YVSyXuYlIRIvefIZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UHODjyErnIJRiDrCaGKEFZi0RzYyj3Y9TdHwq4TjAZ4=; b=XbCMJUn+nClfAStahKj9icF0pYL9/euX9gHoxFSsK8o1wv4WfmSAs5QUyIOsp2mo4N5A8m BXOAsPHwO0FWy2yXGvq/myJsAITuwQBDMnyYtaKMkH1sG1Dkn0VfJ9P36VMT/1FD+maPSm RBHlcOio7ag7wkf+EjrYmOJBzSuPFDiueThx7/+mVGLRSMgwNLXXdwLy3Jukdl7vKYo+qH 3mRE/W+y7HVh4BjdN1JlufwoSa76sksj13Uv8RT+eYaQEqqA0XnFxVyH2FvbtA0L4/LU/t eQ+C+ho64b+fKsflx0ALY6wuHTA3xTWpCXct7fKlJ9g4nR26lDzygsNQzHNL9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076354; a=rsa-sha256; cv=none; b=AbZEqUT5E536umw+wWybjtzOTCbu2PRWKF4rvNPvCSkd4bZVYWetiUOvR+GEg+yQO1WRfi LCdobTKyKxeRmGmWt8Z4ow8vP0FNlFz1wNnHHpDZYnHGC5/tjGGk1al5dnIMK2uajBeTr1 R5VgkDEGW/lPCMUa1ie8cUsXLjn7l2AB+oyKCKVBMvmTsoh8hLvm2Rm4W9WVPVMAgjrBQg tha82+607cvKMEsGCvqj1zAbRbaZ0i4wkM+iyRi8kwuL1i1uq8eNkSVJJos/Nock/0WKtx To0ew+cFvylz4NHdZHzsuBQyKzRqXXqCWN8D0SNHdn6XRqFZsyBMlZlz+LHMaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmf0f1T6VzMyK; Wed, 29 Mar 2023 07:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T7qYWZ052117; Wed, 29 Mar 2023 07:52:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qYuL052116; Wed, 29 Mar 2023 07:52:34 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:34 GMT Message-Id: <202303290752.32T7qYuL052116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 910bd069f809 - main - xen/intr: remove x86 APIC headers from xen_intr.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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 910bd069f809b462303dd52f48546fff3048887f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=910bd069f809b462303dd52f48546fff3048887f commit 910bd069f809b462303dd52f48546fff3048887f Author: Julien Grall AuthorDate: 2015-10-20 16:14:56 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:43 +0000 xen/intr: remove x86 APIC headers from xen_intr.c Remove these no longer needed headers. Key for making xen_intr.c machine-independent as they don't exist on other architectures. Originally this was part of a much larger commit, but was broken off for submission to the FreeBSD project. Reviewed by: royger Submitted by: Elliott Mitchell Original implementation: Julien Grall , 2015-10-20 09:14:56 MFC after: 1 week --- sys/x86/xen/xen_intr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 129252044da9..39486f28c9c5 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -52,8 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include #include From nobody Wed Mar 29 07:52: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 4Pmf0g48N9z42B0F; Wed, 29 Mar 2023 07:52: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 4Pmf0g3HvFz3Q4D; Wed, 29 Mar 2023 07:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=azJ94TRQx1gJ4JaV63eT/ZA/5D8mHemjodGtiEW+agE=; b=q4xzDQZkeKMoUuCCkNgBwGNaFe6Jx4J+f9UiMFlWUhi7e7x2z5xPdfZ/uqlBulPtGwCYYd 8yDa/eFkFWpjBIvEaPT0qTP2+BeNMNpnk2GE5zZgoPIlDEztC/9otebvxPGh2n5j1dAO1H I0TawSIi1QerUswJUYW9bahHRtH1tAMUt7K29BzcTOtlndAJrgMT8u4ztknCGax/nUrHgr suob7PME8xnqQohHHJbKoZ7m1WZ7KvY8R3k7o6AMbcXZPIbMjQMQcRGBLCacxSdtxvQXan hfuc1TuErQ6vA5uVCHfXEyzuBdi1klbWAO8D4mHgSJ9vPeAZzqWoEeh8KMBE7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=azJ94TRQx1gJ4JaV63eT/ZA/5D8mHemjodGtiEW+agE=; b=gJLMHeEPVBhKKbYzzpzC6uHucW8fSDvyPClNTDcgmspZJ0KvrTPXXqcIKI+9+0/jq+rAwL P7ELbKyDMJ14iBAbL9Nj/q6eTo+oKPiTLlzLdfH5xmH+NU8tLAd6FX+MCgvm86/Ir8vZVz +u5JW2TFr+noEXfxm1Xa4JVZ8E7rKLvnIwOiYgUr2dBvt0krsdONG3Lnp7/P32Vj178MMn 80OK7Lzup/B30/1HPZ56ew1HUQozrYgAdhwXT3KT6XyHHh588cqbMf9cX+BBovtZO3k9aa oJXhgE+9ckfW1DeKVYj3YFxkuhOljqb0XulH+kyVD0LmEw8ljhGPxV0DNOWQMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076355; a=rsa-sha256; cv=none; b=Je9Cmgzs9a9Ugs6CqUrM9y4GPjey5gUFp1Q0SwO3avbFDeB+RJMFblGbbJ/6TZeDMdmWZb 6OZjYgeCiZhKyWpBg75e4Oqy8WlqBbYUfmvPRlPMx99ZZjeJAhSor7geHNKw00TE2ML/ou a6jb/TshTYHJ+2pd0Drvyu34WgoaKTy3dZl2tt2888TVsXyIjDGZe8GOlcOiuLKhH85GYH bVZPe2XiCZmLgwhB0tLUkh9xpvFupG/dnpvUochL8dQgu8PT0OgI9Zg4EatioYicswACo/ cn2tbuI+/Bi5V5slvUVCQV06nqw1qfWy9FGrxNNb7Oo6G5mAHJjCEQVTT8dftA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmf0g2Nv4zN71; Wed, 29 Mar 2023 07:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T7qZWQ052141; Wed, 29 Mar 2023 07:52:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qZr4052140; Wed, 29 Mar 2023 07:52:35 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:35 GMT Message-Id: <202303290752.32T7qZr4052140@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: e45c8ea31cd8 - main - xen/intr: merge parts of resume functionality into new function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e45c8ea31cd89feda2b5b31bd623f4879602aec5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=e45c8ea31cd89feda2b5b31bd623f4879602aec5 commit e45c8ea31cd89feda2b5b31bd623f4879602aec5 Author: Elliott Mitchell AuthorDate: 2021-06-01 00:55:12 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:44 +0000 xen/intr: merge parts of resume functionality into new function The portions of xen_rebind_ipi() and xen_rebind_virq() were already near-identical. While xen_rebind_ipi() should panic() on single-processor, still having the functionality to invoke seems harmless. Meanwhile much of the loop from xen_intr_resume() seemed to want to be closer to this same code. This pushes related bits closer together. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D30598 --- sys/x86/xen/xen_intr.c | 52 ++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 39486f28c9c5..e2f23b4a5c6e 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -707,16 +707,6 @@ xen_rebind_ipi(struct xenisrc *isrc) panic("unable to rebind xen IPI: %d", error); isrc->xi_port = bind_ipi.port; - isrc->xi_cpu = 0; - xen_intr_port_to_isrc[bind_ipi.port] = isrc; - - error = xen_intr_assign_cpu(&isrc->xi_intsrc, - cpu_apic_ids[cpu]); - if (error) - panic("unable to bind xen IPI to CPU#%d: %d", - cpu, error); - - evtchn_unmask_port(bind_ipi.port); #else panic("Resume IPI event channel on UP"); #endif @@ -737,18 +727,39 @@ xen_rebind_virq(struct xenisrc *isrc) panic("unable to rebind xen VIRQ#%d: %d", isrc->xi_virq, error); isrc->xi_port = bind_virq.port; - isrc->xi_cpu = 0; - xen_intr_port_to_isrc[bind_virq.port] = isrc; +} + +static void +xen_intr_rebind_isrc(struct xenisrc *isrc) +{ +#ifdef SMP + u_int cpu = isrc->xi_cpu; + int error; +#endif + + switch (isrc->xi_type) { + case EVTCHN_TYPE_IPI: + xen_rebind_ipi(isrc); + break; + case EVTCHN_TYPE_VIRQ: + xen_rebind_virq(isrc); + break; + default: + return; + } + + xen_intr_port_to_isrc[isrc->xi_port] = isrc; #ifdef SMP + isrc->xi_cpu = 0; error = xen_intr_assign_cpu(&isrc->xi_intsrc, cpu_apic_ids[cpu]); if (error) - panic("unable to bind xen VIRQ#%d to CPU#%d: %d", - isrc->xi_virq, cpu, error); + panic("%s(): unable to rebind Xen channel %u to vCPU%u: %d", + __func__, isrc->xi_port, cpu, error); #endif - evtchn_unmask_port(bind_virq.port); + evtchn_unmask_port(isrc->xi_port); } /** @@ -789,16 +800,7 @@ xen_intr_resume(struct pic *unused, bool suspend_cancelled) isrc = (struct xenisrc *)intr_lookup_source(vector); if (isrc != NULL) { isrc->xi_port = INVALID_EVTCHN; - switch (isrc->xi_type) { - case EVTCHN_TYPE_IPI: - xen_rebind_ipi(isrc); - break; - case EVTCHN_TYPE_VIRQ: - xen_rebind_virq(isrc); - break; - default: - break; - } + xen_intr_rebind_isrc(isrc); } } } From nobody Wed Mar 29 07:52: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 4Pmf0h5JbYz42B0H; Wed, 29 Mar 2023 07:52: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 4Pmf0h4NPFz3Pyj; Wed, 29 Mar 2023 07:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/uy8IXH6bZJyIL0Z1EmtKNnQUEfZyOrIT4oNn4nNiZ0=; b=b+Ig/iEnKYKmm7h7fdav4C55FYeFeQqrf+fejT++EOFXmZVgcgD0+ws0S6KIlZNZ7CcKWC Qkk5TvafKxv1hxLCMpW+OyLkjpIIvAkoLn+wd0dj3bkl8Veby5+keALCRpayqGb8hD0IVp wxweqC8BZafMO3DbYOiC2Ni0pbOvAVobBgU+wvr9YVobhEKlk720yJgEcU9P3m19yo1eIm deukCwybsdJj7qaBPMXoV+82HTjSSUGNgHGsuhiOkH6AFMkWAuYSwfEih0skWnyq0ZvXcb qeOvR9cklY02bAfA7ix7WngrsZNfSJBsvOjNN0RY2S0y8pLO21dcYqu7PSrMLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/uy8IXH6bZJyIL0Z1EmtKNnQUEfZyOrIT4oNn4nNiZ0=; b=XHuqUNzncBct8z2GCF9AIavipICZQ7nRWKa+FiPTjJF04Whd4ftNoUcANRVBENh3QQom1b DaKA/X+ciJWuAdf7dpcCB0fHkWgFX6Ly7yzwOVubhhOJQrAW4kaSZ6l21AMKdrbdhsBUMa ZmtadBgG/nH4ljMwy9VsQs/7n/pGrd+id1kyyBi+AlEuvG8TC/qIVmUv3dQ7fV4zRE4oKO 2EeQUtz0V5IfXIHRKC6XhLW35TdGkKTHkxzMdIfw+PwDvE1UdPAuq1aRzaQ57nVZ2hL/LB xDS4hezuKCLaFz3sh6Fx7PDFJ7GlhYi9SWUKw2ItQkXzRPbGldRbzRy7OHylKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076356; a=rsa-sha256; cv=none; b=dx3EtyQQaX7SvzhX1TOhYAih2ztRJRNdeFlEhGiq3ADyNyIW7Th4RuQ7Zga/aCtaPSMwL9 Pn56S3kQ8FFPJUDwc6taD3cCiRMmRKgwUKLD4fftn+axLp7z6wrGPhPhzRyjSDjtGs/w/a CFvyWcits34t8LsOyioSlVPp4v0sFf8iKQkYUnbwvmJWROhBTR7OkF46H0vu1MuMxqMxA+ 03tiZlDEe+PBDfKGvD4+eMl0JVjciquZOfJYu1f9NcEEg16guY7YVC7I82Y+TNc0Ttndex 0wWn0bi1rVM6LcvfYCDPbRjJ1TySB8NBrtwCG5WfoQmPfge+C7q2OvUYAhvlbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmf0h3HrmzN6P; Wed, 29 Mar 2023 07:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T7qab3052168; Wed, 29 Mar 2023 07:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qaEZ052167; Wed, 29 Mar 2023 07:52:36 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:36 GMT Message-Id: <202303290752.32T7qaEZ052167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: b94341afcb12 - main - xen/intr: rework xen_intr_resume() for in-place remapping List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b94341afcb12dac74825ac6fb140e2819760b00d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=b94341afcb12dac74825ac6fb140e2819760b00d commit b94341afcb12dac74825ac6fb140e2819760b00d Author: Elliott Mitchell AuthorDate: 2021-06-01 01:34:33 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:45 +0000 xen/intr: rework xen_intr_resume() for in-place remapping The prior implementation of xen_intr_resume() was wiping xen_intr_port_to_isrc[] and then rebuilding from the x86 interrupt table. Rework to instead wipe the channel numbers (->xi_port) and then scan the table for sources with invalid channels. This will be slower due to scanning the whole table, but this removes the dependency on the x86 interrupt code. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D30599 [royger] Split line over 80 characters. --- sys/x86/xen/xen_intr.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index e2f23b4a5c6e..4b9b4675b5a0 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -729,13 +729,14 @@ xen_rebind_virq(struct xenisrc *isrc) isrc->xi_port = bind_virq.port; } -static void +static struct xenisrc * xen_intr_rebind_isrc(struct xenisrc *isrc) { #ifdef SMP u_int cpu = isrc->xi_cpu; int error; #endif + struct xenisrc *prev; switch (isrc->xi_type) { case EVTCHN_TYPE_IPI: @@ -745,9 +746,10 @@ xen_intr_rebind_isrc(struct xenisrc *isrc) xen_rebind_virq(isrc); break; default: - return; + return (NULL); } + prev = xen_intr_port_to_isrc[isrc->xi_port]; xen_intr_port_to_isrc[isrc->xi_port] = isrc; #ifdef SMP @@ -760,6 +762,8 @@ xen_intr_rebind_isrc(struct xenisrc *isrc) #endif evtchn_unmask_port(isrc->xi_port); + + return (prev); } /** @@ -769,7 +773,6 @@ static void xen_intr_resume(struct pic *unused, bool suspend_cancelled) { shared_info_t *s = HYPERVISOR_shared_info; - struct xenisrc *isrc; u_int isrc_idx; int i; @@ -789,19 +792,29 @@ xen_intr_resume(struct pic *unused, bool suspend_cancelled) for (i = 0; i < nitems(s->evtchn_mask); i++) atomic_store_rel_long(&s->evtchn_mask[i], ~0); - /* Remove port -> isrc mappings */ - memset(xen_intr_port_to_isrc, 0, sizeof(xen_intr_port_to_isrc)); + /* Clear existing port mappings */ + for (isrc_idx = 0; isrc_idx < NR_EVENT_CHANNELS; ++isrc_idx) + if (xen_intr_port_to_isrc[isrc_idx] != NULL) + xen_intr_port_to_isrc[isrc_idx]->xi_port = + INVALID_EVTCHN; - /* Free unused isrcs and rebind VIRQs and IPIs */ - for (isrc_idx = 0; isrc_idx < xen_intr_auto_vector_count; isrc_idx++) { - u_int vector; + /* Remap in-use isrcs, using xen_intr_port_to_isrc as listing */ + for (isrc_idx = 0; isrc_idx < NR_EVENT_CHANNELS; ++isrc_idx) { + struct xenisrc *cur = xen_intr_port_to_isrc[isrc_idx]; - vector = first_evtchn_irq + isrc_idx; - isrc = (struct xenisrc *)intr_lookup_source(vector); - if (isrc != NULL) { - isrc->xi_port = INVALID_EVTCHN; - xen_intr_rebind_isrc(isrc); - } + /* empty or entry already taken care of */ + if (cur == NULL || cur->xi_port == isrc_idx) + continue; + + xen_intr_port_to_isrc[isrc_idx] = NULL; + + do { + KASSERT(!is_valid_evtchn(cur->xi_port), + ("%s(): Multiple channels on single intr?", + __func__)); + + cur = xen_intr_rebind_isrc(cur); + } while (cur != NULL); } } From nobody Wed Mar 29 08:13: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 4PmfSx2HVTz42CLk; Wed, 29 Mar 2023 08:13: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 4PmfSx1npVz3kZg; Wed, 29 Mar 2023 08:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680077617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oceqEQukrY4uNKFSGo+h8Pp6JnIOVxsa98zdqcAPFXg=; b=DqkFcnIdciILBsqW4JrC61gvPilMm9+PQQWJJiqsbSXjqD+cW0y5rJl8U3ooY7ube37836 fOj/qtrcdF2dEewnbaZQZEHrSgzvapFbVPtpqVQsfXSu0/FPeYGSbQO1DSFNTCmoCfPSd8 09CJT0XawrRRJXscjVu5U/8Nq2Re21hU6baMi4ML1+PdaG6BxYuOh+9DsIuA1cJZkdOmhd W3dskz7/woTp7I4qGKNoLg7lICerxEzhTt9aKB4LcuWnf2S9RKvsLE2nXjthsp/aUq4DuN ndmO7fnr+gQgbyodXDkcfzXpn8NlyZgqgYOXy7O7QAvKkLXbAnlPX3O5wvQevA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680077617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oceqEQukrY4uNKFSGo+h8Pp6JnIOVxsa98zdqcAPFXg=; b=TWml3FmHUwJ1ZZ50wq8/VOoTuoEYJfV9apw6AydEel/P5+iQ76KY2hNr3+wiwVXki1+/V8 LqJigtWpzhVIsH7GplE43H9L6H60fI0EnRdBmFYhZwaDLn9WoX3q7R4H9QsdVCneQxSRhn qH63JCS7iyw24MLQO/QvDUwKE7gGWyCLYem658TjWFv/kEaSLklrilUi/NKiUOlnLVWhUA cvLYYS0GTqvvdNUeWt7TLOhHUax7PFfNMh2mpmknehcGux1DRvVnTKLS49vsa+fvoOcAzK CLBRCXC1p9uzC8EO9kbwZ5aDx2AUG4ZuoFZtxxCO2jSZlhEHiU7TMWvQrK5RRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680077617; a=rsa-sha256; cv=none; b=yyMgaTuL6F2eCaRr78lxx0tOAg1rnxIRUjqYlcMFRIMX6mp5tQFyOnuaPO3Zs8wzdJ0HN5 3Bd3MzeBOZHuHxlpt6DLpLJJjhBsMSsPLpYx1PJ/RhLMDLqjDgZwSjm3JhSgLsnK7Bqwzw 8sNzO+WmgzvX8bnsJOO3DzRII3WoIIHZVe6dfyJUIZPN6hICgWHxFEy7Ljb2goHg/nZ/ok 2i62kfYIhn8ctQkrx3LJwzESXmSUbLsaMyoocAcRJsKdADLpE6T5GXYmii0SZIls8+GBpK BAPke1cRJ5EubLVQoTsgDWbUroSjveO9sTxpvEeM9vzMenzLJll0RR3qQjQCUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmfSx0rRmzNHy; Wed, 29 Mar 2023 08:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T8DbVL086036; Wed, 29 Mar 2023 08:13:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T8Db1n086035; Wed, 29 Mar 2023 08:13:37 GMT (envelope-from git) Date: Wed, 29 Mar 2023 08:13:37 GMT Message-Id: <202303290813.32T8Db1n086035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: 9d33a9d96f5a - main - Fix typo in statfs man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d33a9d96f5a2cd88d0955b5b56ef5058b1706c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=9d33a9d96f5a2cd88d0955b5b56ef5058b1706c1 commit 9d33a9d96f5a2cd88d0955b5b56ef5058b1706c1 Author: Stefan Eßer AuthorDate: 2023-03-29 08:11:19 +0000 Commit: Stefan Eßer CommitDate: 2023-03-29 08:11:19 +0000 Fix typo in statfs man page There are FAT12 and FAT16 file systems, but FAT13 of was an unintentional invention of mine ... Reported by: Ravi Pokala MFC after: 1 month --- lib/libc/sys/statfs.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2 index 4df0e801e418..696542a8b19a 100644 --- a/lib/libc/sys/statfs.2 +++ b/lib/libc/sys/statfs.2 @@ -239,7 +239,7 @@ traditional file systems. For some other file systems, values that have similar, but not identical, semantics to those described above may be returned. -An example is msdosfs, which in case of FAT12 or FAT13 file systems +An example is msdosfs, which in case of FAT12 or FAT16 file systems reports the number of available and of free root directory entries instead of inodes .Po From nobody Wed Mar 29 09:12: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 4Pmgmy3cDvz42Ggf; Wed, 29 Mar 2023 09:12: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 4Pmgmy39SGz3q5G; Wed, 29 Mar 2023 09:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680081154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=II5GVz2hw/9+jRl0Ye5sd1WQpEZOYyCFNVEIHWFj/K4=; b=hKooeyji2KlCfqVSUZdDJUwiKWAzwo/m/thz/WJ2n5oot50fxLx3T2sNf3hUTDnfYkTLHG UQ+nqwn2ogQAlUFlGgy/bj2kI5myH1BLdKruIJHQMPT2zBLmmQ3byvEUn2gw1Ola2Lxpc6 KIzlf3tVNPeCKLYQF+T1hf6TJM+TwXIKNk2GdZvsTySNHjP/ZKdbbfQS/wX2k+Mo63EQ8D Mhpsqsh/vgNIHkEzQ3mBcHkse59mGbMvyW88OqhCjHuBgaxawHtcNryfCiPXitZCXGucnc GlB9DeffA6FsG2yyLxbGyTtuwIPcF6z8XzRWhLaAmKvG5O4x9EHFMCgfRvXALA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680081154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=II5GVz2hw/9+jRl0Ye5sd1WQpEZOYyCFNVEIHWFj/K4=; b=aUs22pby5GPb+7GZigfZPZ+E+bhuE2+gIAzpzqNJIwNmcZPF4OUReLZGUk1R+0r9yprs/Y yAL9pkEX5BAlfkYYqZJgxDm/KhpszVWUG4YZfHFkgAuwcEtGiL3ZKbMsscRYReUS0l5/0M aNk96JhjVW7MgxobiJs5gltq8McI45Abm8GyByXONAi4m2nLU7OjEvS4DOUzwgY3/bbJre aTR0Hh3ugJ9xdHy+mbcJTZAhmKBevYqWLNZ6rKXRUsFfpU1p5IuE30nJTbMiLq/B9gDm5k TXLF+9NjeUjS7ZR13Gsh6A/xzyOTKO4CWXvU67MjfEKQUOo7Nfl7izNCVyNyIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680081154; a=rsa-sha256; cv=none; b=QqfDaiVZBWimWYe4oMDxZVz56jdpmwpOBZpu4hTIZBoyp6sA2eGr9T0+En91wk8vzY/GPy 9l3nsubDJ9ZoBG45SyRC0u9QqqAE3DMFz7uA1M4zupdJTiNxlmVfwMX3cgjhjeN794prOn lNai6o3iKksy3VNTrx2aGyknJSeiRCjodZrWK6On6DOvuMDITTsxkYm3xt1L77x52WVs7d /c3XNEaHX0MQl0uXEVkQzIt5LkVXdbkjyVXGaiZlOAOkvlikYH/zqnvtOzBdS9BUc2cnya Fhtb29zxsVq9O4wW2s8pNVtyrxRr+Be6zDezMUOXHw96cd/d9bRUf6NaXzX1/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmgmy2DBczPnl; Wed, 29 Mar 2023 09:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T9CYSo084256; Wed, 29 Mar 2023 09:12:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T9CYLj084255; Wed, 29 Mar 2023 09:12:34 GMT (envelope-from git) Date: Wed, 29 Mar 2023 09:12:34 GMT Message-Id: <202303290912.32T9CYLj084255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Koshy Subject: git: 57014ab77647 - main - pmc: Add a reminder to maintain documentation. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: jkoshy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57014ab77647c74fcb0a01d68e21a161ceb95d5a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkoshy: URL: https://cgit.FreeBSD.org/src/commit/?id=57014ab77647c74fcb0a01d68e21a161ceb95d5a commit 57014ab77647c74fcb0a01d68e21a161ceb95d5a Author: Joseph Koshy AuthorDate: 2023-03-28 21:22:59 +0000 Commit: Joseph Koshy CommitDate: 2023-03-29 09:12:08 +0000 pmc: Add a reminder to maintain documentation. Approved by: gnn (mentor) Differential Revision: https://reviews.freebsd.org/D39298 --- sys/sys/pmc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index 5465d0532a2a..8d25ecad721d 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -79,6 +79,8 @@ extern char pmc_cpuid[PMC_CPUID_LEN]; * some way for PMC operations. CPU names are grouped by manufacturer * and numbered sparsely in order to minimize changes to the ABI involved * when new CPUs are added. + * + * Please keep the pmc(3) manual page in sync with this list. */ #define __PMC_CPUS() \ From nobody Wed Mar 29 09:19: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 4PmgwX2b2Tz42H76; Wed, 29 Mar 2023 09:19: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 4PmgwX23fhz3r01; Wed, 29 Mar 2023 09:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680081548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=keUMoyrig4o4ReAVyk9DStLRSu6Zu/BgFM19lcljfbc=; b=To7g/j8eXC2Rs1r+eo9qGMTCOA3A6mGKBwCikqZrYs2VMXbBHyg6SrhwKpt+p3iwlOHuIB eKFSTfTkLZFHaRBqVhJtWn1ckx/JrP2w93ckB49c9Hf+dNaCvv7OuwoC5Zkp0DnHeFuGi5 ijgvUkKARpQ5Sg6GkFNR4sTB0sjJm7akUGEzsPSO8eHb+zIpFm23rWj3sdEpQeEfGK+mcr xM3eFL1Y6I0ZXYuQcsLORIj0sSACkqbQ+d7m49ud+JdWRCLnz5Z6lJE7njg2n6vVcGHLOY tuSHo2OXZhMc3L3c3G1qiqgNR+okTu5aEpLPuFivtHG2cFTnZAKF46w+pKI6uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680081548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=keUMoyrig4o4ReAVyk9DStLRSu6Zu/BgFM19lcljfbc=; b=ryF7byMBNXXIMO/ciGSXwDc1a5fskuv1fJi63qyb/7VdjX4qPNISeP7fr6dPW7EkQD3rWI nwS8d5/x8PvBERhJ+zE1IHEIuYcuQIwycKDAbMN88OiwrdM/oNC1mTcCPNqYO9VJtUdF1J mRj05EKaqhDpAThHu9ffPPTx/HHmuuGzjRtP1lgLlmZrLCU/9UZBHACh/npb1WyUj7rwBo 79yYi/HKgGztNWvAIvcxIKzHBCa6qsveALmwNQ/LU5JcXuqIoCJpl9DMzmbHSQz6oEsUn3 OF9l/lhce10ZgxLipAkA7Zvh3ujdJmJ6361nUYOsBDyych8jQQl2uJdVQ53BSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680081548; a=rsa-sha256; cv=none; b=EGVEb59g0gTjYJ1/0J9yamjJfaIGbMN0wW09DvActsWXzEPGzW5P0ZybUCDHIpORpcEBPl tmeq76eVIS4vj9y50VgMRt2XRI/Dd4/C+SBTP+FMONeS6zmhV3+H1OnCphBbPMf+y63K0z CSXQOvdn+C0y1l0NU77xykbLPjj8J/SnJIxjFLrz2JY+OXmq5nTLf5SqjO51MERXeqb0Lw NfKrUn2nR8FrZU+fmXpIOz0XtzRGbzWCJ/K/5fMWD8CPHCMrTzyoZWMoMCnx8Ca3LmSGqX EMgseSxa3CnwWXL6tzyH+7U8u0+wHaAMD2/DU4rhXRaPfBna5fr0BQyZqiwWJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmgwX16Y8zPBM; Wed, 29 Mar 2023 09:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T9J8eC085129; Wed, 29 Mar 2023 09:19:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T9J8KG085128; Wed, 29 Mar 2023 09:19:08 GMT (envelope-from git) Date: Wed, 29 Mar 2023 09:19:08 GMT Message-Id: <202303290919.32T9J8KG085128@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: 7c31de1a3cf0 - main - ufs: stop doing refcount_init on made up creds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 7c31de1a3cf06fa9b0e4b11cc7039a55bb433fa5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=7c31de1a3cf06fa9b0e4b11cc7039a55bb433fa5 commit 7c31de1a3cf06fa9b0e4b11cc7039a55bb433fa5 Author: Mateusz Guzik AuthorDate: 2023-03-29 09:16:43 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-29 09:19:03 +0000 ufs: stop doing refcount_init on made up creds creds are not using the refcount API for a long time now, but this previously failed to fail to compile because the type remained int. Now it broke due to conversion to long. --- sys/ufs/ufs/ufs_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index a027a22cc9ca..c13aec4e2175 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -2073,7 +2073,7 @@ ufs_mkdir( * XXX This seems to never be accessed out of * our context so a stack variable is ok. */ - refcount_init(&ucred.cr_ref, 1); + ucred.cr_ref = 1; ucred.cr_uid = ip->i_uid; ucred.cr_ngroups = 1; ucred.cr_groups = &ucred_group; @@ -2825,7 +2825,7 @@ ufs_makeinode(int mode, struct vnode *dvp, struct vnode **vpp, * XXX This seems to never be accessed out of our * context so a stack variable is ok. */ - refcount_init(&ucred.cr_ref, 1); + ucred.cr_ref = 1; ucred.cr_uid = ip->i_uid; ucred.cr_ngroups = 1; ucred.cr_groups = &ucred_group; From nobody Wed Mar 29 09:19: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 4PmgwY3XP0z42H8n; Wed, 29 Mar 2023 09:19: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 4PmgwY33dKz3r2R; Wed, 29 Mar 2023 09:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680081549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dDn8Z31W3hvIg1NQ7Xca9hkJlA+wF5Mws1yjBq9nIyI=; b=Wf6f/FddrP4E7a3JDJkXXz/16gvhjnltESFy7w9sWi6bP1ihSH3GivPhoORVpNdLxmgJNY GBPFsxlpozDU8JxNI7STwAG6LXdMU5MUaMsh3GR+/9alMY4QebCDkyNrK1ooYDNRunlINi YfiY7ETO7uiv/KHvRF/knZ/4yFtseDdnp6iKIg2obvSp+0lIX30yFHGmzNXR96pzt4/dwM w9PkwdhUWG+5Ye90YcscrplN0bFWZ6QmmSJl2EhiF9d8Hej3O8VTXMqx3TjvCrmEQUZQjb dI4IqM3h7/yz0q6ANrrTN0d+Y8b82sC7FeL1r9ANUzKN8X72Ma5wjmP6qy7Beg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680081549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dDn8Z31W3hvIg1NQ7Xca9hkJlA+wF5Mws1yjBq9nIyI=; b=AOo2yZdyCwhSTB0PeamRfA4vVctuzLd3rn2Y+Tvi60Z/GCCDIGuESJI6Ae1+53z9sCDlCa 8BkGNKqGnfdNhfUMzR2pOjbSf6sNMStn8p9x/AXbFaD0lsvK4GQkUmnFg2D/91utcQkVEx gQr9YrQbfZlcSsBYjiSaP716Gbo5UIXKyHJU2EMRTdQ/fJ58jXyb+f4dKpXqI+NV+Agmdc YYIBTXBcw2bUz+giFTlvx+B8eUA+sTROrAKehlqxIZkWo2RfcrXk0xOgRHLokKfbnszMet lMMj8p9H4T7uWy+UmrdMxf2fN85D9YOtJrmMnBAmv04M+vAgqJxmI+BaMThNGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680081549; a=rsa-sha256; cv=none; b=yzBaxtlTNstyWP9n9Lne5P/FfAu3iMb3ckE/zIXCybeAqCK0g2jf7XjW0yvQrxoopDcnJg a3T81KDcpN037vuoesgt6muvKvUIni1vMamIBimBaqdreR/nrwtg6j1bw/f5Cq5EOz/G8N /2ONE+lMWqUyodAxFGMmSRLC4CFG7Odr0pHf5OXb5VtbulZxeuOyqnkRoUCC6wZpCSY8xo AzJHzQIN4AgiuKWYPiwrRfLv//j04BQ1+bOi8yP9xgFiTKV2BlrmfuQhHaChV82MgHOmGE QNqASTaEEA1nUrxbrdXlQbsBPzuYEUELkor64QGMbRTCPJGC31TNQEyl1UiB6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmgwY1czGzQ0p; Wed, 29 Mar 2023 09:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T9J9Ur085151; Wed, 29 Mar 2023 09:19:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T9J9Z5085150; Wed, 29 Mar 2023 09:19:09 GMT (envelope-from git) Date: Wed, 29 Mar 2023 09:19:09 GMT Message-Id: <202303290919.32T9J9Z5085150@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: 80cf427b8dc1 - main - proc: shave a lock trip on exit if possible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 80cf427b8dc18bc5c26fed6d07bc5c5eda4545b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=80cf427b8dc18bc5c26fed6d07bc5c5eda4545b0 commit 80cf427b8dc18bc5c26fed6d07bc5c5eda4545b0 Author: Mateusz Guzik AuthorDate: 2023-03-29 08:45:46 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-29 09:19:03 +0000 proc: shave a lock trip on exit if possible ... which happens to be vast majority of the time --- sys/kern/kern_exit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 3f64343aea0e..a92d5cc0f642 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -477,9 +477,11 @@ exit1(struct thread *td, int rval, int signo) sx_xunlock(&allproc_lock); sx_xlock(&proctree_lock); - PROC_LOCK(p); - p->p_flag &= ~(P_TRACED | P_PPWAIT | P_PPTRACE); - PROC_UNLOCK(p); + if ((p->p_flag & (P_TRACED | P_PPWAIT | P_PPTRACE)) != 0) { + PROC_LOCK(p); + p->p_flag &= ~(P_TRACED | P_PPWAIT | P_PPTRACE); + PROC_UNLOCK(p); + } /* * killjobc() might drop and re-acquire proctree_lock to From nobody Wed Mar 29 09:32: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 4PmhCS55Pqz42J4t; Wed, 29 Mar 2023 09:32:04 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (heemeyer.club [195.93.173.158]) (using TLSv1.3 with cipher TLS_AES_256_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 4PmhCR6tzLz3sqF; Wed, 29 Mar 2023 09:32:03 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.1/8.16.1) with ESMTP id 32T9W1FA032098; Wed, 29 Mar 2023 12:32:01 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.1/8.16.1/Submit) id 32T9W1GX032097; Wed, 29 Mar 2023 12:32:01 +0300 (MSK) (envelope-from dchagin) Date: Wed, 29 Mar 2023 12:32:01 +0300 From: Dmitry Chagin To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 80cf427b8dc1 - main - proc: shave a lock trip on exit if possible Message-ID: References: <202303290919.32T9J9Z5085150@gitrepo.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: <202303290919.32T9J9Z5085150@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4PmhCR6tzLz3sqF X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Wed, Mar 29, 2023 at 09:19:09AM +0000, Mateusz Guzik wrote: > The branch main has been updated by mjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=80cf427b8dc18bc5c26fed6d07bc5c5eda4545b0 > > commit 80cf427b8dc18bc5c26fed6d07bc5c5eda4545b0 > Author: Mateusz Guzik > AuthorDate: 2023-03-29 08:45:46 +0000 > Commit: Mateusz Guzik > CommitDate: 2023-03-29 09:19:03 +0000 > > proc: shave a lock trip on exit if possible > > ... which happens to be vast majority of the time > --- > sys/kern/kern_exit.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c > index 3f64343aea0e..a92d5cc0f642 100644 > --- a/sys/kern/kern_exit.c > +++ b/sys/kern/kern_exit.c > @@ -477,9 +477,11 @@ exit1(struct thread *td, int rval, int signo) > sx_xunlock(&allproc_lock); > > sx_xlock(&proctree_lock); > - PROC_LOCK(p); > - p->p_flag &= ~(P_TRACED | P_PPWAIT | P_PPTRACE); > - PROC_UNLOCK(p); > + if ((p->p_flag & (P_TRACED | P_PPWAIT | P_PPTRACE)) != 0) { > + PROC_LOCK(p); > + p->p_flag &= ~(P_TRACED | P_PPWAIT | P_PPTRACE); > + PROC_UNLOCK(p); > + } just out of curiosuty, is this can be replaced by a single atomic_clear_rel ? > > /* > * killjobc() might drop and re-acquire proctree_lock to From nobody Wed Mar 29 09:33: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 4PmhFD200Nz42JHg; Wed, 29 Mar 2023 09:33:36 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) (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 4PmhFC6Wpdz3tYN; Wed, 29 Mar 2023 09:33:35 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x22b.google.com with SMTP id bk5so11093407oib.6; Wed, 29 Mar 2023 02:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680082414; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=cXCcqQKUdbV0BWWVqVBjh4bz00N/GEKOunmKfnHikh8=; b=IP4GvOnGBlayFxifQMsm7c1nP6a67YS9N6xmS1YXfHU3j1v+X9OttUiYMTKtQLbfgq e2N5gLtXty8Ry9awPCmfUIU2fNgasj0G8d80IHoEeIBJ/xFbLvh9XhziwuAV7P5u+RVq niDp6qguWiDj8NXGzDE/k0hFYzPE0IFTnP/NVa9qHxjUhOq4rA1LwUAJ1nj6AlD28o+S KE8DyWXKNuRC4X4/irApLNl4R50H1MKwlwSd+X3WPWm7GInAeKFdra8lYXWmNoabP9Gg /xo7gVWMhKswJocPapaE79h3ukYha+JaYfmUGFnDOZRYbTMyOsDnW1LLpcs3W44iwVSO E2yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680082414; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cXCcqQKUdbV0BWWVqVBjh4bz00N/GEKOunmKfnHikh8=; b=uubId3V9ev5/sjh9Qza1Skm6z3YPq3HVjFe+09cDPPERJeie16qv2js3IA/SmRdwNl CNZoPmIX0DdXvyY1Y5i5esllhZa9vWPVvAs5B1jg+t8eZ5lvQduW1jxYtRk03OoYosIC EMHUYoDvjpvUXi9MPKu5xo8hQ8lQ1CG0McoLnvZDS5PxkdQjTxYvf19PeUGXWlnnlbF9 0M6Czh/5+FDbMFG745NOxmU4dnxygkg22y2ZsjM3eDR1ha+v2LpOi1QSWlpusbqYzJ4b 3/JaF2ooOwjZvQ9VGCI2JByHeVdRSYkvYAc/3W2fgWU59sqWgFSzOLNyK7bmPtDewvI4 Jraw== X-Gm-Message-State: AO0yUKXtpHfLxcMfoW7uY+uVcChMbEPdmSISIBO7yfUQTnUHRxWp+V2I +p8uOevxIEok8JqtEWoOYhUQjVTmQGpfJ4R3RYYWBeGP X-Google-Smtp-Source: AK7set/gAHOSQ28F277q4zuL3Z2rlv9vu/P+iJFujtmx4ZLMlmFkFl9EHKgYbialiybBHeCJ4YKgo9No2L6dGRHDynE= X-Received: by 2002:aca:1b09:0:b0:383:f5df:9e85 with SMTP id b9-20020aca1b09000000b00383f5df9e85mr4371052oib.4.1680082414484; Wed, 29 Mar 2023 02:33:34 -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 Received: by 2002:ac9:7a07:0:b0:49c:b071:b1e3 with HTTP; Wed, 29 Mar 2023 02:33:33 -0700 (PDT) In-Reply-To: References: <202303290919.32T9J9Z5085150@gitrepo.freebsd.org> From: Mateusz Guzik Date: Wed, 29 Mar 2023 11:33:33 +0200 Message-ID: Subject: Re: git: 80cf427b8dc1 - main - proc: shave a lock trip on exit if possible To: Dmitry Chagin 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-Rspamd-Queue-Id: 4PmhFC6Wpdz3tYN X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 3/29/23, Dmitry Chagin wrote: > On Wed, Mar 29, 2023 at 09:19:09AM +0000, Mateusz Guzik wrote: >> The branch main has been updated by mjg: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=80cf427b8dc18bc5c26fed6d07bc5c5eda4545b0 >> >> commit 80cf427b8dc18bc5c26fed6d07bc5c5eda4545b0 >> Author: Mateusz Guzik >> AuthorDate: 2023-03-29 08:45:46 +0000 >> Commit: Mateusz Guzik >> CommitDate: 2023-03-29 09:19:03 +0000 >> >> proc: shave a lock trip on exit if possible >> >> ... which happens to be vast majority of the time >> --- >> sys/kern/kern_exit.c | 8 +++++--- >> 1 file changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c >> index 3f64343aea0e..a92d5cc0f642 100644 >> --- a/sys/kern/kern_exit.c >> +++ b/sys/kern/kern_exit.c >> @@ -477,9 +477,11 @@ exit1(struct thread *td, int rval, int signo) >> sx_xunlock(&allproc_lock); >> >> sx_xlock(&proctree_lock); >> - PROC_LOCK(p); >> - p->p_flag &= ~(P_TRACED | P_PPWAIT | P_PPTRACE); >> - PROC_UNLOCK(p); >> + if ((p->p_flag & (P_TRACED | P_PPWAIT | P_PPTRACE)) != 0) { >> + PROC_LOCK(p); >> + p->p_flag &= ~(P_TRACED | P_PPWAIT | P_PPTRACE); >> + PROC_UNLOCK(p); >> + } > > just out of curiosuty, is this can be replaced by a single > atomic_clear_rel ? > Not unless all other times p_flag is modified also start using atomics >> >> /* >> * killjobc() might drop and re-acquire proctree_lock to > -- Mateusz Guzik From nobody Wed Mar 29 09:33: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 4PmhFL445Pz42JMQ; Wed, 29 Mar 2023 09:33: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 4PmhFL23Yrz3tZc; Wed, 29 Mar 2023 09:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680082422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+P9QhjAyIDQCSfmlOwZdQLgFj+XEcjkhzO85yyPW8xI=; b=wPPoFJlIhK8BM1rtRzDY+mXpudhi3f0oXbIH+w36tJ9OwVXojll2gcGH7+UbDjEmlcJ8nc +dOINufCfU3FDtNWLuJsDiS+qsbDPubXwAPT9jsnn40E6bQ2ybXZY5FS1cX6xIqIj/8SFV pQCOMVPvKq6u3Y1dlVTKChZuo2/bWyaDLR4kWGO3wlkGtEUs4+n7qw7DvMKieAgt9czRwp 6OxuzIcBrKdQEkjC31yFzCfAKzGsAXQFU14hSeUmA+Ccswpk/NBnQplq/4zm7dT5RdXX4N uBI8cB+SXgleXeD7LNKOWwsu4p544jZoflwjph371Z9Aa1lquvi+rTRYUVD8LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680082422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+P9QhjAyIDQCSfmlOwZdQLgFj+XEcjkhzO85yyPW8xI=; b=UV+sgmKONWNVKBV5HxUYb/gqIbMvqKNtttjCuKnKGXyc3Z/WRPnx+Hu3NzNCw6hrWZpT+8 nE/KuWZbkvDJB6ujQQTPvHNqciA5A8tvFNsqKyahEdxfK//m5ymIGiWkiFWWFx5R7FHSL0 aEFxA10xANAgPfFDvbOZdqHzyL82/21kU58b67hM3TyXTKxdw557s4QlmV78cLIKYW6RTv s3jpi7pxOUEXzwVk4q1YLf/NMjg2OvVIQqh/7ztdQY3V1li/p93ViwRvrBG0N57aVrtrfc 5kLVirgNhuRAUjXoeu5szUuCpUu0Bz+2T8UUTkSXzFqsjK4kmh9cgo9ZPiyeHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680082422; a=rsa-sha256; cv=none; b=GdnOK2oSBeeAkPfro2vN8EbkrSYKi9dRwZY3QgyohrG6Svw1rq07qHx2xa8TfNUNHxB2+8 X2uGilTVOh6MfWtw6pTQ4j+52/fv9QLSkiWwge8GpJbsN1K0KCw3CPrAKOpHZrQyKV16VA ge7APfXwJU+7aoUTxWRwPYxr+AUFJ2tJb1guunGrktS6zQW/qI1fsVmHjNl+rFvD2/2N1q 2sN65UCAybc1sPOz2z0eTgWFka+z3uBvVKMOKMtZ5onjhYmDEruwkl+y7rU3IdoAzXMizE UDONvrgzJ1j+OUiT6QgCFgu1+S7VQ4vpY8CaRfxPkBt9B3iDpk5Bb9vTixCwgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmhFL17cgzQHP; Wed, 29 Mar 2023 09:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T9XgR2017164; Wed, 29 Mar 2023 09:33:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T9XgaL017163; Wed, 29 Mar 2023 09:33:42 GMT (envelope-from git) Date: Wed, 29 Mar 2023 09:33:42 GMT Message-Id: <202303290933.32T9XgaL017163@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: c98d13fbf9c9 - main - bhyve: fix spelling mistake of pcireg 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c98d13fbf9c9b75a49e48789932cd1395c95e7bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=c98d13fbf9c9b75a49e48789932cd1395c95e7bf commit c98d13fbf9c9b75a49e48789932cd1395c95e7bf Author: Corvin Köhne AuthorDate: 2023-03-28 12:19:56 +0000 Commit: Corvin Köhne CommitDate: 2023-03-29 09:33:06 +0000 bhyve: fix spelling mistake of pcireg option The option is spelled "pcireg" not "pcir". MFC after: 1 week Fixes: f4ceaff56ddaacc151df07d2d205a2d7fcb736a8 Sponsored by: Beckhoff Automation GmbH & Co. KG --- usr.sbin/bhyve/bhyve_config.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index e9594d432563..8063df763689 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -542,7 +542,7 @@ for fwctl and for fwcfg. .It Va pc-testdev Ta bool Ta false Ta Enable the PC debug/test device. -.It Va pcir.* Ta integer Ta Ta +.It Va pcireg.* Ta integer Ta Ta Values of PCI register. It also accepts the value .Ar host From nobody Wed Mar 29 12:56: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 4Pmmll5GTNz42WmK; Wed, 29 Mar 2023 12:56:51 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher 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 "mx.blih.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pmmlj74Yyz4F96; Wed, 29 Mar 2023 12:56:49 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=npmimdPb; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com; dmarc=pass (policy=none) header.from=bidouilliste.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1680094602; 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=BmzEcU2kRKQQir2qK6Loz/pYKppoCx911zUA7NX8j9A=; b=npmimdPbfMFUhI015XcLhfMM3UZRRJIaKdENHxiATEoaymyNbVuWStpaD6J02JAIiboQ+b lda41wytwFaGx/TZm8MFRNvm0i3qcj/nOsDomTGTiUpLPQBDs5GENvqCl+5FVhyuRgqX3K oNcVzOtJtiDT+YgHbvffVT2ZZu+rBX8= Received: from skull.home.blih.net (lfbn-lyo-1-2174-135.w90-66.abo.wanadoo.fr [90.66.97.135]) by mx.blih.net (OpenSMTPD) with ESMTPSA id d5180fbf (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 29 Mar 2023 12:56:42 +0000 (UTC) Date: Wed, 29 Mar 2023 14:56:38 +0200 From: Emmanuel Vadot To: Konstantin Belousov Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 02904a06c76b - main - amd64: properly recalculate mitigations knobs after resume Message-Id: <20230329145638.18b68be35ea83cf5455db7bf@bidouilliste.com> In-Reply-To: <202303181540.32IFeR0r052611@gitrepo.freebsd.org> References: <202303181540.32IFeR0r052611@gitrepo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.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=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:212.83.155.74/32]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@FreeBSD.org,dev-commits-src-all@FreeBSD.org]; DKIM_TRACE(0.00)[bidouilliste.com:+]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FREEFALL_USER(0.00)[manu]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4Pmmlj74Yyz4F96 X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N Hi kib, On Sat, 18 Mar 2023 15:40:27 GMT Konstantin Belousov wrote: > The branch main has been updated by kib: > > URL: https://cgit.FreeBSD.org/src/commit/?id=02904a06c76be857307b78184863654b9e7b88ab > > commit 02904a06c76be857307b78184863654b9e7b88ab > Author: Konstantin Belousov > AuthorDate: 2023-03-17 13:02:03 +0000 > Commit: Konstantin Belousov > CommitDate: 2023-03-18 15:40:05 +0000 > > amd64: properly recalculate mitigations knobs after resume > > Revision r333125 AKA 986c4ca38772f72 forced clear cpu_stdext_feature3 > on suspend, since at that time microcode update was not reloaded > early on resume. Then, revision 050f5a8405c63 started re-reading > cpu_stdext_feature3 again. Since modern CPUs do not require mitigations > from the Skylake era, this went unnoticed for some time. > > Keep zeroing cpu_stdext_feature3 on suspend, but re-read it in more > controlled way on resume after microcode is reloaded, and recalculate > active workarounds based on actual microcode capabilities. > > Reported and tested by: romain > Reviewed by: emaste, markj > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D39146 > --- > sys/amd64/acpica/acpi_wakeup.c | 14 ++++++++++++++ > sys/amd64/amd64/initcpu.c | 2 +- > 2 files changed, 15 insertions(+), 1 deletion(-) So this one actually break suspend/resume (likely resume judging by the led) on my whiskeylake laptop (i7-8665U). It doesn't seems to affect my machine with a i5-9400F cpu, nor my skylake machine with a i7-6770HQ cpu. Any hints ? Cheers, -- Emmanuel Vadot From nobody Wed Mar 29 13:25: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 4PmnP42DNrz42Ynx; Wed, 29 Mar 2023 13:25:44 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher 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 "mx.blih.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PmnP32T26z4HNk; Wed, 29 Mar 2023 13:25:43 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=qfdNg6R0; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com; dmarc=pass (policy=none) header.from=bidouilliste.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1680096341; 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=+wGkotnw0TNt6zwVIpIFRUqV6ohEL9HXC8gOG6s03qM=; b=qfdNg6R0iQQaWhHR76EyoNx/iQVgwa3GkWdbPbYT4vD5odbXrNRqkB2hhgxdhUs2ymP4cJ Y/kMpstmgPAcLaPaG6ClJ8RzvQx5UkDTLuzT9HPt4rxiyUFGLkCDQXk9zIA/alD3YymSHM zuHZ0OKrLZm+d5usGCvuPc3eMrT30XI= Received: from skull.home.blih.net (lfbn-lyo-1-2174-135.w90-66.abo.wanadoo.fr [90.66.97.135]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 2bf5a6bd (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 29 Mar 2023 13:25:41 +0000 (UTC) Date: Wed, 29 Mar 2023 15:25:41 +0200 From: Emmanuel Vadot To: Konstantin Belousov Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 02904a06c76b - main - amd64: properly recalculate mitigations knobs after resume Message-Id: <20230329152541.18dca0bcd278e15436293a9d@bidouilliste.com> In-Reply-To: <20230329145638.18b68be35ea83cf5455db7bf@bidouilliste.com> References: <202303181540.32IFeR0r052611@gitrepo.freebsd.org> <20230329145638.18b68be35ea83cf5455db7bf@bidouilliste.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.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=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-3.46 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.96)[-0.960]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; R_SPF_ALLOW(-0.20)[+ip4:212.83.155.74/32:c]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; MLMMJ_DEST(0.00)[dev-commits-src-main@FreeBSD.org,dev-commits-src-all@FreeBSD.org]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[bidouilliste.com:+]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FREEFALL_USER(0.00)[manu]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4PmnP32T26z4HNk X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N On Wed, 29 Mar 2023 14:56:38 +0200 Emmanuel Vadot wrote: > > Hi kib, > > On Sat, 18 Mar 2023 15:40:27 GMT > Konstantin Belousov wrote: > > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=02904a06c76be857307b78184863654b9e7b88ab > > > > commit 02904a06c76be857307b78184863654b9e7b88ab > > Author: Konstantin Belousov > > AuthorDate: 2023-03-17 13:02:03 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2023-03-18 15:40:05 +0000 > > > > amd64: properly recalculate mitigations knobs after resume > > > > Revision r333125 AKA 986c4ca38772f72 forced clear cpu_stdext_feature3 > > on suspend, since at that time microcode update was not reloaded > > early on resume. Then, revision 050f5a8405c63 started re-reading > > cpu_stdext_feature3 again. Since modern CPUs do not require mitigations > > from the Skylake era, this went unnoticed for some time. > > > > Keep zeroing cpu_stdext_feature3 on suspend, but re-read it in more > > controlled way on resume after microcode is reloaded, and recalculate > > active workarounds based on actual microcode capabilities. > > > > Reported and tested by: romain > > Reviewed by: emaste, markj > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > Differential revision: https://reviews.freebsd.org/D39146 > > --- > > sys/amd64/acpica/acpi_wakeup.c | 14 ++++++++++++++ > > sys/amd64/amd64/initcpu.c | 2 +- > > 2 files changed, 15 insertions(+), 1 deletion(-) > > So this one actually break suspend/resume (likely resume judging by > the led) on my whiskeylake laptop (i7-8665U). It doesn't seems to > affect my machine with a i5-9400F cpu, nor my skylake machine with a > i7-6770HQ cpu. > Any hints ? > > Cheers, https://reviews.freebsd.org/D39302 fix the issue. -- Emmanuel Vadot From nobody Wed Mar 29 13:42: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 4PmnmJ3yQCz42ZVB; Wed, 29 Mar 2023 13:42:24 +0000 (UTC) (envelope-from corvink@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 4PmnmJ3RRcz4JRV; Wed, 29 Mar 2023 13:42:24 +0000 (UTC) (envelope-from corvink@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680097344; 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=PHB2Sg9d6AZRbRgJlZ8Cbkq15EW+z/azvoQJEUi5HEk=; b=M9itabS6GhsmQMXpXw0yoqjpAmr4qRiHJLyiLxSRWJRwFMotoqA3lwtFRZ9AJgnIhf2aSb MXfxBiI7w/fOCtsw5oRf8cPPUv15x5JdzRfi9or1Zk29JHApRptJCHySY2/8Io1RrXsfwC q+gKuBXhw3jL9oFLVinagzU3mbCcAEwZUZ52W9ZSFnX9K4K3hbMWaVKQDZcLuyjdB8xN7q MurNmkylKzndLxafzgpadlOxgfQvidoafRd8p7+TrOyZl0SBwVcIRHqMtQ6AWOOPjmH5cI pOBIGS27TUf9e1jvZKJ9o2ZNZ0zGqRJSNYALejP2jECmjwNgasb/czK2oxsOVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680097344; 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=PHB2Sg9d6AZRbRgJlZ8Cbkq15EW+z/azvoQJEUi5HEk=; b=PLQPw3IheCbPuv+J08fmN6naYwlpBt76DvU7uIbm/vl+8XRRgsn2e3I7qmv2R2eynZ8Ovt Ed6H7RWBeB2p0968eFCBdNX9872vqQplkK0r36pPp/bApiapBFUzD7u0dalRXZwf1BxGAw ML3r2ZIAb+nSL/HQE34tkjcF7yVivorMvQAo0UhGy02EnSiR7S+7i2GxrAbjTCijQCmkeD h+38F4mz1EAE5m14Trd1O7GEDPOaU5zxN8RaC/cRHX8YscgdqvOtRJxndVU25nP2CA3Nc8 laKxOssnWIuD3+Jimr2AL2z+JwV9HqNAMp0rU/dSZhcfT3XPcNl0CnwpF1x6xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680097344; a=rsa-sha256; cv=none; b=UwB4YxvolULkNXLst3mupmdRKKM2jMOFfELD29xS66msUohhxngBAMxSP46Bg9M3tjxmA1 NEYmBnmOSQK5fQQVP1hdxeg2GKu3h6dVNCnDHT5VNE/9n34fGZTz8VfQTyeJ3osC//ugFp qhmt1DFTfeOMqCojnlcPQ10aYjSRFuSUyl2yMhQX3dUWNLFD6gD38nuL7j0LUdxmQMB2OG 0lJqrRInjcTm3VT2TI6nKQ5fXS7p7xCaTxzZ/Xfbhbwbur2mHMwmbgL6tPrnZ5ZHk7wQWk qLIXVWsh6eD0eXq/nt7pS010ae7KAQ2PsP9VrpwfNEFbOPJQA+o74tHvWHmx4A== Received: from [IPv6:2001:9e8:da6e:3a00:eeb6:2c69:e8e0:7741] (unknown [IPv6:2001:9e8:da6e:3a00:eeb6:2c69:e8e0:7741]) (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: corvink) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PmnmH5bTcz17j1; Wed, 29 Mar 2023 13:42:23 +0000 (UTC) (envelope-from corvink@FreeBSD.org) Message-ID: <18d0b6ee177ba4d84f0f355c06707f494e99f640.camel@FreeBSD.org> Subject: Re: git: cff482380436 - main - bhyve: Move libcasper dependecy to lib9p From: Corvin =?ISO-8859-1?Q?K=F6hne?= To: Mark Johnston Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Date: Wed, 29 Mar 2023 15:42:21 +0200 In-Reply-To: <202303071613.327GDYuO057215@gitrepo.freebsd.org> References: <202303071613.327GDYuO057215@gitrepo.freebsd.org> Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-HBwsCK6gBwcTCG6lpwON" User-Agent: Evolution 3.46.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 X-ThisMailContainsUnwantedMimeParts: N --=-HBwsCK6gBwcTCG6lpwON Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2023-03-07 at 16:13 +0000, Mark Johnston wrote: > The branch main has been updated by markj: >=20 > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dcff4823804363cf199c7c87eed8870a= d014066cc >=20 > commit cff4823804363cf199c7c87eed8870ad014066cc > Author:=C2=A0=C2=A0=C2=A0=C2=A0 Vitaliy Gusev > AuthorDate: 2023-03-07 16:09:22 +0000 > Commit:=C2=A0=C2=A0=C2=A0=C2=A0 Mark Johnston > CommitDate: 2023-03-07 16:09:22 +0000 >=20 > =C2=A0=C2=A0=C2=A0 bhyve: Move libcasper dependecy to lib9p > =C2=A0=C2=A0=C2=A0=20 > =C2=A0=C2=A0=C2=A0 libcasper(3) is not used in bhyve. So move dependency = to the > appropriate > =C2=A0=C2=A0=C2=A0 place. > =C2=A0=C2=A0=C2=A0=20 > =C2=A0=C2=A0=C2=A0 Reviewed by:=C2=A0=C2=A0=C2=A0 markj > =C2=A0=C2=A0=C2=A0 MFC after:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 1 week > =C2=A0=C2=A0=C2=A0 Sponsored by:=C2=A0=C2=A0 vStack > =C2=A0=C2=A0=C2=A0 Differential Revision:=C2=A0 https://reviews.freebsd.o= rg/D38905 > --- > =C2=A0lib/lib9p/Makefile=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 5 +++-- > =C2=A0share/mk/src.libnames.mk | 4 ++++ > =C2=A0usr.sbin/bhyve/Makefile=C2=A0 | 8 -------- > =C2=A03 files changed, 7 insertions(+), 10 deletions(-) >=20 > diff --git a/lib/lib9p/Makefile b/lib/lib9p/Makefile > index c810ccd79e64..5d3681104d8c 100644 > --- a/lib/lib9p/Makefile > +++ b/lib/lib9p/Makefile > @@ -6,8 +6,11 @@ > =C2=A0CFLAGS+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0-I${.CURDIR} > =C2=A0CFLAGS+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0-I${.CURDIR}/..= /../contrib/lib9p > =C2=A0 > +LIBADD=3D=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=A0sbuf > + > =C2=A0.if ${MK_CASPER} !=3D "no" > =C2=A0CFLAGS+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0-DWITH_CASPER > +LIBADD+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0casper cap_pwd cap_g= rp > =C2=A0.endif > =C2=A0 > =C2=A0LIB=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A09p > @@ -28,6 +31,4 @@ SRCS=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0connection.c \ > =C2=A0INCSDIR=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0${INCLUDEDIR}/l= ib9p > =C2=A0INCS=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= fid.h lib9p.h backend/fs.h > =C2=A0 > -LIBADD=3D=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=A0sbuf > - > =C2=A0.include > diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk > index dd1bc78b1f1a..15971189306a 100644 > --- a/share/mk/src.libnames.mk > +++ b/share/mk/src.libnames.mk > @@ -271,6 +271,10 @@ > LIBVERIEXEC?=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0${LIBVERIEXECDIR}/libv= eriexec.a > =C2=A0# 2nd+ order consumers.=C2=A0 Auto-generating this would be better. > =C2=A0_DP_80211=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sbuf bsdxml > =C2=A0_DP_9p=3D=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=A0sbuf > +.if ${MK_CASPER} !=3D "no" > +_DP_9p+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0casper cap_pwd cap_g= rp > +.endif > + > =C2=A0# XXX: Not bootstrapped so uses host version on non-FreeBSD, so > don't use a > =C2=A0# FreeBSD-specific dependency list > =C2=A0.if ${.MAKE.OS} =3D=3D "FreeBSD" || !defined(BOOTSTRAPPING) > diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile > index bf0a17edc59e..1c679a3c1578 100644 > --- a/usr.sbin/bhyve/Makefile > +++ b/usr.sbin/bhyve/Makefile > @@ -89,14 +89,6 @@ SRCS+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0vmm_= instruction_emul.c > =C2=A0 > =C2=A0LIBADD=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0vmmapi md = nv pthread z util sbuf cam 9p > =C2=A0 > -.if ${MK_CASPER} !=3D "no" > -LIBADD+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0casper > -LIBADD+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0cap_pwd > -LIBADD+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0cap_grp > -# Temporary disable capsicum, until we integrate checkpoint code > with it. > -#CFLAGS+=3D-DWITH_CASPER > -.endif > - > =C2=A0.if ${MK_BHYVE_SNAPSHOT} !=3D "no" > =C2=A0LIBADD+=3D ucl xo > =C2=A0.endif Hi Mark, I do get build failures for my latest commits. The build log contains: /usr/local/bin/x86_64-unknown-freebsd13.1-ld: /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined reference to `cap_setpassent' /usr/local/bin/x86_64-unknown-freebsd13.1-ld: /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined reference to `cap_getgrgid_r' /usr/local/bin/x86_64-unknown-freebsd13.1-ld: /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined reference to `cap_setgroupent' /usr/local/bin/x86_64-unknown-freebsd13.1-ld: /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined reference to `cap_getpwnam' /usr/local/bin/x86_64-unknown-freebsd13.1-ld: /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined reference to `cap_getpwuid_r' collect2: error: ld returned 1 exit status See https://ci.FreeBSD.org/job/FreeBSD-main-amd64-gcc12_build/701/console It seems to be related to this commit. Any ideas how to fix it? --=20 Kind regards, Corvin --=-HBwsCK6gBwcTCG6lpwON Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgvRSla3m2t/H2U9G2FTaVjFeAmoFAmQkQD0ACgkQ2FTaVjFe AmrSRQ//fKt5cZ09ApET7esqdorRSh+TXV3In3TUdHqUmWagzUkS0Ei9I7C0m7iX pt3vYMZNYYHPbjllrra8ynACvrpDHQZaltstpFR2xP1hXs1SncYmq09CHes+EzIl 6giyHNuAPH4wfXhDGyGGiojZnqidwODLz0eoP/GpdtbvCWiK2GjBfc9kSo6bPE8A xkIzaoMCv+nKQEkSP/k3jXpDmSbVYHgZIaWTCszzTuHrxPBRhHmLv+ABO0mqbkGq QYRTieP7T3N1LVPQcba+u1ds1q6RQSvQaosfKA6KuBhKEmqYstNr3BxgbZdqC56t AFRiJ5lDBMSSZbhM4SUSXiZ2suKqW0xVbIta27H8OiQe9xpyR825HNnV9cFNJNcp 2lcsfZlbtSsAvqX4aopg4cec5mKx5y9AaiIubvmM3Io0qkbF4QcqJkgvy76dI68Y rYhC+jARmxqahH0BmgJf29vVOISOarZWsVX0bj8erMYCptA8MWLBVZHXo4TxLVIH wt1FiE4DrMt+LswU2Yf18LVvnxclIKL2h9gySA9STanKN51ejmLv4W4Ap6FDyAgO MLbQKwDcPtvDAvViHSRLLjXE9XCQmX+Br4vxkNYqw1ONtPauRpFdKma5H1B1mJ0m SxGaiCvhTxVXa9ABSa5Dhmla63ZgmHkX0w/ZQvYLVPQVRp+YjYU= =y9td -----END PGP SIGNATURE----- --=-HBwsCK6gBwcTCG6lpwON-- From nobody Wed Mar 29 13:52: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 4Pmp0M65J8z42b4W; Wed, 29 Mar 2023 13:52:51 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 4Pmp0M4N57z4Kyr; Wed, 29 Mar 2023 13:52:51 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-il1-x12b.google.com with SMTP id h11so8122591ild.11; Wed, 29 Mar 2023 06:52:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680097970; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=zfvYxev3GCh3RpStEod3wZtvwyEunBn/adYxI9iwgas=; b=TMKNEvPhGiZEX5izKmxoDVRW+62Id55smUMGf/Dw/j++Vj2h5SaSP8CwWuD8uuC3u4 9UkOndA0mSnMa9TlASQpQBShjz8KxJpwAxPkkEGHtmx7vkbPeWqMOkEJ/dl6Crx2vg09 qTaET6ymg4ltknno/nkQjI0eURRdESPFMGYg3D3ttyqarBwZx2Sjwy+9PWyz5nm1FUyP gDilS8dTNhOQ/KI3eyxdCorOIoiGkPRklS80WGBIUQJAzDZAilM112j99tbhzmiCpGnl nHawAJ95NKL48dNLCFZLzfWbbRQHEzTtG13Zap3yr3taV82T7PkZPoGAqcyvrYmTnN2z KUaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680097970; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zfvYxev3GCh3RpStEod3wZtvwyEunBn/adYxI9iwgas=; b=F//GghhXW9+a+a1NeJI09hGjpBkveaKbmPo0v5urOI+O33o7CNF2zv4rhDnePHJWKD F92VaA0AAmuflSSAPNkJCd52vsiiVwPrhHobOGFyK69WYqOPT/VAd14pJdmaxfL3IJdz C/pROCZJg2bl+JPkKQr9raC2bmCCpD0J6Jbl7i2o0HfBGLyhspckutQuU9LJMUdHthG+ LqMvIo4ylFfQ08etw2mF1C9cNXvXHFRPB7zaZRjZkkE3TIxMJ8mgDqLDFIGmPtSDcT46 yWf5BHT0qNdkglPMw+ossMC0eniZAkIy6w8ACgctSmYsgjwWCOTZFm+dfBFCwtUiIFEe J1VA== X-Gm-Message-State: AAQBX9diOQ0KryP+3PRcQ0yJjEyaYEHYwDRQfptZrkza+TFxE/UBZ+Ve LT+88TG0LYw19G6hZdIGMCxgYBNbL4w= X-Google-Smtp-Source: AKy350bkbCi3V3Sa0qHkszmy62kWyzNpjCEXMYayXdq5Tg/lUtJqgUv/hlkq+QhRg0zMjKY6broHCw== X-Received: by 2002:a92:c104:0:b0:325:b60b:e309 with SMTP id p4-20020a92c104000000b00325b60be309mr14032418ile.4.1680097969799; Wed, 29 Mar 2023 06:52:49 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id q10-20020a056e020c2a00b00316e54a8287sm9408397ilg.14.2023.03.29.06.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 06:52:49 -0700 (PDT) Date: Wed, 29 Mar 2023 09:52:46 -0400 From: Mark Johnston To: Corvin =?iso-8859-1?Q?K=F6hne?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cff482380436 - main - bhyve: Move libcasper dependecy to lib9p Message-ID: References: <202303071613.327GDYuO057215@gitrepo.freebsd.org> <18d0b6ee177ba4d84f0f355c06707f494e99f640.camel@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: <18d0b6ee177ba4d84f0f355c06707f494e99f640.camel@FreeBSD.org> X-Rspamd-Queue-Id: 4Pmp0M4N57z4Kyr X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Wed, Mar 29, 2023 at 03:42:21PM +0200, Corvin Köhne wrote: > On Tue, 2023-03-07 at 16:13 +0000, Mark Johnston wrote: > > The branch main has been updated by markj: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=cff4823804363cf199c7c87eed8870ad014066cc > > > > commit cff4823804363cf199c7c87eed8870ad014066cc > > Author:     Vitaliy Gusev > > AuthorDate: 2023-03-07 16:09:22 +0000 > > Commit:     Mark Johnston > > CommitDate: 2023-03-07 16:09:22 +0000 > > > >     bhyve: Move libcasper dependecy to lib9p > >     > >     libcasper(3) is not used in bhyve. So move dependency to the > > appropriate > >     place. > >     > >     Reviewed by:    markj > >     MFC after:      1 week > >     Sponsored by:   vStack > >     Differential Revision:  https://reviews.freebsd.org/D38905 > > --- > >  lib/lib9p/Makefile       | 5 +++-- > >  share/mk/src.libnames.mk | 4 ++++ > >  usr.sbin/bhyve/Makefile  | 8 -------- > >  3 files changed, 7 insertions(+), 10 deletions(-) > > [...] > > Hi Mark, > > I do get build failures for my latest commits. The build log contains: > > /usr/local/bin/x86_64-unknown-freebsd13.1-ld: > /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined > reference to `cap_setpassent' > /usr/local/bin/x86_64-unknown-freebsd13.1-ld: > /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined > reference to `cap_getgrgid_r' > /usr/local/bin/x86_64-unknown-freebsd13.1-ld: > /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined > reference to `cap_setgroupent' > /usr/local/bin/x86_64-unknown-freebsd13.1-ld: > /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined > reference to `cap_getpwnam' > /usr/local/bin/x86_64-unknown-freebsd13.1-ld: > /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined > reference to `cap_getpwuid_r' > collect2: error: ld returned 1 exit status > > See > https://ci.FreeBSD.org/job/FreeBSD-main-amd64-gcc12_build/701/console > > It seems to be related to this commit. Any ideas how to fix it? John dug into this already and posted a series of different solutions: https://reviews.freebsd.org/D39213 https://reviews.freebsd.org/D39222 https://reviews.freebsd.org/D39245 The last one is probably the one that will end up being committed. In the meantime, the easiest workaround is probably to simply revert my commit. From nobody Wed Mar 29 14:41: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 4Pmq511W8Zz42djm; Wed, 29 Mar 2023 14:41: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 4Pmq510yz3z4P36; Wed, 29 Mar 2023 14:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680100917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ChHXnqIi/57RCX0le5II65BLDqAFT/Fkiv7Ep2ZI9Ps=; b=Y0gl/O+XdswDo2kv1jCjBMOgZtzW/OlJq0v/o/cTLhYqLi+9p1WkZvJIF2JFa15M610yW4 DKsO4Fo+hmC4G1NWhkq7xKVqUGMJoQlBoe6Eo7yLBKWkBFFa+JYnSbACNVVwYtGYwCp48U HKAU/83JUOQu64eePXfxjL04RJSNe4hJkFARGcZ3dGqxZr28uf6tvesNATBrO0I/HwfiK/ FtAdfQ/8KsUaREk+68tIqGKpMRQ460XEvpFrcc++LtoiBezxpmDE2teeBqhVUusCr+JYkH kmmeMfhLf9XddPI9BsdYVXuEwbPVESdjvCkF8joXetzctGiZ59pDslsDeHnc1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680100917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ChHXnqIi/57RCX0le5II65BLDqAFT/Fkiv7Ep2ZI9Ps=; b=YzDb4X/esglLZ/NvHNdsnn1n2d01kkrSmDyMKSZXFnzLS9Dp7H7mopSPlqgz9SOSkmw39J i5BfjIE80leHgsgqU3XHpK4QYlGR2KtPMMylsBEtzwm+VV21r/nEQzrV52TZS9ytvdPZuc UCjOpn2MhcxEwul4qSbAQfzz0V52PZCK5lGNV4sxjCRPfHvfSCOqouJCBxY2fm6WYk0HEL cl4EyTrHkDjZkyJFtTJftsTK0cz/azAt+viq5bYURrFzzH5BX5wB6Dvq4wpD3aD60Zh/lf Ltsxphx6FOyAl+trzdaOHoDnChyxwbsBRwP6aIlfUsM1f62N/UXPZ68uLVspUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680100917; a=rsa-sha256; cv=none; b=SeHKSk69xhwz5Tx10e6CyaqNXXP5bpzNBK0yK/aijrgoOr0IeFQek7fwZuqMPGSGiBUoBx iE2BDunKGv+T3xiWUf46ZkPGh4xC0AEmnEuTKEA9TLjl5c7JfS5hIo0hH0N9GtXjaBlHdR Zayt9UHisKM8LsEtRpxMyN9a5ChEnoEA0S3N94hNC5M+f4tx6cFsne4VoKeJ7L9UXfNbCK i29rNOUQ08uUgWR2mBY+wCxt/UD1SY61wHOvwAl+GThvhdWed6j7/4Ah6dpDAGnp9/sbi/ a4Fkws1nZRoqXyMJgh0tpiZKJp1nPwEP+O6ZD2RFoWF+LBKuwM3uY+12ToShnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmq5102hRzYws; Wed, 29 Mar 2023 14:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TEfuh2023884; Wed, 29 Mar 2023 14:41:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TEfuOD023883; Wed, 29 Mar 2023 14:41:56 GMT (envelope-from git) Date: Wed, 29 Mar 2023 14:41:56 GMT Message-Id: <202303291441.32TEfuOD023883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6ebf11e77cf5 - stable/13 - path_test: Add a test case for openat(O_EMPTY_PATH) in capability mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6ebf11e77cf5490caed1fd629586db3def0db030 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6ebf11e77cf5490caed1fd629586db3def0db030 commit 6ebf11e77cf5490caed1fd629586db3def0db030 Author: Mark Johnston AuthorDate: 2023-03-22 12:51:58 +0000 Commit: Mark Johnston CommitDate: 2023-03-29 14:41:47 +0000 path_test: Add a test case for openat(O_EMPTY_PATH) in capability mode MFC after: 1 week (cherry picked from commit e5e1d9c7b781470b2eb31d80f40927481e0053b8) --- tests/sys/file/path_test.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/tests/sys/file/path_test.c b/tests/sys/file/path_test.c index a212325c7db6..130acababb21 100644 --- a/tests/sys/file/path_test.c +++ b/tests/sys/file/path_test.c @@ -208,6 +208,80 @@ ATF_TC_BODY(path_capsicum, tc) waitchild(child, 4); } +/* + * Check that a pathfd can be converted to a regular fd using openat() in + * capability mode, but that rights on the pathfd are respected. + */ +ATF_TC_WITHOUT_HEAD(path_capsicum_empty); +ATF_TC_BODY(path_capsicum_empty, tc) +{ + char path[PATH_MAX]; + cap_rights_t rights; + int dfd, fd, pathfd, pathdfd; + + mktfile(path, "path_capsicum.XXXXXX"); + + pathdfd = open(".", O_PATH); + ATF_REQUIRE_MSG(pathdfd >= 0, FMT_ERR("open")); + pathfd = open(path, O_PATH); + ATF_REQUIRE_MSG(pathfd >= 0, FMT_ERR("open")); + + ATF_REQUIRE(cap_enter() == 0); + + dfd = openat(pathdfd, "", O_DIRECTORY | O_EMPTY_PATH); + ATF_REQUIRE(dfd >= 0); + CHECKED_CLOSE(dfd); + + /* + * CAP_READ and CAP_LOOKUP should be sufficient to open a directory. + */ + cap_rights_init(&rights, CAP_READ | CAP_LOOKUP); + ATF_REQUIRE(cap_rights_limit(pathdfd, &rights) == 0); + dfd = openat(pathdfd, "", O_DIRECTORY | O_EMPTY_PATH); + ATF_REQUIRE(dfd >= 0); + CHECKED_CLOSE(dfd); + + /* + * ... CAP_READ on its own is not. + */ + cap_rights_init(&rights, CAP_READ); + ATF_REQUIRE(cap_rights_limit(pathdfd, &rights) == 0); + dfd = openat(pathdfd, "", O_DIRECTORY | O_EMPTY_PATH); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, dfd == -1); + + /* + * Now try with a regular file. + */ + fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH); + ATF_REQUIRE(fd >= 0); + CHECKED_CLOSE(fd); + + cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); + fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH | O_APPEND); + ATF_REQUIRE(fd >= 0); + CHECKED_CLOSE(fd); + + /* + * CAP_SEEK is needed to open a file for writing without O_APPEND. + */ + cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); + fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, fd == -1); + + /* + * CAP_LOOKUP isn't sufficient to open a file for reading. + */ + cap_rights_init(&rights, CAP_LOOKUP); + ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); + fd = openat(pathfd, "", O_RDONLY | O_EMPTY_PATH); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, fd == -1); + + CHECKED_CLOSE(pathfd); + CHECKED_CLOSE(pathdfd); +} + /* Make sure that ptrace(PT_COREDUMP) cannot be used to write to a path fd. */ ATF_TC_WITHOUT_HEAD(path_coredump); ATF_TC_BODY(path_coredump, tc) @@ -937,6 +1011,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, path_access); ATF_TP_ADD_TC(tp, path_aio); ATF_TP_ADD_TC(tp, path_capsicum); + ATF_TP_ADD_TC(tp, path_capsicum_empty); ATF_TP_ADD_TC(tp, path_coredump); ATF_TP_ADD_TC(tp, path_directory); ATF_TP_ADD_TC(tp, path_directory_not_root); From nobody Wed Mar 29 14: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 4PmqCD6Bmlz42fF8 for ; Wed, 29 Mar 2023 14: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 4PmqCD5c79z4PPQ; Wed, 29 Mar 2023 14: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=1680101240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUUYfH5VUC4+6VOBmIQXEZD3APb8VuWF3zOOq+kHa70=; b=KgEIbyyH2eRNApt1IqEszZoLjNjAmlx3RZ8YaFGuOyTS2rZuszR9ZTDbFMB4JAQkYeEamL QUO2ZaeUYgm4JSQAwI7FL8UcnCrXiLzhE8wUcikjKTDSKd92KOOeqafrHEIEL5wEyrTcjn GEZPIabYZkvXlQhXOex9chVL0elFLmR7vhdNtJCtQFuCOHbUv+BczmsRiO94fnNnfqKAK7 H3dgxn7wUMZ3jDKdTiif0hHKdxqVDYjOOxR1FxDcbbwNLFPr4/kA8Mjes91cwcnBVLsaDF aGr13P16EHjALT5nHBWNygXnej9JdpegSMWlE1reJ2n7PI4ug/uGuSd9lbt8Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680101240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUUYfH5VUC4+6VOBmIQXEZD3APb8VuWF3zOOq+kHa70=; b=hcCO6vVUIwEbYQCXauNdC/uyYmZBKCEOx7B5Bp0K67/qB8ks9SHZeUT6doMyWsRfKYZ3FM f8hkTW9GnwM7Q3VUXp9xgWrM8sS3PEETjZTQPq77J/D8YmR7D2Ae6f3Cdbyc5k3BOHh7sK 7U+GRebeeI8GUNfWphj9IvsEneWSHeVTJYYTVDnSI2ilL2lReJaj84YT7SGztXj+GHkaab k89NOFIoXD//15jCa6TkvSFeYTMk//I1pjUHTJVlTz9AiptI4wi94Zqp6b+mdtUy33S/JW kDiTF7qPpZ/UWe2BEZqNNkH8gEDxQmlrHkxDGdzMl9lo+ELh66qJMtQqIqLq2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680101240; a=rsa-sha256; cv=none; b=kDVR8BZ63TPXCT+3BOUE4OAdrq0zL5GkjxkRIM+6rzkNjPzdDzABKySPS8Nj770UxnOXzV ZXJ7v81o7d5oeIPAuPeJ9ENKxniXlXRve/0MLdFSU1Lie5UFehe6Fanjn1FC4x+F9L6RjB rgTzIKZByVSDJXaK8on8vtGy8CU5GreATPAddZH1OCJG2ydWnkWcRpQyhWQC2xp5H9U6Lv uGG6HN5KqnVsGzYQnjoD2uK6yuGmC6amf2CZvmr/XeeUaaYAr7uQkP1cwetkW4X9eqT+DG qechxQQEyCSnKb/rWJWwdbgOYDZFbBJ4ZPFign+U5Q+Hyk1+36M+oywtJmBcPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmqCD4g5gzYx2; Wed, 29 Mar 2023 14:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TElKSu026687; Wed, 29 Mar 2023 14:47:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TElKqO026685; Wed, 29 Mar 2023 14:47:20 GMT (envelope-from git) Date: Wed, 29 Mar 2023 14:47:20 GMT Message-Id: <202303291447.32TElKqO026685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: a05263b7aa2a..431083f75bdd - vendor/openzfs/master - 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: 431083f75bdd3efaee992bdd672625ec7240d252 X-Git-Oldrev: a05263b7aa2ae38b50a159b3d2b22f3a454178ab X-Git-Newrev: 431083f75bdd3efaee992bdd672625ec7240d252 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=a05263b7aa2a..431083f75bdd ae0b1f66c707 linux 6.3 compat: add another bdev_io_acct case aebd94cc8541 config: don't link libudev on FreeBSD a604d3243b0f Revert "Do not hold spa_config in ZIL while blocked on IO" 64bfa6bae3dd Additional limits on hole reporting 65d10bd87c40 Fix short-lived txg caused by autotrim 431083f75bdd Fixes in persistent error log From nobody Wed Mar 29 15:36: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 4PmrJL5kc4z42jVf; Wed, 29 Mar 2023 15:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PmrJL5F40z4TYs; Wed, 29 Mar 2023 15:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680104210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yzYPJUm6FcRpV8DVaifBgcst5Bq3TQOHfK+A6Vrkedc=; b=EZgk+zDdeROUJe9PuNf7nXlWvQbW8Yt1WpHCcRKoko5djSOJfrFSrtkF2ez9wBJwK0AA17 hiZbPkWjAlhkuNfKwoldqekutqONEx0fuoQ7GXRsP0cZEgYpX+ECKD0ewkCJ8pdPFBfflt 28zPWH4mtvr06GjaEeV1Y7463JE37NMk5dGbztKJLu70xri6w9PfaIPawrlE5ir1yL3jBF UAsEgXlBEXTJggDBkSttgMUsa/+5ahgpdtegSn86TbQLkt21A4qhA+zfGtWDEw69KMBO9p Cg3ym2VNES/OygdI3EqRULuhgNJFyfKe7aaNBLUVu1m+XEKmqEZgZx5U0G0QZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680104210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yzYPJUm6FcRpV8DVaifBgcst5Bq3TQOHfK+A6Vrkedc=; b=gfWEHY4btTPvyfnj9NaZe+3Lam/mIj/1VnhLSxddCnsYTJAedjqwmI4U5TYYJpGiUW0/w8 rKU/QMohTYI2qOCOcVC/jMQtNnuWOq7vpCZ/NU5IJ52V2bPnzvKx3t9B/3TP/jKL61C5St Yu5IMHFkVd5ARTA2POhvhoVAmGzVetCjwD4ZTFolAUxQKRd6SvmPAT9a2CfCBRUeMfshPJ yWlWXVt8kXyZMrzG1gbGO4fbdVGYQ+r6OCfGNehPXTf+Y4s5LT9lS89BL7e25Lvuqi8NWX ZhPkpf1nSTucoHv/HrwjMJVcpkioqfOJffT8Ro88K+uCH4nomwE2jKgZolg32Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680104210; a=rsa-sha256; cv=none; b=mMhMRiOdHrNPLHY09CIka+qRHPM4TYWDnc9SOGO47/ZvhWfFoYpUtOltJN2eKoPoduO5zn YIvFa2P8aJnm0qd1h888X2a2EICK+VbqT7bgAWUs4tZxD3zDOc3d2cReWbZXgsis95QPiZ xhH9S2jBgbYekN5q7VhCmKcbgEqehECmpc7Y4CEDybbBHNy9ToVlrWGgCTFtkkU29TqEex fRgHGst5YblpyErr8py2youP7/c59p63ESlHqwvKAFXqiiWlFy0cdnDnekHosu5BmYcDZU Nk1p4p7DMbZ4U+rbLmGxgppOrTOMV+LhrkVCmmvB8S/Et1vh/XAYOA07YSkGFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmrJL4JH5zbq8; Wed, 29 Mar 2023 15:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TFaoSA008728; Wed, 29 Mar 2023 15:36:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TFaoGa008727; Wed, 29 Mar 2023 15:36:50 GMT (envelope-from git) Date: Wed, 29 Mar 2023 15:36:50 GMT Message-Id: <202303291536.32TFaoGa008727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: bdb824317b45 - main - pf.conf.5: typo fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bdb824317b45ec731d6a23a6b692845ae67e5187 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=bdb824317b45ec731d6a23a6b692845ae67e5187 commit bdb824317b45ec731d6a23a6b692845ae67e5187 Author: Maxim Konovalov AuthorDate: 2023-03-29 15:34:26 +0000 Commit: Maxim Konovalov CommitDate: 2023-03-29 15:34:26 +0000 pf.conf.5: typo fixes PR: 270501 (partially) --- share/man/man5/pf.conf.5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 2edce7f947eb..ca7c64d1cf83 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -670,7 +670,7 @@ The last matching rule decides what action is taken. If no rule matches the packet, the default action is to pass the packet. .Pp -The folliwing actions can be used in the filter: +The following actions can be used in the filter: .Bl -tag -width xxxx .It Ar block The packet is blocked. @@ -712,7 +712,7 @@ keyword in .Xr ifconfig 8 . .It Ar bridge-to Aq interface Packets matching this rule will be sent out of the specified interface without -futher processing. +further processing. .It Ar proto Aq Ar protocol This rule applies only to packets of this protocol. Note that Ethernet protocol numbers are different from those used in @@ -1418,7 +1418,7 @@ and , the last matching rule decides what action is taken. For .Ar match -, rules are evaulated every time they match; the pass/block state of a packet +, rules are evaluated every time they match; the pass/block state of a packet remains unchanged. If no rule matches the packet, the default action is to pass the packet. From nobody Wed Mar 29 16:32: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 4PmsXk4wkHz42mLg; Wed, 29 Mar 2023 16:32: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 4PmsXk4QRMz4XrF; Wed, 29 Mar 2023 16:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680107558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qba2dn+EZulUhU8ZhUX2BSfHXq1+2yr2Aj/+LLWNATM=; b=oTiXsP6OApXSeWBKU9doTkzy6INthsIkb386g7zhoGadFdiQnkC1SJ3tJzlDlrwsC/Bc5G ECpOlqw8pmGXLxGk0qfgInfJTE7F/G5mJFYJqdmHz7Z0rHctdWupWFcDeG1mnUGxudY06x KP5nw1fiTfcXXo13rScyIBgERCpWWJj4M/N0yPArSl4/3WDl+6NozDwZuuAHkNTMjCmNP2 8biJma+EOVez8KIbm54Oueq01j3iICvFTq/PuuJNE4anZW0s0sfsl/2sLq+0s/QpXfgBXw q6ystJQMe8KtkVDqKIHCkNjpv/sMxZfcIWfLEf3VaKmk32a9cPQKAt+GL6tRaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680107558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qba2dn+EZulUhU8ZhUX2BSfHXq1+2yr2Aj/+LLWNATM=; b=lFbDVjXDV2VNXjAXCOqd8A5V7hnasgc0a2fOfjcRAzafvQSgE3SSB67AgbW4lC6ciMxx5b wCo7I8LARhq7s1/khZRR1N3JIntbVVlBXKSPG5VNMVsYDPN3dz2opNuFtUzq0F1AFuUc/G kMiIazB1QIjwWfnWjB5IBSsPb73VXXPON5sczAhu4+ugJU41PdbuxL4jqAy0Ipu4KqQoVz +JhRYNsUP0OwcloLkmYUICAiPMO272voTx5aU8WqF0naqXuSuv5LNScHYWqLkdsai40+Qt RfJFEuYzJW9eWNt51jszHaZq7s58p/azPMyo9K5ZN7vzzLP2RxiawgiSko6xGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680107558; a=rsa-sha256; cv=none; b=AHhYoLBU3KT85oUCxRb9Z+tTu2wkXAtbvW2aeixjunepminRRpor6nS3nXnVrJvOFqWxYX e7jlhICps44MLRbbHKeGizbYggdNnKG3eajkbGFBbt2HijyZSFDenVc6CpNUqZ/rRoT9v4 cu0O7as3XnecTvqeoA0xjgMnlgS/xSI/L2WIsnsLC0C0p6NYeMBMYF+PA1NxItq1KC8tdR Z0p+y5M3OsjWENmZeZowZqoh3gr/kQK4xnEKee5wXw1NnhylF11b/80yvCI/D0ZIkrSnzI gsEN/lepjGjlf4jd0Zu5rhvJAgiF1/YhG7cnDBfhFM3yoZTq+d9v1yRwokYNhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmsXk3RLnzdJC; Wed, 29 Mar 2023 16:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TGWcVI006673; Wed, 29 Mar 2023 16:32:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TGWcuG006672; Wed, 29 Mar 2023 16:32:38 GMT (envelope-from git) Date: Wed, 29 Mar 2023 16:32:38 GMT Message-Id: <202303291632.32TGWcuG006672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: fcac5719a183 - main - lagg(4): Make lagg_list and lagg_detach_cookie static List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcac5719a1833ad865ac0a7960ff18319a40dfff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fcac5719a1833ad865ac0a7960ff18319a40dfff commit fcac5719a1833ad865ac0a7960ff18319a40dfff Author: Zhenlei Huang AuthorDate: 2023-03-29 16:13:02 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-29 16:14:44 +0000 lagg(4): Make lagg_list and lagg_detach_cookie static They are used internally only. No functional change intended. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39250 --- sys/net/if_lagg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 27ebed8e135a..42c194233a89 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -103,7 +103,7 @@ struct lagg_snd_tag { struct m_snd_tag *tag; }; -VNET_DEFINE(SLIST_HEAD(__trhead, lagg_softc), lagg_list); /* list of laggs */ +VNET_DEFINE_STATIC(SLIST_HEAD(__trhead, lagg_softc), lagg_list); /* list of laggs */ #define V_lagg_list VNET(lagg_list) VNET_DEFINE_STATIC(struct mtx, lagg_list_mtx); #define V_lagg_list_mtx VNET(lagg_list_mtx) @@ -112,7 +112,7 @@ VNET_DEFINE_STATIC(struct mtx, lagg_list_mtx); #define LAGG_LIST_LOCK_DESTROY(x) mtx_destroy(&V_lagg_list_mtx) #define LAGG_LIST_LOCK(x) mtx_lock(&V_lagg_list_mtx) #define LAGG_LIST_UNLOCK(x) mtx_unlock(&V_lagg_list_mtx) -eventhandler_tag lagg_detach_cookie = NULL; +static eventhandler_tag lagg_detach_cookie = NULL; static int lagg_clone_create(struct if_clone *, char *, size_t, struct ifc_data *, struct ifnet **); From nobody Wed Mar 29 16:32: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 4PmsXl68HSz42mPN; Wed, 29 Mar 2023 16:32: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 4PmsXl5VJPz4Y8K; Wed, 29 Mar 2023 16:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680107559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XW58yMpiE9cWNWLlvI1dYj39F7KybQAdZnltzNn8xsE=; b=E/ZnrICc3pJUvF9biMerzECyqZ1hWOELqr94EnaxiCRp9xDMGxoHSWKbc/JRutwWk9RqDY uPCyC9oGLvRBNkS3gtxEE55du9Udva2bbr2j7ZKsj77T8PAv6W0eLH+SCeX77Xl8nlE+SU u92RVTiMRaLTvjusvVZo9TgMB0duGqKQHOmrojI6Oy+pL9kzOyO9wzmleWQyEILYNHAVMN X6ILeAGZKMElopqeLB+5JI/xFJZY9fBUUd0idggVmL7j8zdrYE5MFTXncxnNIKSDpEkKPa y+HAeIS9fdN1cR4J/dMWp1JFglPEIhzvM2zGNMkSRymTK1O5bMBKAYW5Iuzy8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680107559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XW58yMpiE9cWNWLlvI1dYj39F7KybQAdZnltzNn8xsE=; b=wOLbA3hbYGApvKJiu7LthUOXivdT2r+ABBavg70A0Ko5rg+6dQcmGk6oQYHL3sQFACfN1D fNMAY0Dn/ZQ5eUqXBlcWT5XSfDBwE5F5pmF/mHNPHWzNq9q3wiiG4nkpVjQm4wrMZcvYsC s0u3hYwgMdu3cHNePcd1k1wXGtgIo8nMewa90VRYKeCmUMtnRRQf5/UleI2KFTFl3nxewL +1A9OVSvLeIQIMMPEaZ0WUKz6pc7cB265kwL7T1IFkTHJS2M4CLvuLdDVikMydhuv3TIsc zZ+FVQO2xes9zjAWeItB2hN/J48lRByANdKIMGXv99gTXI7RHqnuV25kkUWtcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680107559; a=rsa-sha256; cv=none; b=htKDUEeOdyS7E7lnh4Sdh5GOJfE/qejpjxG/yyDZNJ7+yRXSPUc7t+cgyzExUH9MsZwN8k 4xnO0FwNst55KXZuyK2TU4nrsA7lSHehyGtFLGo7ei2ostpKfNHRbq6XVdouBOEN53GH8S MAk5hystuQLtCGsXl9mrt+KDSJ858mccLCQwSDFQFHHasynr+bTsonCAE30iVc9w3/rbvb AtkzuV9F6qrRO4MFr1M3xw3ky5y2uKqFa+gyFGQfrTNc9VCwJ+UUV8tEx98jn8oPHn6dwF S2In1wmT4pH9Q5H23iRO0k8Wcdiaqt0UInwJ6jmgknLyGLpAmwBrcZoO8LSyZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmsXl4VZTzcpw; Wed, 29 Mar 2023 16:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TGWdhG006692; Wed, 29 Mar 2023 16:32:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TGWdmJ006691; Wed, 29 Mar 2023 16:32:39 GMT (envelope-from git) Date: Wed, 29 Mar 2023 16:32:39 GMT Message-Id: <202303291632.32TGWdmJ006691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: dbe86dd5de18 - main - lagg(4): Refactor out some lagg protocol input routines into a default one List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbe86dd5de18fdf61e1300f6575e0f50785bf6b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=dbe86dd5de18fdf61e1300f6575e0f50785bf6b3 commit dbe86dd5de18fdf61e1300f6575e0f50785bf6b3 Author: Zhenlei Huang AuthorDate: 2023-03-29 16:16:21 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-29 16:22:13 +0000 lagg(4): Refactor out some lagg protocol input routines into a default one Those input routines are identical. Also inline two fast paths. No functional change intended. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39251 --- sys/net/if_lagg.c | 64 ++++++++++++++++++------------------------------------- 1 file changed, 21 insertions(+), 43 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 42c194233a89..7acfa524670c 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -171,8 +171,6 @@ static struct lagg_port *lagg_link_active(struct lagg_softc *, /* Simple round robin */ static void lagg_rr_attach(struct lagg_softc *); static int lagg_rr_start(struct lagg_softc *, struct mbuf *); -static struct mbuf *lagg_rr_input(struct lagg_softc *, struct lagg_port *, - struct mbuf *); /* Active failover */ static int lagg_fail_start(struct lagg_softc *, struct mbuf *); @@ -185,14 +183,10 @@ static void lagg_lb_detach(struct lagg_softc *); static int lagg_lb_port_create(struct lagg_port *); static void lagg_lb_port_destroy(struct lagg_port *); static int lagg_lb_start(struct lagg_softc *, struct mbuf *); -static struct mbuf *lagg_lb_input(struct lagg_softc *, struct lagg_port *, - struct mbuf *); static int lagg_lb_porttable(struct lagg_softc *, struct lagg_port *); /* Broadcast */ static int lagg_bcast_start(struct lagg_softc *, struct mbuf *); -static struct mbuf *lagg_bcast_input(struct lagg_softc *, struct lagg_port *, - struct mbuf *); /* 802.3ad LACP */ static void lagg_lacp_attach(struct lagg_softc *); @@ -202,6 +196,10 @@ static struct mbuf *lagg_lacp_input(struct lagg_softc *, struct lagg_port *, struct mbuf *); static void lagg_lacp_lladdr(struct lagg_softc *); +/* Default input */ +static struct mbuf *lagg_default_input(struct lagg_softc *, struct lagg_port *, + struct mbuf *); + /* lagg protocol table */ static const struct lagg_proto { lagg_proto pr_num; @@ -226,7 +224,7 @@ static const struct lagg_proto { .pr_num = LAGG_PROTO_ROUNDROBIN, .pr_attach = lagg_rr_attach, .pr_start = lagg_rr_start, - .pr_input = lagg_rr_input, + .pr_input = lagg_default_input, }, { .pr_num = LAGG_PROTO_FAILOVER, @@ -238,7 +236,7 @@ static const struct lagg_proto { .pr_attach = lagg_lb_attach, .pr_detach = lagg_lb_detach, .pr_start = lagg_lb_start, - .pr_input = lagg_lb_input, + .pr_input = lagg_default_input, .pr_addport = lagg_lb_port_create, .pr_delport = lagg_lb_port_destroy, }, @@ -260,7 +258,7 @@ static const struct lagg_proto { { .pr_num = LAGG_PROTO_BROADCAST, .pr_start = lagg_bcast_start, - .pr_input = lagg_bcast_input, + .pr_input = lagg_default_input, }, }; @@ -387,14 +385,14 @@ lagg_proto_detach(struct lagg_softc *sc) lagg_protos[pr].pr_detach(sc); } -static int +static inline int lagg_proto_start(struct lagg_softc *sc, struct mbuf *m) { return (lagg_protos[sc->sc_proto].pr_start(sc, m)); } -static struct mbuf * +static inline struct mbuf * lagg_proto_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) { @@ -2427,17 +2425,6 @@ lagg_rr_start(struct lagg_softc *sc, struct mbuf *m) return (lagg_enqueue(lp->lp_ifp, m)); } -static struct mbuf * -lagg_rr_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) -{ - struct ifnet *ifp = sc->sc_ifp; - - /* Just pass in the packet to our lagg device */ - m->m_pkthdr.rcvif = ifp; - - return (m); -} - /* * Broadcast mode */ @@ -2485,16 +2472,6 @@ lagg_bcast_start(struct lagg_softc *sc, struct mbuf *m) return (ret); } -static struct mbuf* -lagg_bcast_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) -{ - struct ifnet *ifp = sc->sc_ifp; - - /* Just pass in the packet to our lagg device */ - m->m_pkthdr.rcvif = ifp; - return (m); -} - /* * Active failover */ @@ -2638,17 +2615,6 @@ lagg_lb_start(struct lagg_softc *sc, struct mbuf *m) return (lagg_enqueue(lp->lp_ifp, m)); } -static struct mbuf * -lagg_lb_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) -{ - struct ifnet *ifp = sc->sc_ifp; - - /* Just pass in the packet to our lagg device */ - m->m_pkthdr.rcvif = ifp; - - return (m); -} - /* * 802.3ad LACP */ @@ -2740,3 +2706,15 @@ lagg_lacp_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) m->m_pkthdr.rcvif = ifp; return (m); } + +/* Default input */ +static struct mbuf * +lagg_default_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) +{ + struct ifnet *ifp = sc->sc_ifp; + + /* Just pass in the packet to our lagg device */ + m->m_pkthdr.rcvif = ifp; + + return (m); +} From nobody Wed Mar 29 16:32: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 4PmsXm6DNpz42mDD; Wed, 29 Mar 2023 16:32: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 4PmsXm5j1Dz4YHp; Wed, 29 Mar 2023 16:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680107560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QpEMgtzRkjD6gnYGN8hY6I9wGqOvCkvW6rTmylocSac=; b=j7k2xiLTYQAU2zxAOmH6LLWSbKUsDoDy/W/Twi0xRYPX6DYwwvgBceNHEUaefEbh7PsVcT NQ4YoVN0PmQ4Iu55BLIwFOOtGvFQB8Ckdaz6SXypowYuQ6oeertBUvvGbuLzSGc6lyEQNr R+QXYkZmlsXgFMx2Ci/9ESGROCZBdq16O0SwaNVLIB8vmqfoYr4CNYaTVWqNIC23c0zbHB MOf1iZZMEtR0sq+4Y7LVjGEexm93MSaOGqrcIzsQlrrYzNn3AM50P2ymjRCwJ0rv4GADDY LgCEQsA24ejQb1OiGob6xfl2ZFmRKOE15Ue0Ao7JvmXMEgPAJu0TiG1GgERP9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680107560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QpEMgtzRkjD6gnYGN8hY6I9wGqOvCkvW6rTmylocSac=; b=q/HtoaXV52rmOLI/ac1ekALnJ7WDOtFsldM/eOA509ChQnOhxomUNGMWmO9YyP3TU2ein8 nNN+FjfmzbpQvldRLw0k8+/wygs3QFi89U3bU/3WOfDvNpUvdhckawjWY19Bwjzl9ya9Hv 5LHQcTAdViWdINYq9LzXzADzs53xW16P8zAe6fCtePBa1KcQfz0bcbqY5VWxPQu5/Bu6Ty 1JK2h9jNkSubyo7GmuZmIX3bZR89AK6Ih/E8UzryDPR/FlHtlgydHwRgN8FOdAGOOsaCK4 gV6tAVE1Xzuep5/HQQeyZR7/qelZ9QEt7p+8GPlY3tDtfmQCc57btQBRzt++vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680107560; a=rsa-sha256; cv=none; b=t76onqdB4uHbHGk+/bBkbaBCu7Cs/FOY1t6UL8OrcKasMQ3nh65vFMizAB6GtVu5vHs9G1 PwR3rMf8g3qOCHkR+1YPmI4Pm7MNZlXsitfNgOhgdxtjVpRE3ilTmA9g7VSolr3LEKqKMb ilAPHLWAa9Ol1diZahWhfhVuOOoBlMsZdpvBZQ2CEm6ho8BZjfC0OfsEEl6BnKBu4k0jKW +1fbft4BhtzoL83C6oGke3VfHm4kTcB2EQjEXpEgkdndhk2KhMsVQh+UmvjwLNS3NCwu9D XxuskPW3tESGUznEEu1NverjTTVMKVM9JqAwHnRyM+42dk/7HvAlqSllFi9c4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmsXm4pK5zdDt; Wed, 29 Mar 2023 16:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TGWedg006711; Wed, 29 Mar 2023 16:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TGWeY8006710; Wed, 29 Mar 2023 16:32:40 GMT (envelope-from git) Date: Wed, 29 Mar 2023 16:32:40 GMT Message-Id: <202303291632.32TGWeY8006710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: d4a80d21b3d3 - main - lagg(4): Do not enter net epoch recursively List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4a80d21b3d32a2de02d1820cc1f38dba1f127cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d4a80d21b3d32a2de02d1820cc1f38dba1f127cb commit d4a80d21b3d32a2de02d1820cc1f38dba1f127cb Author: Zhenlei Huang AuthorDate: 2023-03-29 16:25:16 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-29 16:29:51 +0000 lagg(4): Do not enter net epoch recursively This saves a little resources. No functional change intended. Reviewed by: kp Fixes: b8a6e03fac92 Widen NET_EPOCH coverage MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39267 --- sys/net/if_lagg.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 7acfa524670c..063782b49ad7 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -2107,18 +2107,15 @@ lagg_setflags(struct lagg_port *lp, int status) static int lagg_transmit_ethernet(struct ifnet *ifp, struct mbuf *m) { - struct epoch_tracker et; struct lagg_softc *sc = (struct lagg_softc *)ifp->if_softc; - int error; + NET_EPOCH_ASSERT(); #if defined(KERN_TLS) || defined(RATELIMIT) if (m->m_pkthdr.csum_flags & CSUM_SND_TAG) MPASS(m->m_pkthdr.snd_tag->ifp == ifp); #endif - NET_EPOCH_ENTER(et); /* We need a Tx algorithm and at least one port */ if (sc->sc_proto == LAGG_PROTO_NONE || sc->sc_count == 0) { - NET_EPOCH_EXIT(et); m_freem(m); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); return (ENXIO); @@ -2126,26 +2123,21 @@ lagg_transmit_ethernet(struct ifnet *ifp, struct mbuf *m) ETHER_BPF_MTAP(ifp, m); - error = lagg_proto_start(sc, m); - NET_EPOCH_EXIT(et); - return (error); + return (lagg_proto_start(sc, m)); } static int lagg_transmit_infiniband(struct ifnet *ifp, struct mbuf *m) { - struct epoch_tracker et; struct lagg_softc *sc = (struct lagg_softc *)ifp->if_softc; - int error; + NET_EPOCH_ASSERT(); #if defined(KERN_TLS) || defined(RATELIMIT) if (m->m_pkthdr.csum_flags & CSUM_SND_TAG) MPASS(m->m_pkthdr.snd_tag->ifp == ifp); #endif - NET_EPOCH_ENTER(et); /* We need a Tx algorithm and at least one port */ if (sc->sc_proto == LAGG_PROTO_NONE || sc->sc_count == 0) { - NET_EPOCH_EXIT(et); m_freem(m); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); return (ENXIO); @@ -2153,9 +2145,7 @@ lagg_transmit_infiniband(struct ifnet *ifp, struct mbuf *m) infiniband_bpf_mtap(ifp, m); - error = lagg_proto_start(sc, m); - NET_EPOCH_EXIT(et); - return (error); + return (lagg_proto_start(sc, m)); } /* @@ -2169,16 +2159,14 @@ lagg_qflush(struct ifnet *ifp __unused) static struct mbuf * lagg_input_ethernet(struct ifnet *ifp, struct mbuf *m) { - struct epoch_tracker et; struct lagg_port *lp = ifp->if_lagg; struct lagg_softc *sc = lp->lp_softc; struct ifnet *scifp = sc->sc_ifp; - NET_EPOCH_ENTER(et); + NET_EPOCH_ASSERT(); if ((scifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || lp->lp_detaching != 0 || sc->sc_proto == LAGG_PROTO_NONE) { - NET_EPOCH_EXIT(et); m_freem(m); return (NULL); } @@ -2198,7 +2186,6 @@ lagg_input_ethernet(struct ifnet *ifp, struct mbuf *m) } #endif /* DEV_NETMAP */ - NET_EPOCH_EXIT(et); return (m); } From nobody Wed Mar 29 16:53: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 4Pmt0K55nLz42nWn; Wed, 29 Mar 2023 16:53: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 4Pmt0K3S3rz4cbD; Wed, 29 Mar 2023 16:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4+2MvxDRmD+e+M7JdkzukexKF5qQxAQA8rXvxxR2lLI=; b=RKfKPxpo83/06ympKpZT1iWccCnOigAmfvRYQxUyXD2/5mHRiX+Qe3GFPv5KlRb6KaR5CB y3DwJrSJpXgQ7XoX3abE/NxbeHxFlCUxMXGJhgsub/9plqmeNtPJtbpJy6TcKQ0ydfW6+X 7775niGnFUGwiOwL7nu7EtD8TneOWvmf74lCBIxTslyEqGgSSxAySrv0Jx8hxnqk5+SvWt UszWkOSGnWQBZ9gySQLRtV2OxmqYRLm+lCuuLqPIRdFqUyuFSIKdyacBSAE7vDgMogCklN kZaEoNIIXrKlPbXUHEXjhu1G3jbdTDc4CKwbZVGYgUMp4mKXP8izVgK9BC78kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4+2MvxDRmD+e+M7JdkzukexKF5qQxAQA8rXvxxR2lLI=; b=KSqt/97bvLCAIPvIG4Pmc2lZYEg5vysNmAerP3e3kpGRvz0UPAW3OHkeCNcOGy4INq+Wuc 7uAcqDuqxHVa2b5Oomn4/jin+pdFqqqxDdLtZ1j/NfIt0DOr8D7Epjy3Nsg1E5KWCXQw8a KVzjoNr7ps2l64WndVuCjKhvMFjzFWkPlxgt1c6anjFVBli4VMPqDRfS4M5ml6JOSI5r3o cvDKShyP29Lh+3KFSIHz44TlKKwQ9gNcDIGVgkIxH2UleWCxoEWlWijilHdNVvoSX/1EGW 9y26pgO+frc87FVWmPFpVLqj3OfFPYLsOZlpWo20eODMASv2f1BFprZKZejT9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680108785; a=rsa-sha256; cv=none; b=nJ5I3J7ZueFBWon9KNdfe5Rr3mBCySBNVCH4Sf9mKMtymbSsZbzCtuBndXgWCHqihL7qik l4CuNtsTOIg27nnKdaMl904kiV1XHk61hc5CSVpHQ0vr9AMvNPne3fmFGJlVsUmxjBnxNX Dvq06RYeyBVRaRHhJOrXS6yDgv/7mpCJPNjXg7IrsUYswQCIVisi5nXEppIz+h+w9+cKKZ 8UUHJa5qIPMO0yB+C1HdpUR3XyL8yBkMmRrJ3Fqg18XPzrmZrIBJBP0qnCvEdCRVVw5CmO U2g5r1GJZUa4siFOEFrTpjd7VzJOB9easY3V8XQ4MPNWsdBQ2E7FSjVanERJWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmt0K2X73zdnK; Wed, 29 Mar 2023 16:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TGr5ZI039704; Wed, 29 Mar 2023 16:53:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TGr5BN039703; Wed, 29 Mar 2023 16:53:05 GMT (envelope-from git) Date: Wed, 29 Mar 2023 16:53:05 GMT Message-Id: <202303291653.32TGr5BN039703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: fd16ee512374 - stable/13 - xhci(4): Add IDs for Zhaoxin USB 3.0 controllers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fd16ee51237444aa0cacacfdf7de1975485dcf35 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fd16ee51237444aa0cacacfdf7de1975485dcf35 commit fd16ee51237444aa0cacacfdf7de1975485dcf35 Author: Dmitry Luhtionov AuthorDate: 2023-01-17 10:43:40 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-29 16:37:14 +0000 xhci(4): Add IDs for Zhaoxin USB 3.0 controllers Reviewed by: hselasky Tested by: Weitao Wang MFC after: 1 week Sponsored by: NVIDIA Networking Differential Revision: https://reviews.freebsd.org/D38921 (cherry picked from commit 0d7064d58f897c95c3bd319b497f70c8177e0de6) (cherry picked from commit f50f53931edb24c5f30434603f5d1d3043effc0c) --- sys/dev/usb/controller/xhci_pci.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index 31c361fd26e8..ad49ea7bb38f 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$"); #define PCI_XHCI_VENDORID_AMD 0x1022 #define PCI_XHCI_VENDORID_INTEL 0x8086 #define PCI_XHCI_VENDORID_VMWARE 0x15ad +#define PCI_XHCI_VENDORID_ZHAOXIN 0x1d17 static device_probe_t xhci_pci_probe; static device_detach_t xhci_pci_detach; @@ -207,6 +208,13 @@ xhci_pci_match(device_t self) case 0x1ada10de: return ("NVIDIA TU106 USB 3.1 controller"); + case 0x92021d17: + return ("Zhaoxin ZX-100 USB 3.0 controller"); + case 0x92031d17: + return ("Zhaoxin ZX-200 USB 3.0 controller"); + case 0x92041d17: + return ("Zhaoxin ZX-E USB 3.0 controller"); + default: break; } @@ -395,6 +403,9 @@ xhci_pci_attach(device_t self) case PCI_XHCI_VENDORID_VMWARE: strlcpy(sc->sc_vendor, "VMware", sizeof(sc->sc_vendor)); break; + case PCI_XHCI_VENDORID_ZHAOXIN: + strlcpy(sc->sc_vendor, "Zhaoxin", sizeof(sc->sc_vendor)); + break; default: if (bootverbose) device_printf(self, "(New XHCI DeviceId=0x%08x)\n", From nobody Wed Mar 29 16:53: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 4Pmt0L5Ctnz42nTT; Wed, 29 Mar 2023 16:53: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 4Pmt0L4MDtz4cKp; Wed, 29 Mar 2023 16:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2DaNyADKBdFPnSQRIu+FLDeROo02qgnxKYZ8DWVPeRA=; b=YfZRAZR/wpB7D9SFVB6IksjevszxJqtQCMIAylrApX/qCkz21LoLSBK+MqbnSqTD2ecZ7U 7qnhZxe8zMW9Ho1Q5TLA1FdcDI1D5whwWqIdIn34QHNlXkAadrv9fDwmJaqPzSB/5E7Gg3 WGLdr6Vg794rUGDnTPU/yW8p9rD/Iv37dPJpKdEC58fMRt80fUFJk+fkNzDjzvInCl5JWS SQq+uJPddlcLZqF+wQ8PeoX7lysXcbmMsK915JDZkxl3APpOi/sGKMjX/ah9Aac2kHfw0W CIc4SD7Mrw5gCf2PtqXMxwfe99jY8ft/GZwJD0p2nkdQccM38AwD8mj4LvAl9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2DaNyADKBdFPnSQRIu+FLDeROo02qgnxKYZ8DWVPeRA=; b=vyQ+z8zeHvBHkCB97SFMkW+FcfVRJ2tFJBJJ/pLcuEli/uBjHaxSN+9BGCLi4iW6Vzvohb wtfrKAPc2AQHH2JsVLKbpxQgEY2dGrcSSLgO2CXSc4VENlz5ua/27WBzCZ9mJGg+TyvK0H bOeNm3gzGqD54cpz0J432ZZgQSx0c7w24huBjG+/uAOBUJIMX/Oj0JJKwAxf2O15NQurXR K072EClbTDjk6CSZAKVjtDwyp8a3tI9NNTvYPnEH8VvKOScroYJyr7zHchT9pJVIsYX8FN guWQAAWz5/PHM9q4WyrjvWx/oi70nigkQPFqDvfEdynZEXFf8jlyHHma3c5LfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680108786; a=rsa-sha256; cv=none; b=XH3ZZlKFxtyMBaP/f16XjCP5pAf+QjzEE8eCyi/UzWXVemHh8WxqgUo2jY4wL4FwNK8VP+ gonkb7/j1AdmlbpxXjiTt4CzrsGJ+iP5mG998RTpJv01t3idpdCm9jm9T4zEFb7ylJxsXE WuUOs17ejiv0y1Fkt7ee0K1rP/217fyiP1kgThO1ewaEvObNmSqoUJp30izVIcn+Sw3Sqm uGstdWWafSgIvQQDVmTbLgXMFHvmWMjK5XfMkyGVARvShfjo5vTAxQfT2etorNZPife3Q/ T+J5WT98SdTCKs77QnA5f2bgHAS9jK1o4+P6jz7Eihj7kNS/AMiZesaVctnxLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmt0L3RgNzdcF; Wed, 29 Mar 2023 16:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TGr65k039725; Wed, 29 Mar 2023 16:53:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TGr630039724; Wed, 29 Mar 2023 16:53:06 GMT (envelope-from git) Date: Wed, 29 Mar 2023 16:53:06 GMT Message-Id: <202303291653.32TGr630039724@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ffb8b19f767d - stable/13 - ehci(4): Add IDs for for Zhaoxin USB 2.0 controller List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ffb8b19f767da0c36a67fb76cbaa9f47457af184 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ffb8b19f767da0c36a67fb76cbaa9f47457af184 commit ffb8b19f767da0c36a67fb76cbaa9f47457af184 Author: Dmitry Luhtionov AuthorDate: 2023-01-17 10:43:33 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-29 16:49:21 +0000 ehci(4): Add IDs for for Zhaoxin USB 2.0 controller Tested by: Weitao Wang MFC after: 1 week Sponsored by: NVIDIA Networking Differential Revision: https://reviews.freebsd.org/D38923 (cherry picked from commit f9237e1937a4e399e08ca8e5bd88a60910e74be6) (cherry picked from commit 95b2d16b38a720108a51f9e8ce0685244e3e3ea4) --- sys/dev/usb/controller/ehci_pci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index b536ea02b649..9018b2e4db40 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -96,6 +96,7 @@ __FBSDID("$FreeBSD$"); #define PCI_EHCI_VENDORID_NVIDIA2 0x10DE #define PCI_EHCI_VENDORID_VIA 0x1106 #define PCI_EHCI_VENDORID_VMWARE 0x15ad +#define PCI_EHCI_VENDORID_ZHAOXIN 0x1d17 static device_probe_t ehci_pci_probe; static device_attach_t ehci_pci_attach; @@ -224,6 +225,10 @@ ehci_pci_match(device_t self) case 0x077015ad: return ("VMware USB 2.0 controller"); + + case 0x31041d17: + return ("Zhaoxin ZX-100/ZX-200/ZX-E USB 2.0 controller"); + default: break; } @@ -409,6 +414,9 @@ ehci_pci_attach(device_t self) case PCI_EHCI_VENDORID_VMWARE: sprintf(sc->sc_vendor, "VMware"); break; + case PCI_EHCI_VENDORID_ZHAOXIN: + sprintf(sc->sc_vendor, "Zhaoxin"); + break; default: if (bootverbose) device_printf(self, "(New EHCI DeviceId=0x%08x)\n", From nobody Wed Mar 29 16:53: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 4Pmt0M5Xrzz42nTb; Wed, 29 Mar 2023 16:53: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 4Pmt0M51twz4chH; Wed, 29 Mar 2023 16:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68zrFtQysFubsKMDpTOf0dAUhfOEv6NSFvp/HHe0TmQ=; b=lEovmXnrbhjIR460tg10cXFIXAi5SG+gtM421+cJS8xCC1LZ3nHNdZBIqVZfwaQNKyJif/ P9IgVkdgqpIibrEgAuaRQS9s4C62p3m0ACZYU0Aq+n6rmC5vafvkNfpaSqCbS6s0ltSRti kN4g6NBzR+Hi+X6TB5AoWN/UH/OST4unVwtsGd4vD64slUEVe4UB8kDagiPASbTP8EkZCn TVCbKFF1nNPkiCB1mcFxdPmTZVans8pCUOHy1d84CCbarTmE6xsrrwJD5nKlabYs5LDcDW vLvmrJzjt4g+3IklIpmODdoRi15PstuNClsrHDC4CvVOw3LfbWMNVEo9iB5e5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68zrFtQysFubsKMDpTOf0dAUhfOEv6NSFvp/HHe0TmQ=; b=xiOEBNM6XQPkkEiqXY3yBtE1DyxeR0ZntCwehjExf9UTW5Efdmvtek1R+iJK4mldNsBYih l9RrWKgKFEWikKs7XC0Qi6K5FFWoA7wVuidQclDxVOUa6QLQ8LImH1rbUeOfiCG40dBSyS YNtB2AN5M1OuMJRVSJNtlr5wPulUlkDvckdDlR13CgayQfsnl0yGMBFE+l3xGS1QvYtdbM 3+DGwpheasugU/hFzBmokpzXSWymsrFTXI4kliRg/nC4K3dUzZzMsD/wL5zTj2shpm89Gh X7A1H1dgV0aPhmCmMRU/496kOYvuNgbBkmxeMnnlEz9I2picuB+DFMZfalVNLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680108787; a=rsa-sha256; cv=none; b=iAkIOos9z9qUaAHlFyk9Hur3CHJAKUE6BzGqaVqNTkNyMBx3M7kHic3oL95WQqBej+XMOd zFQRyQqr0oNkcI5UufiKracOR4YCx+Ezc3AXQQcl3KVB9y46PTP90OgqxuB8VERSris2Gp 7e0gZzMBNQJ0SPrmVD9gzYFWLHdK+iDqdpKUsU8Kgvp3LtnDJnmaNZR4Am5qUf+avKfAUf hrTGXYXy9B2A4g303E05PR2+0z/4vzeW9eFOox125Icj9sZQSWOxjYaoQn1tUvR6gNl3BC hFgLzV5oOWStfz81nXybwImLB4uN5UG7DXjXWmJLAkMHXJ+16lejuz5oGulMGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmt0M46mzzdqk; Wed, 29 Mar 2023 16:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TGr7gY039749; Wed, 29 Mar 2023 16:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TGr7Le039748; Wed, 29 Mar 2023 16:53:07 GMT (envelope-from git) Date: Wed, 29 Mar 2023 16:53:07 GMT Message-Id: <202303291653.32TGr7Le039748@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 4abe99d02d2e - stable/13 - uhci(4): Add IDs for Zhaoxin USB controller List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4abe99d02d2e28dfa8290b305d735d61ffd9cbca Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4abe99d02d2e28dfa8290b305d735d61ffd9cbca commit 4abe99d02d2e28dfa8290b305d735d61ffd9cbca Author: Dmitry Luhtionov AuthorDate: 2023-01-17 10:43:24 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-29 16:49:31 +0000 uhci(4): Add IDs for Zhaoxin USB controller Tested by: Weitao Wang MFC after: 1 week Sponsored by: NVIDIA Networking Differential Revision: https://reviews.freebsd.org/D38924 (cherry picked from commit 986c7be472bd8b29bb280e72b57e6cbf1851b26f) (cherry picked from commit b754d7faafd3536889bb6078b9fd11ef2e7717d7) --- sys/dev/usb/controller/uhci_pci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c index e9036aa9ce23..07bc25b644e3 100644 --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -82,6 +82,7 @@ __FBSDID("$FreeBSD$"); #define PCI_UHCI_VENDORID_HP 0x103c #define PCI_UHCI_VENDORID_VIA 0x1106 #define PCI_UHCI_VENDORID_VMWARE 0x15ad +#define PCI_UHCI_VENDORID_ZHAOXIN 0x1d17 /* PIIX4E has no separate stepping */ @@ -240,6 +241,10 @@ uhci_pci_match(device_t self) case 0x077415ad: return ("VMware USB controller"); + + case 0x30381d17: + return ("Zhaoxin ZX-100/ZX-200/ZX-E USB controller"); + default: break; } @@ -333,6 +338,9 @@ uhci_pci_attach(device_t self) case PCI_UHCI_VENDORID_VMWARE: sprintf(sc->sc_vendor, "VMware"); break; + case PCI_UHCI_VENDORID_ZHAOXIN: + sprintf(sc->sc_vendor, "Zhaoxin"); + break; default: if (bootverbose) { device_printf(self, "(New UHCI DeviceId=0x%08x)\n", From nobody Wed Mar 29 16:53: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 4Pmt0N6V62z42nNv; Wed, 29 Mar 2023 16:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pmt0N63qMz4cwm; Wed, 29 Mar 2023 16:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t40W/B80o96iAPbg0pm3RDFk9BSec0AFlyb5sc6+1+Q=; b=s/EsSg1rOFZ6EuS7OVG0CidYmZfM1gw2wU5gWw5kE0JNh33kpCXWglRLDf1lI0FUZShN3m ZugtfUJ3DFW82iQIujkxxltVP2mdPy0ndy3cBHfMB4MYLoHzJvCSroMYg1ko71FdPKHWZm +R3dWpS5GN3ZWnUx6gZ8EUs1D8VgqMMnVDOgifXgd0wxCHj3p2uE9pyrpUBNKvLC9kbWa/ N8EeMM3k74N8hb7apy3t9FfSFo78eX1BsTL1U6yuT2yBuQMVtaFiLRRiB76pq7edxxtKj4 StadEr9pU88fMelkCnQFxjkIA2vGhwFvs/V3VRviE1LldvuBT20YcV/KrxeUwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t40W/B80o96iAPbg0pm3RDFk9BSec0AFlyb5sc6+1+Q=; b=wNRtwdnhSskl38wkyD5P/pisdvQfhPuUZq//OvkivzDoK56X8wHQ7kDCly76RJd0iFe6YY cyqhsqix23oV5C/wawIt5KXbNMPRKeOdl3mG+8v910b3ySSdlYzOBsEVLfToFpV0uCmrzA D76XRvrnjpRzVsKW692sxN59hr8DMHayvwC7mwKYv46yiEpvGSygSh9ouHLDpM6b2yUGP7 VHtWiRi/rSV+JZ9uviYXaLJyva89A1/16Unx9HkU+H9mwP4pwEFKLuqsr0V8xfaLRU1q4F lsRHe9ZEfn8vyToRcqToIBBh7GZmDvsUngLCVmmZlCSHSp0Jp1pb2X8lUxObzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680108788; a=rsa-sha256; cv=none; b=kunO4l8yzpNPS5hPWQAJoSmTvD6OJ52C5FnbDMRJ/ToFXd+diFQbMZ96zD+1mDj9OsGYIh 5D/xWUzrLoY5ukY2WeWDnutXH21oair3oEnU5RHoCkrWOgyOyHzjgNG1wYRvS8D3MQcFVE n0nowFq573szWGUTRRQZrc6MlcXRpz0+8j2D9pTo14H86pVw5mfdiqRVla/4HRy9cVuXFK mrWK9V5EZcDvBgiUsUtqREaeUl7XSi7X3ACIeuWSc41RT+ACP8Dz7oETGeEaRjAGNurpjR OtZGw6KYgxRW32MHT2EIB8mzTE25nkKXpeR7cJ1gWN4NK3vVMC/DktNyEU2aFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmt0N54qczd38; Wed, 29 Mar 2023 16:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TGr8vN039770; Wed, 29 Mar 2023 16:53:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TGr8vK039769; Wed, 29 Mar 2023 16:53:08 GMT (envelope-from git) Date: Wed, 29 Mar 2023 16:53:08 GMT Message-Id: <202303291653.32TGr8vK039769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 298d6896b0ac - stable/13 - xhci(4): Describe Fresco Logic FL1009 USB 3.0 controller List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 298d6896b0aca5a4a67c4147b94113ab0a39c9e3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=298d6896b0aca5a4a67c4147b94113ab0a39c9e3 commit 298d6896b0aca5a4a67c4147b94113ab0a39c9e3 Author: Zhenlei Huang AuthorDate: 2023-03-20 04:00:59 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-29 16:50:14 +0000 xhci(4): Describe Fresco Logic FL1009 USB 3.0 controller Reviewed by: hselasky MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38922 (cherry picked from commit 082895ebecb55f342dec918c555309c11e3fe17f) --- sys/dev/usb/controller/xhci_pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index ad49ea7bb38f..2a98bc45b700 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -128,6 +128,8 @@ xhci_pci_match(device_t self) case 0x10001b73: return ("Fresco Logic FL1000G USB 3.0 controller"); + case 0x10091b73: + return ("Fresco Logic FL1009 USB 3.0 controller"); case 0x11001b73: return ("Fresco Logic FL1100 USB 3.0 controller"); From nobody Wed Mar 29 17: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 4Pmtt433Qrz42qkp; Wed, 29 Mar 2023 17:32: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 4Pmtt429hdz3Dcs; Wed, 29 Mar 2023 17: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=1680111164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gk1fMHdW/LoVGTucnQPNnlOxDOlI+XEIqYMz8OBMRUI=; b=GXGfsoRKwopKLlmnxLHm5MXsCZrMAwEj+K8UCVannB3xQ+mBiiv0EBix9rzS3oK1woO28J D8sXryc1KLr/eKPYyiJFgpGA0YUElh86i2xMPhKTy0J4oOvTm1Q/yf387fjR6ySunHkKAW oH5kQrrW2Nl5sKnAivMvxKaO6UKS0H2ijk9i+tC+buLw9NuVdzfUPzkkEPS7WT+qrz4gJ0 LpBDbut8FT/yFsGki9lwp8yzem3nn4CY/nyiHXiSNEUqhoc2ItOBYdIH0u5qYAOt4r18u7 ov+tSfTYuw6jYyJCW+kxk/LSYcl5sJcR6wlp78eq5900EbnWTu4K06UbWnH9Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680111164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gk1fMHdW/LoVGTucnQPNnlOxDOlI+XEIqYMz8OBMRUI=; b=lIE+61s+s1IwC4lrYRgJ5HWdU/0srrEI+JU+cdhCB1VFq9nAZVWIwwxe2fBhoI84Q0IBjl wfehGgpRxLrHHPjRI72pi/VRG7cv2QAD5/LGMaKNN7YPq7fyLhwhzJIlXMIh0SFGVfy6hK 3do0QuM2vIvpXIB1HnpmR2zbLA6JtV4KsnHHFz4mIw3lLojwBsSENELnFkOOhfPf2uUnff y3/0PyyK0LsohbaIj1kO9SUCHwvqUIi79EUBQFL4QknC6J64DuamPMsei67oJ4MR1bXvGY 0sXuhvO2gfohHeb5uF8Sj1F9IdzhItSw6P1fAbWYImGADPQoeGJKfLKpoU3jbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680111164; a=rsa-sha256; cv=none; b=pnhyTUoty4UkCdr92nkJpxPrebvnPCIbEfyzFV3AqcIhczJDh8a0biYp4LaveD+NoOKsZs xmqt1aXIxZ4WYWaeN2RQdVs2wJPck7U088iWReS3JVPlCH80V0rmo7kBQxG2RoYShBHXfT ttl2sdTX5l4dBS+O68xq8CK91eLV15r7izjbSqB8SU/NJx1gobgCFcwpzE+n1T5NnK81I1 VGr3rT+RsiFCJBAXuIoSb9VL1WrYUxFF5KpZnvM/Q6iGltIBQzCCpWRxo0HlsumMOxFyne o0Ir7SD/9Iy4VN8GpNc76qJ2QhuB2dI57m092N8eW5mjQq40XiJNe+yc8HVwBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmtt41Ccrzfk6; Wed, 29 Mar 2023 17:32:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32THWibE005778; Wed, 29 Mar 2023 17:32:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32THWiH5005777; Wed, 29 Mar 2023 17:32:44 GMT (envelope-from git) Date: Wed, 29 Mar 2023 17:32:44 GMT Message-Id: <202303291732.32THWiH5005777@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: 3ba927fdc46d - main - rc.d/ldconfig: Remove mips64 check for ldconfig32. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 3ba927fdc46de1fe3086c088b9be69557ec5ce27 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3ba927fdc46de1fe3086c088b9be69557ec5ce27 commit 3ba927fdc46de1fe3086c088b9be69557ec5ce27 Author: John Baldwin AuthorDate: 2023-03-29 17:20:03 +0000 Commit: John Baldwin CommitDate: 2023-03-29 17:20:03 +0000 rc.d/ldconfig: Remove mips64 check for ldconfig32. --- libexec/rc/rc.d/ldconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index 02693b844e60..5dd25ced0cd4 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -43,7 +43,7 @@ ldconfig_start() machine_arch=$(sysctl -n hw.machine_arch) case ${machine_arch} in - amd64|mips64|powerpc64) + amd64|powerpc64) for i in ${ldconfig_local32_dirs}; do if [ -d "${i}" ]; then _files=`find ${i} -type f` From nobody Wed Mar 29 17:41: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 4Pmv4Q1Zczz42rKp; Wed, 29 Mar 2023 17:41: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 4Pmv4Q14Mjz3FWj; Wed, 29 Mar 2023 17:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680111702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxPiBh6WsAjJ4pkOl/ryx8dm5Za6SU4JXrKJM21sbws=; b=jMfJZcQj+YG2e87kkM8g+sU+mvWwjiBbVEN4uaz3sIVy4cwbk7iIqCZTZmOwMmy1ygNOgY Usaink8vUoqp3H3lX0u9D8u3JtKUH48LOO3skS3VbvxG6bEM7FhqP7ZPOwTOCGjf1rnepx G2tGE6JX8kC4+QDFPtckq+3qW8lhfVoHpRWS/L/v3UfHtWl/p4m8fTii52R2S8YEhy99mQ FIpR8WI2xLP5YVEGHXvmuRnipDKETCMnIsK5rxcobNT7OajHR0XclgH/t5gawNMPb6jRUr BQ2fYkOcul5FTAldiuO6j7i4Br4UT8Id1lozFiCrQ6izPGGzzqV2Yh/nWnvjmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680111702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxPiBh6WsAjJ4pkOl/ryx8dm5Za6SU4JXrKJM21sbws=; b=qRXAtl02f765hcrrwl+qe7XUQ+oEfZOmm3+/iL+YkkyXZBNPKGI3yB0qD3m/IyuStkYwAg bMcQRmh6J6W73mJUBibObmsRy/RuJE5RVG3qSFFCGmI9BscFOCP0UQzrLZQiAFZ5tTL2io S4gJBdMjmaPVI8KRF2wPDfJKUab28c7BWZvy22fmEk4mAdNaAVFrJpJlOuoNX51N3Qx63U hxmevYwO51//mvxCweSutZNo54L8TPpDWC/6suIrTKwWW2OplUCCrLEGQpTHQl/Opfhnm2 dY7ffkp4cBW+AW/Oz+tbrUUnzS3NLkyWPFFhlPnrp8lNFPWI4GYK8yoODX/xqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680111702; a=rsa-sha256; cv=none; b=egllOhaHAFegdG/pR65weIeIaeJ+cJ1/Pla03fablRO1Ug2vGwsVIeemC2uAqF5jpXOFzw nn5IMK/bMqxWEwFkV5Tc06uwMrnKYq8i/Zo3LuaWD6uiFWuR8ElWPPoY/NS3jAgawuEeZt uuxJwUTbvAX2ezaMt2wbnNFpNXb2O9zujmIe2g4Kiv6U+lpFQpCBe/4CpdmWusInz4YtUK fbC46Y85AXBeCgUZVyC/qghFxLMV2Y2IhJ7jPyXnpy2DGGa3ehrKoAMqdEwzj01JQoFzWH bTmUMg8sddYihmBC2JsUFqVfafaumlReOaOtrYmcZuviaAk5+jpdYJqmITZkgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmv4Q07VgzfYb; Wed, 29 Mar 2023 17:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32THffYW019448; Wed, 29 Mar 2023 17:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32THff4o019447; Wed, 29 Mar 2023 17:41:41 GMT (envelope-from git) Date: Wed, 29 Mar 2023 17:41:41 GMT Message-Id: <202303291741.32THff4o019447@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: 96241a568e5d - main - libproc: Trim a MIPS leftover. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 96241a568e5db7bd00512e8e51eb05f1aead695c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=96241a568e5db7bd00512e8e51eb05f1aead695c commit 96241a568e5db7bd00512e8e51eb05f1aead695c Author: John Baldwin AuthorDate: 2023-03-29 17:34:32 +0000 Commit: John Baldwin CommitDate: 2023-03-29 17:34:32 +0000 libproc: Trim a MIPS leftover. Fixes: 101ba46bb6bd libproc: retire now-unused MIPS support --- lib/libproc/proc_regs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libproc/proc_regs.c b/lib/libproc/proc_regs.c index 157d355b53fa..97619afa77e6 100644 --- a/lib/libproc/proc_regs.c +++ b/lib/libproc/proc_regs.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include -#define _WANT_MIPS_REGNUM #include #include From nobody Wed Mar 29 17: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 4Pmv4R2xcWz42rWK; Wed, 29 Mar 2023 17: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 4Pmv4R2G2Rz3FQ5; Wed, 29 Mar 2023 17: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=1680111703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=up+k6+PlqL1Ej4wlyZqahj+0JWlburpFX1z6XZojIvg=; b=jx5hurMyKIttg2qRrJzJDvqrvPCphW/pMClYDl2jc1WfRZB+CfOTBsEQXBvAASO0lwYLGL 0AwOS/k7UofULmfSYlMqA+i2GmiGhD6OHmmOVllNqUcih+hk5cN2iyFWAwGgWARnmDrhkB 8+LrN1hkGdXSdeOgDxxW2J22x6/3lStxj6BPZLe3qiY4VakcFvXMi8mk7wcEU5YfHLutXH RWci/g2vqgD8syU3RKK50bDBLN45qZmRgpPAivMlF2Qto8uC2rcIaQyW6IVa720jUvAMsx Raz3rx3cXv4pU1OQvWfycC3ODVrXoMUBXTXVTIYsfuHzift01wOQlR0ZI0mbUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680111703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=up+k6+PlqL1Ej4wlyZqahj+0JWlburpFX1z6XZojIvg=; b=AQMTNLZphtdvc225nE7j2BORfvGta73YE6z6B1zNDkBgrlb+hA5MHDZ91KGU5ZTMD7LgQa 8mktoY9zBXo6ARBFrTk+3PiDzVFUKpVbJkXWGEJsCte+fPH8gfLktt6K6e6QV7DDoNW0SR ofPhLL2LaCJIn4GxHWsj8tl55zmPmowjJXt/+EI1svZno5GNyQiIPe9/V4yZkRxboK6p3s 6MlyQzKdT8ND/8HWymzdDRa014fvzPII5PBZi4WwHm+I1xiaujPo/Cw27mFezVqfz2Slku WRU7SjgZZaZ5rHmxgZjGFUf+2D1vyqlewX2BfM5r22hli9qLFsgJSS1bM0orLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680111703; a=rsa-sha256; cv=none; b=leip2GMnmu6M0mfvX4wZ2vYTkHHsycg9FAlv0CkNgDDRIhvSZ6SWIIKEfM2rmOvkZ3nENO ltdwow5QwJx1YEbUBAHcNYq0+FfzLhij0Jb7bev53uigMzoxabqJaVPKdEmn8WrUBaSw/l KP9KIC8bRozDdD044W+tmdBMBNJulRfXgAtbe6dCz56c58ulzCEaWjFnNPXEReGkLsN0oM qoJwQrmJWC0g+vKkCtU5Pd+XCmtuy3p4e/HVj8xercrWUDosmIWcSKNnR3p46FragvV8rI DS912gqghahOFQh2g1Vj8+gzfGurHjZHbHutVvrk4BzKLMoTU0k8djn0my9DTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmv4R14nKzfhg; Wed, 29 Mar 2023 17:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32THfh6N019469; Wed, 29 Mar 2023 17:41:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32THfhh8019468; Wed, 29 Mar 2023 17:41:43 GMT (envelope-from git) Date: Wed, 29 Mar 2023 17:41:43 GMT Message-Id: <202303291741.32THfhh8019468@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: c476ca181ae7 - main - OptionalObsoleteFiles.inc: Remove MIPS-specific hwpmc manpages. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: c476ca181ae7f3970b45c35ab8eccb27eb625740 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c476ca181ae7f3970b45c35ab8eccb27eb625740 commit c476ca181ae7f3970b45c35ab8eccb27eb625740 Author: John Baldwin AuthorDate: 2023-03-29 17:40:59 +0000 Commit: John Baldwin CommitDate: 2023-03-29 17:40:59 +0000 OptionalObsoleteFiles.inc: Remove MIPS-specific hwpmc manpages. These are unconditionally removed in ObsoleteFiles.inc. --- tools/build/mk/OptionalObsoleteFiles.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 3fff008422a1..f3bb91ae6ff9 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6787,8 +6787,6 @@ OLD_FILES+=usr/share/man/man3/pmc.ivybridge.3.gz OLD_FILES+=usr/share/man/man3/pmc.ivybridgexeon.3.gz OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz OLD_FILES+=usr/share/man/man3/pmc.k8.3.gz -OLD_FILES+=usr/share/man/man3/pmc.mips24k.3.gz -OLD_FILES+=usr/share/man/man3/pmc.octeon.3.gz OLD_FILES+=usr/share/man/man3/pmc.p4.3.gz OLD_FILES+=usr/share/man/man3/pmc.p5.3.gz OLD_FILES+=usr/share/man/man3/pmc.p6.3.gz From nobody Wed Mar 29 17:50: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 4PmvG61pC2z42rnr; Wed, 29 Mar 2023 17:50: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 4PmvG61Jqlz3GRS; Wed, 29 Mar 2023 17:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680112206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=goPXEO4rIAjagYjqngknq20VVteaosYJfcW+U7UDMeI=; b=Y2+5yd6Fg8QxAbBuIE/xylCHAWvPN8++fDxaJaNZGKIj/LdH3v7My4buU/E5zbgDHDAw7k +SO/RXDijyz8tQFKPBZLD4zsqDK1ac2c9hPQnbdT6szDIzh9TeYlXugjobwXFkFXye0m1e zrU7l5amu3BtYpQM6hPZZauyMLD17UmUVZUKbJtILDsJx9687CPgQH/MXZdS6WT2xT9ay+ 8IVwlAjb4z1EpfqQa7CLATDT7nA7rfiwtTQzDXPNNMZ4GfozhQGITfTK0CJbUkLL2psEMi QPMF1PHMSZzKQJiE2R4wXDzVBUYlcV78t97SH1raRvWfz2jzG9+AWZTpo0eHsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680112206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=goPXEO4rIAjagYjqngknq20VVteaosYJfcW+U7UDMeI=; b=Q8YijNbdqECUQpcvSVwm+qbsHxT/3ZiJYPK3kDboG5wwx5zB8/35p1KlNF1iCLXvcUb2a2 mHVx2Q2Uda7fTCITn/VvdWHPW/YT6omfFeHn2sld8UPGWOZZBxe2RbJuM25tfSvG4X4Fz1 N7i0RYyIcB+D0JcJ7sPljkDx8IXKPO8FkjgqTwmxccdzSDFFG7mBQqxo5HLHRrz7thBtTE 9oP8+GWqjMK8M+CLwbDrojY3rzvcgAxyCBBJF8JUpJ2rLxRq9DBLNc/4tKg4tqVlXd67Id key87K0JNO1OsVxeKeZfHNpqdBxaV2xNAvJ0PxfpXzhDO0Kfx1HwaH/dMdHiTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680112206; a=rsa-sha256; cv=none; b=HtvIhrGUiWwrXpn7GIyLKwNpeB+NeWByoMEFLSZHpPGL98T46k3EpXsjJHzttGbgexQjMR JE8ZZ0xFQXLMpUjl+no+jqnJhF6HEzo5IzUanY2ZEdqQ4+FwmGq2dwFidLSXP956Yeyx8E muKmvV7vWBrvCbefqpwEwhWw8g7jIt+yOvEkRH+aTKNSQ525+M0kXtC1+SO5QR+LB50m5X n7yrHxscdFjtYebRnfLwfPalyaXYUeBaPcV4UCsM0QVuyidbWthNZNMZFfAX5A3n1IUEJH HQpThR3smdbsCm07abvytAFcm15YxS8dKlzkCRgmKahy8itJ58gRcy5FNNjBaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmvG60Mbhzfj8; Wed, 29 Mar 2023 17:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32THo6OT026381; Wed, 29 Mar 2023 17:50:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32THo5nr026376; Wed, 29 Mar 2023 17:50:05 GMT (envelope-from git) Date: Wed, 29 Mar 2023 17:50:05 GMT Message-Id: <202303291750.32THo5nr026376@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: 8f391d909808 - main - Rework {clang,lldb,llvm}-tblgen invocations to add --write-if-changed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 8f391d9098083044793ff036dff8c96930fb1553 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8f391d9098083044793ff036dff8c96930fb1553 commit 8f391d9098083044793ff036dff8c96930fb1553 Author: Dimitry Andric AuthorDate: 2023-03-29 17:48:43 +0000 Commit: Dimitry Andric CommitDate: 2023-03-29 17:49:49 +0000 Rework {clang,lldb,llvm}-tblgen invocations to add --write-if-changed This flag ensures that the tblgen tools do not actually touch the produced .inc file, if there are no changes to the contents. In turn, this may prevent a number of rebuilds of files that include such .inc files, saving build time. While here, ensure that the shell invocations to locate the used tblgen binary do not show unnecessary error messages. Reported by: des MFC after: 1 week --- lib/clang/clang.pre.mk | 7 +- lib/clang/headers/Makefile | 12 +- lib/clang/libclang/Makefile | 370 ++++++++++++++++----------------- lib/clang/liblldb/Makefile | 21 +- lib/clang/libllvm/Makefile | 58 +++--- lib/clang/lldb.pre.mk | 6 +- lib/clang/llvm.pre.mk | 9 +- usr.bin/clang/lld/Makefile | 11 +- usr.bin/clang/lldb-server/Makefile | 11 +- usr.bin/clang/lldb/Makefile | 11 +- usr.bin/clang/llvm-cxxfilt/Makefile | 11 +- usr.bin/clang/llvm-dwarfutil/Makefile | 11 +- usr.bin/clang/llvm-nm/Makefile | 11 +- usr.bin/clang/llvm-objcopy/Makefile | 4 +- usr.bin/clang/llvm-objdump/Makefile | 4 +- usr.bin/clang/llvm-readobj/Makefile | 11 +- usr.bin/clang/llvm-size/Makefile | 11 +- usr.bin/clang/llvm-strings/Makefile | 11 +- usr.bin/clang/llvm-symbolizer/Makefile | 11 +- 19 files changed, 273 insertions(+), 328 deletions(-) diff --git a/lib/clang/clang.pre.mk b/lib/clang/clang.pre.mk index 9ef401645f14..41071681851e 100644 --- a/lib/clang/clang.pre.mk +++ b/lib/clang/clang.pre.mk @@ -2,7 +2,8 @@ .include "llvm.pre.mk" -CLANG_SRCS= ${LLVM_BASE}/clang +CLANG_SRCS= ${LLVM_BASE}/clang -CLANG_TBLGEN?= clang-tblgen -CLANG_TBLGEN_BIN!= which ${CLANG_TBLGEN} +CLANG_TBLGEN?= clang-tblgen +CLANG_TBLGEN_BIN!= which ${CLANG_TBLGEN} || echo __nonexistent_clang_tblgen__ +CLANG_TBLGEN_OPTS?= --write-if-changed diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile index df53b7dc7ea0..8a4a778f43e2 100644 --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@ -200,17 +200,17 @@ PPC+= ppc_wrappers/xmmintrin.h .for hdr in bf16/bf16 cde/cde-header fp16/fp16 mve/mve-header neon/neon \ sve/sve-header arm_${hdr:H}.h: ${CLANG_SRCS}/include/clang/Basic/arm_${hdr:H}.td - ${CLANG_TBLGEN} -gen-arm-${hdr:T} \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_${hdr:H}.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-${hdr:T} \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} GENINCS+= arm_${hdr:H}.h .endfor .for hdr in vector/vector-header riscv_${hdr:H}.h: ${CLANG_SRCS}/include/clang/Basic/riscv_${hdr:H}.td - ${CLANG_TBLGEN} -gen-riscv-${hdr:T} \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_${hdr:H}.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-riscv-${hdr:T} \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} GENINCS+= riscv_${hdr:H}.h .endfor diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index ac85db06ed58..5e493e3509c9 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -760,358 +760,339 @@ SRCS_ALL+= ${SRCS_LDB} SRCS+= ${SRCS_ALL:O} clang/AST/AbstractBasicReader.inc: \ - ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td - ${CLANG_TBLGEN} -gen-clang-basic-reader \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td + ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-basic-reader \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/AbstractBasicReader.inc clang/AST/AbstractBasicWriter.inc: \ - ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td - ${CLANG_TBLGEN} -gen-clang-basic-writer \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td + ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-basic-writer \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/AbstractBasicWriter.inc clang/AST/AbstractTypeReader.inc: \ - ${CLANG_SRCS}/include/clang/AST/TypeProperties.td - ${CLANG_TBLGEN} -gen-clang-type-reader \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/AST/TypeProperties.td + ${CLANG_SRCS}/include/clang/AST/TypeProperties.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-type-reader \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/AbstractTypeReader.inc clang/AST/AbstractTypeWriter.inc: \ - ${CLANG_SRCS}/include/clang/AST/TypeProperties.td - ${CLANG_TBLGEN} -gen-clang-type-writer \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/AST/TypeProperties.td + ${CLANG_SRCS}/include/clang/AST/TypeProperties.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-type-writer \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/AbstractTypeWriter.inc clang/AST/AttrImpl.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-impl \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-impl \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/AttrImpl.inc clang/AST/AttrNodeTraverse.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-node-traverse \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-node-traverse \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/AttrNodeTraverse.inc clang/AST/AttrTextNodeDump.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-text-node-dump \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-text-node-dump \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/AttrTextNodeDump.inc clang/AST/AttrVisitor.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-ast-visitor \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-ast-visitor \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/AttrVisitor.inc clang/AST/Attrs.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-classes \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-classes \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/Attrs.inc clang/AST/CommentCommandInfo.inc: \ - ${CLANG_SRCS}/include/clang/AST/CommentCommands.td - ${CLANG_TBLGEN} -gen-clang-comment-command-info \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/AST/CommentCommands.td + ${CLANG_SRCS}/include/clang/AST/CommentCommands.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-comment-command-info \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/CommentCommandInfo.inc clang/AST/CommentCommandList.inc: \ - ${CLANG_SRCS}/include/clang/AST/CommentCommands.td - ${CLANG_TBLGEN} -gen-clang-comment-command-list \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/AST/CommentCommands.td + ${CLANG_SRCS}/include/clang/AST/CommentCommands.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-comment-command-list \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/CommentCommandList.inc clang/AST/CommentHTMLNamedCharacterReferences.inc: \ - ${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td - ${CLANG_TBLGEN} -gen-clang-comment-html-named-character-references \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td + ${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ + --gen-clang-comment-html-named-character-references \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/CommentHTMLNamedCharacterReferences.inc clang/AST/CommentHTMLTags.inc: \ - ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td - ${CLANG_TBLGEN} -gen-clang-comment-html-tags \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td + ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-comment-html-tags \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/CommentHTMLTags.inc clang/AST/CommentHTMLTagsProperties.inc: \ - ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td - ${CLANG_TBLGEN} -gen-clang-comment-html-tags-properties \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td + ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ + --gen-clang-comment-html-tags-properties -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/CommentHTMLTagsProperties.inc clang/AST/CommentNodes.inc: ${CLANG_SRCS}/include/clang/Basic/CommentNodes.td - ${CLANG_TBLGEN} -gen-clang-comment-nodes \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/CommentNodes.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-comment-nodes \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/CommentNodes.inc clang/AST/DeclNodes.inc: ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td - ${CLANG_TBLGEN} -gen-clang-decl-nodes \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-decl-nodes \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/DeclNodes.inc clang/AST/StmtDataCollectors.inc: \ - ${CLANG_SRCS}/include/clang/AST/StmtDataCollectors.td - ${CLANG_TBLGEN} -gen-clang-data-collectors \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/AST/StmtDataCollectors.td + ${CLANG_SRCS}/include/clang/AST/StmtDataCollectors.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-data-collectors \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/StmtDataCollectors.inc clang/AST/StmtNodes.inc: ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td - ${CLANG_TBLGEN} -gen-clang-stmt-nodes \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-stmt-nodes \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/StmtNodes.inc clang/AST/TypeNodes.inc: ${CLANG_SRCS}/include/clang/Basic/TypeNodes.td - ${CLANG_TBLGEN} -gen-clang-type-nodes \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/TypeNodes.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-type-nodes \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/AST/TypeNodes.inc clang/Basic/AttrHasAttributeImpl.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-has-attribute-impl \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ + --gen-clang-attr-has-attribute-impl -I ${CLANG_SRCS}/include \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/AttrHasAttributeImpl.inc clang/Basic/AttrList.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-list \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-list \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/AttrList.inc -clang/Basic/AttrSubMatchRulesList.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-subject-match-rule-list \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td +clang/Basic/AttrSubMatchRulesList.inc: \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ + --gen-clang-attr-subject-match-rule-list -I ${CLANG_SRCS}/include \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/AttrSubMatchRulesList.inc .for hdr in \ AST Analysis Comment Common CrossTU Driver Frontend Lex Parse \ Refactoring Sema Serialization SemaSerialization clang/Basic/Diagnostic${hdr}Kinds.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td - ${CLANG_TBLGEN} -gen-clang-diags-defs -clang-component=${hdr} \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td + ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-diags-defs \ + -clang-component=${hdr} -I ${CLANG_SRCS}/include/clang/Basic \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/Diagnostic${hdr}Kinds.inc .endfor clang/Basic/DiagnosticGroups.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td - ${CLANG_TBLGEN} -gen-clang-diag-groups \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td + ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-diag-groups \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/DiagnosticGroups.inc clang/Basic/DiagnosticIndexName.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td - ${CLANG_TBLGEN} -gen-clang-diags-index-name \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td + ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-diags-index-name \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/DiagnosticIndexName.inc clang/Basic/arm_fp16.inc: ${CLANG_SRCS}/include/clang/Basic/arm_fp16.td - ${CLANG_TBLGEN} -gen-arm-neon-sema \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_fp16.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-neon-sema \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_fp16.inc clang/Basic/arm_neon.inc: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td - ${CLANG_TBLGEN} -gen-arm-neon-sema \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_neon.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-neon-sema \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_neon.inc clang/Basic/arm_cde_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_cde.td - ${CLANG_TBLGEN} -gen-arm-cde-builtin-def \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-cde-builtin-def \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_cde_builtins.inc clang/Basic/arm_cde_builtin_aliases.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_cde.td - ${CLANG_TBLGEN} -gen-arm-cde-builtin-aliases \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-cde-builtin-aliases \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_cde_builtin_aliases.inc -clang/Basic/arm_cde_builtin_cg.inc: ${CLANG_SRCS}/include/clang/Basic/arm_cde.td - ${CLANG_TBLGEN} -gen-arm-cde-builtin-codegen \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td +clang/Basic/arm_cde_builtin_cg.inc: \ + ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-cde-builtin-codegen \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_cde_builtin_cg.inc clang/Basic/arm_cde_builtin_sema.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_cde.td - ${CLANG_TBLGEN} -gen-arm-cde-builtin-sema \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-cde-builtin-sema \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_cde_builtin_sema.inc clang/Basic/arm_mve_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_mve.td - ${CLANG_TBLGEN} -gen-arm-mve-builtin-def \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_mve.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-mve-builtin-def \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_mve_builtins.inc clang/Basic/arm_mve_builtin_aliases.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_mve.td - ${CLANG_TBLGEN} -gen-arm-mve-builtin-aliases \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_mve.td + ${CLANG_SRCS}/include/clang/Basic/arm_mve.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-mve-builtin-aliases \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_mve_builtin_aliases.inc -clang/Basic/arm_mve_builtin_cg.inc: ${CLANG_SRCS}/include/clang/Basic/arm_mve.td - ${CLANG_TBLGEN} -gen-arm-mve-builtin-codegen \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_mve.td +clang/Basic/arm_mve_builtin_cg.inc: \ + ${CLANG_SRCS}/include/clang/Basic/arm_mve.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-mve-builtin-codegen \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_mve_builtin_cg.inc clang/Basic/arm_mve_builtin_sema.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_mve.td - ${CLANG_TBLGEN} -gen-arm-mve-builtin-sema \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_mve.td + ${CLANG_SRCS}/include/clang/Basic/arm_mve.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-mve-builtin-sema \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_mve_builtin_sema.inc clang/Basic/arm_sve_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_sve.td - ${CLANG_TBLGEN} -gen-arm-sve-builtins \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-sve-builtins \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_sve_builtins.inc -clang/Basic/arm_sve_builtin_cg.inc: ${CLANG_SRCS}/include/clang/Basic/arm_sve.td - ${CLANG_TBLGEN} -gen-arm-sve-builtin-codegen \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td +clang/Basic/arm_sve_builtin_cg.inc: \ + ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-sve-builtin-codegen \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_sve_builtin_cg.inc clang/Basic/arm_sve_sema_rangechecks.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_sve.td - ${CLANG_TBLGEN} -gen-arm-sve-sema-rangechecks \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-sve-sema-rangechecks \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_sve_sema_rangechecks.inc clang/Basic/arm_sve_typeflags.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_sve.td - ${CLANG_TBLGEN} -gen-arm-sve-typeflags \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-sve-typeflags \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/arm_sve_typeflags.inc clang/Basic/riscv_vector_builtins.inc: \ - ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td - ${CLANG_TBLGEN} -gen-riscv-vector-builtins \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td + ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-riscv-vector-builtins \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/riscv_vector_builtins.inc clang/Basic/riscv_vector_builtin_cg.inc: \ - ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td - ${CLANG_TBLGEN} -gen-riscv-vector-builtin-codegen \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td + ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ + --gen-riscv-vector-builtin-codegen \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/riscv_vector_builtin_cg.inc clang/Basic/riscv_vector_builtin_sema.inc: \ - ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td - ${CLANG_TBLGEN} -gen-riscv-vector-builtin-sema \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td + ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-riscv-vector-builtin-sema \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ + -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Basic/riscv_vector_builtin_sema.inc clang/Parse/AttrParserStringSwitches.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-parser-string-switches \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ + --gen-clang-attr-parser-string-switches -I ${CLANG_SRCS}/include \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Parse/AttrParserStringSwitches.inc clang/Parse/AttrSubMatchRulesParserStringSwitches.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-subject-match-rules-parser-string-switches \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ + --gen-clang-attr-subject-match-rules-parser-string-switches \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Parse/AttrSubMatchRulesParserStringSwitches.inc clang/Sema/AttrParsedAttrImpl.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-impl \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ + --gen-clang-attr-parsed-attr-impl -I ${CLANG_SRCS}/include \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Sema/AttrParsedAttrImpl.inc clang/Sema/AttrParsedAttrKinds.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-kinds \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ + --gen-clang-attr-parsed-attr-kinds -I ${CLANG_SRCS}/include \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Sema/AttrParsedAttrKinds.inc clang/Sema/AttrParsedAttrList.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-list \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ + --gen-clang-attr-parsed-attr-list -I ${CLANG_SRCS}/include \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Sema/AttrParsedAttrList.inc clang/Sema/AttrSpellingListIndex.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-spelling-index \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-spelling-index \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Sema/AttrSpellingListIndex.inc clang/Sema/AttrTemplateInstantiate.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-template-instantiate \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ + --gen-clang-attr-template-instantiate -I ${CLANG_SRCS}/include \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Sema/AttrTemplateInstantiate.inc clang/Serialization/AttrPCHRead.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-pch-read \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-pch-read \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Serialization/AttrPCHRead.inc clang/Serialization/AttrPCHWrite.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} -gen-clang-attr-pch-write \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-pch-write \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/Serialization/AttrPCHWrite.inc clang/StaticAnalyzer/Checkers/Checkers.inc: \ - ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td - ${CLANG_TBLGEN} -gen-clang-sa-checkers \ + ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-sa-checkers \ -I ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= clang/StaticAnalyzer/Checkers/Checkers.inc Opcodes.inc: ${CLANG_SRCS}/lib/AST/Interp/Opcodes.td - ${CLANG_TBLGEN} -gen-clang-opcodes \ - -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/lib/AST/Interp/Opcodes.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-opcodes \ + -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= Opcodes.inc OpenCLBuiltins.inc: ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td - ${CLANG_TBLGEN} -gen-clang-opencl-builtins \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td + ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-opencl-builtins \ + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= OpenCLBuiltins.inc ${TGHDRS}: ${CLANG_TBLGEN_BIN} @@ -1121,10 +1102,9 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td - ${LLVM_TBLGEN} -gen-opt-parser-defs \ + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Driver/Options.td + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} LTGHDRS+= clang/Driver/Options.inc ${LTGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index 1a1494fd2bfb..2dfb585ee731 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -700,13 +700,10 @@ SRCS+= Utility/VMRange.cpp SRCS+= Utility/XcodeSDK.cpp SRCS+= Version/Version.cpp -LLDB_TBLGEN?= lldb-tblgen -LLDB_TBLGEN_BIN!= which ${LLDB_TBLGEN} - CommandOptions.inc: ${LLDB_SRCS}/source/Commands/Options.td - ${LLDB_TBLGEN} -gen-lldb-option-defs \ - -I ${LLDB_SRCS}/source/Commands -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${LLDB_SRCS}/source/Commands/Options.td + ${LLDB_TBLGEN} ${LLDB_TBLGEN_OPTS} --gen-lldb-option-defs \ + -I ${LLDB_SRCS}/source/Commands -d ${.TARGET}.d -o ${.TARGET} \ + ${.ALLSRC} TGHDRS+= CommandOptions.inc .for path in \ @@ -717,15 +714,15 @@ TGHDRS+= CommandOptions.inc Plugins/SymbolFile/DWARF/SymbolFileDWARF \ Target/Target ${path:T}Properties.inc: ${LLDB_SRCS}/source/${path}Properties.td - ${LLDB_TBLGEN} -gen-lldb-property-defs \ - -I ${LLDB_SRCS}/source/${path:H} -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${LLDB_SRCS}/source/${path}Properties.td + ${LLDB_TBLGEN} ${LLDB_TBLGEN_OPTS} --gen-lldb-property-defs \ + -I ${LLDB_SRCS}/source/${path:H} -d ${.TARGET}.d -o ${.TARGET} \ + ${.ALLSRC} TGHDRS+= ${path:T}Properties.inc ${path:T}PropertiesEnum.inc: ${LLDB_SRCS}/source/${path}Properties.td - ${LLDB_TBLGEN} -gen-lldb-property-enum-defs \ - -I ${LLDB_SRCS}/source/${path:H} -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${LLDB_SRCS}/source/${path}Properties.td + ${LLDB_TBLGEN} ${LLDB_TBLGEN_OPTS} --gen-lldb-property-enum-defs \ + -I ${LLDB_SRCS}/source/${path:H} -d ${.TARGET}.d -o ${.TARGET} \ + ${.ALLSRC} TGHDRS+= ${path:T}PropertiesEnum.inc .endfor diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 1cfd75f509c0..63b95219735c 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -1907,64 +1907,57 @@ SRCS_ALL+= ${SRCS_XDW} SRCS+= ${GENSRCS} SRCS+= ${SRCS_ALL:O} -llvm/Frontend/OpenMP/OMP.h.inc: ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td - ${LLVM_TBLGEN} --gen-directive-decl \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ - ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td +llvm/Frontend/OpenMP/OMP.h.inc: \ + ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-directive-decl \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= llvm/Frontend/OpenMP/OMP.h.inc llvm/Frontend/OpenMP/OMP.inc: ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td - ${LLVM_TBLGEN} --gen-directive-impl \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ - ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-directive-impl \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= llvm/Frontend/OpenMP/OMP.inc OMP.cpp: ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td - ${LLVM_TBLGEN} --gen-directive-impl \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ - ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-directive-impl \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} GENSRCS+= OMP.cpp llvm/IR/Attributes.inc: ${LLVM_SRCS}/include/llvm/IR/Attributes.td - ${LLVM_TBLGEN} -gen-attrs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ - ${LLVM_SRCS}/include/llvm/IR/Attributes.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-attrs \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= llvm/IR/Attributes.inc llvm/IR/IntrinsicEnums.inc: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td - ${LLVM_TBLGEN} -gen-intrinsic-enums \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ - ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-intrinsic-enums \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= llvm/IR/IntrinsicEnums.inc llvm/IR/IntrinsicImpl.inc: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td - ${LLVM_TBLGEN} -gen-intrinsic-impl \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ - ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-intrinsic-impl \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= llvm/IR/IntrinsicImpl.inc .for arch in \ AArch64/aarch64 AMDGPU/amdgcn ARM/arm BPF/bpf DirectX/dx \ - Hexagon/hexagon Mips/mips NVPTX/nvvm PowerPC/ppc R600/r600 RISCV/riscv \ - S390/s390 VE/ve WebAssembly/wasm X86/x86 XCore/xcore + Hexagon/hexagon Mips/mips NVPTX/nvvm PowerPC/ppc R600/r600 \ + RISCV/riscv S390/s390 VE/ve WebAssembly/wasm X86/x86 XCore/xcore llvm/IR/Intrinsics${arch:H}.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td - ${LLVM_TBLGEN} -gen-intrinsic-enums -intrinsic-prefix=${arch:T} \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ - ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} \ + --gen-intrinsic-enums -intrinsic-prefix=${arch:T} \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= llvm/IR/Intrinsics${arch:H}.h .endfor llvm-lib/Options.inc: ${LLVM_SRCS}/lib/ToolDrivers/llvm-lib/Options.td - ${LLVM_TBLGEN} -gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ - ${LLVM_SRCS}/lib/ToolDrivers/llvm-lib/Options.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= llvm-lib/Options.inc CFLAGS.LibDriver.cpp+= -I${.OBJDIR}/llvm-lib llvm-dlltool/Options.inc: ${LLVM_SRCS}/lib/ToolDrivers/llvm-dlltool/Options.td - ${LLVM_TBLGEN} -gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ - ${LLVM_SRCS}/lib/ToolDrivers/llvm-dlltool/Options.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= llvm-dlltool/Options.inc CFLAGS.DlltoolDriver.cpp+= -I${.OBJDIR}/llvm-dlltool @@ -2009,10 +2002,9 @@ beforebuild: SystemOperands/-gen-searchable-tables \ SystemRegister/-gen-searchable-tables ${arch:T}Gen${hdr:H}.inc: ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td - ${LLVM_TBLGEN} ${hdr:T:C/,/ /g} \ + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} ${hdr:T:C/,/ /g} \ -I ${LLVM_SRCS}/include -I ${LLVM_SRCS}/lib/Target/${arch:H} \ - -d ${.TARGET}.d -o ${.TARGET} \ - ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} . endfor .endfor .if ${MK_LLVM_TARGET_AARCH64} != "no" diff --git a/lib/clang/lldb.pre.mk b/lib/clang/lldb.pre.mk index dbbfa1dba049..b0fb73925989 100644 --- a/lib/clang/lldb.pre.mk +++ b/lib/clang/lldb.pre.mk @@ -2,4 +2,8 @@ .include "clang.pre.mk" -LLDB_SRCS= ${LLVM_BASE}/lldb +LLDB_SRCS= ${LLVM_BASE}/lldb + +LLDB_TBLGEN?= lldb-tblgen +LLDB_TBLGEN_BIN!= which ${LLDB_TBLGEN} || echo __nonexistent_lldb_tblgen__ +LLDB_TBLGEN_OPTS?= --write-if-changed diff --git a/lib/clang/llvm.pre.mk b/lib/clang/llvm.pre.mk index 92124a7bf092..834a258c20e8 100644 --- a/lib/clang/llvm.pre.mk +++ b/lib/clang/llvm.pre.mk @@ -1,8 +1,9 @@ # $FreeBSD$ -LLVM_BASE= ${SRCTOP}/contrib/llvm-project -LLVM_SRCS= ${LLVM_BASE}/llvm +LLVM_BASE= ${SRCTOP}/contrib/llvm-project +LLVM_SRCS= ${LLVM_BASE}/llvm -LLVM_TBLGEN?= llvm-tblgen -LLVM_TBLGEN_BIN!= which ${LLVM_TBLGEN} +LLVM_TBLGEN?= llvm-tblgen +LLVM_TBLGEN_BIN!= which ${LLVM_TBLGEN} || echo __nonexistent_llvm_tblgen__ +LLVM_TBLGEN_OPTS?= --write-if-changed diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index 150f74b90984..954112a83aac 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -87,13 +87,10 @@ DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a .endfor -INCFILE= Options.inc -TDFILE= ${LLD_SRCS}/ELF/Options.td -GENOPT= -gen-opt-parser-defs -${INCFILE}: ${TDFILE} - ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${TDFILE} -TGHDRS+= ${INCFILE} +Options.inc: ${LLD_SRCS}/ELF/Options.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} +TGHDRS+= Options.inc ${TGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index b11fbfbbef33..974b288406c8 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -29,13 +29,10 @@ DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a .endfor -INCFILE= LLGSOptions.inc -TDFILE= ${LLDB_SRCS}/tools/lldb-server/LLGSOptions.td -GENOPT= -gen-opt-parser-defs -${INCFILE}: ${TDFILE} - ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${TDFILE} -TGHDRS+= ${INCFILE} +LLGSOptions.inc: ${LLDB_SRCS}/tools/lldb-server/LLGSOptions.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} +TGHDRS+= LLGSOptions.inc ${TGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index b6486756d882..8b6e22de5522 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -22,13 +22,10 @@ DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a .endfor -INCFILE= Options.inc -TDFILE= ${LLVM_BASE}/${SRCDIR}/Options.td -GENOPT= -gen-opt-parser-defs -${INCFILE}: ${TDFILE} - ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${TDFILE} -TGHDRS+= ${INCFILE} +Options.inc: ${LLVM_BASE}/${SRCDIR}/Options.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} +TGHDRS+= Options.inc ${TGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile index 0ce39d66f0f5..168ba219cfc5 100644 --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -13,13 +13,10 @@ CFLAGS.llvm-cxxfilt.cpp+= -Dllvm_cxxfilt_main=main CFLAGS+= -I${.OBJDIR} -INCFILE= Opts.inc -TDFILE= ${LLVM_BASE}/${SRCDIR}/Opts.td -GENOPT= -gen-opt-parser-defs -${INCFILE}: ${TDFILE} - ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${TDFILE} -TGHDRS+= ${INCFILE} +Opts.inc: ${LLVM_BASE}/${SRCDIR}/Opts.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} +TGHDRS+= Opts.inc ${TGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/usr.bin/clang/llvm-dwarfutil/Makefile b/usr.bin/clang/llvm-dwarfutil/Makefile index 6dd9bd2d5259..fca08efcce36 100644 --- a/usr.bin/clang/llvm-dwarfutil/Makefile +++ b/usr.bin/clang/llvm-dwarfutil/Makefile @@ -10,13 +10,10 @@ SRCS+= llvm-dwarfutil.cpp CFLAGS+= -I${.OBJDIR} -INCFILE= Options.inc -TDFILE= ${LLVM_BASE}/${SRCDIR}/Options.td -GENOPT= -gen-opt-parser-defs -${INCFILE}: ${TDFILE} - ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${TDFILE} -TGHDRS+= ${INCFILE} +Options.inc: ${LLVM_BASE}/${SRCDIR}/Options.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} +TGHDRS+= Options.inc ${TGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index d3099e5a75be..702a31e7da59 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -11,13 +11,10 @@ SRCS+= llvm-nm.cpp CFLAGS+= -I${.OBJDIR} -INCFILE= Opts.inc -TDFILE= ${LLVM_BASE}/${SRCDIR}/Opts.td -GENOPT= -gen-opt-parser-defs -${INCFILE}: ${TDFILE} - ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${TDFILE} -TGHDRS+= ${INCFILE} +Opts.inc: ${LLVM_BASE}/${SRCDIR}/Opts.td + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} +TGHDRS+= Opts.inc ${TGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 5cdbf5e32d2d..9077cce53b8c 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -17,9 +17,9 @@ CFLAGS+= -I${LLVM_BASE}/${SRCDIR} .for hdr in BitcodeStripOpts InstallNameToolOpts ObjcopyOpts StripOpts ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td - ${LLVM_TBLGEN} -gen-opt-parser-defs \ + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ -I ${LLVM_SRCS}/tools/llvm-objcopy -I ${LLVM_SRCS}/include \ - -d ${.TARGET}.d -o ${.TARGET} ${LLVM_BASE}/${SRCDIR}/${hdr}.td + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= ${hdr}.inc .endfor diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index b4286ffec623..a56457396819 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -20,9 +20,9 @@ CFLAGS+= -I${.OBJDIR} .for hdr in ObjdumpOpts OtoolOpts ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td - ${LLVM_TBLGEN} -gen-opt-parser-defs \ + ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ -I ${LLVM_SRCS}/tools/llvm-objcopy -I ${LLVM_SRCS}/include \ - -d ${.TARGET}.d -o ${.TARGET} ${LLVM_BASE}/${SRCDIR}/${hdr}.td + -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} TGHDRS+= ${hdr}.inc .endfor diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile index 8926eb03bdbf..4d9611960063 100644 --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -22,13 +22,10 @@ SRCS+= XCOFFDumper.cpp *** 82 LINES SKIPPED *** From nobody Wed Mar 29 18:24: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 4Pmw1P12qCz42v4P; Wed, 29 Mar 2023 18:24:09 +0000 (UTC) (envelope-from des@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 4Pmw1P0YBsz3KgL; Wed, 29 Mar 2023 18:24:09 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680114249; 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=K5g4/DEQE0dWtmrVKDOBkhZnkA6wyPc6CQUAXlAPalE=; b=OnK26rRk5tB/YBVuRclVZkASVYktHd1+Xl4NEEMD0iKC/eS3bVfPzB9nNnsf8RHWkD3tsP rYNwPp/fxIKyLeMX6X/DuGUHED9m+9mgRb0ppLu0BNLsynOUeR1tuxVAIAHS0FENx157fM 4qQuTnK0pxgrBuxxj0xsOnpEaMiRKBYZpjyqdJuiAygVNxOOweN9sEluBT0qCOoTio3Xnm EdK3HN3cRc91d42Cd0AKTYa/lqIwykD7WOv+dfVAjhe2WPIj4D3dVjBjPkyAG5sG1v2MkR YTCz22S04veRLs1ODawLBsYdQjK1gsw7ezxY1ZlGcp95VLMDshijs4jbpHMCfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680114249; 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=K5g4/DEQE0dWtmrVKDOBkhZnkA6wyPc6CQUAXlAPalE=; b=XKtr4odb0B4669Psduo6MMG1ETCrXGGDEYVsLdyDmjB05lIfDzMTFfwCKX+DKlBSGANU9A G0SLTWvwr2OMebVKnlTTAgW4TGYSpwdk5KVTQ+RANB4kwyYymBcM5cIwL4+0zvwTMB/Qui Im5YbWLV5PjRDJ6KJ5XjE68vT9yLSKo9P2WI0vYY/K48itEfsTQqltYGtQSfLtnEibhEE4 3FXPzFUdozFnK0hxEsLiWBBy6HiUCKxpy3RQmbTonectyJIWcc+mj2kO3v/EJ55ysfL51O faYjfZvTVrZzvj/iEPd+w6Zn4BnoTDg7Gf+VI0riwgvGfJPv2Es2RN43gxdHSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680114249; a=rsa-sha256; cv=none; b=jvCzt0TidzSrFX/ZV6dnSfIOrgjmGbgJphCzWGRDdw3pbwv4MaA1gs8THY8yG32uvL4lYD 3qrpUEGP2WwRp1ujzW0aWygQyxDEHEakKL1emWHYq2phCp0K0e2Ko491CURd6r1kH5oqK4 SYKRxg/2voxRpv+0Xd0m/yvC18+7KONadg/NvTbCfsDpDd2ogHhQfCycUPDzUdI2oO5ltx /uaOAGc2i8Ad/siSVxnaJLbJU/VYG87wpEHFB6lri+yPuY2n5BoLvNbRiJ0gmumXyEx7F3 RCAY2msp+cElIUsZ0vA4a590KUcqwg4/o1ul35QsEml6WrSWEByIytZjjhYqHw== Received: from ltc.des.no (unknown [84.210.219.2]) (using TLSv1.3 with cipher TLS_AES_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 4Pmw1N5sKTz1CWT; Wed, 29 Mar 2023 18:24:08 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.no (Postfix, from userid 1001) id 3D44538DFA; Wed, 29 Mar 2023 20:24:06 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Dimitry Andric Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8f391d909808 - main - Rework {clang,lldb,llvm}-tblgen invocations to add --write-if-changed In-Reply-To: <202303291750.32THo5nr026376@gitrepo.freebsd.org> (Dimitry Andric's message of "Wed, 29 Mar 2023 17:50:05 GMT") References: <202303291750.32THo5nr026376@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (berkeley-unix) Date: Wed, 29 Mar 2023 20:24:06 +0200 Message-ID: <86r0t7za9l.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 X-ThisMailContainsUnwantedMimeParts: N Dimitry Andric writes: > Rework {clang,lldb,llvm}-tblgen invocations to add --write-if-changed =3D=3D=3D> lib/clang/headers (includes) clang-tblgen --write-if-changed --gen-arm-bf16 -I /usr/src/contrib/llvm-pr= oject/clang/include/clang/Basic -d arm_bf16.h.d -o arm_bf16.h /usr/src/con= trib/llvm-project/clang/include/clang/Basic/arm_bf16.td /usr/obj/usr/src/am= d64.amd64/tmp/legacy/usr/sbin/clang-tblgen clang-tblgen: Too many positional arguments specified! Can specify at most 1 positional arguments: See: clang-tblgen --help *** Error code 1 Stop. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed Mar 29 18:26: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 4Pmw4M0wdxz42v10; Wed, 29 Mar 2023 18: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 4Pmw4M0JRVz3L96; Wed, 29 Mar 2023 18: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=1680114403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MEJ6ZzTsrnsM19aQn6PmOtiKaBtKrFYoux2bRpzfltc=; b=fQKcag63Tx/w51g9TTfTw12wgRIPZ7MYNvLrfAV1RLKHEoAXJir6VKXtALl0X88bFXkEUp YdJjFp8J4Fyf+SMUFXrhax9P94v2+VSqOLa31wbWs5MOOfwQuv9Xk+x71EbAWISUZHaxvT Wb0pnyo5z2/GK5PC5Tq2FZ6PeaQOalybZp9tIAzkYN8q4kZXKonnuPZS/2M/a0DA0/WrSK 8c59zCg4rHThxQFEnK39ubR7+iIg7MIBO/hrrXpjz3LeTqCLrORVoefz1hbECYrAFGRzgD q+4yFbk3MMNpGgqLbWMY9arOWKjmDnX3FWaYJAlDXOyN3hYnUqdvOy8YQQVUEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680114403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MEJ6ZzTsrnsM19aQn6PmOtiKaBtKrFYoux2bRpzfltc=; b=cPIUKMuX4a0Of9WArguUhBGNLg50i6UWXD6m5t9GE5r1RYUdiHY6eoWbtGEp34bMMqPbBn KQRo6JmSnlysAoEfqRs2LY0WvM1c7wob9CvyanQrz5YAdVCHcGHm9D6AWMERhJz3McITuD 5+UavSPrZiPngMvhLrwNwholKQfw/SHEH04md01zXJBhuJ4uw5ezcPst0BjQnhtWeRSOjh stSNiwwFOrestLsZVlc09vqvhSa2+YRcX7sa000qwaLBKEyOpyAkWlF9GV3Nxb1Q+fc94J GR8NGKgP4wI+iA8iVpsXyyRDHU4cumim37NgotKk6kPlDQTpuEXGpqeCukDDig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680114403; a=rsa-sha256; cv=none; b=aQ4E1zE3gldfut/wtDsfj0/dyAlMKMhbIPehmperYNu9GzLbUpVf8bieJHb/VUNX6ai150 7IILfCX7nQXlLy9qhEuSfkHcqIcZBaJVjdTDxAO3Dy12h/xhZlSZtkNT/9u7Cd87AFYZMz sZWy8Ht/GP19dzRyKKZaAKivmMHr5CAR1Kb5oj58zwFpkgJwbhzDfd4debONKMEQv2u9lC rFfJ+eXQkaRyns7RMtQNqgZytqULZ2hYQXXcs7ZegmJG2mj1Sl4WnF4/m4+Y+ggrRmMBOg x5E/IHK6JKD4X0XZBQgMIJpdwz48EuKHDyppZn3CplNIKEMeh+kMU2SVz1j84w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmw4L6RM1zgXW; Wed, 29 Mar 2023 18:26:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TIQgbV089060; Wed, 29 Mar 2023 18:26:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TIQgYH089059; Wed, 29 Mar 2023 18:26:42 GMT (envelope-from git) Date: Wed, 29 Mar 2023 18:26:42 GMT Message-Id: <202303291826.32TIQgYH089059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: 3bbd1a1a0056 - main - camcontrol powermode: fix use-after-free List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bbd1a1a005698fcf1aaeae0065a8f2f97fdf4be Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=3bbd1a1a005698fcf1aaeae0065a8f2f97fdf4be commit 3bbd1a1a005698fcf1aaeae0065a8f2f97fdf4be Author: Eric van Gyzen AuthorDate: 2023-03-29 19:14:40 +0000 Commit: Eric van Gyzen CommitDate: 2023-03-29 19:17:16 +0000 camcontrol powermode: fix use-after-free Free the ccb after processing the response therein. Reported by: Coverity Fixes: 3bed0179ee571ba3ceadb2773f86d57af8bc5499 MFC after: 1 week Sponsored by: Dell EMC Isilon --- sbin/camcontrol/camcontrol.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 489c3026537a..9e50fbf2646e 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -9312,12 +9312,11 @@ atapm(struct cam_device *device, int argc, char **argv, /*timeout*/timeout ? timeout : 30 * 1000, /*force48bit*/0); - cam_freeccb(ccb); - - if (retval || cmd != ATA_CHECK_POWER_MODE) - return (retval); + if (retval == 0 && cmd == ATA_CHECK_POWER_MODE) + retval = atapm_proc_resp(device, ccb); - return (atapm_proc_resp(device, ccb)); + cam_freeccb(ccb); + return (retval); } static int From nobody Wed Mar 29 18:31: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 4PmwBF2VqSz42vT8; Wed, 29 Mar 2023 18:31: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 4PmwBF2J9kz3LX2; Wed, 29 Mar 2023 18:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680114709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bi3q0KW4EW78vW+qbmAmmsOPb+Q7P+9waGWFQ12jOLE=; b=pooh0YCUDvDxN6OxeyPnIBnKaW6pwtwJaIm1zhCUUw0NwPYxceD+hV8TztmKBMPWqOMBbm hfjCdPGJ2ZRtHflesEe8AeOHDqw1eZUpG7mP74SZdJDg9tddcP2iE6uJGWMYXPt61gS350 sNtvid+Is7+wziM3Exs5raPxmzAJ1bc/9FyqKNK/HoReqlqG4+PV5ay3afV1Fvx+HtJp6r Ue/Elxl8LUsbBY10DIY1ue4c+3dVUFwXjwM+Am1w/+YedEg6F4wgHfQZ+NaQtHxWET/GSr l8mbQ7nlhcQkAr3ZtAXa07iRTwOKt5n+FnOKkuWvRJjlb4YmwwjSM4qEBDmlqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680114709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bi3q0KW4EW78vW+qbmAmmsOPb+Q7P+9waGWFQ12jOLE=; b=mSyLRv9YxilRvumTvnNXy0fwtNkSuyPMixCfdRtkLkuqyExkr+wvYW8qRFm2CEXpMgo9kd G44Pq95qSQnfcamPQgHOlq2ZQ3AQ9++pjK5MWm1dfpUlX6J/EXThZc9f8hnZkwtkIYZx0L xq9iss2Er3qG0NN4ubeOstqrb/SDPO6GnOak+yLYWDHcRwijTAcrGjSeOqy0q7pvcGcph+ nw0ZGGMl4guWk5E3/AVpv9iXV17DztUGN+CTQPPmjfC/McxoXiyKz8YIlP2MR0Ri1tDK6x vL7QG+U2ykgFp/S9e77Ey77KbleSVoxrduPnAfA0V8B12+FF7kB+/NRNV71XEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680114709; a=rsa-sha256; cv=none; b=kQtTyTH+wjM/iJd91t9/IxsAG4H5wXUzMOwVT8BYB+22ZI6kEGAK9YC0OUZ486DZ8dUYlH GYM5cNPe2qRT2drGbHJi0LB9ikUximaWRgFqB5UcVS7/pvyU5nWiczoDC1b+nPIGCdgXoA aGMJd/7GORN4YaoXfXyNzOftuxvzcsUfTkI0V0/cCm0IuEGqWjo8IuQhNrJmXhL8oK/SWN ij8Q1hNIS8S9DUr5Fea90yxVFPHSf0U2O8B+5MxUGRKkZyFoLZfj62XDFTt/ys9JkcjzdM K8RHVg80PpZNv+qhwmWTj5CNNt7x51RHMbs7Fbp1AXY1oarngMKaGsqKwZwJRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmwBF1LRkzgmK; Wed, 29 Mar 2023 18:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TIVnT7001616; Wed, 29 Mar 2023 18:31:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TIVnqK001615; Wed, 29 Mar 2023 18:31:49 GMT (envelope-from git) Date: Wed, 29 Mar 2023 18:31:49 GMT Message-Id: <202303291831.32TIVnqK001615@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: d8ed7fa3d55d - main - Revert "Rework {clang,lldb,llvm}-tblgen invocations to add --write-if-changed" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: d8ed7fa3d55d57f3bb3c2eeb8826e3e0a63ccdc3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d8ed7fa3d55d57f3bb3c2eeb8826e3e0a63ccdc3 commit d8ed7fa3d55d57f3bb3c2eeb8826e3e0a63ccdc3 Author: Dimitry Andric AuthorDate: 2023-03-29 18:29:48 +0000 Commit: Dimitry Andric CommitDate: 2023-03-29 18:31:33 +0000 Revert "Rework {clang,lldb,llvm}-tblgen invocations to add --write-if-changed" This reverts commit 8f391d9098083044793ff036dff8c96930fb1553. There are still a bunch of problems, and apparently ${.ALLSRC} does not work as I expected. Fixes: 8f391d909808 --- lib/clang/clang.pre.mk | 7 +- lib/clang/headers/Makefile | 12 +- lib/clang/libclang/Makefile | 370 +++++++++++++++++---------------- lib/clang/liblldb/Makefile | 21 +- lib/clang/libllvm/Makefile | 58 +++--- lib/clang/lldb.pre.mk | 6 +- lib/clang/llvm.pre.mk | 9 +- usr.bin/clang/lld/Makefile | 11 +- usr.bin/clang/lldb-server/Makefile | 11 +- usr.bin/clang/lldb/Makefile | 11 +- usr.bin/clang/llvm-cxxfilt/Makefile | 11 +- usr.bin/clang/llvm-dwarfutil/Makefile | 11 +- usr.bin/clang/llvm-nm/Makefile | 11 +- usr.bin/clang/llvm-objcopy/Makefile | 4 +- usr.bin/clang/llvm-objdump/Makefile | 4 +- usr.bin/clang/llvm-readobj/Makefile | 11 +- usr.bin/clang/llvm-size/Makefile | 11 +- usr.bin/clang/llvm-strings/Makefile | 11 +- usr.bin/clang/llvm-symbolizer/Makefile | 11 +- 19 files changed, 328 insertions(+), 273 deletions(-) diff --git a/lib/clang/clang.pre.mk b/lib/clang/clang.pre.mk index 41071681851e..9ef401645f14 100644 --- a/lib/clang/clang.pre.mk +++ b/lib/clang/clang.pre.mk @@ -2,8 +2,7 @@ .include "llvm.pre.mk" -CLANG_SRCS= ${LLVM_BASE}/clang +CLANG_SRCS= ${LLVM_BASE}/clang -CLANG_TBLGEN?= clang-tblgen -CLANG_TBLGEN_BIN!= which ${CLANG_TBLGEN} || echo __nonexistent_clang_tblgen__ -CLANG_TBLGEN_OPTS?= --write-if-changed +CLANG_TBLGEN?= clang-tblgen +CLANG_TBLGEN_BIN!= which ${CLANG_TBLGEN} diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile index 8a4a778f43e2..df53b7dc7ea0 100644 --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@ -200,17 +200,17 @@ PPC+= ppc_wrappers/xmmintrin.h .for hdr in bf16/bf16 cde/cde-header fp16/fp16 mve/mve-header neon/neon \ sve/sve-header arm_${hdr:H}.h: ${CLANG_SRCS}/include/clang/Basic/arm_${hdr:H}.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-${hdr:T} \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-arm-${hdr:T} \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_${hdr:H}.td GENINCS+= arm_${hdr:H}.h .endfor .for hdr in vector/vector-header riscv_${hdr:H}.h: ${CLANG_SRCS}/include/clang/Basic/riscv_${hdr:H}.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-riscv-${hdr:T} \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-riscv-${hdr:T} \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_${hdr:H}.td GENINCS+= riscv_${hdr:H}.h .endfor diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 5e493e3509c9..ac85db06ed58 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -760,339 +760,358 @@ SRCS_ALL+= ${SRCS_LDB} SRCS+= ${SRCS_ALL:O} clang/AST/AbstractBasicReader.inc: \ - ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-basic-reader \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td + ${CLANG_TBLGEN} -gen-clang-basic-reader \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td TGHDRS+= clang/AST/AbstractBasicReader.inc clang/AST/AbstractBasicWriter.inc: \ - ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-basic-writer \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td + ${CLANG_TBLGEN} -gen-clang-basic-writer \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td TGHDRS+= clang/AST/AbstractBasicWriter.inc clang/AST/AbstractTypeReader.inc: \ - ${CLANG_SRCS}/include/clang/AST/TypeProperties.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-type-reader \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/AST/TypeProperties.td + ${CLANG_TBLGEN} -gen-clang-type-reader \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/AST/TypeProperties.td TGHDRS+= clang/AST/AbstractTypeReader.inc clang/AST/AbstractTypeWriter.inc: \ - ${CLANG_SRCS}/include/clang/AST/TypeProperties.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-type-writer \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/AST/TypeProperties.td + ${CLANG_TBLGEN} -gen-clang-type-writer \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/AST/TypeProperties.td TGHDRS+= clang/AST/AbstractTypeWriter.inc clang/AST/AttrImpl.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-impl \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-impl \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/AST/AttrImpl.inc clang/AST/AttrNodeTraverse.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-node-traverse \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-node-traverse \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/AST/AttrNodeTraverse.inc clang/AST/AttrTextNodeDump.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-text-node-dump \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-text-node-dump \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/AST/AttrTextNodeDump.inc clang/AST/AttrVisitor.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-ast-visitor \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-ast-visitor \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/AST/AttrVisitor.inc clang/AST/Attrs.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-classes \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-classes \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/AST/Attrs.inc clang/AST/CommentCommandInfo.inc: \ - ${CLANG_SRCS}/include/clang/AST/CommentCommands.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-comment-command-info \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/AST/CommentCommands.td + ${CLANG_TBLGEN} -gen-clang-comment-command-info \ + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/AST/CommentCommands.td TGHDRS+= clang/AST/CommentCommandInfo.inc clang/AST/CommentCommandList.inc: \ - ${CLANG_SRCS}/include/clang/AST/CommentCommands.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-comment-command-list \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/AST/CommentCommands.td + ${CLANG_TBLGEN} -gen-clang-comment-command-list \ + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/AST/CommentCommands.td TGHDRS+= clang/AST/CommentCommandList.inc clang/AST/CommentHTMLNamedCharacterReferences.inc: \ - ${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ - --gen-clang-comment-html-named-character-references \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td + ${CLANG_TBLGEN} -gen-clang-comment-html-named-character-references \ + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td TGHDRS+= clang/AST/CommentHTMLNamedCharacterReferences.inc clang/AST/CommentHTMLTags.inc: \ - ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-comment-html-tags \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td + ${CLANG_TBLGEN} -gen-clang-comment-html-tags \ + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td TGHDRS+= clang/AST/CommentHTMLTags.inc clang/AST/CommentHTMLTagsProperties.inc: \ - ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ - --gen-clang-comment-html-tags-properties -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td + ${CLANG_TBLGEN} -gen-clang-comment-html-tags-properties \ + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td TGHDRS+= clang/AST/CommentHTMLTagsProperties.inc clang/AST/CommentNodes.inc: ${CLANG_SRCS}/include/clang/Basic/CommentNodes.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-comment-nodes \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-comment-nodes \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/CommentNodes.td TGHDRS+= clang/AST/CommentNodes.inc clang/AST/DeclNodes.inc: ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-decl-nodes \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-decl-nodes \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td TGHDRS+= clang/AST/DeclNodes.inc clang/AST/StmtDataCollectors.inc: \ - ${CLANG_SRCS}/include/clang/AST/StmtDataCollectors.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-data-collectors \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/AST/StmtDataCollectors.td + ${CLANG_TBLGEN} -gen-clang-data-collectors \ + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/AST/StmtDataCollectors.td TGHDRS+= clang/AST/StmtDataCollectors.inc clang/AST/StmtNodes.inc: ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-stmt-nodes \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-stmt-nodes \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td TGHDRS+= clang/AST/StmtNodes.inc clang/AST/TypeNodes.inc: ${CLANG_SRCS}/include/clang/Basic/TypeNodes.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-type-nodes \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-type-nodes \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/TypeNodes.td TGHDRS+= clang/AST/TypeNodes.inc clang/Basic/AttrHasAttributeImpl.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ - --gen-clang-attr-has-attribute-impl -I ${CLANG_SRCS}/include \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-has-attribute-impl \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/Basic/AttrHasAttributeImpl.inc clang/Basic/AttrList.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-list \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-list \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/Basic/AttrList.inc -clang/Basic/AttrSubMatchRulesList.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ - --gen-clang-attr-subject-match-rule-list -I ${CLANG_SRCS}/include \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} +clang/Basic/AttrSubMatchRulesList.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} -gen-clang-attr-subject-match-rule-list \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/Basic/AttrSubMatchRulesList.inc .for hdr in \ AST Analysis Comment Common CrossTU Driver Frontend Lex Parse \ Refactoring Sema Serialization SemaSerialization clang/Basic/Diagnostic${hdr}Kinds.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-diags-defs \ - -clang-component=${hdr} -I ${CLANG_SRCS}/include/clang/Basic \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td + ${CLANG_TBLGEN} -gen-clang-diags-defs -clang-component=${hdr} \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td TGHDRS+= clang/Basic/Diagnostic${hdr}Kinds.inc .endfor clang/Basic/DiagnosticGroups.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-diag-groups \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td + ${CLANG_TBLGEN} -gen-clang-diag-groups \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td TGHDRS+= clang/Basic/DiagnosticGroups.inc clang/Basic/DiagnosticIndexName.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-diags-index-name \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td + ${CLANG_TBLGEN} -gen-clang-diags-index-name \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td TGHDRS+= clang/Basic/DiagnosticIndexName.inc clang/Basic/arm_fp16.inc: ${CLANG_SRCS}/include/clang/Basic/arm_fp16.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-neon-sema \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-arm-neon-sema \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_fp16.td TGHDRS+= clang/Basic/arm_fp16.inc clang/Basic/arm_neon.inc: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-neon-sema \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-arm-neon-sema \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_neon.td TGHDRS+= clang/Basic/arm_neon.inc clang/Basic/arm_cde_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_cde.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-cde-builtin-def \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-arm-cde-builtin-def \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td TGHDRS+= clang/Basic/arm_cde_builtins.inc clang/Basic/arm_cde_builtin_aliases.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_cde.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-cde-builtin-aliases \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_TBLGEN} -gen-arm-cde-builtin-aliases \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td TGHDRS+= clang/Basic/arm_cde_builtin_aliases.inc -clang/Basic/arm_cde_builtin_cg.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_cde.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-cde-builtin-codegen \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} +clang/Basic/arm_cde_builtin_cg.inc: ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_TBLGEN} -gen-arm-cde-builtin-codegen \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td TGHDRS+= clang/Basic/arm_cde_builtin_cg.inc clang/Basic/arm_cde_builtin_sema.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_cde.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-cde-builtin-sema \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_TBLGEN} -gen-arm-cde-builtin-sema \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td TGHDRS+= clang/Basic/arm_cde_builtin_sema.inc clang/Basic/arm_mve_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_mve.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-mve-builtin-def \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-arm-mve-builtin-def \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_mve.td TGHDRS+= clang/Basic/arm_mve_builtins.inc clang/Basic/arm_mve_builtin_aliases.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_mve.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-mve-builtin-aliases \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/arm_mve.td + ${CLANG_TBLGEN} -gen-arm-mve-builtin-aliases \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_mve.td TGHDRS+= clang/Basic/arm_mve_builtin_aliases.inc -clang/Basic/arm_mve_builtin_cg.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_mve.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-mve-builtin-codegen \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} +clang/Basic/arm_mve_builtin_cg.inc: ${CLANG_SRCS}/include/clang/Basic/arm_mve.td + ${CLANG_TBLGEN} -gen-arm-mve-builtin-codegen \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_mve.td TGHDRS+= clang/Basic/arm_mve_builtin_cg.inc clang/Basic/arm_mve_builtin_sema.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_mve.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-mve-builtin-sema \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/arm_mve.td + ${CLANG_TBLGEN} -gen-arm-mve-builtin-sema \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_mve.td TGHDRS+= clang/Basic/arm_mve_builtin_sema.inc clang/Basic/arm_sve_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_sve.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-sve-builtins \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-arm-sve-builtins \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td TGHDRS+= clang/Basic/arm_sve_builtins.inc -clang/Basic/arm_sve_builtin_cg.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_sve.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-sve-builtin-codegen \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} +clang/Basic/arm_sve_builtin_cg.inc: ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_TBLGEN} -gen-arm-sve-builtin-codegen \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td TGHDRS+= clang/Basic/arm_sve_builtin_cg.inc clang/Basic/arm_sve_sema_rangechecks.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_sve.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-sve-sema-rangechecks \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_TBLGEN} -gen-arm-sve-sema-rangechecks \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td TGHDRS+= clang/Basic/arm_sve_sema_rangechecks.inc clang/Basic/arm_sve_typeflags.inc: \ - ${CLANG_SRCS}/include/clang/Basic/arm_sve.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-arm-sve-typeflags \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_TBLGEN} -gen-arm-sve-typeflags \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td TGHDRS+= clang/Basic/arm_sve_typeflags.inc clang/Basic/riscv_vector_builtins.inc: \ - ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-riscv-vector-builtins \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td + ${CLANG_TBLGEN} -gen-riscv-vector-builtins \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td TGHDRS+= clang/Basic/riscv_vector_builtins.inc clang/Basic/riscv_vector_builtin_cg.inc: \ - ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ - --gen-riscv-vector-builtin-codegen \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td + ${CLANG_TBLGEN} -gen-riscv-vector-builtin-codegen \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td TGHDRS+= clang/Basic/riscv_vector_builtin_cg.inc clang/Basic/riscv_vector_builtin_sema.inc: \ - ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-riscv-vector-builtin-sema \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET}.d \ - -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td + ${CLANG_TBLGEN} -gen-riscv-vector-builtin-sema \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td TGHDRS+= clang/Basic/riscv_vector_builtin_sema.inc clang/Parse/AttrParserStringSwitches.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ - --gen-clang-attr-parser-string-switches -I ${CLANG_SRCS}/include \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} -gen-clang-attr-parser-string-switches \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/Parse/AttrParserStringSwitches.inc clang/Parse/AttrSubMatchRulesParserStringSwitches.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ - --gen-clang-attr-subject-match-rules-parser-string-switches \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} -gen-clang-attr-subject-match-rules-parser-string-switches \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/Parse/AttrSubMatchRulesParserStringSwitches.inc clang/Sema/AttrParsedAttrImpl.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ - --gen-clang-attr-parsed-attr-impl -I ${CLANG_SRCS}/include \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-impl \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/Sema/AttrParsedAttrImpl.inc clang/Sema/AttrParsedAttrKinds.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ - --gen-clang-attr-parsed-attr-kinds -I ${CLANG_SRCS}/include \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-kinds \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/Sema/AttrParsedAttrKinds.inc clang/Sema/AttrParsedAttrList.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ - --gen-clang-attr-parsed-attr-list -I ${CLANG_SRCS}/include \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-list \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/Sema/AttrParsedAttrList.inc clang/Sema/AttrSpellingListIndex.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-spelling-index \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-spelling-index \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/Sema/AttrSpellingListIndex.inc clang/Sema/AttrTemplateInstantiate.inc: \ - ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} \ - --gen-clang-attr-template-instantiate -I ${CLANG_SRCS}/include \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_SRCS}/include/clang/Basic/Attr.td + ${CLANG_TBLGEN} -gen-clang-attr-template-instantiate \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/Sema/AttrTemplateInstantiate.inc clang/Serialization/AttrPCHRead.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-pch-read \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-pch-read \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/Serialization/AttrPCHRead.inc clang/Serialization/AttrPCHWrite.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-attr-pch-write \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-attr-pch-write \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Basic/Attr.td TGHDRS+= clang/Serialization/AttrPCHWrite.inc clang/StaticAnalyzer/Checkers/Checkers.inc: \ - ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-sa-checkers \ + ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td + ${CLANG_TBLGEN} -gen-clang-sa-checkers \ -I ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td TGHDRS+= clang/StaticAnalyzer/Checkers/Checkers.inc Opcodes.inc: ${CLANG_SRCS}/lib/AST/Interp/Opcodes.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-opcodes \ - -I ${CLANG_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-opcodes \ + -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/lib/AST/Interp/Opcodes.td TGHDRS+= Opcodes.inc OpenCLBuiltins.inc: ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td - ${CLANG_TBLGEN} ${CLANG_TBLGEN_OPTS} --gen-clang-opencl-builtins \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${CLANG_TBLGEN} -gen-clang-opencl-builtins \ + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td TGHDRS+= OpenCLBuiltins.inc ${TGHDRS}: ${CLANG_TBLGEN_BIN} @@ -1102,9 +1121,10 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ + ${LLVM_TBLGEN} -gen-opt-parser-defs \ -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Driver/Options.td LTGHDRS+= clang/Driver/Options.inc ${LTGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index 2dfb585ee731..1a1494fd2bfb 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -700,10 +700,13 @@ SRCS+= Utility/VMRange.cpp SRCS+= Utility/XcodeSDK.cpp SRCS+= Version/Version.cpp +LLDB_TBLGEN?= lldb-tblgen +LLDB_TBLGEN_BIN!= which ${LLDB_TBLGEN} + CommandOptions.inc: ${LLDB_SRCS}/source/Commands/Options.td - ${LLDB_TBLGEN} ${LLDB_TBLGEN_OPTS} --gen-lldb-option-defs \ - -I ${LLDB_SRCS}/source/Commands -d ${.TARGET}.d -o ${.TARGET} \ - ${.ALLSRC} + ${LLDB_TBLGEN} -gen-lldb-option-defs \ + -I ${LLDB_SRCS}/source/Commands -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${LLDB_SRCS}/source/Commands/Options.td TGHDRS+= CommandOptions.inc .for path in \ @@ -714,15 +717,15 @@ TGHDRS+= CommandOptions.inc Plugins/SymbolFile/DWARF/SymbolFileDWARF \ Target/Target ${path:T}Properties.inc: ${LLDB_SRCS}/source/${path}Properties.td - ${LLDB_TBLGEN} ${LLDB_TBLGEN_OPTS} --gen-lldb-property-defs \ - -I ${LLDB_SRCS}/source/${path:H} -d ${.TARGET}.d -o ${.TARGET} \ - ${.ALLSRC} + ${LLDB_TBLGEN} -gen-lldb-property-defs \ + -I ${LLDB_SRCS}/source/${path:H} -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${LLDB_SRCS}/source/${path}Properties.td TGHDRS+= ${path:T}Properties.inc ${path:T}PropertiesEnum.inc: ${LLDB_SRCS}/source/${path}Properties.td - ${LLDB_TBLGEN} ${LLDB_TBLGEN_OPTS} --gen-lldb-property-enum-defs \ - -I ${LLDB_SRCS}/source/${path:H} -d ${.TARGET}.d -o ${.TARGET} \ - ${.ALLSRC} + ${LLDB_TBLGEN} -gen-lldb-property-enum-defs \ + -I ${LLDB_SRCS}/source/${path:H} -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${LLDB_SRCS}/source/${path}Properties.td TGHDRS+= ${path:T}PropertiesEnum.inc .endfor diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 63b95219735c..1cfd75f509c0 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -1907,57 +1907,64 @@ SRCS_ALL+= ${SRCS_XDW} SRCS+= ${GENSRCS} SRCS+= ${SRCS_ALL:O} -llvm/Frontend/OpenMP/OMP.h.inc: \ - ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-directive-decl \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} +llvm/Frontend/OpenMP/OMP.h.inc: ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td + ${LLVM_TBLGEN} --gen-directive-decl \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ + ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td TGHDRS+= llvm/Frontend/OpenMP/OMP.h.inc llvm/Frontend/OpenMP/OMP.inc: ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-directive-impl \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${LLVM_TBLGEN} --gen-directive-impl \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ + ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td TGHDRS+= llvm/Frontend/OpenMP/OMP.inc OMP.cpp: ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-directive-impl \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${LLVM_TBLGEN} --gen-directive-impl \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ + ${LLVM_SRCS}/include/llvm/Frontend/OpenMP/OMP.td GENSRCS+= OMP.cpp llvm/IR/Attributes.inc: ${LLVM_SRCS}/include/llvm/IR/Attributes.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-attrs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${LLVM_TBLGEN} -gen-attrs \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ + ${LLVM_SRCS}/include/llvm/IR/Attributes.td TGHDRS+= llvm/IR/Attributes.inc llvm/IR/IntrinsicEnums.inc: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-intrinsic-enums \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${LLVM_TBLGEN} -gen-intrinsic-enums \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ + ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td TGHDRS+= llvm/IR/IntrinsicEnums.inc llvm/IR/IntrinsicImpl.inc: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-intrinsic-impl \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${LLVM_TBLGEN} -gen-intrinsic-impl \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ + ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td TGHDRS+= llvm/IR/IntrinsicImpl.inc .for arch in \ AArch64/aarch64 AMDGPU/amdgcn ARM/arm BPF/bpf DirectX/dx \ - Hexagon/hexagon Mips/mips NVPTX/nvvm PowerPC/ppc R600/r600 \ - RISCV/riscv S390/s390 VE/ve WebAssembly/wasm X86/x86 XCore/xcore + Hexagon/hexagon Mips/mips NVPTX/nvvm PowerPC/ppc R600/r600 RISCV/riscv \ + S390/s390 VE/ve WebAssembly/wasm X86/x86 XCore/xcore llvm/IR/Intrinsics${arch:H}.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} \ - --gen-intrinsic-enums -intrinsic-prefix=${arch:T} \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${LLVM_TBLGEN} -gen-intrinsic-enums -intrinsic-prefix=${arch:T} \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ + ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td TGHDRS+= llvm/IR/Intrinsics${arch:H}.h .endfor llvm-lib/Options.inc: ${LLVM_SRCS}/lib/ToolDrivers/llvm-lib/Options.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${LLVM_TBLGEN} -gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ + ${LLVM_SRCS}/lib/ToolDrivers/llvm-lib/Options.td TGHDRS+= llvm-lib/Options.inc CFLAGS.LibDriver.cpp+= -I${.OBJDIR}/llvm-lib llvm-dlltool/Options.inc: ${LLVM_SRCS}/lib/ToolDrivers/llvm-dlltool/Options.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + ${LLVM_TBLGEN} -gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ + ${LLVM_SRCS}/lib/ToolDrivers/llvm-dlltool/Options.td TGHDRS+= llvm-dlltool/Options.inc CFLAGS.DlltoolDriver.cpp+= -I${.OBJDIR}/llvm-dlltool @@ -2002,9 +2009,10 @@ beforebuild: SystemOperands/-gen-searchable-tables \ SystemRegister/-gen-searchable-tables ${arch:T}Gen${hdr:H}.inc: ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} ${hdr:T:C/,/ /g} \ + ${LLVM_TBLGEN} ${hdr:T:C/,/ /g} \ -I ${LLVM_SRCS}/include -I ${LLVM_SRCS}/lib/Target/${arch:H} \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + -d ${.TARGET}.d -o ${.TARGET} \ + ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td . endfor .endfor .if ${MK_LLVM_TARGET_AARCH64} != "no" diff --git a/lib/clang/lldb.pre.mk b/lib/clang/lldb.pre.mk index b0fb73925989..dbbfa1dba049 100644 --- a/lib/clang/lldb.pre.mk +++ b/lib/clang/lldb.pre.mk @@ -2,8 +2,4 @@ .include "clang.pre.mk" -LLDB_SRCS= ${LLVM_BASE}/lldb - -LLDB_TBLGEN?= lldb-tblgen -LLDB_TBLGEN_BIN!= which ${LLDB_TBLGEN} || echo __nonexistent_lldb_tblgen__ -LLDB_TBLGEN_OPTS?= --write-if-changed +LLDB_SRCS= ${LLVM_BASE}/lldb diff --git a/lib/clang/llvm.pre.mk b/lib/clang/llvm.pre.mk index 834a258c20e8..92124a7bf092 100644 --- a/lib/clang/llvm.pre.mk +++ b/lib/clang/llvm.pre.mk @@ -1,9 +1,8 @@ # $FreeBSD$ -LLVM_BASE= ${SRCTOP}/contrib/llvm-project -LLVM_SRCS= ${LLVM_BASE}/llvm +LLVM_BASE= ${SRCTOP}/contrib/llvm-project +LLVM_SRCS= ${LLVM_BASE}/llvm -LLVM_TBLGEN?= llvm-tblgen -LLVM_TBLGEN_BIN!= which ${LLVM_TBLGEN} || echo __nonexistent_llvm_tblgen__ -LLVM_TBLGEN_OPTS?= --write-if-changed +LLVM_TBLGEN?= llvm-tblgen +LLVM_TBLGEN_BIN!= which ${LLVM_TBLGEN} diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index 954112a83aac..150f74b90984 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -87,10 +87,13 @@ DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a .endfor -Options.inc: ${LLD_SRCS}/ELF/Options.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} -TGHDRS+= Options.inc +INCFILE= Options.inc +TDFILE= ${LLD_SRCS}/ELF/Options.td +GENOPT= -gen-opt-parser-defs +${INCFILE}: ${TDFILE} + ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${TDFILE} +TGHDRS+= ${INCFILE} ${TGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index 974b288406c8..b11fbfbbef33 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -29,10 +29,13 @@ DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a .endfor -LLGSOptions.inc: ${LLDB_SRCS}/tools/lldb-server/LLGSOptions.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} -TGHDRS+= LLGSOptions.inc +INCFILE= LLGSOptions.inc +TDFILE= ${LLDB_SRCS}/tools/lldb-server/LLGSOptions.td +GENOPT= -gen-opt-parser-defs +${INCFILE}: ${TDFILE} + ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${TDFILE} +TGHDRS+= ${INCFILE} ${TGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index 8b6e22de5522..b6486756d882 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -22,10 +22,13 @@ DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a .endfor -Options.inc: ${LLVM_BASE}/${SRCDIR}/Options.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} -TGHDRS+= Options.inc +INCFILE= Options.inc +TDFILE= ${LLVM_BASE}/${SRCDIR}/Options.td +GENOPT= -gen-opt-parser-defs +${INCFILE}: ${TDFILE} + ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${TDFILE} +TGHDRS+= ${INCFILE} ${TGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile index 168ba219cfc5..0ce39d66f0f5 100644 --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -13,10 +13,13 @@ CFLAGS.llvm-cxxfilt.cpp+= -Dllvm_cxxfilt_main=main CFLAGS+= -I${.OBJDIR} -Opts.inc: ${LLVM_BASE}/${SRCDIR}/Opts.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} -TGHDRS+= Opts.inc +INCFILE= Opts.inc +TDFILE= ${LLVM_BASE}/${SRCDIR}/Opts.td +GENOPT= -gen-opt-parser-defs +${INCFILE}: ${TDFILE} + ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${TDFILE} +TGHDRS+= ${INCFILE} ${TGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/usr.bin/clang/llvm-dwarfutil/Makefile b/usr.bin/clang/llvm-dwarfutil/Makefile index fca08efcce36..6dd9bd2d5259 100644 --- a/usr.bin/clang/llvm-dwarfutil/Makefile +++ b/usr.bin/clang/llvm-dwarfutil/Makefile @@ -10,10 +10,13 @@ SRCS+= llvm-dwarfutil.cpp CFLAGS+= -I${.OBJDIR} -Options.inc: ${LLVM_BASE}/${SRCDIR}/Options.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} -TGHDRS+= Options.inc +INCFILE= Options.inc +TDFILE= ${LLVM_BASE}/${SRCDIR}/Options.td +GENOPT= -gen-opt-parser-defs +${INCFILE}: ${TDFILE} + ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${TDFILE} +TGHDRS+= ${INCFILE} ${TGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 702a31e7da59..d3099e5a75be 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -11,10 +11,13 @@ SRCS+= llvm-nm.cpp CFLAGS+= -I${.OBJDIR} -Opts.inc: ${LLVM_BASE}/${SRCDIR}/Opts.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} -TGHDRS+= Opts.inc +INCFILE= Opts.inc +TDFILE= ${LLVM_BASE}/${SRCDIR}/Opts.td +GENOPT= -gen-opt-parser-defs +${INCFILE}: ${TDFILE} + ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${TDFILE} +TGHDRS+= ${INCFILE} ${TGHDRS}: ${LLVM_TBLGEN_BIN} diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 9077cce53b8c..5cdbf5e32d2d 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -17,9 +17,9 @@ CFLAGS+= -I${LLVM_BASE}/${SRCDIR} .for hdr in BitcodeStripOpts InstallNameToolOpts ObjcopyOpts StripOpts ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ + ${LLVM_TBLGEN} -gen-opt-parser-defs \ -I ${LLVM_SRCS}/tools/llvm-objcopy -I ${LLVM_SRCS}/include \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + -d ${.TARGET}.d -o ${.TARGET} ${LLVM_BASE}/${SRCDIR}/${hdr}.td TGHDRS+= ${hdr}.inc .endfor diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index a56457396819..b4286ffec623 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -20,9 +20,9 @@ CFLAGS+= -I${.OBJDIR} .for hdr in ObjdumpOpts OtoolOpts ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ + ${LLVM_TBLGEN} -gen-opt-parser-defs \ -I ${LLVM_SRCS}/tools/llvm-objcopy -I ${LLVM_SRCS}/include \ - -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} + -d ${.TARGET}.d -o ${.TARGET} ${LLVM_BASE}/${SRCDIR}/${hdr}.td TGHDRS+= ${hdr}.inc .endfor diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile index 4d9611960063..8926eb03bdbf 100644 --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -22,10 +22,13 @@ SRCS+= XCOFFDumper.cpp CFLAGS+= -I${.OBJDIR} -Opts.inc: ${LLVM_BASE}/${SRCDIR}/Opts.td - ${LLVM_TBLGEN} ${LLVM_TBLGEN_OPTS} --gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} ${.ALLSRC} *** 77 LINES SKIPPED *** From nobody Wed Mar 29 18:40: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 4PmwNK3Hjvz42vww; Wed, 29 Mar 2023 18:40: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 4PmwNK2pRZz3NG2; Wed, 29 Mar 2023 18:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680115233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ff/iTI+Tsji+mUZa1eGwc2PNc429YaHd0I4a6EjR3Jg=; b=EvOD/eOuuZEA5UAUUg6HAtmpwui9+8kIpbkmz9IoPXdrV/sHkZhKwF8NlOrqo8Ms8qE2wI Pgfhi4fNMQ2yEbjpxncZUAub06qAnZrOdaGG2Hc8/lSysN7DU9jVV3th9p+mcWXRGdu4pR RmlYgqiQcbpopGUp6swQ5mUv6RbgU9IO/ej+JSd07phhPrhrFYoPsWJZGIFHwwa/l92wVi Kap1xX6+y4K9ZJ48TEwtkaJ0q0td9lTBwcS6rGKeL2NCantX6f9nqRNlj8C8QnRUC4SR9U Reibgs3SNWHU+o6JNlnMScUHX9O66m6aBt2VebSpl9uZbZCl4UpQBBjeIwIPVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680115233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ff/iTI+Tsji+mUZa1eGwc2PNc429YaHd0I4a6EjR3Jg=; b=gMkymS3SIwUGnUheuo0TqGHAkX9iea/cTYmGPibb62MHbZ8463lrRfOrXAWI4PyAttsWzE V6Fs0n3TVnOFh95pnJpSRW+Q8gi523UZ1cby4RpuMtuZOVpr6nV0c9r/hI9YYbBKrDxi33 O/3qrSYReqik1VA8WSpQGTNTdwYyRN5WDsAk0jrtQSvuegEOdKbpC7++a9jEC2JhWzE5tQ tIe34QSJqdoyjigOSQZ44VrTfdao1wDoBrng7/z+XhxlnC4YOgYsWA44p0mT8GjftcbDR6 SfaDNTK+XW81c0fR8k58/7Ia6mZH3kbKJmD5p1nPTboSy/nkERisSCGkjX39qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680115233; a=rsa-sha256; cv=none; b=slF0mRvpwT3S/ap9mNc4iK6/HIO7+cuTX9NebXSOvMA188Acw+pkHCzLPmBkXbPFqjQaHi mZbIF53Ue9oVe/5XGRxn2QzT/JV4lyU9rfXOAnLmZ7CjEFIP8KW2j7tR7exdaX9/graaOy ENdHb6IAWRzCQ0zmArVSDdBfDoK7KbqddIlHS4EG+GUpFT40zttbA4ZsBTkCvT1zzGApjK Si6gq+XyalsWkbM1WbvENIjjK0bXJz/99ptob0keDv0nsQdYZF9+M9q1T/wSusaUc73JkO ch4Vfq08qcbHi/Vhrgux+GPAQqxe32gzx44O12EohQ38lna3DwhDIUIvTLGNKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmwNK1rq1zh27; Wed, 29 Mar 2023 18:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TIeXEe014379; Wed, 29 Mar 2023 18:40:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TIeXQa014378; Wed, 29 Mar 2023 18:40:33 GMT (envelope-from git) Date: Wed, 29 Mar 2023 18:40:33 GMT Message-Id: <202303291840.32TIeXQa014378@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: 4dc3b1fa1bbc - main - Revert "Ensure .inc files are regenerated when llvm/clang tblgen binaries change" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 4dc3b1fa1bbcf20f7713d94776a1604964ada32b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4dc3b1fa1bbcf20f7713d94776a1604964ada32b commit 4dc3b1fa1bbcf20f7713d94776a1604964ada32b Author: Dimitry Andric AuthorDate: 2023-03-29 18:37:02 +0000 Commit: Dimitry Andric CommitDate: 2023-03-29 18:37:02 +0000 Revert "Ensure .inc files are regenerated when llvm/clang tblgen binaries change" This reverts commit ab80f0b21fbb9c44d40e6f7a99090188f4ed2f71. The intent of this change was to avoid possible compilation errors when certain .inc files were not regenerated, but the method turns out to cause way more rebuilds than anticipated. Another method will have to be found, and in the mean time, WITH_CLEAN is the solution that always works. Fixes: ab80f0b21fbb --- lib/clang/clang.pre.mk | 1 - lib/clang/headers/Makefile | 2 -- lib/clang/libclang/Makefile | 22 +++++++--------------- lib/clang/liblldb/Makefile | 3 --- lib/clang/libllvm/Makefile | 2 -- lib/clang/llvm.pre.mk | 1 - usr.bin/clang/lld/Makefile | 2 -- usr.bin/clang/lldb-server/Makefile | 2 -- usr.bin/clang/lldb/Makefile | 2 -- usr.bin/clang/llvm-cxxfilt/Makefile | 2 -- usr.bin/clang/llvm-dwarfutil/Makefile | 2 -- usr.bin/clang/llvm-nm/Makefile | 2 -- usr.bin/clang/llvm-objcopy/Makefile | 2 -- usr.bin/clang/llvm-objdump/Makefile | 2 -- usr.bin/clang/llvm-readobj/Makefile | 2 -- usr.bin/clang/llvm-size/Makefile | 2 -- usr.bin/clang/llvm-strings/Makefile | 2 -- usr.bin/clang/llvm-symbolizer/Makefile | 2 -- 18 files changed, 7 insertions(+), 48 deletions(-) diff --git a/lib/clang/clang.pre.mk b/lib/clang/clang.pre.mk index 9ef401645f14..520a9300e6ce 100644 --- a/lib/clang/clang.pre.mk +++ b/lib/clang/clang.pre.mk @@ -5,4 +5,3 @@ CLANG_SRCS= ${LLVM_BASE}/clang CLANG_TBLGEN?= clang-tblgen -CLANG_TBLGEN_BIN!= which ${CLANG_TBLGEN} diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile index df53b7dc7ea0..4e5a08e9fed2 100644 --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@ -214,8 +214,6 @@ riscv_${hdr:H}.h: ${CLANG_SRCS}/include/clang/Basic/riscv_${hdr:H}.td GENINCS+= riscv_${hdr:H}.h .endfor -${GENINCS}: ${CLANG_TBLGEN_BIN} - CLEANFILES= ${GENINCS} ${GENINCS:C/$/.d/} .include diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index ac85db06ed58..7181da12a065 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -1037,6 +1037,13 @@ clang/Basic/riscv_vector_builtin_sema.inc: \ -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td TGHDRS+= clang/Basic/riscv_vector_builtin_sema.inc +clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td + ${LLVM_TBLGEN} -gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Driver/Options.td +TGHDRS+= clang/Driver/Options.inc + clang/Parse/AttrParserStringSwitches.inc: \ ${CLANG_SRCS}/include/clang/Basic/Attr.td ${CLANG_TBLGEN} -gen-clang-attr-parser-string-switches \ @@ -1114,25 +1121,10 @@ OpenCLBuiltins.inc: ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td TGHDRS+= OpenCLBuiltins.inc -${TGHDRS}: ${CLANG_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td - ${LLVM_TBLGEN} -gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Driver/Options.td -LTGHDRS+= clang/Driver/Options.inc - -${LTGHDRS}: ${LLVM_TBLGEN_BIN} - -DEPENDFILES+= ${LTGHDRS:C/$/.d/} -DPSRCS+= ${LTGHDRS} -CLEANFILES+= ${LTGHDRS} ${LTGHDRS:C/$/.d/} - .include "../clang.build.mk" INTERNALLIB= diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index 1a1494fd2bfb..e5590ff1e536 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -701,7 +701,6 @@ SRCS+= Utility/XcodeSDK.cpp SRCS+= Version/Version.cpp LLDB_TBLGEN?= lldb-tblgen -LLDB_TBLGEN_BIN!= which ${LLDB_TBLGEN} CommandOptions.inc: ${LLDB_SRCS}/source/Commands/Options.td ${LLDB_TBLGEN} -gen-lldb-option-defs \ @@ -729,8 +728,6 @@ ${path:T}PropertiesEnum.inc: ${LLDB_SRCS}/source/${path}Properties.td TGHDRS+= ${path:T}PropertiesEnum.inc .endfor -${TGHDRS}: ${LLDB_TBLGEN_BIN} - DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 1cfd75f509c0..a031f0fdd706 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -2128,8 +2128,6 @@ TGHDRS+= X86GenRegisterInfo.inc TGHDRS+= X86GenSubtargetInfo.inc .endif # MK_LLVM_TARGET_X86 -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/lib/clang/llvm.pre.mk b/lib/clang/llvm.pre.mk index 92124a7bf092..774d7d47ea37 100644 --- a/lib/clang/llvm.pre.mk +++ b/lib/clang/llvm.pre.mk @@ -5,4 +5,3 @@ LLVM_BASE= ${SRCTOP}/contrib/llvm-project LLVM_SRCS= ${LLVM_BASE}/llvm LLVM_TBLGEN?= llvm-tblgen -LLVM_TBLGEN_BIN!= which ${LLVM_TBLGEN} diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index 150f74b90984..aed22a7ae847 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -95,8 +95,6 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index b11fbfbbef33..532c2aa2047a 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -37,8 +37,6 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index b6486756d882..0637b8844cad 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -30,8 +30,6 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile index 0ce39d66f0f5..0036fbe6cf8d 100644 --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -21,8 +21,6 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-dwarfutil/Makefile b/usr.bin/clang/llvm-dwarfutil/Makefile index 6dd9bd2d5259..a436acf0e197 100644 --- a/usr.bin/clang/llvm-dwarfutil/Makefile +++ b/usr.bin/clang/llvm-dwarfutil/Makefile @@ -18,8 +18,6 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index d3099e5a75be..0df48744632d 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -19,8 +19,6 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 5cdbf5e32d2d..20f5f191b766 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -23,8 +23,6 @@ ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td TGHDRS+= ${hdr}.inc .endfor -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index b4286ffec623..c20bc172528f 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -26,8 +26,6 @@ ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td TGHDRS+= ${hdr}.inc .endfor -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile index 8926eb03bdbf..4b547d81c583 100644 --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -30,8 +30,6 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile index f39e5db6f872..20bd5de61192 100644 --- a/usr.bin/clang/llvm-size/Makefile +++ b/usr.bin/clang/llvm-size/Makefile @@ -19,8 +19,6 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-strings/Makefile b/usr.bin/clang/llvm-strings/Makefile index 253766ba084d..1438aa847997 100644 --- a/usr.bin/clang/llvm-strings/Makefile +++ b/usr.bin/clang/llvm-strings/Makefile @@ -17,8 +17,6 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index ae417356df6b..c4677169f912 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -20,8 +20,6 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} -${TGHDRS}: ${LLVM_TBLGEN_BIN} - DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} From nobody Wed Mar 29 18:45: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 4PmwVW4jrrz42wB3; Wed, 29 Mar 2023 18:45: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 4PmwVW4Dytz3NZk; Wed, 29 Mar 2023 18:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680115555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4VC61rUGOQf6w4J/u2UJYsDhWdCQkmL4k99AY+YyWrU=; b=IlFNXA/s/AL47iyG9yX8W1+nprSC/+0AFbelMxtYjs1U4WW5MUp0IJd0q6SgDpojM/SNDt coOdOTG/uWAH+R0xxmND/Q0HPgDH9cX59flXEloJjWiy7pp3jMgOk85a6RncjiEdLPgKaq CgP8bdXJ11tFvnnnjoY95aLJ1jqNkkcdbku3cwKNAIg6z2KLSwFYe6iMPuHh4BV1kbAhIA u9LqRGMYE3CEyShxgIrHhIsfipWWveJ1MIGhnF+0WGwakSVpW2W8n8QBmklzbEqq00Jz5x xAlmfy/D0wFdQIw9it5DmOaFXNGO4999458bqaD+KvxNxhuOM/OfDiT0Yh3k6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680115555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4VC61rUGOQf6w4J/u2UJYsDhWdCQkmL4k99AY+YyWrU=; b=Gdnxk/z94zzcAgWMHth1jrOAOR+t+KDUlNDQM/QoCtppqfn1ti9pakvWk73qYVvOg7Qpz/ 6B6U+jplLmYl1VCv93Wg1TnHXRU8GCm2Gz4gW6g28Nq2gt6q8bzDqUNjKly39HOPEsIBSY ErR3OZCJGiga9iJoar3pjHPoum1KU+fVQ1Jj4NpteEOxpMJwYWfyJ1VAvr7UcTFAvCTJ9u r+1kq9dtUSSljKdwx28LI3CGOgGDxeGDZVMqxcHUwhcHle4+lMiyXve6t5YAqZvQZD4xFl i0k/GpvyiyTtRqMkbZQfX/elpZa0YjdVMkBhg3/Cm/YqBtxbSRWeaT/5RQjELA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680115555; a=rsa-sha256; cv=none; b=mZ9wfS6M5Va8B97EVM6UIXoX3AfRtQliL2Ljkr+IrTO+dfkAm2kmptLaF9fQ4feQschNLu dIPoicWpFLMF9du7D4wF12+2IYpKUeySTWrwrR11kuEamZoYs97MGv3e/k8tBkmxgM3pFt +lXPtxiG3n2h6Jpr9ROUh0f2v6jd1Z8nl5dmxnOV3ri7Jb9MQ4R7nxxHwvrjcQnp9m3od6 vz5KyFs6yDbSGD9ySn8C2d2w1nyGnV2poIT9XrZD2LjQqX0RvoFbVxo8rsnNZ15yqyD6y1 vHmwBAJ78hcSrRWP09xgARG6L4KX+5T6l5ZYQzPeeS1rEHDIc1qb1hM+E2EyVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PmwVW3JTKzh0S; Wed, 29 Mar 2023 18:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TIjtCG022132; Wed, 29 Mar 2023 18:45:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TIjtNn022131; Wed, 29 Mar 2023 18:45:55 GMT (envelope-from git) Date: Wed, 29 Mar 2023 18:45:55 GMT Message-Id: <202303291845.32TIjtNn022131@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: cd137909c309 - main - amd64 wakeup: recalculate mitigations after APICs are woken List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: cd137909c3097fe223ce2b49075eed42a4933bb5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cd137909c3097fe223ce2b49075eed42a4933bb5 commit cd137909c3097fe223ce2b49075eed42a4933bb5 Author: Konstantin Belousov AuthorDate: 2023-03-28 23:51:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-29 18:45:20 +0000 amd64 wakeup: recalculate mitigations after APICs are woken APICs are needed to broadcast IPIs for MSR writes. PR: 270489 Reviewed by: dchagin, emaste, jhb Tested by: dchagin, manu Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39302 --- sys/amd64/acpica/acpi_wakeup.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 3df4457550d6..62e11f5797f6 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -294,19 +294,21 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, * in acpi_sleep_machdep(), after the microcode was * reloaded. Then recalculate the active mitigation * knobs that depend on the microcode and - * cpu_stdext_feature3. + * cpu_stdext_feature3. Do it after LAPICs are woken, + * so that IPIs work. */ identify_cpu_ext_features(); - hw_ibrs_recalculate(true); - hw_ssb_recalculate(true); - amd64_syscall_ret_flush_l1d_recalc(); - x86_rngds_mitg_recalculate(true); mca_resume(); if (vmm_resume_p != NULL) vmm_resume_p(); intr_resume(/*suspend_cancelled*/false); + hw_ibrs_recalculate(true); + amd64_syscall_ret_flush_l1d_recalc(); + hw_ssb_recalculate(true); + x86_rngds_mitg_recalculate(true); + AcpiSetFirmwareWakingVector(0, 0); } else { /* Wakeup MD procedures in interrupt enabled context */ From nobody Wed Mar 29 20:29: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 4Pmyp835DCz41pYL; Wed, 29 Mar 2023 20:29: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 4Pmyp82W7qz3n5d; Wed, 29 Mar 2023 20:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680121776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ucRyY92svluETEWwTr+CU8NBOuQuZNV8/uVIPPlP+4w=; b=RN1J5UYo5pwUBJ3Ka+y+Ia4uBixf0Z4NScueS4I/9klBJ9UESGzGjaZjt28IRv4r3H3/MM tkylOo9bqyuo78lRW9k65JeMLffsYkZn+p8n/rKUhlqckTb4Gd6ZiwWhsGdTM6KbPLU5z9 pzucXlsZj7vD3ztsb5iXb5B3EFqDA+q3la1AOHQNSy24CgLs8l4G6JSShFkZrbmFSSQ0uI cGu1x01Pibqc2g7AOAkMOEwxO4xCt1eSb/m/u6m9mBns5nlfxasSpF+EkGliHzjUaQzp9a ORTxMY8P2e+lU49JTQ8KwM3cl3PkYw+bckqsUeLmEM3ohZsW4VjCMmTm2Colng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680121776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ucRyY92svluETEWwTr+CU8NBOuQuZNV8/uVIPPlP+4w=; b=noMjbl5Wjzm8VO9pV4jqwL8aFSdDujlg6wrpsliAVwFUiuODCbouqJgM7vtjPcQzg21/Dm v8zls+9BeM7PWyWftW7RhbTIS/U8B7dwRlPAwQCIL5Ut54aRvxp1fkVzRCLOdX54T5xfHN NDe85NsxEU/fdNC3RL0q3lDdF5sgejXHI984UXTBInuZ5JgLfXojixK9YDOiftyVnLIjJU 8fyNo/orYOVsn+Wvr0wieXmLM1OSQrPonANRZWFdeVVFvgvutsVZYQxzad9UESNq1GG3Dk SJllehMKiZLhwSdQVTh0udLa+p7QPfarlWl+AbhaMWxRum6sRf81IWHNAY1tEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680121776; a=rsa-sha256; cv=none; b=a5zqTtyejpQlR3OZUS334nUBHi7cH4F4yBDQmpanG27GFgERNtZEh/Q0A3vL8FHuzLQxkb NkNzfhFs5bJznvW5PzChYzf1wArgU51xgbOohGffJCRwsZfybzstJ13+UrMGY7zV48YjXJ q1OIBx29xBcFSJq2RZofUk9Bcqxt2ph8KW2492yKtpq49TXWb6HZTtOF4xKCK4aTt/Tb3w qyAA8WamRA/251SyR3q9SU0cyHR3OOSWw/Llotzo1EYPdih344qRNkcLFgRre2fdNZ7HW5 CxwHnx8uQsM/BdiRqogAbGb/T50Bg9A2/QFF+xqVD3+1QgOzgxh+aAV/kYaEfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pmyp81ZlGzkMB; Wed, 29 Mar 2023 20:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TKTasp087285; Wed, 29 Mar 2023 20:29:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TKTaOh087284; Wed, 29 Mar 2023 20:29:36 GMT (envelope-from git) Date: Wed, 29 Mar 2023 20:29:36 GMT Message-Id: <202303292029.32TKTaOh087284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: badcb3fd5710 - main - routing: fix panic when adding an interface route to the p2p interface without and inet/inet6 addresses attached. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: badcb3fd5710a511e35ac3afd724ef68c77614b7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=badcb3fd5710a511e35ac3afd724ef68c77614b7 commit badcb3fd5710a511e35ac3afd724ef68c77614b7 Author: Alexander V. Chernikov AuthorDate: 2023-03-29 20:28:24 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-29 20:28:24 +0000 routing: fix panic when adding an interface route to the p2p interface without and inet/inet6 addresses attached. MFC after: 3 days --- sys/net/if.c | 2 +- tests/sys/net/routing/test_routing_l3.py | 39 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/sys/net/if.c b/sys/net/if.c index ff942bceb090..4b3b7d5b121b 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2056,7 +2056,7 @@ ifaof_ifpforaddr(const struct sockaddr *addr, struct ifnet *ifp) continue; } if (ifp->if_flags & IFF_POINTOPOINT) { - if (sa_equal(addr, ifa->ifa_dstaddr)) + if (ifa->ifa_dstaddr && sa_equal(addr, ifa->ifa_dstaddr)) goto done; } else { cp = addr->sa_data; diff --git a/tests/sys/net/routing/test_routing_l3.py b/tests/sys/net/routing/test_routing_l3.py index 74017ae0459c..3a3822293424 100755 --- a/tests/sys/net/routing/test_routing_l3.py +++ b/tests/sys/net/routing/test_routing_l3.py @@ -1,7 +1,13 @@ import ipaddress +import socket import pytest +from atf_python.sys.net.rtsock import RtConst +from atf_python.sys.net.rtsock import Rtsock +from atf_python.sys.net.rtsock import RtsockRtMessage +from atf_python.sys.net.rtsock import SaHelper from atf_python.sys.net.tools import ToolsHelper +from atf_python.sys.net.vnet import SingleVnetTestTemplate from atf_python.sys.net.vnet import VnetTestTemplate @@ -79,3 +85,36 @@ class TestIfOps(VnetTestTemplate): nhops = ToolsHelper.get_nhops(family) nh = [nh for nh in nhops if nh["index"] == nhop_kidx][0] assert nh["ifa"] == str(second_addr.ip) + + +class TestRouteCornerCase1(SingleVnetTestTemplate): + @pytest.mark.parametrize("family", ["inet", "inet6"]) + @pytest.mark.require_user("root") + def test_add_direct_route_p2p_wo_ifa(self, family): + + tun_ifname = ToolsHelper.get_output("/sbin/ifconfig tun create").rstrip() + tun_ifindex = socket.if_nametoindex(tun_ifname) + assert tun_ifindex > 0 + rtsock = Rtsock() + + if family == "inet": + prefix = "172.16.0.0/12" + else: + prefix = "2a02:6b8::/64" + IFT_ETHER = 0x06 + gw_link = SaHelper.link_sa(ifindex=tun_ifindex, iftype=IFT_ETHER) + + msg = rtsock.new_rtm_add(prefix, gw_link) + msg.add_link_attr(RtConst.RTA_IFP, tun_ifindex) + rtsock.write_message(msg) + + data = rtsock.read_data(msg.rtm_seq) + msg_in = RtsockRtMessage.from_bytes(data) + msg_in.print_in_message() + + desired_sa = { + RtConst.RTA_DST: msg.get_sa(RtConst.RTA_DST), + RtConst.RTA_NETMASK: msg.get_sa(RtConst.RTA_NETMASK), + } + + msg_in.verify(msg.rtm_type, desired_sa) From nobody Wed Mar 29 21:59: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 4Pn0pQ5XmRz41wmR; Wed, 29 Mar 2023 21:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pn0pQ4mY5z3w5m; Wed, 29 Mar 2023 21:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0nEw5PFbo0MVQ8naZaGF3aEvD4sDwpQPSxoxzfoWcg=; b=OlmToJCQYLA8jwAEM7ICvUmgpqWbeWCfntUHsJx+n3SP81RHncjUCbo4pEgay2Ei8ZJYkB 5hRIgmBlBxK+dkbnpq6tJUuXMMvlUOxqo8ngk0VJPCV/3TMWEjm+sIQlhgY36SpXO42kxB jVeR0EcnHxEVm2FNq8UH/4S5gxKaTJ6sXnsLS4b4onx4QJ8usSyNJpMYxC/QY0sZzwWs4V a8fVad2+Palv+bYD0YJ0Z2xAopeqPcSMwi+PL+osGnqG4dAycYGFFjmPiCSe7tmUSWwEPw qhnajCpbbu+zQsVoEm/pRrzI1Eza+Cvp9RYKzB776t+Bl6KMM7D+CySZDK9cIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0nEw5PFbo0MVQ8naZaGF3aEvD4sDwpQPSxoxzfoWcg=; b=UF4sp58UEDBwQj0GTdv+8N12UGd5N2BOxif6gsyA9ISmx/ONpct3cJk9neQ5C8j+uykCE+ C1TaVKr+TLLBaf8YtAlNAqmLZmV/lDz4iJJLZdswuSV+vTDF2GXV9AmoEERhvNnVHv1jHM dQHUk65AjkQjJL3Zj9hvxlO9N7+uSfmO5lGQO4sTmCaYcX0+o5tBZZLIsEUhB8qhUcii49 f5GXNfk8EouFb3kuJZ8Ewkzy0kSBFGKdlPc3P+bVxvqw1bYA4k/8GHANMKimCSYm9p/5Fu Z7gjyY6SFsvaslN9uoMO1aghEimb2PCadBx99B7v1YPz/n87HiInI6N99syKmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680127198; a=rsa-sha256; cv=none; b=s5dLiaH59sSG/ZEU90zK9LhFG340epI8mKElWHp6Uf35M7hBSK6csDCzMgKeqWB8HAWAwD kkXaaB6IviMp793mTO/kemSvrQtj+O8/eQUVCjK54eDu120zKYpJRnggSvF8mbFoyy1IlY M6xq4C7SW9pItBOnViASYe1sA/PDgyT8hu1jLdWb9BDzR/NNVIkjDJGvICJb9vsGWtLIcC YqbBn4Yk/2RBWB/H+7j0c5380091iVOtNSxuoarcYkuYaSaVwB3IUqnlR2o5GO+7bnyQ50 lteJ2zZ6DI/8tmFT28ZcXShBQAEocfNLBhjwrk8K8V7Y1XH84xMauqGi25ZcKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn0pQ3nPWzmks; Wed, 29 Mar 2023 21:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TLxwP6033764; Wed, 29 Mar 2023 21:59:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TLxwWD033763; Wed, 29 Mar 2023 21:59:58 GMT (envelope-from git) Date: Wed, 29 Mar 2023 21:59:58 GMT Message-Id: <202303292159.32TLxwWD033763@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: a1254dcaa869 - main - nfsd.8: Update for nfsd running in 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1254dcaa869bba20e46d966c53c7473bb24d02b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=a1254dcaa869bba20e46d966c53c7473bb24d02b commit a1254dcaa869bba20e46d966c53c7473bb24d02b Author: Rick Macklem AuthorDate: 2023-03-29 21:58:47 +0000 Commit: Rick Macklem CommitDate: 2023-03-29 21:58:47 +0000 nfsd.8: Update for nfsd running in jails Nfsd can now be run in an appropriately configured vnet jail. This man page update adds some information for this case. This is a content change. Reviewed by: karels, markj MFC after: 3 months Differential Revision: https://reviews.freebsd.org/D39219 --- usr.sbin/nfsd/nfsd.8 | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8 index c8a5fea4e6a2..40e75f0a232d 100644 --- a/usr.sbin/nfsd/nfsd.8 +++ b/usr.sbin/nfsd/nfsd.8 @@ -28,7 +28,7 @@ .\" @(#)nfsd.8 8.4 (Berkeley) 3/29/95 .\" $FreeBSD$ .\" -.Dd December 20, 2019 +.Dd March 22, 2023 .Dt NFSD 8 .Os .Sh NAME @@ -56,6 +56,22 @@ must be running for a machine to operate as a server. Unless otherwise specified, eight servers per CPU for UDP transport are started. .Pp +When +.Nm +is run in an appropriately configured vnet jail, the server is restricted +to TCP transport and no pNFS service. +Therefore, the +.Fl t +option must be specified and none of the +.Fl u , +.Fl p +and +.Fl m +options can be specified when run in a vnet jail. +See +.Xr jail 8 +for more information. +.Pp The following options are available: .Bl -tag -width Ds .It Fl r @@ -307,6 +323,7 @@ just do a .Xr stablerestart 5 , .Xr gssd 8 , .Xr ipfw 8 , +.Xr jail 8 , .Xr mountd 8 , .Xr nfsiod 8 , .Xr nfsrevoke 8 , From nobody Wed Mar 29 22:07: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 4Pn0yp6Ttzz41xF8; Wed, 29 Mar 2023 22:07: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 4Pn0yp5x5xz3xRl; Wed, 29 Mar 2023 22:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h5mFQxnpBO2wnKyUWsCab4yYVbY1iHq5+Ii/tBTpVyc=; b=sqyHVhY2v7/UF2k5JogFl+MAVMof3md/bUM+H9xoRnf1EfU3582rEY1nOxRJ8Y+v8Eamym AGZeS970sFXGOfUVIMBQ+ocW6W4SXVjn6mGUWg2NGAhpyTzAWc1DezcGJJlaozK0Zvc26h 9I4YTCEPtOf6AVP86jgLkJ1GzB57Q0eHj/RdHu9eqpdwwH4t6u0FhVSrO8ruP4l3snBQz1 66spfiQX2JJQifKyYY4Q/RcOQs9rNWoQrnms8DKATJe+r3TcZK9jzVBfu2PcEpV+lcXqAS EAEt0uGbyusfNYUibFQjvrPmOnt2+WwMIvvFBtJZKb0aVxO4w8aE2cb9iJibPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h5mFQxnpBO2wnKyUWsCab4yYVbY1iHq5+Ii/tBTpVyc=; b=FP97DcimIrdsxA81yRlV7toyW2rv7pYAUMmrgs/CNFxls0fHtT+K4Wqa/PlzS49NskpK3b iuOd7+NeLcGj7nDBZ8ac7NHGBZKwDWaupq+Udn/pOcSCH8CC+mzx12aI6tKy5BdiDwgBNC Y4C8Gy/Q/ltwhQ3hDTiwWMs8Q5Rx6bUQmA4PZRO9HU/vbSh/Quyi0S5DS2QYxTPx2WyDrz zZE8BBc0Y509mP1keQTsvOef89LBMMBZSSOvWBROZvgrUY8Wi/hgGS6mdwwhlXYjRQzhJh +nSJT4LfsVkf2SjXTxm7p3KgVJCIkgS4rJ+MIaLUAen6Mn6vXMh3ZjaaxCNJzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680127634; a=rsa-sha256; cv=none; b=i2PInXdIoB0qoJ2ReC2yxqMmWrB2vDGqrDbUjpzgnLxp2clS6hALh8Nz0u83OLam9+Jycu LBqt6V3VzJWla1FYu5WCS4X2RjfXxbbuhCV0yXRj8uriI40Ow5X8Bb/cUEgao+h+aOPuB6 5BQic0ro+eeiet8pGpbBSVuW01G7lMbsfzOlgJL7hUK+1mzW5oxyeDieKM3TLOsuYEKbeF d1/RfvOUF072vcleHQotl/L4nbWT+aB/Hodhgs7zrE6wIWmsafSwMe3omQIdKNC30j1i2T ODlZJMYBREOThsp+EWM0uXeu11aabagEcl0lfGNZWsHOiGjd4kLclI7y9kzqiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn0yp526zzn2Q; Wed, 29 Mar 2023 22:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TM7EtG050653; Wed, 29 Mar 2023 22:07:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TM7Emk050652; Wed, 29 Mar 2023 22:07:14 GMT (envelope-from git) Date: Wed, 29 Mar 2023 22:07:14 GMT Message-Id: <202303292207.32TM7Emk050652@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: 7d8e1e8dd904 - main - libcasper: Move helper libraries from /lib/casper to /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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d8e1e8dd9042f802a67adefabd28fcd9b1e4051 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7d8e1e8dd9042f802a67adefabd28fcd9b1e4051 commit 7d8e1e8dd9042f802a67adefabd28fcd9b1e4051 Author: John Baldwin AuthorDate: 2023-03-29 22:04:28 +0000 Commit: John Baldwin CommitDate: 2023-03-29 22:04:28 +0000 libcasper: Move helper libraries from /lib/casper to /lib. These libraries are linked to directly by applications rather than opened at runtime via dlopen(). Discussed with: oshogbo Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D39245 --- Makefile.inc1 | 3 +-- ObsoleteFiles.inc | 11 +++++++++++ etc/mtree/BSD.root.dist | 2 -- lib/libcasper/services/cap_dns/Makefile | 2 +- lib/libcasper/services/cap_fileargs/Makefile | 2 +- lib/libcasper/services/cap_grp/Makefile | 2 +- lib/libcasper/services/cap_net/Makefile | 2 +- lib/libcasper/services/cap_netdb/Makefile | 2 +- lib/libcasper/services/cap_pwd/Makefile | 2 +- lib/libcasper/services/cap_sysctl/Makefile | 2 +- lib/libcasper/services/cap_syslog/Makefile | 2 +- libexec/rtld-elf/rtld_paths.h | 2 +- tools/build/Makefile | 1 - tools/build/mk/OptionalObsoleteFiles.inc | 16 ++++++++-------- 14 files changed, 29 insertions(+), 22 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 63c3ce80f54d..471267b3435f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1076,8 +1076,7 @@ _bootstrap-tools: ${_+_}cd ${.CURDIR}; ${BMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack .endif ${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools - mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/casper ${WORLDTMP}/lib/geom \ - ${WORLDTMP}/bin + mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/geom ${WORLDTMP}/bin ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${WORLDTMP}/usr >/dev/null ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \ diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 72b119c1c85b..f526d0f7458a 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,17 @@ # xargs -n1 | sort | uniq -d; # done +# 20230329: libcasper libraries moved to /lib +MOVED_LIBS+=lib/casper/libcap_dns.so.2 +MOVED_LIBS+=lib/casper/libcap_fileargs.so.1 +MOVED_LIBS+=lib/casper/libcap_grp.so.1 +MOVED_LIBS+=lib/casper/libcap_net.so.1 +MOVED_LIBS+=lib/casper/libcap_pwd.so.1 +MOVED_LIBS+=lib/casper/libcap_sysctl.so.1 +MOVED_LIBS+=lib/casper/libcap_sysctl.so.2 +MOVED_LIBS+=lib/casper/libcap_syslog.so.1 +OLD_DIRS+=lib/casper + # 20230324: libvmmapi shlib version bumped to 6 OLD_LIBS+=usr/lib/libvmmapi.so.5 diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 5ee5da8ee149..3a3a3a78d995 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -104,8 +104,6 @@ .. .. lib - casper - .. geom .. nvmecontrol diff --git a/lib/libcasper/services/cap_dns/Makefile b/lib/libcasper/services/cap_dns/Makefile index b59b329d0653..dbeebcd19dfa 100644 --- a/lib/libcasper/services/cap_dns/Makefile +++ b/lib/libcasper/services/cap_dns/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib/casper +SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_fileargs/Makefile b/lib/libcasper/services/cap_fileargs/Makefile index 22230f82d9f4..2369f58cc2bb 100644 --- a/lib/libcasper/services/cap_fileargs/Makefile +++ b/lib/libcasper/services/cap_fileargs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib/casper +SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_grp/Makefile b/lib/libcasper/services/cap_grp/Makefile index 83e24fcc8e76..1250832bcd2d 100644 --- a/lib/libcasper/services/cap_grp/Makefile +++ b/lib/libcasper/services/cap_grp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib/casper +SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_net/Makefile b/lib/libcasper/services/cap_net/Makefile index 70acac1cc9ad..a1528b40c2a6 100644 --- a/lib/libcasper/services/cap_net/Makefile +++ b/lib/libcasper/services/cap_net/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib/casper +SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_netdb/Makefile b/lib/libcasper/services/cap_netdb/Makefile index 5070976d2e25..fdec72ec4ada 100644 --- a/lib/libcasper/services/cap_netdb/Makefile +++ b/lib/libcasper/services/cap_netdb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib/casper +SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_pwd/Makefile b/lib/libcasper/services/cap_pwd/Makefile index d5e6e9576854..203ea806a215 100644 --- a/lib/libcasper/services/cap_pwd/Makefile +++ b/lib/libcasper/services/cap_pwd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib/casper +SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_sysctl/Makefile b/lib/libcasper/services/cap_sysctl/Makefile index afb7b4374370..30bec927f29b 100644 --- a/lib/libcasper/services/cap_sysctl/Makefile +++ b/lib/libcasper/services/cap_sysctl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib/casper +SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_syslog/Makefile b/lib/libcasper/services/cap_syslog/Makefile index a6b4af5640d6..a3e4603e8ace 100644 --- a/lib/libcasper/services/cap_syslog/Makefile +++ b/lib/libcasper/services/cap_syslog/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIBDIR?= /lib/casper +SHLIBDIR?= /lib .include diff --git a/libexec/rtld-elf/rtld_paths.h b/libexec/rtld-elf/rtld_paths.h index c051db7b580f..759a610e6469 100644 --- a/libexec/rtld-elf/rtld_paths.h +++ b/libexec/rtld-elf/rtld_paths.h @@ -69,7 +69,7 @@ #endif #ifndef STANDARD_LIBRARY_PATH -#define STANDARD_LIBRARY_PATH "/lib/casper:/lib:/usr/lib" +#define STANDARD_LIBRARY_PATH "/lib:/usr/lib" #endif #ifndef LD_ diff --git a/tools/build/Makefile b/tools/build/Makefile index 71a38534f7ac..97e0bfe8f4f7 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -354,7 +354,6 @@ host-symlinks: # yet (this happens if we are crossbuilding from Linux/Mac). INSTALLDIR_LIST= \ bin \ - lib/casper \ lib/geom \ usr/include/casper \ usr/include/private/ucl \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index f3bb91ae6ff9..ac7109609dd4 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -855,14 +855,14 @@ OLD_DIRS+=usr/tests/usr.bin/calendar .if ${MK_CASPER} == no OLD_LIBS+=lib/libcasper.so.1 -OLD_LIBS+=lib/casper/libcap_dns.so.2 -OLD_LIBS+=lib/casper/libcap_fileargs.so.1 -OLD_LIBS+=lib/casper/libcap_grp.so.1 -OLD_LIBS+=lib/casper/libcap_net.so.1 -OLD_LIBS+=lib/casper/libcap_pwd.so.1 -OLD_LIBS+=lib/casper/libcap_sysctl.so.1 -OLD_LIBS+=lib/casper/libcap_sysctl.so.2 -OLD_LIBS+=lib/casper/libcap_syslog.so.1 +OLD_LIBS+=lib/libcap_dns.so.2 +OLD_LIBS+=lib/libcap_fileargs.so.1 +OLD_LIBS+=lib/libcap_grp.so.1 +OLD_LIBS+=lib/libcap_net.so.1 +OLD_LIBS+=lib/libcap_pwd.so.1 +OLD_LIBS+=lib/libcap_sysctl.so.1 +OLD_LIBS+=lib/libcap_sysctl.so.2 +OLD_LIBS+=lib/libcap_syslog.so.1 .endif .if ${MK_CCD} == no From nobody Wed Mar 29 22:07: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 4Pn0yr0mLrz41xNs; Wed, 29 Mar 2023 22:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pn0yr0Jyyz3xHB; Wed, 29 Mar 2023 22:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tQ6OvBcuWj9hdIY5dr/rTHp5AwuRB29XdWRzqOXGeTc=; b=W3+eenCmmYBwnWp1d4BJWkcLQaaAc/OT+NLBKme8fSkC74vz7RUiER0cG3NBxjW9CgjjCF KkjTSt3bD3hdbTRXDbbCmeENuENBJ00+0luIZe+lkcOh3timcUsqbzCFiBziinXUbcUl+3 VFU+sW7BGFdNwhU7WX8HJ5TElit0agihtxUNg9Cq+dw2t2fp2Vr1Sjj8JIBBgqQ3SOsfUX qYOc9ojnsabTCJBPZDoPBPuWtVrVPjfukPG1ViuMdiLohxi5/Vr/FJ33dnbQG/Nan07X2r Qfglv6JuyTRVBA85MvShgDEdnoSiIsUq+NtneSPwPNrXe6oPsa96jhOxQvgivA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tQ6OvBcuWj9hdIY5dr/rTHp5AwuRB29XdWRzqOXGeTc=; b=Q2LRl5T6b8AoZ9ylCkr4zYkJ7j1XQY3CcGQJa9RczmOPAHVP2qwPc+jgsMJf45YMrYODqZ PjXc36h7kUmAZ/ennIqKzB+GhGbPkVEQ6lLyKk3DtZ5LHHc1tEWsfoegpo0jLAJ2px/mj5 1cqU5WBqJJ8UCJ3ElTB+C7HEY2+2TaEsoz/x5wn04yAObkNdTRhePE4ns862NqKRB4xFRJ DQ0Rxilk03zXpTiMOenEvCHO5PLIyviGtPfD6DULIqLWl4M1a9kt+ArqNeeij7Hhs++IDG BWK1QmLoo1OdN/PoegIoEeyT1RqXjIKmFJsv00sqBgHG0yvtanch++2Af4y9bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680127636; a=rsa-sha256; cv=none; b=esQB32nqs8g+v95uB9b+LAmajEYGHtPL3toSbxEFM+9vWbUbAwr8dyEyEepmRjSCQuqx/X 6I5+sfSnAjobIo/YSRzUTAG9CjNsmTHj3OF+CZtIeMyfoSCEScr2TQekONORFvVvknoNtU q2SifNGpKEig2oZpUFYu9jLnmFhBCLIF/YEfSoOgUXg6rN4nbpd4x/5+T+pLw3Gaxgs3LX TJxuTOkVK6+mZVBSial+/NYULzEPdFiLwXzr8vuivsbKclGipVTkMJiYSAO/j4i0qQtjzD jWgV1BeJaRCHpZypyANUv8+btBus3JCrLQRBBbIIGuHp/aHS9LQLtMCDn5z0+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn0yq6BSWznB1; Wed, 29 Mar 2023 22:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TM7FQ8050672; Wed, 29 Mar 2023 22:07:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TM7FAU050671; Wed, 29 Mar 2023 22:07:15 GMT (envelope-from git) Date: Wed, 29 Mar 2023 22:07:15 GMT Message-Id: <202303292207.32TM7FAU050671@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: 1ab9996fb5fa - main - libcompiler_rt/libgcc_s: Remove MIPS build glue. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 1ab9996fb5fafce958fc0d22f68ee16a50d56638 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1ab9996fb5fafce958fc0d22f68ee16a50d56638 commit 1ab9996fb5fafce958fc0d22f68ee16a50d56638 Author: John Baldwin AuthorDate: 2023-03-29 22:05:42 +0000 Commit: John Baldwin CommitDate: 2023-03-29 22:05:42 +0000 libcompiler_rt/libgcc_s: Remove MIPS build glue. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D39328 --- lib/libcompiler_rt/Makefile.inc | 9 ++------- lib/libgcc_s/Makefile | 3 +-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc index 4657ffe64abe..519ff0943ff3 100644 --- a/lib/libcompiler_rt/Makefile.inc +++ b/lib/libcompiler_rt/Makefile.inc @@ -189,8 +189,7 @@ SRCF+= trunctfsf2 .endif # These are already shipped by libc.a on some architectures. -.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \ - ${MACHINE_CPUARCH} != "riscv" +.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "riscv" SRCF+= adddf3 SRCF+= addsf3 SRCF+= divdf3 @@ -207,7 +206,7 @@ SRCF+= subsf3 SRCF+= truncdfsf2 .endif -.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" +.if ${MACHINE_CPUARCH} != "arm" SRCF+= comparedf2 SRCF+= comparesf2 .endif @@ -218,10 +217,6 @@ SRCF+= comparesf2 SRCF+= stdatomic CFLAGS+= -DEMIT_SYNC_ATOMICS -.elif ${MACHINE_CPUARCH} == "mips" -.PATH: ${SRCTOP}/sys/mips/mips - -SRCF+= stdatomic .endif .for file in ${SRCF} diff --git a/lib/libgcc_s/Makefile b/lib/libgcc_s/Makefile index aa097d7255de..f1f94589376e 100644 --- a/lib/libgcc_s/Makefile +++ b/lib/libgcc_s/Makefile @@ -48,8 +48,7 @@ SRCS+= s_scalbnf.c # Don't include long double routines on architectures where long double # is the same size as double. -.if ${MACHINE_CPUARCH} != "mips" && ${MACHINE_CPUARCH} != "arm" && \ - ${MACHINE_CPUARCH} != "powerpc" +.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "powerpc" SRCS+= s_fmaxl.c SRCS+= s_logbl.c SRCS+= s_scalbnl.c From nobody Wed Mar 29 22:07: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 4Pn0ys1WTbz41xHd; Wed, 29 Mar 2023 22: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 4Pn0ys0lWpz3xMc; Wed, 29 Mar 2023 22: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=1680127637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=azoCueJZHFnaxgoz60x1q7V28tKYRFDmQM/sWPpEuTQ=; b=tF5VEHiySlkmon2VSpBNTgGH8wn17Oc5aokSkcLqhMUEyqc2zyu7iyeA0JWZtkfwaFaOKt 0ie5Gso000UJiZng6sKPML6nHq8GiklH1YYpArgZWwm4Cknwhr7aaZwxhPzCGcDdMlZrnm UUuyxRxNCYzjokucDUX/mwDd/4oJZ7Lp6SlwW/VmVKZA2G3iT4ByOIoDUkPduCEtBEY0Hl M+j4+vU/r+GzZbcn7Ft6EZ05YirdAymE0HiZhraps+GXxizbnsLWJGqFxRaT3loWj5RDcU H2i6LepXCrL/AhJGdj5BZftJkBKlQr0i9QPOWn2VvWvpAE+6vIimq6SNMpSwxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=azoCueJZHFnaxgoz60x1q7V28tKYRFDmQM/sWPpEuTQ=; b=R+NwUUtniYaz9O8S+6a5yi95EpOkkvCXMJE9XnBt8bgYEd0NijoGn/cyarcLJMmwLqsWBJ 04ZxSdcf07tnjnH2p/LBx8xhxgG+oJbC1lCEoxu1DvvNNwnOqS0LRGBj0Jz9xYlFCtQ2MB L4fgpf0iFBEWKVPtlxW7dOSxU7179uSoEASu8ShTV2DiDzGUwjzgn7Ral2HNe8e/bG3w3y ZeID4fBvWA+nD5wqdWwt2iotag+98qdLZTqy5MpFUjL9oMp1w36yLEhJojYSFvoiAI0VTU jQhukI5IefxazrDLvZO49AFAiCFA3tGbOBaASoEZpWy1+tRwkd+UUokKuZ0BTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680127637; a=rsa-sha256; cv=none; b=hmPMJR2Acp7qJaWphhScWw0HNuFjgMnd7jmZDAeMW6BBo5cB2HlGwYDMOpR0NsSkkbRuM9 nBdf0HX7bltMWBwelkdRXod69OuuUBvlneaqxewEMOdbNgmSWP/bXnNC2jdvDUwB3kaejb E85aASot9abM+H5QdMAQfbc2uPleBKB7Mnfp4HVXrVh/EuJ0cZIwz3iviIOrLSgNHb6HO5 jCyUbVOOt4yq1Ii5lvdz4NC40f9soAfUCVEiDv5RKcpLQPLi08C0kHwrEJ+U7dw26xyF76 M2vbAzvQKfQ0r+vmbCtWpCprQsuhZVyUEJB4UT4uiMa4b9YriAL4QSeudoUmlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn0yr6rSVzn0d; Wed, 29 Mar 2023 22:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TM7Gmb050691; Wed, 29 Mar 2023 22:07:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TM7GKQ050690; Wed, 29 Mar 2023 22:07:16 GMT (envelope-from git) Date: Wed, 29 Mar 2023 22:07:16 GMT Message-Id: <202303292207.32TM7GKQ050690@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: f40b617e1539 - main - libarchive: Remove MIPS build glue. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: f40b617e153991d70ee6628357dd08a0606418d6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f40b617e153991d70ee6628357dd08a0606418d6 commit f40b617e153991d70ee6628357dd08a0606418d6 Author: John Baldwin AuthorDate: 2023-03-29 22:05:53 +0000 Commit: John Baldwin CommitDate: 2023-03-29 22:05:53 +0000 libarchive: Remove MIPS build glue. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D39329 --- lib/libarchive/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index d0db17b567c0..5f67d0a180d6 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -14,8 +14,7 @@ CFLAGS+= -I${.OBJDIR} CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib .include "Makefile.inc" -.if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \ - ${MACHINE_ARCH:Mpowerpc*} != "" +.if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mpowerpc*} != "" NO_WCAST_ALIGN= yes .if ${MACHINE_ARCH:M*64*} == "" CFLAGS+= -DPPMD_32BIT From nobody Wed Mar 29 22:07: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 4Pn0yt2N0Mz41xXH; Wed, 29 Mar 2023 22:07: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 4Pn0yt1whfz3xWF; Wed, 29 Mar 2023 22:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jSbYo9F+y3nqHZ6Kt9EFU/6zgYN03H9j6jQFsvItOS0=; b=EZMabIrcUz7YuNgh7gdd2UUc+X+caTmqZPnMyo8H9Yaeo2sSzgWsuB+dO/BziU0wW0x3Yx LxFVWtTjp0vvCxSJe6cIc4UMx6K9kTGoqJ7vfCIdZvJbh+Gd4EBnP5RoWIb/8Gh9RpSQsj dXv8i5+L12xXyHH6yVQlWnuNiaa6FTdo3g0EtMZkaIqj6qmI6mBsbLQAjsyw6v/85g8znO /9+/yZYueuNMCFYVzM+66LcQBwhIZOdLJ2Jez1blSW7Fyv3nz49BEbGEIi0T9L3YSTAUzM nEiiWdJvsh270azrBpa3i/723UxJwuAhj9McPstmzcA+hhGyJ0021+uPKxYo+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jSbYo9F+y3nqHZ6Kt9EFU/6zgYN03H9j6jQFsvItOS0=; b=Jpx3dDESpFYaUgYYzdIBYDc0NjL3SiF+7y6v+KyW46QXBBQRDmVGR8SY1bfAoxVvqyfkk8 VBvQKV3A7H6JY2SvW6zsNviqHM2hEZaeUPeZAOY7a3E8aJFiQ1ymH97vNJzucouzQlV3tt n35nQkOFyA0mTukIEJJSSN+1t0kWCo/CRVKom15xd8CTYdWAsRwmra6rjsqfnU+Dqmtmk5 3LEd2w9tlBIQYvLXLlHg9sDuv295b0kjdsOnvbbOTwIU494Z5FCM0hrgpUNqKfw+Q4tD3y A4dczWIJxpu7+NpM7J8ValwgtA0p9CEfXBgpXSbotlgQ/GZzGU7Kc/NFtxNdNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680127638; a=rsa-sha256; cv=none; b=uDIYjlBzlHky0MyGa+ph/iJJGlf07z9CYRiSMwLVz5n5/HypeY9EZb0bpk/mCDhJ8ksGyY +6fLgWkx80fnSBUE35ckyr1hvLWhlPheUOidG1OTG/jh12ZJs2j/LmSY3O4JY2XTHr0VwC MFapm771x2rDpfC+bYPOpr3l+MeMKp3XUUkm4BGI43Nc0MM398zBuuFCTJE6tXiznAigRN tUjjf7Y8KO7C29pTzNEx0uvBEg1k9Med6g6TG66UF7X78Zb9e1ZIFBlpO4RxNeB6iJBhax jr2QORtpR7wuVPzRjA8o/7975ExNThNvYk8s6f/EwDQ2j24Jcbr06PalDcMQxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn0yt0j0qzn0f; Wed, 29 Mar 2023 22:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TM7IVG050712; Wed, 29 Mar 2023 22:07:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TM7IIh050711; Wed, 29 Mar 2023 22:07:18 GMT (envelope-from git) Date: Wed, 29 Mar 2023 22:07:18 GMT Message-Id: <202303292207.32TM7IIh050711@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: 60d0871dbfbe - main - tests/sys/audit: Remove MIPS-specific sysarch(2) 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60d0871dbfbebe20a9e24c1b4c659cfe841154c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=60d0871dbfbebe20a9e24c1b4c659cfe841154c1 commit 60d0871dbfbebe20a9e24c1b4c659cfe841154c1 Author: John Baldwin AuthorDate: 2023-03-29 22:06:03 +0000 Commit: John Baldwin CommitDate: 2023-03-29 22:06:03 +0000 tests/sys/audit: Remove MIPS-specific sysarch(2) test. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D39330 --- tests/sys/audit/miscellaneous.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/sys/audit/miscellaneous.c b/tests/sys/audit/miscellaneous.c index 727d8300722f..470706ab76ea 100644 --- a/tests/sys/audit/miscellaneous.c +++ b/tests/sys/audit/miscellaneous.c @@ -92,9 +92,6 @@ ATF_TC_BODY(sysarch_success, tc) #elif defined(AMD64_GET_FSBASE) /* amd64 */ register_t amd64arg; -#elif defined(MIPS_GET_TLS) /* MIPS */ - char *mipsarg; - #elif defined(ARM_SYNC_ICACHE) /* ARM */ struct arm_sync_icache_args armsysarg; bzero(&armsysarg, sizeof(armsysarg)); @@ -123,8 +120,6 @@ ATF_TC_BODY(sysarch_success, tc) ATF_REQUIRE_EQ(0, sysarch(I386_GET_IOPERM, &i3sysarg)); #elif defined(AMD64_GET_FSBASE) ATF_REQUIRE_EQ(0, sysarch(AMD64_GET_FSBASE, &amd64arg)); -#elif defined(MIPS_GET_TLS) - ATF_REQUIRE_EQ(0, sysarch(MIPS_GET_TLS, &mipsarg)); #elif defined(ARM_SYNC_ICACHE) ATF_REQUIRE_EQ(0, sysarch(ARM_SYNC_ICACHE, &armsysarg)); #elif defined(SPARC_UTRAP_INSTALL) From nobody Wed Mar 29 22:07: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 4Pn0yv4cZbz41xTl; Wed, 29 Mar 2023 22:07: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 4Pn0yv2pFWz3xNS; Wed, 29 Mar 2023 22:07:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cRNqENyAppFTqjoDdOKOMOLY785ZQHl+2imSD41iXs8=; b=NGDWT4T4QTLEv+12qWrzDNfsA6lSVOnfbnLnWrJ1JwPVWwFyVkRte2Ky0HDjNN0ts5ZpSA kTpICZO5YVn3D8sWSAalIeBEdnXQxqqDBJfG1d9Tku+nUpnjdRVbhTKKS1t7n3YNNr38Kq NjjiMcWA2crPstkDCXNMaP+1USdcnCF5qhLo5d8Gm8rfUbYFWgz+igf2KXw8QXuZ+7z5dM nZkBIEZSxi+F70NQ44C5/jHB9J3RVaHLHCe/cCIQxljKRtRL6TwThEmr2nsIVldKR3GVh/ 1il761mH0I5/hu2Ecth0ng76VgpapYTPTHUkbHDzfve4oQL9JGphnKaJYMeSsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cRNqENyAppFTqjoDdOKOMOLY785ZQHl+2imSD41iXs8=; b=m/0TwCP4AeFIja5oFYzSdS1UmNGYv5HiRR+7nTAk6AeKsfyU4jEzAW9ocvACmCb56JUC36 kOUpsKv3bQcZra0txODKBlFfWpWsqx/Tn6JzWOg4rvIiXKMgAXLT1IQyE4AWbfqCxBQVF1 MkbEQekOgPefQ1k3cJlBvtVvZLc5Dhd6bHbpmfgItCeviSAssY1GK4DbsYUij6BMygXzQQ zWjzt87HrgpB71uOZGghUUAWcD2IFo36UOTBckA62plXdpG3IlEi4rWYXStphi8Ndiac1P ARjp+AA9SXDwUuDvFP0dK154HQ3CutJM/2mr3Lrz3gnZTzKhPziup3tOnpdUFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680127639; a=rsa-sha256; cv=none; b=lFTkqM/PVBS3cLk2Rq917J7KanZ9JwujGHJxsDPXmR/Hz59XX/DZwnVZm2riAnz89W+gXV ZT8KWGnjhKpLPc9ygSrcKxKI/sYajcF+JiBOp0/iVZRMuUQ235scuZJijqKHngu6Mh4vC5 B/1L/8hIKHlgC+oYKaYHuJTvBknWiboi4zQidc0yvU9Lq1U8mM+O79BCaWPm1Nj8PZM4en ZziLCSlfVcj/0E+KKrQ5hIAMem+t8x4SrS0aZ2JheRfEGO1TSPPrjhqaqSE916cehs6PSd MEfb2sfHsKm5BI1Yi+vYxikf7oDx/WhfnsvDSHcctk2jtB1SuyegDJMt3oJtgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn0yv1c9jzmfY; Wed, 29 Mar 2023 22:07:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TM7J2S050738; Wed, 29 Mar 2023 22:07:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TM7JG7050737; Wed, 29 Mar 2023 22:07:19 GMT (envelope-from git) Date: Wed, 29 Mar 2023 22:07:19 GMT Message-Id: <202303292207.32TM7JG7050737@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: eeedaefab5ef - main - Remove LLVM build glue for MIPS as a native architecture. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: eeedaefab5ef689abf03df2e8a273be0a5595d84 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eeedaefab5ef689abf03df2e8a273be0a5595d84 commit eeedaefab5ef689abf03df2e8a273be0a5595d84 Author: John Baldwin AuthorDate: 2023-03-29 22:06:15 +0000 Commit: John Baldwin CommitDate: 2023-03-29 22:06:15 +0000 Remove LLVM build glue for MIPS as a native architecture. This does not remove LLVM_TARGET_MIPS. Note that the only MACHINE_ARCH values ending in 'hf' were all MIPS architectures, hence removing the pattern matches for 'hf'. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D39331 --- lib/clang/llvm.build.mk | 12 ++---------- share/mk/src.opts.mk | 2 +- usr.bin/clang/Makefile.inc | 5 ----- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index 575b6b2d9c62..d958a4becc63 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -49,8 +49,8 @@ TARGET_TRIPLE_ABI= .endif VENDOR= unknown -LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI} -LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION} +LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI} +LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION} CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${LLVM_TARGET_TRIPLE}\" CFLAGS+= -DLLVM_HOST_TRIPLE=\"${LLVM_BUILD_TRIPLE}\" @@ -73,9 +73,6 @@ CFLAGS+= -DLLVM_TARGET_ENABLE_BPF .endif .if ${MK_LLVM_TARGET_MIPS} != "no" CFLAGS+= -DLLVM_TARGET_ENABLE_MIPS -. if ${MACHINE_CPUARCH} == "mips" -LLVM_NATIVE_ARCH= Mips -. endif .endif .if ${MK_LLVM_TARGET_POWERPC} != "no" CFLAGS+= -DLLVM_TARGET_ENABLE_POWERPC @@ -126,8 +123,3 @@ CFLAGS+= -DBOOTSTRAPPING_WANT_NATIVE_SYSCTL .if defined(BOOTSTRAPPING) && ${.MAKE.OS} == "Linux" LIBADD+= dl .endif - -.if ${MACHINE_ARCH:Mmips64} -STATIC_CFLAGS+= -mxgot -STATIC_CXXFLAGS+= -mxgot -.endif diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index c0491d6e8769..8032284d964e 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -263,7 +263,7 @@ __LLVM_TARGETS= \ powerpc \ riscv \ x86 -__LLVM_TARGET_FILT= C/(amd64|i386)/x86/:C/powerpc.*/powerpc/:C/armv[67]/arm/:C/riscv.*/riscv/:C/mips.*/mips/ +__LLVM_TARGET_FILT= C/(amd64|i386)/x86/:C/powerpc.*/powerpc/:C/armv[67]/arm/:C/riscv.*/riscv/ .for __llt in ${__LLVM_TARGETS} # Default enable the given TARGET's LLVM_TARGET support .if ${__T:${__LLVM_TARGET_FILT}} == ${__llt} diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index a257b795b7af..ba32f0c1032d 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -12,9 +12,4 @@ DEBUG_FILES_CFLAGS= -gline-tables-only DEBUG_FILES_CFLAGS= -g1 .endif -.if ${MACHINE_ARCH:Mmips*} && ${MACHINE_ARCH:Mmips64*} == "" -CFLAGS+= -mxgot -CXXFLAGS+= -mxgot -.endif - .include "../Makefile.inc" From nobody Wed Mar 29 22:38: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 4Pn1fy3svwz4203X; Wed, 29 Mar 2023 22:38: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 4Pn1fy3Cv9z43BL; Wed, 29 Mar 2023 22:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680129514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T/oloV/6tI24q57gKHWVsgI2UcY+YhSjRKraFmwDVEY=; b=aPrPtKuFK8gioFnzdqmgg7bQraZ8k0uzb/KHhG9VtJP6VVXc3YElhucBg+/zjSGn3IvAjW PFxcMGslSj2jInzuHplAH2zBTSbDD849hoZBB3HFwmwL/ZlvDLOk9DIIHUaIgbBWDafDMs o7gHG+qRFzbkChswmHjHtO8X7TF9JI/z1ybwL6vfTWFv7gtdHyQk6OUGpTFibt6sUmvUI1 yYQ5oWggUbcggMNaMW+N2zKQGZMKiVXgWeG7M1o02p1Kxsy/mgScDbTPUnSTnY4Hzyfi5n kdbpRod34InR5DIrT4iAqbeIJLZLXSoKEEqfSJvu62nvW+3FIzrIpGHxjkFA7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680129514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T/oloV/6tI24q57gKHWVsgI2UcY+YhSjRKraFmwDVEY=; b=y2s67KGWfyjdlciU/7MUvXiGAJqwNZuBPD+iGSEkcVHkWAi7b+vw/9MVuUDen9QNclNIRX BB+fjJRaAMcn/BkEKpnChrjfEansFQQLT3iFl156yL2SB+r4wG8dPtFT3vf1oGNbJgJwau BQhyrvG7mjHarD9ELWKf0kxXd6tOyAXEHKK92AcLBH6blj1JDmtNfNAduHr+5dAdtPcQA7 cbU4m+KfDuTp6QLFjTEkqoT9tOhQcmSgpvZyOpMjcsy2mDBs80dRNPzQ9HWBYmlF5dN30a hQvwDSQikTUWV2U2jrw1zFzdga9rOb97XTVYmbgVyl56olC9qUdAhWi8seKQPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680129514; a=rsa-sha256; cv=none; b=yV0kmA4Y7ZruiFvoAjZColftUarsBQQQ0+4dZAIy0vm0hAJ3ugY4kbUMgy7YwT/guOJXxV 1JP2jiIqieZNdXfZBb82/DcUW0xrHbpmJStaNtt+KV4uczQnBNaRW1OjqrAFVs76eQfMFk 32aIeXOpQKAiGuGooQmmol8n74wdA1XmLJKjEYERLiMD4Cwo+ZruOiBEUOi1XOxAplo5of 2Ye7XAjZjGh0Ne/rPrE6ywH6EO09ahXCQ7qPiPXWb4BbG/VBY4hlH//qcuVPeNtM3Q6gTQ odWIwqp8vSU4twJGhHg3tReIuwGJa5EPAs7sWnhMsRGomvzRyKLP3H8UJyRUiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn1fy2BK9zn46; Wed, 29 Mar 2023 22:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TMcYQ1000155; Wed, 29 Mar 2023 22:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TMcYGK000154; Wed, 29 Mar 2023 22:38:34 GMT (envelope-from git) Date: Wed, 29 Mar 2023 22:38:34 GMT Message-Id: <202303292238.32TMcYGK000154@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: 738b20a47f73 - stable/13 - amd64 wakeup: recalculate mitigations after APICs are woken List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 738b20a47f7379b27ccf7a6d2af2c1bbfa11d05f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=738b20a47f7379b27ccf7a6d2af2c1bbfa11d05f commit 738b20a47f7379b27ccf7a6d2af2c1bbfa11d05f Author: Konstantin Belousov AuthorDate: 2023-03-28 23:51:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-29 22:37:54 +0000 amd64 wakeup: recalculate mitigations after APICs are woken PR: 270489 Approved by: re (cperciva) (cherry picked from commit cd137909c3097fe223ce2b49075eed42a4933bb5) --- sys/amd64/acpica/acpi_wakeup.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 3df4457550d6..62e11f5797f6 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -294,19 +294,21 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, * in acpi_sleep_machdep(), after the microcode was * reloaded. Then recalculate the active mitigation * knobs that depend on the microcode and - * cpu_stdext_feature3. + * cpu_stdext_feature3. Do it after LAPICs are woken, + * so that IPIs work. */ identify_cpu_ext_features(); - hw_ibrs_recalculate(true); - hw_ssb_recalculate(true); - amd64_syscall_ret_flush_l1d_recalc(); - x86_rngds_mitg_recalculate(true); mca_resume(); if (vmm_resume_p != NULL) vmm_resume_p(); intr_resume(/*suspend_cancelled*/false); + hw_ibrs_recalculate(true); + amd64_syscall_ret_flush_l1d_recalc(); + hw_ssb_recalculate(true); + x86_rngds_mitg_recalculate(true); + AcpiSetFirmwareWakingVector(0, 0); } else { /* Wakeup MD procedures in interrupt enabled context */ From nobody Wed Mar 29 23:33: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 4Pn2tV2kFtz423R4; Wed, 29 Mar 2023 23:33: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 4Pn2tV1njFz47Dh; Wed, 29 Mar 2023 23:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680132818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d/Rdn1IEsiSlEGWlGVC4xHcrqI/5KBiKzWIUJjidipk=; b=M9ymJABMvWzaoVG6q78P1eF+qkKfOgXA21BI6TnAUbM9YyRJP7l3GnlxK4QJD7/JHZghb2 FNppQd93TyNDFEmWKJaknA3ZtH3ZRr6bF2HXFlHJqlwbnN3OQT9Dg+zVio27oCW1QLJGCI QMi35sjm38yXjFfCxM7sqzTmvoQWtWAZYwV4RTjCpNwBv5ZNZpPsm8GQYxdAMlTFVZIBE1 C46XPSZZbRrxNr2o+7gTt4N+zs2989kNWCUa8MezXhVzs3PZQeoLnyJRNiqnMdnojARabH lpQiWAvfknqtMf2XZ6iK6FOpBH94dtCtmed4PdXDxyBK5feYjEY/O+XjEI9SFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680132818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d/Rdn1IEsiSlEGWlGVC4xHcrqI/5KBiKzWIUJjidipk=; b=jmhQAOMGxGcBWrqCaLHWZRaNaT3CR8G3/D5Qu2ySutQyjQlMBJvg6/npwvdc3O8UnWWLML a+v/nnOalle3D3XjxirathRowvp/J/8caGS2FidzblWT0cV5UCUUNHPif5DrsGapvAqPI2 9ohCrjTbB+cCZqxDhh+jlFElGLkLyV3XFjEhe/7uhAyCy+VHKXrHtGvfuCwtwebCIA+/F2 z+67Q32h12ugo/47x45uPfT9NjG44IkYtOfIgTisTSSYQzbwBqERCRjMiAhaMWhbJd21Me 9s/L8LgZIlMJkv/DU3Gv4QmU1STZnUTzUU7gEwjWTbhh45T0MoFaUgQJh+fi1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680132818; a=rsa-sha256; cv=none; b=P8WvJTU0JUYsnTzuK1g9qVejghmXxzmWVj8Bgr4MOMi9+pqdWz5FRA8SLMDp44rSyxK/t9 f8s6y1w0gWsC/gt8PbUgjhCxQ8WIgM8Pxy8YSgMK8F0JHj5jsEdydQpW9R7OeheDGAyE+B 6g23UKNsPjfvCepAHX8105JQz8nyrAocMq61pM1A0K9+bmpYmbxpjoN9/LelWBNh338i35 AOANIczD73MzTkymNVQD7zllRE/sWDQvNq+a30apYIDRMmd3eTxUXn6RpIwnF++V3ZqzgB dbMCos3Vk+d+quuwy30+XQpMSlgzcOXuYlTnpQsPkcRr2EFw0PdSmesM7fYrlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn2tV0pYczqFh; Wed, 29 Mar 2023 23:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TNXcTK097747; Wed, 29 Mar 2023 23:33:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TNXcgX097746; Wed, 29 Mar 2023 23:33:38 GMT (envelope-from git) Date: Wed, 29 Mar 2023 23:33:38 GMT Message-Id: <202303292333.32TNXcgX097746@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: 9faa27f263d1 - main - ssh: update FREEBSD-upgrade for upstream CheckHostIP default change List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 9faa27f263d1b68cc1beb5a58e9ff2a80fa1e20e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9faa27f263d1b68cc1beb5a58e9ff2a80fa1e20e commit 9faa27f263d1b68cc1beb5a58e9ff2a80fa1e20e Author: Ed Maste AuthorDate: 2023-03-29 22:27:21 +0000 Commit: Ed Maste CommitDate: 2023-03-29 23:32:44 +0000 ssh: update FREEBSD-upgrade for upstream CheckHostIP default change We changed the CheckHostIP default to "no" years ago. Upstream has now made the same change, so do not list it as a local change any longer. I did not just remove the "Modified client-side defaults" section to avoid having to renumber everything, and we may add a new local change in the future. Sponsored by: The FreeBSD Foundation --- crypto/openssh/FREEBSD-upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 78cca746fb77..caf9597b0d6b 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -121,9 +121,9 @@ 2) Modified client-side defaults - We've modified some configuration defaults in ssh: - - - CheckHostIP defaults to "no". + We defaulted CheckHostIP to "no" in 2000 (a95c1225217b). Upstream has + now made the same change, and we no longer have any modified client-side + defaults. 3) Canonic host names From nobody Thu Mar 30 01:49: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 4Pn5vQ1LPKz42CY2; Thu, 30 Mar 2023 01:49: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 4Pn5vQ0KDqz4PYV; Thu, 30 Mar 2023 01:49:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680140978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hMeuvQj9m998MekDMkDC6IOlzZ7uKszvRwrG4gfRJ0s=; b=nYAtEOXSkpfbKP50ALeu5HuwoEkfYLxXGWSVL3Vk8qxHU36vqH3DtAiP+nKseWuutg2ZGc uCjsPza+OFO7EjMOO4OeByHAzsOy1bw/s9UkyKTgn5flKgWOI/lrODIsndvoh+aag3PfnI 2OEbAv2RvrYDlE6cyiwfRfb7DsJdpxn91CgAO0ISh5O4/l8uKbRzwP25q+TwZHLZ1whgSE DnksNi74mC1z4HtlpcLCA8l0yL6uQkvmZghQA8OGKgpzEY6v+VJfxh6dsY83y+Z5pphYLP t7lJmrlQEPDziHFttLSGEX6/2UlV5QNB/Fq+zNA5mOd7xASLbQQZ+ORY7MnNLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680140978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hMeuvQj9m998MekDMkDC6IOlzZ7uKszvRwrG4gfRJ0s=; b=FDU0xKZsJzFFyT8OMalxuu6Z8bpGq0qnxQyBroovt730Mae79cNXg6ZoK+Cq0+QDSAZN46 VPy/eNFpfBNF73XMOvJq63bgXUn9fpOxyz2KUuuHy1JzacRbgwJP/3xFf22169IrpTsFt6 +1ef8ZMO6YzGlE+PI0m9f1n29RDqAu7PrQXbTKNgUZlj8opQgLPZVv/aIKK/fnFRP7a26f UkFQxLdjT+4SV99ilD0j5RuXvxS4Cf8SJm8+6an1BkbrJ9ktEA2AmK6yFWD2JJbzLKl35K Uj5XS3cPBVdVYdnhSaipJdnsjFvD28MyVDy/FKIri7GNwDS4AkGkfWSl58rmcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680140978; a=rsa-sha256; cv=none; b=VHiEvjxKnkde2zf2jaiMAmwAvRFAdHh2A4cyq0gTnflcqhn7eNrfwFTUwKJJgIqGE+CwGa v9qzKCImQyNvT8g0Mhh1pjqYxGmV+XnoUd16cAFkQzAUBWAEP6uR9CopYh9zt3Z45rILex kwpLDQ9sjYtUTmZ7Mdue+gE2GLq7oP7BRNQzp0CaxF7U/wZRrpZJr6LtVn1+/PrPr7iuRS EL30IArT5ua72Vv//p3mZD1wqVMqaWN2LFvL6iVAqGuYIlO6cEnMQwrOXHBhlQkaiAs9ii cGNivoGmGaPO02vmlG2gFlbeH5oXE+dbq3SlOYsxxSZ9K/K39WilXUY2F8CvIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn5vP6Vrjzt9B; Thu, 30 Mar 2023 01:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U1nbbT013428; Thu, 30 Mar 2023 01:49:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U1nbMG013427; Thu, 30 Mar 2023 01:49:37 GMT (envelope-from git) Date: Thu, 30 Mar 2023 01:49:37 GMT Message-Id: <202303300149.32U1nbMG013427@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: 1fb7d2cf999e - main - makefs: spelling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 1fb7d2cf999e52e3682174d0c2f20cb3baf414f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1fb7d2cf999e52e3682174d0c2f20cb3baf414f3 commit 1fb7d2cf999e52e3682174d0c2f20cb3baf414f3 Author: Ed Maste AuthorDate: 2023-03-30 01:40:07 +0000 Commit: Ed Maste CommitDate: 2023-03-30 01:48:14 +0000 makefs: spelling Obtained from: OpenBSD msdosfs_fat.c 1.7 --- usr.sbin/makefs/msdos/msdosfs_fat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/msdos/msdosfs_fat.c b/usr.sbin/makefs/msdos/msdosfs_fat.c index 0081e2d2d38c..ab452be10f64 100644 --- a/usr.sbin/makefs/msdos/msdosfs_fat.c +++ b/usr.sbin/makefs/msdos/msdosfs_fat.c @@ -135,7 +135,7 @@ pcbmap(struct denode *dep, u_long findcn, daddr_t *bnp, u_long *cnp, int *sp) int error; u_long i; u_long cn; - u_long prevcn = 0; /* XXX: prevcn could be used unititialized */ + u_long prevcn = 0; /* XXX: prevcn could be used uninitialized */ u_long byteoffset; u_long bn; u_long bo; @@ -668,7 +668,7 @@ chainlength(struct msdosfsmount *pmp, u_long start, u_long count) } /* - * Allocate contigous free clusters. + * Allocate contiguous free clusters. * * pmp - mount point. * start - start of cluster chain. @@ -737,7 +737,7 @@ clusteralloc1(struct msdosfsmount *pmp, u_long start, u_long count, { u_long idx; u_long len, newst, foundl, cn, l; - u_long foundcn = 0; /* XXX: foundcn could be used unititialized */ + u_long foundcn = 0; /* XXX: foundcn could be used uninitialized */ u_int map; MSDOSFS_DPRINTF(("clusteralloc(): find %lu clusters\n", count)); From nobody Thu Mar 30 03:07: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 4Pn7dY0K8qz42JhT; Thu, 30 Mar 2023 03:07: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 4Pn7dX5bhsz3N17; Thu, 30 Mar 2023 03:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680145664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nmmiNyljVgdH8EgfbmFWdlD7IRr46KuYC62nbNsev0=; b=iRDoJ/ut7cDfSqnNYXNIQ6Txy/HOLtu+JaVPKKgCGooBPrP7iIrN8h+JJ4rKxtleLA5AKO FKHSVoJffKPbmSj1yw2t+xRXRhDZ2iM8sUaIqiq2X+No7kgcWYEsren97bMfiDn6tb+FnC 268hG7Hh6XP+hoBjqdJYztxz3g0GFGHYhj4TTHETiC1qlujNWKx1jm4XD8cIwXudseoHRn G69LnPqzdcfKkjyN7nTagYuVT1DUaY2fsyM5on0owLzZR98yDwtcKhy5BkXkF6fT0UZjdn kK9vtxk5eDI2lXGpj0RQYcvgjFlGyx0wwFKAZwqlJJ49S2n2p8SXM0hEC2Ml/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680145664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nmmiNyljVgdH8EgfbmFWdlD7IRr46KuYC62nbNsev0=; b=VYW5KH5c1aMHwKUZYQGy8y0g+nzpWA+ufqa9ZbOvA6yVl1r0vLMo3BIyIFLhS/gsuFMJ2I IpbJ82C2XrX+pJge6Lsk1ZuBUAVxpIBDEd+5XLVfHWpNcgbZl700Y7MR+/36rPgC6A66Va fQ+okzgWmzfGNpSXklAxnhsq7YtS3UQ5ZzijHIIH4q9JCo5+emNWCFvreuiFJfuPWrNFLD TXYo3Jz+Da+vWTBhOpQy3vKm/qgckMDuicql6GA8A9iFEXMbaQKzSRLQRzptVJhTGhr53X MXPKyAPapOeQ/QHCXfvzDyMLKHyvRJ+Qho779D3Cy+PCviE4YPIvqtPRt1KSgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680145664; a=rsa-sha256; cv=none; b=CaNvGdvBPwnYdjZpygwh2r0mKSib7prlqPA5E9oHc2ooY9wNWqqYoqwgY0ORnYE8CRnGIg ZCZvw7FPdEujKHf09px7nbuiVZ28irmKqABBcc8fNiiTsX4EGudJH3HH/Jwtdd/r2l8cbr nEhijBUGB2YKjJqeJ271/0t+z2N3uKoyR/ehkROQTDvdtSe31x27rSokpYxdcyR7xPVsie OYRzget0J0X63QXGhLs/A051VpWfjLiEGXHNc6w8Kt+LB7F+YyGpgmBIfBtUTseNhGCbwQ b/GRQvmdeZUq/4Ocki9dJZ9K/AXr5lEZIzvCZkz+To2Ji8k9fwt4MA8MRkRZiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn7dX4gxtzwFK; Thu, 30 Mar 2023 03:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U37i1l046396; Thu, 30 Mar 2023 03:07:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U37ibI046395; Thu, 30 Mar 2023 03:07:44 GMT (envelope-from git) Date: Thu, 30 Mar 2023 03:07:44 GMT Message-Id: <202303300307.32U37ibI046395@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: 9965ab873cd7 - stable/13 - pfsync: hold b_mtx for callout_stop(pd_tmo) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 9965ab873cd7e2ff07c8052497b1d5e3ae588a27 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9965ab873cd7e2ff07c8052497b1d5e3ae588a27 commit 9965ab873cd7e2ff07c8052497b1d5e3ae588a27 Author: Kristof Provost AuthorDate: 2023-03-22 13:46:25 +0000 Commit: Kristof Provost CommitDate: 2023-03-30 00:23:07 +0000 pfsync: hold b_mtx for callout_stop(pd_tmo) The pd_tmo callout has an associated mutex, which we must hold while calling callout_stop(). Reported by: markj Reviewed by: markj MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39223 (cherry picked from commit 01194da28a2123a2aa09808319f152fa115f60f1) --- sys/netpfil/pf/if_pfsync.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 0a8ece621006..a05fd85423ee 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -395,7 +395,7 @@ pfsync_clone_destroy(struct ifnet *ifp) { struct pfsync_softc *sc = ifp->if_softc; struct pfsync_bucket *b; - int c; + int c, ret; for (c = 0; c < pfsync_buckets; c++) { b = &sc->sc_buckets[c]; @@ -404,22 +404,25 @@ pfsync_clone_destroy(struct ifnet *ifp) * cleared by pfsync_uninit(), and we have only to * drain callouts. */ + PFSYNC_BUCKET_LOCK(b); while (b->b_deferred > 0) { struct pfsync_deferral *pd = TAILQ_FIRST(&b->b_deferrals); - TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry); - b->b_deferred--; - if (callout_stop(&pd->pd_tmo) > 0) { - pf_release_state(pd->pd_st); - m_freem(pd->pd_m); - free(pd, M_PFSYNC); + ret = callout_stop(&pd->pd_tmo); + PFSYNC_BUCKET_UNLOCK(b); + if (ret > 0) { + pfsync_undefer(pd, 1); } else { pd->pd_refs++; callout_drain(&pd->pd_tmo); - free(pd, M_PFSYNC); } + free(pd, M_PFSYNC); + PFSYNC_BUCKET_LOCK(b); } + MPASS(b->b_deferred == 0); + MPASS(TAILQ_EMPTY(&b->b_deferrals)); + PFSYNC_BUCKET_UNLOCK(b); callout_drain(&b->b_tmo); } From nobody Thu Mar 30 03:07: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 4Pn7dY4k6yz42JkH; Thu, 30 Mar 2023 03:07: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 4Pn7dY1k39z3N18; Thu, 30 Mar 2023 03:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680145665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eOHCv8/vLrRyOFmo3lnUKyvpU30UncNJPPAL8A1bFxU=; b=l8MOx3WNOHtLnzHOGgAJXRuu/uwvyO0ss0w491tVVsTuw9ipQ4PG7KXOrfrAGYr+gY4h9e 0BlMcMWKcM/Rh4AwylCLXcU9n6loRKEHfcUhP0HlG47vYSdVlcutHyS0UksUkvjbRNEHKX KL4nbZAs/Hy1ZVlQUiFyhi4TAjhdwUrqdCqiyoNZFpfohaqkO3RneW2HE3gtQ8dwhO1mfY swgpQrJtc6Yp1EC0kqMh7bjO0ZnuzyZRidKAY8S2C4p9X96ZJ3AQPIEh8AA7qY8sxaXQlm FhWn2jaTBQlVgpJcKHQZT1wGCeWsSIZuuSFBc/f4GNwBjWd8REa+8u6aHgsIQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680145665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eOHCv8/vLrRyOFmo3lnUKyvpU30UncNJPPAL8A1bFxU=; b=T+SxLFxFwC77USobA1L7jrP4x2FcSQjg9PwSqgxSIYd2R7Sx9pT1vIGimVz0GXhUfU2Rth v0V6Vtny8cjMYnWJ3+Beqj7uNjbjbvLYzCpbI9XbXu5XUi/nZVTiPGVtPRGsjC/f9na+UF qmfuRsLwjHiGit+b6hp48s3eNu6C5qGS5R45SLchr1MhuTX/537G7WCiBvlfpl8+JkPsp9 SeIMYO8ZQzsqKLniJIPi4fQVrXzpV8gz6uOZbf9FH1bXKXngBoU5AB6Y+heSFlMBp3qpXC nPw+JHkmzKsc/acM+rDXtkll1n/nyxK39GQ5gdBDxXFWx0EfQ5+wwSbja6c07g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680145665; a=rsa-sha256; cv=none; b=GIOX5EIWqlyyDkaaEdWLvjNBFWXZUQlhnVBiQPnR1fP/wHcxmJI81+u6zQBunlkhY47kGs WmvtMgXGdGmJYi+rcCfs8QXns2g1RVytNGTyM+WOGDzM2zu8tMdplph+cXjrlO++n/K8Wd bnZr7DL1VGj+KBgzEtYCLJd4vHsw8btg5cV2YjpcvHi4zHBRcmZH3Yqnvpk8gGlrYglvRI 3tO5CZw5IW0uZpI/k+ZTz1NvCHWlqaKlqramr6EMk8Od0vPcqRVWJAtskjvvXWrcRAOubD qe1gxP+zkGe1IlugAyO/MfX5WJfstSZPXZUVv34EPLIvNLHyVXBx2uxpVP4SIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn7dY0qrVzwJl; Thu, 30 Mar 2023 03:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U37jTx046473; Thu, 30 Mar 2023 03:07:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U37j7g046472; Thu, 30 Mar 2023 03:07:45 GMT (envelope-from git) Date: Thu, 30 Mar 2023 03:07:45 GMT Message-Id: <202303300307.32U37j7g046472@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: 5f74ed9afdb1 - stable/12 - pfsync: hold b_mtx for callout_stop(pd_tmo) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/12 X-Git-Reftype: branch X-Git-Commit: 5f74ed9afdb143f3e2c5159b778685fd69f54d1d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5f74ed9afdb143f3e2c5159b778685fd69f54d1d commit 5f74ed9afdb143f3e2c5159b778685fd69f54d1d Author: Kristof Provost AuthorDate: 2023-03-22 13:46:25 +0000 Commit: Kristof Provost CommitDate: 2023-03-30 00:23:09 +0000 pfsync: hold b_mtx for callout_stop(pd_tmo) The pd_tmo callout has an associated mutex, which we must hold while calling callout_stop(). Reported by: markj Reviewed by: markj MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39223 (cherry picked from commit 01194da28a2123a2aa09808319f152fa115f60f1) --- sys/netpfil/pf/if_pfsync.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index a73b4ff95c6a..30cac5717df5 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -395,7 +395,7 @@ pfsync_clone_destroy(struct ifnet *ifp) { struct pfsync_softc *sc = ifp->if_softc; struct pfsync_bucket *b; - int c; + int c, ret; for (c = 0; c < pfsync_buckets; c++) { b = &sc->sc_buckets[c]; @@ -404,22 +404,25 @@ pfsync_clone_destroy(struct ifnet *ifp) * cleared by pfsync_uninit(), and we have only to * drain callouts. */ + PFSYNC_BUCKET_LOCK(b); while (b->b_deferred > 0) { struct pfsync_deferral *pd = TAILQ_FIRST(&b->b_deferrals); - TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry); - b->b_deferred--; - if (callout_stop(&pd->pd_tmo) > 0) { - pf_release_state(pd->pd_st); - m_freem(pd->pd_m); - free(pd, M_PFSYNC); + ret = callout_stop(&pd->pd_tmo); + PFSYNC_BUCKET_UNLOCK(b); + if (ret > 0) { + pfsync_undefer(pd, 1); } else { pd->pd_refs++; callout_drain(&pd->pd_tmo); - free(pd, M_PFSYNC); } + free(pd, M_PFSYNC); + PFSYNC_BUCKET_LOCK(b); } + MPASS(b->b_deferred == 0); + MPASS(TAILQ_EMPTY(&b->b_deferrals)); + PFSYNC_BUCKET_UNLOCK(b); callout_drain(&b->b_tmo); } From nobody Thu Mar 30 03:07: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 4Pn7db0qwGz42JpJ; Thu, 30 Mar 2023 03:07: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 4Pn7dZ2DlSz3N1J; Thu, 30 Mar 2023 03:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680145666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8v1dqga6G3oYgr+/92eylGLfLlDxIrEFqABxO4WEjqA=; b=kTsLWj6eCG/3ZGfziqM0V3vw3+uG5vLncouAPynec5uLxMw6BmTTEejXDiAb22IjqyA7U8 iZuf9l2wGP3ek5P6NoO5Y+QlVTKWu17KiqDej83SvREJVCvzeLKzp17+3sAvJHtRz2MV/r 0VnR+m1l61f3yGsMmcbJ/2cyKw3uDPT7Dnvl5vgDZa8Uew6xHDAJhg+YvKq8SB04N0uw5M evyVJtrN7VSrTFvxXosJT4Lm/1S8zCmYYP9XcjrFDo4O7TKdem/k7tGxxos5kRLtTuzNnf 1or0KSfGYpf1wXd4b2UC19CUuUlhoU13NWGJ8pK5X1kk09CJrgEp5x05OmFzSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680145666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8v1dqga6G3oYgr+/92eylGLfLlDxIrEFqABxO4WEjqA=; b=dTdxYWeehCPK6jHbJqVPn8LCavzrDOswrwGSPRT2sknC+p8ez6yBhdLEulkGiqh+v/In63 PgidqCLiW876bujiGTCWyJd4nl4ZG/gfvI+0bB2krNZenlSkCB6wGgye3e/99r94G34TCM dpTjU5bb/X4PX9MKTx9h4cOQhRy8r/V1O1kLfBqVgAPI5ID2EmuoxztXHWtsnnNQ4NRdzQ SwNJiwC0peyfY5aKv5NzXN1SsGbB42mvhetE1tVJkyGlXovJArkFkBgb3LViBgXdwT92BA XEn5/Mh8W4hCc5tenzD7rF8Qa0eA5abwyeCwW7XW8OrocAVZ2II+mDy7M69CVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680145666; a=rsa-sha256; cv=none; b=rcCaswFXAH+TILz2A0FHgw+k3L74kY8MwVtHLfQ/0QmdQfY9KrCF6q3kxuB3fqstnfVxhr ++DuMJqloPThy5SgDU5tSDRhnZfOWPej/gZJj/75aXI3afWrobLlp3FATMSPbI96uuhVlD GLtZH10M9ulWW3/pYZfrZBONGYlPn0KwdYgllaIt+w21Yc4Y/1D2zVv5Pc+9sztfDLaX8W DVS2H1YyUmRX3XeVuiVLpUF3HQGInZxqITIi7YS/rmU0jbInCdkcCK+1xHoB4X7uJY8QGB uIFdCI9HpGY6j0Lr2hFJXYAxzpyhBLe1TIO0n8Qa9MtCZxgLUV99zGiOq32PBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn7dZ1KwZzwGj; Thu, 30 Mar 2023 03:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U37kP8046518; Thu, 30 Mar 2023 03:07:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U37kb1046517; Thu, 30 Mar 2023 03:07:46 GMT (envelope-from git) Date: Thu, 30 Mar 2023 03:07:46 GMT Message-Id: <202303300307.32U37kb1046517@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: 8d636e4d6937 - stable/12 - pf: remove pd_refs from pfsync List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/12 X-Git-Reftype: branch X-Git-Commit: 8d636e4d6937b36cd6f1c45f057c672c855571cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8d636e4d6937b36cd6f1c45f057c672c855571cc commit 8d636e4d6937b36cd6f1c45f057c672c855571cc Author: Kristof Provost AuthorDate: 2023-03-24 06:04:56 +0000 Commit: Kristof Provost CommitDate: 2023-03-30 00:23:31 +0000 pf: remove pd_refs from pfsync It only served to complicate cleanup, and added no value. While here drop packets in pfsync_defer_tmo() if we don't have a syncif, rather than just leaving them on the queue. Reviewed by: markj Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39248 (cherry picked from commit 27b23cdec9d1255e014ea0decac42a5be8d00735) --- sys/netpfil/pf/if_pfsync.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 30cac5717df5..648e2bd36f34 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -184,7 +184,6 @@ struct pfsync_upd_req_item { struct pfsync_deferral { struct pfsync_softc *pd_sc; TAILQ_ENTRY(pfsync_deferral) pd_entry; - u_int pd_refs; struct callout pd_tmo; struct pf_kstate *pd_st; @@ -414,10 +413,8 @@ pfsync_clone_destroy(struct ifnet *ifp) if (ret > 0) { pfsync_undefer(pd, 1); } else { - pd->pd_refs++; callout_drain(&pd->pd_tmo); } - free(pd, M_PFSYNC); PFSYNC_BUCKET_LOCK(b); } MPASS(b->b_deferred == 0); @@ -1784,7 +1781,6 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m) st->state_flags |= PFSTATE_ACK; pd->pd_sc = sc; - pd->pd_refs = 0; pd->pd_st = st; pf_ref_state(st); pd->pd_m = m; @@ -1834,20 +1830,20 @@ pfsync_defer_tmo(void *arg) PFSYNC_BUCKET_LOCK_ASSERT(b); + TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry); + b->b_deferred--; + pd->pd_st->state_flags &= ~PFSTATE_ACK; /* XXX: locking! */ + PFSYNC_BUCKET_UNLOCK(b); + free(pd, M_PFSYNC); + if (sc->sc_sync_if == NULL) { - PFSYNC_BUCKET_UNLOCK(b); + pf_release_state(st); + m_freem(m); return; } CURVNET_SET(sc->sc_sync_if->if_vnet); - TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry); - b->b_deferred--; - pd->pd_st->state_flags &= ~PFSTATE_ACK; /* XXX: locking! */ - if (pd->pd_refs == 0) - free(pd, M_PFSYNC); - PFSYNC_BUCKET_UNLOCK(b); - pfsync_tx(sc, m); pf_release_state(st); From nobody Thu Mar 30 03:07: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 4Pn7db15FVz42JhY; Thu, 30 Mar 2023 03:07: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 4Pn7dY6gpTz3ND9; Thu, 30 Mar 2023 03:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680145665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gD8NTxcxm16PB0p8T1sqNvFDBVRw8fH5vXWuhyhvEd8=; b=P98URLIQzQS9sdQAC6EaVYdspd/R5b3DaC1Uq5cyXB0IqIQnpcnLXSq7hqxdOj3KuRr9e/ d9xE8ZlSwXl/v0LnajQ3OO7D3h6HxVrm+fxnxusEGxoaVwmWQ+22f8U7UYKOwelukupdwd I6wNoiRLCAe/2kfAlRFyVeyj0hVJHk8DDCp3KhMmc/GtC/koxz5+dhvxB4FuzodxkAkQOh 9RsgRs+9v5A+tzrSuYMDM9GVDjJIZu+7z7XxacZahTCoEB5x9GIjZ9CabFNMjawhhicwA8 15pmBOUeJMwh6BCK9rdwcV4l3z2hurmmUP6Czl/QMRiiia4gUP/C/zVS48nzmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680145665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gD8NTxcxm16PB0p8T1sqNvFDBVRw8fH5vXWuhyhvEd8=; b=kp7csMxB2rX195SoJbe8lxR0spv0NjmfaG/JIo3Ucpo5vwNXKtt6iUmauzygfN0gyeCRlI XVMqzH1LQNHu4MHY3baTAfvgTsGX4rN/dYKzfh9c1Lksn7t5068XcJb9W0AMWjQyrNTlTU hYLztlC5UzSiGY6nfhhPh4xFT955L1Yamcj9T2GQ6jfDBM30JRM8/gymmDMSug1Syul5Nr gmq6a6v/cpTt708o5ptBGlSbW5/OG+OdSEDVpKauz7+wmn+Jf4aYYL8twI4cGm2V+qJtcY IoPIIt9P6v27de7dXGLUbrgfnqjTwtxInQKUBaovXBfIfsf5pWSrF5Sx4rI6fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680145665; a=rsa-sha256; cv=none; b=cOGXN3t6etnc/1QoKq+Gu0tS+k0jnbFOO2ameGA2HUjsXvRpIbTTthnRk8+OzayifcXnwm eQ1JmhJO6SWdyAxWMqtqqDlQdr96659o1RiJLA4ZoWwXghmbw+ficUoBAIo6nIIs3ViLQB K6+kDaBc9WcKRHHehAwNqwcciJ4keMiWuIh5OyD5T49nCizRG36jXG+7wVAMcnGw1Ozy7U nX8MOOzDq4fB5Z9g9g6gy0UywBZS/ybZIQhc0jXuUNdxR7wsVcDHVr4wjh9WRj7fKbGlrd MTJ6M913WFe0pr8xe66W68nLMAzIemvMi1KilV6lyRaIlEHzlInepgRBAj1M+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn7dY5nBtzvf7; Thu, 30 Mar 2023 03:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U37jXD046498; Thu, 30 Mar 2023 03:07:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U37jgp046497; Thu, 30 Mar 2023 03:07:45 GMT (envelope-from git) Date: Thu, 30 Mar 2023 03:07:45 GMT Message-Id: <202303300307.32U37jgp046497@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: 8d261cd2d38f - stable/13 - pf: remove pd_refs from pfsync List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 8d261cd2d38fb1cbf4ba5450fafa92f85f64eb82 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8d261cd2d38fb1cbf4ba5450fafa92f85f64eb82 commit 8d261cd2d38fb1cbf4ba5450fafa92f85f64eb82 Author: Kristof Provost AuthorDate: 2023-03-24 06:04:56 +0000 Commit: Kristof Provost CommitDate: 2023-03-30 00:23:30 +0000 pf: remove pd_refs from pfsync It only served to complicate cleanup, and added no value. While here drop packets in pfsync_defer_tmo() if we don't have a syncif, rather than just leaving them on the queue. Reviewed by: markj Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39248 (cherry picked from commit 27b23cdec9d1255e014ea0decac42a5be8d00735) --- sys/netpfil/pf/if_pfsync.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index a05fd85423ee..b05e1ae9550a 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -184,7 +184,6 @@ struct pfsync_upd_req_item { struct pfsync_deferral { struct pfsync_softc *pd_sc; TAILQ_ENTRY(pfsync_deferral) pd_entry; - u_int pd_refs; struct callout pd_tmo; struct pf_kstate *pd_st; @@ -414,10 +413,8 @@ pfsync_clone_destroy(struct ifnet *ifp) if (ret > 0) { pfsync_undefer(pd, 1); } else { - pd->pd_refs++; callout_drain(&pd->pd_tmo); } - free(pd, M_PFSYNC); PFSYNC_BUCKET_LOCK(b); } MPASS(b->b_deferred == 0); @@ -1782,7 +1779,6 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m) st->state_flags |= PFSTATE_ACK; pd->pd_sc = sc; - pd->pd_refs = 0; pd->pd_st = st; pf_ref_state(st); pd->pd_m = m; @@ -1833,21 +1829,21 @@ pfsync_defer_tmo(void *arg) PFSYNC_BUCKET_LOCK_ASSERT(b); + TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry); + b->b_deferred--; + pd->pd_st->state_flags &= ~PFSTATE_ACK; /* XXX: locking! */ + PFSYNC_BUCKET_UNLOCK(b); + free(pd, M_PFSYNC); + if (sc->sc_sync_if == NULL) { - PFSYNC_BUCKET_UNLOCK(b); + pf_release_state(st); + m_freem(m); return; } NET_EPOCH_ENTER(et); CURVNET_SET(sc->sc_sync_if->if_vnet); - TAILQ_REMOVE(&b->b_deferrals, pd, pd_entry); - b->b_deferred--; - pd->pd_st->state_flags &= ~PFSTATE_ACK; /* XXX: locking! */ - if (pd->pd_refs == 0) - free(pd, M_PFSYNC); - PFSYNC_BUCKET_UNLOCK(b); - pfsync_tx(sc, m); pf_release_state(st); From nobody Thu Mar 30 04:13: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 4Pn95j4jh2z42NMM; Thu, 30 Mar 2023 04:13: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 4Pn95j4QQLz3jXL; Thu, 30 Mar 2023 04:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680149625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R4uw24BlmoPDkLcWqpl9RDRX89p2dy+7WCVN30hxIXc=; b=EQLSVzUzLVkjVkYhTr0AmWuUtQHVw8GFBIubxxjIvchggCatjPnO0Mu3SP5o+ZYEDuVhs0 RtlbYYcqEg+bARhbqWnQwT9R31ZSbcA4nP4QD3mEfebjUPzogrRLbXCO51AEGDOzIT+x8p bbeu41uapOBlBQ9Jq1f4YrBiB3SMaVaL1C+jKwpdBZKPv5UsqafLgy49w9Q64wF5MD5AqS e951801X+shKUGw0b1RXtulF6jWslyRjC3XC4CeKTER8IHZSA77+nvzVaCwGQ+Ekr8z3tO smemLqOJyMyKgT0qRPPVfkaaYPklLRkaeh07ksqGC6MoGQ7jbSAOhbvoFymmbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680149625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R4uw24BlmoPDkLcWqpl9RDRX89p2dy+7WCVN30hxIXc=; b=FnKBU/HSYuHyqft+5zH6gUh34kHvM+H3yxc3NJ7oI0PVVy/8dKWWZ6pcl3NSC4Tg4A1j2J noz9npsardzMEbnG8DaQKUvWSCHg0c+SxDtdZTP5juOMFdulo3+CyKrjQxUZ+CV3f4Ngw3 yIyQz+NbwQZ+xxCBe/Y+PbXFBiIp4Lirb/vWdXh2fWKDBr4Zl2Q6Jl0Iz7sASW+Bss152F 7XjquY7sncWaNrRvEsoZcB09xghuyvs5dsOimn2OphZy2kFM+ElAhOgwZJaCrWAUDPr8wo GbW9K2wYxMYaEx+5dmovPBF9uRI5//PHL7LorY07mq7NhWZHyLkDXpjL/6/g4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680149625; a=rsa-sha256; cv=none; b=yKOEqM5+hTy+gQ4/tpDupHhByk31GOXLUAwaF2Dqn+ZukWVkSdXdKtKQ7M79zU8a0jq46M 5IBfWHC1OIPglbYiJdbLGw75YMO4XqL/i9k5hw8yAS3O8IHVXDND0MES/M+hUXLLaji5z4 DDcdJqWaPgEiG+TroAZcc72odcCfEKr0bcC2uUCg0nI0RcYxROPdQh7a9WMchba+vFDCmr NgNK3xCGW7R5RNTDzAEtAMM+T9gsYMy5miXIUqwANAQunq9Dbjeo8f/j0WbvXrDD9pIR1V TiOm7ulIwYdn7sJTSzzvnqyjtg9KPmiON/kOkQpFYX3tTXyQXhr7I7KUHJCdVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn95j3RlxzxgQ; Thu, 30 Mar 2023 04:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U4Djlg060959; Thu, 30 Mar 2023 04:13:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U4DjOY060958; Thu, 30 Mar 2023 04:13:45 GMT (envelope-from git) Date: Thu, 30 Mar 2023 04:13:45 GMT Message-Id: <202303300413.32U4DjOY060958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: fe5e6e2cc5d6 - main - Improvement in UFS/FFS directory placement when doing mkdir(2). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe5e6e2cc5d6f2e4121eccdb3a8ceba646aef2c9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=fe5e6e2cc5d6f2e4121eccdb3a8ceba646aef2c9 commit fe5e6e2cc5d6f2e4121eccdb3a8ceba646aef2c9 Author: Kirk McKusick AuthorDate: 2023-03-30 04:09:39 +0000 Commit: Kirk McKusick CommitDate: 2023-03-30 04:13:27 +0000 Improvement in UFS/FFS directory placement when doing mkdir(2). The algorithm for laying out new directories was devised in the 1980s and markedly improved the performance of the filesystem. In those days large disks had at most 100 cylinder groups and often as few as 10-20. Modern multi-terrabyte disks have thousands of cylinder groups. The original algorithm does not handle these large sizes well. This change attempts to expand the scope of the original algorithm to work well with these much larger disks while still retaining the properties of the original algorithm for small disks. The filesystem implementation is divided into policy routines and implementation routines. The policy routines can be changed in any way desired without risk of corrupting the filesystem. The policy requests are handled by the implementation layer. If the policy asks for an available resource, it is granted. But if it asks for an already in-use resource, then the implementation will provide an available one nearby the request. Thus it is impossible for a policy to double allocate. This change is limited to the policy implementation. This change updates the ffs_dirpref() routine which is responsible for selecting the cylinder group into which a new directory should be placed. If we are near the root of the filesystem we aim to spread them out as much as possible. As we descend deeper from the root we cluster them closer together around their parent as we expect them to be more closely interactive. Higher-level directories like usr/src/sys and usr/src/bin should be separated while the directories in these areas are more likely to be accessed together so should be closer. And directories within commands or kernel subsystems should be closer still. We pick a range of cylinder groups around the cylinder group of the directory in which we are being created. The size of the range for our search is based on our depth from the root of our filesystem. We then probe that range based on how many directories are already present. The first new directory is at 1/2 (middle) of the range; the second is in the first 1/4 of the range, then at 3/4, 1/8, 3/8, 5/8, 7/8, 1/16, 3/16, 5/16, etc. It is desirable to store the depth of a directory in its on-disk inode so that it is available when we need it. We add a new field di_dirdepth to track the depth of each directory. Because there are few spare fields left in the inode, we choose to share an existing field in the inode rather than having one of our own. Specifically we create a union with the di_freelink field. The di_freelink field is used to track inodes that have been unlinked but remain referenced. It is not needed until a rmdir(2) operation has been done on a directory. At that point, the directory has no contents and even if it is kept active as a current directory is no longer able to have any new directories or files created in it. Thus the use of di_dirdepth and di_freelink will never coincide. Reported by: Timo Voelker Reviewed by: kib Tested by: Peter Holm MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39246 --- sbin/fsck_ffs/dir.c | 107 +++++++++++++++++++++++++++++++++++++++++++--- sbin/fsck_ffs/fsck.h | 4 +- sbin/fsck_ffs/inode.c | 1 + sbin/fsck_ffs/pass1.c | 11 ++--- sbin/fsck_ffs/pass2.c | 13 ++++-- sbin/fsck_ffs/pass3.c | 4 +- sbin/fsdb/fsdb.c | 2 +- sbin/newfs/mkfs.c | 10 +++-- sys/ufs/ffs/ffs_alloc.c | 73 +++++++++++++++++++------------ sys/ufs/ffs/ffs_softdep.c | 26 ++++++----- sys/ufs/ufs/dinode.h | 10 ++++- sys/ufs/ufs/ufs_vnops.c | 5 +++ 12 files changed, 204 insertions(+), 62 deletions(-) diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index 64e477c66ed8..cc5305c390a4 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -88,12 +88,97 @@ propagate(void) if (inoinfo(inp->i_parent)->ino_state == DFOUND && INO_IS_DUNFOUND(inp->i_number)) { inoinfo(inp->i_number)->ino_state = DFOUND; + check_dirdepth(inp); change++; } } } while (change > 0); } +/* + * Check that the recorded depth of the directory is correct. + */ +void +check_dirdepth(struct inoinfo *inp) +{ + struct inoinfo *parentinp; + struct inode ip; + union dinode *dp; + int saveresolved; + static int updateasked, dirdepthupdate; + + if ((parentinp = getinoinfo(inp->i_parent)) == NULL) { + pfatal("check_dirdepth: UNKNOWN PARENT DIR"); + return; + } + /* + * If depth is correct, nothing to do. + */ + if (parentinp->i_depth + 1 == inp->i_depth) + return; + /* + * Only the root inode should have depth of 0, so if any other + * directory has a depth of 0 then this is an old filesystem + * that has not been tracking directory depth. Ask just once + * whether it should start tracking directory depth. + */ + if (inp->i_depth == 0 && updateasked == 0) { + updateasked = 1; + if (preen) { + pwarn("UPDATING FILESYSTEM TO TRACK DIRECTORY DEPTH"); + dirdepthupdate = 1; + } else { + /* + * The file system can be marked clean even if + * a directory does not have the right depth. + * Hence, resolved should not be cleared when + * the filesystem does not update directory depths. + */ + saveresolved = resolved; + dirdepthupdate = + reply("UPDATE FILESYSTEM TO TRACK DIRECTORY DEPTH"); + resolved = saveresolved; + } + } + /* + * If we are not converting, nothing more to do. + */ + if (inp->i_depth == 0 && dirdepthupdate == 0) + return; + /* + * Individual directory at wrong depth. Report it and correct if + * in preen mode or ask if in interactive mode. Note that if a + * directory is renamed to a new location that is at a different + * level in the tree, its depth will be recalculated, but none of + * the directories that it contains will be updated. Thus it is + * not unexpected to find directories with incorrect depths. No + * operational harm will come from this though new directory + * placement in the subtree may not be as optimal until the depths + * of the affected directories are corrected. + * + * To avoid much spurious output on otherwise clean filesystems + * we only generate detailed output when the debug flag is given. + */ + ginode(inp->i_number, &ip); + dp = ip.i_dp; + if (inp->i_depth != 0 && debug) { + pwarn("DIRECTORY"); + prtinode(&ip); + printf(" DEPTH %d SHOULD BE %d", inp->i_depth, + parentinp->i_depth + 1); + if (preen == 0 && reply("ADJUST") == 0) { + irelse(&ip); + return; + } + if (preen) + printf(" (ADJUSTED)\n"); + } + inp->i_depth = parentinp->i_depth + 1; + DIP_SET(dp, di_dirdepth, inp->i_depth); + inodirty(&ip); + irelse(&ip); +} + /* * Scan each entry in a directory block. */ @@ -471,7 +556,7 @@ linkup(ino_t orphan, ino_t parentdir, char *name) { struct inode ip; union dinode *dp; - int lostdir; + int lostdir, depth; ino_t oldlfdir; struct inoinfo *inp; struct inodesc idesc; @@ -546,7 +631,7 @@ linkup(ino_t orphan, ino_t parentdir, char *name) irelse(&ip); return (0); } - if ((changeino(UFS_ROOTINO, lfname, lfdir) & ALTERED) == 0) { + if ((changeino(UFS_ROOTINO, lfname, lfdir, 1) & ALTERED) == 0) { pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY\n\n"); irelse(&ip); return (0); @@ -575,7 +660,8 @@ linkup(ino_t orphan, ino_t parentdir, char *name) } inoinfo(orphan)->ino_linkcnt--; if (lostdir) { - if ((changeino(orphan, "..", lfdir) & ALTERED) == 0 && + depth = DIP(dp, di_dirdepth) + 1; + if ((changeino(orphan, "..", lfdir, depth) & ALTERED) == 0 && parentdir != (ino_t)-1) (void)makeentry(orphan, lfdir, ".."); DIP_SET(dp, di_nlink, DIP(dp, di_nlink) + 1); @@ -607,7 +693,7 @@ linkup(ino_t orphan, ino_t parentdir, char *name) * fix an entry in a directory. */ int -changeino(ino_t dir, const char *name, ino_t newnum) +changeino(ino_t dir, const char *name, ino_t newnum, int depth) { struct inodesc idesc; struct inode ip; @@ -621,7 +707,10 @@ changeino(ino_t dir, const char *name, ino_t newnum) idesc.id_name = strdup(name); idesc.id_parent = newnum; /* new value for name */ ginode(dir, &ip); - error = ckinode(ip.i_dp, &idesc); + if (((error = ckinode(ip.i_dp, &idesc)) & ALTERED) && newnum != 0) { + DIP_SET(ip.i_dp, di_dirdepth, depth); + getinoinfo(dir)->i_depth = depth; + } free(idesc.id_name); irelse(&ip); return (error); @@ -815,8 +904,8 @@ allocdir(ino_t parent, ino_t request, int mode) struct inode ip; union dinode *dp; struct bufarea *bp; - struct inoinfo *inp; struct dirtemplate *dirp; + struct inoinfo *inp, *parentinp; ino = allocino(request, IFDIR|mode); if (ino == 0) @@ -859,6 +948,12 @@ allocdir(ino_t parent, ino_t request, int mode) inp->i_parent = parent; inp->i_dotdot = parent; inp->i_flags |= INFO_NEW; + if ((parentinp = getinoinfo(inp->i_parent)) == NULL) { + pfatal("allocdir: UNKNOWN PARENT DIR"); + } else { + inp->i_depth = parentinp->i_depth + 1; + DIP_SET(dp, di_dirdepth, inp->i_depth); + } inoinfo(ino)->ino_type = DT_DIR; inoinfo(ino)->ino_state = inoinfo(parent)->ino_state; if (inoinfo(ino)->ino_state == DSTATE) { diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 3c5cc957cd4e..43e826e13b77 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -309,6 +309,7 @@ struct inoinfo { ino_t i_parent; /* inode number of parent */ ino_t i_dotdot; /* inode number of `..' */ size_t i_isize; /* size of inode */ + u_int i_depth; /* depth of directory from root */ u_int i_flags; /* flags, see below */ u_int i_numblks; /* size of block array in bytes */ ufs2_daddr_t i_blks[1]; /* actually longer */ @@ -462,9 +463,10 @@ void catch(int); void catchquit(int); void cgdirty(struct bufarea *); struct bufarea *cglookup(int cg); -int changeino(ino_t dir, const char *name, ino_t newnum); +int changeino(ino_t dir, const char *name, ino_t newnum, int depth); void check_blkcnt(struct inode *ip); int check_cgmagic(int cg, struct bufarea *cgbp, int requestrebuild); +void check_dirdepth(struct inoinfo *inp); int chkrange(ufs2_daddr_t blk, int cnt); void ckfini(int markclean); int ckinode(union dinode *dp, struct inodesc *); diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 947e5e0cbc08..a46fea0607a0 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -1135,6 +1135,7 @@ cacheino(union dinode *dp, ino_t inumber) inp->i_dotdot = (ino_t)0; inp->i_number = inumber; inp->i_isize = DIP(dp, di_size); + inp->i_depth = DIP(dp, di_dirdepth); inp->i_numblks = blks; for (i = 0; i < MIN(blks, UFS_NDADDR); i++) inp->i_blks[i] = DIP(dp, di_db[i]); diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 5f1ad8ecb686..afe9f7f2b789 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -388,14 +388,15 @@ checkinode(ino_t inumber, struct inodesc *idesc, int rebuildcg) n_files++; inoinfo(inumber)->ino_linkcnt = DIP(dp, di_nlink); if (mode == IFDIR) { - if (DIP(dp, di_size) == 0) + if (DIP(dp, di_size) == 0) { inoinfo(inumber)->ino_state = DCLEAR; - else if (DIP(dp, di_nlink) <= 0) + } else if (DIP(dp, di_nlink) <= 0) { inoinfo(inumber)->ino_state = DZLINK; - else + } else { inoinfo(inumber)->ino_state = DSTATE; - cacheino(dp, inumber); - countdirs++; + cacheino(dp, inumber); + countdirs++; + } } else if (DIP(dp, di_nlink) <= 0) inoinfo(inumber)->ino_state = FZLINK; else diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index abe14549e6f4..8200209cc03e 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -210,8 +210,10 @@ pass2(void) if (inp->i_parent == 0 || inp->i_isize == 0) continue; if (inoinfo(inp->i_parent)->ino_state == DFOUND && - INO_IS_DUNFOUND(inp->i_number)) + INO_IS_DUNFOUND(inp->i_number)) { inoinfo(inp->i_number)->ino_state = DFOUND; + check_dirdepth(inp); + } if (inp->i_dotdot == inp->i_parent || inp->i_dotdot == (ino_t)-1) continue; @@ -271,7 +273,8 @@ pass2(void) inoinfo(inp->i_dotdot)->ino_linkcnt++; inoinfo(inp->i_parent)->ino_linkcnt--; inp->i_dotdot = inp->i_parent; - (void)changeino(inp->i_number, "..", inp->i_parent); + (void)changeino(inp->i_number, "..", inp->i_parent, + getinoinfo(inp->i_parent)->i_depth + 1); } /* * Mark all the directories that can be found from the root. @@ -548,10 +551,12 @@ again: case DFOUND: inp = getinoinfo(dirp->d_ino); if (idesc->id_entryno > 2) { - if (inp->i_parent == 0) + if (inp->i_parent == 0) { inp->i_parent = idesc->id_number; - else if ((n = fix_extraneous(inp, idesc)) == 1) + check_dirdepth(inp); + } else if ((n = fix_extraneous(inp, idesc))) { break; + } } /* FALLTHROUGH */ diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c index 22cb0393905b..b9d24f18371b 100644 --- a/sbin/fsck_ffs/pass3.c +++ b/sbin/fsck_ffs/pass3.c @@ -74,7 +74,7 @@ pass3(void) if (inp->i_number == UFS_ROOTINO || (inp->i_parent != 0 && !S_IS_DUNFOUND(state))) continue; - if (state == DCLEAR) + if (state == DCLEAR || state == DZLINK) continue; /* * If we are running with soft updates and we come @@ -102,6 +102,7 @@ pass3(void) inoinfo(lfdir)->ino_linkcnt--; } inoinfo(orphan)->ino_state = DFOUND; + check_dirdepth(inp); propagate(); continue; } @@ -127,6 +128,7 @@ pass3(void) } irelse(&ip); inoinfo(orphan)->ino_state = DFOUND; + check_dirdepth(inp); propagate(); } } diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index f9775c7da089..a7d3a439b6b3 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -781,7 +781,7 @@ CMDFUNCSTART(rm) if (!checkactivedir()) return 1; - rval = changeino(curinum, argv[1], 0); + rval = changeino(curinum, argv[1], 0, 0); if (rval & ALTERED) { printf("Name `%s' removed\n", argv[1]); return 0; diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 56496eacdc7c..16508305aa57 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -915,8 +915,9 @@ fsinit(time_t utime) alloc(sblock.fs_fsize, node.dp1.di_mode); node.dp1.di_blocks = btodb(fragroundup(&sblock, node.dp1.di_size)); - wtfs(fsbtodb(&sblock, node.dp1.di_db[0]), - sblock.fs_fsize, iobuf); + node.dp1.di_dirdepth = 1; + wtfs(fsbtodb(&sblock, node.dp1.di_db[0]), + sblock.fs_fsize, iobuf); iput(&node, UFS_ROOTINO + 1); } } else { @@ -951,8 +952,9 @@ fsinit(time_t utime) alloc(sblock.fs_fsize, node.dp2.di_mode); node.dp2.di_blocks = btodb(fragroundup(&sblock, node.dp2.di_size)); - wtfs(fsbtodb(&sblock, node.dp2.di_db[0]), - sblock.fs_fsize, iobuf); + node.dp2.di_dirdepth = 1; + wtfs(fsbtodb(&sblock, node.dp2.di_db[0]), + sblock.fs_fsize, iobuf); iput(&node, UFS_ROOTINO + 1); } } diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 4b0c7b108cb6..6d37afcfadf6 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -1179,6 +1179,8 @@ retry: } ip->i_flags = 0; DIP_SET(ip, i_flags, 0); + if ((mode & IFMT) == IFDIR) + DIP_SET(ip, i_dirdepth, DIP(pip, i_dirdepth) + 1); /* * Set up a new generation number for this inode. */ @@ -1238,10 +1240,10 @@ static ino_t ffs_dirpref(struct inode *pip) { struct fs *fs; - int cg, prefcg, dirsize, cgsize; + int cg, prefcg, curcg, dirsize, cgsize; + int depth, range, start, end, numdirs, power, numerator, denominator; u_int avgifree, avgbfree, avgndir, curdirsize; u_int minifree, minbfree, maxndir; - u_int mincg, minndir; u_int maxcontigdirs; mtx_assert(UFS_MTX(ITOUMP(pip)), MA_OWNED); @@ -1252,35 +1254,53 @@ ffs_dirpref(struct inode *pip) avgndir = fs->fs_cstotal.cs_ndir / fs->fs_ncg; /* - * Force allocation in another cg if creating a first level dir. - */ - ASSERT_VOP_LOCKED(ITOV(pip), "ffs_dirpref"); - if (ITOV(pip)->v_vflag & VV_ROOT) { - prefcg = arc4random() % fs->fs_ncg; - mincg = prefcg; - minndir = fs->fs_ipg; - for (cg = prefcg; cg < fs->fs_ncg; cg++) - if (fs->fs_cs(fs, cg).cs_ndir < minndir && - fs->fs_cs(fs, cg).cs_nifree >= avgifree && - fs->fs_cs(fs, cg).cs_nbfree >= avgbfree) { - mincg = cg; - minndir = fs->fs_cs(fs, cg).cs_ndir; - } - for (cg = 0; cg < prefcg; cg++) - if (fs->fs_cs(fs, cg).cs_ndir < minndir && - fs->fs_cs(fs, cg).cs_nifree >= avgifree && - fs->fs_cs(fs, cg).cs_nbfree >= avgbfree) { - mincg = cg; - minndir = fs->fs_cs(fs, cg).cs_ndir; - } - return ((ino_t)(fs->fs_ipg * mincg)); - } + * Select a preferred cylinder group to place a new directory. + * If we are near the root of the filesystem we aim to spread + * them out as much as possible. As we descend deeper from the + * root we cluster them closer together around their parent as + * we expect them to be more closely interactive. Higher-level + * directories like usr/src/sys and usr/src/bin should be + * separated while the directories in these areas are more + * likely to be accessed together so should be closer. + * + * We pick a range of cylinder groups around the cylinder group + * of the directory in which we are being created. The size of + * the range for our search is based on our depth from the root + * of our filesystem. We then probe that range based on how many + * directories are already present. The first new directory is at + * 1/2 (middle) of the range; the second is in the first 1/4 of the + * range, then at 3/4, 1/8, 3/8, 5/8, 7/8, 1/16, 3/16, 5/16, etc. + */ + depth = DIP(pip, i_dirdepth); + range = fs->fs_ncg / (1 << depth); + curcg = ino_to_cg(fs, pip->i_number); + start = curcg - (range / 2); + if (start < 0) + start += fs->fs_ncg; + end = curcg + (range / 2); + if (end >= fs->fs_ncg) + end -= fs->fs_ncg; + numdirs = pip->i_effnlink - 1; + power = fls(numdirs); + numerator = (numdirs & ~(1 << (power - 1))) * 2 + 1; + denominator = 1 << power; + prefcg = (curcg - (range / 2) + (range * numerator / denominator)); + if (prefcg < 0) + prefcg += fs->fs_ncg; + if (prefcg >= fs->fs_ncg) + prefcg -= fs->fs_ncg; + /* + * If this filesystem is not tracking directory depths, + * revert to the old algorithm. + */ + if (depth == 0 && pip->i_number != UFS_ROOTINO) + prefcg = curcg; /* * Count various limits which used for * optimal allocation of a directory inode. */ - maxndir = min(avgndir + fs->fs_ipg / 16, fs->fs_ipg); + maxndir = min(avgndir + (1 << depth), fs->fs_ipg); minifree = avgifree - avgifree / 4; if (minifree < 1) minifree = 1; @@ -1324,7 +1344,6 @@ ffs_dirpref(struct inode *pip) * in new cylinder groups so finds every possible block after * one pass over the filesystem. */ - prefcg = ino_to_cg(fs, pip->i_number); for (cg = prefcg; cg < fs->fs_ncg; cg++) if (fs->fs_cs(fs, cg).cs_ndir < maxndir && fs->fs_cs(fs, cg).cs_nifree >= minifree && diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index ef1753862595..1e245d82f8b8 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -12485,17 +12485,6 @@ softdep_update_inodeblock( KASSERT(MOUNTEDSOFTDEP(mp) != 0, ("softdep_update_inodeblock called on non-softdep filesystem")); fs = ump->um_fs; - /* - * Preserve the freelink that is on disk. clear_unlinked_inodedep() - * does not have access to the in-core ip so must write directly into - * the inode block buffer when setting freelink. - */ - if (fs->fs_magic == FS_UFS1_MAGIC) - DIP_SET(ip, i_freelink, ((struct ufs1_dinode *)bp->b_data + - ino_to_fsbo(fs, ip->i_number))->di_freelink); - else - DIP_SET(ip, i_freelink, ((struct ufs2_dinode *)bp->b_data + - ino_to_fsbo(fs, ip->i_number))->di_freelink); /* * If the effective link count is not equal to the actual link * count, then we must track the difference in an inodedep while @@ -12511,6 +12500,21 @@ again: panic("softdep_update_inodeblock: bad link count"); return; } + /* + * Preserve the freelink that is on disk. clear_unlinked_inodedep() + * does not have access to the in-core ip so must write directly into + * the inode block buffer when setting freelink. + */ + if ((inodedep->id_state & UNLINKED) != 0) { + if (fs->fs_magic == FS_UFS1_MAGIC) + DIP_SET(ip, i_freelink, + ((struct ufs1_dinode *)bp->b_data + + ino_to_fsbo(fs, ip->i_number))->di_freelink); + else + DIP_SET(ip, i_freelink, + ((struct ufs2_dinode *)bp->b_data + + ino_to_fsbo(fs, ip->i_number))->di_freelink); + } KASSERT(ip->i_nlink >= inodedep->id_nlinkdelta, ("softdep_update_inodeblock inconsistent ip %p i_nlink %d " "inodedep %p id_nlinkdelta %jd", diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h index 840a4cc7d40f..e4a424abe2e6 100644 --- a/sys/ufs/ufs/dinode.h +++ b/sys/ufs/ufs/dinode.h @@ -156,7 +156,10 @@ struct ufs2_dinode { [(UFS_NDADDR + UFS_NIADDR) * sizeof(ufs2_daddr_t)]; }; u_int64_t di_modrev; /* 232: i_modrev for NFSv4 */ - uint32_t di_freelink; /* 240: SUJ: Next unlinked inode. */ + union { + uint32_t di_freelink; /* 240: SUJ: Next unlinked inode. */ + uint32_t di_dirdepth; /* 240: IFDIR: depth from root dir */ + }; uint32_t di_ckhash; /* 244: if CK_INODE, its check-hash */ uint32_t di_spare[2]; /* 248: Reserved; currently unused */ }; @@ -179,7 +182,10 @@ struct ufs2_dinode { struct ufs1_dinode { u_int16_t di_mode; /* 0: IFMT, permissions; see below. */ int16_t di_nlink; /* 2: File link count. */ - uint32_t di_freelink; /* 4: SUJ: Next unlinked inode. */ + union { + uint32_t di_freelink; /* 4: SUJ: Next unlinked inode. */ + uint32_t di_dirdepth; /* 4: IFDIR: depth from root dir */ + }; u_int64_t di_size; /* 8: File byte count. */ int32_t di_atime; /* 16: Last access time. */ int32_t di_atimensec; /* 20: Last access time. */ diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index c13aec4e2175..7815293b92a7 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1710,6 +1710,10 @@ relock: * and ".." set to point to the new parent. */ if (doingdirectory && newparent) { + /* + * Set the directory depth based on its new parent. + */ + DIP_SET(fip, i_dirdepth, DIP(tdp, i_dirdepth) + 1); /* * If tip exists we simply use its link, otherwise we must * add a new one. @@ -2121,6 +2125,7 @@ ufs_mkdir( ip->i_effnlink = 2; ip->i_nlink = 2; DIP_SET(ip, i_nlink, 2); + DIP_SET(ip, i_dirdepth, DIP(dp,i_dirdepth) + 1); if (cnp->cn_flags & ISWHITEOUT) { ip->i_flags |= UF_OPAQUE; From nobody Thu Mar 30 04:32: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 4Pn9WX2nMRz42PV4; Thu, 30 Mar 2023 04:32: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 4Pn9WX2GBmz3ldn; Thu, 30 Mar 2023 04:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680150760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A7CkdCalNCKk2DBZSO3OUr0oWIUiesJKqYjJRxraChM=; b=dsuQUrqMgkh4+gAaoC9B56qR0HBXOV1SAu+bp7NZBSZ8ga9w7B97/VSFLicfTgc/L8w0y9 aGo3PNP5EcQxYUAKqBZ03sQKEq+V0JPXXyCV3uFDDVePrf/JW1prNug90aRTFOabOZK4SM km+Y9kYIag9ME51mKWcyn7S1C0W2fiPjmGG4JcnniqChjjPm0gxPYxBN+jqnIoZlaU3c2T vPBZEr47RjQGFYNxuzwYYHIl/syDScsB3PfGWJUeNIIuSr1jygN/yYzSZpLpwFrRUhLXju bHMePkdy1X2u3mLO4ZNqW5r8jFzC93/GhZVBdrQT3cpKs9+2Lr5I4+J/VOQZ2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680150760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A7CkdCalNCKk2DBZSO3OUr0oWIUiesJKqYjJRxraChM=; b=Xer5iiOdVCSZWdNt08KBKJmO4OPw80dMBko0b7wuH7QSO//O7D0AL6Rr2WPXCGAI52Rps2 VlCnbvdjusP6k6622qQZ8srB3kbdC7YmGrYQgF21e4j30FWtg7fOEnHSEXuve2b5ACRRyX ins7CGxVPSNE5MX7uUkoe5pWeHwfrFqJxxAia6nwpRCh3o8GZFN2PIWeJ23YsrVbzAGsia Q2KXGFxMWBG0VyeCCbke+xEoVnovwYcqX5IRem+TvruEz2c6P6qgfV68ULgWZl2qHgVwJU RcBB4OoUUIQFDa1fGisp5HxbRaiA2iTgM4RTQvUEGqKqKiqEwmBBBT/RR8ADGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680150760; a=rsa-sha256; cv=none; b=qiTIP9M+U7LoJP0r3Y6LMF99L8bZrGkCKkiz3vRZAYZd+GsWMf7yDpeCrrIsmphL7JW2NK N/1OgjhLv8iSz8zMEtUPVPqjAaUPZ6h5XrJKqKjDf6rVpC7pIwP6z48b3kblZURiQTK5wH lSitDumRA/GWne2/Llz1Nt0CST9xoedLR+6Mhdpo1Jr6+30WBgG7+0QQKCzzp1gU+ER8sI mdidmPWm7mUDtGVNRR+HKA+SGzD5F9EB86s+O9c03/ZY+UWho43lUUvAl93cuBldCj3KMH ZStoQQpZZTHSaljAUsggjkFBkw9E9jDUqOJ7JlYbgj3rT7V6dLszxub69cdLnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn9WX1J9Czy8q; Thu, 30 Mar 2023 04:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U4WeYu093246; Thu, 30 Mar 2023 04:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U4Wewl093245; Thu, 30 Mar 2023 04:32:40 GMT (envelope-from git) Date: Thu, 30 Mar 2023 04:32:40 GMT Message-Id: <202303300432.32U4Wewl093245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 40f022975df9 - stable/13 - Rewrite function definitions with identifier lists. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 40f022975df948c071f8bd1736ba9078df8ef6b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=40f022975df948c071f8bd1736ba9078df8ef6b8 commit 40f022975df948c071f8bd1736ba9078df8ef6b8 Author: Kirk McKusick AuthorDate: 2023-03-22 22:57:26 +0000 Commit: Kirk McKusick CommitDate: 2023-03-30 04:32:32 +0000 Rewrite function definitions with identifier lists. A few functions snuck in with K&R style definitions. Also add some missing memory frees. (cherry picked from commit e5d0d1c5fbbc0ce44fdc720a35b499056fe60b06) --- sbin/dump/tape.c | 54 +++++++++++++++++++++++++--------------- sbin/fsck_ffs/dir.c | 5 ++++ sbin/fsck_ffs/fsutil.c | 6 ++--- sbin/fsck_ffs/inode.c | 20 +++++---------- sbin/fsck_ffs/pass2.c | 1 + sbin/fsck_ffs/suj.c | 4 +-- tools/diag/prtblknos/main.c | 4 +-- tools/diag/prtblknos/prtblknos.c | 26 +++++-------------- 8 files changed, 57 insertions(+), 63 deletions(-) diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index 45ad0ee50487..c123f7fa9404 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -74,7 +74,8 @@ static long blocksthisvol; /* number of blocks on current output file */ static char *nexttape; static FILE *popenfp = NULL; -static int atomic(ssize_t (*)(), int, char *, int); +static int atomic_read(int, void *, int); +static int atomic_write(int, const void *, int); static void worker(int, int); static void create_workers(void); static void flushtape(void); @@ -236,7 +237,7 @@ flushtape(void) wp->req[trecno].count = 0; /* Sentinel */ - if (atomic(write, wp->fd, (char *)wp->req, siz) != siz) + if (atomic_write(wp->fd, (const void *)wp->req, siz) != siz) quit("error writing command pipe: %s\n", strerror(errno)); wp->sent = 1; /* we sent a request, read the response later */ @@ -247,7 +248,7 @@ flushtape(void) /* Read results back from next worker */ if (wp->sent) { - if (atomic(read, wp->fd, (char *)&got, sizeof got) + if (atomic_read(wp->fd, (void *)&got, sizeof got) != sizeof got) { perror(" DUMP: error reading command pipe in master"); dumpabort(0); @@ -264,8 +265,8 @@ flushtape(void) */ for (i = 0; i < WORKERS; i++) { if (workers[i].sent) { - if (atomic(read, workers[i].fd, - (char *)&got, sizeof got) + if (atomic_read(workers[i].fd, + (void *)&got, sizeof got) != sizeof got) { perror(" DUMP: error reading command pipe in master"); dumpabort(0); @@ -322,7 +323,7 @@ trewind(void) * fixme: punt for now. */ if (workers[f].sent) { - if (atomic(read, workers[f].fd, (char *)&got, sizeof got) + if (atomic_read(workers[f].fd, (void *)&got, sizeof got) != sizeof got) { perror(" DUMP: error reading command pipe in master"); dumpabort(0); @@ -446,7 +447,7 @@ rollforward(void) lastspclrec = savedtapea - 1; } size = (char *)ntb - (char *)q; - if (atomic(write, wp->fd, (char *)q, size) != size) { + if (atomic_write(wp->fd, (const void *)q, size) != size) { perror(" DUMP: error writing command pipe"); dumpabort(0); } @@ -486,7 +487,7 @@ rollforward(void) * worked ok, otherwise the tape is much too short! */ if (wp->sent) { - if (atomic(read, wp->fd, (char *)&got, sizeof got) + if (atomic_read(wp->fd, (void *)&got, sizeof got) != sizeof got) { perror(" DUMP: error reading command pipe in master"); dumpabort(0); @@ -676,8 +677,7 @@ dumpabort(int signo __unused) } void -Exit(status) - int status; +Exit(int status) { #ifdef TDEBUG @@ -735,8 +735,8 @@ create_workers(void) } for (i = 0; i < WORKERS; i++) - (void) atomic(write, workers[i].fd, - (char *) &workers[(i + 1) % WORKERS].pid, + (void) atomic_write(workers[i].fd, + (const void *) &workers[(i + 1) % WORKERS].pid, sizeof workers[0].pid); master = 0; @@ -777,7 +777,7 @@ worker(int cmd, int worker_number) /* * Need the pid of the next worker in the loop... */ - if ((nread = atomic(read, cmd, (char *)&nextworker, sizeof nextworker)) + if ((nread = atomic_read(cmd, (void *)&nextworker, sizeof nextworker)) != sizeof nextworker) { quit("master/worker protocol botched - didn't get pid of next worker.\n"); } @@ -785,7 +785,7 @@ worker(int cmd, int worker_number) /* * Get list of blocks to dump, read the blocks into tape buffer */ - while ((nread = atomic(read, cmd, (char *)wp->req, reqsiz)) == reqsiz) { + while ((nread = atomic_read(cmd, (void *)wp->req, reqsiz)) == reqsiz) { struct req *p = wp->req; for (trecno = 0; trecno < ntrec; @@ -794,8 +794,8 @@ worker(int cmd, int worker_number) blkread(p->dblk, wp->tblock[trecno], p->count * TP_BSIZE); } else { - if (p->count != 1 || atomic(read, cmd, - (char *)wp->tblock[trecno], + if (p->count != 1 || atomic_read(cmd, + (void *)wp->tblock[trecno], TP_BSIZE) != TP_BSIZE) quit("master/worker protocol botched.\n"); } @@ -858,7 +858,8 @@ worker(int cmd, int worker_number) * pass size of write back to master * (for EOT handling) */ - (void) atomic(write, cmd, (char *)&size, sizeof size); + (void)atomic_write(cmd, (const void *)&size, + sizeof size); } /* @@ -873,15 +874,28 @@ worker(int cmd, int worker_number) /* * Since a read from a pipe may not return all we asked for, - * or a write may not write all we ask if we get a signal, * loop until the count is satisfied (or error). */ static int -atomic(ssize_t (*func)(), int fd, char *buf, int count) +atomic_read(int fd, void *buf, int count) { int got, need = count; - while ((got = (*func)(fd, buf, need)) > 0 && (need -= got) > 0) + while ((got = read(fd, buf, need)) > 0 && (need -= got) > 0) + buf += got; + return (got < 0 ? got : count - need); +} + +/* + * Since a write to a pipe may not write all we ask if we get a signal, + * loop until the count is satisfied (or error). + */ +static int +atomic_write(int fd, const void *buf, int count) +{ + int got, need = count; + + while ((got = write(fd, buf, need)) > 0 && (need -= got) > 0) buf += got; return (got < 0 ? got : count - need); } diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index 18229ab96fb6..64e477c66ed8 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -525,6 +525,7 @@ linkup(ino_t orphan, ino_t parentdir, char *name) } } irelse(&ip); + free(idesc.id_name); if (lfdir == 0) { pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY"); printf("\n\n"); @@ -621,6 +622,7 @@ changeino(ino_t dir, const char *name, ino_t newnum) idesc.id_parent = newnum; /* new value for name */ ginode(dir, &ip); error = ckinode(ip.i_dp, &idesc); + free(idesc.id_name); irelse(&ip); return (error); } @@ -655,15 +657,18 @@ makeentry(ino_t parent, ino_t ino, const char *name) } if ((ckinode(dp, &idesc) & ALTERED) != 0) { irelse(&ip); + free(idesc.id_name); return (1); } getpathname(pathbuf, parent, parent); if (expanddir(&ip, pathbuf) == 0) { irelse(&ip); + free(idesc.id_name); return (0); } retval = ckinode(dp, &idesc) & ALTERED; irelse(&ip); + free(idesc.id_name); return (retval); } diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index d8842e7d41f2..44b3e50da012 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -1162,9 +1162,7 @@ allocblk(long startcg, long frags, } ufs2_daddr_t -std_checkblkavail(blkno, frags) - ufs2_daddr_t blkno; - long frags; +std_checkblkavail(ufs2_daddr_t blkno, long frags) { struct bufarea *cgbp; struct cg *cgp; @@ -1278,9 +1276,11 @@ getpathname(char *namebuf, ino_t curdir, ino_t ino) ginode(ino, &ip); if ((ckinode(ip.i_dp, &idesc) & FOUND) == 0) { irelse(&ip); + free(idesc.id_name); break; } irelse(&ip); + free(idesc.id_name); namelookup: idesc.id_number = idesc.id_parent; idesc.id_parent = ino; diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 057d49a1ea18..947e5e0cbc08 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -798,12 +798,8 @@ snapclean(struct inodesc *idesc) * must always have been allocated from a BLK_NOCOPY location. */ int -snapblkfree(fs, bno, size, inum, checkblkavail) - struct fs *fs; - ufs2_daddr_t bno; - long size; - ino_t inum; - ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t blkno, long frags); +snapblkfree(struct fs *fs, ufs2_daddr_t bno, long size, ino_t inum, + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t blkno, long frags)) { union dinode *dp; struct inode ip; @@ -930,10 +926,8 @@ snapblkfree(fs, bno, size, inum, checkblkavail) * block. Here we need to check each block in the buffer. */ void -copyonwrite(fs, bp, checkblkavail) - struct fs *fs; - struct bufarea *bp; - ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t blkno, long frags); +copyonwrite(struct fs *fs, struct bufarea *bp, + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t blkno, long frags)) { ufs2_daddr_t copyblkno; long i, numblks; @@ -953,10 +947,8 @@ copyonwrite(fs, bp, checkblkavail) } static void -chkcopyonwrite(fs, copyblkno, checkblkavail) - struct fs *fs; - ufs2_daddr_t copyblkno; - ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t blkno, long frags); +chkcopyonwrite(struct fs *fs, ufs2_daddr_t copyblkno, + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t blkno, long frags)) { struct inode ip; union dinode *dp; diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index 4e17863ef04c..abe14549e6f4 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -602,6 +602,7 @@ fix_extraneous(struct inoinfo *inp, struct inodesc *idesc) if ((ckinode(ip.i_dp, &dotdesc) & FOUND)) inp->i_dotdot = dotdesc.id_parent; irelse(&ip); + free(dotdesc.id_name); } /* * We have the previously found old name (inp->i_parent) and the diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index e9f5bbd421b1..a1d624392fcf 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -382,9 +382,7 @@ blk_isindir(ufs2_daddr_t blk, ino_t ino, ufs_lbn_t lbn) * they will only have usable blocks in them. */ ufs2_daddr_t -suj_checkblkavail(blkno, frags) - ufs2_daddr_t blkno; - long frags; +suj_checkblkavail(ufs2_daddr_t blkno, long frags) { struct bufarea *cgbp; struct cg *cgp; diff --git a/tools/diag/prtblknos/main.c b/tools/diag/prtblknos/main.c index 25a717760922..1535755ea52e 100644 --- a/tools/diag/prtblknos/main.c +++ b/tools/diag/prtblknos/main.c @@ -44,9 +44,7 @@ void prtblknos(struct fs *fs, union dinode *dp); struct uufsd disk; int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { union dinodep dp; struct fs *fs; diff --git a/tools/diag/prtblknos/prtblknos.c b/tools/diag/prtblknos/prtblknos.c index ae53471156a6..d6135f70eb46 100644 --- a/tools/diag/prtblknos/prtblknos.c +++ b/tools/diag/prtblknos/prtblknos.c @@ -53,9 +53,7 @@ static void indirprt(struct fs *, int, ufs_lbn_t, ufs_lbn_t, ufs2_daddr_t, ufs_lbn_t); void -prtblknos(fs, dp) - struct fs *fs; - union dinode *dp; +prtblknos(struct fs *fs, union dinode *dp) { int i, mode, frags; ufs_lbn_t lbn, lastlbn, len, blksperindir; @@ -154,13 +152,8 @@ prtblknos(fs, dp) } static void -indirprt(fs, level, blksperindir, lbn, blkno, lastlbn) - struct fs *fs; - int level; - ufs_lbn_t blksperindir; - ufs_lbn_t lbn; - ufs2_daddr_t blkno; - ufs_lbn_t lastlbn; +indirprt(struct fs *fs, int level, ufs_lbn_t blksperindir, ufs_lbn_t lbn, + ufs2_daddr_t blkno, ufs_lbn_t lastlbn) { char indir[MAXBSIZE]; ufs_lbn_t i, last; @@ -209,10 +202,7 @@ indirprt(fs, level, blksperindir, lbn, blkno, lastlbn) } static const char * -distance(fs, lastblk, firstblk) - struct fs *fs; - ufs2_daddr_t lastblk; - ufs2_daddr_t firstblk; +distance(struct fs *fs, ufs2_daddr_t lastblk, ufs2_daddr_t firstblk) { ufs2_daddr_t delta; int firstcg, lastcg; @@ -237,12 +227,8 @@ distance(fs, lastblk, firstblk) static const char *indirname[UFS_NIADDR] = { "First", "Second", "Third" }; static void -printblk(fs, lbn, blkno, numfrags, lastlbn) - struct fs *fs; - ufs_lbn_t lbn; - ufs2_daddr_t blkno; - int numfrags; - ufs_lbn_t lastlbn; +printblk(struct fs *fs, ufs_lbn_t lbn, ufs2_daddr_t blkno, int numfrags, + ufs_lbn_t lastlbn) { static int seq; static ufs2_daddr_t totfrags, lastindirblk, lastblk, firstblk; From nobody Thu Mar 30 04:49: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 4Pn9vJ1QYQz42Qcq; Thu, 30 Mar 2023 04:49:48 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2607:f138:0:13::2]) (using TLSv1.3 with cipher TLS_AES_256_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 4Pn9vG6fjlz3pM5; Thu, 30 Mar 2023 04:49:46 +0000 (UTC) (envelope-from jhb@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 2607:f138:0:13::2 is neither permitted nor denied by domain of jhb@freebsd.org) smtp.mailfrom=jhb@freebsd.org; dmarc=none Received: from smtpclient.apple (c-98-35-126-114.hsd1.ca.comcast.net [98.35.126.114]) by mail.baldwin.cx (Postfix) with ESMTPSA id 0221A1A84E33; Thu, 30 Mar 2023 00:49:39 -0400 (EDT) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: John Baldwin List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (1.0) Subject: Re: git: 68ca8363c7a1 - main - libc: Use secure_getenv(3) where appropriate Date: Wed, 29 Mar 2023 21:49:26 -0700 Message-Id: <933D3669-FAC3-4D3C-937E-93F4F7387D5F@freebsd.org> References: <202303271256.32RCuV1K007625@gitrepo.freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org In-Reply-To: <202303271256.32RCuV1K007625@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: iPhone Mail (20D67) X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.4 (mail.baldwin.cx [0.0.0.0]); Thu, 30 Mar 2023 00:49:39 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.103.1 at mail.baldwin.cx X-Virus-Status: Clean X-Spamd-Result: default: False [-2.60 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:19151, ipnet:2607:f138::/32, country:US]; MIME_TRACE(0.00)[0:+]; R_SPF_SOFTFAIL(0.00)[~all]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FREEFALL_USER(0.00)[jhb]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DMARC_NA(0.00)[freebsd.org]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4Pn9vG6fjlz3pM5 X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N This looks to have broken cross-builds on MacOS as the MacOS jobs on GitHub a= re now failing due to missing the prototype for this function building shims= for btree from libc. --=20 John Baldwin > On Mar 27, 2023, at 05:56, Mark Johnston wrote: >=20 > =EF=BB=BFThe branch main has been updated by markj: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D68ca8363c7a19d5351dc2b10568= cbf2403e07e33 >=20 > commit 68ca8363c7a19d5351dc2b10568cbf2403e07e33 > Author: Mark Johnston > AuthorDate: 2023-03-27 12:55:01 +0000 > Commit: Mark Johnston > CommitDate: 2023-03-27 12:56:22 +0000 >=20 > libc: Use secure_getenv(3) where appropriate >=20 > No functional change intended. >=20 > Reviewed by: mjg, imp, kib > Differential Revision: https://reviews.freebsd.org/D39278 > --- > lib/libc/db/btree/bt_open.c | 5 ++--- > lib/libc/db/hash/hash_page.c | 5 ++--- > lib/libc/gen/fstab.c | 8 ++------ > lib/libc/gen/glob-compat11.c | 3 +-- > lib/libc/gen/glob.c | 3 +-- > lib/libc/iconv/citrus_iconv.c | 5 +++-- > lib/libc/iconv/citrus_module.c | 4 ++-- > lib/libc/locale/setlocale.c | 4 ++-- > lib/libc/net/hesiod.c | 10 ++-------- > lib/libc/net/rcmd.c | 2 +- > lib/libc/nls/msgcat.c | 2 +- > lib/libc/posix1e/mac.c | 5 ++--- > lib/libc/resolv/res_init.c | 2 +- > lib/libc/resolv/res_query.c | 4 +--- > lib/libc/stdio/tempnam.c | 2 +- > lib/libc/stdio/tmpfile.c | 4 +--- > 16 files changed, 25 insertions(+), 43 deletions(-) >=20 > diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c > index ce3b8a1ecf1b..06bbd39f1842 100644 > --- a/lib/libc/db/btree/bt_open.c > +++ b/lib/libc/db/btree/bt_open.c > @@ -391,11 +391,10 @@ tmp(void) > { > sigset_t set, oset; > int fd, len; > - char *envtmp =3D NULL; > + char *envtmp; > char path[MAXPATHLEN]; >=20 > - if (issetugid() =3D=3D 0) > - envtmp =3D getenv("TMPDIR"); > + envtmp =3D secure_getenv("TMPDIR"); > len =3D snprintf(path, > sizeof(path), "%s/bt.XXXXXXXXXX", envtmp ? envtmp : "/tmp"); > if (len < 0 || len >=3D (int)sizeof(path)) { > diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c > index fba854b51f33..afcda6321133 100644 > --- a/lib/libc/db/hash/hash_page.c > +++ b/lib/libc/db/hash/hash_page.c > @@ -855,11 +855,10 @@ open_temp(HTAB *hashp) > { > sigset_t set, oset; > int len; > - char *envtmp =3D NULL; > + char *envtmp; > char path[MAXPATHLEN]; >=20 > - if (issetugid() =3D=3D 0) > - envtmp =3D getenv("TMPDIR"); > + envtmp =3D secure_getenv("TMPDIR"); > len =3D snprintf(path, > sizeof(path), "%s/_hash.XXXXXX", envtmp ? envtmp : "/tmp"); > if (len < 0 || len >=3D (int)sizeof(path)) { > diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c > index 3813202afb15..718373931757 100644 > --- a/lib/libc/gen/fstab.c > +++ b/lib/libc/gen/fstab.c > @@ -259,12 +259,8 @@ setfsent(void) > LineNo =3D 0; > return (1); > } > - if (fsp_set =3D=3D 0) { > - if (issetugid()) > - setfstab(NULL); > - else > - setfstab(getenv("PATH_FSTAB")); > - } > + if (fsp_set =3D=3D 0) > + setfstab(secure_getenv("PATH_FSTAB")); > if ((_fs_fp =3D fopen(path_fstab, "re")) !=3D NULL) { > LineNo =3D 0; > return (1); > diff --git a/lib/libc/gen/glob-compat11.c b/lib/libc/gen/glob-compat11.c > index 76a4553c922c..26dc9db9ff29 100644 > --- a/lib/libc/gen/glob-compat11.c > +++ b/lib/libc/gen/glob-compat11.c > @@ -422,8 +422,7 @@ globtilde(const Char *pattern, Char *patbuf, size_t pa= tbuf_len, glob11_t *pglob) > * we're not running setuid or setgid) and then trying > * the password file > */ > - if (issetugid() !=3D 0 || > - (h =3D getenv("HOME")) =3D=3D NULL) { > + if ((h =3D secure_getenv("HOME")) =3D=3D NULL) { > if (((h =3D getlogin()) !=3D NULL && > (pwd =3D getpwnam(h)) !=3D NULL) || > (pwd =3D getpwuid(getuid())) !=3D NULL) > diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c > index 2e8bf6310641..43dd77df8119 100644 > --- a/lib/libc/gen/glob.c > +++ b/lib/libc/gen/glob.c > @@ -453,8 +453,7 @@ globtilde(const Char *pattern, Char *patbuf, size_t pa= tbuf_len, glob_t *pglob) > * we're not running setuid or setgid) and then trying > * the password file > */ > - if (issetugid() !=3D 0 || > - (h =3D getenv("HOME")) =3D=3D NULL) { > + if ((h =3D secure_getenv("HOME")) =3D=3D NULL) { > if (((h =3D getlogin()) !=3D NULL && > (pwd =3D getpwnam(h)) !=3D NULL) || > (pwd =3D getpwuid(getuid())) !=3D NULL) > diff --git a/lib/libc/iconv/citrus_iconv.c b/lib/libc/iconv/citrus_iconv.c= > index 88dfc2deca33..27f88c6a47ab 100644 > --- a/lib/libc/iconv/citrus_iconv.c > +++ b/lib/libc/iconv/citrus_iconv.c > @@ -81,8 +81,9 @@ init_cache(void) > _CITRUS_HASH_INIT(&shared_pool, CI_HASH_SIZE); > TAILQ_INIT(&shared_unused); > shared_max_reuse =3D -1; > - if (!issetugid() && getenv(CI_ENV_MAX_REUSE)) > - shared_max_reuse =3D atoi(getenv(CI_ENV_MAX_REUSE)); > + if (secure_getenv(CI_ENV_MAX_REUSE) !=3D NULL) > + shared_max_reuse =3D > + atoi(secure_getenv(CI_ENV_MAX_REUSE)); > if (shared_max_reuse < 0) > shared_max_reuse =3D CI_INITIAL_MAX_REUSE; > isinit =3D true; > diff --git a/lib/libc/iconv/citrus_module.c b/lib/libc/iconv/citrus_module= .c > index bd173b41bb04..76db1bc7df9c 100644 > --- a/lib/libc/iconv/citrus_module.c > +++ b/lib/libc/iconv/citrus_module.c > @@ -282,8 +282,8 @@ _citrus_load_module(_citrus_module_t *rhandle, const c= har *encname) > int maj, min; >=20 > if (_pathI18nModule =3D=3D NULL) { > - p =3D getenv("PATH_I18NMODULE"); > - if (p !=3D NULL && !issetugid()) { > + p =3D secure_getenv("PATH_I18NMODULE"); > + if (p !=3D NULL) { > _pathI18nModule =3D strdup(p); > if (_pathI18nModule =3D=3D NULL) > return (ENOMEM); > diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c > index e0ba66e0e35a..bb60418f3583 100644 > --- a/lib/libc/locale/setlocale.c > +++ b/lib/libc/locale/setlocale.c > @@ -312,9 +312,9 @@ int > __detect_path_locale(void) > { > if (_PathLocale =3D=3D NULL) { > - char *p =3D getenv("PATH_LOCALE"); > + char *p =3D secure_getenv("PATH_LOCALE"); >=20 > - if (p !=3D NULL && !issetugid()) { > + if (p !=3D NULL) { > if (strlen(p) + 1/*"/"*/ + ENCODING_LEN + > 1/*"/"*/ + CATEGORY_LEN >=3D PATH_MAX) > return (ENAMETOOLONG); > diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c > index 0966b6d7ef91..f456e76316a1 100644 > --- a/lib/libc/net/hesiod.c > +++ b/lib/libc/net/hesiod.c > @@ -92,10 +92,7 @@ hesiod_init(context) > ctx =3D malloc(sizeof(struct hesiod_p)); > if (ctx) { > *context =3D ctx; > - if (!issetugid()) > - configname =3D getenv("HESIOD_CONFIG"); > - else > - configname =3D NULL; > + configname =3D secure_getenv("HESIOD_CONFIG"); > if (!configname) > configname =3D _PATH_HESIOD_CONF; > if (read_config_file(ctx, configname) >=3D 0) { > @@ -103,10 +100,7 @@ hesiod_init(context) > * The default rhs can be overridden by an > * environment variable. > */ > - if (!issetugid()) > - p =3D getenv("HES_DOMAIN"); > - else > - p =3D NULL; > + p =3D secure_getenv("HES_DOMAIN"); > if (p) { > if (ctx->rhs) > free(ctx->rhs); > diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c > index e8b4ffd356c4..2a6edd66440c 100644 > --- a/lib/libc/net/rcmd.c > +++ b/lib/libc/net/rcmd.c > @@ -97,7 +97,7 @@ rcmd_af(char **ahost, int rport, const char *locuser, co= nst char *remuser, > static char canonnamebuf[MAXDNAME]; /* is it proper here? */ >=20 > /* call rcmdsh() with specified remote shell if appropriate. */ > - if (!issetugid() && (p =3D getenv("RSH"))) { > + if ((p =3D secure_getenv("RSH")) !=3D NULL) { > struct servent *sp =3D getservbyname("shell", "tcp"); >=20 > if (sp && sp->s_port =3D=3D rport) > diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c > index f27bf7918b88..7f687258e5c3 100644 > --- a/lib/libc/nls/msgcat.c > +++ b/lib/libc/nls/msgcat.c > @@ -196,7 +196,7 @@ __catopen_l(const char *name, int type, locale_t local= e) > pcode =3D cptr; > } >=20 > - if ((nlspath =3D getenv("NLSPATH")) =3D=3D NULL || issetugid()) > + if ((nlspath =3D secure_getenv("NLSPATH")) =3D=3D NULL) > nlspath =3D _DEFAULT_NLS_PATH; >=20 > if ((base =3D cptr =3D strdup(nlspath)) =3D=3D NULL) { > diff --git a/lib/libc/posix1e/mac.c b/lib/libc/posix1e/mac.c > index a8e0abe7afff..7747b62b7c72 100644 > --- a/lib/libc/posix1e/mac.c > +++ b/lib/libc/posix1e/mac.c > @@ -177,9 +177,8 @@ mac_init_internal(int ignore_errors) >=20 > LIST_INIT(&label_default_head); >=20 > - if (!issetugid() && getenv("MAC_CONFFILE") !=3D NULL) > - filename =3D getenv("MAC_CONFFILE"); > - else > + filename =3D secure_getenv("MAC_CONFFILE"); > + if (filename =3D=3D NULL) > filename =3D MAC_CONFFILE; > file =3D fopen(filename, "re"); > if (file =3D=3D NULL) > diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c > index 274ffbf999d6..40d3373e813d 100644 > --- a/lib/libc/resolv/res_init.c > +++ b/lib/libc/resolv/res_init.c > @@ -277,7 +277,7 @@ __res_vinit(res_state statp, int preinit) { > #endif /* SOLARIS2 */ >=20 > /* Allow user to override the local domain definition */ > - if (issetugid() =3D=3D 0 && (cp =3D getenv("LOCALDOMAIN")) !=3D NULL)= { > + if ((cp =3D secure_getenv("LOCALDOMAIN")) !=3D NULL) { > (void)strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1); > statp->defdname[sizeof(statp->defdname) - 1] =3D '\0'; > haveenv++; > diff --git a/lib/libc/resolv/res_query.c b/lib/libc/resolv/res_query.c > index 8270e26ecdfb..10ac46ced8af 100644 > --- a/lib/libc/resolv/res_query.c > +++ b/lib/libc/resolv/res_query.c > @@ -457,9 +457,7 @@ res_hostalias(const res_state statp, const char *name,= char *dst, size_t siz) { >=20 > if (statp->options & RES_NOALIASES) > return (NULL); > - if (issetugid()) > - return (NULL); > - file =3D getenv("HOSTALIASES"); > + file =3D secure_getenv("HOSTALIASES"); > if (file =3D=3D NULL || (fp =3D fopen(file, "re")) =3D=3D NULL) > return (NULL); > setbuf(fp, NULL); > diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c > index 2d7bd90e08a4..4a720fd4c1cb 100644 > --- a/lib/libc/stdio/tempnam.c > +++ b/lib/libc/stdio/tempnam.c > @@ -60,7 +60,7 @@ tempnam(const char *dir, const char *pfx) > if (!pfx) > pfx =3D "tmp."; >=20 > - if (issetugid() =3D=3D 0 && (f =3D getenv("TMPDIR"))) { > + if ((f =3D secure_getenv("TMPDIR")) !=3D NULL) { > (void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXX", f, > *(f + strlen(f) - 1) =3D=3D '/'? "": "/", pfx); > if ((f =3D _mktemp(name))) > diff --git a/lib/libc/stdio/tmpfile.c b/lib/libc/stdio/tmpfile.c > index e5ee1be2884e..aedaab6e1262 100644 > --- a/lib/libc/stdio/tmpfile.c > +++ b/lib/libc/stdio/tmpfile.c > @@ -60,9 +60,7 @@ tmpfile(void) > char *buf; > const char *tmpdir; >=20 > - tmpdir =3D NULL; > - if (issetugid() =3D=3D 0) > - tmpdir =3D getenv("TMPDIR"); > + tmpdir =3D secure_getenv("TMPDIR"); > if (tmpdir =3D=3D NULL) > tmpdir =3D _PATH_TMP; >=20 From nobody Thu Mar 30 04:54: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 4PnB0d00FDz42Qyt; Thu, 30 Mar 2023 04:54: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 4PnB0c6dMnz3qGp; Thu, 30 Mar 2023 04:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680152064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykOQiyN5pHdyRPbv7BTaWLgh03OTG9sCsWAOyPDFmm0=; b=Oy5dw8XpZBAwDHyt8lfNS6LOAUNIo4tqwvPn1mx/i2f4RlDKOBATHM4/jRiKFFr1pEyqOi Y3KwWyE6wfq7GFAnWOSjK5ORiWBeKVxQGBloipdx986AVSIYzDmthA9oxghaH2TQoJz9jC Z7AtMbP/jHcebC2qlERpm58Z23zsVL4MejPdDQLQN+XGb3+7zC+2hRwWX01Fy2lougThfK w3p7PnolFq/sXGB+oZELBecG91Hm0HhAmjdL44qpPJ6ek3DS1Zh74SRGNqtP4ou+9a1ODY aNIPXtsidKcM4O+dmX1uagj/mPdTZjkHNkNRXOHvfAacdBvf4AmppwPCHXWKKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680152064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykOQiyN5pHdyRPbv7BTaWLgh03OTG9sCsWAOyPDFmm0=; b=wh+oJaF/cASOsmaT0qVe8XXKGbZZB46jmLCfwnyWIh0kjoiAN/4u56AHpGd7UFhPl+LCUI VN0uWvYNjKUhpDGVgYIYaopYAMGE5Y5e9LIFbe15oBtkykBf249GM83nyD5UbqSMZ4mNNe YTs4R9+iZ8Jk3DPDpkUsZ8dzrJ54tIapRCrkkiYx/bGq4YR8ECno7K6lOSoL5FWaJqPvEx 0Wq7gjFtbPKzAsJNde9dl2ahvKcRriOAoIdvthYQq3FooxjYOinPj5YI7kM35TnJYunuuR HGgW7x2fwGl7eXvv5GGLHwupUR6GOJ3hjEeisTqAwVmM5Je32AhsQR1LsW/1Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680152064; a=rsa-sha256; cv=none; b=DgYEeOE3bYGEmeZgi0Lq5RGlT7tvaLxxpLbMGftXboPMT38EkWTdmA6iOTCHLaFIivkQI9 anKYZygj5WpYVIIpIuu/c0uStm0WmBMCrkQy/Y2cpSajifZuHRA7Lk2yO1j7QmY6FOtkm4 IEeYqa53t3wa5em0BZt0SKXQHRIGccAp9ASbPOa3a/90fvx6RrS8zOVP54xvJXF1Vf0oBh M1P06ykoH/vhebMJq3SnHenSIMZHguGMHGwHyEd4FGE8nztj+sX7ziTq8BysZmot/RygTf JbU5GJECFIkrw/m/WitVAhH4HV6TSAEpiX+bIEcq/0z0X2hlI7A+NejJQ6+Epg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnB0c5jmKzygt; Thu, 30 Mar 2023 04:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U4sOtd025844; Thu, 30 Mar 2023 04:54:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U4sOub025843; Thu, 30 Mar 2023 04:54:24 GMT (envelope-from git) Date: Thu, 30 Mar 2023 04:54:24 GMT Message-Id: <202303300454.32U4sOub025843@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: 0ec03c0b10b1 - main - cross-build: Add secure_getenv() for MacOS cross 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ec03c0b10b125f5996d59fee904248978981898 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0ec03c0b10b125f5996d59fee904248978981898 commit 0ec03c0b10b125f5996d59fee904248978981898 Author: Mark Johnston AuthorDate: 2023-03-28 12:55:17 +0000 Commit: Mark Johnston CommitDate: 2023-03-30 04:54:13 +0000 cross-build: Add secure_getenv() for MacOS cross builds Reviewed by: arichardson Fixes: 68ca8363c7a1 ("libc: Use secure_getenv(3) where appropriate") Differential Revision: https://reviews.freebsd.org/D39295 --- tools/build/Makefile | 10 ++++++++-- tools/build/cross-build/include/mac/stdlib.h | 1 + tools/build/cross-build/secure_getenv.c | 16 ++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/tools/build/Makefile b/tools/build/Makefile index 97e0bfe8f4f7..922d86dba7e7 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -204,7 +204,13 @@ CFLAGS.closefrom.c+= -DSTDC_HEADERS -DHAVE_SYS_DIR_H -DHAVE_DIRENT_H \ SRCS+= progname.c # Stub implementations of fflagstostr/strtofflags SRCS+= fflags.c -.endif +.endif # ${MAKE.OS} == "Linux" + +.if ${.MAKE.OS} == "Darwin" +# Standalone implementation of secure_getenv(), not available on MacOS. +SRCS+= secure_getenv.c +.endif # ${MAKE.OS} == "Darwin" + # Provide the same arc4random implementation on Linux/macOS CFLAGS.arc4random.c+= -I${SRCTOP}/sys/crypto/chacha20 -D__isthreaded=1 SRCS+= arc4random.c arc4random_uniform.c @@ -227,7 +233,7 @@ subr_capability.c: ${SRCTOP}/sys/kern/subr_capability.c cp ${.ALLSRC} ${.TARGET} SRCS+= subr_capability.c CLEANFILES+= subr_capability.c -.endif +.endif # ${MAKE.OS} != "FreeBSD" CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_fileargs.h CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_net/cap_net.h diff --git a/tools/build/cross-build/include/mac/stdlib.h b/tools/build/cross-build/include/mac/stdlib.h index 314ae0d1dca6..c0c82751fb13 100644 --- a/tools/build/cross-build/include/mac/stdlib.h +++ b/tools/build/cross-build/include/mac/stdlib.h @@ -42,6 +42,7 @@ __BEGIN_DECLS int rpmatch(const char *response); +char *secure_getenv(const char *name); long long strtonum(const char *numstr, long long minval, long long maxval, const char **errstrp); diff --git a/tools/build/cross-build/secure_getenv.c b/tools/build/cross-build/secure_getenv.c new file mode 100644 index 000000000000..466035f31a40 --- /dev/null +++ b/tools/build/cross-build/secure_getenv.c @@ -0,0 +1,16 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Mark Johnston + */ + +#include +#include + +char * +secure_getenv(const char *name) +{ + if (issetugid() != 0) + return (NULL); + return (getenv(name)); +} From nobody Thu Mar 30 04:55: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 4PnB1P5n94z42QxS; Thu, 30 Mar 2023 04:55:05 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) (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 4PnB1P0FNfz3qgK; Thu, 30 Mar 2023 04:55:05 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qv1-xf30.google.com with SMTP id cu4so13334184qvb.3; Wed, 29 Mar 2023 21:55:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680152103; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=bKqCVIX+T21Th82xrDswLcHfvO9M3zVBocjo7xqRlDg=; b=kGFgtJlhhoxC9hlxm9/c0do9W2o82zu+I+ECKU5/6JiF8ejcmWyvsahAO5KGop/JRd D9lNQS8JtFnVjBPSClUJ+U7JoleYIA/UGbbeWku6PpRyvp2+zYv4QtKYyDtxA0s0UgRw ODHCCGU4wYtF11h6E7rKn9Ejm/obP1Ps0dWoSPhqUDtVkIpiIc/ViAR9MWMpFapbFkXf CHUgIfR2YMBEUYOCtDXVfZDMY7hsWBT6f4y0oorKfsLKnnuVp4PNBO+wJGDoZ4yukXIe 6p3uS6ItCrrLuxereQN7sQ/29y5I3oyJBtHkgcBU/iaCcexe3l0LiM7rjzr5foT8osYt vfJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680152103; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bKqCVIX+T21Th82xrDswLcHfvO9M3zVBocjo7xqRlDg=; b=AJC9nhCdpmy13wSYzA6EZ4rTmesqmzh675lsTCO6VfFQVmHEfGKfS3Nv1fd5JbbGx6 9rpDBInpHcvrDJjJdZlYA1L3C9BwSEgi/Z8qNct7xaiFL7RKz9h1L19kKlwL8xEjinEI IMAsHjbZu1UQK1ljnPc750si8ePhncPflBsyYvf3A/KdoKoCuAtRzq85ONAbQpI21TLs SrHtQ1SaYHt5PI1rfXnWwwaCNs1BIIs1OCA39ywwrPktqgG1DdFi7pB5vRDcwTrYGEzz uvVLrIvgUJq/8dgr5cpV9TXk1iq28HZ8zeCzZYrkXUpLx+B8QJUDbD9UBts/Cwofuxqm xQpg== X-Gm-Message-State: AAQBX9e9LPuXMOvFQrbZmbdUFjkb2EvRaFwjPr/xVsHjbqG7vDrDl51b dwtqbkt2KerV96GKAKqDjR2q5GcG+LE= X-Google-Smtp-Source: AKy350b8tzZMnYPkGB7jum8JUWeoXp7IgyHhuq35J/AA+o4EmjD0As8S/UEdGeCgAFKlGSsLyevjmw== X-Received: by 2002:a05:6214:f0c:b0:5e0:5935:d80e with SMTP id gw12-20020a0562140f0c00b005e05935d80emr2009988qvb.45.1680152103082; Wed, 29 Mar 2023 21:55:03 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id px20-20020a056214051400b005dd8b934570sm5164526qvb.8.2023.03.29.21.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 21:55:02 -0700 (PDT) Date: Thu, 30 Mar 2023 00:55:00 -0400 From: Mark Johnston To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 68ca8363c7a1 - main - libc: Use secure_getenv(3) where appropriate Message-ID: References: <202303271256.32RCuV1K007625@gitrepo.freebsd.org> <933D3669-FAC3-4D3C-937E-93F4F7387D5F@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: <933D3669-FAC3-4D3C-937E-93F4F7387D5F@freebsd.org> X-Rspamd-Queue-Id: 4PnB1P0FNfz3qgK X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Wed, Mar 29, 2023 at 09:49:26PM -0700, John Baldwin wrote: > This looks to have broken cross-builds on MacOS as the MacOS jobs on GitHub are now failing due to missing the prototype for this function building shims for btree from libc. Sorry, this should be fixed now with commit 0ec03c0b10b12. From nobody Thu Mar 30 06:31: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 4PnD873GNJz42XPS; Thu, 30 Mar 2023 06:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PnD872mm1z40Ld; Thu, 30 Mar 2023 06:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680157863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z0meZ8g3LNAL7Ikveob2TeCBdSTXlwGISRSzZDG3rOU=; b=ZeHYn2+hW+HhI05xbio5HZOkv1S9CSRL5pzo5hPMg/uLWpQ1QP2EkkK25ry84Jd69w1lYm VBEvFaozylGJ+I3A0nOHoCoc9ZVh3/pP9ytf0UVluifMSmEV/SOg+67eddMsWl+lHybrFT TuJeoAkPdexjJWJEU70gzadiHvxAXBrhM3lkROHaR8fw0QRFwg5hm7USW+Ms2xobu29f7i uPi7a6jj2/rMOJy5GjTGwEY69XimO5EnXQKS+8VwJtTgrKd0LR9w3bBMDEjF8RJCzXE+M9 uFKHyMaLg+QMciF3uc4qtBa0Ec1TfT/K7Aj6IgkHo8JYMQmlgAAWpZxDxqqw1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680157863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z0meZ8g3LNAL7Ikveob2TeCBdSTXlwGISRSzZDG3rOU=; b=Lw0dhdneLwllcWSYSFOt4zdzPV9ap1gUQeinpbRIj/nmUKOJq97dU+bM54n9FUTyTsYaYk R3W0jFfAHhUAliyu+x4cTq4y6ZWdqkxlXZuREWQrqVX76vMlWddmTSKr63cV1J1zXOrGr9 vtro2Hpuf7geju5Yz9/USz4tuQMELNk0pII0knB9dvYp8dP88hjuJckLwYDsU+EHVoyZYA 56avH0/qViPpC8Vs3U86A2Uphgp3LGL5wcl3iLPGqWiW7Y7ZEJqodXqCF/EN3NU6cBT4WC +rzXufxPHt8rW16YrfHutqfEbqFOl3CkudaY9pi4VF7ka3GP4GY0TKFScWrgwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680157863; a=rsa-sha256; cv=none; b=Aixz5i6D1J6JPlvvAxrxIQQHRz1v8Q+3+SHXaZn0eYgqDHUljKV0mlbeqHou1dRhkHodaE UeOpeNS0fPfdhWH2F6HLVmgLqz9N4EzEghhGMl5ZAZcHRT0YOzi9G3uNW9E16k2+BEbzPk M/DYC/FHFDAZPz0LvCmVF+rZDJ5gK0gM7Cn+LbbXvhx/n3ZENMd4v5/uO+LTJ10YGXFDHu sXLq3Gp+UpmBd5Ow8b7Vz2Zc/GuwUx1ffJ5I6Oj/v+vzOffnAKPBlTUOgRxGZCcohMf5AW uyyEAGtKlpflSeZSPXekHtMWO1vBrs+0syL3D8/rarigA7wDy9ue+pbDacwwag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnD871qqyz123X; Thu, 30 Mar 2023 06:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U6V3Ov088080; Thu, 30 Mar 2023 06:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U6V3Ut088079; Thu, 30 Mar 2023 06:31:03 GMT (envelope-from git) Date: Thu, 30 Mar 2023 06:31:03 GMT Message-Id: <202303300631.32U6V3Ut088079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f7174106ef55 - stable/13 - rarpd(8): Fix a typo in a source code 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f7174106ef553a49e3e2f72f12d47108915a8a4b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f7174106ef553a49e3e2f72f12d47108915a8a4b commit f7174106ef553a49e3e2f72f12d47108915a8a4b Author: Gordon Bergling AuthorDate: 2023-03-27 06:45:30 +0000 Commit: Gordon Bergling CommitDate: 2023-03-30 06:30:52 +0000 rarpd(8): Fix a typo in a source code comment - s/combinataion/combination/ Obtained from: NetBSD (cherry picked from commit 107597fbd4dcd6d0a6ec09913642af151635b77a) --- usr.sbin/rarpd/rarpd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index 441164dd2bd2..29781be817f9 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -692,7 +692,7 @@ rarp_process(struct if_info *ii, u_char *pkt, u_int len) } /* - * Poke the kernel arp tables with the ethernet/ip address combinataion + * Poke the kernel arp tables with the ethernet/ip address combination * given. When processing a reply, we must do this so that the booting * host (i.e. the guy running rarpd), won't try to ARP for the hardware * address of the guy being booted (he cannot answer the ARP). From nobody Thu Mar 30 06:31: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 4PnD8S5xlcz42XRt; Thu, 30 Mar 2023 06:31: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 4PnD8S5Sdsz40wL; Thu, 30 Mar 2023 06:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680157880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vLZELzBzBJrCI0TVky6b/pBqX/jcFT+TAGelabugmSA=; b=AOIfAHMl6hkvaOVhwtpKzvQBwjQlJvrVctaPn5UYx6mAY+4hDWF5vC9LuEC3JTdxRnyVYv DCbj1CXajhKMTb+VznQMN+y1nYkvgS/gT7fLBpeHfYHkeP7BvxCpgxdy6Puxs+tihePvFP GmvRKxJUl40YkM8rxZpaSJKMzdD0YZxf08S0dXJp4LV975PmycoZqkYoIPFI2kQq6QhzZE J/ov+GjSEp8IWByzUpm8fIL0Fk4Tqzuraqi0m0lJSZw3zyiYPlBUNjuTA8trgXd4oYCN9a 5JCpdRmQUjM5En+WfRJOjGxJcujD57ButQINlFJArhcUmTfRG1QlD2SkLZEYzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680157880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vLZELzBzBJrCI0TVky6b/pBqX/jcFT+TAGelabugmSA=; b=ROrbG9I8+x3/0ggfJk2cxVKUBxcodQCxlr2Mn25roa4EPc4+qAMGUw68z6Yr6Iosbu72XV Zz0hE+qQjoEXD4CQY9P3MF9pEi1q/pXLrtN1NzmBXl0XsON1T3GLXpYuDIrGnrJDvxfj4E 9xPykIih/4nSZCydC5oVQuf/hjtCBwuv5bYj7/etJXhCqFHzuHm61TWW+NZ5xNF540MWwU iyiwDRx2AajeJaFWlHZpZPxvCFeFffPlumob5mpyGWy68yuQSGpeDQANAq67XGZbWCkak7 Lw7u4u+nVXmtfvJw0FTNUtgz7E3QS9DIn2c1YBuOoJG1jkW5t3E/IwNRVRZXBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680157880; a=rsa-sha256; cv=none; b=wuRanirGmNUsXiOvhkHCjq/EpY41bz2hk17uEDZ5UAyKbKiUd/Wd8AcdYKAnjqSnZiUPxM C/jEa63nkLF9zpwHtiFKunKry291Egj4jdLqac7+lZcfqKljdzrJlStG2No9ZgdZAX2J9Y sKgaf3cgShbd49sTLYNTcLOT5MiJV6p3BxptOu2yIHP3eZnLC4SGteUd74K1HZ8lQ5ovh+ nqtiERZRznGZKI5F/pL+/oTRYaCuZM15UaHqPcGUB+0lPY/n8ePG1oa4aUS54j9Airr6Bi xclwETUmF30xFLBasUyx1HQ5+5gfutfcFdr2nhyJdtUu3m8cDILIA/2huR+kwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnD8S4YZVz125J; Thu, 30 Mar 2023 06:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U6VKER088211; Thu, 30 Mar 2023 06:31:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U6VKkf088210; Thu, 30 Mar 2023 06:31:20 GMT (envelope-from git) Date: Thu, 30 Mar 2023 06:31:20 GMT Message-Id: <202303300631.32U6VKkf088210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 95d0723eb308 - stable/12 - rarpd(8): Fix a typo in a source code 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 95d0723eb308a5d636e84e75a80be315303d19eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=95d0723eb308a5d636e84e75a80be315303d19eb commit 95d0723eb308a5d636e84e75a80be315303d19eb Author: Gordon Bergling AuthorDate: 2023-03-27 06:45:30 +0000 Commit: Gordon Bergling CommitDate: 2023-03-30 06:31:10 +0000 rarpd(8): Fix a typo in a source code comment - s/combinataion/combination/ Obtained from: NetBSD (cherry picked from commit 107597fbd4dcd6d0a6ec09913642af151635b77a) --- usr.sbin/rarpd/rarpd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index 441164dd2bd2..29781be817f9 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -692,7 +692,7 @@ rarp_process(struct if_info *ii, u_char *pkt, u_int len) } /* - * Poke the kernel arp tables with the ethernet/ip address combinataion + * Poke the kernel arp tables with the ethernet/ip address combination * given. When processing a reply, we must do this so that the booting * host (i.e. the guy running rarpd), won't try to ARP for the hardware * address of the guy being booted (he cannot answer the ARP). From nobody Thu Mar 30 07:53: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 4PnFym0VFMz42dSp; Thu, 30 Mar 2023 07:53: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 4PnFym02Wjz46HS; Thu, 30 Mar 2023 07:53:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680162784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gr2RBwVQMAdkHz/SAippfnHle9x6cOrC/DBw6JoUAPE=; b=PvoI9Z8l+sKMlAmMEBFLLTRk9TifgkIzoitES/H3TiKM5V1zRcZ65QcAf6xVH5KBkaPGd1 dTPMn8gxAuQDE5BH2vKcoH6pBFHWfXD9Vub4yblIN7IXRQiSJNXpEzSzhQnl7iB8CKR8iq sezMRqAgCabeWUZJan0oXIjoG/aG7ZFVlkk7Byv/hyleqM+eZODZ77sVAhq9ITMzVqwCIm EcTn3bOl8rnJGypZnkA8X39KY1ypTvFoensGYJvkxWpc0/IAuT9OKq23hZNqLcM3L6xGXw NCU2yVDdbAF641HiqxiXPi7pwjSNC91PHRQVs/KS25qt2SchD93FVK2zOj/ubA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680162784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gr2RBwVQMAdkHz/SAippfnHle9x6cOrC/DBw6JoUAPE=; b=fTDPJaFJa810H/gUakewizX1cjoKO1Zw+qY2WiEITzEcy1cuCVzeH+eBmwwUbZ5Lp7y51f yVNqOSQoWvDaD4xRbn4A6GzVh1uJpyrSGB051x4ZfIFRLRz9LmwAsoFNuniuuh3szMtMup Dx4TSAV8J+Qz6ZPzR2lj6almHHPb6FHgSEAJapCnwJJCnEN9X4bOd34tzQHidC7Jn2Sa9l exwNfzFSAfAmtgpD16Wqd/01Gd9NA7rrwPCqchTlRF2WOuS57vkd59ytxVLadt0Uf8D5BN PihZys465nGqaxHWpARqTCcmpaIKUn9ZQ4M4JNRHvhE7o/VOaVMDxD3y7gdUHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680162784; a=rsa-sha256; cv=none; b=KksvU5ADVIaz7Sifg0MfC9/TxXJYF1MN9ssjXc8h48JY+gaOv8lU3j1n2zv+WdZbluoZqj NW3CsHfieYOBYL+tUkkEp2ikczf+CnRHOd4ciC93KTo5mufbJlhUXuW2yMhzxacVRNTcsA xaEP2lwQDO4NXfjoFac8NiqEP9AOLUjhH2Z0Lc71Nx5dbWDXtbL5JydnkztP1M60zOKNz/ 8qjqisvQ4a0WHiopSbxf+lFSvyUVsgKwVcGn550DTPpnlpLQVPQ7T9I2f4lMsxdFxucC6R bZzoHczDGMFQmpXT0j4cVI1GSS95xx1YJ/F6fvUrTg7RMFtcvsF0OZVVV6mtCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnFyl6BcJz13V8; Thu, 30 Mar 2023 07:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U7r3PQ021003; Thu, 30 Mar 2023 07:53:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U7r3PW021002; Thu, 30 Mar 2023 07:53:03 GMT (envelope-from git) Date: Thu, 30 Mar 2023 07:53:03 GMT Message-Id: <202303300753.32U7r3PW021002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 52f576459855 - main - committers-doc.dot: bring file up to 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: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52f576459855dd9d206bf922cabef735a7817557 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=52f576459855dd9d206bf922cabef735a7817557 commit 52f576459855dd9d206bf922cabef735a7817557 Author: Fernando Apesteguía AuthorDate: 2023-03-29 09:05:01 +0000 Commit: Fernando Apesteguía CommitDate: 2023-03-30 07:46:56 +0000 committers-doc.dot: bring file up to date Long due task. Many developers should be in alumni by now. Approved by: docs (bcr, carlavilla) Differential Revision: D39309 --- share/misc/committers-doc.dot | 54 +++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index 9602419e5e1b..b070296e790d 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -30,20 +30,44 @@ node [color=grey62, style=filled, bgcolor=black]; # Alumni go here. Try to keep things sorted. ache [label="Andrey Chernov\nache@FreeBSD.org\n1997/06/13\n2010/12/11"] +bhd [label="Björn Heidotting\nbhd@FreeBSD.org\n2014/10/14\202209/16"] bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2000/08/22\n2009/09/13"] bvs [label="Vitaly Bogdanov\nbvs@FreeBSD.org\n2005/10/03\n2010/12/11"] +chinsan [label="Chinsan Huang\nchinsan@FreeBSD.org\n2006/09/20\n2014/03/02"] +crees [label="Chris Rees\ncrees@FreeBSD.org\n2013/05/27\n2022/11/08"] den [label="Denis Peplin\nden@FreeBSD.org\n2003/09/13\n2009/07/09"] +dexter [label="Michael Dexter\ndexter@FreeBSD.org\n2016/11/15\n2019/04/02"] +dru [label="Dru Lavigne\ndru@FreeBSD.org\n2013/01/22\n202/05/05"] +eadler [label="Eitan Adler\neadler@FreeBSD.org\n2012/10/15\2022/09/15"] +gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2007/02/02\n2021/09/21"] garys [label="Gary W. Swearingen\ngarys@FreeBSD.org\n2005/08/21\n2008/03/02"] +gavin [label="Gavin Atkinson\ngavin@FreeBSD.org\n2011/07/18\n2021/10/24"] +issyl0 [label="Isabell Long\nissyl0@FreeBSD.org\n2012/04/25\n2017/08/25"] jcamou [label="Jesus R. Camou\njcamou@FreeBSD.org\n2005/03/02\n2008/12/20"] jesusr [label="Jesus Rodriguez Cuesta\njesusr@FreeBSD.org\n1998/12/10\n2010/12/11"] -jim [label="Jim Mock\njim@FreeBSD.org\n1999/08/11\n2003/12/15"] +jim [label="Jim Mock\njim@FreeBSD.org\n1999/08/11\n2003/12/15\n???"] +jkois [label="Johann Kois\njkois@FreeBSD.org\n2004/11/11\n2021/01/16"] josef [label="Josef El-Rayes\njosef@FreeBSD.org\n2004/01/15\n2008/03/29"] +keramida [label="Giorgos Keramidas\nkeramida@FreeBSD.org\n2001/10/12"] +linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2004/03/31\2022/03/31"] +manolis [label="Manolis Kiagias\nmanolis@FreeBSD.org\n2008/05/24\n2019/05/09"] marcel [label="Marcel Moolenaar\nmarcel@FreeBSD.org\n1999/07/03\n2012/04/25"] mheinen [label="Martin Heinen\nmheinen@FreeBSD.org\n2002/10/04\n2006/04/26"] +miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2007/10/26\n2019/05/09"] murray [label="Murray Stokely\nmurray@FreeBSD.org\n2000/04/05\n2012/04/25"] nik [label="Nik Clayton\nnik@FreeBSD.org\n1998/02/26\n2008/12/20"] +pauamma [label="Pau Amma\npauamma@FreeBSD.org\n2022/06/03\n2023/03/15"] +pav [label="Pav Lucistnik\npav@FreeBSD.org\n2005/08/12\n2013/12/20"] pgj [label="Gabor Pali\npgj@FreeBSD.org\n2008/04/21\n2010/12/01"] +remko [label="Remko Lodder\nremko@FreeBSD.org\n2004/10/16\n2019/10/07"] roam [label="Peter Pentchev\nroam@FreeBSD.org\n2003/02/14\n2012/02/29"] +sevan [label="Sevan Janiyan\nsevan@FreeBSD.org\n2016/09/16\n2021/09/18"] +sg [label="Stephen Gregoratto\nsg@FreeBSD.org\n2019/09/10\n2019/12/10"] +simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2003/07/20\n2019/05/09"] +skreuzer [label="Steven Kreuzer\nskreuzer@FreeBSD.org\n2014/01/15\n2019/05/09"] +taras [label="Taras Korenko\ntaras@FreeBSD.org\n2010/06/25\n2019/05/09"] +wblock [label="Warren Block\nwblock@FreeBSD.org\n2011/09/12\n2021/09/29"] +zeising [label="Niclas Zeising\nzeising@FreeBSD.org\n2012/07/03\n2022/11/08"] node [color=lightblue2, style=filled, bgcolor=black]; @@ -53,60 +77,36 @@ node [color=lightblue2, style=filled, bgcolor=black]; ale [label="Alex Dupre\nale@FreeBSD.org\n2003/12/22"] allanjude [label="Allan Jude\nallanjude@FreeBSD.org\n2014/05/17"] bcr [label="Benedict Reuschling\nbcr@FreeBSD.org\n2009/12/24"] -bhd [label="Björn Heidotting\nbhd@FreeBSD.org\n2014/10/14"] blackend [label="Marc Fonvieille\nblackend@FreeBSD.org\n2002/06/16"] brd [label="Brad Davis\nbrd@FreeBSD.org\n2005/06/01"] brueffer [label="Christian Brueffer\nbrueffer@FreeBSD.org\n2003/01/13"] carlavilla [label="Sergio Carlavilla\ncarlavilla@FreeBSD.org\n2019/05/16"] ceri [label="Ceri Davies\nceri@FreeBSD.org\n2002/03/17"] -chinsan [label="Chinsan Huang\nchinsan@FreeBSD.org\n2006/09/20"] -crees [label="Chris Rees\ncrees@FreeBSD.org\n2013/05/27"] danger [label="Daniel Gerzo\ndanger@FreeBSD.org\n2006/08/20"] dbaio [label="Danilo G. Baio\ndbaio@FreeBSD.org\n2021/05/13"] debdrup [label="Daniel Ebdrup Jensen\ndebdrup@FreeBSD.org\n2020/07/26"] delphij [label="Xin Li\ndelphij@FreeBSD.org\n2004/09/14"] -dexter [label="Michael Dexter\ndexter@FreeBSD.org\n2016/11/15"] -dru [label="Dru Lavigne\ndru@FreeBSD.org\n2013/01/22"] -eadler [label="Eitan Adler\neadler@FreeBSD.org\n2012/10/15"] ebrandi [label="Edson Brandi\nebrandi@FreeBSD.org\n2012/09/13"] emaste [label="Ed Maste\nemaste@FreeBSD.org\n2021/08/18"] -fernape [label="Fernando Apesteguia\fernape@FreeBSD.org\n2021/02/07"] -gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2007/02/02"] +fernape [label="Fernando Apesteguia\nfernape@FreeBSD.org\n2021/02/07"] ganbold [label="Ganbold Tsagaankhuu\nganbold@FreeBSD.org\n2008/02/26"] -gavin [label="Gavin Atkinson\ngavin@FreeBSD.org\n2011/07/18"] gbe [label="Gordon Bergling\ngbe@FreeBSD.org\n2020/06/08"] gjb [label="Glen Barber\ngjb@FreeBSD.org\n2010/09/01"] grahamperrin [label="Graham Perrin\ngrahamperrin@FreeBSD.org\n2022/06/01"] hrs [label="Hiroki Sato\nhrs@FreeBSD.org\n2000/07/06"] -issyl0 [label="Isabell Long\nissyl0@FreeBSD.org\n2012/04/25"] jgh [label="Jason Helfman\njgh@FreeBSD.org\n2014/01/20"] -jkois [label="Johann Kois\njkois@FreeBSD.org\n2004/11/11"] joel [label="Joel Dahl\njoel@FreeBSD.org\n2005/04/05"] -keramida [label="Giorgos Keramidas\nkeramida@FreeBSD.org\n2001/10/12"] -linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2004/03/31"] loader [label="Fukang Chen\nloader@FreeBSD.org\n2007/07/30"] lwhsu [label="Li-Wen Hsu\nlwhsu@FreeBSD.org\n2021/08/01"] -manolis [label="Manolis Kiagias\nmanolis@FreeBSD.org\n2008/05/24"] marck [label="Dmitry Morozovsky\nmarck@FreeBSD.org\n2004/08/10"] maxim [label="Maxim Konovalov\nmaxim@FreeBSD.org\n2002/02/07"] -miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2007/10/26"] -pauamma [label="Pau Amma\npauamma@FreeBSD.org\n2022/06/03"] -pav [label="Pav Lucistnik\npav@FreeBSD.org\n2005/08/12"] philip [label="Philip Paeps\nphilip@FreeBSD.org\n2021/07/13"] pluknet [label="Sergey Kandaurov\npluknet@FreeBSD.org\n2012/02/14"] -remko [label="Remko Lodder\nremko@FreeBSD.org\n2004/10/16"] rene [label="Rene Ladan\nrene@FreeBSD.org\n2008/11/03"] ryusuke [label="Ryusuke Suzuki\nryusuke@FreeBSD.org\n2009/12/21"] -salvadore[label="Lorenzo Salvadore\nsalvadore@FreeBSD.org\n2023/03/20"] -sevan [label="Sevan Janiyan\nsevan@FreeBSD.org\n2016/09/16"] -sg [label="Stephen Gregoratto\nsg@FreeBSD.org\n2019/09/10"] -simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2003/07/20"] -skreuzer [label="Steven Kreuzer\nskreuzer@FreeBSD.org\n2014/01/15"] -taras [label="Taras Korenko\ntaras@FreeBSD.org\n2010/06/25"] +salvadore [label="Lorenzo Salvadore\nsalvadore@FreeBSD.org\n2023/03/20"] trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2002/03/25"] -wblock [label="Warren Block\nwblock@FreeBSD.org\n2011/09/12"] ygy [label="Guangyuan Yang\nygy@FreeBSD.org\n2017/09/18"] -zeising [label="Niclas Zeising\nzeising@FreeBSD.org\n2012/07/03"] # Here are the mentor/mentee relationships. # Group together all the mentees for a particular mentor. From nobody Thu Mar 30 08:47: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 4PnH912qDXz42gyL; Thu, 30 Mar 2023 08:47: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 4PnH912B39z4DL4; Thu, 30 Mar 2023 08:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680166021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3AVt/OmkIQ2noNdF9GYhQ67S4Fc9z6e2LMs0aeBjbiw=; b=N2YgYJTYGPWQn8mAOtlk5Ysp4HxIV4wjBnloT1poxI5sOAUlxCVPclNkt49A/aNHY6DsFA u20kL3KmCxdR1z8MA73J4D3lJsD+ISmfcIYV0rTWYX+EWGGbHwO1eMkxeysvGj9fMNiwZ5 Gvn7wKzKq681Tfd39o99hL25gxrW9weAN9GMBP8wRyazyUx22p1ec+1YV85xal7vcb9j8W h9X0CG4IdiltxzSzscFwtILHyapKSOKxv9eqHGb3CanaZat9q0TK6WwwLe3qD+uC1aH+bo kMC7DsjvcXjAxfjo6YFl6DQJYItIzKU9/kf1MYCh85se/Ms0ZULJNPaBwuEOSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680166021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3AVt/OmkIQ2noNdF9GYhQ67S4Fc9z6e2LMs0aeBjbiw=; b=LwBQGyOJj1k5NL/Vsce0lSgBIIm65+1AIXh/FDizZW5WdsCLZS+FyaQLptlaraICybALOf lCMwKqFV1F/LLGhrh/DaVmDj1nxVj+RSdiX81/XzpxwqtkQ8ReFQj/K/EknQmnmhuLAKrf WfVzmwnFU43r0HXkDcM/hASGQ10WUJhkeD2qOk9F7rQWdQqmv0gVe/rqYpxx9gFGm5kjtr LKNQ4J0YcanPXHtDqdaU4sUbbpXU0y9CUQcrJjzpFD7063Y598ZUogg/MJx6T1qF6DhXAi 60ZOX/fXvk3bNVU9mlhxuJW8VMI5EeoCIOzvrH/kYzjmLNnjoOVWcC2BteRtjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680166021; a=rsa-sha256; cv=none; b=WNML2yTw2TuoeHwjDZdCbDFG4hTCI0hra1V6pE7QKQ23JOrpK9rBiPmGXB4vGlYT5i2bdO JtSuVuZ0SfmrOV9h5RbMKFiVRVreAuQ/etC9cpaSw/WLyPnYjckmb+h5dD4vf5xq9YoNma xL2Sex164aKPTr2XXRMmFZcmOBOWhW0lz0jsOFHKGxo+5sSnLJWS6L7mEnbXMaD2j0GXp6 MJi3KBNoK7A7tF7bp4YgAqdKsMuKJOT0V4BYPX5CQoiSWEgUbPYBNVdRUFS+aqJpJg9t6J 8+Vgm/Px1wcL5TNggBNTv8c/IQvVTmuBoyp3gfNw+YwHyIoYscHb2nl/+fb8bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnH911CgTz14vp; Thu, 30 Mar 2023 08:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U8l1tl004220; Thu, 30 Mar 2023 08:47:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U8l1UM004219; Thu, 30 Mar 2023 08:47:01 GMT (envelope-from git) Date: Thu, 30 Mar 2023 08:47:01 GMT Message-Id: <202303300847.32U8l1UM004219@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: f5a365e51fee - main - inet6: protect address manipulation with a lock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: f5a365e51feea75d1e5ebc86c53808d8cae7b6d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f5a365e51feea75d1e5ebc86c53808d8cae7b6d7 commit f5a365e51feea75d1e5ebc86c53808d8cae7b6d7 Author: Mateusz Guzik AuthorDate: 2023-03-29 12:46:41 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-30 08:46:38 +0000 inet6: protect address manipulation with a lock This is a total hack/bare minimum which follows inet4. Otherwise 2 threads removing the same address can easily crash. Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39317 --- sys/netinet6/in6.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 27dc3550177c..3d967e9a40c7 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -168,6 +168,9 @@ static void in6_leave_proxy_ndp_mc(struct ifnet *, const struct in6_addr *); #define ifa2ia6(ifa) ((struct in6_ifaddr *)(ifa)) #define ia62ifa(ia6) (&((ia6)->ia_ifa)) +static struct sx in6_control_sx; +SX_SYSINIT(in6_control_sx, &in6_control_sx, "in6_control"); + void in6_newaddrmsg(struct in6_ifaddr *ia, int cmd) { @@ -254,6 +257,7 @@ in6_control(struct socket *so, u_long cmd, void *data, struct in6_aliasreq *ifra = (struct in6_aliasreq *)data; struct sockaddr_in6 *sa6; int error; + bool control_locked = false; /* * Compat to make pre-10.x ifconfig(8) operable. @@ -411,6 +415,8 @@ in6_control(struct socket *so, u_long cmd, void *data, if (td != NULL && (error = prison_check_ip6(td->td_ucred, &sa6->sin6_addr)) != 0) return (error); + sx_xlock(&in6_control_sx); + control_locked = true; ia = in6ifa_ifpwithaddr(ifp, &sa6->sin6_addr); } else ia = NULL; @@ -582,6 +588,9 @@ in6_control(struct socket *so, u_long cmd, void *data, error = 0; out: + if (control_locked) + sx_xunlock(&in6_control_sx); + if (ia != NULL) ifa_free(&ia->ia_ifa); return (error); From nobody Thu Mar 30 09: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 4PnJkB6Xt7z42lvf; Thu, 30 Mar 2023 09:57: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 4PnJkB5Zp7z4MFw; Thu, 30 Mar 2023 09: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=1680170242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=msaYeFpM0OL87nh2qXps+2dP8bw/GafmMfY0LDx0OG4=; b=CgqLvSUSd8KF1Fb0eQB3fw1H2DVypwf5D6c6SRb3mJiFB+eW5JIZpgVfHK9pYBd8RRYtTX 08MsAsQGX4+3TTgxlO8wXUcJWmTzduxCvFRwV5wxCH4cPzyO4rE924cM45P2ckT7b8e0Wc Hjzj/P0+M/vi67lkk0V/Uja2XXcLrtfwL6qre/3Aw2kZifs6ynrv/sdA/gbQMET7X8CedZ hWjVsDwx9AVB5GV9SHsrVnq2+smBySEEsKCvCc+Huq6mfx6ROlwT9xBqE4qMen4MA+fG9h sJs5qzPusEwSpyeoEOO97gBtFz1qsjpBYWS9+OzKbU1mLB9qp7L5sYV10wHNmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680170242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=msaYeFpM0OL87nh2qXps+2dP8bw/GafmMfY0LDx0OG4=; b=vfhk3ULTfeND0nRE/8e71S5h1IRY0SqKI2hKdsVYNL4ukUfieUoTMhsumGUibXwuVWYxTx 1Z7VSLZvgR3IJ92/7cZAlY1GMvtLYqgCaenklpjZwBSgNAlqwp+ZVYyhmqNaG7YS5Csq7E DZO4a16WeFbCZYY5Oe9vFQpJpQbZDU/bVA12ixWCuNdlqHdmANJ3LotTaFU5umc3f5XS+n XZ4ngd/cUjpZQLjIJ9H1yAylGzE0TXseaY+xefb8OXNG8J8iFsa9rMUT6xIJeNQ7X8R2Ko kfbqNgA9dratucX/LYpqO3+35ev/yMomFWoaOtcoXvM4uXd7NIZWKhPs7m7U+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680170242; a=rsa-sha256; cv=none; b=rn8ZDXh89G8izM/u/6FfC5GtqBj4vhVYY8kv4Xjq4BUYHSM9CgqW6BIjgSKg7foeYj8IoH wDl72mf4ywqzdNcSu2GUG3Vd2e7V92576TBTZMJP6tzdfq0loRh++meAAn0U8RESK+ypoM 3YfR6AUe2h89sZo//u2307lNi5whGVyyq18QK3PniJK9Nr5QNNkCqTwsY2Tgh+v/CNm/Oa TxgJum6MlbIF61zfLSUhlJ+4q4GD1noaeEswU+LSgjlFYhexOzucVH7IizgoIYfVQZz1HS Eiv8qS7KrX4lmZJee7WsfRW5q17P+JnDAFUq6rsNRJu8/MfJOLMb6RlCLB25fQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnJkB4JWnz16lR; Thu, 30 Mar 2023 09:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U9vMsG018898; Thu, 30 Mar 2023 09:57:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U9vMCx018897; Thu, 30 Mar 2023 09:57:22 GMT (envelope-from git) Date: Thu, 30 Mar 2023 09:57:22 GMT Message-Id: <202303300957.32U9vMCx018897@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 140ddeba0834 - main - route: try to autoload netlink(4) module if not present in the kernel. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 140ddeba0834509b9b8159c4d0c59cc7962dcc0e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=140ddeba0834509b9b8159c4d0c59cc7962dcc0e commit 140ddeba0834509b9b8159c4d0c59cc7962dcc0e Author: Alexander V. Chernikov AuthorDate: 2023-03-29 15:31:26 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-30 09:53:06 +0000 route: try to autoload netlink(4) module if not present in the kernel. Differential Revision: https://reviews.freebsd.org/D39324 --- sbin/route/route_netlink.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index 0b9bb4ff5750..66b1920a58db 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -6,6 +6,8 @@ #include #include +#include +#include #include #include #include @@ -90,6 +92,23 @@ get_netmask(struct snl_state *ss, int family, int plen) return (NULL); } +static void +nl_init_socket(struct snl_state *ss) +{ + if (snl_init(ss, NETLINK_ROUTE)) + return; + + if (modfind("netlink") == -1 && errno == ENOENT) { + /* Try to load */ + if (kldload("netlink") == -1) + err(1, "netlink is not loaded and load attempt failed"); + if (snl_init(ss, NETLINK_ROUTE)) + return; + } + + err(1, "unable to open netlink socket"); +} + struct nl_helper { struct snl_state ss_cmd; }; @@ -97,8 +116,7 @@ struct nl_helper { static void nl_helper_init(struct nl_helper *h) { - if (!snl_init(&h->ss_cmd, NETLINK_ROUTE)) - err(1, "unable to open netlink socket"); + nl_init_socket(&h->ss_cmd); } static void @@ -680,8 +698,7 @@ monitor_nl(int fib) struct snl_state ss_event = {}; struct nl_helper h; - if (!snl_init(&ss_event, NETLINK_ROUTE)) - err(1, "unable to open netlink socket"); + nl_init_socket(&ss_event); nl_helper_init(&h); int groups[] = { @@ -789,8 +806,7 @@ flushroutes_fib_nl(int fib, int af) struct snl_writer nw; struct nl_helper h = {}; - if (!snl_init(&ss, NETLINK_ROUTE)) - err(1, "unable to open netlink socket"); + nl_init_socket(&ss); snl_init_writer(&ss, &nw); struct nlmsghdr *hdr = snl_create_msg_request(&nw, NL_RTM_GETROUTE); From nobody Thu Mar 30 09: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 4PnJkC6qDrz42m8C; Thu, 30 Mar 2023 09: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 4PnJkC6480z4MKW; Thu, 30 Mar 2023 09: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=1680170243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zd2+ATycv3W5x26YZEL7rBwfjxs6Et73s5pcqGNXSQM=; b=aGKxQ2Z5r9v+97GqsPjz0IbvTqo82uk0hyPCS3NecL9Qd5wr76+71eQU4PkSa6fCSDLMzk g2RPYovk6xR2ajq3Q8xZK8kO/aH+XKWHtnD/hmc2MBoc4e2ltWm29+qSiBfh4kLMsKl11K ZOt6NSrKYIPC9KZn2yfJv/4Unq4JPiNPvV9uBevdzOGp3rl36yiDHBq+HdqMVuRdh07BSv lYkRF6NZKfwStYMbUjCPgh7IBJ+JIPk8NW79XMRl47opQnhocUIU+DwdrgyVo77Fr1mH9q xKwS0iwhpTVF988Sa1GFtOMtsPqIVZSrkvJysol6k7z4BZFfaeAbqb/pab9zfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680170243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zd2+ATycv3W5x26YZEL7rBwfjxs6Et73s5pcqGNXSQM=; b=AGWq+2+1WDVrkO8vN8MxC6i07saFWwuepG1Mi2YgsU0gAhnuD/dYFJGRz2plRzTXQ0G2CN tzk9NZMvE7+QVtuCHTPhu4AN3s/DOQf3nQdFN3FQdyinAhYW4LG01bAgqdhOrGPBN38BGM D9qccLPr/1dsmz4uQFZSvP7Tf8fpBSAXWgPMVWo/4wbiyNe0GlP1GroC4P931wXDQTSB3u GCTC6qNO49YMcHn+0cFBvZbnUv7c5ryND2usi1Ny95WZ4ePyhVD07WRTDaPFREWD6ydpE9 kQTNW5Zb7QINk5Q/uuHdWcnOSc06FUnGbcjjMZszGMXXFiyt0nj8QI7nhJlpTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680170243; a=rsa-sha256; cv=none; b=avoccSqJjaUMrzpOlhOJxovkHjA8eKMXyLDUQqfO0jXI+ftTYYg/2VSZdYz76N4AWecT3a dGkCatdE8VXP63aDB6DYq8gfU9WGPsqkY7RxNFvnkS0dHMyW2rpIXM39XcrI+udh/n9SPV OUbFjWl7qxWZ6he207DITOTaZ2WOEdkci68BUA5YeSbda7oWdUY2V4EZb7q3N/t3QecH/w yDwK28gVZG6o0HCGfm7Q18ccTdj800FZwUEnnyIASUxMY+DJdj5CGSbWu9SDO7kwCWEmaB Zaa+IWTQuiEdHIt7VhFUiDYSaF7ONeGxWKOeOr1d/nz0MJveXw6m5/d7SJNncQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnJkC5B0Tz16Nx; Thu, 30 Mar 2023 09:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U9vNhB018917; Thu, 30 Mar 2023 09:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U9vNDC018916; Thu, 30 Mar 2023 09:57:23 GMT (envelope-from git) Date: Thu, 30 Mar 2023 09:57:23 GMT Message-Id: <202303300957.32U9vNDC018916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: b755f1a009b0 - main - netlink: Fix adding routes with nexthops on p2p 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b755f1a009b05cec45108e2ae83ae72c6e264c29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=b755f1a009b05cec45108e2ae83ae72c6e264c29 commit b755f1a009b05cec45108e2ae83ae72c6e264c29 Author: Alexander V. Chernikov AuthorDate: 2023-03-29 14:13:44 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-30 09:53:50 +0000 netlink: Fix adding routes with nexthops on p2p interfaces. Use full-featured ifa_ifwithroute() to guess route ifa/ifp instead of ifa_ifwithnet(). This change makes the route addition logic closer to the rt_getifa_fib() used by rtsock. Reported by: glebius Tested by: glebius Differential Revision: https://reviews.freebsd.org/D39335 MFC after: 2 weeks --- sys/netlink/route/rt.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 7785dd42dc65..6d76390016dd 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -661,7 +661,7 @@ handle_rtm_dump(struct nlpcb *nlp, uint32_t fibnum, int family, } static struct nhop_object * -finalize_nhop(struct nhop_object *nh, int *perror) +finalize_nhop(struct nhop_object *nh, const struct sockaddr *dst, int *perror) { /* * The following MUST be filled: @@ -682,7 +682,15 @@ finalize_nhop(struct nhop_object *nh, int *perror) } else { /* Gateway is set up, we can derive ifp if not set */ if (nh->nh_ifp == NULL) { - struct ifaddr *ifa = ifa_ifwithnet(&nh->gw_sa, 1, nhop_get_fibnum(nh)); + uint32_t fibnum = nhop_get_fibnum(nh); + uint32_t flags = 0; + + if (nh->nh_flags & NHF_GATEWAY) + flags = RTF_GATEWAY; + else if (nh->nh_flags & NHF_HOST) + flags = RTF_HOST; + + struct ifaddr *ifa = ifa_ifwithroute(flags, dst, &nh->gw_sa, fibnum); if (ifa == NULL) { NL_LOG(LOG_DEBUG, "Unable to determine ifp, skipping"); *perror = EINVAL; @@ -765,7 +773,7 @@ create_nexthop_one(struct nl_parsed_route *attrs, struct rta_mpath_nh *mpnh, if (attrs->rtm_protocol > RTPROT_STATIC) nhop_set_origin(nh, attrs->rtm_protocol); - *pnh = finalize_nhop(nh, &error); + *pnh = finalize_nhop(nh, attrs->rta_dst, &error); return (error); } @@ -852,7 +860,7 @@ create_nexthop_from_attrs(struct nl_parsed_route *attrs, /* TODO: return ENOTSUP for other types if strict option is set */ } - nh = finalize_nhop(nh, perror); + nh = finalize_nhop(nh, attrs->rta_dst, perror); } return (nh); From nobody Thu Mar 30 11:05: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 4PnLDq61y9z42qtJ; Thu, 30 Mar 2023 11:05: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 4PnLDq5CRpz3DgL; Thu, 30 Mar 2023 11:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680174331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nABS0zl+vsXOnCx0t3qM+sxbrDvQZIvZYtMMr3UH4I4=; b=atrtrahLHYycgneFJOH3uEnH9lS118YDbTREq1eFM0qPb57Bld13LXxk4QuKXQOV9HkyGk BUXlqyMmBaPGiTTQRL6IvE2AbYDyXdg4F3s0Bc2OpBOSKY9yNa+OzrxcSq0lEyeHcnvrIz /+dW1DtEIZlb+b0mjI9bASmbkklvRFW5UH1hVPmHmul4kagoBZyv4s3GBy4OHlb7xehYcv cbTY01vIfGVAFUEzt7m+2qXL25BU4jJzEcpzFCBLKeMe3TJjeEz5ek1soVVWgQu1VuozG2 c3Ehngi4VmjTMV8+agetQBJuFiTfJrme615eeBD0ajCzMu+M/oue7psrdvFdEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680174331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nABS0zl+vsXOnCx0t3qM+sxbrDvQZIvZYtMMr3UH4I4=; b=GcFm103UF19euQqQlJAtxZWmACq64h4o2mJ7XyfJVxFMh4ME7J7D+eWLiElw75YTD8fyzO u5Mj75tyx4YB4P4qVvmZeNkpJY5Yp1Df8tS+eOOj59PbOhPZM83vHhB2cbhYHECTSZYBF6 Aio+vSCUu4FzvEEBst0F4LNM54nVROl213dESeiRFACWfuMG3xoyseDGBLR8XZ2PKoc0v6 KBtRLMUhSA2GYNoMD5ZHRAftEHP3R5h2ZKsZ7hzoFv0Ab1Y82m8952wpoCaSY7v0iSaBcL 0842YSXvIYmj36zUY13agjZXjvtIEbc2/zyJ9EK5lrrJEcuJPMslgm5OgVY3lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680174331; a=rsa-sha256; cv=none; b=TpFb6cIqFPkfj4h7cewPN8Ms+KFub2sCd1jKDXHFkh2x7o+46Qc8kcFkgquW6GdelZ19xb eHXknRoO0CiJfC1LppfbbHyS565F00E9KNkELAsRy3fHZnH2EKucykl0eQNKrg4kfik+0V 2+GgTkBhx19atl6UB/oM7Aju56wdiNQMIJDZi23kbThKlZR/Y2Ezvx37QVkoIoMXp2qCI0 F2jJQtAYR2wxq2jjqqqiVpP7UE0kkh7G/zwQrNDayHZBFkLzO9pMWn3QuG8dndJv2wxB+f QoLJNSgs6mLMviA0sxgLBfb4wFZO9TTMHAzbFlgWHNQTIN4NHTj0cf6Ul8XvGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnLDq4H62z18YL; Thu, 30 Mar 2023 11:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UB5Vis034537; Thu, 30 Mar 2023 11:05:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UB5VmM034536; Thu, 30 Mar 2023 11:05:31 GMT (envelope-from git) Date: Thu, 30 Mar 2023 11:05:31 GMT Message-Id: <202303301105.32UB5VmM034536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 404689908632 - main - bhyve: remove unnecessary const qualifier in acpi_device.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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 404689908632599ee5b3bcbc289ae7f094368dc5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=404689908632599ee5b3bcbc289ae7f094368dc5 commit 404689908632599ee5b3bcbc289ae7f094368dc5 Author: Corvin Köhne AuthorDate: 2023-03-29 13:13:03 +0000 Commit: Corvin Köhne CommitDate: 2023-03-30 11:05:15 +0000 bhyve: remove unnecessary const qualifier in acpi_device.h Those const qualifier declare that the function doesn't change the values internally. It makes no sense to add them in the header file. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39318 --- usr.sbin/bhyve/acpi_device.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index 5fb3ea18e481..49e55c7d4f14 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -26,13 +26,13 @@ struct acpi_device; * @param[in] hid Hardware ID of the ACPI device. Should always be a NULL * terminated string. */ -int acpi_device_create(struct acpi_device **const new_dev, - struct vmctx *const vm_ctx, const char *const name, const char *const hid); -void acpi_device_destroy(struct acpi_device *const dev); +int acpi_device_create(struct acpi_device **new_dev, struct vmctx *vm_ctx, + const char *name, const char *hid); +void acpi_device_destroy(struct acpi_device *dev); -int acpi_device_add_res_fixed_ioport(struct acpi_device *const dev, - const UINT16 port, UINT8 length); -int acpi_device_add_res_fixed_memory32(struct acpi_device *const dev, - const UINT8 write_protected, const UINT32 address, const UINT32 length); +int acpi_device_add_res_fixed_ioport(struct acpi_device *dev, UINT16 port, + UINT8 length); +int acpi_device_add_res_fixed_memory32(struct acpi_device *dev, + UINT8 write_protected, UINT32 address, UINT32 length); -void acpi_device_write_dsdt(const struct acpi_device *const dev); +void acpi_device_write_dsdt(const struct acpi_device *dev); From nobody Thu Mar 30 12:22: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 4PnMxn4vfnz42w8H; Thu, 30 Mar 2023 12:22: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 4PnMxn4GTnz3MHg; Thu, 30 Mar 2023 12:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680178957; h=from:from:reply-to:subject:subject: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+ErkiCQXr5bmOQaHvfKuNlDtEGi32nOW0GtX3TyaTE=; b=EyeoQgx0CITP6jrXBs4E7uGPkffLFpryufiBemojh5rDn5QCBXZMa2ImITavGvApy+7ygz f4clXPtBu8tRm5algcvWP/SXn3mnyZwjnuItGLHmOzGDERkCwIbqpipzu91oyjd84WAJcY nGywD/SNQJ9jn4gVhRq0sfyluv5zAqBI7JCGCd61+b6LPTcMvsM8DFQZghhCuR4iwnmVAt lBRJqW1TnHrkwG2XjK75ampRaf+yyuG8loq7cN2lTzRVO48FbLYIVybthrzjUezfkQJIrq +VzTWV3M4r7P7E5sEe8nJMoSzC+OGRVvJLxUJj3TcBJbOot2RAXpMDhI2EBlYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680178957; h=from:from:reply-to:subject:subject: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+ErkiCQXr5bmOQaHvfKuNlDtEGi32nOW0GtX3TyaTE=; b=LPQozr8r+GhdNat+UtXONKJkFspeYBE73Bsz5MivrmPjNw74pkS/5ry5aEB8uCi4+DH0HQ vrAmKGlOfDU3r5rImDt6R15/sE4j2rQA5F/Ofeg8tp8WuN7zY7NPOX2cWp/FoGjbtvAatO b+NlLZSLQdbZfhCzFg6JCf6u0vtAx91PUSXMPdTfgdtbxcHqEixY/0Pul8onSPlugJl07l dFfTnKOeI91BqFoMOPkejCWEczMwID5BIgkEBF1H0a/7jeqsPv5oA9tOV18oM0RPGL6R8m 47PYRkjGcs0frqienbozOSty0b5uZEZiVMH8mAAh2rweYSb1euIC/t0TCiSVrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680178957; a=rsa-sha256; cv=none; b=YfW2BSdSr/JkOnfx2d5MYQ0k1IOxdgb5aZS0JlDjMPCi64F9cccRcHiCJbwPNEDvLEKaA9 /n4k3KcTNNsm6szS9kzYaQknHQrh6CvNd7eeFWMS1BFZ+LDDj3p/JGc90hEPw1/6aA0TkK tHmAta/Ld6myWLNN+8lMXkA/6C+QviWrsnXPGid7onMqr3UKcWrrR9mg2Ccun3+Y2pd/3n B0pfwf2Gkq9zudM6OqLA2HBDG2c6sRq9acDipX+EqozUMyJMUdrU03OrhkQpyAgRdxL83C Nr+rZgUUk3vJse0u+gzK2MKjlEeCoeZ+842PUMQC/dLKW2YKKlPVCFp7ZvSEQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnMxn3KLZz1BkF; Thu, 30 Mar 2023 12:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UCMbYo065032; Thu, 30 Mar 2023 12:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UCMbFN065031; Thu, 30 Mar 2023 12:22:37 GMT (envelope-from git) Date: Thu, 30 Mar 2023 12:22:37 GMT Message-Id: <202303301222.32UCMbFN065031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 5faf90050e6c - main - committers-ports.dot: Bring file up to 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: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5faf90050e6c280c314bca58ee61707d8bfdbaf3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=5faf90050e6c280c314bca58ee61707d8bfdbaf3 commit 5faf90050e6c280c314bca58ee61707d8bfdbaf3 Author: Fernando Apesteguía AuthorDate: 2023-03-30 10:03:00 +0000 Commit: Fernando Apesteguía CommitDate: 2023-03-30 12:17:10 +0000 committers-ports.dot: Bring file up to date. Many listed committers are actually alumni. Related to this change: 52f576459855 Approved by: bcr@ Differential Revision: https://reviews.freebsd.org/D39340 --- share/misc/committers-ports.dot | 208 ++++++++++++++++++++-------------------- 1 file changed, 104 insertions(+), 104 deletions(-) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 93e7a3f97827..ab6bd8385fe7 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -29,63 +29,145 @@ node [color=grey62, style=filled, bgcolor=black]; # Alumni go here.. Try to keep things sorted. +ache [label="Andrey Chernov\nache@FreeBSD.org\n1994/11/15\n2017/08/17"] +ahze [label="Michael Johnson\nahze@FreeBSD.org\n2004/10/29\n2013/12/02"] +alexbl [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] +alonso [label="Alonso Schaich\nalonso@FreeBSD.org\n2014/08/14\n2017/08/07"] +anray [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] +araujo [label="Marcelo Araujo\naraujo@FreeBSD.org\n2007/04/26\n2020/11/03"] asami [label="Satoshi Asami\nasami@FreeBSD.org\n1994/11/18\n2001/09/11"] +avilla [label="Alberto Villa\navilla@FreeBSD.org\n2010/01/24\n2018/10/01"] +avl [label="Alexander Logvinov\navl@FreeBSD.org\n2009/05/27\n2013/12/02"] +az [label="Andrej Zverev\naz@FreeBSD.org\n2005/10/03\n2019/11/04"] +bar [label="Barbara Guida\nbar@FreeBSD.org\n2012/11/25\n2022/12/05"] +beech [label="Beech Rintoul\nbeech@FreeBSD.org\n2007/05/30\n2014/01/10"] +bf [label="Brendan Fabeny\nbf@FreeBSD.org\n2010/06/02\n2017/04/29"] billf [label="Bill Fumerola\nbillf@FreeBSD.org\n1998/11/11\n2006/12/14"] +brix [label="Henrik Brix Andersen\nbrix@FreeBSD.org\n2007/10/31\n2015/08/26"] +bsam [label="Boris Samorodov\nbsam@FreeBSD.org\n2006/07/20\n2022/06/06"] +chinsan [label="Chinsan Huang\nchinsan@FreeBSD.org\n2007/06/12\n2013/08/17"] +clement [label="Clement Laforet\nclement@FreeBSD.org\n2003/12/17\n2013/08/18"] +clsung [label="Cheng-Lung Sung\nclsung@FreeBSD.org\n2004/8/18\n2015/06/11"] +culot [label="Frederic Culot\nculot@FreeBSD.org\n2010/10/16\n2021/09/06"] +daichi [label="Daichi Goto\ndaichi@FreeBSD.org\n2002/10/17\n2018/06/01"] +dhn [label="Dennis Herrmann\ndhn@FreeBSD.org\n2009/03/03\n2015/06/11"] +dryice [label="Dryice Dong Liu\ndryice@FreeBSD.org\n2006/12/25\n2018/11/06"] +dteske [label="Devin Teske\ndteske@FreeBSD.org\n2018/03/01\n2019/11/05"] +edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2002/10/22\n2016/11/16"] +eik [label="Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12\n2006/12/14"] +erwin [label="Erwin Lansing\nerwin@FreeBSD.org\n2003/06/04\n2016/10/12"] +fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06\n2021/12/06"] +flz [label="Florent Thoumie\nflz@FreeBSD.org\n2005/03/01\n2014/10/17"] +gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2006/12/05\n2019/09/02"] +gblach [label="Grzegorz Blach\ngblach@FreeBSD.org\n2012/11/03\n2020/08/03"] +glarkin [label="Greg Larkin\nglarkin@FreeBSD.org\n2008/07/17\n2014/06/04"] +gnn [label="George Neville-Neil\ngnn@FreeBSD.org\n2013/09/04\n2020/06/02"] +gordon [label="Gordon Tetlow\ngordon@FreeBSD.org\n2014/10/14\n2019/04/08"] +hq [label="Herve Quiroz\nhq@FreeBSD.org\n2004/08/05\n2014/03/02"] +ijliao [label="Ying-Chieh Liao\nijliao@FreeBSD.org\n2001/01/20\n2011/01/02"] +itetcu [label="Ion-Mihai Tetcu\nitetcu@FreeBSD.org\n2006/06/07\n2018/11/06"] +jacula [label="Giuseppe Pilichi\njacula@FreeBSD.org\n2010/04/05\n2011/10/14"] +jadawin [label="Philippe Audeoud\njadawin@FreeBSD.org\n2008/03/02\n2020/10/05"] +jlaffaye [label="Julien Laffaye\njlaffaye@FreeBSD.org\n2011/06/06\n2021/06/07"] jmallett [label="Juli Mallett\njmallett@FreeBSD.org\n2003/01/16\n2006/08/10"] +jmelo [label="Jean Milanez Melo\njmelo@FreeBSD.org\n2006/03/31\n2013/08/18"] +johans [label="Johan Selst\njohans@FreeBSD.org\n2006/04/01\n2019/11/04"] +jsa [label="Joseph S. Atkinson\njsa@FreeBSD.org\n2010/07/15"] +junovitch [label="Jason Unovitch\njunovitch@FreeBSD.org\n2015/07/27\n2018/01/04"] +jylefort [label="Jean-Yves Lefort\njylefort@FreeBSD.org\n2008/04/24"] +kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2003/02/21\n2020/09/07"] +kmoore [label="Kris Moore\nkmoore@FreeBSD.org\n2009/04/14\n2021/05/04"] +koitsu [label="Jeremy Chadwick\nkoitsu@FreeBSD.org\n2006/11/10\n2008/08/18"] +koobs [label="Kubilay Kocak\nkoobs@FreeBSD.org\n2012/12/24\n2022/03/07"] +laszlof [label="Frank Laszlo\nlaszlof@FreeBSD.org\n2006/11/07\n2010/07/05"] +lbr [label="Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30"] +leeym [label="Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14\n2017/01/02"] +lifanov [label="Nikolai Lifanov\nlifanov@FreeBSD.org\n2016/12/11\n2021/05/04"] +linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2003/10/23\n2022/05/05"] +lioux [label="Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.org\n2015/10/14\n2015/10/14"] +lippe [label="Felippe de Meirelles Motta\nlippe@FreeBSD.org\n2015/14/10\n2015/10/14"] +lth [label="Lars Thegler\nlth@FreeBSD.org\n2004/05/04\n2018/10/07"] +lx [label="David Thiel\nlx@FreeBSD.org\n2006/11/29"] +maho [label="Maho Nakata\nmaho@FreeBSD.org\n2002/10/17\n2018/03/11"] marcel [label="Marcel Moolenaar\nmarcel@FreeBSD.org\n1999/07/03\n2007/07/01"] -sobomax[label="Maxim Sobolev\nsobomax@FreeBSD.org\n2000/05/17\n2018/12/03"] -steve [label="Steve Price\nsteve@FreeBSD.org\nxxxx/xx/xx\nxxxx/xx/xx"] +marino [label="John Marino\nmarino@FreeBSD.org\n2013/07/04\n2017/02/10"] +marius [label="Marius Strobl\nmarius@FreeBSD.org\n2012/12/29\n2023/02/07"] +markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21\n2011/07/05"] +mezz [label="Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30"] +mharo [label="Michael Haro\nmharo@FreeBSD.org\n1999/04/13\n2007/09/01"] +miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04\n2021/05/04"] +mnag [label="Marcus Alves Grando\nmnag@FreeBSD.org\n2005/09/15\n2012/02/01"] +mva [label="Marcus von Appen\nmva@FreeBSD.org\n2009/02/16\n2017/01/22"] +nemoliu [label="Tong Liu\nnemoliu@FreeBSD.org\n2007/04/25\n2011/09/15"] +nemysis [label="Rusmir Dusko\nnemysis@FreeBSD.org\n2013/07/31\n2018/09/03"] +nox [label="Juergen Lock\nnox@FreeBSD.org\n2006/12/22"] +obrien [label="David E. O'Brien\nobrien@FreeBSD.org\n1996/10/29\n2015/06/11"] +pat [label="Patrick Li\npat@FreeBSD.org\n2001/11/14\n2008/02/08"] +pav [label="Pav Lucistnik\npav@FreeBSD.org\n2003/11/12\n2013/12/20"] +pawel [label="Pawel Pekala\npawel@FreeBSD.org\n2011/03/11\n2018/02/24"] +pclin [label="Po-Chien Lin\npclin@FreeBSD.org\n2013/02/11\n2014/10/17"] +pgj [label="Gabor Pali\npgj@FreeBSD.org\n2009/04/12\n2018/11/06\n2018/11/06"] +pgollucci [label="Philip M. Gollucci\npgollucci@FreeBSD.org\n2008/07/21\n2017/03/29"] +rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23\n2015/01/21"] +rezny [label="Matthew Rezny\nrezny@FreeBSD.org\n2017/01/09\n2019/02/04"] +rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/07/21\n2011/07/05"] +rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2014/07/15\n2017/08/20"] +sahil [label="Sahil Tandon\nsahil@FreeBSD.org\n2010/04/11"] +sat [label="Andrew Pantyukhin\nsat@FreeBSD.org\n2006/05/06\n2009/07/17"] +scheidell [label="Michael Scheidell\nscheidell@FreeBSD.org\n2011/11/06\n2013/03/19"] +seanc [label="Sean Chittenden\nseanc@FreeBSD.org\n2002/08/15\n2007/09/01"] +sergei [label="Sergei Kolobov\nsergei@FreeBSD.org\n2003/10/21\n2011/09/15"] +shurd [label="Stephen Hurd\nshurd@FreeBSD.org\n2014/06/14\n2021/06/07"] +simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2005/01/08\n2015/10/14"] +sobomax [label="Maxim Sobolev\nsobomax@FreeBSD.org\n2000/05/17\n2018/12/03"] +sperber [label="Armin Pirkovitsch\nsperber@FreeBSD.org\n2012/04/15"] +stas [label="Stanislav Sedov\nstas@FreeBSD.org\n2006/09/18\n2011/11/05"] +stefan [label="Stefan Walter\nstefan@FreeBSD.org\n2006/05/07"] +steve [label="Steve Price\nsteve@FreeBSD.org\n2003/02/06\n2012/04/03"] +sylvio [label="Sylvio Cesar Teixeira\nsylvio@FreeBSD.org\n2009/10/29\n2014/10/17"] +tabthorpe [label="Thomas Abthorpe\ntabthorpe@FreeBSD.org\n2007/08/20\n2018/02/23"] +tj [label="Tom Judge\ntj@FreeBSD.org\n2012/05/28\n2018/11/06"] +tmclaugh [label="Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09/15\n2011/04/16"] +trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007/04/12\n2022/06/06"] +vg [label="Veniamin Gvozdikov\nvg@FreeBSD.org\n2013/06/11\n2018/02/23"] +wg [label="William Grzybowski\nwg@FreeBSD.org\n2013/04/01\n2022/06/06"] will [label="Will Andrews\nwill@FreeBSD.org\n2000/03/20\n2006/09/01"] +wxs [label="Wesley Shields\nwxs@FreeBSD.org\n2008/01/03\n2018/03/11"] +xmj [label="Johannes Jost Meixner\nxmj@FreeBSD.org\n2014/04/07\n2015/07/01"] +yzlin [label="Yi-Jheng Lin\nyzlin@FreeBSD.org\n2009/07/19\n2013/08/17"] +zeising [label="Niclas Zeising\nzeising@FreeBSD.org\n2012/07/03\n2022/05/02"] +znerd [label="Ernst de Haan\nznerd@FreeBSD.org\n2001/11/15\n2006/09/14"] node [color=lightblue2, style=filled, bgcolor=black]; # Current ports committers go here. Try to keep things sorted. "0mp" [label="Mateusz Piotrowski\n0mp@FreeBSD.org\n2018/06/16"] -ache [label="Andrey Chernov\nache@FreeBSD.org\n1994/11/15"] acm [label="Jose Alonso Cardenas Marquez\nacm@FreeBSD.org\n2006/07/18"] adamw [label="Adam Weinberger\nadamw@FreeBSD.org\n2002/10/16"] adridg [label="Adriaan de Groot\nadridg@FreeBSD.org\n2017/09/08"] -ahze [label="Michael Johnson\nahze@FreeBSD.org\n2004/10/29"] ak [label="Alex Kozlov\nak@FreeBSD.org\n2012/02/29"] ale [label="Alex Dupre\nale@FreeBSD.org\n2004/01/12"] alepulver [label="Alejandro Pulver\nalepulver@FreeBSD.org\n2006/04/01"] -alexbl [label="Alexander Botero-Lowry\nalexbl@FreeBSD.org\n2006/09/11"] alexey [label="Alexey Degtyarev\nalexey@FreeBSD.org\n2013/11/09"] -alonso [label="Alonso Schaich\nalonso@FreeBSD.org\n2014/08/14"] amdmi3 [label="Dmitry Marakasov\namdmi3@FreeBSD.org\n2008/06/19"] -anray [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11"] antoine [label="Antoine Brodin\nantoine@FreeBSD.org\n2013/04/03"] -araujo [label="Marcelo Araujo\naraujo@FreeBSD.org\n2007/04/26"] arrowd [label="Gleb Popov\narrowd@FreeBSD.org\n2018/05/18"] arved [label="Tilman Linneweh\narved@FreeBSD.org\n2002/10/15"] ashish [label="Ashish SHUKLA\nashish@FreeBSD.org\n2010/06/10"] -avilla [label="Alberto Villa\navilla@FreeBSD.org\n2010/01/24"] -avl [label="Alexander Logvinov\navl@FreeBSD.org\n2009/05/27"] -az [label="Andrej Zverev\naz@FreeBSD.org\n2005/10/03"] bapt [label="Baptiste Daroussin\nbapt@FreeBSD.org\n2010/07/27"] -bar [label="Barbara Guida\nbar@FreeBSD.org\n2012/11/25"] bdrewery [label="Bryan Drewery\nbdrewery@FreeBSD.org\n2012/07/31"] beat [label="Beat Gaetzi\nbeat@FreeBSD.org\n2009/01/28"] -beech [label="Beech Rintoul\nbeech@FreeBSD.org\n2007/05/30"] -bf [label="Brendan Fabeny\nbf@FreeBSD.org\n2010/06/02"] bland [label="Alexander Nedotsukov\nbland@FreeBSD.org\n2003/08/14"] bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2000/08/23"] bofh [label="Muhammad Moinur Rahman\nbofh@FreeBSD.org\n2014/12/23"] brnrd [label="Bernard Spil\nbrnrd@FreeBSD.org\n2015/05/24"] -brix [label="Henrik Brix Andersen\nbrix@FreeBSD.org\n2007/10/31"] brooks [label="Brooks Davies\nbrooks@FreeBSD.org\n2004/05/03"] -bsam [label="Boris Samorodov\nbsam@FreeBSD.org\n2006/07/20"] -chinsan [label="Chinsan Huang\nchinsan@FreeBSD.org\n2007/06/12"] -clement [label="Clement Laforet\nclement@FreeBSD.org\n2003/12/17"] -clsung [label="Cheng-Lung Sung\nclsung@FreeBSD.org\n2004/8/18"] cmt [label="Christoph Moench-Tegeder\ncmt@FreeBSD.org\n2016/03/01"] cperciva [label="Colin Percival\ncperciva@FreeBSD.org\n2006/01/31"] crees [label="Chris Rees\ncrees@FreeBSD.org\n2011/06/11"] cs [label="Carlo Strub\ncs@FreeBSD.org\n2011/09/13"] -culot [label="Frederic Culot\nculot@FreeBSD.org\n2010/10/16"] cy [label="Cy Schubert\ncy@FreeBSD.org\n2001/11/13"] -daichi [label="Daichi Goto\ndaichi@FreeBSD.org\n2002/10/17"] danfe [label="Alexey Dokuchaev\ndanfe@FreeBSD.org\n2004/08/20"] danilo [label="Danilo E. Gondolfo\ndanilo@FreeBSD.org\n2013/09/23"] db [label="Diane Bruce\ndb@FreeBSD.org\n2007/01/18"] @@ -95,214 +177,132 @@ dch [label="Dave Cottlehuber\ndch@FreeBSD.org\n2017/09/09"] decke [label="Bernhard Froehlich\ndecke@FreeBSD.org\n2010/03/21"] delphij [label="Xin Li\ndelphij@FreeBSD.org\n2006/05/01"] demon [label="Dmitry Sivachenko\ndemon@FreeBSD.org\n2000/11/13"] -dhn [label="Dennis Herrmann\ndhn@FreeBSD.org\n2009/03/03"] diizzy [label="Daniel Engberg\ndiizzy@FreeBSD.org\n2021/07/06"] dmgk [label="Dmitri Goutnik\ndmgk@FreeBSD.org\n2019/09/15"] driesm [label="Dries Michiels\ndriesm@FreeBSD.org\n2021/11/06"] -dryice [label="Dryice Dong Liu\ndryice@FreeBSD.org\n2006/12/25"] -dteske [label="Devin Teske\ndteske@FreeBSD.org\n2018/03/01"] dumbbell [label="Jean-Sebastien Pedron\ndumbbell@FreeBSD.org\n2017/01/10"] dvl [label="Dan Langille\ndvl@FreeBSD.org\n2014/08/10"] eadler [label="Eitan Adler\neadler@FreeBSD.org\n2011/08/17"] eduardo [label="Nuno Teixeira\neduardo@FreeBSD.org\n2021/01/27"] -edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2002/10/22"] egypcio [label="Vinícius Zavam\negypcio@FreeBSD.org\n2018/10/04"] ehaupt [label="Emanuel Haupt\nehaupt@FreeBSD.org\n2005/10/03"] -eik [label="Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12"] ericbsd [label="Eric Turgeon\nericbsd@FreeBSD.org\n2018/03/17"] -erwin [label="Erwin Lansing\nerwin@FreeBSD.org\n2003/06/04"] eugen [label="Eugene Grosbein\neugen@FreeBSD.org\n2017/03/04"] farrokhi [label="Babak Farrokhi\nfarrokhi@FreeBSD.org\n2006/11/07"] feld [label="Mark Felder\nfeld@FreeBSD.org\n2013/06/25"] fernape [label="Fernando Apesteguia\nfernape@FreeBSD.org\n2018/03/03"] -fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06"] flo [label="Florian Smeets\nflo@FreeBSD.org\n2010/12/07"] fluffy [label="Dima Panov\nfluffy@FreeBSD.org\n2009/08/10"] -flz [label="Florent Thoumie\nflz@FreeBSD.org\n2005/03/01"] fuz [label="Robert Clausecker\nfuz@FreeBSD.org\n2023/02/02"] -gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2006/12/05"] gahr [label="Pietro Cerutti\ngahr@FreeBSD.org\n2008/02/20"] garga [label="Renato Botelho\ngarga@FreeBSD.org\n2005/07/11"] -gblach [label="Grzegorz Blach\ngblach@FreeBSD.org\n2012/11/03"] gerald [label="Gerald Pfeifer\ngerald@FreeBSD.org\n2002/04/03"] gjb [label="Glen Barber\ngjb@FreeBSD.org\n2012/06/19"] -glarkin [label="Greg Larkin\nglarkin@FreeBSD.org\n2008/07/17"] glewis [label="Greg Lewis\nglewis@FreeBSD.org\n2002/04/08"] -gordon [label="Gordon Tetlow\ngordon@FreeBSD.org\n2014/10/14"] grembo [label="Michael Gmelin\ngrembo@FreeBSD.org\n2014/01/21"] -gnn [label="George Neville-Neil\ngnn@FreeBSD.org\n2013/09/04"] -hq [label="Herve Quiroz\nhq@FreeBSD.org\n2004/08/05"] hrs [label="Hiroki Sato\nhrs@FreeBSD.org\n2004/04/10"] -ijliao [label="Ying-Chieh Liao\nijliao@FreeBSD.org\n2001/01/20"] -itetcu [label="Ion-Mihai Tetcu\nitetcu@FreeBSD.org\n2006/06/07"] -jacula [label="Giuseppe Pilichi\njacula@FreeBSD.org\n2010/04/05"] -jadawin [label="Philippe Audeoud\njadawin@FreeBSD.org\n2008/03/02"] jase [label="Jase Thew\njase@FreeBSD.org\n2012/05/30"] jbeich [label="Jan Beich\njbeich@FreeBSD.org\n2015/01/19"] jgh [label="Jason Helfman\njgh@FreeBSD.org\n2011/12/16"] jhale [label="Jason E. Hale\njhale@FreeBSD.org\n2012/09/10"] jhixson [label="John Hixson\njhixson@FreeBSD.org\n2018/07/16"] jkim [label="Jung-uk Kim\njkim@FreeBSD.org\n2007/09/12"] -jlaffaye [label="Julien Laffaye\njlaffaye@FreeBSD.org\n2011/06/06"] jmd [label="Johannes M. Dieterich\njmd@FreeBSD.org\n2017/01/09"] -jmelo [label="Jean Milanez Melo\njmelo@FreeBSD.org\n2006/03/31"] -joneum [label="Jochen Neumeister\njoneum@FreeBSD.org\n2017/05/11"] joerg [label="Joerg Wunsch\njoerg@FreeBSD.org\n1994/08/22"] -johans [label="Johan Selst\njohans@FreeBSD.org\n2006/04/01"] +joneum [label="Jochen Neumeister\njoneum@FreeBSD.org\n2017/05/11"] josef [label="Josef El-Rayes\njosef@FreeBSD.org\n2004/12/20"] jpaetzel [label="Josh Paetzel\njpaetzel@FreeBSD.org\n2008/09/05"] jrm [label="Joseph R. Mingrone\njrm@FreeBSD.org\n2016/09/17"] -jsa [label="Joseph S. Atkinson\njsa@FreeBSD.org\n2010/07/15"] jsm [label="Jesper Schmitz Mouridsen\njsm@FreeBSD.org\n2018/06/30"] -junovitch [label="Jason Unovitch\njunovitch@FreeBSD.org\n2015/07/27"] -jylefort [label="Jean-Yves Lefort\njylefort@FreeBSD.org\n2005/04/12"] kai [label="Kai Knoblich\nkai@FreeBSD.org\n2019/02/01"] kami [label="Dominic Fandrey\nkami@FreeBSD.org\n2014/09/09"] kbowling [label="Kevin Bowling\nkbowling@FreeBSD.org\n2018/09/02"] kevans [label="Kyle Evans\nkevans@FreeBSD.org\n2020/02/14"] -kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2003/02/21"] -kmoore [label="Kris Moore\nkmoore@FreeBSD.org\n2009/04/14"] knu [label="Akinori Musha\nknu@FreeBSD.org\n2000/03/22"] -koitsu [label="Jeremy Chadwick\nkoitsu@FreeBSD.org\n2006/11/10"] -koobs [label="Kubilay Kocak\nkoobs@FreeBSD.org\n2012/12/24"] krion [label="Kirill Ponomarew\nkrion@FreeBSD.org\n2003/07/20"] kwm [label="Koop Mast\nkwm@FreeBSD.org\n2004/09/14"] -laszlof [label="Frank Laszlo\nlaszlof@FreeBSD.org\n2006/11/07"] lawrance [label="Sam Lawrance\nlawrance@FreeBSD.org\n2005/04/11\n2007/02/21"] lbartoletti [label="Loïc Bartoletti\nlbartoletti@FreeBSD.org\n2020/01/02"] -lbr [label="Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30"] lcook [label="Lewis Cook\nlcook@FreeBSD.org\n2021/01/21"] -leeym [label="Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14"] ler [label="Larry Rosenman\nler@FreeBSD.org\n2017/01/09"] leres [label="Craig Leres\nleres@FreeBSD.org\n2017/10/10"] lev [label="Lev Serebryakov\nlev@FreeBSD.org\n2003/06/17"] -lifanov [label="Nikolai Lifanov\nlifanov@FreeBSD.org\n2016/12/11"] -linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2003/10/23"] -lioux [label="Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.org\n2000/10/14"] -lippe [label="Felippe de Meirelles Motta\nlippe@FreeBSD.org\n2008/03/08"] lme [label="Lars Engels\nlme@FreeBSD.org\n2007/07/09"] -lth [label="Lars Thegler\nlth@FreeBSD.org\n2004/05/04"] lwhsu [label="Li-Wen Hsu\nlwhsu@FreeBSD.org\n2007/04/03"] -lx [label="David Thiel\nlx@FreeBSD.org\n2006/11/29"] madpilot [label="Guido Falsi\nmadpilot@FreeBSD.org\n2012/04/12"] -maho [label="Maho Nakata\nmaho@FreeBSD.org\n2002/10/17"] makc [label="Max Brazhnikov\nmakc@FreeBSD.org\n2008/08/25"] mandree [label="Matthias Andree\nmandree@FreeBSD.org\n2009/11/18"] manu [label="Emmanuel Vadot\nmanu@FreeBSD.org\n2018/09/06"] marcus [label="Joe Marcus Clarke\nmarcus@FreeBSD.org\n2002/04/05"] -marino [label="John Marino\nmarino@FreeBSD.org\n2013/07/04"] -marius [label="Marius Strobl\nmarius@FreeBSD.org\n2012/12/29"] -markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21"] martymac [label="Ganael Laplanche\nmartymac@FreeBSD.org\n2010/09/24"] mat [label="Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15"] matthew [label="Matthew Seaman\nmatthew@FreeBSD.org\n2012/02/07"] meta [label="Koichiro Iwao\nmeta@FreeBSD.org\n2018/03/19"] -mezz [label="Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30"] mfechner [label="Matthias Fechner\nmfechner@FreeBSD.org\n2018/03/01"] -mharo [label="Michael Haro\nmharo@FreeBSD.org\n1999/04/13"] mikael [label="Mikael Urankar\nmikael@FreeBSD.org\n2020/01/16"] milki [label="Jonathan Chu\nmilki@FreeBSD.org\n2013/12/15"] misha [label="Mikhail Pchelin\nmisha@FreeBSD.org\n2016/11/15"] -miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04"] mm [label="Martin Matuska\nmm@FreeBSD.org\n2007/04/04"] mmokhi [label="Mahdi Mokhtari\nmmokhi@FreeBSD.org\n2017/02/09"] -mnag [label="Marcus Alves Grando\nmnag@FreeBSD.org\n2005/09/15"] -mva [label="Marcus von Appen\nmva@FreeBSD.org\n2009/02/16"] nc [label="Neel Chauhan\nnc@FreeBSD.org\n2021/01/02"] -nemysis [label="Rusmir Dusko\nnemysis@FreeBSD.org\n2013/07/31"] -nemoliu [label="Tong Liu\nnemoliu@FreeBSD.org\n2007/04/25"] netchild [label="Alexander Leidinger\nnetchild@FreeBSD.org\n2002/03/19"] nobutaka [label="Nobutaka Mantani\nnobutaka@FreeBSD.org\n2001/11/02"] nork [label="Norikatsu Shigemura\nnork@FreeBSD.org\n2002/04/01"] novel [label="Roman Bogorodskiy\nnovel@FreeBSD.org\n2005/03/07"] -nox [label="Juergen Lock\nnox@FreeBSD.org\n2006/12/22"] -obrien [label="David E. O'Brien\nobrien@FreeBSD.org\n1996/10/29"] olivier [label="Olivier Cochard-Labbe\nolivier@FreeBSD.org\n2016/02/02"] olivierd [label="Olivier Duchateau\nolivierd@FreeBSD.org\n2012/05/29"] osa [label="Sergey A. Osokin\nosa@FreeBSD.org\n2003/06/04"] otis [label="Juraj Lutter\notis@FreeBSD.org\n2020/12/12"] -pat [label="Patrick Li\npat@FreeBSD.org\n2001/11/14"] -pav [label="Pav Lucistnik\npav@FreeBSD.org\n2003/11/12"] -pawel [label="Pawel Pekala\npawel@FreeBSD.org\n2011/03/11"] -pclin [label="Po-Chien Lin\npclin@FreeBSD.org\n2013/02/11"] pfg [label="Pedro Giffuni\npfg@FreeBSD.org\n2019/04/14"] -pgj [label="Gabor Pali\npgj@FreeBSD.org\n2009/04/12"] -pgollucci [label="Philip M. Gollucci\npgollucci@FreeBSD.org\n2008/07/21"] philip [label="Philip Paeps\nphilip@FreeBSD.org\n2005/10/19"] pi [label="Kurt Jaeger\npi@FreeBSD.org\n2014/03/14"] pizzamig [label="Luca Pizzamiglio\npizzamig@FreeBSD.org\n2017/08/25"] pkubaj [label="Piotr Kubaj\npkubaj@FreeBSD.org\n2019/04/14"] -rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23"] rakuco [label="Raphael Kubo da Costa\nrakuco@FreeBSD.org\n2011/08/22"] rene [label="Rene Ladan\nrene@FreeBSD.org\n2010/04/11"] -rezny [label="Matthew Rezny\nrezny@FreeBSD.org\n2017/01/09"] rhurlin [label="Rainer Hurling\nrhurlin@FreeBSD.org\n2020/08/31"] riggs [label="Thomas Zander\nriggs@FreeBSD.org\n2014/01/09"] rigoletto [label="Alexandre C. Guimaraes\nrigoletto@FreeBSD.org\n2018/10/01"] rm [label="Ruslan Makhmatkhanov\nrm@FreeBSD.org\n2011/11/06"] -rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/07/21"] robak [label="Bartek Rutkowski\nrobak@FreeBSD.org\n2014/06/10"] rodrigo [label="Rodrigo Osorio\nrodrigo@FreeBSD.org\n2014/01/15"] romain [label="Romain Tartiere\nromain@FreeBSD.org\n2010/01/24"] ronald [label="Ronald Klop\nronald@FreeBSD.org\n2022/10/06"] -rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2014/07/15"] -sahil [label="Sahil Tandon\nsahil@FreeBSD.org\n2010/04/11"] salvadore [label="Lorenzo Salvadore\nsalvadore@FreeBSD.org\n2020/02/21"] samm [label="Alex Samorukov\nsamm@FreeBSD.org\n2019/10/09"] -sat [label="Andrew Pantyukhin\nsat@FreeBSD.org\n2006/05/06"] sbruno [label="Sean Bruno\nsbruno@FreeBSD.org\n2014/09/14"] sbz [label="Sofian Brabez\nsbz@FreeBSD.org\n2011/03/14"] -scheidell [label="Michael Scheidell\nscheidell@FreeBSD.org\n2011/11/06"] -seanc [label="Sean Chittenden\nseanc@FreeBSD.org\n2002/08/15"] sem [label="Sergey Matveychuk\nsem@FreeBSD.org\n2004/07/07"] -sergei [label="Sergei Kolobov\nsergei@FreeBSD.org\n2003/10/21"] shaun [label="Shaun Amott\nshaun@FreeBSD.org\n2006/06/19"] -shurd [label="Stephen Hurd\nshurd@FreeBSD.org\n2014/06/14"] -simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2005/01/08"] skozlov [label="Sergey Kozlov\nskozlov@FreeBSD.org\n2018/09/21"] skreuzer [label="Steven Kreuzer\nskreuzer@FreeBSD.org\n2009/03/25"] -sperber[label="Armin Pirkovitsch\nsperber@FreeBSD.org\n2012/04/15"] -stas [label="Stanislav Sedov\nstas@FreeBSD.org\n2006/09/18"] -stefan [label="Stefan Walter\nstefan@FreeBSD.org\n2006/05/07"] stephen [label="Stephen Montgomery-Smith\nstephen@FreeBSD.org\n2011/06/13"] sunpoet [label="Po-Chuan Hsieh\nsunpoet@FreeBSD.org\n2010/09/21"] swills [label="Steve Wills\nswills@FreeBSD.org\n2010/09/03"] -sylvio [label="Sylvio Cesar Teixeira\nsylvio@FreeBSD.org\n2009/10/29"] -tabthorpe [label="Thomas Abthorpe\ntabthorpe@FreeBSD.org\n2007/08/20"] tagattie [label="Hiroki Tagato\ntagattie@FreeBSD.org\n2020/04/01"] tcberner [label="Tobias C. Berner\ntcberner@FreeBSD.org\n2016/07/06"] tdb [label="Tim Bishop\ntdb@FreeBSD.org\n2005/11/30"] thierry [label="Thierry Thomas\nthierry@FreeBSD.org\n2004/03/15"] tijl [label="Tijl Coosemans\ntijl@FreeBSD.org\n2013/03/27"] timur [label="Timur Bakeyev\ntimur@FreeBSD.org\n2007/06/07"] -tj [label="Tom Judge\ntj@FreeBSD.org\n2012/05/28"] -tmclaugh [label="Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09/15"] tobik [label="Tobias Kortkamp\ntobik@FreeBSD.org\n2017/02/08"] tota [label="TAKATSU Tomonari\ntota@FreeBSD.org\n2009/03/30"] -trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007/04/12"] trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2004/07/06"] trociny [label="Mikolaj Golub\ntrociny@FreeBSD.org\n2013/10/17"] tz [label="Torsten Zuehlsdorff\ntz@FreeBSD.org\n2016/06/04"] ultima [label="Richard Gallamore\nultima@FreeBSD.org\n2017/06/07"] uqs [label="Ulrich Spoerlein\nuqs@FreeBSD.org\n2012/01/19"] vd [label="Vasil Dimov\nvd@FreeBSD.org\n2006/01/19"] -vg [label="Veniamin Gvozdikov\nvg@FreeBSD.org\n2013/06/11"] vishwin [label="Charlie Li\nvishwin@FreeBSD.org\n2021/04/29"] vsevolod [label="Vsevolod Stakhov\nvsevolod@FreeBSD.org\n2005/07/22"] wen [label="Wen Heping\nwen@FreeBSD.org\n2010/12/13"] -wg [label="William Grzybowski\nwg@FreeBSD.org\n2013/04/01"] woodsb02 [label="Ben Woods\nwoodsb02@FreeBSD.org\n2016/05/09"] -wxs [label="Wesley Shields\nwxs@FreeBSD.org\n2008/01/03"] -xmj [label="Johannes Jost Meixner\nxmj@FreeBSD.org\n2014/04/07"] xride [label="Soeren Straarup\nxride@FreeBSD.org\n2006/09/27"] yasu [label="Yasuhiro Kimura\nyasu@FreeBSD.org\n2021/08/27"] ygy [label="Guangyuan Yang\nygy@FreeBSD.org\n2021/05/17"] yuri [label="Yuri Victorovich\nyuri@FreeBSD.org\n2017/10/30"] -yzlin [label="Yi-Jheng Lin\nyzlin@FreeBSD.org\n2009/07/19"] -zeising [label="Niclas Zeising\nzeising@FreeBSD.org\n2012/07/03"] zi [label="Ryan Steinmetz\nzi@FreeBSD.org\n2011/07/14"] zirias [label="Felix Palmen\nzirias@FreeBSD.org\n2022/08/02"] -znerd [label="Ernst de Haan\nznerd@FreeBSD.org\n2001/11/15"] # Here are the mentor/mentee relationships. # Group together all the mentees for a particular mentor. From nobody Thu Mar 30 12:30: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 4PnN7T3pJ3z42wb5; Thu, 30 Mar 2023 12:31:01 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (heemeyer.club [195.93.173.158]) (using TLSv1.3 with cipher TLS_AES_256_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 4PnN7S74kRz3NV1; Thu, 30 Mar 2023 12:31:00 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.1/8.16.1) with ESMTP id 32UCUpej014264; Thu, 30 Mar 2023 15:30:51 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.1/8.16.1/Submit) id 32UCUp9U014263; Thu, 30 Mar 2023 15:30:51 +0300 (MSK) (envelope-from dchagin) Date: Thu, 30 Mar 2023 15:30:51 +0300 From: Dmitry Chagin To: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 5faf90050e6c - main - committers-ports.dot: Bring file up to date. Message-ID: References: <202303301222.32UCMbFN065031@gitrepo.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=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <202303301222.32UCMbFN065031@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4PnN7S74kRz3NV1 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Thu, Mar 30, 2023 at 12:22:37PM +0000, Fernando Apesteguía wrote: > The branch main has been updated by fernape: > > URL: https://cgit.FreeBSD.org/src/commit/?id=5faf90050e6c280c314bca58ee61707d8bfdbaf3 > > commit 5faf90050e6c280c314bca58ee61707d8bfdbaf3 > Author: Fernando Apesteguía > AuthorDate: 2023-03-30 10:03:00 +0000 > Commit: Fernando Apesteguía > CommitDate: 2023-03-30 12:17:10 +0000 > > committers-ports.dot: Bring file up to date. > > Many listed committers are actually alumni. > > Related to this change: 52f576459855 > > Approved by: bcr@ > Differential Revision: https://reviews.freebsd.org/D39340 > --- > share/misc/committers-ports.dot | 208 ++++++++++++++++++++-------------------- > 1 file changed, 104 insertions(+), 104 deletions(-) > > diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot > index 93e7a3f97827..ab6bd8385fe7 100644 > --- a/share/misc/committers-ports.dot > +++ b/share/misc/committers-ports.dot > @@ -29,63 +29,145 @@ node [color=grey62, style=filled, bgcolor=black]; > > # Alumni go here.. Try to keep things sorted. > > +ache [label="Andrey Chernov\nache@FreeBSD.org\n1994/11/15\n2017/08/17"] > +ahze [label="Michael Johnson\nahze@FreeBSD.org\n2004/10/29\n2013/12/02"] > +alexbl [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] > +alonso [label="Alonso Schaich\nalonso@FreeBSD.org\n2014/08/14\n2017/08/07"] > +anray [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] alexbl@ Alexandr Botero > +araujo [label="Marcelo Araujo\naraujo@FreeBSD.org\n2007/04/26\n2020/11/03"] > asami [label="Satoshi Asami\nasami@FreeBSD.org\n1994/11/18\n2001/09/11"] > +avilla [label="Alberto Villa\navilla@FreeBSD.org\n2010/01/24\n2018/10/01"] > +avl [label="Alexander Logvinov\navl@FreeBSD.org\n2009/05/27\n2013/12/02"] > +az [label="Andrej Zverev\naz@FreeBSD.org\n2005/10/03\n2019/11/04"] > +bar [label="Barbara Guida\nbar@FreeBSD.org\n2012/11/25\n2022/12/05"] > +beech [label="Beech Rintoul\nbeech@FreeBSD.org\n2007/05/30\n2014/01/10"] > +bf [label="Brendan Fabeny\nbf@FreeBSD.org\n2010/06/02\n2017/04/29"] > billf [label="Bill Fumerola\nbillf@FreeBSD.org\n1998/11/11\n2006/12/14"] > +brix [label="Henrik Brix Andersen\nbrix@FreeBSD.org\n2007/10/31\n2015/08/26"] > +bsam [label="Boris Samorodov\nbsam@FreeBSD.org\n2006/07/20\n2022/06/06"] > +chinsan [label="Chinsan Huang\nchinsan@FreeBSD.org\n2007/06/12\n2013/08/17"] > +clement [label="Clement Laforet\nclement@FreeBSD.org\n2003/12/17\n2013/08/18"] > +clsung [label="Cheng-Lung Sung\nclsung@FreeBSD.org\n2004/8/18\n2015/06/11"] > +culot [label="Frederic Culot\nculot@FreeBSD.org\n2010/10/16\n2021/09/06"] > +daichi [label="Daichi Goto\ndaichi@FreeBSD.org\n2002/10/17\n2018/06/01"] > +dhn [label="Dennis Herrmann\ndhn@FreeBSD.org\n2009/03/03\n2015/06/11"] > +dryice [label="Dryice Dong Liu\ndryice@FreeBSD.org\n2006/12/25\n2018/11/06"] > +dteske [label="Devin Teske\ndteske@FreeBSD.org\n2018/03/01\n2019/11/05"] > +edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2002/10/22\n2016/11/16"] > +eik [label="Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12\n2006/12/14"] > +erwin [label="Erwin Lansing\nerwin@FreeBSD.org\n2003/06/04\n2016/10/12"] > +fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06\n2021/12/06"] > +flz [label="Florent Thoumie\nflz@FreeBSD.org\n2005/03/01\n2014/10/17"] > +gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2006/12/05\n2019/09/02"] > +gblach [label="Grzegorz Blach\ngblach@FreeBSD.org\n2012/11/03\n2020/08/03"] > +glarkin [label="Greg Larkin\nglarkin@FreeBSD.org\n2008/07/17\n2014/06/04"] > +gnn [label="George Neville-Neil\ngnn@FreeBSD.org\n2013/09/04\n2020/06/02"] > +gordon [label="Gordon Tetlow\ngordon@FreeBSD.org\n2014/10/14\n2019/04/08"] > +hq [label="Herve Quiroz\nhq@FreeBSD.org\n2004/08/05\n2014/03/02"] > +ijliao [label="Ying-Chieh Liao\nijliao@FreeBSD.org\n2001/01/20\n2011/01/02"] > +itetcu [label="Ion-Mihai Tetcu\nitetcu@FreeBSD.org\n2006/06/07\n2018/11/06"] > +jacula [label="Giuseppe Pilichi\njacula@FreeBSD.org\n2010/04/05\n2011/10/14"] > +jadawin [label="Philippe Audeoud\njadawin@FreeBSD.org\n2008/03/02\n2020/10/05"] > +jlaffaye [label="Julien Laffaye\njlaffaye@FreeBSD.org\n2011/06/06\n2021/06/07"] > jmallett [label="Juli Mallett\njmallett@FreeBSD.org\n2003/01/16\n2006/08/10"] > +jmelo [label="Jean Milanez Melo\njmelo@FreeBSD.org\n2006/03/31\n2013/08/18"] > +johans [label="Johan Selst\njohans@FreeBSD.org\n2006/04/01\n2019/11/04"] > +jsa [label="Joseph S. Atkinson\njsa@FreeBSD.org\n2010/07/15"] > +junovitch [label="Jason Unovitch\njunovitch@FreeBSD.org\n2015/07/27\n2018/01/04"] > +jylefort [label="Jean-Yves Lefort\njylefort@FreeBSD.org\n2008/04/24"] > +kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2003/02/21\n2020/09/07"] > +kmoore [label="Kris Moore\nkmoore@FreeBSD.org\n2009/04/14\n2021/05/04"] > +koitsu [label="Jeremy Chadwick\nkoitsu@FreeBSD.org\n2006/11/10\n2008/08/18"] > +koobs [label="Kubilay Kocak\nkoobs@FreeBSD.org\n2012/12/24\n2022/03/07"] > +laszlof [label="Frank Laszlo\nlaszlof@FreeBSD.org\n2006/11/07\n2010/07/05"] > +lbr [label="Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30"] > +leeym [label="Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14\n2017/01/02"] > +lifanov [label="Nikolai Lifanov\nlifanov@FreeBSD.org\n2016/12/11\n2021/05/04"] > +linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2003/10/23\n2022/05/05"] > +lioux [label="Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.org\n2015/10/14\n2015/10/14"] > +lippe [label="Felippe de Meirelles Motta\nlippe@FreeBSD.org\n2015/14/10\n2015/10/14"] > +lth [label="Lars Thegler\nlth@FreeBSD.org\n2004/05/04\n2018/10/07"] > +lx [label="David Thiel\nlx@FreeBSD.org\n2006/11/29"] > +maho [label="Maho Nakata\nmaho@FreeBSD.org\n2002/10/17\n2018/03/11"] > marcel [label="Marcel Moolenaar\nmarcel@FreeBSD.org\n1999/07/03\n2007/07/01"] > -sobomax[label="Maxim Sobolev\nsobomax@FreeBSD.org\n2000/05/17\n2018/12/03"] > -steve [label="Steve Price\nsteve@FreeBSD.org\nxxxx/xx/xx\nxxxx/xx/xx"] > +marino [label="John Marino\nmarino@FreeBSD.org\n2013/07/04\n2017/02/10"] > +marius [label="Marius Strobl\nmarius@FreeBSD.org\n2012/12/29\n2023/02/07"] > +markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21\n2011/07/05"] > +mezz [label="Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30"] > +mharo [label="Michael Haro\nmharo@FreeBSD.org\n1999/04/13\n2007/09/01"] > +miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04\n2021/05/04"] > +mnag [label="Marcus Alves Grando\nmnag@FreeBSD.org\n2005/09/15\n2012/02/01"] > +mva [label="Marcus von Appen\nmva@FreeBSD.org\n2009/02/16\n2017/01/22"] > +nemoliu [label="Tong Liu\nnemoliu@FreeBSD.org\n2007/04/25\n2011/09/15"] > +nemysis [label="Rusmir Dusko\nnemysis@FreeBSD.org\n2013/07/31\n2018/09/03"] > +nox [label="Juergen Lock\nnox@FreeBSD.org\n2006/12/22"] > +obrien [label="David E. O'Brien\nobrien@FreeBSD.org\n1996/10/29\n2015/06/11"] > +pat [label="Patrick Li\npat@FreeBSD.org\n2001/11/14\n2008/02/08"] > +pav [label="Pav Lucistnik\npav@FreeBSD.org\n2003/11/12\n2013/12/20"] > +pawel [label="Pawel Pekala\npawel@FreeBSD.org\n2011/03/11\n2018/02/24"] > +pclin [label="Po-Chien Lin\npclin@FreeBSD.org\n2013/02/11\n2014/10/17"] > +pgj [label="Gabor Pali\npgj@FreeBSD.org\n2009/04/12\n2018/11/06\n2018/11/06"] > +pgollucci [label="Philip M. Gollucci\npgollucci@FreeBSD.org\n2008/07/21\n2017/03/29"] > +rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23\n2015/01/21"] > +rezny [label="Matthew Rezny\nrezny@FreeBSD.org\n2017/01/09\n2019/02/04"] > +rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/07/21\n2011/07/05"] > +rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2014/07/15\n2017/08/20"] > +sahil [label="Sahil Tandon\nsahil@FreeBSD.org\n2010/04/11"] > +sat [label="Andrew Pantyukhin\nsat@FreeBSD.org\n2006/05/06\n2009/07/17"] > +scheidell [label="Michael Scheidell\nscheidell@FreeBSD.org\n2011/11/06\n2013/03/19"] > +seanc [label="Sean Chittenden\nseanc@FreeBSD.org\n2002/08/15\n2007/09/01"] > +sergei [label="Sergei Kolobov\nsergei@FreeBSD.org\n2003/10/21\n2011/09/15"] > +shurd [label="Stephen Hurd\nshurd@FreeBSD.org\n2014/06/14\n2021/06/07"] > +simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2005/01/08\n2015/10/14"] > +sobomax [label="Maxim Sobolev\nsobomax@FreeBSD.org\n2000/05/17\n2018/12/03"] > +sperber [label="Armin Pirkovitsch\nsperber@FreeBSD.org\n2012/04/15"] > +stas [label="Stanislav Sedov\nstas@FreeBSD.org\n2006/09/18\n2011/11/05"] > +stefan [label="Stefan Walter\nstefan@FreeBSD.org\n2006/05/07"] > +steve [label="Steve Price\nsteve@FreeBSD.org\n2003/02/06\n2012/04/03"] > +sylvio [label="Sylvio Cesar Teixeira\nsylvio@FreeBSD.org\n2009/10/29\n2014/10/17"] > +tabthorpe [label="Thomas Abthorpe\ntabthorpe@FreeBSD.org\n2007/08/20\n2018/02/23"] > +tj [label="Tom Judge\ntj@FreeBSD.org\n2012/05/28\n2018/11/06"] > +tmclaugh [label="Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09/15\n2011/04/16"] > +trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007/04/12\n2022/06/06"] > +vg [label="Veniamin Gvozdikov\nvg@FreeBSD.org\n2013/06/11\n2018/02/23"] > +wg [label="William Grzybowski\nwg@FreeBSD.org\n2013/04/01\n2022/06/06"] > will [label="Will Andrews\nwill@FreeBSD.org\n2000/03/20\n2006/09/01"] > +wxs [label="Wesley Shields\nwxs@FreeBSD.org\n2008/01/03\n2018/03/11"] > +xmj [label="Johannes Jost Meixner\nxmj@FreeBSD.org\n2014/04/07\n2015/07/01"] > +yzlin [label="Yi-Jheng Lin\nyzlin@FreeBSD.org\n2009/07/19\n2013/08/17"] > +zeising [label="Niclas Zeising\nzeising@FreeBSD.org\n2012/07/03\n2022/05/02"] > +znerd [label="Ernst de Haan\nznerd@FreeBSD.org\n2001/11/15\n2006/09/14"] > > node [color=lightblue2, style=filled, bgcolor=black]; > > # Current ports committers go here. Try to keep things sorted. > > "0mp" [label="Mateusz Piotrowski\n0mp@FreeBSD.org\n2018/06/16"] > -ache [label="Andrey Chernov\nache@FreeBSD.org\n1994/11/15"] > acm [label="Jose Alonso Cardenas Marquez\nacm@FreeBSD.org\n2006/07/18"] > adamw [label="Adam Weinberger\nadamw@FreeBSD.org\n2002/10/16"] > adridg [label="Adriaan de Groot\nadridg@FreeBSD.org\n2017/09/08"] > -ahze [label="Michael Johnson\nahze@FreeBSD.org\n2004/10/29"] > ak [label="Alex Kozlov\nak@FreeBSD.org\n2012/02/29"] > ale [label="Alex Dupre\nale@FreeBSD.org\n2004/01/12"] > alepulver [label="Alejandro Pulver\nalepulver@FreeBSD.org\n2006/04/01"] > -alexbl [label="Alexander Botero-Lowry\nalexbl@FreeBSD.org\n2006/09/11"] > alexey [label="Alexey Degtyarev\nalexey@FreeBSD.org\n2013/11/09"] > -alonso [label="Alonso Schaich\nalonso@FreeBSD.org\n2014/08/14"] > amdmi3 [label="Dmitry Marakasov\namdmi3@FreeBSD.org\n2008/06/19"] > -anray [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11"] > antoine [label="Antoine Brodin\nantoine@FreeBSD.org\n2013/04/03"] > -araujo [label="Marcelo Araujo\naraujo@FreeBSD.org\n2007/04/26"] > arrowd [label="Gleb Popov\narrowd@FreeBSD.org\n2018/05/18"] > arved [label="Tilman Linneweh\narved@FreeBSD.org\n2002/10/15"] > ashish [label="Ashish SHUKLA\nashish@FreeBSD.org\n2010/06/10"] > -avilla [label="Alberto Villa\navilla@FreeBSD.org\n2010/01/24"] > -avl [label="Alexander Logvinov\navl@FreeBSD.org\n2009/05/27"] > -az [label="Andrej Zverev\naz@FreeBSD.org\n2005/10/03"] > bapt [label="Baptiste Daroussin\nbapt@FreeBSD.org\n2010/07/27"] > -bar [label="Barbara Guida\nbar@FreeBSD.org\n2012/11/25"] > bdrewery [label="Bryan Drewery\nbdrewery@FreeBSD.org\n2012/07/31"] > beat [label="Beat Gaetzi\nbeat@FreeBSD.org\n2009/01/28"] > -beech [label="Beech Rintoul\nbeech@FreeBSD.org\n2007/05/30"] > -bf [label="Brendan Fabeny\nbf@FreeBSD.org\n2010/06/02"] > bland [label="Alexander Nedotsukov\nbland@FreeBSD.org\n2003/08/14"] > bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2000/08/23"] > bofh [label="Muhammad Moinur Rahman\nbofh@FreeBSD.org\n2014/12/23"] > brnrd [label="Bernard Spil\nbrnrd@FreeBSD.org\n2015/05/24"] > -brix [label="Henrik Brix Andersen\nbrix@FreeBSD.org\n2007/10/31"] > brooks [label="Brooks Davies\nbrooks@FreeBSD.org\n2004/05/03"] > -bsam [label="Boris Samorodov\nbsam@FreeBSD.org\n2006/07/20"] > -chinsan [label="Chinsan Huang\nchinsan@FreeBSD.org\n2007/06/12"] > -clement [label="Clement Laforet\nclement@FreeBSD.org\n2003/12/17"] > -clsung [label="Cheng-Lung Sung\nclsung@FreeBSD.org\n2004/8/18"] > cmt [label="Christoph Moench-Tegeder\ncmt@FreeBSD.org\n2016/03/01"] > cperciva [label="Colin Percival\ncperciva@FreeBSD.org\n2006/01/31"] > crees [label="Chris Rees\ncrees@FreeBSD.org\n2011/06/11"] > cs [label="Carlo Strub\ncs@FreeBSD.org\n2011/09/13"] > -culot [label="Frederic Culot\nculot@FreeBSD.org\n2010/10/16"] > cy [label="Cy Schubert\ncy@FreeBSD.org\n2001/11/13"] > -daichi [label="Daichi Goto\ndaichi@FreeBSD.org\n2002/10/17"] > danfe [label="Alexey Dokuchaev\ndanfe@FreeBSD.org\n2004/08/20"] > danilo [label="Danilo E. Gondolfo\ndanilo@FreeBSD.org\n2013/09/23"] > db [label="Diane Bruce\ndb@FreeBSD.org\n2007/01/18"] > @@ -95,214 +177,132 @@ dch [label="Dave Cottlehuber\ndch@FreeBSD.org\n2017/09/09"] > decke [label="Bernhard Froehlich\ndecke@FreeBSD.org\n2010/03/21"] > delphij [label="Xin Li\ndelphij@FreeBSD.org\n2006/05/01"] > demon [label="Dmitry Sivachenko\ndemon@FreeBSD.org\n2000/11/13"] > -dhn [label="Dennis Herrmann\ndhn@FreeBSD.org\n2009/03/03"] > diizzy [label="Daniel Engberg\ndiizzy@FreeBSD.org\n2021/07/06"] > dmgk [label="Dmitri Goutnik\ndmgk@FreeBSD.org\n2019/09/15"] > driesm [label="Dries Michiels\ndriesm@FreeBSD.org\n2021/11/06"] > -dryice [label="Dryice Dong Liu\ndryice@FreeBSD.org\n2006/12/25"] > -dteske [label="Devin Teske\ndteske@FreeBSD.org\n2018/03/01"] > dumbbell [label="Jean-Sebastien Pedron\ndumbbell@FreeBSD.org\n2017/01/10"] > dvl [label="Dan Langille\ndvl@FreeBSD.org\n2014/08/10"] > eadler [label="Eitan Adler\neadler@FreeBSD.org\n2011/08/17"] > eduardo [label="Nuno Teixeira\neduardo@FreeBSD.org\n2021/01/27"] > -edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2002/10/22"] > egypcio [label="Vinícius Zavam\negypcio@FreeBSD.org\n2018/10/04"] > ehaupt [label="Emanuel Haupt\nehaupt@FreeBSD.org\n2005/10/03"] > -eik [label="Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12"] > ericbsd [label="Eric Turgeon\nericbsd@FreeBSD.org\n2018/03/17"] > -erwin [label="Erwin Lansing\nerwin@FreeBSD.org\n2003/06/04"] > eugen [label="Eugene Grosbein\neugen@FreeBSD.org\n2017/03/04"] > farrokhi [label="Babak Farrokhi\nfarrokhi@FreeBSD.org\n2006/11/07"] > feld [label="Mark Felder\nfeld@FreeBSD.org\n2013/06/25"] > fernape [label="Fernando Apesteguia\nfernape@FreeBSD.org\n2018/03/03"] > -fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06"] > flo [label="Florian Smeets\nflo@FreeBSD.org\n2010/12/07"] > fluffy [label="Dima Panov\nfluffy@FreeBSD.org\n2009/08/10"] > -flz [label="Florent Thoumie\nflz@FreeBSD.org\n2005/03/01"] > fuz [label="Robert Clausecker\nfuz@FreeBSD.org\n2023/02/02"] > -gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2006/12/05"] > gahr [label="Pietro Cerutti\ngahr@FreeBSD.org\n2008/02/20"] > garga [label="Renato Botelho\ngarga@FreeBSD.org\n2005/07/11"] > -gblach [label="Grzegorz Blach\ngblach@FreeBSD.org\n2012/11/03"] > gerald [label="Gerald Pfeifer\ngerald@FreeBSD.org\n2002/04/03"] > gjb [label="Glen Barber\ngjb@FreeBSD.org\n2012/06/19"] > -glarkin [label="Greg Larkin\nglarkin@FreeBSD.org\n2008/07/17"] > glewis [label="Greg Lewis\nglewis@FreeBSD.org\n2002/04/08"] > -gordon [label="Gordon Tetlow\ngordon@FreeBSD.org\n2014/10/14"] > grembo [label="Michael Gmelin\ngrembo@FreeBSD.org\n2014/01/21"] > -gnn [label="George Neville-Neil\ngnn@FreeBSD.org\n2013/09/04"] > -hq [label="Herve Quiroz\nhq@FreeBSD.org\n2004/08/05"] > hrs [label="Hiroki Sato\nhrs@FreeBSD.org\n2004/04/10"] > -ijliao [label="Ying-Chieh Liao\nijliao@FreeBSD.org\n2001/01/20"] > -itetcu [label="Ion-Mihai Tetcu\nitetcu@FreeBSD.org\n2006/06/07"] > -jacula [label="Giuseppe Pilichi\njacula@FreeBSD.org\n2010/04/05"] > -jadawin [label="Philippe Audeoud\njadawin@FreeBSD.org\n2008/03/02"] > jase [label="Jase Thew\njase@FreeBSD.org\n2012/05/30"] > jbeich [label="Jan Beich\njbeich@FreeBSD.org\n2015/01/19"] > jgh [label="Jason Helfman\njgh@FreeBSD.org\n2011/12/16"] > jhale [label="Jason E. Hale\njhale@FreeBSD.org\n2012/09/10"] > jhixson [label="John Hixson\njhixson@FreeBSD.org\n2018/07/16"] > jkim [label="Jung-uk Kim\njkim@FreeBSD.org\n2007/09/12"] > -jlaffaye [label="Julien Laffaye\njlaffaye@FreeBSD.org\n2011/06/06"] > jmd [label="Johannes M. Dieterich\njmd@FreeBSD.org\n2017/01/09"] > -jmelo [label="Jean Milanez Melo\njmelo@FreeBSD.org\n2006/03/31"] > -joneum [label="Jochen Neumeister\njoneum@FreeBSD.org\n2017/05/11"] > joerg [label="Joerg Wunsch\njoerg@FreeBSD.org\n1994/08/22"] > -johans [label="Johan Selst\njohans@FreeBSD.org\n2006/04/01"] > +joneum [label="Jochen Neumeister\njoneum@FreeBSD.org\n2017/05/11"] > josef [label="Josef El-Rayes\njosef@FreeBSD.org\n2004/12/20"] > jpaetzel [label="Josh Paetzel\njpaetzel@FreeBSD.org\n2008/09/05"] > jrm [label="Joseph R. Mingrone\njrm@FreeBSD.org\n2016/09/17"] > -jsa [label="Joseph S. Atkinson\njsa@FreeBSD.org\n2010/07/15"] > jsm [label="Jesper Schmitz Mouridsen\njsm@FreeBSD.org\n2018/06/30"] > -junovitch [label="Jason Unovitch\njunovitch@FreeBSD.org\n2015/07/27"] > -jylefort [label="Jean-Yves Lefort\njylefort@FreeBSD.org\n2005/04/12"] > kai [label="Kai Knoblich\nkai@FreeBSD.org\n2019/02/01"] > kami [label="Dominic Fandrey\nkami@FreeBSD.org\n2014/09/09"] > kbowling [label="Kevin Bowling\nkbowling@FreeBSD.org\n2018/09/02"] > kevans [label="Kyle Evans\nkevans@FreeBSD.org\n2020/02/14"] > -kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2003/02/21"] > -kmoore [label="Kris Moore\nkmoore@FreeBSD.org\n2009/04/14"] > knu [label="Akinori Musha\nknu@FreeBSD.org\n2000/03/22"] > -koitsu [label="Jeremy Chadwick\nkoitsu@FreeBSD.org\n2006/11/10"] > -koobs [label="Kubilay Kocak\nkoobs@FreeBSD.org\n2012/12/24"] > krion [label="Kirill Ponomarew\nkrion@FreeBSD.org\n2003/07/20"] > kwm [label="Koop Mast\nkwm@FreeBSD.org\n2004/09/14"] > -laszlof [label="Frank Laszlo\nlaszlof@FreeBSD.org\n2006/11/07"] > lawrance [label="Sam Lawrance\nlawrance@FreeBSD.org\n2005/04/11\n2007/02/21"] > lbartoletti [label="Loïc Bartoletti\nlbartoletti@FreeBSD.org\n2020/01/02"] > -lbr [label="Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30"] > lcook [label="Lewis Cook\nlcook@FreeBSD.org\n2021/01/21"] > -leeym [label="Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14"] > ler [label="Larry Rosenman\nler@FreeBSD.org\n2017/01/09"] > leres [label="Craig Leres\nleres@FreeBSD.org\n2017/10/10"] > lev [label="Lev Serebryakov\nlev@FreeBSD.org\n2003/06/17"] > -lifanov [label="Nikolai Lifanov\nlifanov@FreeBSD.org\n2016/12/11"] > -linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2003/10/23"] > -lioux [label="Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.org\n2000/10/14"] > -lippe [label="Felippe de Meirelles Motta\nlippe@FreeBSD.org\n2008/03/08"] > lme [label="Lars Engels\nlme@FreeBSD.org\n2007/07/09"] > -lth [label="Lars Thegler\nlth@FreeBSD.org\n2004/05/04"] > lwhsu [label="Li-Wen Hsu\nlwhsu@FreeBSD.org\n2007/04/03"] > -lx [label="David Thiel\nlx@FreeBSD.org\n2006/11/29"] > madpilot [label="Guido Falsi\nmadpilot@FreeBSD.org\n2012/04/12"] > -maho [label="Maho Nakata\nmaho@FreeBSD.org\n2002/10/17"] > makc [label="Max Brazhnikov\nmakc@FreeBSD.org\n2008/08/25"] > mandree [label="Matthias Andree\nmandree@FreeBSD.org\n2009/11/18"] > manu [label="Emmanuel Vadot\nmanu@FreeBSD.org\n2018/09/06"] > marcus [label="Joe Marcus Clarke\nmarcus@FreeBSD.org\n2002/04/05"] > -marino [label="John Marino\nmarino@FreeBSD.org\n2013/07/04"] > -marius [label="Marius Strobl\nmarius@FreeBSD.org\n2012/12/29"] > -markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21"] > martymac [label="Ganael Laplanche\nmartymac@FreeBSD.org\n2010/09/24"] > mat [label="Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15"] > matthew [label="Matthew Seaman\nmatthew@FreeBSD.org\n2012/02/07"] > meta [label="Koichiro Iwao\nmeta@FreeBSD.org\n2018/03/19"] > -mezz [label="Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30"] > mfechner [label="Matthias Fechner\nmfechner@FreeBSD.org\n2018/03/01"] > -mharo [label="Michael Haro\nmharo@FreeBSD.org\n1999/04/13"] > mikael [label="Mikael Urankar\nmikael@FreeBSD.org\n2020/01/16"] > milki [label="Jonathan Chu\nmilki@FreeBSD.org\n2013/12/15"] > misha [label="Mikhail Pchelin\nmisha@FreeBSD.org\n2016/11/15"] > -miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04"] > mm [label="Martin Matuska\nmm@FreeBSD.org\n2007/04/04"] > mmokhi [label="Mahdi Mokhtari\nmmokhi@FreeBSD.org\n2017/02/09"] > -mnag [label="Marcus Alves Grando\nmnag@FreeBSD.org\n2005/09/15"] > -mva [label="Marcus von Appen\nmva@FreeBSD.org\n2009/02/16"] > nc [label="Neel Chauhan\nnc@FreeBSD.org\n2021/01/02"] > -nemysis [label="Rusmir Dusko\nnemysis@FreeBSD.org\n2013/07/31"] > -nemoliu [label="Tong Liu\nnemoliu@FreeBSD.org\n2007/04/25"] > netchild [label="Alexander Leidinger\nnetchild@FreeBSD.org\n2002/03/19"] > nobutaka [label="Nobutaka Mantani\nnobutaka@FreeBSD.org\n2001/11/02"] > nork [label="Norikatsu Shigemura\nnork@FreeBSD.org\n2002/04/01"] > novel [label="Roman Bogorodskiy\nnovel@FreeBSD.org\n2005/03/07"] > -nox [label="Juergen Lock\nnox@FreeBSD.org\n2006/12/22"] > -obrien [label="David E. O'Brien\nobrien@FreeBSD.org\n1996/10/29"] > olivier [label="Olivier Cochard-Labbe\nolivier@FreeBSD.org\n2016/02/02"] > olivierd [label="Olivier Duchateau\nolivierd@FreeBSD.org\n2012/05/29"] > osa [label="Sergey A. Osokin\nosa@FreeBSD.org\n2003/06/04"] > otis [label="Juraj Lutter\notis@FreeBSD.org\n2020/12/12"] > -pat [label="Patrick Li\npat@FreeBSD.org\n2001/11/14"] > -pav [label="Pav Lucistnik\npav@FreeBSD.org\n2003/11/12"] > -pawel [label="Pawel Pekala\npawel@FreeBSD.org\n2011/03/11"] > -pclin [label="Po-Chien Lin\npclin@FreeBSD.org\n2013/02/11"] > pfg [label="Pedro Giffuni\npfg@FreeBSD.org\n2019/04/14"] > -pgj [label="Gabor Pali\npgj@FreeBSD.org\n2009/04/12"] > -pgollucci [label="Philip M. Gollucci\npgollucci@FreeBSD.org\n2008/07/21"] > philip [label="Philip Paeps\nphilip@FreeBSD.org\n2005/10/19"] > pi [label="Kurt Jaeger\npi@FreeBSD.org\n2014/03/14"] > pizzamig [label="Luca Pizzamiglio\npizzamig@FreeBSD.org\n2017/08/25"] > pkubaj [label="Piotr Kubaj\npkubaj@FreeBSD.org\n2019/04/14"] > -rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23"] > rakuco [label="Raphael Kubo da Costa\nrakuco@FreeBSD.org\n2011/08/22"] > rene [label="Rene Ladan\nrene@FreeBSD.org\n2010/04/11"] > -rezny [label="Matthew Rezny\nrezny@FreeBSD.org\n2017/01/09"] > rhurlin [label="Rainer Hurling\nrhurlin@FreeBSD.org\n2020/08/31"] > riggs [label="Thomas Zander\nriggs@FreeBSD.org\n2014/01/09"] > rigoletto [label="Alexandre C. Guimaraes\nrigoletto@FreeBSD.org\n2018/10/01"] > rm [label="Ruslan Makhmatkhanov\nrm@FreeBSD.org\n2011/11/06"] > -rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/07/21"] > robak [label="Bartek Rutkowski\nrobak@FreeBSD.org\n2014/06/10"] > rodrigo [label="Rodrigo Osorio\nrodrigo@FreeBSD.org\n2014/01/15"] > romain [label="Romain Tartiere\nromain@FreeBSD.org\n2010/01/24"] > ronald [label="Ronald Klop\nronald@FreeBSD.org\n2022/10/06"] > -rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2014/07/15"] > -sahil [label="Sahil Tandon\nsahil@FreeBSD.org\n2010/04/11"] > salvadore [label="Lorenzo Salvadore\nsalvadore@FreeBSD.org\n2020/02/21"] > samm [label="Alex Samorukov\nsamm@FreeBSD.org\n2019/10/09"] > -sat [label="Andrew Pantyukhin\nsat@FreeBSD.org\n2006/05/06"] > sbruno [label="Sean Bruno\nsbruno@FreeBSD.org\n2014/09/14"] > sbz [label="Sofian Brabez\nsbz@FreeBSD.org\n2011/03/14"] > -scheidell [label="Michael Scheidell\nscheidell@FreeBSD.org\n2011/11/06"] > -seanc [label="Sean Chittenden\nseanc@FreeBSD.org\n2002/08/15"] > sem [label="Sergey Matveychuk\nsem@FreeBSD.org\n2004/07/07"] > -sergei [label="Sergei Kolobov\nsergei@FreeBSD.org\n2003/10/21"] > shaun [label="Shaun Amott\nshaun@FreeBSD.org\n2006/06/19"] > -shurd [label="Stephen Hurd\nshurd@FreeBSD.org\n2014/06/14"] > -simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2005/01/08"] > skozlov [label="Sergey Kozlov\nskozlov@FreeBSD.org\n2018/09/21"] > skreuzer [label="Steven Kreuzer\nskreuzer@FreeBSD.org\n2009/03/25"] > -sperber[label="Armin Pirkovitsch\nsperber@FreeBSD.org\n2012/04/15"] > -stas [label="Stanislav Sedov\nstas@FreeBSD.org\n2006/09/18"] > -stefan [label="Stefan Walter\nstefan@FreeBSD.org\n2006/05/07"] > stephen [label="Stephen Montgomery-Smith\nstephen@FreeBSD.org\n2011/06/13"] > sunpoet [label="Po-Chuan Hsieh\nsunpoet@FreeBSD.org\n2010/09/21"] > swills [label="Steve Wills\nswills@FreeBSD.org\n2010/09/03"] > -sylvio [label="Sylvio Cesar Teixeira\nsylvio@FreeBSD.org\n2009/10/29"] > -tabthorpe [label="Thomas Abthorpe\ntabthorpe@FreeBSD.org\n2007/08/20"] > tagattie [label="Hiroki Tagato\ntagattie@FreeBSD.org\n2020/04/01"] > tcberner [label="Tobias C. Berner\ntcberner@FreeBSD.org\n2016/07/06"] > tdb [label="Tim Bishop\ntdb@FreeBSD.org\n2005/11/30"] > thierry [label="Thierry Thomas\nthierry@FreeBSD.org\n2004/03/15"] > tijl [label="Tijl Coosemans\ntijl@FreeBSD.org\n2013/03/27"] > timur [label="Timur Bakeyev\ntimur@FreeBSD.org\n2007/06/07"] > -tj [label="Tom Judge\ntj@FreeBSD.org\n2012/05/28"] > -tmclaugh [label="Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09/15"] > tobik [label="Tobias Kortkamp\ntobik@FreeBSD.org\n2017/02/08"] > tota [label="TAKATSU Tomonari\ntota@FreeBSD.org\n2009/03/30"] > -trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007/04/12"] > trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2004/07/06"] > trociny [label="Mikolaj Golub\ntrociny@FreeBSD.org\n2013/10/17"] > tz [label="Torsten Zuehlsdorff\ntz@FreeBSD.org\n2016/06/04"] > ultima [label="Richard Gallamore\nultima@FreeBSD.org\n2017/06/07"] > uqs [label="Ulrich Spoerlein\nuqs@FreeBSD.org\n2012/01/19"] > vd [label="Vasil Dimov\nvd@FreeBSD.org\n2006/01/19"] > -vg [label="Veniamin Gvozdikov\nvg@FreeBSD.org\n2013/06/11"] > vishwin [label="Charlie Li\nvishwin@FreeBSD.org\n2021/04/29"] > vsevolod [label="Vsevolod Stakhov\nvsevolod@FreeBSD.org\n2005/07/22"] > wen [label="Wen Heping\nwen@FreeBSD.org\n2010/12/13"] > -wg [label="William Grzybowski\nwg@FreeBSD.org\n2013/04/01"] > woodsb02 [label="Ben Woods\nwoodsb02@FreeBSD.org\n2016/05/09"] > -wxs [label="Wesley Shields\nwxs@FreeBSD.org\n2008/01/03"] > -xmj [label="Johannes Jost Meixner\nxmj@FreeBSD.org\n2014/04/07"] > xride [label="Soeren Straarup\nxride@FreeBSD.org\n2006/09/27"] > yasu [label="Yasuhiro Kimura\nyasu@FreeBSD.org\n2021/08/27"] > ygy [label="Guangyuan Yang\nygy@FreeBSD.org\n2021/05/17"] > yuri [label="Yuri Victorovich\nyuri@FreeBSD.org\n2017/10/30"] > -yzlin [label="Yi-Jheng Lin\nyzlin@FreeBSD.org\n2009/07/19"] > -zeising [label="Niclas Zeising\nzeising@FreeBSD.org\n2012/07/03"] > zi [label="Ryan Steinmetz\nzi@FreeBSD.org\n2011/07/14"] > zirias [label="Felix Palmen\nzirias@FreeBSD.org\n2022/08/02"] > -znerd [label="Ernst de Haan\nznerd@FreeBSD.org\n2001/11/15"] > > # Here are the mentor/mentee relationships. > # Group together all the mentees for a particular mentor. From nobody Thu Mar 30 12:36: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 4PnNFH4k8nz42x9T; Thu, 30 Mar 2023 12:36: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 4PnNFH4DH0z3PX4; Thu, 30 Mar 2023 12:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680179763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ajsg9AnaGygWiyBt2PW7vpzldDn17bJRq4vjzNbo1xE=; b=bkwHuh3g/0VxY3GLcndGB93GukK8rOaRT9NUlnFE/gMsg6JJVDbKWVXGQ59wYRW05DeO99 QItTZkRCR/qK1B0PE0IjYncexLTUkxSBmxq8JDrJsG0atlzusPwKg8d9NDxo9odRnrDRh4 814eiWhzDJpBw0A3tPr/ARVoJTZ3DyrEv0+UgCOANjwlntfey1e0m4qUv0+OyO2KdBXlQX zdheCMGyUFj4W9rFeLt2ZNVUkHy+67b+r1qLsSm4kh9oYmUBtKZyBee11dHeGKhVAZDAaN k3CzQJr1E4TMqRuPWkaNO2icCuI2s7nhGcJ0Xvxn6fsny4mA4hffMFzIKZJ5iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680179763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ajsg9AnaGygWiyBt2PW7vpzldDn17bJRq4vjzNbo1xE=; b=tlMJkLV/gdr79eBJhpIyK36FVoFQRY1oe4HGXzsLauCsP6uOpXXOFv7wyjRZQDRQny0B9o XiS4KmFUl3xR32QaYs9AKZihVMaghVOvtYGwpp/5I5DUldEBEfD3vZkBkPDBLEQSwh/1Ow 52aVeh+DHAQ/EavydH0ZVqdhp54nUxCgggYiXpgOjynm2NRITuULvvbVVFkukYIFtLcxR6 jNPqWVzgVsk+24x9rnQ8/YAnh/D1oYS7Kx5L4ianCk+pHUn9SZjaKPw90VDG7KjpQetWlt JfYgf1z3yvcyEKeoyPyFBX/bqVI/H2MVnhMQVG7LZOZk9/MJgErbL4UM9srLqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680179763; a=rsa-sha256; cv=none; b=GMEusJhAiXU4ThmJWWU9H+G0qDyXYPdqyINEde6naztXKwUNDtiSgmHNvyNi5nT2UGByMW yHkbSkZVkek9N/zPO+0l5Y/2OMh+StU4nJiIedBloycwChGzwDnZaciVnMMhq4dL1wnEz0 eQnx5gxhQQJWKfmRAkjNFSpl3PbIjJizydIR6CVpWPkrio2sRCU3G5ifGAMWEtHCg++Bjo yUtuw1k7TqhvC23PYf7GkrzwtHKs8YeA3+6+ihtNy4C8PhYpsTLSR4ad1OKNmwfGg4gU+B 4UltlSoMIPwDf+K9kiQBw5C9pk26SF1KoDYS2nRFQ20QkB3URlKSECoerythOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnNFH3Ghnz1BZg; Thu, 30 Mar 2023 12:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UCa3Lu081674; Thu, 30 Mar 2023 12:36:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UCa3uL081672; Thu, 30 Mar 2023 12:36:03 GMT (envelope-from git) Date: Thu, 30 Mar 2023 12:36:03 GMT Message-Id: <202303301236.32UCa3uL081672@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: 878cd9623c8e - releng/13.2 - amd64 wakeup: recalculate mitigations after APICs are woken List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 878cd9623c8eaa747ec27269fec968b33b153e1d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=878cd9623c8eaa747ec27269fec968b33b153e1d commit 878cd9623c8eaa747ec27269fec968b33b153e1d Author: Konstantin Belousov AuthorDate: 2023-03-28 23:51:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-30 12:35:53 +0000 amd64 wakeup: recalculate mitigations after APICs are woken PR: 270489 Approved by: re (cperciva) (cherry picked from commit cd137909c3097fe223ce2b49075eed42a4933bb5) (cherry picked from commit 738b20a47f7379b27ccf7a6d2af2c1bbfa11d05f) --- sys/amd64/acpica/acpi_wakeup.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 3df4457550d6..62e11f5797f6 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -294,19 +294,21 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, * in acpi_sleep_machdep(), after the microcode was * reloaded. Then recalculate the active mitigation * knobs that depend on the microcode and - * cpu_stdext_feature3. + * cpu_stdext_feature3. Do it after LAPICs are woken, + * so that IPIs work. */ identify_cpu_ext_features(); - hw_ibrs_recalculate(true); - hw_ssb_recalculate(true); - amd64_syscall_ret_flush_l1d_recalc(); - x86_rngds_mitg_recalculate(true); mca_resume(); if (vmm_resume_p != NULL) vmm_resume_p(); intr_resume(/*suspend_cancelled*/false); + hw_ibrs_recalculate(true); + amd64_syscall_ret_flush_l1d_recalc(); + hw_ssb_recalculate(true); + x86_rngds_mitg_recalculate(true); + AcpiSetFirmwareWakingVector(0, 0); } else { /* Wakeup MD procedures in interrupt enabled context */ From nobody Thu Mar 30 12:52: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 4PnNcC6X9Bz42y5j; Thu, 30 Mar 2023 12:52: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 4PnNcC5ypLz3Qst; Thu, 30 Mar 2023 12:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680180747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=woWzXr/JRVZ2cMuTSW9q23EMLUVRGo+4BI7qvI2xkXA=; b=L/GMepGoePkEn728OYda7hq0omt0XOG68wHZ35+I7ZXQLWcGk8Zxo0NkMbf7dJCbThxgOC 5xRcWYmj/kzTZGjbMYG7sktx70qo/shIM51uUqgZEbvGYcCEIZ0e0fSXLrXgy0rCTqndrm Xn0CSAy2Y3Y5th/CGex+5i6T8h/aj1sjbIRAeigyH6q+KrbJW7Z6Eh1XT0eh7Jw7v42DVU dXsoEvQku4WJgXEV6CIYfsANcyKyDCC6pMWmWgGYClzSaP1rF1/6OkJ0slUZdKAVdVi2i9 MK1sUIINRBY2YvX9aKCHqRIAsynkWg/aDpWRc1mFx/efosGJa/9WNcJtKwZJpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680180747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=woWzXr/JRVZ2cMuTSW9q23EMLUVRGo+4BI7qvI2xkXA=; b=nDI678Cqe4pWLiDGOY/BiYKDhWNsCbFWvXXgEeeL4ozX9WxQBdkiKT9Xz9e43XYWDWJRyu vtYj2ip4yz4hceCzUrr0xLfpln8UV/p/4HgPVjqBnseO+e7rpnFKfPk/+7xVAvYMpw6g/B 6Z0gAf4jfdx7oivLeVsdhbl7SKUP/6OtQD8hO3bppU2nGx5VFtkPYBQSupQOjUmbAXiqWT b7TlLB50ze+Wcy+Dk4BtvwhEECTzK7RqWf7C15tdIbN+4WdIbdVTeBl9yGI2mX+jIvugEc zrMTWlxgPljinNE5Bk/czuGtkrhAJPwvmvYcwauGNokAXBhlaeFT5f8zrSk8PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680180747; a=rsa-sha256; cv=none; b=ViSV4/TKVaGmj6g5M/U+CixcFBjX+wrINwbSHts7NejcefEgkJcS5rfCSjixcGE9Y0Kg/h jT/WAZfIeDNdLOkgL/ixHupvrcP3nkAIDVNDwHYfJNEZwSsEcLY5MzVsBhBgc7Qz5ySxnS Mq9NmKVk5nGg+PoHqUezMo1U8SXnaIz+8wdEWcOFoJ+Hn9iTdl9/E01Ws6Fi2hp8fGzKLr tP31x8p8NIsamRMgD4lNFD79qdwfQNlUxkfEvlSims2n467CS+jmdsALaUlOmx0cjrfbYp lVQJXFdhipiAvOkeGBpXzUrlnC/2FljgUtGvVETdbH7tbTMBLMzWNSw2QgzDow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnNcC52vWz1BsB; Thu, 30 Mar 2023 12:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UCqR2S014123; Thu, 30 Mar 2023 12:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UCqR5T014122; Thu, 30 Mar 2023 12:52:27 GMT (envelope-from git) Date: Thu, 30 Mar 2023 12:52:27 GMT Message-Id: <202303301252.32UCqR5T014122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: a2d2f25dd44c - main - committers-ports.dot: Fix alexbl entry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2d2f25dd44ce9a7bed1e83cf63ccae9a46b2d0b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=a2d2f25dd44ce9a7bed1e83cf63ccae9a46b2d0b commit a2d2f25dd44ce9a7bed1e83cf63ccae9a46b2d0b Author: Fernando Apesteguía AuthorDate: 2023-03-30 12:46:47 +0000 Commit: Fernando Apesteguía CommitDate: 2023-03-30 12:46:47 +0000 committers-ports.dot: Fix alexbl entry Copy-paste error. Reported by: dchagin Fixes: 5faf90050e6c --- share/misc/committers-ports.dot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index ab6bd8385fe7..b0aa4e16408a 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -31,7 +31,7 @@ node [color=grey62, style=filled, bgcolor=black]; ache [label="Andrey Chernov\nache@FreeBSD.org\n1994/11/15\n2017/08/17"] ahze [label="Michael Johnson\nahze@FreeBSD.org\n2004/10/29\n2013/12/02"] -alexbl [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] +alexbl [label="Alexandr Botero\nalexbl@FreeBSD.org\n2006/09/11\n2011/01/14"] alonso [label="Alonso Schaich\nalonso@FreeBSD.org\n2014/08/14\n2017/08/07"] anray [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] araujo [label="Marcelo Araujo\naraujo@FreeBSD.org\n2007/04/26\n2020/11/03"] From nobody Thu Mar 30 12:48: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 4PnNd35Kp4z42xgM; Thu, 30 Mar 2023 12:53:11 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 4PnNd30wRkz3h4H; Thu, 30 Mar 2023 12:53:11 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f42.google.com with SMTP id bi9so24348798lfb.12; Thu, 30 Mar 2023 05:53:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680180789; 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=LJjFnZh4Xbe8vvQDQ978sEfdKK7bhUlgGMNOqQ5Vwuw=; b=X+K240nlrK0Ne8v5nrc2OgDfZwG2oMxSd+2F5TwLFJpqOH46riz+y5rONHoUXMrz6P Okone0J4S0oRVe1hp5yvXJvwu99iikK7iYtDtp/vK5lex4prkoI3XBzYbRNUK7T91mfk ngRzSaOeHsoRbrFW/j8zgDosDxwme+icLYjfFxOjVBccVPw8+PR2/wm+y15YpEVsR2e/ DciLn/oG7A3Rz2761oWwXuUW55WkiTKHmWnHxnTAashy8fRD9hmIzpIdKmJZFQLvhUnQ kvl3egw+ki5qB6c1xBEf89qhpPVJXILvFGaemDF+mdXwgWAW1FnCZ3zbIJyGMehzNV/r uZxQ== X-Gm-Message-State: AAQBX9fXAp9kNBfYtoGEyfbN7nE+VdQ82pQqaSHC3pknNr6wucD7l5Bc X3+Lzs1NXjl+B2n5ADui6OI2XOhhutioyw== X-Google-Smtp-Source: AKy350bAQ3zfBOsRhqT/oNKHfxrn9lNXk7RMQQoTpo1LEyat91RXDfvgAQRfLfIvDs97ypDPnFFYCQ== X-Received: by 2002:a05:6512:92b:b0:4e8:16e8:88b with SMTP id f11-20020a056512092b00b004e816e8088bmr6882214lft.29.1680180788285; Thu, 30 Mar 2023 05:53:08 -0700 (PDT) Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com. [209.85.167.47]) by smtp.gmail.com with ESMTPSA id r10-20020a19ac4a000000b004b5979f9ba8sm5879905lfc.210.2023.03.30.05.53.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Mar 2023 05:53:08 -0700 (PDT) Received: by mail-lf1-f47.google.com with SMTP id h11so17401762lfu.8; Thu, 30 Mar 2023 05:53:07 -0700 (PDT) X-Received: by 2002:a19:5518:0:b0:4dd:a9e5:aa09 with SMTP id n24-20020a195518000000b004dda9e5aa09mr6687771lfe.11.1680180787275; Thu, 30 Mar 2023 05:53:07 -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: <202303301222.32UCMbFN065031@gitrepo.freebsd.org> In-Reply-To: From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Thu, 30 Mar 2023 14:48:32 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 5faf90050e6c - main - committers-ports.dot: Bring file up to date. To: Dmitry Chagin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000fbee3405f81d9280" X-Rspamd-Queue-Id: 4PnNd30wRkz3h4H X-Spamd-Bar: ---- 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]; TAGGED_FROM(0.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --000000000000fbee3405f81d9280 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 30, 2023 at 2:31=E2=80=AFPM Dmitry Chagin = wrote: > On Thu, Mar 30, 2023 at 12:22:37PM +0000, Fernando Apestegu=C3=ADa wrote: > > The branch main has been updated by fernape: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D5faf90050e6c280c314bca58ee61707= d8bfdbaf3 > > > > commit 5faf90050e6c280c314bca58ee61707d8bfdbaf3 > > Author: Fernando Apestegu=C3=ADa > > AuthorDate: 2023-03-30 10:03:00 +0000 > > Commit: Fernando Apestegu=C3=ADa > > CommitDate: 2023-03-30 12:17:10 +0000 > > > > committers-ports.dot: Bring file up to date. > > > > Many listed committers are actually alumni. > > > > Related to this change: 52f576459855 > > > > Approved by: bcr@ > > Differential Revision: https://reviews.freebsd.org/D39340 > > --- > > share/misc/committers-ports.dot | 208 > ++++++++++++++++++++-------------------- > > 1 file changed, 104 insertions(+), 104 deletions(-) > > > > diff --git a/share/misc/committers-ports.dot > b/share/misc/committers-ports.dot > > index 93e7a3f97827..ab6bd8385fe7 100644 > > --- a/share/misc/committers-ports.dot > > +++ b/share/misc/committers-ports.dot > > @@ -29,63 +29,145 @@ node [color=3Dgrey62, style=3Dfilled, bgcolor=3Dbl= ack]; > > > > # Alumni go here.. Try to keep things sorted. > > > > +ache [label=3D"Andrey Chernov\nache@FreeBSD.org\n1994/11/15\n2017/08/1= 7"] > > +ahze [label=3D"Michael Johnson\nahze@FreeBSD.org > \n2004/10/29\n2013/12/02"] > > +alexbl [label=3D"Andrey Slusar\nanray@FreeBSD.org > \n2005/12/11\n2011/01/14"] > > > > +alonso [label=3D"Alonso Schaich\nalonso@FreeBSD.org > \n2014/08/14\n2017/08/07"] > > +anray [label=3D"Andrey Slusar\nanray@FreeBSD.org > \n2005/12/11\n2011/01/14"] > > alexbl@ Alexandr Botero > Very good catch! Thank you, should be fixed now. > > > +araujo [label=3D"Marcelo Araujo\naraujo@FreeBSD.org > \n2007/04/26\n2020/11/03"] > > asami [label=3D"Satoshi Asami\nasami@FreeBSD.org > \n1994/11/18\n2001/09/11"] > > +avilla [label=3D"Alberto Villa\navilla@FreeBSD.org > \n2010/01/24\n2018/10/01"] > > +avl [label=3D"Alexander Logvinov\navl@FreeBSD.org > \n2009/05/27\n2013/12/02"] > > +az [label=3D"Andrej Zverev\naz@FreeBSD.org\n2005/10/03\n2019/11/04"] > > +bar [label=3D"Barbara Guida\nbar@FreeBSD.org\n2012/11/25\n2022/12/05"] > > +beech [label=3D"Beech Rintoul\nbeech@FreeBSD.org > \n2007/05/30\n2014/01/10"] > > +bf [label=3D"Brendan Fabeny\nbf@FreeBSD.org\n2010/06/02\n2017/04/29"] > > billf [label=3D"Bill Fumerola\nbillf@FreeBSD.org > \n1998/11/11\n2006/12/14"] > > +brix [label=3D"Henrik Brix Andersen\nbrix@FreeBSD.org > \n2007/10/31\n2015/08/26"] > > +bsam [label=3D"Boris Samorodov\nbsam@FreeBSD.org > \n2006/07/20\n2022/06/06"] > > +chinsan [label=3D"Chinsan Huang\nchinsan@FreeBSD.org > \n2007/06/12\n2013/08/17"] > > +clement [label=3D"Clement Laforet\nclement@FreeBSD.org > \n2003/12/17\n2013/08/18"] > > +clsung [label=3D"Cheng-Lung Sung\nclsung@FreeBSD.org > \n2004/8/18\n2015/06/11"] > > +culot [label=3D"Frederic Culot\nculot@FreeBSD.org > \n2010/10/16\n2021/09/06"] > > +daichi [label=3D"Daichi Goto\ndaichi@FreeBSD.org > \n2002/10/17\n2018/06/01"] > > +dhn [label=3D"Dennis Herrmann\ndhn@FreeBSD.org\n2009/03/03\n2015/06/11= "] > > +dryice [label=3D"Dryice Dong Liu\ndryice@FreeBSD.org > \n2006/12/25\n2018/11/06"] > > +dteske [label=3D"Devin Teske\ndteske@FreeBSD.org > \n2018/03/01\n2019/11/05"] > > +edwin [label=3D"Edwin Groothuis\nedwin@FreeBSD.org > \n2002/10/22\n2016/11/16"] > > +eik [label=3D"Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12\n2006/12/1= 4"] > > +erwin [label=3D"Erwin Lansing\nerwin@FreeBSD.org > \n2003/06/04\n2016/10/12"] > > +fjoe [label=3D"Max Khon\nfjoe@FreeBSD.org\n2001/08/06\n2021/12/06"] > > +flz [label=3D"Florent Thoumie\nflz@FreeBSD.org\n2005/03/01\n2014/10/17= "] > > +gabor [label=3D"Gabor Kovesdan\ngabor@FreeBSD.org > \n2006/12/05\n2019/09/02"] > > +gblach [label=3D"Grzegorz Blach\ngblach@FreeBSD.org > \n2012/11/03\n2020/08/03"] > > +glarkin [label=3D"Greg Larkin\nglarkin@FreeBSD.org > \n2008/07/17\n2014/06/04"] > > +gnn [label=3D"George Neville-Neil\ngnn@FreeBSD.org > \n2013/09/04\n2020/06/02"] > > +gordon [label=3D"Gordon Tetlow\ngordon@FreeBSD.org > \n2014/10/14\n2019/04/08"] > > +hq [label=3D"Herve Quiroz\nhq@FreeBSD.org\n2004/08/05\n2014/03/02"] > > +ijliao [label=3D"Ying-Chieh Liao\nijliao@FreeBSD.org > \n2001/01/20\n2011/01/02"] > > +itetcu [label=3D"Ion-Mihai Tetcu\nitetcu@FreeBSD.org > \n2006/06/07\n2018/11/06"] > > +jacula [label=3D"Giuseppe Pilichi\njacula@FreeBSD.org > \n2010/04/05\n2011/10/14"] > > +jadawin [label=3D"Philippe Audeoud\njadawin@FreeBSD.org > \n2008/03/02\n2020/10/05"] > > +jlaffaye [label=3D"Julien Laffaye\njlaffaye@FreeBSD.org > \n2011/06/06\n2021/06/07"] > > jmallett [label=3D"Juli Mallett\njmallett@FreeBSD.org > \n2003/01/16\n2006/08/10"] > > +jmelo [label=3D"Jean Milanez Melo\njmelo@FreeBSD.org > \n2006/03/31\n2013/08/18"] > > +johans [label=3D"Johan Selst\njohans@FreeBSD.org > \n2006/04/01\n2019/11/04"] > > +jsa [label=3D"Joseph S. Atkinson\njsa@FreeBSD.org\n2010/07/15"] > > +junovitch [label=3D"Jason Unovitch\njunovitch@FreeBSD.org > \n2015/07/27\n2018/01/04"] > > +jylefort [label=3D"Jean-Yves Lefort\njylefort@FreeBSD.org\n2008/04/24"= ] > > +kevlo [label=3D"Kevin Lo\nkevlo@FreeBSD.org\n2003/02/21\n2020/09/07"] > > +kmoore [label=3D"Kris Moore\nkmoore@FreeBSD.org\n2009/04/14\n2021/05/0= 4"] > > +koitsu [label=3D"Jeremy Chadwick\nkoitsu@FreeBSD.org > \n2006/11/10\n2008/08/18"] > > +koobs [label=3D"Kubilay Kocak\nkoobs@FreeBSD.org > \n2012/12/24\n2022/03/07"] > > +laszlof [label=3D"Frank Laszlo\nlaszlof@FreeBSD.org > \n2006/11/07\n2010/07/05"] > > +lbr [label=3D"Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30"] > > +leeym [label=3D"Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14\n2017/01/0= 2"] > > +lifanov [label=3D"Nikolai Lifanov\nlifanov@FreeBSD.org > \n2016/12/11\n2021/05/04"] > > +linimon [label=3D"Mark Linimon\nlinimon@FreeBSD.org > \n2003/10/23\n2022/05/05"] > > +lioux [label=3D"Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.org > \n2015/10/14\n2015/10/14"] > > +lippe [label=3D"Felippe de Meirelles Motta\nlippe@FreeBSD.org > \n2015/14/10\n2015/10/14"] > > +lth [label=3D"Lars Thegler\nlth@FreeBSD.org\n2004/05/04\n2018/10/07"] > > +lx [label=3D"David Thiel\nlx@FreeBSD.org\n2006/11/29"] > > +maho [label=3D"Maho Nakata\nmaho@FreeBSD.org\n2002/10/17\n2018/03/11"] > > marcel [label=3D"Marcel Moolenaar\nmarcel@FreeBSD.org > \n1999/07/03\n2007/07/01"] > > -sobomax[label=3D"Maxim Sobolev\nsobomax@FreeBSD.org > \n2000/05/17\n2018/12/03"] > > -steve [label=3D"Steve Price\nsteve@FreeBSD.org\nxxxx/xx/xx\nxxxx/xx/xx= "] > > +marino [label=3D"John Marino\nmarino@FreeBSD.org > \n2013/07/04\n2017/02/10"] > > +marius [label=3D"Marius Strobl\nmarius@FreeBSD.org > \n2012/12/29\n2023/02/07"] > > +markus [label=3D"Markus Brueffer\nmarkus@FreeBSD.org > \n2004/02/21\n2011/07/05"] > > +mezz [label=3D"Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30"] > > +mharo [label=3D"Michael Haro\nmharo@FreeBSD.org\n1999/04/13\n2007/09/0= 1"] > > +miwi [label=3D"Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04\n2021/05/04"= ] > > +mnag [label=3D"Marcus Alves Grando\nmnag@FreeBSD.org > \n2005/09/15\n2012/02/01"] > > +mva [label=3D"Marcus von Appen\nmva@FreeBSD.org\n2009/02/16\n2017/01/2= 2"] > > +nemoliu [label=3D"Tong Liu\nnemoliu@FreeBSD.org\n2007/04/25\n2011/09/1= 5"] > > +nemysis [label=3D"Rusmir Dusko\nnemysis@FreeBSD.org > \n2013/07/31\n2018/09/03"] > > +nox [label=3D"Juergen Lock\nnox@FreeBSD.org\n2006/12/22"] > > +obrien [label=3D"David E. O'Brien\nobrien@FreeBSD.org > \n1996/10/29\n2015/06/11"] > > +pat [label=3D"Patrick Li\npat@FreeBSD.org\n2001/11/14\n2008/02/08"] > > +pav [label=3D"Pav Lucistnik\npav@FreeBSD.org\n2003/11/12\n2013/12/20"] > > +pawel [label=3D"Pawel Pekala\npawel@FreeBSD.org\n2011/03/11\n2018/02/2= 4"] > > +pclin [label=3D"Po-Chien Lin\npclin@FreeBSD.org\n2013/02/11\n2014/10/1= 7"] > > +pgj [label=3D"Gabor Pali\npgj@FreeBSD.org > \n2009/04/12\n2018/11/06\n2018/11/06"] > > +pgollucci [label=3D"Philip M. Gollucci\npgollucci@FreeBSD.org > \n2008/07/21\n2017/03/29"] > > +rafan [label=3D"Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23\n2015/01/21= "] > > +rezny [label=3D"Matthew Rezny\nrezny@FreeBSD.org > \n2017/01/09\n2019/02/04"] > > +rnoland [label=3D"Robert Noland\nrnoland@FreeBSD.org > \n2008/07/21\n2011/07/05"] > > +rpaulo [label=3D"Rui Paulo\nrpaulo@FreeBSD.org\n2014/07/15\n2017/08/20= "] > > +sahil [label=3D"Sahil Tandon\nsahil@FreeBSD.org\n2010/04/11"] > > +sat [label=3D"Andrew Pantyukhin\nsat@FreeBSD.org > \n2006/05/06\n2009/07/17"] > > +scheidell [label=3D"Michael Scheidell\nscheidell@FreeBSD.org > \n2011/11/06\n2013/03/19"] > > +seanc [label=3D"Sean Chittenden\nseanc@FreeBSD.org > \n2002/08/15\n2007/09/01"] > > +sergei [label=3D"Sergei Kolobov\nsergei@FreeBSD.org > \n2003/10/21\n2011/09/15"] > > +shurd [label=3D"Stephen Hurd\nshurd@FreeBSD.org\n2014/06/14\n2021/06/0= 7"] > > +simon [label=3D"Simon L. Nielsen\nsimon@FreeBSD.org > \n2005/01/08\n2015/10/14"] > > +sobomax [label=3D"Maxim Sobolev\nsobomax@FreeBSD.org > \n2000/05/17\n2018/12/03"] > > +sperber [label=3D"Armin Pirkovitsch\nsperber@FreeBSD.org\n2012/04/15"] > > +stas [label=3D"Stanislav Sedov\nstas@FreeBSD.org > \n2006/09/18\n2011/11/05"] > > +stefan [label=3D"Stefan Walter\nstefan@FreeBSD.org\n2006/05/07"] > > +steve [label=3D"Steve Price\nsteve@FreeBSD.org\n2003/02/06\n2012/04/03= "] > > +sylvio [label=3D"Sylvio Cesar Teixeira\nsylvio@FreeBSD.org > \n2009/10/29\n2014/10/17"] > > +tabthorpe [label=3D"Thomas Abthorpe\ntabthorpe@FreeBSD.org > \n2007/08/20\n2018/02/23"] > > +tj [label=3D"Tom Judge\ntj@FreeBSD.org\n2012/05/28\n2018/11/06"] > > +tmclaugh [label=3D"Tom McLaughlin\ntmclaugh@FreeBSD.org > \n2005/09/15\n2011/04/16"] > > +trasz [label=3D"Edward Tomasz Napierala\ntrasz@FreeBSD.org > \n2007/04/12\n2022/06/06"] > > +vg [label=3D"Veniamin Gvozdikov\nvg@FreeBSD.org\n2013/06/11\n2018/02/2= 3"] > > +wg [label=3D"William Grzybowski\nwg@FreeBSD.org\n2013/04/01\n2022/06/0= 6"] > > will [label=3D"Will Andrews\nwill@FreeBSD.org\n2000/03/20\n2006/09/01"= ] > > +wxs [label=3D"Wesley Shields\nwxs@FreeBSD.org\n2008/01/03\n2018/03/11"= ] > > +xmj [label=3D"Johannes Jost Meixner\nxmj@FreeBSD.org > \n2014/04/07\n2015/07/01"] > > +yzlin [label=3D"Yi-Jheng Lin\nyzlin@FreeBSD.org\n2009/07/19\n2013/08/1= 7"] > > +zeising [label=3D"Niclas Zeising\nzeising@FreeBSD.org > \n2012/07/03\n2022/05/02"] > > +znerd [label=3D"Ernst de Haan\nznerd@FreeBSD.org > \n2001/11/15\n2006/09/14"] > > > > node [color=3Dlightblue2, style=3Dfilled, bgcolor=3Dblack]; > > > > # Current ports committers go here. Try to keep things sorted. > > > > "0mp" [label=3D"Mateusz Piotrowski\n0mp@FreeBSD.org\n2018/06/16"] > > -ache [label=3D"Andrey Chernov\nache@FreeBSD.org\n1994/11/15"] > > acm [label=3D"Jose Alonso Cardenas Marquez\nacm@FreeBSD.org\n2006/07/1= 8"] > > adamw [label=3D"Adam Weinberger\nadamw@FreeBSD.org\n2002/10/16"] > > adridg [label=3D"Adriaan de Groot\nadridg@FreeBSD.org\n2017/09/08"] > > -ahze [label=3D"Michael Johnson\nahze@FreeBSD.org\n2004/10/29"] > > ak [label=3D"Alex Kozlov\nak@FreeBSD.org\n2012/02/29"] > > ale [label=3D"Alex Dupre\nale@FreeBSD.org\n2004/01/12"] > > alepulver [label=3D"Alejandro Pulver\nalepulver@FreeBSD.org\n2006/04/0= 1"] > > -alexbl [label=3D"Alexander Botero-Lowry\nalexbl@FreeBSD.org\n2006/09/1= 1"] > > alexey [label=3D"Alexey Degtyarev\nalexey@FreeBSD.org\n2013/11/09"] > > -alonso [label=3D"Alonso Schaich\nalonso@FreeBSD.org\n2014/08/14"] > > amdmi3 [label=3D"Dmitry Marakasov\namdmi3@FreeBSD.org\n2008/06/19"] > > -anray [label=3D"Andrey Slusar\nanray@FreeBSD.org\n2005/12/11"] > > antoine [label=3D"Antoine Brodin\nantoine@FreeBSD.org\n2013/04/03"] > > -araujo [label=3D"Marcelo Araujo\naraujo@FreeBSD.org\n2007/04/26"] > > arrowd [label=3D"Gleb Popov\narrowd@FreeBSD.org\n2018/05/18"] > > arved [label=3D"Tilman Linneweh\narved@FreeBSD.org\n2002/10/15"] > > ashish [label=3D"Ashish SHUKLA\nashish@FreeBSD.org\n2010/06/10"] > > -avilla [label=3D"Alberto Villa\navilla@FreeBSD.org\n2010/01/24"] > > -avl [label=3D"Alexander Logvinov\navl@FreeBSD.org\n2009/05/27"] > > -az [label=3D"Andrej Zverev\naz@FreeBSD.org\n2005/10/03"] > > bapt [label=3D"Baptiste Daroussin\nbapt@FreeBSD.org\n2010/07/27"] > > -bar [label=3D"Barbara Guida\nbar@FreeBSD.org\n2012/11/25"] > > bdrewery [label=3D"Bryan Drewery\nbdrewery@FreeBSD.org\n2012/07/31"] > > beat [label=3D"Beat Gaetzi\nbeat@FreeBSD.org\n2009/01/28"] > > -beech [label=3D"Beech Rintoul\nbeech@FreeBSD.org\n2007/05/30"] > > -bf [label=3D"Brendan Fabeny\nbf@FreeBSD.org\n2010/06/02"] > > bland [label=3D"Alexander Nedotsukov\nbland@FreeBSD.org\n2003/08/14"] > > bmah [label=3D"Bruce A. Mah\nbmah@FreeBSD.org\n2000/08/23"] > > bofh [label=3D"Muhammad Moinur Rahman\nbofh@FreeBSD.org\n2014/12/23"] > > brnrd [label=3D"Bernard Spil\nbrnrd@FreeBSD.org\n2015/05/24"] > > -brix [label=3D"Henrik Brix Andersen\nbrix@FreeBSD.org\n2007/10/31"] > > brooks [label=3D"Brooks Davies\nbrooks@FreeBSD.org\n2004/05/03"] > > -bsam [label=3D"Boris Samorodov\nbsam@FreeBSD.org\n2006/07/20"] > > -chinsan [label=3D"Chinsan Huang\nchinsan@FreeBSD.org\n2007/06/12"] > > -clement [label=3D"Clement Laforet\nclement@FreeBSD.org\n2003/12/17"] > > -clsung [label=3D"Cheng-Lung Sung\nclsung@FreeBSD.org\n2004/8/18"] > > cmt [label=3D"Christoph Moench-Tegeder\ncmt@FreeBSD.org\n2016/03/01"] > > cperciva [label=3D"Colin Percival\ncperciva@FreeBSD.org\n2006/01/31"] > > crees [label=3D"Chris Rees\ncrees@FreeBSD.org\n2011/06/11"] > > cs [label=3D"Carlo Strub\ncs@FreeBSD.org\n2011/09/13"] > > -culot [label=3D"Frederic Culot\nculot@FreeBSD.org\n2010/10/16"] > > cy [label=3D"Cy Schubert\ncy@FreeBSD.org\n2001/11/13"] > > -daichi [label=3D"Daichi Goto\ndaichi@FreeBSD.org\n2002/10/17"] > > danfe [label=3D"Alexey Dokuchaev\ndanfe@FreeBSD.org\n2004/08/20"] > > danilo [label=3D"Danilo E. Gondolfo\ndanilo@FreeBSD.org\n2013/09/23"] > > db [label=3D"Diane Bruce\ndb@FreeBSD.org\n2007/01/18"] > > @@ -95,214 +177,132 @@ dch [label=3D"Dave Cottlehuber\ndch@FreeBSD.org > \n2017/09/09"] > > decke [label=3D"Bernhard Froehlich\ndecke@FreeBSD.org\n2010/03/21"] > > delphij [label=3D"Xin Li\ndelphij@FreeBSD.org\n2006/05/01"] > > demon [label=3D"Dmitry Sivachenko\ndemon@FreeBSD.org\n2000/11/13"] > > -dhn [label=3D"Dennis Herrmann\ndhn@FreeBSD.org\n2009/03/03"] > > diizzy [label=3D"Daniel Engberg\ndiizzy@FreeBSD.org\n2021/07/06"] > > dmgk [label=3D"Dmitri Goutnik\ndmgk@FreeBSD.org\n2019/09/15"] > > driesm [label=3D"Dries Michiels\ndriesm@FreeBSD.org\n2021/11/06"] > > -dryice [label=3D"Dryice Dong Liu\ndryice@FreeBSD.org\n2006/12/25"] > > -dteske [label=3D"Devin Teske\ndteske@FreeBSD.org\n2018/03/01"] > > dumbbell [label=3D"Jean-Sebastien Pedron\ndumbbell@FreeBSD.org > \n2017/01/10"] > > dvl [label=3D"Dan Langille\ndvl@FreeBSD.org\n2014/08/10"] > > eadler [label=3D"Eitan Adler\neadler@FreeBSD.org\n2011/08/17"] > > eduardo [label=3D"Nuno Teixeira\neduardo@FreeBSD.org\n2021/01/27"] > > -edwin [label=3D"Edwin Groothuis\nedwin@FreeBSD.org\n2002/10/22"] > > egypcio [label=3D"Vinícius Zavam\negypcio@FreeBSD.org > \n2018/10/04"] > > ehaupt [label=3D"Emanuel Haupt\nehaupt@FreeBSD.org\n2005/10/03"] > > -eik [label=3D"Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12"] > > ericbsd [label=3D"Eric Turgeon\nericbsd@FreeBSD.org\n2018/03/17"] > > -erwin [label=3D"Erwin Lansing\nerwin@FreeBSD.org\n2003/06/04"] > > eugen [label=3D"Eugene Grosbein\neugen@FreeBSD.org\n2017/03/04"] > > farrokhi [label=3D"Babak Farrokhi\nfarrokhi@FreeBSD.org\n2006/11/07"] > > feld [label=3D"Mark Felder\nfeld@FreeBSD.org\n2013/06/25"] > > fernape [label=3D"Fernando Apesteguia\nfernape@FreeBSD.org\n2018/03/03= "] > > -fjoe [label=3D"Max Khon\nfjoe@FreeBSD.org\n2001/08/06"] > > flo [label=3D"Florian Smeets\nflo@FreeBSD.org\n2010/12/07"] > > fluffy [label=3D"Dima Panov\nfluffy@FreeBSD.org\n2009/08/10"] > > -flz [label=3D"Florent Thoumie\nflz@FreeBSD.org\n2005/03/01"] > > fuz [label=3D"Robert Clausecker\nfuz@FreeBSD.org\n2023/02/02"] > > -gabor [label=3D"Gabor Kovesdan\ngabor@FreeBSD.org\n2006/12/05"] > > gahr [label=3D"Pietro Cerutti\ngahr@FreeBSD.org\n2008/02/20"] > > garga [label=3D"Renato Botelho\ngarga@FreeBSD.org\n2005/07/11"] > > -gblach [label=3D"Grzegorz Blach\ngblach@FreeBSD.org\n2012/11/03"] > > gerald [label=3D"Gerald Pfeifer\ngerald@FreeBSD.org\n2002/04/03"] > > gjb [label=3D"Glen Barber\ngjb@FreeBSD.org\n2012/06/19"] > > -glarkin [label=3D"Greg Larkin\nglarkin@FreeBSD.org\n2008/07/17"] > > glewis [label=3D"Greg Lewis\nglewis@FreeBSD.org\n2002/04/08"] > > -gordon [label=3D"Gordon Tetlow\ngordon@FreeBSD.org\n2014/10/14"] > > grembo [label=3D"Michael Gmelin\ngrembo@FreeBSD.org\n2014/01/21"] > > -gnn [label=3D"George Neville-Neil\ngnn@FreeBSD.org\n2013/09/04"] > > -hq [label=3D"Herve Quiroz\nhq@FreeBSD.org\n2004/08/05"] > > hrs [label=3D"Hiroki Sato\nhrs@FreeBSD.org\n2004/04/10"] > > -ijliao [label=3D"Ying-Chieh Liao\nijliao@FreeBSD.org\n2001/01/20"] > > -itetcu [label=3D"Ion-Mihai Tetcu\nitetcu@FreeBSD.org\n2006/06/07"] > > -jacula [label=3D"Giuseppe Pilichi\njacula@FreeBSD.org\n2010/04/05"] > > -jadawin [label=3D"Philippe Audeoud\njadawin@FreeBSD.org\n2008/03/02"] > > jase [label=3D"Jase Thew\njase@FreeBSD.org\n2012/05/30"] > > jbeich [label=3D"Jan Beich\njbeich@FreeBSD.org\n2015/01/19"] > > jgh [label=3D"Jason Helfman\njgh@FreeBSD.org\n2011/12/16"] > > jhale [label=3D"Jason E. Hale\njhale@FreeBSD.org\n2012/09/10"] > > jhixson [label=3D"John Hixson\njhixson@FreeBSD.org\n2018/07/16"] > > jkim [label=3D"Jung-uk Kim\njkim@FreeBSD.org\n2007/09/12"] > > -jlaffaye [label=3D"Julien Laffaye\njlaffaye@FreeBSD.org\n2011/06/06"] > > jmd [label=3D"Johannes M. Dieterich\njmd@FreeBSD.org\n2017/01/09"] > > -jmelo [label=3D"Jean Milanez Melo\njmelo@FreeBSD.org\n2006/03/31"] > > -joneum [label=3D"Jochen Neumeister\njoneum@FreeBSD.org\n2017/05/11"] > > joerg [label=3D"Joerg Wunsch\njoerg@FreeBSD.org\n1994/08/22"] > > -johans [label=3D"Johan Selst\njohans@FreeBSD.org\n2006/04/01"] > > +joneum [label=3D"Jochen Neumeister\njoneum@FreeBSD.org\n2017/05/11"] > > josef [label=3D"Josef El-Rayes\njosef@FreeBSD.org\n2004/12/20"] > > jpaetzel [label=3D"Josh Paetzel\njpaetzel@FreeBSD.org\n2008/09/05"] > > jrm [label=3D"Joseph R. Mingrone\njrm@FreeBSD.org\n2016/09/17"] > > -jsa [label=3D"Joseph S. Atkinson\njsa@FreeBSD.org\n2010/07/15"] > > jsm [label=3D"Jesper Schmitz Mouridsen\njsm@FreeBSD.org\n2018/06/30"] > > -junovitch [label=3D"Jason Unovitch\njunovitch@FreeBSD.org\n2015/07/27"= ] > > -jylefort [label=3D"Jean-Yves Lefort\njylefort@FreeBSD.org\n2005/04/12"= ] > > kai [label=3D"Kai Knoblich\nkai@FreeBSD.org\n2019/02/01"] > > kami [label=3D"Dominic Fandrey\nkami@FreeBSD.org\n2014/09/09"] > > kbowling [label=3D"Kevin Bowling\nkbowling@FreeBSD.org\n2018/09/02"] > > kevans [label=3D"Kyle Evans\nkevans@FreeBSD.org\n2020/02/14"] > > -kevlo [label=3D"Kevin Lo\nkevlo@FreeBSD.org\n2003/02/21"] > > -kmoore [label=3D"Kris Moore\nkmoore@FreeBSD.org\n2009/04/14"] > > knu [label=3D"Akinori Musha\nknu@FreeBSD.org\n2000/03/22"] > > -koitsu [label=3D"Jeremy Chadwick\nkoitsu@FreeBSD.org\n2006/11/10"] > > -koobs [label=3D"Kubilay Kocak\nkoobs@FreeBSD.org\n2012/12/24"] > > krion [label=3D"Kirill Ponomarew\nkrion@FreeBSD.org\n2003/07/20"] > > kwm [label=3D"Koop Mast\nkwm@FreeBSD.org\n2004/09/14"] > > -laszlof [label=3D"Frank Laszlo\nlaszlof@FreeBSD.org\n2006/11/07"] > > lawrance [label=3D"Sam Lawrance\nlawrance@FreeBSD.org > \n2005/04/11\n2007/02/21"] > > lbartoletti [label=3D"Lo=C3=AFc Bartoletti\nlbartoletti@FreeBSD.org > \n2020/01/02"] > > -lbr [label=3D"Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30"] > > lcook [label=3D"Lewis Cook\nlcook@FreeBSD.org\n2021/01/21"] > > -leeym [label=3D"Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14"] > > ler [label=3D"Larry Rosenman\nler@FreeBSD.org\n2017/01/09"] > > leres [label=3D"Craig Leres\nleres@FreeBSD.org\n2017/10/10"] > > lev [label=3D"Lev Serebryakov\nlev@FreeBSD.org\n2003/06/17"] > > -lifanov [label=3D"Nikolai Lifanov\nlifanov@FreeBSD.org\n2016/12/11"] > > -linimon [label=3D"Mark Linimon\nlinimon@FreeBSD.org\n2003/10/23"] > > -lioux [label=3D"Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.org > \n2000/10/14"] > > -lippe [label=3D"Felippe de Meirelles Motta\nlippe@FreeBSD.org > \n2008/03/08"] > > lme [label=3D"Lars Engels\nlme@FreeBSD.org\n2007/07/09"] > > -lth [label=3D"Lars Thegler\nlth@FreeBSD.org\n2004/05/04"] > > lwhsu [label=3D"Li-Wen Hsu\nlwhsu@FreeBSD.org\n2007/04/03"] > > -lx [label=3D"David Thiel\nlx@FreeBSD.org\n2006/11/29"] > > madpilot [label=3D"Guido Falsi\nmadpilot@FreeBSD.org\n2012/04/12"] > > -maho [label=3D"Maho Nakata\nmaho@FreeBSD.org\n2002/10/17"] > > makc [label=3D"Max Brazhnikov\nmakc@FreeBSD.org\n2008/08/25"] > > mandree [label=3D"Matthias Andree\nmandree@FreeBSD.org\n2009/11/18"] > > manu [label=3D"Emmanuel Vadot\nmanu@FreeBSD.org\n2018/09/06"] > > marcus [label=3D"Joe Marcus Clarke\nmarcus@FreeBSD.org\n2002/04/05"] > > -marino [label=3D"John Marino\nmarino@FreeBSD.org\n2013/07/04"] > > -marius [label=3D"Marius Strobl\nmarius@FreeBSD.org\n2012/12/29"] > > -markus [label=3D"Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21"] > > martymac [label=3D"Ganael Laplanche\nmartymac@FreeBSD.org\n2010/09/24"= ] > > mat [label=3D"Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15"] > > matthew [label=3D"Matthew Seaman\nmatthew@FreeBSD.org\n2012/02/07"] > > meta [label=3D"Koichiro Iwao\nmeta@FreeBSD.org\n2018/03/19"] > > -mezz [label=3D"Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30"] > > mfechner [label=3D"Matthias Fechner\nmfechner@FreeBSD.org\n2018/03/01"= ] > > -mharo [label=3D"Michael Haro\nmharo@FreeBSD.org\n1999/04/13"] > > mikael [label=3D"Mikael Urankar\nmikael@FreeBSD.org\n2020/01/16"] > > milki [label=3D"Jonathan Chu\nmilki@FreeBSD.org\n2013/12/15"] > > misha [label=3D"Mikhail Pchelin\nmisha@FreeBSD.org\n2016/11/15"] > > -miwi [label=3D"Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04"] > > mm [label=3D"Martin Matuska\nmm@FreeBSD.org\n2007/04/04"] > > mmokhi [label=3D"Mahdi Mokhtari\nmmokhi@FreeBSD.org\n2017/02/09"] > > -mnag [label=3D"Marcus Alves Grando\nmnag@FreeBSD.org\n2005/09/15"] > > -mva [label=3D"Marcus von Appen\nmva@FreeBSD.org\n2009/02/16"] > > nc [label=3D"Neel Chauhan\nnc@FreeBSD.org\n2021/01/02"] > > -nemysis [label=3D"Rusmir Dusko\nnemysis@FreeBSD.org\n2013/07/31"] > > -nemoliu [label=3D"Tong Liu\nnemoliu@FreeBSD.org\n2007/04/25"] > > netchild [label=3D"Alexander Leidinger\nnetchild@FreeBSD.org > \n2002/03/19"] > > nobutaka [label=3D"Nobutaka Mantani\nnobutaka@FreeBSD.org\n2001/11/02"= ] > > nork [label=3D"Norikatsu Shigemura\nnork@FreeBSD.org\n2002/04/01"] > > novel [label=3D"Roman Bogorodskiy\nnovel@FreeBSD.org\n2005/03/07"] > > -nox [label=3D"Juergen Lock\nnox@FreeBSD.org\n2006/12/22"] > > -obrien [label=3D"David E. O'Brien\nobrien@FreeBSD.org\n1996/10/29"] > > olivier [label=3D"Olivier Cochard-Labbe\nolivier@FreeBSD.org > \n2016/02/02"] > > olivierd [label=3D"Olivier Duchateau\nolivierd@FreeBSD.org\n2012/05/29= "] > > osa [label=3D"Sergey A. Osokin\nosa@FreeBSD.org\n2003/06/04"] > > otis [label=3D"Juraj Lutter\notis@FreeBSD.org\n2020/12/12"] > > -pat [label=3D"Patrick Li\npat@FreeBSD.org\n2001/11/14"] > > -pav [label=3D"Pav Lucistnik\npav@FreeBSD.org\n2003/11/12"] > > -pawel [label=3D"Pawel Pekala\npawel@FreeBSD.org\n2011/03/11"] > > -pclin [label=3D"Po-Chien Lin\npclin@FreeBSD.org\n2013/02/11"] > > pfg [label=3D"Pedro Giffuni\npfg@FreeBSD.org\n2019/04/14"] > > -pgj [label=3D"Gabor Pali\npgj@FreeBSD.org\n2009/04/12"] > > -pgollucci [label=3D"Philip M. Gollucci\npgollucci@FreeBSD.org > \n2008/07/21"] > > philip [label=3D"Philip Paeps\nphilip@FreeBSD.org\n2005/10/19"] > > pi [label=3D"Kurt Jaeger\npi@FreeBSD.org\n2014/03/14"] > > pizzamig [label=3D"Luca Pizzamiglio\npizzamig@FreeBSD.org\n2017/08/25"= ] > > pkubaj [label=3D"Piotr Kubaj\npkubaj@FreeBSD.org\n2019/04/14"] > > -rafan [label=3D"Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23"] > > rakuco [label=3D"Raphael Kubo da Costa\nrakuco@FreeBSD.org\n2011/08/22= "] > > rene [label=3D"Rene Ladan\nrene@FreeBSD.org\n2010/04/11"] > > -rezny [label=3D"Matthew Rezny\nrezny@FreeBSD.org\n2017/01/09"] > > rhurlin [label=3D"Rainer Hurling\nrhurlin@FreeBSD.org\n2020/08/31"] > > riggs [label=3D"Thomas Zander\nriggs@FreeBSD.org\n2014/01/09"] > > rigoletto [label=3D"Alexandre C. Guimaraes\nrigoletto@FreeBSD.org > \n2018/10/01"] > > rm [label=3D"Ruslan Makhmatkhanov\nrm@FreeBSD.org\n2011/11/06"] > > -rnoland [label=3D"Robert Noland\nrnoland@FreeBSD.org\n2008/07/21"] > > robak [label=3D"Bartek Rutkowski\nrobak@FreeBSD.org\n2014/06/10"] > > rodrigo [label=3D"Rodrigo Osorio\nrodrigo@FreeBSD.org\n2014/01/15"] > > romain [label=3D"Romain Tartiere\nromain@FreeBSD.org\n2010/01/24"] > > ronald [label=3D"Ronald Klop\nronald@FreeBSD.org\n2022/10/06"] > > -rpaulo [label=3D"Rui Paulo\nrpaulo@FreeBSD.org\n2014/07/15"] > > -sahil [label=3D"Sahil Tandon\nsahil@FreeBSD.org\n2010/04/11"] > > salvadore [label=3D"Lorenzo Salvadore\nsalvadore@FreeBSD.org > \n2020/02/21"] > > samm [label=3D"Alex Samorukov\nsamm@FreeBSD.org\n2019/10/09"] > > -sat [label=3D"Andrew Pantyukhin\nsat@FreeBSD.org\n2006/05/06"] > > sbruno [label=3D"Sean Bruno\nsbruno@FreeBSD.org\n2014/09/14"] > > sbz [label=3D"Sofian Brabez\nsbz@FreeBSD.org\n2011/03/14"] > > -scheidell [label=3D"Michael Scheidell\nscheidell@FreeBSD.org > \n2011/11/06"] > > -seanc [label=3D"Sean Chittenden\nseanc@FreeBSD.org\n2002/08/15"] > > sem [label=3D"Sergey Matveychuk\nsem@FreeBSD.org\n2004/07/07"] > > -sergei [label=3D"Sergei Kolobov\nsergei@FreeBSD.org\n2003/10/21"] > > shaun [label=3D"Shaun Amott\nshaun@FreeBSD.org\n2006/06/19"] > > -shurd [label=3D"Stephen Hurd\nshurd@FreeBSD.org\n2014/06/14"] > > -simon [label=3D"Simon L. Nielsen\nsimon@FreeBSD.org\n2005/01/08"] > > skozlov [label=3D"Sergey Kozlov\nskozlov@FreeBSD.org\n2018/09/21"] > > skreuzer [label=3D"Steven Kreuzer\nskreuzer@FreeBSD.org\n2009/03/25"] > > -sperber[label=3D"Armin Pirkovitsch\nsperber@FreeBSD.org\n2012/04/15"] > > -stas [label=3D"Stanislav Sedov\nstas@FreeBSD.org\n2006/09/18"] > > -stefan [label=3D"Stefan Walter\nstefan@FreeBSD.org\n2006/05/07"] > > stephen [label=3D"Stephen Montgomery-Smith\nstephen@FreeBSD.org > \n2011/06/13"] > > sunpoet [label=3D"Po-Chuan Hsieh\nsunpoet@FreeBSD.org\n2010/09/21"] > > swills [label=3D"Steve Wills\nswills@FreeBSD.org\n2010/09/03"] > > -sylvio [label=3D"Sylvio Cesar Teixeira\nsylvio@FreeBSD.org\n2009/10/29= "] > > -tabthorpe [label=3D"Thomas Abthorpe\ntabthorpe@FreeBSD.org\n2007/08/20= "] > > tagattie [label=3D"Hiroki Tagato\ntagattie@FreeBSD.org\n2020/04/01"] > > tcberner [label=3D"Tobias C. Berner\ntcberner@FreeBSD.org\n2016/07/06"= ] > > tdb [label=3D"Tim Bishop\ntdb@FreeBSD.org\n2005/11/30"] > > thierry [label=3D"Thierry Thomas\nthierry@FreeBSD.org\n2004/03/15"] > > tijl [label=3D"Tijl Coosemans\ntijl@FreeBSD.org\n2013/03/27"] > > timur [label=3D"Timur Bakeyev\ntimur@FreeBSD.org\n2007/06/07"] > > -tj [label=3D"Tom Judge\ntj@FreeBSD.org\n2012/05/28"] > > -tmclaugh [label=3D"Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09/15"] > > tobik [label=3D"Tobias Kortkamp\ntobik@FreeBSD.org\n2017/02/08"] > > tota [label=3D"TAKATSU Tomonari\ntota@FreeBSD.org\n2009/03/30"] > > -trasz [label=3D"Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007/04/12= "] > > trhodes [label=3D"Tom Rhodes\ntrhodes@FreeBSD.org\n2004/07/06"] > > trociny [label=3D"Mikolaj Golub\ntrociny@FreeBSD.org\n2013/10/17"] > > tz [label=3D"Torsten Zuehlsdorff\ntz@FreeBSD.org\n2016/06/04"] > > ultima [label=3D"Richard Gallamore\nultima@FreeBSD.org\n2017/06/07"] > > uqs [label=3D"Ulrich Spoerlein\nuqs@FreeBSD.org\n2012/01/19"] > > vd [label=3D"Vasil Dimov\nvd@FreeBSD.org\n2006/01/19"] > > -vg [label=3D"Veniamin Gvozdikov\nvg@FreeBSD.org\n2013/06/11"] > > vishwin [label=3D"Charlie Li\nvishwin@FreeBSD.org\n2021/04/29"] > > vsevolod [label=3D"Vsevolod Stakhov\nvsevolod@FreeBSD.org\n2005/07/22"= ] > > wen [label=3D"Wen Heping\nwen@FreeBSD.org\n2010/12/13"] > > -wg [label=3D"William Grzybowski\nwg@FreeBSD.org\n2013/04/01"] > > woodsb02 [label=3D"Ben Woods\nwoodsb02@FreeBSD.org\n2016/05/09"] > > -wxs [label=3D"Wesley Shields\nwxs@FreeBSD.org\n2008/01/03"] > > -xmj [label=3D"Johannes Jost Meixner\nxmj@FreeBSD.org\n2014/04/07"] > > xride [label=3D"Soeren Straarup\nxride@FreeBSD.org\n2006/09/27"] > > yasu [label=3D"Yasuhiro Kimura\nyasu@FreeBSD.org\n2021/08/27"] > > ygy [label=3D"Guangyuan Yang\nygy@FreeBSD.org\n2021/05/17"] > > yuri [label=3D"Yuri Victorovich\nyuri@FreeBSD.org\n2017/10/30"] > > -yzlin [label=3D"Yi-Jheng Lin\nyzlin@FreeBSD.org\n2009/07/19"] > > -zeising [label=3D"Niclas Zeising\nzeising@FreeBSD.org\n2012/07/03"] > > zi [label=3D"Ryan Steinmetz\nzi@FreeBSD.org\n2011/07/14"] > > zirias [label=3D"Felix Palmen\nzirias@FreeBSD.org\n2022/08/02"] > > -znerd [label=3D"Ernst de Haan\nznerd@FreeBSD.org\n2001/11/15"] > > > > # Here are the mentor/mentee relationships. > > # Group together all the mentees for a particular mentor. > --000000000000fbee3405f81d9280 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 30, 2023 at 2:31=E2=80=AF= PM Dmitry Chagin <dchagin@freebsd= .org> wrote:
On Thu, Mar 30, 2023 at 12:22:37PM +0000, Fernando Apestegu=C3=ADa wrot= e:
> The branch main has been updated by fernape:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D5faf90050e6c280c314bca58ee61707d8bfdbaf3<= /a>
>
> commit 5faf90050e6c280c314bca58ee61707d8bfdbaf3
> Author:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=C3=ADa <fernape@FreeBS= D.org>
> AuthorDate: 2023-03-30 10:03:00 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=C3=ADa <fernape@FreeBS= D.org>
> CommitDate: 2023-03-30 12:17:10 +0000
>
>=C2=A0 =C2=A0 =C2=A0committers-ports.dot: Bring file up to date.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Many listed committers are actually alumni.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Related to this change: 52f576459855
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Approved by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 bcr@
>=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 https://revie= ws.freebsd.org/D39340
> ---
>=C2=A0 share/misc/committers-ports.dot | 208 ++++++++++++++++++++------= --------------
>=C2=A0 1 file changed, 104 insertions(+), 104 deletions(-)
>
> diff --git a/share/misc/committers-ports.dot b/share/misc/committers-p= orts.dot
> index 93e7a3f97827..ab6bd8385fe7 100644
> --- a/share/misc/committers-ports.dot
> +++ b/share/misc/committers-ports.dot
> @@ -29,63 +29,145 @@ node [color=3Dgrey62, style=3Dfilled, bgcolor=3Db= lack];
>=C2=A0
>=C2=A0 # Alumni go here.. Try to keep things sorted.
>=C2=A0
> +ache [label=3D"Andrey Chernov\nache@FreeBSD.org\n1994/11/15\n201= 7/08/17"]
> +ahze [label=3D"Michael Johnson\nahze@FreeBSD.org\n2004/10/29\n20= 13/12/02"]
> +alexbl [label=3D"Andrey Slusar\nanray@FreeBSD.org\n2005/12/11\n2= 011/01/14"]


> +alonso [label=3D"Alonso Schaich\nalonso@FreeBSD.org\n2014/08/14\= n2017/08/07"]
> +anray [label=3D"Andrey Slusar\nanray@FreeBSD.org\n2005/12/11\n20= 11/01/14"]

alexbl@ Alexandr Botero

Very good catch= !

Thank you, should be fixed now.
= =C2=A0

> +araujo [label=3D"Marcelo Araujo\naraujo@FreeBSD.org\n2007/04/26\= n2020/11/03"]
>=C2=A0 asami [label=3D"Satoshi Asami\nasami@FreeBSD.org\n1994/11/1= 8\n2001/09/11"]
> +avilla [label=3D"Alberto Villa\navilla@FreeBSD.org\n2010/01/24\n= 2018/10/01"]
> +avl [label=3D"Alexander Logvinov\navl@FreeBSD.org\n2009/05/27\n2= 013/12/02"]
> +az [label=3D"Andrej Zverev\naz@FreeBSD.org\n2005/10/03\n2019/11/= 04"]
> +bar [label=3D"Barbara Guida\nbar@FreeBSD.org\n2012/11/25\n2022/1= 2/05"]
> +beech [label=3D"Beech Rintoul\nbeech@FreeBSD.org\n2007/05/30\n20= 14/01/10"]
> +bf [label=3D"Brendan Fabeny\nbf@FreeBSD.org\n2010/06/02\n2017/04= /29"]
>=C2=A0 billf [label=3D"Bill Fumerola\nbillf@FreeBSD.org\n1998/11/1= 1\n2006/12/14"]
> +brix [label=3D"Henrik Brix Andersen\nbrix@FreeBSD.org\n2007/10/3= 1\n2015/08/26"]
> +bsam [label=3D"Boris Samorodov\nbsam@FreeBSD.org\n2006/07/20\n20= 22/06/06"]
> +chinsan [label=3D"Chinsan Huang\nchinsan@FreeBSD.org\n2007/06/12= \n2013/08/17"]
> +clement [label=3D"Clement Laforet\nclement@FreeBSD.org\n2003/12/= 17\n2013/08/18"]
> +clsung [label=3D"Cheng-Lung Sung\nclsung@FreeBSD.org\n2004/8/18\= n2015/06/11"]
> +culot [label=3D"Frederic Culot\nculot@FreeBSD.org\n2010/10/16\n2= 021/09/06"]
> +daichi [label=3D"Daichi Goto\ndaichi@FreeBSD.org\n2002/10/17\n20= 18/06/01"]
> +dhn [label=3D"Dennis Herrmann\ndhn@FreeBSD.org\n2009/03/03\n2015= /06/11"]
> +dryice [label=3D"Dryice Dong Liu\ndryice@FreeBSD.org\n2006/12/25= \n2018/11/06"]
> +dteske [label=3D"Devin Teske\ndteske@FreeBSD.org\n2018/03/01\n20= 19/11/05"]
> +edwin [label=3D"Edwin Groothuis\nedwin@FreeBSD.org\n2002/10/22\n= 2016/11/16"]
> +eik [label=3D"Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12\n200= 6/12/14"]
> +erwin [label=3D"Erwin Lansing\nerwin@FreeBSD.org\n2003/06/04\n20= 16/10/12"]
> +fjoe [label=3D"Max Khon\nfjoe@FreeBSD.org\n2001/08/06\n2021/12/0= 6"]
> +flz [label=3D"Florent Thoumie\nflz@FreeBSD.org\n2005/03/01\n2014= /10/17"]
> +gabor [label=3D"Gabor Kovesdan\ngabor@FreeBSD.org\n2006/12/05\n2= 019/09/02"]
> +gblach [label=3D"Grzegorz Blach\ngblach@FreeBSD.org\n2012/11/03\= n2020/08/03"]
> +glarkin [label=3D"Greg Larkin\nglarkin@FreeBSD.org\n2008/07/17\n= 2014/06/04"]
> +gnn [label=3D"George Neville-Neil\ngnn@FreeBSD.org\n2013/09/04\n= 2020/06/02"]
> +gordon [label=3D"Gordon Tetlow\ngordon@FreeBSD.org\n2014/10/14\n= 2019/04/08"]
> +hq [label=3D"Herve Quiroz\nhq@FreeBSD.org\n2004/08/05\n2014/03/0= 2"]
> +ijliao [label=3D"Ying-Chieh Liao\nijliao@FreeBSD.org\n2001/01/20= \n2011/01/02"]
> +itetcu [label=3D"Ion-Mihai Tetcu\nitetcu@FreeBSD.org\n2006/06/07= \n2018/11/06"]
> +jacula [label=3D"Giuseppe Pilichi\njacula@FreeBSD.org\n2010/04/0= 5\n2011/10/14"]
> +jadawin [label=3D"Philippe Audeoud\njadawin@FreeBSD.org\n2008/03= /02\n2020/10/05"]
> +jlaffaye [label=3D"Julien Laffaye\njlaffaye@FreeBSD.org\n2011/06= /06\n2021/06/07"]
>=C2=A0 jmallett [label=3D"Juli Mallett\njmallett@FreeBSD.org\n2003= /01/16\n2006/08/10"]
> +jmelo [label=3D"Jean Milanez Melo\njmelo@FreeBSD.org\n2006/03/31= \n2013/08/18"]
> +johans [label=3D"Johan Selst\njohans@FreeBSD.org\n2006/04/01\n20= 19/11/04"]
> +jsa [label=3D"Joseph S. Atkinson\njsa@FreeBSD.org\n2010/07/15&qu= ot;]
> +junovitch [label=3D"Jason Unovitch\njunovitch@FreeBSD.org\n2015/= 07/27\n2018/01/04"]
> +jylefort [label=3D"Jean-Yves Lefort\njylefort@FreeBSD.org\n2008/= 04/24"]
> +kevlo [label=3D"Kevin Lo\nkevlo@FreeBSD.org\n2003/02/21\n2020/09= /07"]
> +kmoore [label=3D"Kris Moore\nkmoore@FreeBSD.org\n2009/04/14\n202= 1/05/04"]
> +koitsu [label=3D"Jeremy Chadwick\nkoitsu@FreeBSD.org\n2006/11/10= \n2008/08/18"]
> +koobs [label=3D"Kubilay Kocak\nkoobs@FreeBSD.org\n2012/12/24\n20= 22/03/07"]
> +laszlof [label=3D"Frank Laszlo\nlaszlof@FreeBSD.org\n2006/11/07\= n2010/07/05"]
> +lbr [label=3D"Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30= "]
> +leeym [label=3D"Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14\n201= 7/01/02"]
> +lifanov [label=3D"Nikolai Lifanov\nlifanov@FreeBSD.org\n2016/12/= 11\n2021/05/04"]
> +linimon [label=3D"Mark Linimon\nlinimon@FreeBSD.org\n2003/10/23\= n2022/05/05"]
> +lioux [label=3D"Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.or= g\n2015/10/14\n2015/10/14"]
> +lippe [label=3D"Felippe de Meirelles Motta\nlippe@FreeBSD.org\n2= 015/14/10\n2015/10/14"]
> +lth [label=3D"Lars Thegler\nlth@FreeBSD.org\n2004/05/04\n2018/10= /07"]
> +lx [label=3D"David Thiel\nlx@FreeBSD.org\n2006/11/29"]
> +maho [label=3D"Maho Nakata\nmaho@FreeBSD.org\n2002/10/17\n2018/0= 3/11"]
>=C2=A0 marcel [label=3D"Marcel Moolenaar\nmarcel@FreeBSD.org\n1999= /07/03\n2007/07/01"]
> -sobomax[label=3D"Maxim Sobolev\nsobomax@FreeBSD.org\n2000/05/17\= n2018/12/03"]
> -steve [label=3D"Steve Price\nsteve@FreeBSD.org\nxxxx/xx/xx\nxxxx= /xx/xx"]
> +marino [label=3D"John Marino\nmarino@FreeBSD.org\n2013/07/04\n20= 17/02/10"]
> +marius [label=3D"Marius Strobl\nmarius@FreeBSD.org\n2012/12/29\n= 2023/02/07"]
> +markus [label=3D"Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21= \n2011/07/05"]
> +mezz [label=3D"Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30&qu= ot;]
> +mharo [label=3D"Michael Haro\nmharo@FreeBSD.org\n1999/04/13\n200= 7/09/01"]
> +miwi [label=3D"Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04\n2021/= 05/04"]
> +mnag [label=3D"Marcus Alves Grando\nmnag@FreeBSD.org\n2005/09/15= \n2012/02/01"]
> +mva [label=3D"Marcus von Appen\nmva@FreeBSD.org\n2009/02/16\n201= 7/01/22"]
> +nemoliu [label=3D"Tong Liu\nnemoliu@FreeBSD.org\n2007/04/25\n201= 1/09/15"]
> +nemysis [label=3D"Rusmir Dusko\nnemysis@FreeBSD.org\n2013/07/31\= n2018/09/03"]
> +nox [label=3D"Juergen Lock\nnox@FreeBSD.org\n2006/12/22"] > +obrien [label=3D"David E. O'Brien\nobrien@FreeBSD.org\n1996/= 10/29\n2015/06/11"]
> +pat [label=3D"Patrick Li\npat@FreeBSD.org\n2001/11/14\n2008/02/0= 8"]
> +pav [label=3D"Pav Lucistnik\npav@FreeBSD.org\n2003/11/12\n2013/1= 2/20"]
> +pawel [label=3D"Pawel Pekala\npawel@FreeBSD.org\n2011/03/11\n201= 8/02/24"]
> +pclin [label=3D"Po-Chien Lin\npclin@FreeBSD.org\n2013/02/11\n201= 4/10/17"]
> +pgj [label=3D"Gabor Pali\npgj@FreeBSD.org\n2009/04/12\n2018/11/0= 6\n2018/11/06"]
> +pgollucci [label=3D"Philip M.=C2=A0 Gollucci\npgollucci@FreeBSD.= org\n2008/07/21\n2017/03/29"]
> +rafan [label=3D"Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23\n2015= /01/21"]
> +rezny [label=3D"Matthew Rezny\nrezny@FreeBSD.org\n2017/01/09\n20= 19/02/04"]
> +rnoland [label=3D"Robert Noland\nrnoland@FreeBSD.org\n2008/07/21= \n2011/07/05"]
> +rpaulo [label=3D"Rui Paulo\nrpaulo@FreeBSD.org\n2014/07/15\n2017= /08/20"]
> +sahil [label=3D"Sahil Tandon\nsahil@FreeBSD.org\n2010/04/11"= ;]
> +sat [label=3D"Andrew Pantyukhin\nsat@FreeBSD.org\n2006/05/06\n20= 09/07/17"]
> +scheidell [label=3D"Michael Scheidell\nscheidell@FreeBSD.org\n20= 11/11/06\n2013/03/19"]
> +seanc [label=3D"Sean Chittenden\nseanc@FreeBSD.org\n2002/08/15\n= 2007/09/01"]
> +sergei [label=3D"Sergei Kolobov\nsergei@FreeBSD.org\n2003/10/21\= n2011/09/15"]
> +shurd [label=3D"Stephen Hurd\nshurd@FreeBSD.org\n2014/06/14\n202= 1/06/07"]
> +simon [label=3D"Simon L. Nielsen\nsimon@FreeBSD.org\n2005/01/08\= n2015/10/14"]
> +sobomax [label=3D"Maxim Sobolev\nsobomax@FreeBSD.org\n2000/05/17= \n2018/12/03"]
> +sperber [label=3D"Armin Pirkovitsch\nsperber@FreeBSD.org\n2012/0= 4/15"]
> +stas [label=3D"Stanislav Sedov\nstas@FreeBSD.org\n2006/09/18\n20= 11/11/05"]
> +stefan [label=3D"Stefan Walter\nstefan@FreeBSD.org\n2006/05/07&q= uot;]
> +steve [label=3D"Steve Price\nsteve@FreeBSD.org\n2003/02/06\n2012= /04/03"]
> +sylvio [label=3D"Sylvio Cesar Teixeira\nsylvio@FreeBSD.org\n2009= /10/29\n2014/10/17"]
> +tabthorpe [label=3D"Thomas Abthorpe\ntabthorpe@FreeBSD.org\n2007= /08/20\n2018/02/23"]
> +tj [label=3D"Tom Judge\ntj@FreeBSD.org\n2012/05/28\n2018/11/06&q= uot;]
> +tmclaugh [label=3D"Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09= /15\n2011/04/16"]
> +trasz [label=3D"Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007= /04/12\n2022/06/06"]
> +vg [label=3D"Veniamin Gvozdikov\nvg@FreeBSD.org\n2013/06/11\n201= 8/02/23"]
> +wg [label=3D"William Grzybowski\nwg@FreeBSD.org\n2013/04/01\n202= 2/06/06"]
>=C2=A0 will [label=3D"Will Andrews\nwill@FreeBSD.org\n2000/03/20\n= 2006/09/01"]
> +wxs [label=3D"Wesley Shields\nwxs@FreeBSD.org\n2008/01/03\n2018/= 03/11"]
> +xmj [label=3D"Johannes Jost Meixner\nxmj@FreeBSD.org\n2014/04/07= \n2015/07/01"]
> +yzlin [label=3D"Yi-Jheng Lin\nyzlin@FreeBSD.org\n2009/07/19\n201= 3/08/17"]
> +zeising [label=3D"Niclas Zeising\nzeising@FreeBSD.org\n2012/07/0= 3\n2022/05/02"]
> +znerd [label=3D"Ernst de Haan\nznerd@FreeBSD.org\n2001/11/15\n20= 06/09/14"]
>=C2=A0
>=C2=A0 node [color=3Dlightblue2, style=3Dfilled, bgcolor=3Dblack];
>=C2=A0
>=C2=A0 # Current ports committers go here. Try to keep things sorted. >=C2=A0
>=C2=A0 "0mp" [label=3D"Mateusz Piotrowski\n0mp@FreeBSD.o= rg\n2018/06/16"]
> -ache [label=3D"Andrey Chernov\nache@FreeBSD.org\n1994/11/15"= ;]
>=C2=A0 acm [label=3D"Jose Alonso Cardenas Marquez\nacm@FreeBSD.org= \n2006/07/18"]
>=C2=A0 adamw [label=3D"Adam Weinberger\nadamw@FreeBSD.org\n2002/10= /16"]
>=C2=A0 adridg [label=3D"Adriaan de Groot\nadridg@FreeBSD.org\n2017= /09/08"]
> -ahze [label=3D"Michael Johnson\nahze@FreeBSD.org\n2004/10/29&quo= t;]
>=C2=A0 ak [label=3D"Alex Kozlov\nak@FreeBSD.org\n2012/02/29"]=
>=C2=A0 ale [label=3D"Alex Dupre\nale@FreeBSD.org\n2004/01/12"= ]
>=C2=A0 alepulver [label=3D"Alejandro Pulver\nalepulver@FreeBSD.org= \n2006/04/01"]
> -alexbl [label=3D"Alexander Botero-Lowry\nalexbl@FreeBSD.org\n200= 6/09/11"]
>=C2=A0 alexey [label=3D"Alexey Degtyarev\nalexey@FreeBSD.org\n2013= /11/09"]
> -alonso [label=3D"Alonso Schaich\nalonso@FreeBSD.org\n2014/08/14&= quot;]
>=C2=A0 amdmi3 [label=3D"Dmitry Marakasov\namdmi3@FreeBSD.org\n2008= /06/19"]
> -anray [label=3D"Andrey Slusar\nanray@FreeBSD.org\n2005/12/11&quo= t;]
>=C2=A0 antoine [label=3D"Antoine Brodin\nantoine@FreeBSD.org\n2013= /04/03"]
> -araujo [label=3D"Marcelo Araujo\naraujo@FreeBSD.org\n2007/04/26&= quot;]
>=C2=A0 arrowd [label=3D"Gleb Popov\narrowd@FreeBSD.org\n2018/05/18= "]
>=C2=A0 arved [label=3D"Tilman Linneweh\narved@FreeBSD.org\n2002/10= /15"]
>=C2=A0 ashish [label=3D"Ashish SHUKLA\nashish@FreeBSD.org\n2010/06= /10"]
> -avilla [label=3D"Alberto Villa\navilla@FreeBSD.org\n2010/01/24&q= uot;]
> -avl [label=3D"Alexander Logvinov\navl@FreeBSD.org\n2009/05/27&qu= ot;]
> -az [label=3D"Andrej Zverev\naz@FreeBSD.org\n2005/10/03"] >=C2=A0 bapt [label=3D"Baptiste Daroussin\nbapt@FreeBSD.org\n2010/0= 7/27"]
> -bar [label=3D"Barbara Guida\nbar@FreeBSD.org\n2012/11/25"]<= br> >=C2=A0 bdrewery [label=3D"Bryan Drewery\nbdrewery@FreeBSD.org\n201= 2/07/31"]
>=C2=A0 beat [label=3D"Beat Gaetzi\nbeat@FreeBSD.org\n2009/01/28&qu= ot;]
> -beech [label=3D"Beech Rintoul\nbeech@FreeBSD.org\n2007/05/30&quo= t;]
> -bf [label=3D"Brendan Fabeny\nbf@FreeBSD.org\n2010/06/02"] >=C2=A0 bland [label=3D"Alexander Nedotsukov\nbland@FreeBSD.org\n20= 03/08/14"]
>=C2=A0 bmah [label=3D"Bruce A. Mah\nbmah@FreeBSD.org\n2000/08/23&q= uot;]
>=C2=A0 bofh [label=3D"Muhammad Moinur Rahman\nbofh@FreeBSD.org\n20= 14/12/23"]
>=C2=A0 brnrd [label=3D"Bernard Spil\nbrnrd@FreeBSD.org\n2015/05/24= "]
> -brix [label=3D"Henrik Brix Andersen\nbrix@FreeBSD.org\n2007/10/3= 1"]
>=C2=A0 brooks [label=3D"Brooks Davies\nbrooks@FreeBSD.org\n2004/05= /03"]
> -bsam [label=3D"Boris Samorodov\nbsam@FreeBSD.org\n2006/07/20&quo= t;]
> -chinsan [label=3D"Chinsan Huang\nchinsan@FreeBSD.org\n2007/06/12= "]
> -clement [label=3D"Clement Laforet\nclement@FreeBSD.org\n2003/12/= 17"]
> -clsung [label=3D"Cheng-Lung Sung\nclsung@FreeBSD.org\n2004/8/18&= quot;]
>=C2=A0 cmt [label=3D"Christoph Moench-Tegeder\ncmt@FreeBSD.org\n20= 16/03/01"]
>=C2=A0 cperciva [label=3D"Colin Percival\ncperciva@FreeBSD.org\n20= 06/01/31"]
>=C2=A0 crees [label=3D"Chris Rees\ncrees@FreeBSD.org\n2011/06/11&q= uot;]
>=C2=A0 cs [label=3D"Carlo Strub\ncs@FreeBSD.org\n2011/09/13"]=
> -culot [label=3D"Frederic Culot\nculot@FreeBSD.org\n2010/10/16&qu= ot;]
>=C2=A0 cy [label=3D"Cy Schubert\ncy@FreeBSD.org\n2001/11/13"]=
> -daichi [label=3D"Daichi Goto\ndaichi@FreeBSD.org\n2002/10/17&quo= t;]
>=C2=A0 danfe [label=3D"Alexey Dokuchaev\ndanfe@FreeBSD.org\n2004/0= 8/20"]
>=C2=A0 danilo [label=3D"Danilo E. Gondolfo\ndanilo@FreeBSD.org\n20= 13/09/23"]
>=C2=A0 db [label=3D"Diane Bruce\ndb@FreeBSD.org\n2007/01/18"]=
> @@ -95,214 +177,132 @@ dch [label=3D"Dave Cottlehuber\ndch@FreeBS= D.org\n2017/09/09"]
>=C2=A0 decke [label=3D"Bernhard Froehlich\ndecke@FreeBSD.org\n2010= /03/21"]
>=C2=A0 delphij [label=3D"Xin Li\ndelphij@FreeBSD.org\n2006/05/01&q= uot;]
>=C2=A0 demon [label=3D"Dmitry Sivachenko\ndemon@FreeBSD.org\n2000/= 11/13"]
> -dhn [label=3D"Dennis Herrmann\ndhn@FreeBSD.org\n2009/03/03"= ]
>=C2=A0 diizzy [label=3D"Daniel Engberg\ndiizzy@FreeBSD.org\n2021/0= 7/06"]
>=C2=A0 dmgk [label=3D"Dmitri Goutnik\ndmgk@FreeBSD.org\n2019/09/15= "]
>=C2=A0 driesm [label=3D"Dries Michiels\ndriesm@FreeBSD.org\n2021/1= 1/06"]
> -dryice [label=3D"Dryice Dong Liu\ndryice@FreeBSD.org\n2006/12/25= "]
> -dteske [label=3D"Devin Teske\ndteske@FreeBSD.org\n2018/03/01&quo= t;]
>=C2=A0 dumbbell [label=3D"Jean-Sebastien Pedron\ndumbbell@FreeBSD.= org\n2017/01/10"]
>=C2=A0 dvl [label=3D"Dan Langille\ndvl@FreeBSD.org\n2014/08/10&quo= t;]
>=C2=A0 eadler [label=3D"Eitan Adler\neadler@FreeBSD.org\n2011/08/1= 7"]
>=C2=A0 eduardo [label=3D"Nuno Teixeira\neduardo@FreeBSD.org\n2021/= 01/27"]
> -edwin [label=3D"Edwin Groothuis\nedwin@FreeBSD.org\n2002/10/22&q= uot;]
>=C2=A0 egypcio [label=3D"Vin&iacute;cius Zavam\negypcio@FreeBS= D.org\n2018/10/04"]
>=C2=A0 ehaupt [label=3D"Emanuel Haupt\nehaupt@FreeBSD.org\n2005/10= /03"]
> -eik [label=3D"Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12"= ;]
>=C2=A0 ericbsd [label=3D"Eric Turgeon\nericbsd@FreeBSD.org\n2018/0= 3/17"]
> -erwin [label=3D"Erwin Lansing\nerwin@FreeBSD.org\n2003/06/04&quo= t;]
>=C2=A0 eugen [label=3D"Eugene Grosbein\neugen@FreeBSD.org\n2017/03= /04"]
>=C2=A0 farrokhi [label=3D"Babak Farrokhi\nfarrokhi@FreeBSD.org\n20= 06/11/07"]
>=C2=A0 feld [label=3D"Mark Felder\nfeld@FreeBSD.org\n2013/06/25&qu= ot;]
>=C2=A0 fernape [label=3D"Fernando Apesteguia\nfernape@FreeBSD.org\= n2018/03/03"]
> -fjoe [label=3D"Max Khon\nfjoe@FreeBSD.org\n2001/08/06"]
>=C2=A0 flo [label=3D"Florian Smeets\nflo@FreeBSD.org\n2010/12/07&q= uot;]
>=C2=A0 fluffy [label=3D"Dima Panov\nfluffy@FreeBSD.org\n2009/08/10= "]
> -flz [label=3D"Florent Thoumie\nflz@FreeBSD.org\n2005/03/01"= ]
>=C2=A0 fuz [label=3D"Robert Clausecker\nfuz@FreeBSD.org\n2023/02/0= 2"]
> -gabor [label=3D"Gabor Kovesdan\ngabor@FreeBSD.org\n2006/12/05&qu= ot;]
>=C2=A0 gahr [label=3D"Pietro Cerutti\ngahr@FreeBSD.org\n2008/02/20= "]
>=C2=A0 garga [label=3D"Renato Botelho\ngarga@FreeBSD.org\n2005/07/= 11"]
> -gblach [label=3D"Grzegorz Blach\ngblach@FreeBSD.org\n2012/11/03&= quot;]
>=C2=A0 gerald [label=3D"Gerald Pfeifer\ngerald@FreeBSD.org\n2002/0= 4/03"]
>=C2=A0 gjb [label=3D"Glen Barber\ngjb@FreeBSD.org\n2012/06/19"= ;]
> -glarkin [label=3D"Greg Larkin\nglarkin@FreeBSD.org\n2008/07/17&q= uot;]
>=C2=A0 glewis [label=3D"Greg Lewis\nglewis@FreeBSD.org\n2002/04/08= "]
> -gordon [label=3D"Gordon Tetlow\ngordon@FreeBSD.org\n2014/10/14&q= uot;]
>=C2=A0 grembo [label=3D"Michael Gmelin\ngrembo@FreeBSD.org\n2014/0= 1/21"]
> -gnn [label=3D"George Neville-Neil\ngnn@FreeBSD.org\n2013/09/04&q= uot;]
> -hq [label=3D"Herve Quiroz\nhq@FreeBSD.org\n2004/08/05"]
>=C2=A0 hrs [label=3D"Hiroki Sato\nhrs@FreeBSD.org\n2004/04/10"= ;]
> -ijliao [label=3D"Ying-Chieh Liao\nijliao@FreeBSD.org\n2001/01/20= "]
> -itetcu [label=3D"Ion-Mihai Tetcu\nitetcu@FreeBSD.org\n2006/06/07= "]
> -jacula [label=3D"Giuseppe Pilichi\njacula@FreeBSD.org\n2010/04/0= 5"]
> -jadawin [label=3D"Philippe Audeoud\njadawin@FreeBSD.org\n2008/03= /02"]
>=C2=A0 jase [label=3D"Jase Thew\njase@FreeBSD.org\n2012/05/30"= ;]
>=C2=A0 jbeich [label=3D"Jan Beich\njbeich@FreeBSD.org\n2015/01/19&= quot;]
>=C2=A0 jgh [label=3D"Jason Helfman\njgh@FreeBSD.org\n2011/12/16&qu= ot;]
>=C2=A0 jhale [label=3D"Jason E. Hale\njhale@FreeBSD.org\n2012/09/1= 0"]
>=C2=A0 jhixson [label=3D"John Hixson\njhixson@FreeBSD.org\n2018/07= /16"]
>=C2=A0 jkim [label=3D"Jung-uk Kim\njkim@FreeBSD.org\n2007/09/12&qu= ot;]
> -jlaffaye [label=3D"Julien Laffaye\njlaffaye@FreeBSD.org\n2011/06= /06"]
>=C2=A0 jmd [label=3D"Johannes M. Dieterich\njmd@FreeBSD.org\n2017/= 01/09"]
> -jmelo [label=3D"Jean Milanez Melo\njmelo@FreeBSD.org\n2006/03/31= "]
> -joneum [label=3D"Jochen Neumeister\njoneum@FreeBSD.org\n2017/05/= 11"]
>=C2=A0 joerg [label=3D"Joerg Wunsch\njoerg@FreeBSD.org\n1994/08/22= "]
> -johans [label=3D"Johan Selst\njohans@FreeBSD.org\n2006/04/01&quo= t;]
> +joneum [label=3D"Jochen Neumeister\njoneum@FreeBSD.org\n2017/05/= 11"]
>=C2=A0 josef [label=3D"Josef El-Rayes\njosef@FreeBSD.org\n2004/12/= 20"]
>=C2=A0 jpaetzel [label=3D"Josh Paetzel\njpaetzel@FreeBSD.org\n2008= /09/05"]
>=C2=A0 jrm [label=3D"Joseph R. Mingrone\njrm@FreeBSD.org\n2016/09/= 17"]
> -jsa [label=3D"Joseph S. Atkinson\njsa@FreeBSD.org\n2010/07/15&qu= ot;]
>=C2=A0 jsm [label=3D"Jesper Schmitz Mouridsen\njsm@FreeBSD.org\n20= 18/06/30"]
> -junovitch [label=3D"Jason Unovitch\njunovitch@FreeBSD.org\n2015/= 07/27"]
> -jylefort [label=3D"Jean-Yves Lefort\njylefort@FreeBSD.org\n2005/= 04/12"]
>=C2=A0 kai [label=3D"Kai Knoblich\nkai@FreeBSD.org\n2019/02/01&quo= t;]
>=C2=A0 kami [label=3D"Dominic Fandrey\nkami@FreeBSD.org\n2014/09/0= 9"]
>=C2=A0 kbowling [label=3D"Kevin Bowling\nkbowling@FreeBSD.org\n201= 8/09/02"]
>=C2=A0 kevans [label=3D"Kyle Evans\nkevans@FreeBSD.org\n2020/02/14= "]
> -kevlo [label=3D"Kevin Lo\nkevlo@FreeBSD.org\n2003/02/21"] > -kmoore [label=3D"Kris Moore\nkmoore@FreeBSD.org\n2009/04/14"= ;]
>=C2=A0 knu [label=3D"Akinori Musha\nknu@FreeBSD.org\n2000/03/22&qu= ot;]
> -koitsu [label=3D"Jeremy Chadwick\nkoitsu@FreeBSD.org\n2006/11/10= "]
> -koobs [label=3D"Kubilay Kocak\nkoobs@FreeBSD.org\n2012/12/24&quo= t;]
>=C2=A0 krion [label=3D"Kirill Ponomarew\nkrion@FreeBSD.org\n2003/0= 7/20"]
>=C2=A0 kwm [label=3D"Koop Mast\nkwm@FreeBSD.org\n2004/09/14"]=
> -laszlof [label=3D"Frank Laszlo\nlaszlof@FreeBSD.org\n2006/11/07&= quot;]
>=C2=A0 lawrance [label=3D"Sam Lawrance\nlawrance@FreeBSD.org\n2005= /04/11\n2007/02/21"]
>=C2=A0 lbartoletti [label=3D"Lo=C3=AFc Bartoletti\nlbartoletti@Fre= eBSD.org\n2020/01/02"]
> -lbr [label=3D"Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30= "]
>=C2=A0 lcook [label=3D"Lewis Cook\nlcook@FreeBSD.org\n2021/01/21&q= uot;]
> -leeym [label=3D"Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14"= ;]
>=C2=A0 ler [label=3D"Larry Rosenman\nler@FreeBSD.org\n2017/01/09&q= uot;]
>=C2=A0 leres [label=3D"Craig Leres\nleres@FreeBSD.org\n2017/10/10&= quot;]
>=C2=A0 lev [label=3D"Lev Serebryakov\nlev@FreeBSD.org\n2003/06/17&= quot;]
> -lifanov [label=3D"Nikolai Lifanov\nlifanov@FreeBSD.org\n2016/12/= 11"]
> -linimon [label=3D"Mark Linimon\nlinimon@FreeBSD.org\n2003/10/23&= quot;]
> -lioux [label=3D"Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.or= g\n2000/10/14"]
> -lippe [label=3D"Felippe de Meirelles Motta\nlippe@FreeBSD.org\n2= 008/03/08"]
>=C2=A0 lme [label=3D"Lars Engels\nlme@FreeBSD.org\n2007/07/09"= ;]
> -lth [label=3D"Lars Thegler\nlth@FreeBSD.org\n2004/05/04"] >=C2=A0 lwhsu [label=3D"Li-Wen Hsu\nlwhsu@FreeBSD.org\n2007/04/03&q= uot;]
> -lx [label=3D"David Thiel\nlx@FreeBSD.org\n2006/11/29"]
>=C2=A0 madpilot [label=3D"Guido Falsi\nmadpilot@FreeBSD.org\n2012/= 04/12"]
> -maho [label=3D"Maho Nakata\nmaho@FreeBSD.org\n2002/10/17"]<= br> >=C2=A0 makc [label=3D"Max Brazhnikov\nmakc@FreeBSD.org\n2008/08/25= "]
>=C2=A0 mandree [label=3D"Matthias Andree\nmandree@FreeBSD.org\n200= 9/11/18"]
>=C2=A0 manu [label=3D"Emmanuel Vadot\nmanu@FreeBSD.org\n2018/09/06= "]
>=C2=A0 marcus [label=3D"Joe Marcus Clarke\nmarcus@FreeBSD.org\n200= 2/04/05"]
> -marino [label=3D"John Marino\nmarino@FreeBSD.org\n2013/07/04&quo= t;]
> -marius [label=3D"Marius Strobl\nmarius@FreeBSD.org\n2012/12/29&q= uot;]
> -markus [label=3D"Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21= "]
>=C2=A0 martymac [label=3D"Ganael Laplanche\nmartymac@FreeBSD.org\n= 2010/09/24"]
>=C2=A0 mat [label=3D"Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15&q= uot;]
>=C2=A0 matthew [label=3D"Matthew Seaman\nmatthew@FreeBSD.org\n2012= /02/07"]
>=C2=A0 meta [label=3D"Koichiro Iwao\nmeta@FreeBSD.org\n2018/03/19&= quot;]
> -mezz [label=3D"Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30&qu= ot;]
>=C2=A0 mfechner [label=3D"Matthias Fechner\nmfechner@FreeBSD.org\n= 2018/03/01"]
> -mharo [label=3D"Michael Haro\nmharo@FreeBSD.org\n1999/04/13"= ;]
>=C2=A0 mikael [label=3D"Mikael Urankar\nmikael@FreeBSD.org\n2020/0= 1/16"]
>=C2=A0 milki [label=3D"Jonathan Chu\nmilki@FreeBSD.org\n2013/12/15= "]
>=C2=A0 misha [label=3D"Mikhail Pchelin\nmisha@FreeBSD.org\n2016/11= /15"]
> -miwi [label=3D"Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04"]=
>=C2=A0 mm [label=3D"Martin Matuska\nmm@FreeBSD.org\n2007/04/04&quo= t;]
>=C2=A0 mmokhi [label=3D"Mahdi Mokhtari\nmmokhi@FreeBSD.org\n2017/0= 2/09"]
> -mnag [label=3D"Marcus Alves Grando\nmnag@FreeBSD.org\n2005/09/15= "]
> -mva [label=3D"Marcus von Appen\nmva@FreeBSD.org\n2009/02/16"= ;]
>=C2=A0 nc [label=3D"Neel Chauhan\nnc@FreeBSD.org\n2021/01/02"= ]
> -nemysis [label=3D"Rusmir Dusko\nnemysis@FreeBSD.org\n2013/07/31&= quot;]
> -nemoliu [label=3D"Tong Liu\nnemoliu@FreeBSD.org\n2007/04/25"= ;]
>=C2=A0 netchild [label=3D"Alexander Leidinger\nnetchild@FreeBSD.or= g\n2002/03/19"]
>=C2=A0 nobutaka [label=3D"Nobutaka Mantani\nnobutaka@FreeBSD.org\n= 2001/11/02"]
>=C2=A0 nork [label=3D"Norikatsu Shigemura\nnork@FreeBSD.org\n2002/= 04/01"]
>=C2=A0 novel [label=3D"Roman Bogorodskiy\nnovel@FreeBSD.org\n2005/= 03/07"]
> -nox [label=3D"Juergen Lock\nnox@FreeBSD.org\n2006/12/22"] > -obrien [label=3D"David E. O'Brien\nobrien@FreeBSD.org\n1996/= 10/29"]
>=C2=A0 olivier [label=3D"Olivier Cochard-Labbe\nolivier@FreeBSD.or= g\n2016/02/02"]
>=C2=A0 olivierd [label=3D"Olivier Duchateau\nolivierd@FreeBSD.org\= n2012/05/29"]
>=C2=A0 osa [label=3D"Sergey A. Osokin\nosa@FreeBSD.org\n2003/06/04= "]
>=C2=A0 otis [label=3D"Juraj Lutter\notis@FreeBSD.org\n2020/12/12&q= uot;]
> -pat [label=3D"Patrick Li\npat@FreeBSD.org\n2001/11/14"]
> -pav [label=3D"Pav Lucistnik\npav@FreeBSD.org\n2003/11/12"]<= br> > -pawel [label=3D"Pawel Pekala\npawel@FreeBSD.org\n2011/03/11"= ;]
> -pclin [label=3D"Po-Chien Lin\npclin@FreeBSD.org\n2013/02/11"= ;]
>=C2=A0 pfg [label=3D"Pedro Giffuni\npfg@FreeBSD.org\n2019/04/14&qu= ot;]
> -pgj [label=3D"Gabor Pali\npgj@FreeBSD.org\n2009/04/12"]
> -pgollucci [label=3D"Philip M. Gollucci\npgollucci@FreeBSD.org\n2= 008/07/21"]
>=C2=A0 philip [label=3D"Philip Paeps\nphilip@FreeBSD.org\n2005/10/= 19"]
>=C2=A0 pi [label=3D"Kurt Jaeger\npi@FreeBSD.org\n2014/03/14"]=
>=C2=A0 pizzamig [label=3D"Luca Pizzamiglio\npizzamig@FreeBSD.org\n= 2017/08/25"]
>=C2=A0 pkubaj [label=3D"Piotr Kubaj\npkubaj@FreeBSD.org\n2019/04/1= 4"]
> -rafan [label=3D"Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23"= ]
>=C2=A0 rakuco [label=3D"Raphael Kubo da Costa\nrakuco@FreeBSD.org\= n2011/08/22"]
>=C2=A0 rene [label=3D"Rene Ladan\nrene@FreeBSD.org\n2010/04/11&quo= t;]
> -rezny [label=3D"Matthew Rezny\nrezny@FreeBSD.org\n2017/01/09&quo= t;]
>=C2=A0 rhurlin [label=3D"Rainer Hurling\nrhurlin@FreeBSD.org\n2020= /08/31"]
>=C2=A0 riggs [label=3D"Thomas Zander\nriggs@FreeBSD.org\n2014/01/0= 9"]
>=C2=A0 rigoletto [label=3D"Alexandre C. Guimaraes\nrigoletto@FreeB= SD.org\n2018/10/01"]
>=C2=A0 rm [label=3D"Ruslan Makhmatkhanov\nrm@FreeBSD.org\n2011/11/= 06"]
> -rnoland [label=3D"Robert Noland\nrnoland@FreeBSD.org\n2008/07/21= "]
>=C2=A0 robak [label=3D"Bartek Rutkowski\nrobak@FreeBSD.org\n2014/0= 6/10"]
>=C2=A0 rodrigo [label=3D"Rodrigo Osorio\nrodrigo@FreeBSD.org\n2014= /01/15"]
>=C2=A0 romain [label=3D"Romain Tartiere\nromain@FreeBSD.org\n2010/= 01/24"]
>=C2=A0 ronald [label=3D"Ronald Klop\nronald@FreeBSD.org\n2022/10/0= 6"]
> -rpaulo [label=3D"Rui Paulo\nrpaulo@FreeBSD.org\n2014/07/15"= ]
> -sahil [label=3D"Sahil Tandon\nsahil@FreeBSD.org\n2010/04/11"= ;]
>=C2=A0 salvadore [label=3D"Lorenzo Salvadore\nsalvadore@FreeBSD.or= g\n2020/02/21"]
>=C2=A0 samm [label=3D"Alex Samorukov\nsamm@FreeBSD.org\n2019/10/09= "]
> -sat [label=3D"Andrew Pantyukhin\nsat@FreeBSD.org\n2006/05/06&quo= t;]
>=C2=A0 sbruno [label=3D"Sean Bruno\nsbruno@FreeBSD.org\n2014/09/14= "]
>=C2=A0 sbz [label=3D"Sofian Brabez\nsbz@FreeBSD.org\n2011/03/14&qu= ot;]
> -scheidell [label=3D"Michael Scheidell\nscheidell@FreeBSD.org\n20= 11/11/06"]
> -seanc [label=3D"Sean Chittenden\nseanc@FreeBSD.org\n2002/08/15&q= uot;]
>=C2=A0 sem [label=3D"Sergey Matveychuk\nsem@FreeBSD.org\n2004/07/0= 7"]
> -sergei [label=3D"Sergei Kolobov\nsergei@FreeBSD.org\n2003/10/21&= quot;]
>=C2=A0 shaun [label=3D"Shaun Amott\nshaun@FreeBSD.org\n2006/06/19&= quot;]
> -shurd [label=3D"Stephen Hurd\nshurd@FreeBSD.org\n2014/06/14"= ;]
> -simon [label=3D"Simon L. Nielsen\nsimon@FreeBSD.org\n2005/01/08&= quot;]
>=C2=A0 skozlov [label=3D"Sergey Kozlov\nskozlov@FreeBSD.org\n2018/= 09/21"]
>=C2=A0 skreuzer [label=3D"Steven Kreuzer\nskreuzer@FreeBSD.org\n20= 09/03/25"]
> -sperber[label=3D"Armin Pirkovitsch\nsperber@FreeBSD.org\n2012/04= /15"]
> -stas [label=3D"Stanislav Sedov\nstas@FreeBSD.org\n2006/09/18&quo= t;]
> -stefan [label=3D"Stefan Walter\nstefan@FreeBSD.org\n2006/05/07&q= uot;]
>=C2=A0 stephen [label=3D"Stephen Montgomery-Smith\nstephen@FreeBSD= .org\n2011/06/13"]
>=C2=A0 sunpoet [label=3D"Po-Chuan Hsieh\nsunpoet@FreeBSD.org\n2010= /09/21"]
>=C2=A0 swills [label=3D"Steve Wills\nswills@FreeBSD.org\n2010/09/0= 3"]
> -sylvio [label=3D"Sylvio Cesar Teixeira\nsylvio@FreeBSD.org\n2009= /10/29"]
> -tabthorpe [label=3D"Thomas Abthorpe\ntabthorpe@FreeBSD.org\n2007= /08/20"]
>=C2=A0 tagattie [label=3D"Hiroki Tagato\ntagattie@FreeBSD.org\n202= 0/04/01"]
>=C2=A0 tcberner [label=3D"Tobias C. Berner\ntcberner@FreeBSD.org\n= 2016/07/06"]
>=C2=A0 tdb [label=3D"Tim Bishop\ntdb@FreeBSD.org\n2005/11/30"= ]
>=C2=A0 thierry [label=3D"Thierry Thomas\nthierry@FreeBSD.org\n2004= /03/15"]
>=C2=A0 tijl [label=3D"Tijl Coosemans\ntijl@FreeBSD.org\n2013/03/27= "]
>=C2=A0 timur [label=3D"Timur Bakeyev\ntimur@FreeBSD.org\n2007/06/0= 7"]
> -tj [label=3D"Tom Judge\ntj@FreeBSD.org\n2012/05/28"]
> -tmclaugh [label=3D"Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09= /15"]
>=C2=A0 tobik [label=3D"Tobias Kortkamp\ntobik@FreeBSD.org\n2017/02= /08"]
>=C2=A0 tota [label=3D"TAKATSU Tomonari\ntota@FreeBSD.org\n2009/03/= 30"]
> -trasz [label=3D"Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007= /04/12"]
>=C2=A0 trhodes [label=3D"Tom Rhodes\ntrhodes@FreeBSD.org\n2004/07/= 06"]
>=C2=A0 trociny [label=3D"Mikolaj Golub\ntrociny@FreeBSD.org\n2013/= 10/17"]
>=C2=A0 tz [label=3D"Torsten Zuehlsdorff\ntz@FreeBSD.org\n2016/06/0= 4"]
>=C2=A0 ultima [label=3D"Richard Gallamore\nultima@FreeBSD.org\n201= 7/06/07"]
>=C2=A0 uqs [label=3D"Ulrich Spoerlein\nuqs@FreeBSD.org\n2012/01/19= "]
>=C2=A0 vd [label=3D"Vasil Dimov\nvd@FreeBSD.org\n2006/01/19"]=
> -vg [label=3D"Veniamin Gvozdikov\nvg@FreeBSD.org\n2013/06/11"= ;]
>=C2=A0 vishwin [label=3D"Charlie Li\nvishwin@FreeBSD.org\n2021/04/= 29"]
>=C2=A0 vsevolod [label=3D"Vsevolod Stakhov\nvsevolod@FreeBSD.org\n= 2005/07/22"]
>=C2=A0 wen [label=3D"Wen Heping\nwen@FreeBSD.org\n2010/12/13"= ]
> -wg [label=3D"William Grzybowski\nwg@FreeBSD.org\n2013/04/01"= ;]
>=C2=A0 woodsb02 [label=3D"Ben Woods\nwoodsb02@FreeBSD.org\n2016/05= /09"]
> -wxs [label=3D"Wesley Shields\nwxs@FreeBSD.org\n2008/01/03"]=
> -xmj [label=3D"Johannes Jost Meixner\nxmj@FreeBSD.org\n2014/04/07= "]
>=C2=A0 xride [label=3D"Soeren Straarup\nxride@FreeBSD.org\n2006/09= /27"]
>=C2=A0 yasu [label=3D"Yasuhiro Kimura\nyasu@FreeBSD.org\n2021/08/2= 7"]
>=C2=A0 ygy [label=3D"Guangyuan Yang\nygy@FreeBSD.org\n2021/05/17&q= uot;]
>=C2=A0 yuri [label=3D"Yuri Victorovich\nyuri@FreeBSD.org\n2017/10/= 30"]
> -yzlin [label=3D"Yi-Jheng Lin\nyzlin@FreeBSD.org\n2009/07/19"= ;]
> -zeising [label=3D"Niclas Zeising\nzeising@FreeBSD.org\n2012/07/0= 3"]
>=C2=A0 zi [label=3D"Ryan Steinmetz\nzi@FreeBSD.org\n2011/07/14&quo= t;]
>=C2=A0 zirias [label=3D"Felix Palmen\nzirias@FreeBSD.org\n2022/08/= 02"]
> -znerd [label=3D"Ernst de Haan\nznerd@FreeBSD.org\n2001/11/15&quo= t;]
>=C2=A0
>=C2=A0 # Here are the mentor/mentee relationships.
>=C2=A0 # Group together all the mentees for a particular mentor.
--000000000000fbee3405f81d9280-- From nobody Thu Mar 30 13:07: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 4PnNxM0Z1gz4301Q; Thu, 30 Mar 2023 13:07:19 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) (using TLSv1.3 with cipher TLS_AES_256_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 4PnNxL5dMLz3hs7; Thu, 30 Mar 2023 13:07:18 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; none Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 7B4E43200927; Thu, 30 Mar 2023 09:07:16 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 30 Mar 2023 09:07:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; t= 1680181636; x=1680268036; bh=bgM0r4WVOR5n/fTVkPDSRvyfCIxZHqfuMEG JWVz6Mag=; b=a/ToJH/mCwM6YyIrBI6EjTmhIfbo3RLD6DcStMSnWJIlQfeQtIT rOUwUIPjnbSumRUlvuo/VmtV6uwuB6lLS0wudFeNLYjlI2Q4fhPOSfYcByC8fm/o Zv4m+nT3iZVw/6rLHWeEdUjKYWTwpqpmqlMFjLDe48+nAGMOgn/soW9XqgDKwoEx i4gP7n2WbkFWd6ICONv11yBCWbwSdZWqTfPgHxA656gRV+VaWHhE2WbGaodWGCuB vDQdgars/h2EHgdt2Wz8Ehv6Jf7QNSYrmrFtXFug8deQfCyr/m0KKYaWaYLT9vtE JRBHcMETUq0+XkoxgMqfVJNUGyRZ45yRlAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1680181636; x= 1680268036; bh=bgM0r4WVOR5n/fTVkPDSRvyfCIxZHqfuMEGJWVz6Mag=; b=U nd8AutbeM5xI6HCieTM/gfVb7oaZ1TfeNhiav/jeblWmByym64l2hUe0kxDdnl3b azE31i3G2xaU3IVxDUd4rJswbGVnmaay4Y6ViTYE4hOGwfH2nnVGrWRv53zpcxr5 JvjGt8/3J70zkSZ+ZshXl0sD/k34DACAJ9Lk08TWCgyxmgzVw76p2xKIsPm+Qjfl vgfjGLWggCu5ZpkiibglKCwbeQAq0jws+mKTL6cFCejKSSrLXlWbCT3VZNktSPIn NdRdTUfG4V5n5FM+BMyVUIvaXrt1M+32UwfT4fB/nFz+OJzy6AojnMP6FZyFPUJF mnGkpEcRiM8qG2V60lERA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehkedgheelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefkffggfgfuvfhfhfgjtgfgsehtke ertddtfeejnecuhfhrohhmpegjuhhrihcuoeihuhhrihesrggvthgvrhhnrdhorhhgqeen ucggtffrrghtthgvrhhnpeeivefgieekjeetgfetieffgeduteehhefhudeufefhjeehge ffteevlefffffggeenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeihuhhrihesrggvthgvrh hnrdhorhhg X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 30 Mar 2023 09:07:14 -0400 (EDT) Message-ID: <5ac0249d-dc67-22c1-2ebc-9b2ad6bccd43@aetern.org> Date: Thu, 30 Mar 2023 15:07:12 +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: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: git: a2d2f25dd44c - main - committers-ports.dot: Fix alexbl entry Content-Language: en-US To: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202303301252.32UCqR5T014122@gitrepo.freebsd.org> From: Yuri In-Reply-To: <202303301252.32UCqR5T014122@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PnNxL5dMLz3hs7 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Fernando Apesteguía wrote: > The branch main has been updated by fernape: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a2d2f25dd44ce9a7bed1e83cf63ccae9a46b2d0b > > commit a2d2f25dd44ce9a7bed1e83cf63ccae9a46b2d0b > Author: Fernando Apesteguía > AuthorDate: 2023-03-30 12:46:47 +0000 > Commit: Fernando Apesteguía > CommitDate: 2023-03-30 12:46:47 +0000 > > committers-ports.dot: Fix alexbl entry > > Copy-paste error. > > Reported by: dchagin > Fixes: 5faf90050e6c > --- > share/misc/committers-ports.dot | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot > index ab6bd8385fe7..b0aa4e16408a 100644 > --- a/share/misc/committers-ports.dot > +++ b/share/misc/committers-ports.dot > @@ -31,7 +31,7 @@ node [color=grey62, style=filled, bgcolor=black]; > > ache [label="Andrey Chernov\nache@FreeBSD.org\n1994/11/15\n2017/08/17"] > ahze [label="Michael Johnson\nahze@FreeBSD.org\n2004/10/29\n2013/12/02"] > -alexbl [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] > +alexbl [label="Alexandr Botero\nalexbl@FreeBSD.org\n2006/09/11\n2011/01/14"] It's still wrong, please check the original entry: -alexbl [label="Alexander Botero-Lowry\nalexbl@FreeBSD.org\n2006/09/11"] > alonso [label="Alonso Schaich\nalonso@FreeBSD.org\n2014/08/14\n2017/08/07"] > anray [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] > araujo [label="Marcelo Araujo\naraujo@FreeBSD.org\n2007/04/26\n2020/11/03"] From nobody Thu Mar 30 13:20: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 4PnPD76T2pz41ljV; Thu, 30 Mar 2023 13:20: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 4PnPD760Dvz3jrT; Thu, 30 Mar 2023 13:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680182407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TlssGNtwM4m12dmxSL6N7UhsdY/TRxHS6ERdpa1X3lE=; b=tcbMGr+Ft6FNSIkM+kZOap6nZUn2e51mc1W37UoIXen2KiKdBKevL9/UcgaKd/tjar9g+5 PcN/ZHNZfKDTTpLQ0TYrVl02c6nNvoNaUzC90ySoKD/ihpf1qt3QXWO5tNvmsRAJg2XaHx FA6bwsxXarHc4IW/fl1+DMZbhTb8NtWOu0753TRwUyctPFyjcaKK84yO9KdyucG4z5nw/n pHFPBsTveGI2YZEE7yQuQk71mTxLvQ7BrDGpeWsTPPPki85t+m1BUogyFc9XHJvl74tXCq Lin+cqgAHWNQ6Tm0veYWj6Wq8QGN20SfoJ9KJXDhj5bMECziVjGe/KyGiLVqdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680182407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TlssGNtwM4m12dmxSL6N7UhsdY/TRxHS6ERdpa1X3lE=; b=dZQEZOQt/i33j5FVxffHsVzYUQGdOSl9lB6gl1vge5DoGZRUI6To8oWbZwn6jgqBTSf/MI qlajeGtdTE4ZEfdG+z02N9G07qniqP+MX6MIl7UU05aU29ap1urtwZA3sL8locMR45CZRU 7lca/XwG6jBtJgsWcJ7pQDqd0Ba6C/kug7cRevpJwA1xlgMvpaSTsmgXflevEiIz+WKUnl +V/toR5GRqTjVkS/XaNN3BKdZI0prjFSCRA7SUxAgb51LmrDpS49RngW/HNIfWyDRYXu+f iphv5g4QxHIhrMjLXHswNE3ML2bsW7WvQNFWcM5NJxFZkFH0wt/fmgNJCJQuPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680182407; a=rsa-sha256; cv=none; b=mfRrq1Wn/c24gqpgkiZGt6g8w+geytOmzSPiovUWzGg6dN+IaYTaPgoAiyckztgW3qMFU/ eiDdJoUIP+uGdnwz0EmLFa7kdPubC+jkOJf0SwdKhgb1dicKXBsKtkzZncDwhiIIK03lfq ZtYPcgVGG40VLJtgzubk8JcTxTXhzMZx47bGhoBvx9SBl8gq4QLVArqHkzWEax65cYUSKM 5/UxV52H8WCILK1g/Ynl+NrcYBc9Jp7hkjjvK5PtrPpWZ6D3dkyyVSR473Iq5Adn6A8hXs 41e6werfL292aexA1YnxxT9yzDIpOGjw9Qm1AcMfr1Kkdb9lNeendJjim/pa/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnPD753L3zDd1; Thu, 30 Mar 2023 13:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UDK77H051575; Thu, 30 Mar 2023 13:20:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UDK72b051572; Thu, 30 Mar 2023 13:20:07 GMT (envelope-from git) Date: Thu, 30 Mar 2023 13:20:07 GMT Message-Id: <202303301320.32UDK72b051572@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: cc4adc4c4e47 - main - makefs: remove vestigial '?' cases from top-level getopt(3) 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc4adc4c4e473d47b687d2ac2757157abd728c81 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cc4adc4c4e473d47b687d2ac2757157abd728c81 commit cc4adc4c4e473d47b687d2ac2757157abd728c81 Author: Ed Maste AuthorDate: 2023-03-30 01:33:39 +0000 Commit: Ed Maste CommitDate: 2023-03-30 13:20:00 +0000 makefs: remove vestigial '?' cases from top-level getopt(3) loop getopt(3) returns '?' when it encounters a flag not present in the in the optstring or if a flag is missing its option argument. We can handle this case with the "default" failure case with no loss of legibility. Obtained from: OpenBSD makefs.c 1.22 --- usr.sbin/makefs/makefs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c index 2b97c7643e1a..e775b72fd4bb 100644 --- a/usr.sbin/makefs/makefs.c +++ b/usr.sbin/makefs/makefs.c @@ -273,7 +273,6 @@ main(int argc, char *argv[]) fsoptions.sparse = 1; break; - case '?': default: usage(fstype, &fsoptions); /* NOTREACHED */ From nobody Thu Mar 30 13:20: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 4PnPD90Jqtz41llH; Thu, 30 Mar 2023 13:20: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 4PnPD86wsGz3jrq; Thu, 30 Mar 2023 13:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680182409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cB7xy695yzghCGVmn3nkRHPHr59hdVP2DqoPKKHLoXQ=; b=oqEHbiRLa3l9SvHTH3MobL6upb27ci9mhryYZmGYOYBdW/JFMLS8aMCe2/FIH2e/sIC8PA MAO61XrKL7yMrB8JqEj3ouGb1sZx4B9/ebs3WY+WDhIGJnLPHMMqhLyskUMkVl9r1o94t3 mBCip6vuOgP1Q0RIPISR/Tt25ID2cxjCKAhez2bB0PArJnX+595aT8+RoTQS7bTxO3UiXv kri9RaReB4HeEPSgk2FfeWev7odgTbYKisUi5m7ZrTRNMfEJt5TaVjJDm3S+Vm1hxhZVQ9 D64LqikM3C2/1Di4m8mzj6/ot8AzR5U1lGhYNd4DlhxJsZp6+uPt5dmL6PD+hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680182409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cB7xy695yzghCGVmn3nkRHPHr59hdVP2DqoPKKHLoXQ=; b=JKQfBrv7vzB/K/eh3T5LTBwFP8Rdzv9+3/D1WMp19NdTzdl2mtlVpkIspURZ42xmH16Ee9 wuixkCjtBGUq6uTeVv6cFlK4GyTIFpj3AvSQxAQXKs/C8ImSSChKsOneP6Z96KIN/qXshH ZF5nt3F5EqKM2AY+DUdFIDUwjuICFJvlJGhrCfhfrsnq+grlH6aRd98QYfTuTN5M9vqxQL jrwFvOr7k7NVTaGXxK7quOUr/tfVFFJ65JNl+Mqs/Z3ec0gBkebYYzpaPt7KEatvqM+00G hQsvXXFArNrb0XvKVBMr6Lnk8Zhd+h09s5NrK+IcWClHMW0z9hfSoKcAwMj2KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680182409; a=rsa-sha256; cv=none; b=BQhq+BqiYFC2l/BbMnvaoAU5860gAUGRwK8LxFuligcjReG5mBEPTvUGdqH2QBRwM9G92U Pag5EMnbZC1k0oJRVbxs+O/PmGvV1xYuTC3dPHguCNPdk8UhdWR+gAyH0j2lfGm6JcTwGZ 5RjphzTrB7V82s83ijJGpZCEPEIlvfWllGwgSgA6xst1bFk15hKtpm5MYikAm9ON6BwB1i iYdtQP0rUI6tis43gZXSGR5l++yAFL00eLAe9zjXzqiWvGsAn4mjZG6fHDMzDWZ1tLnlx/ fsYLTsOsF2BaZ0GbpsR1Z+8P1Y3qu6+YsHYuMOVqs7MNGWA1SfM04sBcMYjj0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnPD85ZtBz1CMX; Thu, 30 Mar 2023 13:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UDK8tC051861; Thu, 30 Mar 2023 13:20:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UDK8Fu051857; Thu, 30 Mar 2023 13:20:08 GMT (envelope-from git) Date: Thu, 30 Mar 2023 13:20:08 GMT Message-Id: <202303301320.32UDK8Fu051857@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: 45e405603b7f - main - makefs: do not pass mode to open() call lacking O_CREAT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 45e405603b7f4d33372f32c80453ab5cd0d8fdcf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=45e405603b7f4d33372f32c80453ab5cd0d8fdcf commit 45e405603b7f4d33372f32c80453ab5cd0d8fdcf Author: Ed Maste AuthorDate: 2023-03-30 01:42:44 +0000 Commit: Ed Maste CommitDate: 2023-03-30 13:20:00 +0000 makefs: do not pass mode to open() call lacking O_CREAT Obtained from: OpenBSD ffs.c 1.35 --- usr.sbin/makefs/ffs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index ac214a775e9d..cc0f640e3c9c 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -954,7 +954,7 @@ ffs_write_file(union dinode *din, uint32_t ino, void *buf, fsinfo_t *fsopts) if (isfile) { fbuf = emalloc(ffs_opts->bsize); - if ((ffd = open((char *)buf, O_RDONLY, 0444)) == -1) { + if ((ffd = open((char *)buf, O_RDONLY)) == -1) { err(EXIT_FAILURE, "Can't open `%s' for reading", (char *)buf); } } else { From nobody Thu Mar 30 14:04: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 4PnQJH0893z41pdc; Thu, 30 Mar 2023 14:08:47 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.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 4PnQJG5d22z3v9Y; Thu, 30 Mar 2023 14:08:46 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f43.google.com with SMTP id q16so24664968lfe.10; Thu, 30 Mar 2023 07:08:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680185324; 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=LQ0HUakSWzPVt9VU7hSeeiPiMK45fzPA3Tnpjhi2/UU=; b=My3RpoImTe2SHgnbSZUHIb3pVHuvTa6Sb2y/cGNIPCea4qRZgL/9F+PZI32geNAKjm O7aIbuQs6D9EHMKsEcg0/Z1cnv+aYJrNVoY6lNR8IYPNspUMqOtaiHn19RM0GUGh5qvL 1D2mdM2PwY+ETJNhLCVSrt5wrfrHt5Tq8DXPok50VCJYtv2vPqIEwE62WNg8rZYyxeD9 +HJ9cJ/ZD+b3HD2tghv9CZvOrt6WcOjqww6x4094V+J6H8Uvy1WVIV/PsChHnri2mVwg RfqmJumuHZcXHQaFf/9R3Lk+vEJ/2lBqYHCIWpuHynUKNURaoaiTLzbMUWcnPZry2PZI ZKRQ== X-Gm-Message-State: AAQBX9eKlvh2UKgD47wxViuKBw0/icRZYtzDBu25U7/STblJ4V3nNZBr A7WIZ87SNqIEd35NhG0p72JUiNuTmb5+7w== X-Google-Smtp-Source: AKy350ZPX48lY+8FC4I4ZCiHlxHgYKLtFJMIwpd2eXnDek0pQAaPUFEXdrwzFwwXgmWBPlrKF5HowQ== X-Received: by 2002:ac2:51a1:0:b0:4df:830d:4a3a with SMTP id f1-20020ac251a1000000b004df830d4a3amr7114557lfk.23.1680185324341; Thu, 30 Mar 2023 07:08:44 -0700 (PDT) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com. [209.85.167.42]) by smtp.gmail.com with ESMTPSA id c18-20020a05651221b200b004dc53353d15sm5872340lft.281.2023.03.30.07.08.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Mar 2023 07:08:44 -0700 (PDT) Received: by mail-lf1-f42.google.com with SMTP id c9so14257676lfb.1; Thu, 30 Mar 2023 07:08:44 -0700 (PDT) X-Received: by 2002:a05:6512:3694:b0:4e8:49cc:6744 with SMTP id d20-20020a056512369400b004e849cc6744mr2784722lfs.1.1680185324099; Thu, 30 Mar 2023 07:08:44 -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: <202303301252.32UCqR5T014122@gitrepo.freebsd.org> <5ac0249d-dc67-22c1-2ebc-9b2ad6bccd43@aetern.org> In-Reply-To: <5ac0249d-dc67-22c1-2ebc-9b2ad6bccd43@aetern.org> From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Thu, 30 Mar 2023 16:04:09 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: a2d2f25dd44c - main - committers-ports.dot: Fix alexbl entry To: Yuri Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000665fbe05f81ea12f" X-Rspamd-Queue-Id: 4PnQJG5d22z3v9Y X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --000000000000665fbe05f81ea12f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 30, 2023 at 3:07=E2=80=AFPM Yuri wrote: > Fernando Apestegu=C3=ADa wrote: > > The branch main has been updated by fernape: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Da2d2f25dd44ce9a7bed1e83cf63ccae= 9a46b2d0b > > > > commit a2d2f25dd44ce9a7bed1e83cf63ccae9a46b2d0b > > Author: Fernando Apestegu=C3=ADa > > AuthorDate: 2023-03-30 12:46:47 +0000 > > Commit: Fernando Apestegu=C3=ADa > > CommitDate: 2023-03-30 12:46:47 +0000 > > > > committers-ports.dot: Fix alexbl entry > > > > Copy-paste error. > > > > Reported by: dchagin > > Fixes: 5faf90050e6c > > --- > > share/misc/committers-ports.dot | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/share/misc/committers-ports.dot > b/share/misc/committers-ports.dot > > index ab6bd8385fe7..b0aa4e16408a 100644 > > --- a/share/misc/committers-ports.dot > > +++ b/share/misc/committers-ports.dot > > @@ -31,7 +31,7 @@ node [color=3Dgrey62, style=3Dfilled, bgcolor=3Dblack= ]; > > > > ache [label=3D"Andrey Chernov\nache@FreeBSD.org\n1994/11/15\n2017/08/1= 7"] > > ahze [label=3D"Michael Johnson\nahze@FreeBSD.org > \n2004/10/29\n2013/12/02"] > > -alexbl [label=3D"Andrey Slusar\nanray@FreeBSD.org > \n2005/12/11\n2011/01/14"] > > +alexbl [label=3D"Alexandr Botero\nalexbl@FreeBSD.org > \n2006/09/11\n2011/01/14"] > > It's still wrong, please check the original entry: > > -alexbl [label=3D"Alexander Botero-Lowry\nalexbl@FreeBSD.org\n2006/09/11"= ] > I don't think it was right in the first place. It is "Alexander Botero-Lowry" in https://docs.freebsd.org/en/articles/contributors/#staff-committers which is generated from a different file (doc-repo:shared/authors.doc) Also from the original commit message: Author: Roman Bogorodskiy Date: Mon Sep 11 17:58:58 2006 +0000 Please welcome Alexander Botero-Lowry (alexbl) to the rank of ports committers! He was working hard on the ports tree and got the usual punishment. Approved by: portmgr Account created by: simon > > > alonso [label=3D"Alonso Schaich\nalonso@FreeBSD.org > \n2014/08/14\n2017/08/07"] > > anray [label=3D"Andrey Slusar\nanray@FreeBSD.org > \n2005/12/11\n2011/01/14"] > > araujo [label=3D"Marcelo Araujo\naraujo@FreeBSD.org > \n2007/04/26\n2020/11/03"] > > --000000000000665fbe05f81ea12f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 30, 2023 at 3:07=E2=80=AF= PM Yuri <yuri@aetern.org> wrot= e:
Fernando Apes= tegu=C3=ADa wrote:
> The branch main has been updated by fernape:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3Da2d2f25dd44ce9a7bed1e83cf63ccae9a46b2d0b<= /a>
>
> commit a2d2f25dd44ce9a7bed1e83cf63ccae9a46b2d0b
> Author:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=C3=ADa <fernape@FreeBS= D.org>
> AuthorDate: 2023-03-30 12:46:47 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=C3=ADa <fernape@FreeBS= D.org>
> CommitDate: 2023-03-30 12:46:47 +0000
>
>=C2=A0 =C2=A0 =C2=A0committers-ports.dot: Fix alexbl entry
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Copy-paste error.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Reported by:=C2=A0 =C2=A0 dchagin
>=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 5faf90050e= 6c
> ---
>=C2=A0 share/misc/committers-ports.dot | 2 +-
>=C2=A0 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/share/misc/committers-ports.dot b/share/misc/committers-p= orts.dot
> index ab6bd8385fe7..b0aa4e16408a 100644
> --- a/share/misc/committers-ports.dot
> +++ b/share/misc/committers-ports.dot
> @@ -31,7 +31,7 @@ node [color=3Dgrey62, style=3Dfilled, bgcolor=3Dblac= k];
>=C2=A0
>=C2=A0 ache [label=3D"Andrey Chernov\nache@FreeBSD.org\n1994/11/15= \n2017/08/17"]
>=C2=A0 ahze [label=3D"Michael Johnson\nahze@FreeBSD.org\n2004/10/2= 9\n2013/12/02"]
> -alexbl [label=3D"Andrey Slusar\nanray@FreeBSD.org\n2005/12/11\n2= 011/01/14"]
> +alexbl [label=3D"Alexandr Botero\nalexbl@FreeBSD.org\n2006/09/11= \n2011/01/14"]

It's still wrong, please check the original entry:

-alexbl [label=3D"Alexander Botero-Lowry\nalexbl@FreeBSD.org\n2006/09/= 11"]

=

Also from the original commit message:

Author: Roman Bogorodskiy <novel@FreeBSD.org>
Date: =C2= =A0 Mon Sep 11 17:58:58 2006 +0000

=C2=A0 =C2=A0 Please welcome Alex= ander Botero-Lowry (alexbl) to the rank of ports
=C2=A0 =C2=A0 committer= s! He was working hard on the ports tree and got the usual
=C2=A0 =C2=A0= punishment.
=C2=A0 =C2=A0
=C2=A0 =C2=A0 Approved by: =C2=A0 =C2=A0p= ortmgr
=C2=A0 =C2=A0 Account created by: =C2=A0 =C2=A0 simon

=C2=A0

>=C2=A0 alonso [label=3D"Alonso Schaich\nalonso@FreeBSD.org\n2014/0= 8/14\n2017/08/07"]
>=C2=A0 anray [label=3D"Andrey Slusar\nanray@FreeBSD.org\n2005/12/1= 1\n2011/01/14"]
>=C2=A0 araujo [label=3D"Marcelo Araujo\naraujo@FreeBSD.org\n2007/0= 4/26\n2020/11/03"]

--000000000000665fbe05f81ea12f-- From nobody Thu Mar 30 14:40: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 4PnR0Q5L6bz41rKN; Thu, 30 Mar 2023 14:40:06 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) (using TLSv1.3 with cipher TLS_AES_256_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 4PnR0Q34tCz3xCx; Thu, 30 Mar 2023 14:40:06 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; none Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id A9B0B3200977; Thu, 30 Mar 2023 10:40:04 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 30 Mar 2023 10:40:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; t= 1680187204; x=1680273604; bh=MeMWJoEXq3CSYza7Eslq4t5nXS1JTDrHF0T WvbUH3y0=; b=afNegGGJneSVjlzuBkg6LOX8hs+Vv4gQU4KIk7J6lTUrJxTqN62 xlEnOuJYY607IifRkbbY5TtmbNDtzP9OAr014+VL+Muxiz5TPQ25oIm48G2jmezw 5lAxCZ9KYTr5pPNelrMkcWBALORnfRarxrtQbs3eNFndsgiBXadG1YXdLh5gKSSp uV4R+ly+8cktnbIS2w9Pr631yOVq7uPwTLDeIPXJGjDdDpt4vGJtX8pXuDiLcYmF KnvaGnMncz4zqXF2/5euw9WeRo1gLLw2WN1gvYSIXvV5DId9dQ8ur82Ln56dhEv6 btq76CF5a0bgdwHELEIq76xsR1m4ZufnTBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1680187204; x=1680273604; bh=MeMWJoEXq3CSYza7Eslq4t5nXS1JTDrHF0T WvbUH3y0=; b=lzkZVRdTPwFbJtA4IUahrP2BHcz6ahd+DgeuqrL4/dYEp6brbdh vyGp+ZVCOnQTmxr/OuL3nR11NdzFG0XiHtanXMLRhMJPEtVXv6uNsDV+STDqPM0e 1MckVWgjgroSQ1VGNgIu1yJnHzhjvGgG58pOcKDNN8xnQe6migYceerYRckTVQm8 yDDS2dkeqhFs5jBRCrheIrosQP5zWyg9pim/HyusT7kzsWnaLEAY1JurPJ1jQ4UK I06eYLfZeliZfblQdQDl7/ADU9gQD3uDAAbFUDxGNNmwMApp5wMgJeBszX19IInR J3pkW1xS44gsia5cDl1JLJ/LFwlY2GmjOIQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehkedgjeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefkffggfgfuvfevfhfhjggtgfesth ekredttdefjeenucfhrhhomhepjghurhhiuceohihurhhisegrvghtvghrnhdrohhrgheq necuggftrfgrthhtvghrnhepvdektdfhkeeuueevleefudethffgkeeigfetveduieeggf ejueegheffjeefgffhnecuffhomhgrihhnpehfrhgvvggsshgurdhorhhgnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephihurhhisegrvghtvg hrnhdrohhrgh X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 30 Mar 2023 10:40:03 -0400 (EDT) Message-ID: <9061e81b-ae32-6524-9d5a-f72bbcc5e445@aetern.org> Date: Thu, 30 Mar 2023 16:40:01 +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: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: git: a2d2f25dd44c - main - committers-ports.dot: Fix alexbl entry Content-Language: en-US To: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202303301252.32UCqR5T014122@gitrepo.freebsd.org> <5ac0249d-dc67-22c1-2ebc-9b2ad6bccd43@aetern.org> From: Yuri In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PnR0Q34tCz3xCx X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Fernando Apesteguía wrote: > > > On Thu, Mar 30, 2023 at 3:07 PM Yuri > wrote: > > Fernando Apesteguía wrote: > > The branch main has been updated by fernape: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=a2d2f25dd44ce9a7bed1e83cf63ccae9a46b2d0b > > > > commit a2d2f25dd44ce9a7bed1e83cf63ccae9a46b2d0b > > Author:     Fernando Apesteguía > > AuthorDate: 2023-03-30 12:46:47 +0000 > > Commit:     Fernando Apesteguía > > CommitDate: 2023-03-30 12:46:47 +0000 > > > >     committers-ports.dot: Fix alexbl entry > >      > >     Copy-paste error. > >      > >     Reported by:    dchagin > >     Fixes:          5faf90050e6c > > --- > >  share/misc/committers-ports.dot | 2 +- > >  1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/share/misc/committers-ports.dot > b/share/misc/committers-ports.dot > > index ab6bd8385fe7..b0aa4e16408a 100644 > > --- a/share/misc/committers-ports.dot > > +++ b/share/misc/committers-ports.dot > > @@ -31,7 +31,7 @@ node [color=grey62, style=filled, bgcolor=black]; > >  > >  ache [label="Andrey > Chernov\nache@FreeBSD.org\n1994/11/15\n2017/08/17"] > >  ahze [label="Michael > Johnson\nahze@FreeBSD.org\n2004/10/29\n2013/12/02"] > > -alexbl [label="Andrey > Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] > > +alexbl [label="Alexandr > Botero\nalexbl@FreeBSD.org\n2006/09/11\n2011/01/14"] > > It's still wrong, please check the original entry: > > -alexbl [label="Alexander Botero-Lowry\nalexbl@FreeBSD.org\n2006/09/11"] > > > I don't think it was right in the first place. It is "Alexander > Botero-Lowry" in > https://docs.freebsd.org/en/articles/contributors/#staff-committers > > which is generated from a different file (doc-repo:shared/authors.doc) > > Also from the original commit message: > > Author: Roman Bogorodskiy > Date:   Mon Sep 11 17:58:58 2006 +0000 > >     Please welcome Alexander Botero-Lowry (alexbl) to the rank of ports >     committers! He was working hard on the ports tree and got the usual >     punishment. >     >     Approved by:    portmgr >     Account created by:     simon Right, and after the followup fix it's just "Alexandr Botero". > >  alonso [label="Alonso > Schaich\nalonso@FreeBSD.org\n2014/08/14\n2017/08/07"] > >  anray [label="Andrey > Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] > >  araujo [label="Marcelo > Araujo\naraujo@FreeBSD.org\n2007/04/26\n2020/11/03"] > From nobody Thu Mar 30 14:54: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 4PnRK54B4tz41sfw; Thu, 30 Mar 2023 14:54: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 4PnRK537Tvz40QN; Thu, 30 Mar 2023 14:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680188073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zellVLnzFSxhQmb2iTVXBKmkZ/6DreyAqN+fU86zEKo=; b=hcc6e0c0mge/i83Wvu4wRIYMbtTzRVgqY5RXOYBcDYadJN55kI7jQLdna2fiwjXBnKXUir kJbSZyRWqUd7Tt9Q3wulKl4F+aDQzHL80f+aXLbFhoQH9OtwlY0g60lQS8w9VdkJXpJNnT wKjdTEuk61w6/fZjURvtET9kagp6mpl1r4Z5FoauucPaSf7ggDaGzLDOOaxgvbr1VOm5Bn WQf/Zi71S13A+HEcKcjzB6/09UInFRgDVFSucY9fNmRhVB7UMzy6v17oBtrOrRrUDBtlX0 lzP7pZcRVZH8gMjpXcKh2aGyIfGbshFyERv6GSbr5shLcKv21g1Rrzt2pUU67A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680188073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zellVLnzFSxhQmb2iTVXBKmkZ/6DreyAqN+fU86zEKo=; b=iU+J+26JAX6UhtmVM0cvltlODtJQXKowcjSTYSTbYlnlNHx2il0P1HfqAmQy8jCmBjEmHF AVnuFw/5xAHUf3jAhaw0sFbS6X4JNKDlnPVFBHxoPJd1A0H3Wtcv3HNOLn8FfZNBPmAQnB aV92ofEKuFfzpYxEI/fEv+qDaaBAojNgb6tUs9eM7NkF5eN4UUK5jW6CxkpMeV3fN1+4U+ k9D8g/bt51MJNkhQL8Q/0s2CXIJemv3FUnOCY1UuSGFEhjb9+xLVy0Ix38fyAp87F7mkt/ 4cjiLfdWJGc9SKVUy/fqSM8KWN3g/2coMDuP4XdCgRe9dBAI6IFwr7HKJXa6Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680188073; a=rsa-sha256; cv=none; b=w56t4Tl6UE4O8khoFSCTAjVia1Mjkgl8qPekaFPozlyg4rcWB5BxDjqyz+4bKTEIXdnbdA z4hsFSLGQk6M9ayvHc1oaMXkSg6PxlH5LO74z0DwAgS/95qka7+/BeB3dXRYQQwB2LyHbK PrQ6HYfbE98dK2OvLqM0xwHgMLIV/VF7kNKJWlMSHuRD/v5SykkiPZQK2NIjxs3H5nd83e uiMqG9Gr2yXDdFzcrFbNyhksXCJ4r/63CQVHtORUb8pBLnD0Q5aj3sY90bSQcoNMQWIaBA AZFp1KcmG8Z82xMk5qSx1AfDExaMYdcgaOOT0hqO9w0gjwiZB1BfEcQ8vtJ6vQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnRK52B72zGjt; Thu, 30 Mar 2023 14:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UEsXFY010936; Thu, 30 Mar 2023 14:54:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UEsXuj010935; Thu, 30 Mar 2023 14:54:33 GMT (envelope-from git) Date: Thu, 30 Mar 2023 14:54:33 GMT Message-Id: <202303301454.32UEsXuj010935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 82eb549f800e - stable/13 - Support compilation with llvm 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 82eb549f800e08158802b74bef62e7db0939a3fe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=82eb549f800e08158802b74bef62e7db0939a3fe commit 82eb549f800e08158802b74bef62e7db0939a3fe Author: Mateusz Guzik AuthorDate: 2023-03-30 14:53:33 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-30 14:53:33 +0000 Support compilation with llvm 15 This is a direct bare minimum commit. --- sys/conf/kern.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 1144522c357b..5b12bbb1c9ce 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -45,6 +45,11 @@ CWARNEXTRA+= -Wno-address-of-packed-member .if ${COMPILER_VERSION} >= 130000 CWARNFLAGS+= -Wno-error=unused-but-set-variable .endif +.if ${COMPILER_VERSION} >= 150000 +CWARNFLAGS+= -Wno-error=deprecated-non-prototype +CWARNFLAGS+= -Wno-error=array-parameter +CWARNFLAGS+= -Wno-error=strict-prototypes +.endif .endif # clang .if ${COMPILER_TYPE} == "gcc" From nobody Thu Mar 30 14:57: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 4PnRNX0Fc7z41syb; Thu, 30 Mar 2023 14:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PnRNW5mpcz41Yj; Thu, 30 Mar 2023 14:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680188251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wIiQJDKcGkqi+Sk31y9kwAyVn+6pjJBMVQW8VKUOXtE=; b=fFa26KnCazEIE7BWvEWZoALwCTUnolv6T4cXkf50GAfFnTpop5EK/fpsWXJu7NrMRNB/bB QaZIAXgqtMVvSjCJP3WH2hilaFaWlOi9pvh1OgKNuJbCKFR0TI2Agi2rwIGF4gXts9K4K9 f7iGQeUfTe0JeDPZ0qk7nkEEePSBedfEr239kZYgbByf3t1by5Yfc+A+h/LWEZjfCbvFVz VKRXJ5YL3JAjT1eAWIRNcMM961PabJ3aAxnnOgmlJdkmBlySwl8n4m9Dk74sDdnADcjG9s VKbQVxoqtfmybxQliZLwU50H51krkFz3lVE1eMh2t/v9yAtADOoNtR92s+e94g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680188251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wIiQJDKcGkqi+Sk31y9kwAyVn+6pjJBMVQW8VKUOXtE=; b=GHjry7DGyRbk0eIxXOxSIcBjkCKCFInoTwdXzVvD0DH2EpL8vUu+bD0yNL1F4nMim9UgIU EPLrn+GSARZtc44CHsbh85g7oXPFjmZ0MZgvEQKO+XIDO1I+RlreB2a5q/rpNl7KhvAjpy 5MWndnYtksujjaSTzCymQSJF2Xssj8wz1MHiANvCTK0jqm5NSWKMA53Bn7N4ImizxSSyfV 4CaRKH6y9lyUrJese8VlN02T9hzoSkRG1hLWxs5wXkDgBHbeo+fFzA32K+YMODdPgReNcz DONQfYWRdtVlN7ZcZLrFJtTnU0bwtUOV6eJB4SVCpCxc2FxGKPb6ygdzhSyTvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680188251; a=rsa-sha256; cv=none; b=LOvesqKdNMNJHLkA4A2TBNTZeq4sReFzajYiDY52it9yeONCE24aAY2mKCKs27Wdxj/aPI yAqUf5+P2AbBe6xmdyMiRrRoncF9fLLjMXYiMwF6MIgxDthyWVvHkl7aKHlI4tywFicrzs p45yZ+9DC1dyYrIxzMjSvM3B/9mjXW3XsiIdlQsCDmjkmDOhriBRJR8s718SzbkEvp8zle N1k/vYXiGyIcaOZHUOt0ML4I0UxA5RMk1LYlYI9sauqsjplvtrjw9nOu/HLNqH0NWmzWzP 1y1qjc/IjDvoPx76L106Ut4jTYxg2J6boyJdBAtX2RAKpghoSaek5AUy0WY8yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnRNW4s7BzGTB; Thu, 30 Mar 2023 14:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UEvVvh011464; Thu, 30 Mar 2023 14:57:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UEvV26011463; Thu, 30 Mar 2023 14:57:31 GMT (envelope-from git) Date: Thu, 30 Mar 2023 14:57:31 GMT Message-Id: <202303301457.32UEvV26011463@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: cab1056105e3 - main - kdb: Modify securelevel 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cab1056105e3fdadf6f2b8cc745cfecfb0411755 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cab1056105e3fdadf6f2b8cc745cfecfb0411755 commit cab1056105e3fdadf6f2b8cc745cfecfb0411755 Author: Mark Johnston AuthorDate: 2022-10-25 17:57:44 +0000 Commit: Mark Johnston CommitDate: 2023-03-30 14:45:00 +0000 kdb: Modify securelevel policy Currently, sysctls which enable KDB in some way are flagged with CTLFLAG_SECURE, meaning that you can't modify them if securelevel > 0. This is so that KDB cannot be used to lower a running system's securelevel, see commit 3d7618d8bf0b7. However, the newer mac_ddb(4) restricts DDB operations which could be abused to lower securelevel while retaining some ability to gather useful debugging information. To enable the use of KDB (specifically, DDB) on systems with a raised securelevel, change the KDB sysctl policy: rather than relying on CTLFLAG_SECURE, add a check of the current securelevel to kdb_trap(). If the securelevel is raised, only pass control to the backend if MAC specifically grants access; otherwise simply check to see if mac_ddb vetoes the request, as before. Add a new secure sysctl, debug.kdb.enter_securelevel, to override this behaviour. That is, the sysctl lets one enter a KDB backend even with a raised securelevel, so long as it is set before the securelevel is raised. Reviewed by: mhorne, stevek MFC after: 1 month Sponsored by: Juniper Networks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D37122 --- share/man/man7/security.7 | 7 ++++-- sys/kern/kern_shutdown.c | 12 +++++------ sys/kern/subr_kdb.c | 46 +++++++++++++++++++++++++++++++++------- sys/security/mac/mac_framework.h | 1 + sys/security/mac/mac_kdb.c | 9 ++++++++ 5 files changed, 59 insertions(+), 16 deletions(-) diff --git a/share/man/man7/security.7 b/share/man/man7/security.7 index f87833ece112..e3f11765d083 100644 --- a/share/man/man7/security.7 +++ b/share/man/man7/security.7 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 29, 2022 +.Dd March 30, 2023 .Dt SECURITY 7 .Os .Sh NAME @@ -537,7 +537,10 @@ kernel modules (see may not be loaded or unloaded. The kernel debugger may not be entered using the .Va debug.kdb.enter -sysctl. +sysctl unless a +.Xr MAC 9 +policy grants access, for example using +.Xr mac_ddb 4 . A panic or trap cannot be forced using the .Va debug.kdb.panic , .Va debug.kdb.panic_str diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 70de6b691fd3..4544e217802d 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -129,18 +129,18 @@ int debugger_on_panic = 0; int debugger_on_panic = 1; #endif SYSCTL_INT(_debug, OID_AUTO, debugger_on_panic, - CTLFLAG_RWTUN | CTLFLAG_SECURE, - &debugger_on_panic, 0, "Run debugger on kernel panic"); + CTLFLAG_RWTUN, &debugger_on_panic, 0, + "Run debugger on kernel panic"); static bool debugger_on_recursive_panic = false; SYSCTL_BOOL(_debug, OID_AUTO, debugger_on_recursive_panic, - CTLFLAG_RWTUN | CTLFLAG_SECURE, - &debugger_on_recursive_panic, 0, "Run debugger on recursive kernel panic"); + CTLFLAG_RWTUN, &debugger_on_recursive_panic, 0, + "Run debugger on recursive kernel panic"); int debugger_on_trap = 0; SYSCTL_INT(_debug, OID_AUTO, debugger_on_trap, - CTLFLAG_RWTUN | CTLFLAG_SECURE, - &debugger_on_trap, 0, "Run debugger on kernel trap before panic"); + CTLFLAG_RWTUN, &debugger_on_trap, 0, + "Run debugger on kernel trap before panic"); #ifdef KDB_TRACE static int trace_on_panic = 1; diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c index b1bf197be3dc..ff981cdfe47c 100644 --- a/sys/kern/subr_kdb.c +++ b/sys/kern/subr_kdb.c @@ -77,6 +77,7 @@ struct trapframe *kdb_frame = NULL; static int kdb_break_to_debugger = KDB_BREAK_TO_DEBUGGER; static int kdb_alt_break_to_debugger = KDB_ALT_BREAK_TO_DEBUGGER; +static int kdb_enter_securelevel = 0; KDB_BACKEND(null, NULL, NULL, NULL, NULL); @@ -103,7 +104,7 @@ SYSCTL_PROC(_debug_kdb, OID_AUTO, current, "currently selected KDB backend"); SYSCTL_PROC(_debug_kdb, OID_AUTO, enter, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE | CTLFLAG_MPSAFE, NULL, 0, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0, kdb_sysctl_enter, "I", "set to enter the debugger"); @@ -133,13 +134,18 @@ SYSCTL_PROC(_debug_kdb, OID_AUTO, stack_overflow, "set to cause a stack overflow"); SYSCTL_INT(_debug_kdb, OID_AUTO, break_to_debugger, - CTLFLAG_RWTUN | CTLFLAG_SECURE, + CTLFLAG_RWTUN, &kdb_break_to_debugger, 0, "Enable break to debugger"); SYSCTL_INT(_debug_kdb, OID_AUTO, alt_break_to_debugger, - CTLFLAG_RWTUN | CTLFLAG_SECURE, + CTLFLAG_RWTUN, &kdb_alt_break_to_debugger, 0, "Enable alternative break to debugger"); +SYSCTL_INT(_debug_kdb, OID_AUTO, enter_securelevel, + CTLFLAG_RWTUN | CTLFLAG_SECURE, + &kdb_enter_securelevel, 0, + "Maximum securelevel to enter a KDB backend"); + /* * Flag to indicate to debuggers why the debugger was entered. */ @@ -489,6 +495,34 @@ kdb_dbbe_select(const char *name) return (EINVAL); } +static bool +kdb_backend_permitted(struct kdb_dbbe *be, struct ucred *cred) +{ + int error; + + error = securelevel_gt(cred, kdb_enter_securelevel); +#ifdef MAC + /* + * Give MAC a chance to weigh in on the policy: if the securelevel is + * not raised, then MAC may veto the backend, otherwise MAC may + * explicitly grant access. + */ + if (error == 0) { + error = mac_kdb_check_backend(be); + if (error != 0) { + printf("MAC prevented execution of KDB backend: %s\n", + be->dbbe_name); + return (false); + } + } else if (mac_kdb_grant_backend(be) == 0) { + error = 0; + } +#endif + if (error != 0) + printf("refusing to enter KDB with elevated securelevel\n"); + return (error == 0); +} + /* * Enter the currently selected debugger. If a message has been provided, * it is printed first. If the debugger does not support the enter method, @@ -733,15 +767,11 @@ kdb_trap(int type, int code, struct trapframe *tf) cngrab(); for (;;) { -#ifdef MAC - if (mac_kdb_check_backend(be) != 0) { - printf("MAC prevented execution of KDB backend: %s\n", - be->dbbe_name); + if (!kdb_backend_permitted(be, curthread->td_ucred)) { /* Unhandled breakpoint traps are fatal. */ handled = 1; break; } -#endif handled = be->dbbe_trap(type, code); if (be == kdb_dbbe) break; diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h index 31951c97a69e..8a1de6fe13e1 100644 --- a/sys/security/mac/mac_framework.h +++ b/sys/security/mac/mac_framework.h @@ -214,6 +214,7 @@ void mac_ipq_reassemble(struct ipq *q, struct mbuf *m); void mac_ipq_update(struct mbuf *m, struct ipq *q); int mac_kdb_check_backend(struct kdb_dbbe *be); +int mac_kdb_grant_backend(struct kdb_dbbe *be); int mac_kenv_check_dump(struct ucred *cred); int mac_kenv_check_get(struct ucred *cred, char *name); diff --git a/sys/security/mac/mac_kdb.c b/sys/security/mac/mac_kdb.c index 9082ec7d4580..08bb3eb743f1 100644 --- a/sys/security/mac/mac_kdb.c +++ b/sys/security/mac/mac_kdb.c @@ -39,6 +39,15 @@ #include #include +int +mac_kdb_grant_backend(struct kdb_dbbe *be) +{ + int error = 0; + + MAC_POLICY_GRANT_NOSLEEP(kdb_check_backend, be); + return (error); +} + int mac_kdb_check_backend(struct kdb_dbbe *be) { From nobody Thu Mar 30 15:00: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 4PnRRS03YKz41sVr; Thu, 30 Mar 2023 15:00: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 4PnRRR6dPrz41sj; Thu, 30 Mar 2023 15:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680188403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xVD3/YkP503gOtBYVpE7b6zJ0sIIOQ5P1BIrPUtiklE=; b=rBCFrbfYP+BUcgXFu3OJJpmkOm/bJ75T9ZA/uMj8zjXWj7tiJrySE6chSnC4yToiNHjmXE hl7oWCNZRYrBoyYGbEVP/Ej69hKAgpgYLYM5BYxNkFPxvU4C4wbS1dfT5pwZz9i031balp GsL0kBnb6HwbHUcS2lphU3bKdV6xOpnsG6rQy/lBFma4/IL3pExd+RnydLLIzWO1CMwqz2 tsPDg16jH1L9TBk4+prMYYq2E+NcssDd50MiGlPiwzoiGEgUHrSCYwESuGkQD4avh5bDcy 7ooiwQ9CA+M44ph98KKsxqAsHqURGyIF9zkAzV5x7xPrv1I1MPHAJzksxlUEbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680188403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xVD3/YkP503gOtBYVpE7b6zJ0sIIOQ5P1BIrPUtiklE=; b=DOG+nMTezb//EZL4yNBIItBjcaocxKrAYyCy+o1LnTGf3W6Ug7dOc11q0gVJn75kByC2KI 3j5AVDyacyDnlP3utEZ44sS7SlnWA63C4rlKbzhUBFlKBC/TQPIrJfjnuTn9/nLom7Sl7B YLcECWyldEfP5djiYJ7GWarURXV5XxiGgG5mru24nHPi81eJhMtUHA5n8UjrxZTpPWwat3 p2yNrCYqZDB448mWGD3pMVuDtJSnnm5UyejT/pV97xNfl0kXHiP7X6POfzeKexX72tg+Dk apm2/l/fRN8ONH2jpArHAZDPvZ2l+OvRO45g39WxAKhzMR7DwHRr6i2QRWKCfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680188403; a=rsa-sha256; cv=none; b=UKgOxJp3XVB4Ebt3hxIveCviVUj7Cp0YYbdwc/0LG3m+TiLkv/Cq//3lmrienpnfiXsV8k Fkh+fnLv+0S08TECLszoZYkIA5i5M4UIVv7rqNQ1pKYoJNbC182j7hoMbMty/AE1/OdmCP 9lLvS8JIeh+dYDs907BCNkVEjLW0jLGu7VOAv/0moVzA+9jryWG0lcSIo+y/2C5AI2O2yd eCAcGewzDzxK6UIR+AlyJMTnM08+TZ2l6yhckQgvlfoMbTuwM52V8hVkX8j8gzM+lM2qBf 4gWNLqjMq9tvWAqOY127tTd8gNq+o1Edm/tSEqBVqkwwrlN7WuplPe7RBdL8Kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnRRR5jBJzGjy; Thu, 30 Mar 2023 15:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UF03Uq015197; Thu, 30 Mar 2023 15:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UF03GJ015194; Thu, 30 Mar 2023 15:00:03 GMT (envelope-from git) Date: Thu, 30 Mar 2023 15:00:03 GMT Message-Id: <202303301500.32UF03GJ015194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: d56bea401be1 - main - committers-ports.dot: Fix alexbl entry and add gj List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d56bea401be1a044900cad80af096dc123b80068 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=d56bea401be1a044900cad80af096dc123b80068 commit d56bea401be1a044900cad80af096dc123b80068 Author: Fernando Apesteguía AuthorDate: 2023-03-30 14:52:39 +0000 Commit: Fernando Apesteguía CommitDate: 2023-03-30 14:55:22 +0000 committers-ports.dot: Fix alexbl entry and add gj Reported by: garyj@gmx.de yuri@aetern.org --- share/misc/committers-ports.dot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index b0aa4e16408a..7ac20b3a28b6 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -31,7 +31,7 @@ node [color=grey62, style=filled, bgcolor=black]; ache [label="Andrey Chernov\nache@FreeBSD.org\n1994/11/15\n2017/08/17"] ahze [label="Michael Johnson\nahze@FreeBSD.org\n2004/10/29\n2013/12/02"] -alexbl [label="Alexandr Botero\nalexbl@FreeBSD.org\n2006/09/11\n2011/01/14"] +alexbl [label="Alexander Botero-Lowry\nalexbl@FreeBSD.org\n2006/09/11\n2011/01/14"] alonso [label="Alonso Schaich\nalonso@FreeBSD.org\n2014/08/14\n2017/08/07"] anray [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] araujo [label="Marcelo Araujo\naraujo@FreeBSD.org\n2007/04/26\n2020/11/03"] @@ -60,6 +60,7 @@ fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06\n2021/12/06"] flz [label="Florent Thoumie\nflz@FreeBSD.org\n2005/03/01\n2014/10/17"] gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2006/12/05\n2019/09/02"] gblach [label="Grzegorz Blach\ngblach@FreeBSD.org\n2012/11/03\n2020/08/03"] +gj [label="Gary L. Jennejohn\ngj@FreeBSD.org\n1994/??/??\n2006/04/28"] glarkin [label="Greg Larkin\nglarkin@FreeBSD.org\n2008/07/17\n2014/06/04"] gnn [label="George Neville-Neil\ngnn@FreeBSD.org\n2013/09/04\n2020/06/02"] gordon [label="Gordon Tetlow\ngordon@FreeBSD.org\n2014/10/14\n2019/04/08"] From nobody Thu Mar 30 15:00: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 4PnRRV1lvgz41shS; Thu, 30 Mar 2023 15:00:06 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (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 4PnRRT6FJgz42FV; Thu, 30 Mar 2023 15:00:05 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id hqggpitL0uZMShtkxphe6f; Thu, 30 Mar 2023 15:00:03 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id htkvpJXnZyAOehtkwp8k1x; Thu, 30 Mar 2023 15:00:03 +0000 X-Authority-Analysis: v=2.4 cv=e5oV9Il/ c=1 sm=1 tr=0 ts=6425a3f3 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=8nJEP1OIZ-IA:10 a=k__wU0fu6RkA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=mFnJQaOm491NK36FB9kA:9 a=wPNLvfGTeEIA: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 06089156D; Thu, 30 Mar 2023 08:00:01 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id DF2A752A; Thu, 30 Mar 2023 08:00:00 -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: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 52f576459855 - main - committers-doc.dot: bring file up to date In-reply-to: <202303300753.32U7r3PW021002@gitrepo.freebsd.org> References: <202303300753.32U7r3PW021002@gitrepo.freebsd.org> Comments: In-reply-to =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= message dated "Thu, 30 Mar 2023 07:53:03 +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=iso-8859-1 Content-Transfer-Encoding: 8bit Date: Thu, 30 Mar 2023 08:00:00 -0700 Message-Id: <20230330150000.DF2A752A@slippy.cwsent.com> X-CMAE-Envelope: MS4xfMNXPitElH/ZJ+tMo8LlIgEJxCegfJv0MJCYaNr4jUlbGSSYE6paR5i/PEU9Ls0hf9zMFAcmHQayvqmjZCj6qms8Xh2AgCKi/LyR1k2jwEQ2tzW8a/p8 nbTVkpPg2BWFw4mcI1EGFSn8C2Pb4LMk9bva14kNfnAy2PqWqp98fms3vf3rYMvjiuuRIRDKCAJ8Iixc8G3ypFAW3+p7TG/xJLVJUANkzZ/EoLtcGrP0UWiU cRSFj/VS9Auzl6oiv+An8V5kgw9UNSOHGeP6qpwjUMBfa++Ry+s/giOluRhBDrqvOKsuOCgGF+w8VJloemjYXPzUzUWpW7pneyF7txtu8g4= X-Rspamd-Queue-Id: 4PnRRT6FJgz42FV X-Spamd-Bar: ---- 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] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <202303300753.32U7r3PW021002@gitrepo.freebsd.org>, =?utf-8?Q?Fernand o=20Apestegu=C3=ADa?= writes: > The branch main has been updated by fernape: > > URL: https://cgit.FreeBSD.org/src/commit/?id=52f576459855dd9d206bf922cabef735 > a7817557 > > commit 52f576459855dd9d206bf922cabef735a7817557 > Author: Fernando Apesteguía > AuthorDate: 2023-03-29 09:05:01 +0000 > Commit: Fernando Apesteguía > CommitDate: 2023-03-30 07:46:56 +0000 > > committers-doc.dot: bring file up to date > > Long due task. Many developers should be in alumni by now. > > Approved by: docs (bcr, carlavilla) > Differential Revision: D39309 I think we need to do the same for src and ports. For example my ports mentor, nectar, gave up his commit bits to work for Apple. This was long before committers-*.dot was a thing. I'm not sure how we can rediscover this information since the access file has been pruned many times since then. Maybe someone has a copy of the original CVS access file -- I do but I can't remember where I put it, it's probably on a USB archive disk somewhere. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Mar 30 14:56: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 4PnRSB363Vz41t7G; Thu, 30 Mar 2023 15:00:42 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 4PnRSB1Qbyz42QJ; Thu, 30 Mar 2023 15:00:42 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f46.google.com with SMTP id y20so24932644lfj.2; Thu, 30 Mar 2023 08:00:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680188440; 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=H1zO+Orw/R6H7CPnhuFVfKLaiBZYV1/JZ0rhjm8Ngic=; b=zeXU50XxpnYdS0lyiE5DvLJIDK3E9RIqeqNkt9aBD4OSaVvRbSKrRfLadQbTOBs8P5 6gugPeJtZGWpYM2a5ogIjVKLdXX8/SPeFiJxijcIrlq+CNvSwVMC8Axxwb/nBEoWZLrj x2x/8Y1igzL7XvYkHt7sZy4JBD0R6FfPcHzCMP8TEjka8pShAexHdwjWhcRyPjq2aG6h fx8BXv1jDzr4LB1sbI35ayY/sAgOOHgTzFWqy3cP6PZCu3yohenEnIuze90oYvtN7aSC nen7cAiL9QT5tbxkZeQKEYhdVRJrFyeCuBE7ifCfaJPjH5He1hlzw1BeSuvDO6uR0arD eQAA== X-Gm-Message-State: AAQBX9ejQb2inWp9FtA3RXDXIqGEtOIiiO1M21LIPvHBMS6s4jH6CLlM XTmxvhELupDpCb4ct/d0B964ZXR+We80mw== X-Google-Smtp-Source: AKy350aW78FT3lB04nR3SB/SiMlOOmaNjwzFLWCq9/XelZGZRVm5SVX1yirEWJMvsWrYXx7OPNCjQA== X-Received: by 2002:a19:5208:0:b0:4eb:680:3920 with SMTP id m8-20020a195208000000b004eb06803920mr6157702lfb.40.1680188440193; Thu, 30 Mar 2023 08:00:40 -0700 (PDT) Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com. [209.85.208.181]) by smtp.gmail.com with ESMTPSA id w4-20020a19c504000000b004eacd90e0c7sm4510656lfe.81.2023.03.30.08.00.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Mar 2023 08:00:40 -0700 (PDT) Received: by mail-lj1-f181.google.com with SMTP id t14so19929486ljd.5; Thu, 30 Mar 2023 08:00:40 -0700 (PDT) X-Received: by 2002:a2e:3808:0:b0:299:a9db:a4 with SMTP id f8-20020a2e3808000000b00299a9db00a4mr7151562lja.6.1680188439949; Thu, 30 Mar 2023 08:00:39 -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: <202303301252.32UCqR5T014122@gitrepo.freebsd.org> <5ac0249d-dc67-22c1-2ebc-9b2ad6bccd43@aetern.org> <9061e81b-ae32-6524-9d5a-f72bbcc5e445@aetern.org> In-Reply-To: <9061e81b-ae32-6524-9d5a-f72bbcc5e445@aetern.org> From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Thu, 30 Mar 2023 16:56:05 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: a2d2f25dd44c - main - committers-ports.dot: Fix alexbl entry To: Yuri Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000001e733a05f81f5be1" X-Rspamd-Queue-Id: 4PnRSB1Qbyz42QJ X-Spamd-Bar: ---- 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]; TAGGED_FROM(0.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --0000000000001e733a05f81f5be1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 30, 2023 at 4:40=E2=80=AFPM Yuri wrote: > Fernando Apestegu=C3=ADa wrote: > > > > > > On Thu, Mar 30, 2023 at 3:07=E2=80=AFPM Yuri > > wrote: > > > > Fernando Apestegu=C3=ADa wrote: > > > The branch main has been updated by fernape: > > > > > > URL: > > > https://cgit.FreeBSD.org/src/commit/?id=3Da2d2f25dd44ce9a7bed1e83cf63ccae= 9a46b2d0b > < > https://cgit.FreeBSD.org/src/commit/?id=3Da2d2f25dd44ce9a7bed1e83cf63ccae= 9a46b2d0b > > > > > > > > commit a2d2f25dd44ce9a7bed1e83cf63ccae9a46b2d0b > > > Author: Fernando Apestegu=C3=ADa > > > AuthorDate: 2023-03-30 12:46:47 +0000 > > > Commit: Fernando Apestegu=C3=ADa > > > CommitDate: 2023-03-30 12:46:47 +0000 > > > > > > committers-ports.dot: Fix alexbl entry > > > > > > Copy-paste error. > > > > > > Reported by: dchagin > > > Fixes: 5faf90050e6c > > > --- > > > share/misc/committers-ports.dot | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/share/misc/committers-ports.dot > > b/share/misc/committers-ports.dot > > > index ab6bd8385fe7..b0aa4e16408a 100644 > > > --- a/share/misc/committers-ports.dot > > > +++ b/share/misc/committers-ports.dot > > > @@ -31,7 +31,7 @@ node [color=3Dgrey62, style=3Dfilled, bgcolor= =3Dblack]; > > > > > > ache [label=3D"Andrey > > Chernov\nache@FreeBSD.org\n1994/11/15\n2017/08/17"] > > > ahze [label=3D"Michael > > Johnson\nahze@FreeBSD.org\n2004/10/29\n2013/12/02"] > > > -alexbl [label=3D"Andrey > > Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] > > > +alexbl [label=3D"Alexandr > > Botero\nalexbl@FreeBSD.org\n2006/09/11\n2011/01/14"] > > > > It's still wrong, please check the original entry: > > > > -alexbl [label=3D"Alexander Botero-Lowry\nalexbl@FreeBSD.org > \n2006/09/11"] > > > > > > I don't think it was right in the first place. It is "Alexander > > Botero-Lowry" in > > https://docs.freebsd.org/en/articles/contributors/#staff-committers > > > > which is generated from a different file (doc-repo:shared/authors.doc) > > > > Also from the original commit message: > > > > Author: Roman Bogorodskiy > > Date: Mon Sep 11 17:58:58 2006 +0000 > > > > Please welcome Alexander Botero-Lowry (alexbl) to the rank of ports > > committers! He was working hard on the ports tree and got the usual > > punishment. > > > > Approved by: portmgr > > Account created by: simon > > Right, and after the followup fix it's just "Alexandr Botero". > Should be fixed. Thanks. > > > > alonso [label=3D"Alonso > > Schaich\nalonso@FreeBSD.org\n2014/08/14\n2017/08/07"] > > > anray [label=3D"Andrey > > Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14"] > > > araujo [label=3D"Marcelo > > Araujo\naraujo@FreeBSD.org\n2007/04/26\n2020/11/03"] > > > > --0000000000001e733a05f81f5be1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 30, 2023 at 4:40=E2=80=AF= PM Yuri <yuri@aetern.org> wrot= e:
Fernando Apes= tegu=C3=ADa wrote:
>
>
> On Thu, Mar 30, 2023 at 3:07=E2=80=AFPM Yuri <yuri@aetern.org
> <mailto:yuri@a= etern.org>> wrote:
>
>=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=C3=ADa wrote:
>=C2=A0 =C2=A0 =C2=A0> The branch main has been updated by fernape: >=C2=A0 =C2=A0 =C2=A0>
>=C2=A0 =C2=A0 =C2=A0> URL:
>=C2=A0 =C2=A0 =C2=A0https://cgit.FreeBSD.org/src/commit/?id=3Da2d2f25dd44ce9a7bed1e83cf6= 3ccae9a46b2d0b <https://cgit.FreeBSD.org/src/commit/?id=3Da2d2f25dd44ce9a7bed1e83cf6= 3ccae9a46b2d0b>
>=C2=A0 =C2=A0 =C2=A0>
>=C2=A0 =C2=A0 =C2=A0> commit a2d2f25dd44ce9a7bed1e83cf63ccae9a46b2d0= b
>=C2=A0 =C2=A0 =C2=A0> Author:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu= =C3=ADa <fernape@FreeBSD.org>
>=C2=A0 =C2=A0 =C2=A0> AuthorDate: 2023-03-30 12:46:47 +0000
>=C2=A0 =C2=A0 =C2=A0> Commit:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu= =C3=ADa <fernape@FreeBSD.org>
>=C2=A0 =C2=A0 =C2=A0> CommitDate: 2023-03-30 12:46:47 +0000
>=C2=A0 =C2=A0 =C2=A0>
>=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0 =C2=A0committers-ports.dot: Fix a= lexbl entry
>=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0 =C2=A0Copy-paste error.
>=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0 =C2=A0Reported by:=C2=A0 =C2=A0 d= chagin
>=C2=A0 =C2=A0 =C2=A0>=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 5faf90050e6c
>=C2=A0 =C2=A0 =C2=A0> ---
>=C2=A0 =C2=A0 =C2=A0>=C2=A0 share/misc/committers-ports.dot | 2 +- >=C2=A0 =C2=A0 =C2=A0>=C2=A0 1 file changed, 1 insertion(+), 1 deleti= on(-)
>=C2=A0 =C2=A0 =C2=A0>
>=C2=A0 =C2=A0 =C2=A0> diff --git a/share/misc/committers-ports.dot >=C2=A0 =C2=A0 =C2=A0b/share/misc/committers-ports.dot
>=C2=A0 =C2=A0 =C2=A0> index ab6bd8385fe7..b0aa4e16408a 100644
>=C2=A0 =C2=A0 =C2=A0> --- a/share/misc/committers-ports.dot
>=C2=A0 =C2=A0 =C2=A0> +++ b/share/misc/committers-ports.dot
>=C2=A0 =C2=A0 =C2=A0> @@ -31,7 +31,7 @@ node [color=3Dgrey62, style= =3Dfilled, bgcolor=3Dblack];
>=C2=A0 =C2=A0 =C2=A0>=C2=A0
>=C2=A0 =C2=A0 =C2=A0>=C2=A0 ache [label=3D"Andrey
>=C2=A0 =C2=A0 =C2=A0Chernov\nache@FreeBSD.org\n1994/11/15\n2017/08/17&q= uot;]
>=C2=A0 =C2=A0 =C2=A0>=C2=A0 ahze [label=3D"Michael
>=C2=A0 =C2=A0 =C2=A0Johnson\nahze@FreeBSD.org\n2004/10/29\n2013/12/02&q= uot;]
>=C2=A0 =C2=A0 =C2=A0> -alexbl [label=3D"Andrey
>=C2=A0 =C2=A0 =C2=A0Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14&q= uot;]
>=C2=A0 =C2=A0 =C2=A0> +alexbl [label=3D"Alexandr
>=C2=A0 =C2=A0 =C2=A0Botero\nalexbl@FreeBSD.org\n2006/09/11\n2011/01/14&= quot;]
>
>=C2=A0 =C2=A0 =C2=A0It's still wrong, please check the original ent= ry:
>
>=C2=A0 =C2=A0 =C2=A0-alexbl [label=3D"Alexander Botero-Lowry\nalex= bl@FreeBSD.org\n2006/09/11"]
>
>
> I don't think it was right in the first place. It is "Alexand= er
> Botero-Lowry" in
> https://docs.freebsd.org/en/= articles/contributors/#staff-committers
> <https://docs.freebsd.org= /en/articles/contributors/#staff-committers>
> which is generated from a different file (doc-repo:shared/authors.doc)=
>
> Also from the original commit message:
>
> Author: Roman Bogorodskiy <novel@FreeBSD.org>
> Date: =C2=A0 Mon Sep 11 17:58:58 2006 +0000
>
> =C2=A0 =C2=A0 Please welcome Alexander Botero-Lowry (alexbl) to the ra= nk of ports
> =C2=A0 =C2=A0 committers! He was working hard on the ports tree and go= t the usual
> =C2=A0 =C2=A0 punishment.
> =C2=A0 =C2=A0
> =C2=A0 =C2=A0 Approved by: =C2=A0 =C2=A0portmgr
> =C2=A0 =C2=A0 Account created by: =C2=A0 =C2=A0 simon

Right, and after the followup fix it's just "Alexandr Botero"= .

Should be fixed.

=
Thanks.
=C2=A0

>=C2=A0 =C2=A0 =C2=A0>=C2=A0 alonso [label=3D"Alonso
>=C2=A0 =C2=A0 =C2=A0Schaich\nalonso@FreeBSD.org\n2014/08/14\n2017/08/07= "]
>=C2=A0 =C2=A0 =C2=A0>=C2=A0 anray [label=3D"Andrey
>=C2=A0 =C2=A0 =C2=A0Slusar\nanray@FreeBSD.org\n2005/12/11\n2011/01/14&q= uot;]
>=C2=A0 =C2=A0 =C2=A0>=C2=A0 araujo [label=3D"Marcelo
>=C2=A0 =C2=A0 =C2=A0Araujo\naraujo@FreeBSD.org\n2007/04/26\n2020/11/03&= quot;]
>

--0000000000001e733a05f81f5be1-- From nobody Thu Mar 30 14:58: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 4PnRW20qvWz41tS0; Thu, 30 Mar 2023 15:03:10 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 4PnRW165WVz43PL; Thu, 30 Mar 2023 15:03:09 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f47.google.com with SMTP id c9so14486991lfb.1; Thu, 30 Mar 2023 08:03:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680188588; 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=ki4dCwuR7S4cnXLdplgZg28TAmItBJGnUNG7uTStL6A=; b=Aee93fDnBTELRU6iQeJUAYHLpgzMVeA8QUjm4gKm6JTlOXnMRIU9CpW5gbUt9npIHg r58AvgBr/8wJwjxS0hPiv77rDEM7QHTJTdxzRyM+QCPezhgvT1lb9H5GvZl+pbhfsoqN 1xRrVoFt3pFD248nNheq9rILKLiG89k+PxiIe91Z4no0FttU21mTCCS/7ZmXhdF+yAau dwJ0x8MQHr1xbkOUUw9Y2sHH8+A8tNv4z2/LAT8f/pkDFy6EReA8nDz+RejVw0h46pVN bK+mxo+kByiVlHTAzmDAJKvXnI9Rf95aWHV+fFdT4/UzsieaPoCpEvYpr0YTlsahi1nq zuLg== X-Gm-Message-State: AAQBX9fwoAjDEBZbBzq9V51cQDQCrHKCyx7bE6Plak85iCwY4gD36ZKc FfRe5l0rJmc9/9P1Rk8Hb0hwQk1DHWiGeA== X-Google-Smtp-Source: AKy350YT9WJ+Uc0SyN2GWqwTuX5WSTFgugqvI/oURhxovNhj6rnCRpauhSXGf7mos57TrPw6qKXaJw== X-Received: by 2002:a05:6512:3092:b0:4eb:1315:eaea with SMTP id z18-20020a056512309200b004eb1315eaeamr1615983lfd.3.1680188587951; Thu, 30 Mar 2023 08:03:07 -0700 (PDT) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com. [209.85.167.52]) by smtp.gmail.com with ESMTPSA id t3-20020ac25483000000b004d8580b2470sm5883754lfk.225.2023.03.30.08.03.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Mar 2023 08:03:07 -0700 (PDT) Received: by mail-lf1-f52.google.com with SMTP id k37so24967979lfv.0; Thu, 30 Mar 2023 08:03:07 -0700 (PDT) X-Received: by 2002:ac2:5ddb:0:b0:4e8:c8f1:a010 with SMTP id x27-20020ac25ddb000000b004e8c8f1a010mr6839832lfq.11.1680188587033; Thu, 30 Mar 2023 08:03:07 -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: <202303300753.32U7r3PW021002@gitrepo.freebsd.org> <20230330150000.DF2A752A@slippy.cwsent.com> In-Reply-To: <20230330150000.DF2A752A@slippy.cwsent.com> From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Thu, 30 Mar 2023 16:58:32 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 52f576459855 - main - committers-doc.dot: bring file up to date To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000e2c98905f81f63ff" X-Rspamd-Queue-Id: 4PnRW165WVz43PL X-Spamd-Bar: ---- 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]; TAGGED_FROM(0.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --000000000000e2c98905f81f63ff Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 30, 2023 at 5:00=E2=80=AFPM Cy Schubert wrote: > In message <202303300753.32U7r3PW021002@gitrepo.freebsd.org>, > =3D?utf-8?Q?Fernand > o=3D20Apestegu=3DC3=3DADa?=3D writes: > > The branch main has been updated by fernape: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D52f576459855dd9d206bf922cabef73= 5 > > a7817557 > > > > commit 52f576459855dd9d206bf922cabef735a7817557 > > Author: Fernando Apestegu=E9=93=86a > > AuthorDate: 2023-03-29 09:05:01 +0000 > > Commit: Fernando Apestegu=E9=93=86a > > CommitDate: 2023-03-30 07:46:56 +0000 > > > > committers-doc.dot: bring file up to date > > > > Long due task. Many developers should be in alumni by now. > > > > Approved by: docs (bcr, carlavilla) > > Differential Revision: D39309 > > I think we need to do the same for src and ports. For example my ports > mentor, nectar, gave up his commit bits to work for Apple. This was long > before committers-*.dot was a thing. I'm not sure how we can rediscover > this information since the access file has been pruned many times since > then. Maybe someone has a copy of the original CVS access file -- I do bu= t > I can't remember where I put it, it's probably on a USB archive disk > somewhere. > Yes, with some bumps and ongoing discussion, this is it for ports: > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > > > > --000000000000e2c98905f81f63ff Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 30, 2023 at 5:00=E2=80=AF= PM Cy Schubert <Cy.Schubert= @cschubert.com> wrote:
In message <202303300753.32U7r3PW021002@gitrepo.= freebsd.org>,
=3D?utf-8?Q?Fernand
o=3D20Apestegu=3DC3=3DADa?=3D writes:
> The branch main has been updated by fernape:
>
> URL: https://cgit.Fre= eBSD.org/src/commit/?id=3D52f576459855dd9d206bf922cabef735
> a7817557
>
> commit 52f576459855dd9d206bf922cabef735a7817557
> Author:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=E9=93=86a <fernape@Fre= eBSD.org>
> AuthorDate: 2023-03-29 09:05:01 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=E9=93=86a <fernape@Fre= eBSD.org>
> CommitDate: 2023-03-30 07:46:56 +0000
>
>=C2=A0 =C2=A0 =C2=A0committers-doc.dot: bring file up to date
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Long due task. Many developers should be in alumni = by now.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Approved by:=C2=A0 =C2=A0 docs (bcr, carlavilla) >=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 D39309

I think we need to do the same for src and ports. For example my ports
mentor, nectar, gave up his commit bits to work for Apple. This was long before committers-*.dot was a thing. I'm not sure how we can rediscover=
this information since the access file has been pruned many times since then. Maybe someone has a copy of the original CVS access file -- I do but =
I can't remember where I put it, it's probably on a USB archive dis= k
somewhere.

Yes, with some bumps and ong= oing discussion, this is it for ports:

=C2=A0


--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://FreeB= SD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2=A0 Web:=C2=A0 https://nwt= ime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 e^(i*pi)+1=3D0



--000000000000e2c98905f81f63ff-- From nobody Thu Mar 30 14:58: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 4PnRWH0wcgz41tL8; Thu, 30 Mar 2023 15:03:23 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.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 4PnRWG4192z43b5; Thu, 30 Mar 2023 15:03:22 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of fernando.apesteguia@gmail.com designates 209.85.167.43 as permitted sender) smtp.mailfrom=fernando.apesteguia@gmail.com; dmarc=none Received: by mail-lf1-f43.google.com with SMTP id br6so24874724lfb.11; Thu, 30 Mar 2023 08:03:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680188601; 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=hXcpmqoARkQjwntKCtIo0MfQX/SVdJb3vvLFKtRGw0I=; b=SzvpA9PSFSWcjogphXqioiknPW2z666PoGouN/EwBImsvyjpS+EeF1zZKwnIsXcxtL Uyxq9J/dta4QIk3i48mFXjy/0zfIbDlSptV92nAQ/SIrxs4HwqPgk+Ex+4ecI944L+Us fK36B23kA4Q5kQ8hat4SQISRUVhMHxjJaqHaAUtqo42jXDuQzML7dMi2k5zRFKJJ9yIn BQBiyZdVgyHOayiujDmiAErhNnUSQbQm2vAJeEbkp4541wBdQ8s5AoSZhs3BS4MMAgbN QxlYv3vvaYTW8EI31Tu84TNqs7krLDDTS8Jgb1Bp8YAY3KxSTRZCgXPM9AUVzmRPnHz/ rbsg== X-Gm-Message-State: AAQBX9e9KL6bOp8T5+bLjEqb/1A3mobMVlaip8Iv4z1p/9VqR84mUUIu 6zDEzGoE4oaNZ293GKygH9yyNFuRXEw3Ng== X-Google-Smtp-Source: AKy350YpkmqJngk8EAOcJPmK5JF26j5XhkxUsJQvs4wTwhfmr/jVqLTt+fFFyVIFm1W/BcuIjX8OUQ== X-Received: by 2002:ac2:51a1:0:b0:4d8:8273:ec with SMTP id f1-20020ac251a1000000b004d8827300ecmr7147496lfk.20.1680188600699; Thu, 30 Mar 2023 08:03:20 -0700 (PDT) Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com. [209.85.167.47]) by smtp.gmail.com with ESMTPSA id y6-20020ac255a6000000b004b5634f9b9dsm5872550lfg.115.2023.03.30.08.03.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Mar 2023 08:03:20 -0700 (PDT) Received: by mail-lf1-f47.google.com with SMTP id q16so24895140lfe.10; Thu, 30 Mar 2023 08:03:20 -0700 (PDT) X-Received: by 2002:ac2:522e:0:b0:4ea:e2f8:5ed6 with SMTP id i14-20020ac2522e000000b004eae2f85ed6mr6716347lfl.11.1680188600483; Thu, 30 Mar 2023 08:03:20 -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: <202303300753.32U7r3PW021002@gitrepo.freebsd.org> <20230330150000.DF2A752A@slippy.cwsent.com> In-Reply-To: From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Thu, 30 Mar 2023 16:58:46 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 52f576459855 - main - committers-doc.dot: bring file up to date To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000b0047105f81f6426" X-Spamd-Result: default: False [-2.97 / 15.00]; NEURAL_HAM_LONG(-1.00)[-0.999]; NEURAL_HAM_MEDIUM(-0.99)[-0.994]; NEURAL_HAM_SHORT(-0.98)[-0.976]; FORGED_SENDER(0.30)[fernape@freebsd.org,fernandoapesteguia@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.47:received,209.85.167.43:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.43:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[]; TAGGED_FROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; MIME_TRACE(0.00)[0:+,1:+,2:~]; TO_DN_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[fernape@freebsd.org,fernandoapesteguia@gmail.com] X-Rspamd-Queue-Id: 4PnRWG4192z43b5 X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N --000000000000b0047105f81f6426 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 30, 2023 at 4:58=E2=80=AFPM Fernando Apestegu=C3=ADa wrote: > > > On Thu, Mar 30, 2023 at 5:00=E2=80=AFPM Cy Schubert > wrote: > >> In message <202303300753.32U7r3PW021002@gitrepo.freebsd.org>, >> =3D?utf-8?Q?Fernand >> o=3D20Apestegu=3DC3=3DADa?=3D writes: >> > The branch main has been updated by fernape: >> > >> > URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D52f576459855dd9d206bf922cabef7= 35 >> > a7817557 >> > >> > commit 52f576459855dd9d206bf922cabef735a7817557 >> > Author: Fernando Apestegu=E9=93=86a >> > AuthorDate: 2023-03-29 09:05:01 +0000 >> > Commit: Fernando Apestegu=E9=93=86a >> > CommitDate: 2023-03-30 07:46:56 +0000 >> > >> > committers-doc.dot: bring file up to date >> > >> > Long due task. Many developers should be in alumni by now. >> > >> > Approved by: docs (bcr, carlavilla) >> > Differential Revision: D39309 >> >> I think we need to do the same for src and ports. For example my ports >> mentor, nectar, gave up his commit bits to work for Apple. This was long >> before committers-*.dot was a thing. I'm not sure how we can rediscover >> this information since the access file has been pruned many times since >> then. Maybe someone has a copy of the original CVS access file -- I do >> but >> I can't remember where I put it, it's probably on a USB archive disk >> somewhere. >> > > Yes, with some bumps and ongoing discussion, this is it for ports: > > https://cgit.FreeBSD.org/src/commit/?id=3D5faf90050e6c280c314bca58ee61707d8= bfdbaf3 > > >> >> >> -- >> Cheers, >> Cy Schubert >> FreeBSD UNIX: Web: https://FreeBSD.org >> NTP: Web: https://nwtime.org >> >> e^(i*pi)+1=3D0 >> >> >> >> --000000000000b0047105f81f6426 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 30, 2023 at 4:58=E2=80=AF= PM Fernando Apestegu=C3=ADa <fern= ape@freebsd.org> wrote:


On Thu, Mar 30, 2023= at 5:00=E2=80=AFPM Cy Schubert <Cy.Schubert@cschubert.com> wrote:
<= blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-l= eft:1px solid rgb(204,204,204);padding-left:1ex">In message <2= 02303300753.32U7r3PW021002@gitrepo.freebsd.org>,
=3D?utf-8?Q?Fernand
o=3D20Apestegu=3DC3=3DADa?=3D writes:
> The branch main has been updated by fernape:
>
> URL: https://cgit.Fre= eBSD.org/src/commit/?id=3D52f576459855dd9d206bf922cabef735
> a7817557
>
> commit 52f576459855dd9d206bf922cabef735a7817557
> Author:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=E9=93=86a <fernape@Fre= eBSD.org>
> AuthorDate: 2023-03-29 09:05:01 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=E9=93=86a <fernape@Fre= eBSD.org>
> CommitDate: 2023-03-30 07:46:56 +0000
>
>=C2=A0 =C2=A0 =C2=A0committers-doc.dot: bring file up to date
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Long due task. Many developers should be in alumni = by now.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Approved by:=C2=A0 =C2=A0 docs (bcr, carlavilla) >=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 D39309

I think we need to do the same for src and ports. For example my ports
mentor, nectar, gave up his commit bits to work for Apple. This was long before committers-*.dot was a thing. I'm not sure how we can rediscover=
this information since the access file has been pruned many times since then. Maybe someone has a copy of the original CVS access file -- I do but =
I can't remember where I put it, it's probably on a USB archive dis= k
somewhere.

Yes, with some bumps and ong= oing discussion, this is it for ports:


=C2=A0
=C2=A0


--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://FreeB= SD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2=A0 Web:=C2=A0 https://nwt= ime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 e^(i*pi)+1=3D0



--000000000000b0047105f81f6426-- From nobody Thu Mar 30 15:14: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 4PnRlf62G6z41tkK; Thu, 30 Mar 2023 15:14:06 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (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 4PnRlf52Zfz44Ny; Thu, 30 Mar 2023 15:14:06 +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 hsBNpiyf1uZMShtyUphiX8; Thu, 30 Mar 2023 15:14:02 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id htyTprZo0HFsOhtyUpza1u; Thu, 30 Mar 2023 15:14:02 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=6425a73a a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=k__wU0fu6RkA:10 a=0VOg8hKvAAAA:8 a=VdIHrAONAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=XNTl38F3aXDFKrNNyFMA:9 a=CjuIK1q_8ugA:10 a=I-efbNKAaAt4Mg394dr-:22 a=-ZXosVZ6gU9uudHHSS1N:22 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 1B2B415A7; Thu, 30 Mar 2023 08:14:01 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id F34B74BB; Thu, 30 Mar 2023 08:14:00 -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: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 52f576459855 - main - committers-doc.dot: bring file up to date In-reply-to: References: <202303300753.32U7r3PW021002@gitrepo.freebsd.org> <20230330150000.DF2A752A@slippy.cwsent.com> Comments: In-reply-to =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= message dated "Thu, 30 Mar 2023 16:58:46 +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 Content-Type: text/plain; charset=us-ascii Date: Thu, 30 Mar 2023 08:14:00 -0700 Message-Id: <20230330151400.F34B74BB@slippy.cwsent.com> X-CMAE-Envelope: MS4xfBPehcRflrpqhiHHzr0TtdjF2e2/9hkbKmgJPFkFNbaIA9BnQOKtlpHJc9EjwMIf43o1mBki+ti8sbXCDrqfQv62zkIgqzUlC1ADpAucPQz8+osSZ6G6 lVf8kcULxrQi3NPoP65yvdOsZQBPTUSETa+kEG0Q87UuPSWzr5b3bkRWdMlfhA+L3lkgmRXujYYw+pMqD4LPCG1zjDNCAUinbNrq4OnDslWC9cF0d67a6O9d ZvCkxuDkdNAouDzDy7Ev1ZhDMgqr8+muJzLl75dlgc61wbmKn0z8WJ3bkVzXrZ8nw2k0UvtCRdWKp4MffHlBPcODGQK1qERTdCWLUVoivOA= X-Rspamd-Queue-Id: 4PnRlf52Zfz44Ny X-Spamd-Bar: ---- 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] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message , =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= writes: > --000000000000b0047105f81f6426 > Content-Type: text/plain; charset="UTF-8" > Content-Transfer-Encoding: quoted-printable > > On Thu, Mar 30, 2023 at 4:58=E2=80=AFPM Fernando Apestegu=C3=ADa reebsd.org> > wrote: > > > > > > > On Thu, Mar 30, 2023 at 5:00=E2=80=AFPM Cy Schubert t.com> > > wrote: > > > >> In message <202303300753.32U7r3PW021002@gitrepo.freebsd.org>, > >> =3D?utf-8?Q?Fernand > >> o=3D20Apestegu=3DC3=3DADa?=3D writes: > >> > The branch main has been updated by fernape: > >> > > >> > URL: > >> https://cgit.FreeBSD.org/src/commit/?id=3D52f576459855dd9d206bf922cabef7= > 35 > >> > a7817557 > >> > > >> > commit 52f576459855dd9d206bf922cabef735a7817557 > >> > Author: Fernando Apestegu=E9=93=86a > >> > AuthorDate: 2023-03-29 09:05:01 +0000 > >> > Commit: Fernando Apestegu=E9=93=86a > >> > CommitDate: 2023-03-30 07:46:56 +0000 > >> > > >> > committers-doc.dot: bring file up to date > >> > > >> > Long due task. Many developers should be in alumni by now. > >> > > >> > Approved by: docs (bcr, carlavilla) > >> > Differential Revision: D39309 > >> > >> I think we need to do the same for src and ports. For example my ports > >> mentor, nectar, gave up his commit bits to work for Apple. This was long > >> before committers-*.dot was a thing. I'm not sure how we can rediscover > >> this information since the access file has been pruned many times since > >> then. Maybe someone has a copy of the original CVS access file -- I do > >> but > >> I can't remember where I put it, it's probably on a USB archive disk > >> somewhere. > >> > > > > Yes, with some bumps and ongoing discussion, this is it for ports: > > > > > https://cgit.FreeBSD.org/src/commit/?id=3D5faf90050e6c280c314bca58ee61707d8= > bfdbaf3 I don't see nectar in there. He was security-officer when he offered me a ports commit bit. I'll try and find that CVS repo. I think it's on that 2 TB archive disk. Next time I'm snooping around on it for other files I'll look through the src, ports and doc access files CVS logs as well. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Mar 30 15:18: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 4PnRrl0mrCz41v7S; Thu, 30 Mar 2023 15:18:31 +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 4PnRrk70b0z468Q; Thu, 30 Mar 2023 15:18:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680189511; 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=DxNbSLgWKNejCMmy08E0XgQ25FGwKu06mmvrAI8kH/4=; b=fPtI1vGt5mq9Pf/oamTasAKcLQ4uUQBd+CM3AdgloSHi6K8soOGk+/EKErSjVJ0nmsUVmb ybBxuaLp/+/2d7dSBiQL1TTZsvXow4v8plRr7BPgivwVLjBXtcST/+Fmf2GjbKQghROPm4 B/pdppoNKKyfxnZ/K7cy3+LI7D/ELzkjdwC47VudPS5mwkkjzVCoYvwrV8uRHq8/8dUNVH 5R4tYOvvfpuzwfXGCtOuS23PzvUD73JSAwNA5etyVMDXC0zaz83bz/Vd2VBiBOzFoXKCRD Jybj5MbE0C7yc0DFLntmGl0IptKcPBnHT+CftX+X5RG8B3+4HBLkd6E3u9gxHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680189511; 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=DxNbSLgWKNejCMmy08E0XgQ25FGwKu06mmvrAI8kH/4=; b=SrOqYplxqy+HaHvTDOb7JkltwIbGrjEfkurvg9km3cCH9pSrQhNRKhm3OAyjBefFIqXOVh TzZom4V/ESeMpeKWrf1LO52CE3HUAYHcRfmh2r5Nx4byx2g6NG++tHdN68DjVNTDRpt/gb 5GGZWhnWqV3afqbwVfca5FLY2Yj5afWkn5TzEmNT3PI7RfXzA4zYqzY+uX3PmN4J6YTdd1 iAFcfEKTxZXuyLN9c9FZqh0CxgPJ0210eUVNk/00lpuCj/xcykmEazgMMCjZRUv5fRmrHC /44XGKRzN9UyQysgXFr9BRUEmWkyjnTzUK47+S6yE5elBh7ExBNBj24J1DXpgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680189511; a=rsa-sha256; cv=none; b=GYi6pSncMv+7YCsXKIUI3jnolX6uTM1X9fj36FeHPn9KCqE6OANHZ9qnFxdcpBpl8YzUTD 352SUsm4B6+6HU3+p5V8oygOZvCuK2CVqaC+z97kjVmOL6tn3t0eH+eXgx5GClbKlb4ZV3 0QmmhVAf2M+m54BFbv9BZzx7BcErdh7WG7nB+ceNZM2oYkghOVzrO1kVuRflfihfLLeMh8 WXCiNw5TQu/6WfFINuMjBkVclC8UKo0Ko5q7zovDsgm63WnzzbobNMw1d7zPdE8sSG9vqr fok0mCw+EScWDRc0LflplLAOf4YwmJSp1GY2OevZZLUgTwzz1fKVd7xDmXyIYA== Received: from [IPV6:2601:648:8680:16b0:585c:175e:6453:40a5] (unknown [IPv6:2601:648:8680:16b0:585c:175e:6453:40a5]) (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 4PnRrk2Z0rzd5n; Thu, 30 Mar 2023 15:18:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <8e326b0f-ec9e-d275-b1f9-dedfa541287d@FreeBSD.org> Date: Thu, 30 Mar 2023 08:18:28 -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.9.0 Subject: Re: git: 68ca8363c7a1 - main - libc: Use secure_getenv(3) where appropriate Content-Language: en-US To: Mark Johnston Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202303271256.32RCuV1K007625@gitrepo.freebsd.org> <933D3669-FAC3-4D3C-937E-93F4F7387D5F@freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 3/29/23 9:55 PM, Mark Johnston wrote: > On Wed, Mar 29, 2023 at 09:49:26PM -0700, John Baldwin wrote: >> This looks to have broken cross-builds on MacOS as the MacOS jobs on GitHub are now failing due to missing the prototype for this function building shims for btree from libc. > > Sorry, this should be fixed now with commit 0ec03c0b10b12. Thanks! -- John Baldwin From nobody Thu Mar 30 15:15: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 4PnRtS3LnFz41vJt; Thu, 30 Mar 2023 15:20:00 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (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 4PnRtR5skhz46rt; Thu, 30 Mar 2023 15:19:59 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-f174.google.com with SMTP id s20so19980741ljp.1; Thu, 30 Mar 2023 08:19:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680189597; 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=9Hmcp7KcjLpFARiRyn6SYJcjz0ofA4K1akmFTD5WYmw=; b=HelqWU+BulOO9uX5AfSLUIlfuQ65jeM9PPOWr5gKV/JdLghGEyZOSdV7UGUZUU+owx twRGJKHM20IixQo9CBmzQ4zd0BmGu9FkmOrAPY24uzIjBvQE7EMc8cgh+1dbPUhh4+ny xbUMcKSsX+hPpVhlsaYYHo0xNIeFDHASCZq1oB7MdFN94C43aQMfNrOaGHKsAqwdSAkN 6x4miSG6K3Q0ZCXa/zeaBvzxbYll+nfnZP4o1MUL7M4P+2TXOQC2h5lcfKJc1zFHee// EgkMCGaqZc/sNtapVSftlep75ljWLclEaLcGuNIHKdtRBAGlgQ2ADeBYltYMiRaOC2O0 l5pg== X-Gm-Message-State: AAQBX9cjHYCTZHnopnwySUzb82f1uZk4GfMKy56H39w/Ta0pS8EA+c5K FKAOhBs7puHQ46RAjOT5Us75CDCfQ7fQ+w== X-Google-Smtp-Source: AKy350YRle5vEHu9BAQiHxLHbMbKl5QWXRXmWNbf1GJO0DCtA3ZnI30Q+I82+fyvoEQQG6tZ5CO4gA== X-Received: by 2002:a2e:8813:0:b0:29c:783d:9241 with SMTP id x19-20020a2e8813000000b0029c783d9241mr7055367ljh.23.1680189597416; Thu, 30 Mar 2023 08:19:57 -0700 (PDT) Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com. [209.85.208.173]) by smtp.gmail.com with ESMTPSA id u26-20020a2e91da000000b002a24bf4831fsm3149113ljg.73.2023.03.30.08.19.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Mar 2023 08:19:57 -0700 (PDT) Received: by mail-lj1-f173.google.com with SMTP id 20so20021526lju.0; Thu, 30 Mar 2023 08:19:57 -0700 (PDT) X-Received: by 2002:a2e:a0c7:0:b0:29e:e7b7:dfd1 with SMTP id f7-20020a2ea0c7000000b0029ee7b7dfd1mr7133129ljm.6.1680189597102; Thu, 30 Mar 2023 08:19:57 -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: <202303300753.32U7r3PW021002@gitrepo.freebsd.org> <20230330150000.DF2A752A@slippy.cwsent.com> <20230330151400.F34B74BB@slippy.cwsent.com> In-Reply-To: <20230330151400.F34B74BB@slippy.cwsent.com> From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Thu, 30 Mar 2023 17:15:22 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 52f576459855 - main - committers-doc.dot: bring file up to date To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000017377605f81fa0b9" X-Rspamd-Queue-Id: 4PnRtR5skhz46rt X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --00000000000017377605f81fa0b9 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 30, 2023 at 5:14=E2=80=AFPM Cy Schubert wrote: > In message > om> > , =3D?UTF-8?Q?Fernando_Apestegu=3DC3=3DADa?=3D writes: > > --000000000000b0047105f81f6426 > > Content-Type: text/plain; charset=3D"UTF-8" > > Content-Transfer-Encoding: quoted-printable > > > > On Thu, Mar 30, 2023 at 4:58=3DE2=3D80=3DAFPM Fernando Apestegu=3DC3=3D= ADa > > reebsd.org> > > wrote: > > > > > > > > > > > On Thu, Mar 30, 2023 at 5:00=3DE2=3D80=3DAFPM Cy Schubert > > t.com> > > > wrote: > > > > > >> In message <202303300753.32U7r3PW021002@gitrepo.freebsd.org>, > > >> =3D3D?utf-8?Q?Fernand > > >> o=3D3D20Apestegu=3D3DC3=3D3DADa?=3D3D writes: > > >> > The branch main has been updated by fernape: > > >> > > > >> > URL: > > >> > https://cgit.FreeBSD.org/src/commit/?id=3D3D52f576459855dd9d206bf922cabef= 7=3D > > 35 > > >> > a7817557 > > >> > > > >> > commit 52f576459855dd9d206bf922cabef735a7817557 > > >> > Author: Fernando Apestegu=3DE9=3D93=3D86a > > >> > AuthorDate: 2023-03-29 09:05:01 +0000 > > >> > Commit: Fernando Apestegu=3DE9=3D93=3D86a > > >> > CommitDate: 2023-03-30 07:46:56 +0000 > > >> > > > >> > committers-doc.dot: bring file up to date > > >> > > > >> > Long due task. Many developers should be in alumni by now. > > >> > > > >> > Approved by: docs (bcr, carlavilla) > > >> > Differential Revision: D39309 > > >> > > >> I think we need to do the same for src and ports. For example my por= ts > > >> mentor, nectar, gave up his commit bits to work for Apple. This was > long > > >> before committers-*.dot was a thing. I'm not sure how we can > rediscover > > >> this information since the access file has been pruned many times > since > > >> then. Maybe someone has a copy of the original CVS access file -- I = do > > >> but > > >> I can't remember where I put it, it's probably on a USB archive disk > > >> somewhere. > > >> > > > > > > Yes, with some bumps and ongoing discussion, this is it for ports: > > > > > > > > > https://cgit.FreeBSD.org/src/commit/?id=3D3D5faf90050e6c280c314bca58ee617= 07d8=3D > > bfdbaf3 > > I don't see nectar in there. He was security-officer when he offered me a > ports commit bit. > I'll try and find that CVS repo. I think it's on that 2 TB archive disk. > Next time I'm snooping around on it for other files I'll look through the > src, ports and doc access files CVS logs as well. > Thanks. There is commit 18485df2779d61e4b191b6d7920cb8cabc50df5b. nectar seemed to be removed there from access, but I can't find it in any of the three repo .dot files. Some people that were in the project before the split up in 2003 did not end up in all three files. gj@ ended up in the src one, despite the fact that developers at that time seemed to have commit permission anywhere in the project. > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > > > L =C3=B2- > --00000000000017377605f81fa0b9 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 30, 2023 at 5:14=E2=80=AF= PM Cy Schubert <Cy.Schubert= @cschubert.com> wrote:
In message <CAGwOe2bQDjy+doa2BWN9oOxbT1h_j5SKGAmyiq7S+jpkT= nZtqA@mail.gmail.c
om>
, =3D?UTF-8?Q?Fernando_Apestegu=3DC3=3DADa?=3D writes:
> --000000000000b0047105f81f6426
> Content-Type: text/plain; charset=3D"UTF-8"
> Content-Transfer-Encoding: quoted-printable
>
> On Thu, Mar 30, 2023 at 4:58=3DE2=3D80=3DAFPM Fernando Apestegu=3DC3= =3DADa <fernape@f=3D
> ree= bsd.org>
> wrote:
>
> >
> >
> > On Thu, Mar 30, 2023 at 5:00=3DE2=3D80=3DAFPM Cy Schubert <Cy.= Schubert@cschuber=3D
> t.com>
> > wrote:
> >
> >> In message <202303300753.32U7r3PW021002@gitrepo.= freebsd.org>,
> >> =3D3D?utf-8?Q?Fernand
> >> o=3D3D20Apestegu=3D3DC3=3D3DADa?=3D3D writes:
> >> > The branch main has been updated by fernape:
> >> >
> >> > URL:
> >> https://c= git.FreeBSD.org/src/commit/?id=3D3D52f576459855dd9d206bf922cabef7=3D > 35
> >> > a7817557
> >> >
> >> > commit 52f576459855dd9d206bf922cabef735a7817557
> >> > Author:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=3DE9=3D93= =3D86a <fernape@FreeBSD.org>
> >> > AuthorDate: 2023-03-29 09:05:01 +0000
> >> > Commit:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=3DE9=3D93= =3D86a <fernape@FreeBSD.org>
> >> > CommitDate: 2023-03-30 07:46:56 +0000
> >> >
> >> >=C2=A0 =C2=A0 =C2=A0committers-doc.dot: bring file up to = date
> >> >
> >> >=C2=A0 =C2=A0 =C2=A0Long due task. Many developers should= be in alumni by now.
> >> >
> >> >=C2=A0 =C2=A0 =C2=A0Approved by:=C2=A0 =C2=A0 docs (bcr, = carlavilla)
> >> >=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 D39309 > >>
> >> I think we need to do the same for src and ports. For example= my ports
> >> mentor, nectar, gave up his commit bits to work for Apple. Th= is was long
> >> before committers-*.dot was a thing. I'm not sure how we = can rediscover
> >> this information since the access file has been pruned many t= imes since
> >> then. Maybe someone has a copy of the original CVS access fil= e -- I do
> >> but
> >> I can't remember where I put it, it's probably on a U= SB archive disk
> >> somewhere.
> >>
> >
> > Yes, with some bumps and ongoing discussion, this is it for ports= :
> >
> >
> https://cgit.Fr= eeBSD.org/src/commit/?id=3D3D5faf90050e6c280c314bca58ee61707d8=3D
> bfdbaf3

I don't see nectar in there. He was security-officer when he offered me= a
ports commit bit.
I'll try and find that CVS repo. I think it's on that 2 TB archive = disk.
Next time I'm snooping around on it for other files I'll look throu= gh the
src, ports and doc access files CVS logs as well.

=
Thanks.

There is commit 18485df2779d61e= 4b191b6d7920cb8cabc50df5b. nectar seemed to be removed there from access, b= ut I can't find it in any of the three repo .dot files.
S= ome people that were in the project before the split up in 2003 did not end= up in all three files.
gj@ ended up in the src one, despite the = fact that developers at that time seemed to have commit permission anywhere= in the project.
=C2=A0


--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://FreeB= SD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2=A0 Web:=C2=A0 https://nwt= ime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 e^(i*pi)+1=3D0


=C2=A0L=C2=A0 =C2=A0 =C3=B2-
--00000000000017377605f81fa0b9-- From nobody Thu Mar 30 15:24: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 4PnRzT0jThz41vbr; Thu, 30 Mar 2023 15:24: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 4PnRzT0DNdz49WM; Thu, 30 Mar 2023 15:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680189861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1qBuTi/xg9ZMWi5WisV6Yu2Q6i8TADwWToQT4dUoI6A=; b=tchanOMpvv+F5qM2STaJMUoSrSfT4cdNOx9QMSKuM+7lzIujkXmGgoix+gkoFeQSzi68xG Tg0j6jICLIo6d73MWDW9neFwyOIKgPbXUfsB+trRx/ytof3NM+DDJWCubslYNm8Eekjnyq U+vy3FnxgZ5xe7Zu0oP4NNCPH21phv4DOy8mn1/wMUEm4y+dGKqKYc4jJGvPkufEqZZgp8 v2WJSxF2aiRmkDUp/JZ80tnGxnTlojIDCVmo1crK4Hf3P83rumYyKXGn/GfMGXb/wPKHgC 1dUMRRhBCPAWNkAqz3lZlJtXL4qNYkO4NNHkH9ddYHS1Pwh85iUseVk9glempA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680189861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1qBuTi/xg9ZMWi5WisV6Yu2Q6i8TADwWToQT4dUoI6A=; b=dBBgJ6c0yFO7dcrQ6ZlniO7EzGuilwnk+s2LtawT3rNziUoJkFJ06zBIxetX04F6IIG6Uv /+YKMipmZBrru7vbV5B3PSnajRZgnqjjHLhFajwqPywlEC229XK6vY3Lczzsh8ecz+62gY 3vdmKz9LOoBeezuc81P3+BJJiBoCQj76eyOCKvFoUdR8TOrF4HiCHNj6YY/Q/CUibURDSa nRq1dBgreLBHTStdkKWME0ur/Xwe3ZgMcoeD7QoH2jIH1NYo4n6Nn6jiLMClX9XHIh1tZj Ie6CX3Cn7s3WwO1QgPqU5h6AXPyc/ftsh7tymr/dbTSsu3jOycgcmEs0+/G9kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680189861; a=rsa-sha256; cv=none; b=ZNFZ3iRCfWo9C+Bas+rE7Kfpbjot7hyCW7jK1i2bcITJypxeIKDQ29WRG6j06cxdWWldP5 fFaWMiYU6y6YX723tEqHFITQOd2JInkQeY1F6867TEcQay4kI/gjYGjCp6Ls1Z22YJZndw RKpTbaQMoWdpHNnn7KonxI453NiJso86xuv/6bpat39EUFurSLhlKXCle525TEOyq332zQ 6lNzcH8FNzG8MSdiDfHpTc228K1MTKW1frzbvyY1ACn6AAMlhdBCNaxMWReMqLHfG32WVG rBjeRS5I1omkEvCx748WmumndDLCPbd7vC262mQ87+aoMP4bnh3R6907dryiZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnRzS6QtHzGwP; Thu, 30 Mar 2023 15:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UFOKhE061411; Thu, 30 Mar 2023 15:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UFOK44061410; Thu, 30 Mar 2023 15:24:20 GMT (envelope-from git) Date: Thu, 30 Mar 2023 15:24:20 GMT Message-Id: <202303301524.32UFOK44061410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 463c88e63424 - main - committers-ports.dot: Use gj@ last commit 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: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 463c88e63424bf03511e4301994fd2b2d769d663 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=463c88e63424bf03511e4301994fd2b2d769d663 commit 463c88e63424bf03511e4301994fd2b2d769d663 Author: Fernando Apesteguía AuthorDate: 2023-03-30 15:18:30 +0000 Commit: Fernando Apesteguía CommitDate: 2023-03-30 15:18:30 +0000 committers-ports.dot: Use gj@ last commit date Use the date of the last commit from gj@ (d276a4dfa6f5f3711808eff44ff20a92114b4d6e) Note that for other developers the date is that when the commit bit was taken in. --- share/misc/committers-ports.dot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 7ac20b3a28b6..622b098dbcff 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -60,7 +60,7 @@ fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06\n2021/12/06"] flz [label="Florent Thoumie\nflz@FreeBSD.org\n2005/03/01\n2014/10/17"] gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2006/12/05\n2019/09/02"] gblach [label="Grzegorz Blach\ngblach@FreeBSD.org\n2012/11/03\n2020/08/03"] -gj [label="Gary L. Jennejohn\ngj@FreeBSD.org\n1994/??/??\n2006/04/28"] +gj [label="Gary L. Jennejohn\ngj@FreeBSD.org\n1994/??/??\n2012/04/20"] glarkin [label="Greg Larkin\nglarkin@FreeBSD.org\n2008/07/17\n2014/06/04"] gnn [label="George Neville-Neil\ngnn@FreeBSD.org\n2013/09/04\n2020/06/02"] gordon [label="Gordon Tetlow\ngordon@FreeBSD.org\n2014/10/14\n2019/04/08"] From nobody Thu Mar 30 15:30: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 4PnS6F3yPGz41wBb; Thu, 30 Mar 2023 15:30: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 4PnS6F3Mb4z4D3L; Thu, 30 Mar 2023 15:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680190213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uLXEpXx+yQPK2tjq8rYJfm4mG4chmFGge5FO6AVKgy0=; b=FO0Xya+PQiPaUPi0dHvNkPcFqkShzGkwYZfI2CF5SQwpxwWEeNQQCcRpSL+rQiIwMGvnkD knNuuctpRSjTVQ0lalnBm8D74zgPoZV7D6WL+0Dsf5tBXw4pybP6tI7tVrTKidm8xu2DHX u7gAgeTgEQpDZaHeUK46h+az4AdNg753dXcnXTcMoA/Oj5cVsLZmgEM6JlHh6/xnfuX57F blGJufMcSAT4UpIx7EgBcD7BHWySBQKem1yAZRn6cZe9Zozk7LED83VLkw1LlhxFKd+hJi JWNu7x78Aux+y3ee5BOmMEic5Xb0RN/oqvu7VsafM2/fm9t5B8mPggjUXeoVbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680190213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uLXEpXx+yQPK2tjq8rYJfm4mG4chmFGge5FO6AVKgy0=; b=DM4Bu87RIkHfT7I7g7T/n9peDk5F1+fEXEk5YpWC42Bzz0sYlx6dgNHbxBn15Svy6ZYXLB M0FcxBI+F+9QrBHSv3XHAr/cGsPgFQnOL8jhvIv6KMFRckLJRXYTqGcxsA9iKrsIhdvoPL U6+IA6UHA2vK5b9ZPpREanj0o5tzpsqw9Y8fC1hn2ErzWSklZqwfz54PJk5Y/mXnR9sg+/ JSbcEQXl3cjdVlZyR+EywrD18UQlq/ytTWQCmiJFEzEbRfTKSSlrZ9o+1n6rIwVEkYJD6o BzeGEYKg/Q++otmG9fD5GHZaEIypa177NwJKZfcmH+2RF5CgSo2zTA83NOTTyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680190213; a=rsa-sha256; cv=none; b=gOg6YtA+QCmno2fjBxhtFb1ry4h64W++Zji+eBJEWMn9IhyFS1SPWkMlIZyGgq+0u1MiJQ 7IbXYXDuFPdizPanSTuqH0KdPhK4EbPdOFPAAhuO2SmHWa0bgFQ9CtE0mOte9g12qa9DR2 iu3xBCOOp7MmDs+jhoFfOff0mjwS768SW0HomJl4Xtaa+c/kUGryuZp43Flv4UADsay4HL E8x3y1R5LAaGf0/9HaXLJumG/uEWB+94J6cio4SrP7kngEwihFcjcAPji3EVdKmA44cC/Q GwZt+NtiIWC75k4uDs1vZ6rAqpPNL+JG5iaRN0U9xHC4eFpXIhHaEWb0stLCUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnS6F2Pw2zGwR; Thu, 30 Mar 2023 15:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UFUDDO068283; Thu, 30 Mar 2023 15:30:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UFUDMp068276; Thu, 30 Mar 2023 15:30:13 GMT (envelope-from git) Date: Thu, 30 Mar 2023 15:30:13 GMT Message-Id: <202303301530.32UFUDMp068276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 4c6bcffd04f9 - main - libusb(3): Implement libusb_init_context() and the needed structures and 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c6bcffd04f9d0b6cb57af0ffcc9be3098fe950c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=4c6bcffd04f9d0b6cb57af0ffcc9be3098fe950c commit 4c6bcffd04f9d0b6cb57af0ffcc9be3098fe950c Author: Hans Petter Selasky AuthorDate: 2023-01-26 12:56:51 +0000 Commit: Hans Petter Selasky CommitDate: 2023-03-30 15:26:55 +0000 libusb(3): Implement libusb_init_context() and the needed structures and definitions. Differential Revision: https://reviews.freebsd.org/D38212 MFC after: 1 week Sponsored by: NVIDIA Networking --- lib/libusb/Makefile | 1 + lib/libusb/libusb.3 | 27 +++++++++++++++++++++------ lib/libusb/libusb.h | 16 ++++++++++++++++ lib/libusb/libusb10.c | 34 +++++++++++++++++++++++++++++++--- 4 files changed, 69 insertions(+), 9 deletions(-) diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile index c8f3dda0f1f8..6eec1b87fcef 100644 --- a/lib/libusb/Makefile +++ b/lib/libusb/Makefile @@ -68,6 +68,7 @@ CFLAGS+= -I ../../sys # LibUSB v1.0 MLINKS += libusb.3 libusb_get_version.3 MLINKS += libusb.3 libusb_init.3 +MLINKS += libusb.3 libusb_init_context.3 MLINKS += libusb.3 libusb_exit.3 MLINKS += libusb.3 libusb_has_capability.3 MLINKS += libusb.3 libusb_strerror.3 diff --git a/lib/libusb/libusb.3 b/lib/libusb/libusb.3 index d4c638d986e4..fe56639fa59f 100644 --- a/lib/libusb/libusb.3 +++ b/lib/libusb/libusb.3 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October, 2, 2022 +.Dd January, 26, 2023 .Dt LIBUSB 3 .Os .Sh NAME @@ -47,11 +47,26 @@ This function returns version information about LibUSB. .Pp .Ft int .Fn libusb_init "libusb_context **ctx" -This function initialises libusb. -It must be called at the beginning -of the program, before other libusb routines are used. -This function returns 0 on success or LIBUSB_ERROR on -failure. +Call this function before any other libusb v1.0 API function, to +initialise a valid libusb v1.0 context. +If the +.Fa ctx +argument is non-NULL, a pointer to the libusb context is stored at +the given location. +This function returns 0 upon success or LIBUSB_ERROR on failure. +.Pp +.Ft int +.Fn libusb_init_context "libusb_context **ctx" "const struct libusb_init_option []" "int num_options" +Call this function before any other libusb v1.0 API function, to +initialise a valid libusb v1.0 context. +If the +.Fa ctx +argument is non-NULL, a pointer to the libusb context is stored at +the given location. +Additional options, like the USB debug level, may be given using the +second and third argument. +If no options are needed, simply use libusb_init(). +This function returns 0 upon success or a LIBUSB_ERROR value on failure. .Pp .Ft void .Fn libusb_exit "libusb_context *ctx" diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h index 9eaee671b8b3..28fbece4955a 100644 --- a/lib/libusb/libusb.h +++ b/lib/libusb/libusb.h @@ -266,6 +266,14 @@ typedef enum { LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT = 2, } libusb_hotplug_event; +enum libusb_option { + LIBUSB_OPTION_LOG_LEVEL = 0, + LIBUSB_OPTION_USE_USBDK = 1, + LIBUSB_OPTION_NO_DEVICE_DISCOVERY = 2, + LIBUSB_OPTION_WEAK_AUTHORITY = 2, + LIBUSB_OPTION_MAX = 3, +}; + /* libusb structures */ struct libusb_context; @@ -288,6 +296,13 @@ struct libusb_version { const char *describe; }; +struct libusb_init_option { + enum libusb_option option; + union { + int64_t ival; + } value; +}; + typedef struct libusb_context libusb_context; typedef struct libusb_device libusb_device; typedef struct libusb_device_handle libusb_device_handle; @@ -465,6 +480,7 @@ const struct libusb_version *libusb_get_version(void); const char *libusb_strerror(int code); const char *libusb_error_name(int code); int libusb_init(libusb_context ** context); +int libusb_init_context(libusb_context **, const struct libusb_init_option [], int num_options); void libusb_exit(struct libusb_context *ctx); int libusb_has_capability(uint32_t capability); diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index 1fc89fc409f0..793152a30910 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -3,7 +3,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. - * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2009-2023 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -135,12 +135,22 @@ libusb_interrupt_event_handler(libusb_context *ctx) int libusb_init(libusb_context **context) +{ + return (libusb_init_context(context, NULL, 0)); +} + +int +libusb_init_context(libusb_context **context, + const struct libusb_init_option option[], int num_options) { struct libusb_context *ctx; pthread_condattr_t attr; char *debug, *ep; int ret; + if (num_options < 0) + return (LIBUSB_ERROR_INVALID_PARAM); + ctx = malloc(sizeof(*ctx)); if (!ctx) return (LIBUSB_ERROR_INVALID_PARAM); @@ -150,8 +160,9 @@ libusb_init(libusb_context **context) debug = getenv("LIBUSB_DEBUG"); if (debug != NULL) { /* - * If LIBUSB_DEBUG is set, we'll honor that and use it to - * override libusb_set_debug calls. + * If LIBUSB_DEBUG is set, we'll honor that first and + * use it to override any future libusb_set_debug() + * calls or init options. */ errno = 0; ctx->debug = strtol(debug, &ep, 10); @@ -166,7 +177,24 @@ libusb_init(libusb_context **context) */ ctx->debug = 0; } + } else { + /* + * If the LIBUSB_OPTION_LOG_LEVEL is set, honor that. + */ + for (int i = 0; i != num_options; i++) { + if (option[i].option != LIBUSB_OPTION_LOG_LEVEL) + continue; + + ctx->debug = (int)option[i].value.ival; + if ((int64_t)ctx->debug == option[i].value.ival) { + ctx->debug_fixed = 1; + } else { + free(ctx); + return (LIBUSB_ERROR_INVALID_PARAM); + } + } } + TAILQ_INIT(&ctx->pollfds); TAILQ_INIT(&ctx->tr_done); TAILQ_INIT(&ctx->hotplug_cbh); From nobody Thu Mar 30 15:45: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 4PnSRt6ZWBz41xGM; Thu, 30 Mar 2023 15:45: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 4PnSRt6BWgz4GDb; Thu, 30 Mar 2023 15:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680191130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WE2BUCRche+2J8VHjRWmtqY5EDM2EQ5bIbop+3mP+f0=; b=GXOnhVQSnpWGRizgJ9egxRnaFLD5OtcJ43I7YzLgM56JCsfTBn/UoQyDBtBQ86JCJpAAPU 8vq+lCnRLUjeGJKgSfEau3wc7/34HkHOzsgbDSpqfhspqcE7zk1b+vmh9xAQbjBgnN0m9Y /y7tXFIOrV9TFpyYJJIoLduG0mwXAKd9zu5bAaz8PHvbZEovILWU2i07MqNH9LY1tfQ8Oy Sk0ihfdTrAknAbOt6oIXAx1vNSA11klPmxy0uJeklC7KKdWlaus3zraWyNdfoXuDyLBUji Wf6EdJD9bw8IpVjxPsqheUYDKs3R4jVkoY1Wu8VCD5rDm/GhIKaakszk9g3cOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680191130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WE2BUCRche+2J8VHjRWmtqY5EDM2EQ5bIbop+3mP+f0=; b=BZRSz6V26t+rYH+EijwSjnyMVhr/XWBSxNbkp7e4soMluL6ODCcd7aVB+6aq2GhxRe9bu5 RvLt/z8ohOo1FUdlefdhxPKr7+TIYJj/q/GI2jh4a6KlqjwtCQCjbYEJbWjya4XHcc5Y6n HF28EtfTQ5xylPb1c48GzdlhMSod50FxPbhZ+zlujb+P22W5P4H7xi6wUS8e2tGlIZ3KWr PpTQRy9OUo6CKf88R2RZNuAOFJAS2QSS3tuNCS+tlNvkpkgP4UL0f2L1Q/2sFylfS0ID1t DrnZIVvi4gxcfdtPzuZPzUnFuoU0rg+hxgn8KLcV1Vx0c9MGZl5M+YE9fLm8AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680191130; a=rsa-sha256; cv=none; b=We0zl2PTAb2BCmwaQy3gvt2PPonCUiWoCojXFuy9DoBdRXHvks/EOqVXUPnPezBmt3MmHa htcBfY8Jbo3yUR00kF35BLsSg9n/M6AYvVCH6e3dqDH1VVglBETiZ3U2fsDkRfWFJOtVnE /WgoIKLS78fgheGlGXD7jaKgh+q48Tyzd4E6NftaUvd0RI4jiBfwZGqLKHIR6TVpGIhisa tfiPvu6X4PxQZ7xwAozW9Op9qGFdJG0LCLdRsSdeQdoFuVsmjY24jqYBReaZ47cSIQLbwj Ek+lRfDwdKhRzgKeeok32VtcaU70N8t9M7KVnakDMSmIY1ZPOGKLDqoWb2k+dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnSRt5GfJzJ6D; Thu, 30 Mar 2023 15:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UFjUsT094286; Thu, 30 Mar 2023 15:45:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UFjUZe094285; Thu, 30 Mar 2023 15:45:30 GMT (envelope-from git) Date: Thu, 30 Mar 2023 15:45:30 GMT Message-Id: <202303301545.32UFjUZe094285@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: 52c68e1625e4 - main - makefs: Whitespace cleanup to sync with NetBSD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 52c68e1625e418e384b6d2d118a22bc3e4529f64 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=52c68e1625e418e384b6d2d118a22bc3e4529f64 commit 52c68e1625e418e384b6d2d118a22bc3e4529f64 Author: Ed Maste AuthorDate: 2023-03-30 14:31:14 +0000 Commit: Ed Maste CommitDate: 2023-03-30 15:45:13 +0000 makefs: Whitespace cleanup to sync with NetBSD --- usr.sbin/makefs/cd9660/cd9660_eltorito.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c index b60e63ee1b53..0a57c91a659e 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c @@ -540,7 +540,7 @@ cd9660_write_mbr_partition_entry(FILE *fd, int idx, off_t sector_start, if (fseeko(fd, (off_t)(idx) * 16 + 0x1be, SEEK_SET) == -1) err(1, "fseeko"); - + val = 0x80; /* Bootable */ fwrite(&val, sizeof(val), 1, fd); @@ -610,7 +610,7 @@ cd9660_write_apm_partition_entry(FILE *fd, int idx, int total_partitions, apm32 = 0; /* pmLgDataStart */ fwrite(&apm32, sizeof(apm32), 1, fd); - /* pmDataCnt */ + /* pmDataCnt */ apm32 = htobe32(nsectors); fwrite(&apm32, sizeof(apm32), 1, fd); /* pmPartStatus */ @@ -659,9 +659,9 @@ cd9660_write_boot(iso9660_disk *diskStructure, FILE *fd) } cd9660_copy_file(diskStructure, fd, t->sector, t->filename); - if (t->system == ET_SYS_MAC) + if (t->system == ET_SYS_MAC) apm_partitions++; - if (t->system == ET_SYS_PPC) + if (t->system == ET_SYS_PPC) mbr_partitions++; } From nobody Thu Mar 30 16:11: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 4PnT1J5c68z4207R; Thu, 30 Mar 2023 16:11: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 4PnT1J59h3z4KmN; Thu, 30 Mar 2023 16:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680192660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ByJIoqlk5ywoCE6TNgZeuVJT74BjL8kYCM/Cxy+/RVI=; b=uwcZOro9zpFKh147q0Y/kOY5Izbki7vTtjOBR4aQJr6/sTRwXPp0uwi/wx2vsJEWgZ9cCg 3Kx31bVledhmVU4UJfGqCf8gEKqTaZ5Ld7iYqFS7Zx7M27oTjJfwkNwxLrReL6/wdm1/DW LrFm6l1FmN4cvAPrA5qGsYI+ZyOPJivtRKQQyB55YvPmc+VVDTbL9YH5gqlwrW5BcFaaIo NKxorZmVlzIFqtJdM6KyzdD2sxGQdCvM/VrWYds4rakdOwgiSKYLLAkWqAMWU1+0PBYTZx 75P3bAg7wKRYhrSPZ4s27R7NcgfSktbOWNq6VQsrAmMQJ0Z+44i0FXDGuBYTAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680192660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ByJIoqlk5ywoCE6TNgZeuVJT74BjL8kYCM/Cxy+/RVI=; b=N9fTjQ87aSD2+Vm+m6K6CNcr7dQc0xcot5PDFcQdhbxkzpHKqRqhs8JUluN7j3GAwAV7SH 3uwcVBiWbvkD0p0k5GwYdgyAARjkfczVCjjTPyUgsX+6PKsZ1Jk9KyS1Y9sBhm6VHoU4aO lVxmO8c9zB41GiX8EMo+oFaatW/OoY6ZeT2r+qlVrvHI6ChslmRgz9pT4yX7ZPpJ6u9dD5 Th473/Qh7Oo+/SMl/3oegY9BCDVZeT/g6/rszG1q1zqBpo1iQXtldthgJ7oebhNJK87P5b sK2mr0K2pZbE6JoL6UPTFn0G6BYcxwPDxvfg61j4gfdaTZEwiPsWYJwcpun3nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680192660; a=rsa-sha256; cv=none; b=P0DKAsK2DuJkehcID5xi5QwVzPGBor9IjiyLb7T4x/LwP8bVeFxzjpjZoPvTEr4PjBYPnr l1cGfK2/bjuvb9nmy9kBks+UG3wR8TmEoM85TX+DS+0JOfLZJCqZ8XB/cH9j/0kvIleCXP JplCi1QIJBcRrFH1MNtGtF4xq5j2UM0rHrau99F3DNu3QcIML+DzENVu62+iF6Oi6w4JRQ rX3Zdh4cAZY7lFceztvEmjI9Ed8pyLzrXOgCmOxTP9fKPx85RHetOupw+ne2OJzGYNen2v mi7+CyEavQZ9TItpRTVOjDpbcqORqvkYyOEK205w3l4RpiPXSVvRuTE5l6mHag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnT1J4G8ZzJS1; Thu, 30 Mar 2023 16:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UGB0Ol038022; Thu, 30 Mar 2023 16:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UGB0R2038021; Thu, 30 Mar 2023 16:11:00 GMT (envelope-from git) Date: Thu, 30 Mar 2023 16:11:00 GMT Message-Id: <202303301611.32UGB0R2038021@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: e37edc91b6a0 - main - bhyve: return EEXIST when adding a fwcfg item twice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: e37edc91b6a0a0116005bdd0fff7c911c37adabf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=e37edc91b6a0a0116005bdd0fff7c911c37adabf commit e37edc91b6a0a0116005bdd0fff7c911c37adabf Author: Corvin Köhne AuthorDate: 2023-03-30 05:43:28 +0000 Commit: Corvin Köhne CommitDate: 2023-03-30 16:10:31 +0000 bhyve: return EEXIST when adding a fwcfg item twice Reviewed by: rew MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39338 --- usr.sbin/bhyve/qemu_fwcfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index 2cc334190c15..1da0a42819b8 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -178,7 +178,7 @@ qemu_fwcfg_add_item(const uint16_t architecture, const uint16_t index, if (fwcfg_item->data != NULL) { warnx("%s: qemu fwcfg item exists (architecture %s index 0x%x)", __func__, arch ? "specific" : "generic", idx); - return (-1); + return (EEXIST); } /* save data of the item */ From nobody Thu Mar 30 16:14: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 4PnT5N3QXwz420Q0; Thu, 30 Mar 2023 16:14: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 4PnT5N10bqz4Lt5; Thu, 30 Mar 2023 16:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680192872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kioeM5VJqkSKa1xMqFBjcl+vqmbcIEoW38SoTqLCOCU=; b=Q+H5ORHyevO4xdEqVAdIDMwaPhXj2PFPA9hh4qF1c2hIfdYQQMlxYqSytfrRliLm0B2A1l piFCSBqwJnF6/dwE2EsQEwLv7EI3VOsnS6bBikFSx5xgJ6Rkg6ReqbOmRmBWbXhmsTABbl r6UbkFn/Oup8N9OAQpvI5F0E5GPdAjunahNLv8M16qrBygoKEBJCV5VmFkOq3oyGRjdcwb BUzHmr5ZQkUmJFf9qt3xDAs0S0yb66BzK79rEQCzgO6kLWCi5Z5rcHfAqrTPLHLBg/s/7b U3IRry+z+TX6RE4hBY9z4cDAuwz4R9eoZxpVc4IGlmcyvK3upCJ0WJVrxCxHig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680192872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kioeM5VJqkSKa1xMqFBjcl+vqmbcIEoW38SoTqLCOCU=; b=oHvcqY8mFj/Cqf1THllA+I9tP1nib1AHN2F15VQDXTejjJkqUDswswKFMjWrSPxHqgR5ac 9iYDMDk6cbrQne6VjWHCf7U46uyqBsphwrqV9sPQQt1nDVuyHM5i4+ZCigyOwSJ67wlwvj hJS0r0YQqxXsGy21ez2e4xNU8ouRIwVjTI0UXcwQTrHTys6HuwBeRD32vRv8H7rJqS81aq u7AmYO1fatfjRrUwZUR7vmmneRLh2pAU3w29a3x6VhAlCRJWpsr5GPADYAYb8/UpUpbKoe C9BUQ56BI3ERqp8WbdCe1mwv5YFsH+WbuN3HdXMuCe2lRH37eyAi0JcpNmpQDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680192872; a=rsa-sha256; cv=none; b=Xo5zLI64/JQKCELLvzBsbg/dVTMABwspMJ6PwPr/X0y7qnWQ7bpIHwGA+GmPEplqaYec6P A19UzxkVU/7kSi/qYM6FSl04HqcinnrBcg0z8bN+5IWrfwAXRvNrww8eE1NrzrelShzy/Y HsE6ZU3B0rvl3j/2hDlWl6GHINOJUS18lypJa//Y3B/ZYg4A1KFk95fK85sfF/ztByZZ5F RXGy6KcBXxEv6VambD/+uMwDEWb0x7ToCbybC3t3c9eYuqKaAMQGGN97MeqGiAk2GysAYl vQ40foGNC7rKvehGvy6zBCFt4uuNzvbqXpXpGyCNHlpM8xJL79ihGeZ8SMx/Dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnT5N04PkzJSg; Thu, 30 Mar 2023 16:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UGEVE7044094; Thu, 30 Mar 2023 16:14:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UGEV7W044093; Thu, 30 Mar 2023 16:14:31 GMT (envelope-from git) Date: Thu, 30 Mar 2023 16:14:31 GMT Message-Id: <202303301614.32UGEV7W044093@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: 30da840c627c - main - memmem: add a note about other systems which have memmem List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 30da840c627c80800c06edef346d907d6e5066a6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=30da840c627c80800c06edef346d907d6e5066a6 commit 30da840c627c80800c06edef346d907d6e5066a6 Author: Ed Maste AuthorDate: 2023-03-30 01:03:27 +0000 Commit: Ed Maste CommitDate: 2023-03-30 16:14:26 +0000 memmem: add a note about other systems which have memmem memmem started as a GNU extension but is now widely available. Reviewed by: mhorne (slightly earlier version) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39337 --- lib/libc/string/memmem.3 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/string/memmem.3 b/lib/libc/string/memmem.3 index a2a7c2ece623..5f8b9d792e78 100644 --- a/lib/libc/string/memmem.3 +++ b/lib/libc/string/memmem.3 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 17, 2017 +.Dd March 30, 2023 .Dt MEMMEM 3 .Os .Sh NAME @@ -71,7 +71,8 @@ is returned. .Xr strstr 3 .Sh CONFORMING TO .Fn memmem -is a GNU extension. +started as a GNU extension but is now available in at least +the GNU, musl, bionic, OpenBSD, NetBSD, macOS, and Illumos C runtime libraries. .Sh HISTORY The .Fn memmem From nobody Thu Mar 30 16:21: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 4PnTFv66Hmz420VB; Thu, 30 Mar 2023 16:21: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 4PnTFv5Gzdz4NhH; Thu, 30 Mar 2023 16:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680193315; h=from:from:reply-to:subject:subject: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+dVgYNN4pLxhVct8V2jQsaOOTJbYQC6aahDumO7th4=; b=Pf4rVJvXvgVYqqFyKKQDApKkwvWZMcPz9zOHHM7E3GxAzpDHSY5rUhPWH+MZhADAngtbeY P2wOnsniBP3OWYWAAgfykntjK2PjjqEyRSG3s05/9teUAf56O48DjvbgqNfZVxuEGRQaRF Ef8nHRkjXfKshOwlM4q1MPOlTdTMM+KXrniHd7lC3qhNHFJe02AV0UqHABAnNvgsSbyGSw K6C4GtHx9kKMvqRzEZ9KpNF8lRbyb91DJOPvMdKRnEkR2v04GChLaFyNKWPY48yS1M3/ky DELfXy+Lwkt+gWiFGW+jykUMm/shvpFAJZAH5Go4D7XzqYeQV987VT/UWMqvtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680193315; h=from:from:reply-to:subject:subject: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+dVgYNN4pLxhVct8V2jQsaOOTJbYQC6aahDumO7th4=; b=rQwTSt2YdKo7frvJT+INygvdHe9rS2flsQkN6iMM1VW5FzykTJjm73BIf8KLaur9EClbWa a7pxkXOR07kuPtwhhzA0pqrVnKPKCM8Wq1Qw6c4Eelb0LzUeDCkN/7GjD6SOsWRhRNUJyO oG3B9QqFImjzReNdxVlA+8AxhwizBqn24hPlv+h9KqKoCkFrYBjW/1E2bAqvluq0xLoUTV lavCfvU1Anfyxzq22T4XzPysbHy7I9p9HcDE7Y/sg51ZtMR9LBxBiQpDl/kKX6+u8XmbLG gcel6NoKKfbWXm10sANFRrlQ0AZt4fvs/fD9zRENUfqaetfcm6MyStrcThlfhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680193315; a=rsa-sha256; cv=none; b=VVeCCp8qN7oADrOgTeCbhVjeQR1hsfrOmN1LLZKVqcprD8ydFawsSdrGhcg8dtTH1RDiFM 783VSx3E5Wcuw26eA21qhEbPfMntF6py9GhYa47Zn42ksKUICMpXLHM+pxM/N6z5DB20jP 52ILIWnKf3GuaztTKMjTNXguHgvbiZU/Qu7Vc8HLwK2bGf6UWCH9tAzWFrT9Op9XhEejEG jPwyZuB5i9ZOhopUtLjAVYo9s2/h30YhSGu4ogJzJhBKXGGLz8f17peRVRWbIMCRbe6Dwo kzZoXD4ZwJtqXyWmSujhqgnqZyqUA7Ng6gBmFSTuaUKEZ9fd7qs/YGmHVN02Fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnTFv4LmrzK97; Thu, 30 Mar 2023 16:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UGLtTf059825; Thu, 30 Mar 2023 16:21:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UGLt6T059824; Thu, 30 Mar 2023 16:21:55 GMT (envelope-from git) Date: Thu, 30 Mar 2023 16:21:55 GMT Message-Id: <202303301621.32UGLt6T059824@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: efe6a1574ec0 - main - makefs: correct "filname" typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: efe6a1574ec0a1b41a5729a478c6243002da60c9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=efe6a1574ec0a1b41a5729a478c6243002da60c9 commit efe6a1574ec0a1b41a5729a478c6243002da60c9 Author: Ed Maste AuthorDate: 2023-03-30 14:14:56 +0000 Commit: Ed Maste CommitDate: 2023-03-30 16:21:26 +0000 makefs: correct "filname" typo Obtained from: NetBSD cd9660.c r1.58 --- usr.sbin/makefs/cd9660.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index ac6a263ec2df..7a795f82bd16 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1001,7 +1001,7 @@ cd9660_sorted_child_insert(cd9660node *parent, cd9660node *cn_new) /* * Called After cd9660_sorted_child_insert - * handles file collisions by suffixing each filname with ~n + * handles file collisions by suffixing each filename with ~n * where n represents the files respective place in the ordering */ static int From nobody Thu Mar 30 17:55: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 4PnWKp4rRkz425xY; Thu, 30 Mar 2023 17:55: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 4PnWKp4Qn7z4bpF; Thu, 30 Mar 2023 17:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680198926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flixQfwoT5q89pZK7FSaZyuQNQy8q4idEaGvpKBk0so=; b=veyXD7OYY4il0TcTV14m9lF64DU7IievK7EZpaUEJ6E7N20xV1EinA4syjkIx7UcQUwr1Z +wH7vRecl14QNBRkMqhcurPdT1VFM2gl2kcKqzJQw5u3B9zg5xKvTMX1gXYjjQp0N4LYuE E6ArQKwjkO3eS6nHnEfBSS5+bHGoRCC8BtXMhV3SAcxY9kvjqYaiG20lsJoI2YHDqRIzvK P1pcLEqB1K0NdVsRbyP+L2fW0fmy4QFc3LfL+7lZLniSNE0s7Qr7FMhHmJt0tRa3klKTQQ 0UgZqR4UN7GZKG11czsT6Se4FiL20icTJXjBAfAKop65n0+XBm1PN/JinCU7Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680198926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flixQfwoT5q89pZK7FSaZyuQNQy8q4idEaGvpKBk0so=; b=mZ+Hbu985d50V1pPIv77bioyj0AGQ3xnUh9ACF0KWpkRB+SD1zKQ21QzHIvnH16Zea+Hfo OleVrNqPwnfykuNzZR38Yl7sArhz6jqEW45G1oOVT5asNPPPExxr2YlkGp74KrKnTnEE01 h5I2xaBcwGoW90EzI1z0rg/XhE9+ggTrWRv2n5P0PkBIatShbg2JHr6jdGhwBdYmWjPOu9 rL9XPEOqWxZfbMsip8BnuLDerv6Auk53rAt1rihOg9GTJrUPfgHZ9w4kg+7D8tYo4KC2/O aI4LTdvNIkj0SHVKilXAmkgGDT2u4Lre5poV0L5YfWpUjI8tOhVTml0lJdAqOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680198926; a=rsa-sha256; cv=none; b=Dcs7zu9sH4gLSJ6KQfm59g5gzBjHzxs5PIIS9E9MnrrscY1WaApzLA82X0xDqjz8ieEfHi Gm7ZADaANoq4FpRszkDI2bSoYDQQeUdDc31CUPzPNMY/VHlEJn4o5TGPg/AVGBYWfngXen jQla0OmmllUJAeb/bCUVkiPxKcz2xtHq37MQIDuuUlJ/0ML1cdFnBbOrNjmB9BCnICRWYn hl2roPJ5yXdheFJ0cJgRZjGxHURl6Boz6v3dB5wu0dcNzOxWBZ7ReTC3Ut147qlQDiOAk2 Wd2O4hYPa8N+0dZvtABWUyxgqmiCxTMdQ+DElrUvZh4zSdaX6rzejLheBFView== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnWKp3XQ8zLlP; Thu, 30 Mar 2023 17:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UHtQe1007971; Thu, 30 Mar 2023 17:55:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UHtQhl007970; Thu, 30 Mar 2023 17:55:26 GMT (envelope-from git) Date: Thu, 30 Mar 2023 17:55:26 GMT Message-Id: <202303301755.32UHtQhl007970@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: fd02d0bc14b5 - main - graid3: Pre-allocate the timeout event structure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: fd02d0bc14b5c8d7109a180575b565fa7427b93e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fd02d0bc14b5c8d7109a180575b565fa7427b93e commit fd02d0bc14b5c8d7109a180575b565fa7427b93e Author: Mark Johnston AuthorDate: 2023-03-26 18:14:53 +0000 Commit: Mark Johnston CommitDate: 2023-03-30 17:38:15 +0000 graid3: Pre-allocate the timeout event structure As in commit 2f1cfb7f63ca ("gmirror: Pre-allocate the timeout event structure"), graid3 must avoid M_WAITOK allocations in callout handlers. Reported by: graid3 regression tests MFC after 2 weeks --- sys/geom/raid3/g_raid3.c | 40 ++++++++++++++++++++++++++++++++-------- sys/geom/raid3/g_raid3.h | 1 + 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 22e833c25f5d..1b425ba66f5f 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -125,6 +125,7 @@ static void g_raid3_dumpconf(struct sbuf *sb, const char *indent, static void g_raid3_sync_stop(struct g_raid3_softc *sc, int type); static int g_raid3_register_request(struct bio *pbp); static void g_raid3_sync_release(struct g_raid3_softc *sc); +static void g_raid3_timeout_drain(struct g_raid3_softc *sc); static const char * g_raid3_disk_state2str(int state) @@ -285,15 +286,14 @@ g_raid3_event_free(struct g_raid3_event *ep) free(ep, M_RAID3); } -int -g_raid3_event_send(void *arg, int state, int flags) +static int +g_raid3_event_dispatch(struct g_raid3_event *ep, void *arg, int state, + int flags) { struct g_raid3_softc *sc; struct g_raid3_disk *disk; - struct g_raid3_event *ep; int error; - ep = malloc(sizeof(*ep), M_RAID3, M_WAITOK); G_RAID3_DEBUG(4, "%s: Sending event %p.", __func__, ep); if ((flags & G_RAID3_EVENT_DEVICE) != 0) { disk = NULL; @@ -330,6 +330,15 @@ g_raid3_event_send(void *arg, int state, int flags) return (error); } +int +g_raid3_event_send(void *arg, int state, int flags) +{ + struct g_raid3_event *ep; + + ep = malloc(sizeof(*ep), M_RAID3, M_WAITOK); + return (g_raid3_event_dispatch(ep, arg, state, flags)); +} + static struct g_raid3_event * g_raid3_event_get(struct g_raid3_softc *sc) { @@ -634,7 +643,7 @@ g_raid3_destroy_device(struct g_raid3_softc *sc) mtx_unlock(&sc->sc_events_mtx); } } - callout_drain(&sc->sc_callout); + g_raid3_timeout_drain(sc); cp = LIST_FIRST(&sc->sc_sync.ds_geom->consumer); g_topology_lock(); if (cp != NULL) @@ -2377,13 +2386,26 @@ static void g_raid3_go(void *arg) { struct g_raid3_softc *sc; + struct g_raid3_event *ep; sc = arg; G_RAID3_DEBUG(0, "Force device %s start due to timeout.", sc->sc_name); - g_raid3_event_send(sc, 0, + ep = sc->sc_timeout_event; + sc->sc_timeout_event = NULL; + g_raid3_event_dispatch(ep, sc, 0, G_RAID3_EVENT_DONTWAIT | G_RAID3_EVENT_DEVICE); } +static void +g_raid3_timeout_drain(struct g_raid3_softc *sc) +{ + sx_assert(&sc->sc_lock, SX_XLOCKED); + + callout_drain(&sc->sc_callout); + g_raid3_event_free(sc->sc_timeout_event); + sc->sc_timeout_event = NULL; +} + static u_int g_raid3_determine_state(struct g_raid3_disk *disk) { @@ -2473,7 +2495,7 @@ g_raid3_update_device(struct g_raid3_softc *sc, boolean_t force) */ if (g_raid3_ndisks(sc, -1) + force == sc->sc_ndisks) { if (!force) - callout_drain(&sc->sc_callout); + g_raid3_timeout_drain(sc); } else { if (force) { /* @@ -3217,9 +3239,11 @@ g_raid3_create(struct g_class *mp, const struct g_raid3_metadata *md) G_RAID3_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount); /* - * Run timeout. + * Schedule startup timeout. */ timeout = atomic_load_acq_int(&g_raid3_timeout); + sc->sc_timeout_event = malloc(sizeof(struct g_raid3_event), M_RAID3, + M_WAITOK); callout_reset(&sc->sc_callout, timeout * hz, g_raid3_go, sc); return (sc->sc_geom); } diff --git a/sys/geom/raid3/g_raid3.h b/sys/geom/raid3/g_raid3.h index 8f0d92dee7ef..edfc036809c8 100644 --- a/sys/geom/raid3/g_raid3.h +++ b/sys/geom/raid3/g_raid3.h @@ -224,6 +224,7 @@ struct g_raid3_softc { TAILQ_HEAD(, g_raid3_event) sc_events; struct mtx sc_events_mtx; + struct g_raid3_event *sc_timeout_event; struct callout sc_callout; From nobody Thu Mar 30 17:55: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 4PnWKq5kYrz425bH; Thu, 30 Mar 2023 17:55: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 4PnWKq5B2Qz4bpZ; Thu, 30 Mar 2023 17:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680198927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jQA9k+GJsMoheTMRxBZ5qI/NKUXPR6jL3/qCU2O+kDk=; b=JRVlHfyb7TXGxNvJi2k3ykrn+K9VVLBbqsuiEv+NeyPijCwiOY8CaPKhr9avzamYrsaXbL w/DYjWJjFiFU/Q6HLNAO9qPGWM0KwclrUdAHGMFxIGdQbFKtmUrZJEBtMbBCB4MzlpVehI 4G1gaKg69+SkyAhcQjKkNDhdJOi7JUN/Z3ymsrXJOcqQtU76IO31PO7tTyOsqjay6lsdtI +JQn3A9afvDryIHDOZmlilx4SiukE9BkVkEj+bjXnByf+Hz5tYl4+7niQyXfN7OvX1sFpb mmRurBhIRRyYlPom/BXKmKNY0Y116WOSii+msl8prKA7ZrQv4MqXllyxfZHXzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680198927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jQA9k+GJsMoheTMRxBZ5qI/NKUXPR6jL3/qCU2O+kDk=; b=sMlLq6UctYxGkwe9pf5i8qrJhcAa9ifkNA2vpWwZw+dK9Go9ql6Hw+t6NsOcTaBxhGLnkh mUX4UVMMdhET1Io6MYrYIkLo0XvVb8jdJjCSyqV6KlKRZ0iaTDs4F/0Jynh/6RTnzhw/JT cqFjbsOYWF4OnbakDHabX6hBdp+qFLw/TW0pRX5e27NO16i62VtqbVxfjLt8idn2ezBhMS erEww1LLRiYK+Rlilb6iU9Mc6nRlD+EwP7nnMb51dCTczZIt9muXRNyXsDCIgmru2WaKPL 7SV/hdwo9nDkcvy6chT5TSBDX7x0DzLgC7DzBZ4CwHfuR5QlIaZaXT//KRMO+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680198927; a=rsa-sha256; cv=none; b=bsBNW0nrEhD84SfIKV6sq9BOsf/UCOBvqk9kNzjlTG4aZTDCiAghMcRxGo6soybAW+2IIU pcXpP6J0jWi0bpuogEtRRW1ELh3HXE5rxW0QaqGC6xrgj6TbV6WiybksQ2Jg/mAvyPc8wy j9HY3bXDWcmVc0XpvC0LxuE6r3s2QQrKyCP9xTTmofKD52Gxw9/A5EO0sDTqH2pS7yoiqf zUWlee6EeOISBt5rs+kvyptZN8a6rnU2iQW0iyeZjlxzuJgRPpqKWjNbtAqnobl9q+rNpG 0lrEMPoFcsEqgfMEsZtjsZwRfbRyQqCcqLdttedJdhqqAA2YPTL+Z04hO+0v1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnWKq4DJzzLpV; Thu, 30 Mar 2023 17:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UHtRG1007990; Thu, 30 Mar 2023 17:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UHtRBF007989; Thu, 30 Mar 2023 17:55:27 GMT (envelope-from git) Date: Thu, 30 Mar 2023 17:55:27 GMT Message-Id: <202303301755.32UHtRBF007989@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: 5ea1e35d7de6 - main - ktls tests: Populate sockaddr fields before binding List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 5ea1e35d7de69cc4e0311b987adaa98e6c19424c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ea1e35d7de69cc4e0311b987adaa98e6c19424c commit 5ea1e35d7de69cc4e0311b987adaa98e6c19424c Author: Mark Johnston AuthorDate: 2023-03-30 17:52:04 +0000 Commit: Mark Johnston CommitDate: 2023-03-30 17:52:04 +0000 ktls tests: Populate sockaddr fields before binding Reported by: Jenkins Fixes: b4b33821fa3d ("ktls: Fix interlocking between ktls_enable_rx() and listen(2)") --- tests/sys/kern/ktls_test.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/sys/kern/ktls_test.c b/tests/sys/kern/ktls_test.c index e925dbe32e52..a3d0c17d6d62 100644 --- a/tests/sys/kern/ktls_test.c +++ b/tests/sys/kern/ktls_test.c @@ -2801,6 +2801,8 @@ ATF_TC_BODY(ktls_listening_socket, tc) s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ATF_REQUIRE(s >= 0); memset(&sin, 0, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); ATF_REQUIRE(bind(s, (struct sockaddr *)&sin, sizeof(sin)) == 0); ATF_REQUIRE(listen(s, 1) == 0); build_tls_enable(tc, CRYPTO_AES_NIST_GCM_16, 128 / 8, 0, From nobody Thu Mar 30 17: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 4PnWKr6vmRz4267q; Thu, 30 Mar 2023 17: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 4PnWKr6Ftyz4bnS; Thu, 30 Mar 2023 17: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=1680198928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X/rPGeIu31dz9sKCX6wgQ9R79lPR1Daa4Id0QKQy99o=; b=nsizacolhbTAnCtK3KhttwZ87cpsroNQE728ZaAwB5JN2dTxiG/H0m0w6jIiAH+24TTSQs 1YdPCWPPkTveZ5e+i3X33kXkQGyL2Z0k5Bn6nFTxPWHGtI/WFEiJvwi41xiQSMMaDHwOtt A3eKqD1mL9RKJopecY8fk8tFpQMSo6xe1QC1jsJDJ3KpjSXT09cM3DQLH4kjaACHNdpVen XLiGwUTaa1oW6LKTIpS89QNG9xAVnHM+wtg1oy5XK4Bc26PVAZs5q/Yq0na1rch+DB06Ij DVxklokI1rrWy5DXb9sl+wpPxUJenvJtPTTOuJlkWbxQYQakdmHKky4wr3zTiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680198928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X/rPGeIu31dz9sKCX6wgQ9R79lPR1Daa4Id0QKQy99o=; b=NGJB0kg2P4ZjyhwxcnEEWhMtCTUyHtGPI4/P6J/u+huC9su5mDa0/ixfxvfpYS3g3xoq+V ZiVcv9+FYAX6noy2TrD+feAm1GWsiQ6w3b2brTVWJi9M7z9YF+nkaP7hhWIEFl2sTATYHl CtC5yrdV0Xaw4RJFyTGy1PGIwTzI8Ar4ONOKJ6y4F1ZU2ZbzqZDQE/GpIGvx3rX/MIIfAw ypZV9OUIMVUTKYWDI+YqbgpuKKijBksnmEOsyQXAY1JYmhM98Ly5rxaPUmTUq3g27xqCzu RF2wEKUthrNC8aCLBS/oIZGv5s5kVeC0TPOkQ8EHDUeOQrK2h0GpHTHfwWiiLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680198928; a=rsa-sha256; cv=none; b=uFRSBEtC6vTF+1DIShghRmS/nMguQ2cStqnYl1y91oQgAiT4wTyDIpllHMehXz3E6KEUQB lxP7kKez1B21xjS+P1jfrO1HZn/IqYIBbtNL97f82ubQejpMNI54kr/+IPsFqWqRh2HG4x Vxph79IyLR42hJ7IFssyUGQgavWw40AkmGnA6Prgqs3Lz70L7u1SLzl3jVhexJYqUQwQMw Xd/YSwqB+otNqFK+eB9eMX+ovE4wFr0F49G75ySbhnERs9FxbsX4YaV4g9Jzl2clpwDHIM wQMdbJK9UAjNnv09YGcnB44e1YioSVgLfDuJQhvB/M7DWGgcbh1S7fu/EmzNog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnWKr5L0PzMQY; Thu, 30 Mar 2023 17:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UHtSts008016; Thu, 30 Mar 2023 17:55:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UHtS7H008015; Thu, 30 Mar 2023 17:55:28 GMT (envelope-from git) Date: Thu, 30 Mar 2023 17:55:28 GMT Message-Id: <202303301755.32UHtS7H008015@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: 889b5662ce06 - main - fdgrowtable tests: Address a set-but-not-used 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 889b5662ce06ad01f87f1e501dc56c7bc50bbf9b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=889b5662ce06ad01f87f1e501dc56c7bc50bbf9b commit 889b5662ce06ad01f87f1e501dc56c7bc50bbf9b Author: Mark Johnston AuthorDate: 2023-03-30 17:53:48 +0000 Commit: Mark Johnston CommitDate: 2023-03-30 17:55:06 +0000 fdgrowtable tests: Address a set-but-not-used warning MFC after: 1 week --- tests/sys/kern/fdgrowtable_test.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/sys/kern/fdgrowtable_test.c b/tests/sys/kern/fdgrowtable_test.c index 794342eaa808..023a25ffe5e6 100644 --- a/tests/sys/kern/fdgrowtable_test.c +++ b/tests/sys/kern/fdgrowtable_test.c @@ -233,6 +233,7 @@ ATF_TC_BODY(oldtables_shared_via_process, tc) /* get current status of child */ wpid = waitpid(child, &status, WUNTRACED); + ATF_REQUIRE(wpid == child); /* child should be stopped */ ATF_REQUIRE(WIFSTOPPED(status)); @@ -254,6 +255,7 @@ ATF_TC_BODY(oldtables_shared_via_process, tc) /* child should have exited */ wpid = waitpid(child, &status, 0); + ATF_REQUIRE(wpid == child); ATF_REQUIRE(WIFEXITED(status)); ATF_REQUIRE(WEXITSTATUS(status) == 127); } From nobody Thu Mar 30 19:02: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 4PnXpr1BqCz42Bfc; Thu, 30 Mar 2023 19:02:12 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) (using TLSv1.3 with cipher TLS_AES_256_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 4PnXpq6XLyz3KLD; Thu, 30 Mar 2023 19:02:11 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; none Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 1F4203200929; Thu, 30 Mar 2023 15:02:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 30 Mar 2023 15:02:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; t= 1680202928; x=1680289328; bh=IO2dRQvLWYWcaeJ1+onw/k2jDb7ae+EHP7E TZl1CdPs=; b=qhiwyZQ67ci9xY2q+ySaaewXQ73Os9lcZlNJYottMbZOTUF+TV5 UuWqukr6UJeHgbFBT2drw2FC2pbs29PL65geGguJUiVzcrKAu4oQwbeI6d2oDX09 XewuGojVxgG8kWwYtRa+LdDjzIOqwMm9Z6PsAsdz8LMfbqMwbkjGy5TUASPLbt3P U+JysjyXXH335xTdiWMf2ebB+JTUNHVnJChYQcIAKEV/LnbKPJH3ftfCzIHu7bqE yKmoWsbr86kirNv8INspkTH/vLjuWYK3cdlADIBvfmClS+BhmfrUtLxvVhff3hVS oDH8pLlKBLPvoiaMF2Qlp4BuTD8hr2MWu8w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1680202928; x= 1680289328; bh=IO2dRQvLWYWcaeJ1+onw/k2jDb7ae+EHP7ETZl1CdPs=; b=l kRUBtsDa7ApvG7E7OAce2S0wA/iOnz0GumBRHDrZ0A+i74JLXAtkVkbgocmMXaQg ybbAqkj79FzSB7mwqvHsRdwTMdJkZ4e0/xt33cq3/E+s4wSD2I8i1aOpli3oc6+z 9cVXH88JZXuzWWDCs2Jr4vv1TBAMe+OIshBa7LB9rvIx1rQ039ggzxq01v2NW5+O +bhi/ck3SYnmBLiKfevUVORcE0YnDOztdCjx442OYzMpcMmezp4kBSCPYjv4R8b0 aOaUkJzWte5EcotYeQ4b2Kf3o0akPiWKX9TMuATiMya3PR43n+eruEFFti6e9w22 ty8CZ/phDtH1YpekAqnrg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehledggeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefkffggfgfuvfhfhfgjtgfgsehtje ertddtfeejnecuhfhrohhmpegjuhhrihcuoeihuhhrihesrggvthgvrhhnrdhorhhgqeen ucggtffrrghtthgvrhhnpeegvedvhedtfeelteduudejveejgfejffekfffgieekveeitd eulefhfedtueejveenucffohhmrghinhepfhhrvggvsghsugdrohhrghdpohhpthhsrdhm khenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeihuh hrihesrggvthgvrhhnrdhorhhg X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 30 Mar 2023 15:02:07 -0400 (EDT) Message-ID: <0cf3ca23-d192-adb6-ee00-8458bde27233@aetern.org> Date: Thu, 30 Mar 2023 21:02:05 +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: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: git: 7d8e1e8dd904 - main - libcasper: Move helper libraries from /lib/casper to /lib. Content-Language: en-US To: John Baldwin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202303292207.32TM7Emk050652@gitrepo.freebsd.org> From: Yuri In-Reply-To: <202303292207.32TM7Emk050652@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4PnXpq6XLyz3KLD X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N John Baldwin wrote: > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=7d8e1e8dd9042f802a67adefabd28fcd9b1e4051 > > commit 7d8e1e8dd9042f802a67adefabd28fcd9b1e4051 > Author: John Baldwin > AuthorDate: 2023-03-29 22:04:28 +0000 > Commit: John Baldwin > CommitDate: 2023-03-29 22:04:28 +0000 > > libcasper: Move helper libraries from /lib/casper to /lib. > > These libraries are linked to directly by applications rather than > opened at runtime via dlopen(). > > Discussed with: oshogbo > Reviewed by: markj, emaste > Differential Revision: https://reviews.freebsd.org/D39245 > --- > Makefile.inc1 | 3 +-- > ObsoleteFiles.inc | 11 +++++++++++ > etc/mtree/BSD.root.dist | 2 -- > lib/libcasper/services/cap_dns/Makefile | 2 +- > lib/libcasper/services/cap_fileargs/Makefile | 2 +- > lib/libcasper/services/cap_grp/Makefile | 2 +- > lib/libcasper/services/cap_net/Makefile | 2 +- > lib/libcasper/services/cap_netdb/Makefile | 2 +- > lib/libcasper/services/cap_pwd/Makefile | 2 +- > lib/libcasper/services/cap_sysctl/Makefile | 2 +- > lib/libcasper/services/cap_syslog/Makefile | 2 +- > libexec/rtld-elf/rtld_paths.h | 2 +- > tools/build/Makefile | 1 - > tools/build/mk/OptionalObsoleteFiles.inc | 16 ++++++++-------- > 14 files changed, 29 insertions(+), 22 deletions(-) > > diff --git a/Makefile.inc1 b/Makefile.inc1 > index 63c3ce80f54d..471267b3435f 100644 > --- a/Makefile.inc1 > +++ b/Makefile.inc1 > @@ -1076,8 +1076,7 @@ _bootstrap-tools: > ${_+_}cd ${.CURDIR}; ${BMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack > .endif > ${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools > - mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/casper ${WORLDTMP}/lib/geom \ > - ${WORLDTMP}/bin > + mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/geom ${WORLDTMP}/bin > ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ > -p ${WORLDTMP}/usr >/dev/null > ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \ > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > index 72b119c1c85b..f526d0f7458a 100644 > --- a/ObsoleteFiles.inc > +++ b/ObsoleteFiles.inc > @@ -52,6 +52,17 @@ > # xargs -n1 | sort | uniq -d; > # done > > +# 20230329: libcasper libraries moved to /lib > +MOVED_LIBS+=lib/casper/libcap_dns.so.2 > +MOVED_LIBS+=lib/casper/libcap_fileargs.so.1 > +MOVED_LIBS+=lib/casper/libcap_grp.so.1 > +MOVED_LIBS+=lib/casper/libcap_net.so.1 Looks like libcap_netdb.so.1 is missing from this list. > +MOVED_LIBS+=lib/casper/libcap_pwd.so.1 > +MOVED_LIBS+=lib/casper/libcap_sysctl.so.1 > +MOVED_LIBS+=lib/casper/libcap_sysctl.so.2 > +MOVED_LIBS+=lib/casper/libcap_syslog.so.1 > +OLD_DIRS+=lib/casper > + > # 20230324: libvmmapi shlib version bumped to 6 > OLD_LIBS+=usr/lib/libvmmapi.so.5 > > diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist > index 5ee5da8ee149..3a3a3a78d995 100644 > --- a/etc/mtree/BSD.root.dist > +++ b/etc/mtree/BSD.root.dist > @@ -104,8 +104,6 @@ > .. > .. > lib > - casper > - .. > geom > .. > nvmecontrol > diff --git a/lib/libcasper/services/cap_dns/Makefile b/lib/libcasper/services/cap_dns/Makefile > index b59b329d0653..dbeebcd19dfa 100644 > --- a/lib/libcasper/services/cap_dns/Makefile > +++ b/lib/libcasper/services/cap_dns/Makefile > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -SHLIBDIR?= /lib/casper > +SHLIBDIR?= /lib > > .include > > diff --git a/lib/libcasper/services/cap_fileargs/Makefile b/lib/libcasper/services/cap_fileargs/Makefile > index 22230f82d9f4..2369f58cc2bb 100644 > --- a/lib/libcasper/services/cap_fileargs/Makefile > +++ b/lib/libcasper/services/cap_fileargs/Makefile > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -SHLIBDIR?= /lib/casper > +SHLIBDIR?= /lib > > .include > > diff --git a/lib/libcasper/services/cap_grp/Makefile b/lib/libcasper/services/cap_grp/Makefile > index 83e24fcc8e76..1250832bcd2d 100644 > --- a/lib/libcasper/services/cap_grp/Makefile > +++ b/lib/libcasper/services/cap_grp/Makefile > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -SHLIBDIR?= /lib/casper > +SHLIBDIR?= /lib > > .include > > diff --git a/lib/libcasper/services/cap_net/Makefile b/lib/libcasper/services/cap_net/Makefile > index 70acac1cc9ad..a1528b40c2a6 100644 > --- a/lib/libcasper/services/cap_net/Makefile > +++ b/lib/libcasper/services/cap_net/Makefile > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -SHLIBDIR?= /lib/casper > +SHLIBDIR?= /lib > > .include > > diff --git a/lib/libcasper/services/cap_netdb/Makefile b/lib/libcasper/services/cap_netdb/Makefile > index 5070976d2e25..fdec72ec4ada 100644 > --- a/lib/libcasper/services/cap_netdb/Makefile > +++ b/lib/libcasper/services/cap_netdb/Makefile > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -SHLIBDIR?= /lib/casper > +SHLIBDIR?= /lib > > .include > > diff --git a/lib/libcasper/services/cap_pwd/Makefile b/lib/libcasper/services/cap_pwd/Makefile > index d5e6e9576854..203ea806a215 100644 > --- a/lib/libcasper/services/cap_pwd/Makefile > +++ b/lib/libcasper/services/cap_pwd/Makefile > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -SHLIBDIR?= /lib/casper > +SHLIBDIR?= /lib > > .include > > diff --git a/lib/libcasper/services/cap_sysctl/Makefile b/lib/libcasper/services/cap_sysctl/Makefile > index afb7b4374370..30bec927f29b 100644 > --- a/lib/libcasper/services/cap_sysctl/Makefile > +++ b/lib/libcasper/services/cap_sysctl/Makefile > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -SHLIBDIR?= /lib/casper > +SHLIBDIR?= /lib > > .include > > diff --git a/lib/libcasper/services/cap_syslog/Makefile b/lib/libcasper/services/cap_syslog/Makefile > index a6b4af5640d6..a3e4603e8ace 100644 > --- a/lib/libcasper/services/cap_syslog/Makefile > +++ b/lib/libcasper/services/cap_syslog/Makefile > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -SHLIBDIR?= /lib/casper > +SHLIBDIR?= /lib > > .include > > diff --git a/libexec/rtld-elf/rtld_paths.h b/libexec/rtld-elf/rtld_paths.h > index c051db7b580f..759a610e6469 100644 > --- a/libexec/rtld-elf/rtld_paths.h > +++ b/libexec/rtld-elf/rtld_paths.h > @@ -69,7 +69,7 @@ > #endif > > #ifndef STANDARD_LIBRARY_PATH > -#define STANDARD_LIBRARY_PATH "/lib/casper:/lib:/usr/lib" > +#define STANDARD_LIBRARY_PATH "/lib:/usr/lib" > #endif > > #ifndef LD_ > diff --git a/tools/build/Makefile b/tools/build/Makefile > index 71a38534f7ac..97e0bfe8f4f7 100644 > --- a/tools/build/Makefile > +++ b/tools/build/Makefile > @@ -354,7 +354,6 @@ host-symlinks: > # yet (this happens if we are crossbuilding from Linux/Mac). > INSTALLDIR_LIST= \ > bin \ > - lib/casper \ > lib/geom \ > usr/include/casper \ > usr/include/private/ucl \ > diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc > index f3bb91ae6ff9..ac7109609dd4 100644 > --- a/tools/build/mk/OptionalObsoleteFiles.inc > +++ b/tools/build/mk/OptionalObsoleteFiles.inc > @@ -855,14 +855,14 @@ OLD_DIRS+=usr/tests/usr.bin/calendar > > .if ${MK_CASPER} == no > OLD_LIBS+=lib/libcasper.so.1 > -OLD_LIBS+=lib/casper/libcap_dns.so.2 > -OLD_LIBS+=lib/casper/libcap_fileargs.so.1 > -OLD_LIBS+=lib/casper/libcap_grp.so.1 > -OLD_LIBS+=lib/casper/libcap_net.so.1 > -OLD_LIBS+=lib/casper/libcap_pwd.so.1 > -OLD_LIBS+=lib/casper/libcap_sysctl.so.1 > -OLD_LIBS+=lib/casper/libcap_sysctl.so.2 > -OLD_LIBS+=lib/casper/libcap_syslog.so.1 > +OLD_LIBS+=lib/libcap_dns.so.2 > +OLD_LIBS+=lib/libcap_fileargs.so.1 > +OLD_LIBS+=lib/libcap_grp.so.1 > +OLD_LIBS+=lib/libcap_net.so.1 Here as well. > +OLD_LIBS+=lib/libcap_pwd.so.1 > +OLD_LIBS+=lib/libcap_sysctl.so.1 > +OLD_LIBS+=lib/libcap_sysctl.so.2 > +OLD_LIBS+=lib/libcap_syslog.so.1 > .endif > > .if ${MK_CCD} == no From nobody Thu Mar 30 19:06: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 4PnXvk4qhvz42C55; Thu, 30 Mar 2023 19:06: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 4PnXvk4Kvmz3MJm; Thu, 30 Mar 2023 19:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680203186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z0I7firGdyKdz2FBsGK7z+936z0h63BeXd5P6zU58mY=; b=B6WSSqrwFWV/lxN8Z2gErFWloyxMcX5IrsCjMYcc45+IbbBpE2YN9JGDnUN6VKYGHi++JD 9ZogO7mJsdlvX7s6GNQmz7xs2pxr2uxn5Y51jNZWhr+pFigHaFoDNCjrLC9Cdnv8ro6lRY 9OXMsoxsYAmbigW6iTg3ftoj7kqjP9iYMA/9Nsd1Q2sCgBkFtCYdq7JQbeJlWCK2C/H1t7 gpIzT+Ifh8ZIvsiU4nr/ljYR04Vjbx665lWM9CgnseilOUkIEhLBGNS14eeo0Bk0nPudC0 NvZJFeCB16dIPkRWeSZhEvHvR6AARIIX+vhtSA4W0OmvSJGG4kWLed0uq+djGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680203186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z0I7firGdyKdz2FBsGK7z+936z0h63BeXd5P6zU58mY=; b=lvYQlo2dwqwrRxxXKkUWH1tt81RB8xA07X5ecLoY/mP8ZoCX4aFo1NFCWO8A5oMFAB3WO1 kAfW0VWNv3ZyL5CEAx60x7TG2jsdWfW05phbiOdv/Nqiw+JprVrNSbNdOT0B/HIb2s5T7V hdhbFCMj96CJGOqacBrpcJmca7NQ15HzBC/NXtHngGXIRMXHwHy+yTwQGX8wnTENgln1Lw MKeamn8i9PTiifR18o1Sljujcfp2SPqcCR3wYBiNfGg7nwT1SiBPeiA+fyKZ0n6kkRUmLz HYx+Qg1hzjAdaBBjf83Z/bgDFOf0ZDSxiRDGfRkHbLpV4owCwuybsKi2yzvL4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680203186; a=rsa-sha256; cv=none; b=CALJCYB2+IbkY71zurNG/aA8FyGbX15U0yt98bey+6eo0amoEjUHtAbaMkUreAHcXBj5Td WG16Vl6STK8u7t6CpSKnsnLhgDRHvUsqyCMwZPl9ucgJ8NeXhTeqY7kwcc72ygCx0efqpK 9SoAhUksIr8LQaGjsdS8Ul+Yv/9ygi4xe/KgWC17qz0z5U4VGwsJPPXLXuXmUVWPs/gR64 O+kW9f5KKxFQmGd4LjCjGcAv+SUYlaQPNghKC14vpRgrh86n6cKSzhrFWE8NcxgOX/CrAO P+Ru+QBtRQ4U8D3VAJn9XHxMexI5FjC2doo6hmE6ZPXCrohw8EOfO7xTUegOrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnXvk3NW2zP3r; Thu, 30 Mar 2023 19:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UJ6QZ8024038; Thu, 30 Mar 2023 19:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UJ6Q1R024037; Thu, 30 Mar 2023 19:06:26 GMT (envelope-from git) Date: Thu, 30 Mar 2023 19:06:26 GMT Message-Id: <202303301906.32UJ6Q1R024037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 0c59e0b4e581 - main - pflogd: Do not access obsolete structure member pcap.tzoff List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c59e0b4e5817f139ce28486085b2f196351c7a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=0c59e0b4e5817f139ce28486085b2f196351c7a3 commit 0c59e0b4e5817f139ce28486085b2f196351c7a3 Author: Joseph Mingrone AuthorDate: 2023-03-30 16:18:28 +0000 Commit: Joseph Mingrone CommitDate: 2023-03-30 18:58:45 +0000 pflogd: Do not access obsolete structure member pcap.tzoff This change is in preparation for a libpcap update. See also: https://github.com/the-tcpdump-group/libpcap/commit/d4d65e7c4c0a6233784b346dcb0ebb7e23a3feaa Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- contrib/pf/pflogd/pflogd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/pf/pflogd/pflogd.c b/contrib/pf/pflogd/pflogd.c index de8d4acfa585..2b1b0df769a7 100644 --- a/contrib/pf/pflogd/pflogd.c +++ b/contrib/pf/pflogd/pflogd.c @@ -375,7 +375,7 @@ try_reset_dump(int nomove) hdr.magic = TCPDUMP_MAGIC; hdr.version_major = PCAP_VERSION_MAJOR; hdr.version_minor = PCAP_VERSION_MINOR; - hdr.thiszone = hpcap->tzoff; + hdr.thiszone = 0; hdr.snaplen = hpcap->snapshot; hdr.sigfigs = 0; hdr.linktype = hpcap->linktype; From nobody Thu Mar 30 21:16: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 4PnbnQ10rrz42Lh1; Thu, 30 Mar 2023 21:16: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 4PnbnQ0W7bz3sxk; Thu, 30 Mar 2023 21:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680210970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9DmAccijFg7JLsKM6zOb1JiXOM66dA9/OfKROTgaUQE=; b=BTC4hlYcmYSk9q21UeSDoQBMdf6uw/lXoclsmQLrnkwvgN+xayRh1b1VrrpBe6tjepgfEE 9+UKLuqK++FqLgDcxLFmV0YU0YZSkdB69qMwPLFZe/s+JFJTjJhy76p4GZB/05nQKAb3z+ 5/MZ+Q38FPjvUm62BFToBY+AhPUBi6EvYXJy69iSlbRjeRH3X0poXy8tNHQPnfq1tAUtOF QGkt505/ivITU1tPPvGcm49OEOi+DGLPWELbS3YaAVD0CaV+WoeRXLdv0Sc+ZLp8YbynH+ U/b2/rAyISiNXqTxMUCCtN+2MwyVnsMTCyIFJx1F9XVzaEeEBBWIJLEWkqqygw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680210970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9DmAccijFg7JLsKM6zOb1JiXOM66dA9/OfKROTgaUQE=; b=V51AA27oHM/aPBXA5xKY9ZnAaIdEDhUSXeMyw0FikjAp8W3Zxg710O+VOFXevC+FuMsg10 ggbx0JkNo9dSKwYJtmu3KCg9QMAJCQPJJROXZewB5BKazjUu+LdaSkchUXi2wJ3C7G7TWq GBdWMCdteKAhCayvv5VLrCJIUm6/QJZgcMYbHrWdSWdRCExdtqWPFDv8SJ/A+3DOh2QN4Q g9vP3kCNsxiZ97OTgk06KlRE3IqfdCoXesht1YfhAcEMt4CznfN/0ZD4W7GnDnMzZ458pp bZ1m1VcT40qz3Nt5aNibxSljOqKn9wz1/xHu/J9pGfr0mVPUNABr54Jz/oUGyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680210970; a=rsa-sha256; cv=none; b=M94Ysq8WvbH0/9CltqhXIFT9XRU3Pb7aXfLOlERCqySD3upaQmmbWKOHtat/TNZEKX51qv +DfIhnh0JpeQ+bvwdeJVr2JyUDsaDoJjTqalgdUCxzsuwGTnZEjEGTleOIE9K+4Lq/YqD+ Nv/o9g953lYY90t8QiUFVg13hTq6HhB+18F/G8Hsc1wIq13e/NNLlPe2uXOVHqFXJCCwc/ 7mEKAqirAAjC7UBaRUfYqAWnDOgvSED/Ia6Yv4Q9PidWsi7senNb4AkLCNuBxaygxNcFOL lwoZzfy7dPsUKNPdXz8UQQC6iOIfiPduw+Aa/TfcZcNe/yzIChYpv6d9GwE5pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnbnP6gbjzRVY; Thu, 30 Mar 2023 21:16:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32ULG9vr037342; Thu, 30 Mar 2023 21:16:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ULG9NG037341; Thu, 30 Mar 2023 21:16:09 GMT (envelope-from git) Date: Thu, 30 Mar 2023 21:16:09 GMT Message-Id: <202303302116.32ULG9NG037341@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: 21b778fbeb93 - main - cxgbe(4): Remove dead 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: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21b778fbeb93d4b6a1e426cceb3b4d2c7e6e3dac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=21b778fbeb93d4b6a1e426cceb3b4d2c7e6e3dac commit 21b778fbeb93d4b6a1e426cceb3b4d2c7e6e3dac Author: Navdeep Parhar AuthorDate: 2023-03-30 18:43:43 +0000 Commit: Navdeep Parhar CommitDate: 2023-03-30 21:13:07 +0000 cxgbe(4): Remove dead code. Fixes: e7e084442227 cxgbe(4): Replace T4_PKT_TIMESTAMP with something slightly less hackish. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_sge.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index 89d8f1b0462a..af76262fc197 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -81,11 +81,7 @@ __FBSDID("$FreeBSD$"); #include "t4_l2t.h" #include "t4_mp_ring.h" -#ifdef T4_PKT_TIMESTAMP -#define RX_COPY_THRESHOLD (MINCLSIZE - 8) -#else #define RX_COPY_THRESHOLD MINCLSIZE -#endif /* * Ethernet frames are DMA'd at this byte offset into the freelist buffer. From nobody Thu Mar 30 21:56: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 4Pncgw0hn0z42PdK; Thu, 30 Mar 2023 21:56: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 4Pncgv6w7Fz41Br; Thu, 30 Mar 2023 21:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680213388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o14MA7usVtIyc2nlJUlPBNNChz5Y1V8KQnAeAxXCgXw=; b=arcrGA4EpjzGmln+wccSW8BBGWpWdv0jcPZ4ZPrKhOGfx1mrKlAoXj0JrA8xi9Lahbjfs8 E8aEQHocTBhwQCvWHSGJoXag8aLNMQzuk/faWCVQGVldaOTtbW58XbeXD7OeZGQodgPZVg qwndXpsz57S18/T8nsVG17ZPdUhOu3YbvVS4I5iaR7Jk78OJdH4nnTMozXBkKnicgdruwH 9+89Pso73NRNpZWnCYd5Ama/KIHgLH+ZreWPsHNLrhACBA1xKo1JlVmKgL/vbHfPnVLN5P kEvTsIjmbplKhulekH0VjwpG5rMJG7K/o63B3x9Dms6gUX24yOwrEGt4polbow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680213388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o14MA7usVtIyc2nlJUlPBNNChz5Y1V8KQnAeAxXCgXw=; b=uAipTXFVAEmsEGEQQmTkw7gDDPnlpuaXv1eXlN8MUobEPEReWoGauMCUdIcXgc5zP5vjBT dnWSbHbLWhmosuYP14/tqnSbtKELetpPibsd2M53beM9WcgjY2OLJwcBV6qYUTXTOjMHkQ eyfLZ2QQMOXHLBelQyD3PpJhMiIjWStONPaTGAdpqbRvalgkVYA5j4CDiPIEk7pfYqdBhr QTVs0dTzsV3R5l6XJiU9k9+0C5XmGk99MUMSpFSr1R/J8bLcj0ll+VsbPwWrSyAHlTO3i6 O0i/eIv9KGTRwilmnjBgjH2TbMULnwYrY9ymviicKaPYxZ3EHDVy1KcPFqaVxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680213388; a=rsa-sha256; cv=none; b=bJdbz984aB7ZrPdXytrnDwWRK5joaE0lBT+nCUZIcC3wGdSseKbfWQEBzU7YxMNrOjQlgH el8U+xX0hh9U7POEAKfDm6qNfU0Wmc4vIW30k2wrWSOvNV2sOfZVmX/Jpnp3INE+jqIjl+ 5xwJGAGHwNo09f5tn4vyIx8eHoaMrrvVNofmMs+MF6gwVlj1YEbfkkJXlEvZlMTg2qWgbO Ac1ByXD11bAHjqbwrtrfp/dD/rWoB4YdEsmUvbe+nrjzTJo70Y/DK0aCB3D5ah1uXww/vT 6keG/K5THjdsMm3ACLT0Fy4WEedv7v/ZDNRnb/TwavCp/oolJz0mnNZnyy4Tag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pncgv61DCzSxY; Thu, 30 Mar 2023 21:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32ULuRaw002329; Thu, 30 Mar 2023 21:56:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ULuR6a002328; Thu, 30 Mar 2023 21:56:27 GMT (envelope-from git) Date: Thu, 30 Mar 2023 21:56:27 GMT Message-Id: <202303302156.32ULuR6a002328@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: a827077e01e8 - main - Add libcap_netdb.so.1 to the list of libcasper helper libraries. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: a827077e01e89f9da2a21c976ce3b6be45df0f11 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a827077e01e89f9da2a21c976ce3b6be45df0f11 commit a827077e01e89f9da2a21c976ce3b6be45df0f11 Author: John Baldwin AuthorDate: 2023-03-30 21:54:48 +0000 Commit: John Baldwin CommitDate: 2023-03-30 21:54:48 +0000 Add libcap_netdb.so.1 to the list of libcasper helper libraries. Reported by: Yuri Fixes: 7d8e1e8dd904 libcasper: Move helper libraries from /lib/casper to /lib. --- ObsoleteFiles.inc | 1 + tools/build/mk/OptionalObsoleteFiles.inc | 1 + 2 files changed, 2 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index f526d0f7458a..ca7d0ac0f60f 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -57,6 +57,7 @@ MOVED_LIBS+=lib/casper/libcap_dns.so.2 MOVED_LIBS+=lib/casper/libcap_fileargs.so.1 MOVED_LIBS+=lib/casper/libcap_grp.so.1 MOVED_LIBS+=lib/casper/libcap_net.so.1 +MOVED_LIBS+=lib/casper/libcap_netdb.so.1 MOVED_LIBS+=lib/casper/libcap_pwd.so.1 MOVED_LIBS+=lib/casper/libcap_sysctl.so.1 MOVED_LIBS+=lib/casper/libcap_sysctl.so.2 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index ac7109609dd4..0d19eab23c8e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -859,6 +859,7 @@ OLD_LIBS+=lib/libcap_dns.so.2 OLD_LIBS+=lib/libcap_fileargs.so.1 OLD_LIBS+=lib/libcap_grp.so.1 OLD_LIBS+=lib/libcap_net.so.1 +OLD_LIBS+=lib/libcap_netdb.so.1 OLD_LIBS+=lib/libcap_pwd.so.1 OLD_LIBS+=lib/libcap_sysctl.so.1 OLD_LIBS+=lib/libcap_sysctl.so.2 From nobody Thu Mar 30 22:27: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 4PndN50j3Sz42RX2; Thu, 30 Mar 2023 22:27: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 4PndN509HTz45FS; Thu, 30 Mar 2023 22:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680215269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HDFGDqSLZIgc1IBSFhd7BcFSXpmpiFwBMivjnCSdjSA=; b=ntAN/44BMWPj6nztF8ah/ob/2Do/Tv4X4d+TblYGhmYKWOj8r3p70hyIFkZdz/B86zU6SV gdO2i73vVL6ok3WsNN5rXaL5p6e0M28S0b/0wMLm7IA1XDo81r6kBFQrFH9zvxQ7FpmpKa Pv3Vmepr3lmWOlRGPTsPUb0UUJ8TkRFeHvFUyJ0O+3HAYs+vNGRfwcF/yvDE39lJ5LxFh0 HFwsfh7MG22nU9vj96Oc6CnoAIyrDowJJCgrhT43Evr70jbMOY2EFx6ktCWnHID9MHjAt5 luk6a+BPwVmVeoYnczdy2Vg39Z+zBC4MD80uJB2Kuw55s3hiD30OVq0i6r4uxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680215269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HDFGDqSLZIgc1IBSFhd7BcFSXpmpiFwBMivjnCSdjSA=; b=jRPFb3H7xu2obGpN3FRxPv2VvzwS36EjyX+4fmtoyjS/vfr/CVLp2u2CbwVJSRumUCu3UP olY4Qp+3MSLKYu6OoNO4BAyEzp/W1h/TqcQxEqE9QaSU8zdAS//ZYvDeHe0IIeobEiNIPl cOBZ0GpbDMNatPN9svDbLOBXzVI+Dd0uyNqDQeWd5c6Rx7PYc94xQJmgqsbpZQvxg0MsLc tFie14uBEF0UGLwWTC3RipXl7bI+OrHR1CTo2I27X6btCprD48we8MK9b2q92mcKpaRb5e yLmoqPwZTZ1L2+M4fYuCQzCacnTywIlj88XKs9Q8JAcbyqHfJKUFt0SpUx8oqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680215269; a=rsa-sha256; cv=none; b=h+1YBgnSX+f8NCph9AgJ+hOKtJbaLUbMPgDz40jq0oOT2TGvLPkZKjp1ZXLB2+hMDr5dgH U69XVs3ZlHpDyOWIXzOeaJhCRpPzRP+tMEE4Fg9zAimjZSOvHP6KoTrockbQM5q4jPTE0q P5/kEfKHq37rMIQHn3KvGn+89XaATi9gD8WjLuQuDyX7KUXmFpbXqKDX7PP0ha7N8o57SI chlAd8oZS3nM8WE/maEID1xkB0Gfu2nEvKoAS2ZhfbTlpzDoFM5rBeL1acJnHUtURg/g1M zhfr/eftoL0NGdctMtfQn5ORTsgWPNL3gOHo31WS5Uo87tKkaoBDyuIKyjcAqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PndN46DNbzV2L; Thu, 30 Mar 2023 22:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UMRmtb052455; Thu, 30 Mar 2023 22:27:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UMRmVG052454; Thu, 30 Mar 2023 22:27:48 GMT (envelope-from git) Date: Thu, 30 Mar 2023 22:27:48 GMT Message-Id: <202303302227.32UMRmVG052454@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: f0bef3d20eb6 - main - makefs: #define Apple Partition bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: f0bef3d20eb6e28cf66a42c6d34fdfe80a784365 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f0bef3d20eb6e28cf66a42c6d34fdfe80a784365 commit f0bef3d20eb6e28cf66a42c6d34fdfe80a784365 Author: Ed Maste AuthorDate: 2023-03-30 16:45:18 +0000 Commit: Ed Maste CommitDate: 2023-03-30 22:27:30 +0000 makefs: #define Apple Partition bits NetBSD defines these in sys/bootblock.h, which we don't have. Add local defintions in cd9660_eltorito.c (as OpenBSD did) to reduce diffs between the three makefs implementations. Obtained from: OpenBSD Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/cd9660/cd9660_eltorito.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c index 0a57c91a659e..6d7a32378b64 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c @@ -41,6 +41,14 @@ #include __FBSDID("$FreeBSD$"); +/* + * Partition Status Information from Apple Tech Note 1189 + */ +#define APPLE_PS_VALID 0x00000001 /* Entry is valid */ +#define APPLE_PS_ALLOCATED 0x00000002 /* Entry is allocated */ +#define APPLE_PS_READABLE 0x00000010 /* Entry is readable */ +#define APPLE_PS_WRITABLE 0x00000020 /* Entry is writable */ + #ifdef DEBUG #define ELTORITO_DPRINTF(__x) printf __x #else @@ -574,15 +582,8 @@ cd9660_write_apm_partition_entry(FILE *fd, int idx, int total_partitions, uint32_t apm32, part_status; uint16_t apm16; - /* See Apple Tech Note 1189 for the details about the pmPartStatus - * flags. - * Below the flags which are default: - * - IsValid 0x01 - * - IsAllocated 0x02 - * - IsReadable 0x10 - * - IsWritable 0x20 - */ - part_status = 0x01 | 0x02 | 0x10 | 0x20; + part_status = APPLE_PS_VALID | APPLE_PS_ALLOCATED | APPLE_PS_READABLE | + APPLE_PS_WRITABLE; if (fseeko(fd, (off_t)(idx + 1) * sector_size, SEEK_SET) == -1) err(1, "fseeko"); From nobody Thu Mar 30 22:43: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 4Pndkk28Jqz42Sd8; Thu, 30 Mar 2023 22:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pndkk1gH0z46XW; Thu, 30 Mar 2023 22:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680216238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rliygU7R43xE8am+XKQ7sXDa0/7p41YwDuxsyMfxMes=; b=ypNnO7A+oQUgvBm6+Yh806fSKEwAOdotwTGQ3Y5FjqaNjLyrfNfhW89LPIN0OfJIgC+ISj 9rsLcnkhnDF1Pd25aVuGNOh88jKP/5kMuXA2jUY2JKQAiDNezL0V3l7FoCtaT3KiJxYB5s 4eqyQXmo1rL6t0uygSgBmhPO/cX6Pmzk0UwguDcm42+8+Fa/R6CXjdIO/GBqZdkdaYp4qy GQAOS7QG4o6r9rYo9EpT5XAOgRyx1WcazoyGDrzURYde5OkCPPIEoHiam6nK3bORpAEAzd E9KkYyzwxD4cugprSai+5L0aIBTuNjVuvAByi2kNqdmbRagV935sSYNArntamg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680216238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rliygU7R43xE8am+XKQ7sXDa0/7p41YwDuxsyMfxMes=; b=bC54Bt4haOIPv00sFfXDZcuMDCjXTagFhqzTt/IrMjGnBri3TD+if3FoKEmxwUobaEYCnM tGUK50WwKDsE8wOJ/+oyiSX1y+XqaQG2QEYDI/DmZoS8jL7JmkK5l5epkSfu9O4/7Du4FA 7Jl8lCoWXpHSi40EjQizKTfWFws1hSa4bhYSzNwtXngAQBEzAbwucLzvGVrJ216/Dd/V9w WcFSCaOHj7NK/IG6bht7zx5MG8qpTUDso5cDMx2x5BQbK4lo9v/6DkyI8EkCBBrIaJTLfH pJUrrsd+8dyEWxEReuY1TSzyAl61YXQacXbatEZA0/tXkH3l+DqKzBV/xrJztw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680216238; a=rsa-sha256; cv=none; b=RDZZrDpz2AvOadGfg+AmUmgK/bpxLD+FxbPkJWUTgxviNMOtpfwpHEb66iYj6uR/PjqgOJ YTY7lI21zJtoWBWiBTDoniCQsiMTLJyFPUOHD/H2TkUltG0ZreIg3z1sBB/d7Knm2X/2Mi 7TunGj+p/y2dCcVAoeyyaqfVGJkQMxTCRQTDw62T77vfrpGZzLVuqa+ciulBHC51bL7ZO+ XwHfLQDTJ9+pq2I0PueymcFCBN+bvlUE+2FHkXmutD8+dMJjNTvKiM/YlgUKGpkArCvEiA 2avNBaVFnJD1iWtPIop+YSL+hPwb0iWsx7nH6OtiD7k2BNJoBfJtXQVu358gsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pndkk0kWTzVW7; Thu, 30 Mar 2023 22:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UMhwRG084339; Thu, 30 Mar 2023 22:43:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UMhv3Q084338; Thu, 30 Mar 2023 22:43:57 GMT (envelope-from git) Date: Thu, 30 Mar 2023 22:43:57 GMT Message-Id: <202303302243.32UMhv3Q084338@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: 47d1e67874fa - main - sys: Disable errors for -Wunused-function on GCC. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 47d1e67874fae0e13a4670a5faa97e87d4667140 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=47d1e67874fae0e13a4670a5faa97e87d4667140 commit 47d1e67874fae0e13a4670a5faa97e87d4667140 Author: John Baldwin AuthorDate: 2023-03-30 22:43:48 +0000 Commit: John Baldwin CommitDate: 2023-03-30 22:43:48 +0000 sys: Disable errors for -Wunused-function on GCC. This matches the handling of this warning on clang. --- sys/conf/kern.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index a80d6211c182..9975eea6417a 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -74,6 +74,7 @@ CWARNEXTRA?= -Wno-error=address \ -Wno-error=sequence-point \ -Wno-error=shift-overflow \ -Wno-error=tautological-compare \ + -Wno-error=unused-function \ -Wno-unused-but-set-variable .if ${COMPILER_VERSION} >= 70100 CWARNEXTRA+= -Wno-error=stringop-overflow From nobody Thu Mar 30 22:52: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 4Pndwm18Mxz42SrV; Thu, 30 Mar 2023 22:52: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 4Pndwm0fjNz4837; Thu, 30 Mar 2023 22:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680216760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l7rH0ah8BGBkoW69LzcZDac0Y8kkr+ltSSLxBHrchQE=; b=T2o+c2PN9NV5uG8XFJ8SX2nCGKaVx5Ruz3OxGH5psKTqMa89TWJ+Y2TRdXG8QCqznCM74Z xfmmNwJPXHgYVxdyZuSFxj5eq8lyExaAJ/OOAhE4XeMpvgt9jGjOP9ibvE6aQ7p4wHsi1i dzpObcT1zTJLYISz9snCcsGZaoBqw1X5PTCM9yCf2bI+fu+8PL9VU+qWvBOgh50gVeTDSL UJ1SYvwRwHVlCHV7Eq1081cu8WU618vkNDcLrekpgSIsSvNKV1J0b0pLV6RtocYE7J24RT gt0U3g+c4wJRaBlOrine6viOP2wxLeG2dgGTsrO4VChfC1TYSAQNejU2/5brDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680216760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l7rH0ah8BGBkoW69LzcZDac0Y8kkr+ltSSLxBHrchQE=; b=MOkl8PxyiFp6mkL15/zRNBB1bjoFrPbMapzOibp/zwuIxV4J86aPgzIL/zgw1lAPcvnjxU FXCDGR+mVpxCpLh36cdX4QI6Tiilb2uXjGEZm2GXyKMqXMM2IFm5ocMRq/7od2FeKxS31Y 2pUP67ntPuQYN8bzRoZk/NGu85XhykapMcVOof6xK8sNq/jz6E8NWpWK+vGRsLs1SUdmmz NzArZX2vRJpD6wEyMHa28JGEvgvhNr22W4uYolQ+ArByAhuQ4+ZCd+e76NmhttTZwJysoS Ya9O0a2W80IwbqwHqrZQQfvRPhdeUm0jgX6/w/L25FX6j5oFCfaqP0KhMfwwkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680216760; a=rsa-sha256; cv=none; b=ga43jx79CK75rw1ReKx1yepzvf1HlItR0xxQgCaAOozI/cuqBkEdHHOTTgBIsiYZ3YpKYB bb91E8hxkhdRTQU4NzgsVC6wGf+C8YyJF3iHPxmP5kmi7wR1kuFX+qEMPwt1mt6MQgaShg Rn+TPlLybmcS53Bk+FGh4om9nUAJO71TR31mM9CHYpdLvlkwJiuUNrZmrt9eX9OHzIIwtS RuKydoTIzUeOgVAobUssYJMMOYQpDx9dyR2IYhuwaedHDSeJ81W09YF1pX9PsIAoj0FOSW iiHNyp1ibgQKA4f9m7wEn/nRs/Ll98uM1dTyVBlETy2OMosDn14FzhLJeJ3jBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pndwl6qN3zVT8; Thu, 30 Mar 2023 22:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UMqdJ1000850; Thu, 30 Mar 2023 22:52:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UMqdFP000849; Thu, 30 Mar 2023 22:52:39 GMT (envelope-from git) Date: Thu, 30 Mar 2023 22:52:39 GMT Message-Id: <202303302252.32UMqdFP000849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 512c553671be - main - tcpdump: Backport a fix required for upcoming libpcap 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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 512c553671bef26e93342d4ae1ec5f60d8ae112b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=512c553671bef26e93342d4ae1ec5f60d8ae112b commit 512c553671bef26e93342d4ae1ec5f60d8ae112b Author: Joseph Mingrone AuthorDate: 2023-03-30 21:41:09 +0000 Commit: Joseph Mingrone CommitDate: 2023-03-30 22:52:10 +0000 tcpdump: Backport a fix required for upcoming libpcap update See also: https://github.com/the-tcpdump-group/tcpdump/commit/51f9c3b947eac89254c4e3662902487e0844a699 Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- contrib/tcpdump/interface.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h index 46d338b4af24..cbe1851c5bb8 100644 --- a/contrib/tcpdump/interface.h +++ b/contrib/tcpdump/interface.h @@ -73,7 +73,13 @@ extern char *program_name; /* used to generate self-identifying messages */ #ifndef HAVE_BPF_DUMP struct bpf_program; +#endif +/* + * With Capsicum bpf_dump() may be not declared even if HAVE_BPF_DUMP is set. + */ +#if !defined(HAVE_BPF_DUMP) || \ + (defined(HAVE_BPF_DUMP) && HAVE_CAPSICUM && !defined(bpf_dump)) extern void bpf_dump(const struct bpf_program *, int); #endif From nobody Thu Mar 30 23:08: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 4PnfGs3sSxz42Vbp; Thu, 30 Mar 2023 23:08: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 4PnfGs3MLbz49gQ; Thu, 30 Mar 2023 23:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680217701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QDAq5eN9To37fa4ITDb6rLe0Nuo9OKdWQ6Sq4WqR9k8=; b=Ry16FueBCIo0JwgCZniDoAPhBogiUXULbwNdWLx7v2DZ9uCH0b0e+PrfOOgP+lpm80EFmv nZ0l0H+11Y/jTPHgZQAWE88Te/exwvsO95fIDA3V7eGigN4rcHSZyt3MstMpmJL0lhI8V8 i1VunN5rZab615jPnPKrG6xuB+nv8qQA1tLNOJVsxO1vQap1QFw3H65V+PgwFzzQL8vqSJ 47IIsMlDLmD463x+oijXNCKCkOt7sRSnvpZvNeq6+OeRvtt8FkYisvRM0fTl9gEOuJVxsV c+0/wH3G4BfP8tunt7UBnQkorT80ApuI0GGIqwV6ivQJOHyLPrcd1lrSGXbO2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680217701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QDAq5eN9To37fa4ITDb6rLe0Nuo9OKdWQ6Sq4WqR9k8=; b=pCOP0HdHvP97jIUDWBBXwE86pp4CVJOfwsGeAGKQwItsAmeFT9s3IeFrZns3ytrYiwF4BW rItSLbgkS5RuKrGwxmQMRuom2E+/kz8hd5Jtm74rnlJ5fHRpvMrykrp9tTHeyFsasU0D0d ngxOIt5ADCZ8bUfAK6+r9SV3p/NW2pByV7FSK/B7MKNO+nyM+yFwyuZxPKtPoouKW0Is2S jJ76Hg/r+qu4UiP367Y4YrjJrIDPj57B8HKoyWPbVKT9wHMXY9gkZIVn/b9DWf/Q5pZIwb C9LPJXqqZ68AR0uWkQR7U7hBLHgR3TrfFA4vryUYhZH55utDz7mN+Nx38+OHKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680217701; a=rsa-sha256; cv=none; b=SoNoliXJSrxl93XrcObZ7TbGISVii2aHNzxDF+BfLjzjqv/fNE7op3wW96a/prK9b2qOAg Fj3yjVLUK5Ka2VzvPwVGx+GOOqRDvADw4au/D8paYffNwY2JG0B/136Tuvlm7vjs482AEr RVEK5ksO+AJGzJz0QYajSQ9C2goS/VtaOdxeEJJrOywysPcitsnJe3WCpv3EuTgFiEYVNR dDHvTvTKxh0uVShY9k/9UrS3tVbmj5St9DKF0iqzWEymfwyatunSrDyvGkvSkZd4ARVHnI +6aER/YMcC3tePSMghwZeu1/2mJcxesjJUUPUchKyDZXBb3XzwsWENrqJJEMQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnfGs2QFdzW9s; Thu, 30 Mar 2023 23:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UN8LRQ018761; Thu, 30 Mar 2023 23:08:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UN8L3l018760; Thu, 30 Mar 2023 23:08:21 GMT (envelope-from git) Date: Thu, 30 Mar 2023 23:08:21 GMT Message-Id: <202303302308.32UN8L3l018760@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: 7170774e2a16 - main - ifcapnv: cap_bit in ifcap2_nv_bit_names[] is bit, not index List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 7170774e2a161aa5cdab439f8f7f9500ed5f1dbc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7170774e2a161aa5cdab439f8f7f9500ed5f1dbc commit 7170774e2a161aa5cdab439f8f7f9500ed5f1dbc Author: Konstantin Belousov AuthorDate: 2023-03-30 22:56:52 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-30 23:08:15 +0000 ifcapnv: cap_bit in ifcap2_nv_bit_names[] is bit, not index Sponsored by: Nvidia networking --- sys/net/if.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if.c b/sys/net/if.c index 4b3b7d5b121b..90ed39bb2cff 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2425,7 +2425,7 @@ const struct ifcap_nv_bit_name ifcap_nv_bit_names[] = { CAPNV(TXTLS_RTLMT), {0, NULL} }; -#define CAP2NV(x) {.cap_bit = IFCAP2_##x, \ +#define CAP2NV(x) {.cap_bit = IFCAP2_BIT(IFCAP2_##x), \ .cap_name = __CONCAT(IFCAP2_, __CONCAT(x, _NAME)) } const struct ifcap_nv_bit_name ifcap2_nv_bit_names[] = { CAP2NV(RXTLS4), From nobody Thu Mar 30 23:21: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 4PnfYv0zGWz42W6s; Thu, 30 Mar 2023 23:21: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 4PnfYv0ClZz4DSJ; Thu, 30 Mar 2023 23:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680218483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjr+M9jPTbLEWrsZAgBEvQYcB1HveZsF0wTnLPcfkZg=; b=pkh0MfY7PrgfRBh8xVU92eG6qGJbOcpXYDZs1e8dBfF0L/WQFsFnRBmgOJzqOYwr8dlZl4 +mvWikIcx4bajcLxqJApsByaDqMF5SWhvmd4HlVW2Cw1EihyoOjyK/J+xJtx7wwVukxmbl afchn0v/e2QR2BZ+dHjLTjDrbePNR6j4TejpXgmA9OVmFXdDVyu1AuvwsHqTlO6mAIxKIU QF/YM5wApEE8wWgfOWr3IZolibQLwDQ7ZXKJTql4zhUpswfcJ0FoXfr0VhlhPAl18kqWjE Cu6wT1msZuE4J+fX9cRhUDu3wKPHKPwfIAYGBVLXhRjyEhqwG7Hn+4SqZBGdHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680218483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjr+M9jPTbLEWrsZAgBEvQYcB1HveZsF0wTnLPcfkZg=; b=Ji19MutgXDkqo4mr0uo0sng+eZ8xCi9SMVACEGTd9NA1pX4LCROSpkmmA9ThBG4+wOvDDz qSzK8sP5cpLNxBQOUgQMR/b4nV8SpTdUJvl/TLQwB/e3uAg88SC3ptu8KFo+NyhosgPanB qUirxq2VwgFrOgt0YrAXK8seEmTx6KeCFSfSmV7sTwHIQ9gxuY0e5zIJEeUaZVflIYoqwO AjeVRs7ravQyNsG43XKcbVCRzsoG64euAxJBO5WR2DHHI+56WNp19nH9T3rDpXOc+OY3YC 1do0V2Jx11+cIXmg6l2IYySpRhX5BjuyaRxhloN9pNgq4QiJDzQSxNukH+TInQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680218483; a=rsa-sha256; cv=none; b=O2crLcu89f8ZxSpeIqUHrhXZtkJd1UKz4gYjT9cJo5nd5MwfLJqv4RBdu98US5AkhbgxXj oaKvQ/Og9DBGNqeL8nEXkbhrQ9nk0yYhsVsn7P3Eb0bgHD2+t53sfQqgsIfMN/Rjl7ogVR UdRrNLBI9I5IpUiZAlW2N1laS4sajyb3hKz07yf13uZ21z7M4mdURHOnTo8ERsQRIobAR7 cL5nyGf7cTvSSnCuE4f62JTn3TTCH4EoVt2y1w/w8+8b9sEYt6NbkxGgpy74nmzPRI31TD 6PRU4DHjzBczbdpi1wYhiWF7C3ZfUEjKzb931Zg5zKb0gy2993z0mrkBEuXwVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnfYt6QCnzWPF; Thu, 30 Mar 2023 23:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UNLMMX044971; Thu, 30 Mar 2023 23:21:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UNLMfv044970; Thu, 30 Mar 2023 23:21:22 GMT (envelope-from git) Date: Thu, 30 Mar 2023 23:21:22 GMT Message-Id: <202303302321.32UNLMfv044970@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: d33cdf16df52 - main - fs/cd9660: add header include guards List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: d33cdf16df52050102931ee3b37ce173e449c9c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d33cdf16df52050102931ee3b37ce173e449c9c1 commit d33cdf16df52050102931ee3b37ce173e449c9c1 Author: Ed Maste AuthorDate: 2023-03-30 16:49:40 +0000 Commit: Ed Maste CommitDate: 2023-03-30 23:20:54 +0000 fs/cd9660: add header include guards Diff reduction against NetBSD files in sys/fs/cd9660/ and OpenBSD files in usr.sbin/makefs/cd9660/. Sponsored by: The FreeBSD Foundation --- sys/fs/cd9660/cd9660_rrip.h | 5 +++++ sys/fs/cd9660/iso.h | 5 +++++ sys/fs/cd9660/iso_rrip.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/sys/fs/cd9660/cd9660_rrip.h b/sys/fs/cd9660/cd9660_rrip.h index 67ec3c233a0c..0c37f204c530 100644 --- a/sys/fs/cd9660/cd9660_rrip.h +++ b/sys/fs/cd9660/cd9660_rrip.h @@ -37,6 +37,9 @@ * $FreeBSD$ */ +#ifndef _ISOFS_CD9660_CD9660_RRIP_H_ +#define _ISOFS_CD9660_CD9660_RRIP_H_ + typedef struct { char type [ISODCL ( 0, 1)]; u_char length [ISODCL ( 2, 2)]; /* 711 */ @@ -137,3 +140,5 @@ typedef struct { u_char offset [ISODCL ( 12, 19)]; u_char length [ISODCL ( 20, 27)]; } ISO_RRIP_CONT; + +#endif /* _ISOFS_CD9660_CD9660_RRIP_H_ */ diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h index 591bcc4ff755..325bb97a9551 100644 --- a/sys/fs/cd9660/iso.h +++ b/sys/fs/cd9660/iso.h @@ -37,6 +37,9 @@ * $FreeBSD$ */ +#ifndef _ISOFS_CD9660_ISO_H_ +#define _ISOFS_CD9660_ISO_H_ + #define ISODCL(from, to) (to - from + 1) struct iso_volume_descriptor { @@ -365,3 +368,5 @@ isonum_733(const unsigned char *p) * Associated files have a leading '='. */ #define ASSOCCHAR '=' + +#endif /* _ISOFS_CD9660_ISO_H_ */ diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h index 5ab9103022d1..99c34f971efe 100644 --- a/sys/fs/cd9660/iso_rrip.h +++ b/sys/fs/cd9660/iso_rrip.h @@ -37,6 +37,9 @@ * $FreeBSD$ */ +#ifndef _ISOFS_CD9660_ISO_RRIP_H_ +#define _ISOFS_CD9660_ISO_RRIP_H_ + /* * Analyze function flag (similar to RR field bits) */ @@ -83,3 +86,5 @@ int cd9660_rrip_getsymname(struct iso_directory_record *isodir, int cd9660_rrip_offset(struct iso_directory_record *isodir, struct iso_mnt *imp); #endif /* _KERNEL */ + +#endif /* _ISOFS_CD9660_ISO_RRIP_H_ */ From nobody Thu Mar 30 23:31: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 4Pnfp24pLLz42WTJ; Thu, 30 Mar 2023 23:31:54 +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 4Pnfp14MsJz4Fcc; Thu, 30 Mar 2023 23:31:53 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 162.251.186.162 is neither permitted nor denied by domain of glebius@freebsd.org) smtp.mailfrom=glebius@freebsd.org; dmarc=none Received: by glebi.us (Postfix, from userid 1000) id CF2FB5F69E; Thu, 30 Mar 2023 16:31:45 -0700 (PDT) Date: Thu, 30 Mar 2023 16:31:45 -0700 From: Gleb Smirnoff To: Wei Hu Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, imp@freebsd.org, gallatin@freebsd.org, kevans@freebsd.org Subject: Re: git: 927358dd98cb - main - amd64 loader: Use efiserialio for Hyper-V booted systems Message-ID: References: <202303180720.32I7KXOc030612@gitrepo.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: <202303180720.32I7KXOc030612@gitrepo.freebsd.org> X-Spamd-Result: default: False [0.50 / 15.00]; VIOLATED_DIRECT_SPF(3.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[glebius]; RCVD_COUNT_TWO(0.00)[2]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Queue-Id: 4Pnfp14MsJz4Fcc X-Spamd-Bar: / X-ThisMailContainsUnwantedMimeParts: N Wei, Kyle, this commit hangs loader on real hardware, at least on some of it. The loader prints list of consoles and hangs hard: [Thu Mar 30 20:46:12 2023]^M|^HLoading /boot/loader.conf^M ^M/^Hconsole vidconsole is invalid!^M ^MAvailable consoles:^M ^M efi^M ^M comconsole^M ^M comconsole^M ^M nullconsole^M ^M spinconsole^M Machine is unrecoverable unless you got alternate boot media and access to BMC console. First, please DO NOT MFC this as scheduled. Second, let's try to fix it or back it out if we hear from any other CURRENT user. Our configuration isn't special. This is what we got in loader.conf, related to consoles: console="comconsole vidconsole efi" comconsole_speed=115200 comconsole_port=0x3e8 console="efi" hw.uart.console="io:1016,br:115200" On Sat, Mar 18, 2023 at 07:20:33AM +0000, Wei Hu wrote: W> The branch main has been updated by whu: W> W> URL: https://cgit.FreeBSD.org/src/commit/?id=927358dd98cb902160093e0dc0bac002d6b43858 W> W> commit 927358dd98cb902160093e0dc0bac002d6b43858 W> Author: Wei Hu W> AuthorDate: 2023-03-14 15:13:46 +0000 W> Commit: Wei Hu W> CommitDate: 2023-03-18 07:07:35 +0000 W> W> amd64 loader: Use efiserialio for Hyper-V booted systems W> W> UEFI provides ConIn/ConOut handles for consoles that it supports, W> which include the text-video and serial ports. When the serial port W> is available, use the UEFI driver instead of direct io-port accesses W> to avoid conflicts between the firmware and direct hardware access, as W> happens on Hyper-V (Azure) setups. W> W> This change enables efiserialio to be built for efi-amd64 and has W> higher order priority vs comconsole, and only uses efiserialio W> if the hypervisor is Hyper-V. When efiserialio successfully W> probes, it will set efi_comconsole_avail=true which will prevent W> comconsole from probing in this setup. W> W> Tested on Hyper-V, ESXi and Azure VMs. W> W> PR: 264267 W> Reviewed by: kevans, whu W> Tested by: whu W> Obtained from: Rubicon Communications, LLC (Netgate) W> MFC after: 2 weeks W> Sponsored by: Rubicon Communications, LLC (Netgate) W> --- W> stand/efi/loader/arch/amd64/Makefile.inc | 1 + W> stand/efi/loader/bootinfo.c | 11 ++++++-- W> stand/efi/loader/conf.c | 6 +++++ W> stand/efi/loader/efiserialio.c | 43 ++++++++++++++++++++++++++++---- W> stand/i386/libi386/comconsole.c | 14 +++++++++++ W> 5 files changed, 68 insertions(+), 7 deletions(-) W> W> diff --git a/stand/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loader/arch/amd64/Makefile.inc W> index 0d9e2648cb59..bd89044bd6c7 100644 W> --- a/stand/efi/loader/arch/amd64/Makefile.inc W> +++ b/stand/efi/loader/arch/amd64/Makefile.inc W> @@ -5,6 +5,7 @@ SRCS+= amd64_tramp.S \ W> elf64_freebsd.c \ W> trap.c \ W> multiboot2.c \ W> + efiserialio.c \ W> exc.S W> W> .PATH: ${BOOTSRC}/i386/libi386 W> diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c W> index 939f2cf4c3fe..d79f59343af1 100644 W> --- a/stand/efi/loader/bootinfo.c W> +++ b/stand/efi/loader/bootinfo.c W> @@ -119,10 +119,17 @@ bi_getboothowto(char *kargs) W> if (tmp != NULL) W> speed = strtol(tmp, NULL, 0); W> tmp = getenv("efi_com_port"); W> - if (tmp == NULL) W> - tmp = getenv("comconsole_port"); W> if (tmp != NULL) W> port = strtol(tmp, NULL, 0); W> + if (port <= 0) { W> + tmp = getenv("comconsole_port"); W> + if (tmp != NULL) W> + port = strtol(tmp, NULL, 0); W> + else { W> + if (port == 0) W> + port = 0x3f8; W> + } W> + } W> if (speed != -1 && port != -1) { W> snprintf(buf, sizeof(buf), "io:%d,br:%d", port, W> speed); W> diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c W> index 863c9188c72c..051e1a3381d1 100644 W> --- a/stand/efi/loader/conf.c W> +++ b/stand/efi/loader/conf.c W> @@ -81,6 +81,9 @@ struct netif_driver *netif_drivers[] = { W> W> extern struct console efi_console; W> extern struct console comconsole; W> +#if defined(__amd64__) W> +extern struct console eficomconsole; W> +#endif W> #if defined(__amd64__) || defined(__i386__) W> extern struct console nullconsole; W> extern struct console spinconsole; W> @@ -88,6 +91,9 @@ extern struct console spinconsole; W> W> struct console *consoles[] = { W> &efi_console, W> +#if defined(__amd64__) W> + &eficomconsole, W> +#endif W> &comconsole, W> #if defined(__amd64__) || defined(__i386__) W> &nullconsole, W> diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/loader/efiserialio.c W> index 375e679d2590..5fbc700f6ac2 100644 W> --- a/stand/efi/loader/efiserialio.c W> +++ b/stand/efi/loader/efiserialio.c W> @@ -69,6 +69,11 @@ static int comc_speed_set(struct env_var *, int, const void *); W> W> static struct serial *comc_port; W> extern struct console efi_console; W> +bool efi_comconsole_avail = false; W> + W> +#if defined(__amd64__) W> +#define comconsole eficomconsole W> +#endif W> W> struct console comconsole = { W> .c_name = "comconsole", W> @@ -254,11 +259,22 @@ comc_probe(struct console *sc) W> char *env, *buf, *ep; W> size_t sz; W> W> +#if defined(__amd64__) W> + /* W> + * For x86-64, don't use this driver if not running in Hyper-V. W> + */ W> + env = getenv("smbios.bios.version"); W> + if (env == NULL || strncmp(env, "Hyper-V", 7) != 0) { W> + return; W> + } W> +#endif W> + W> if (comc_port == NULL) { W> comc_port = calloc(1, sizeof (struct serial)); W> if (comc_port == NULL) W> return; W> } W> + W> /* Use defaults from firmware */ W> comc_port->databits = 8; W> comc_port->parity = DefaultParity; W> @@ -308,6 +324,10 @@ comc_probe(struct console *sc) W> comc_port_set, env_nounset); W> W> env = getenv("efi_com_speed"); W> + if (env == NULL) W> + /* fallback to comconsole setting */ W> + env = getenv("comconsole_speed"); W> + W> if (comc_parse_intval(env, &val) == CMD_OK) W> comc_port->baudrate = val; W> W> @@ -318,8 +338,13 @@ comc_probe(struct console *sc) W> comc_speed_set, env_nounset); W> W> comconsole.c_flags = 0; W> - if (comc_setup()) W> + if (comc_setup()) { W> sc->c_flags = C_PRESENTIN | C_PRESENTOUT; W> + efi_comconsole_avail = true; W> + } else { W> + /* disable being seen as "comconsole" */ W> + comconsole.c_name = "efiserialio"; W> + } W> } W> W> static int W> @@ -489,6 +514,7 @@ comc_setup(void) W> { W> EFI_STATUS status; W> UINT32 control; W> + char *ev; W> W> /* port is not usable */ W> if (comc_port->sio == NULL) W> @@ -498,10 +524,17 @@ comc_setup(void) W> if (EFI_ERROR(status)) W> return (false); W> W> - status = comc_port->sio->SetAttributes(comc_port->sio, W> - comc_port->baudrate, comc_port->receivefifodepth, W> - comc_port->timeout, comc_port->parity, W> - comc_port->databits, comc_port->stopbits); W> + ev = getenv("smbios.bios.version"); W> + if (ev != NULL && strncmp(ev, "Hyper-V", 7) == 0) { W> + status = comc_port->sio->SetAttributes(comc_port->sio, W> + 0, 0, 0, DefaultParity, 0, DefaultStopBits); W> + } else { W> + status = comc_port->sio->SetAttributes(comc_port->sio, W> + comc_port->baudrate, comc_port->receivefifodepth, W> + comc_port->timeout, comc_port->parity, W> + comc_port->databits, comc_port->stopbits); W> + } W> + W> if (EFI_ERROR(status)) W> return (false); W> W> diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c W> index ed1f1aa08ed7..3fbb6a292c19 100644 W> --- a/stand/i386/libi386/comconsole.c W> +++ b/stand/i386/libi386/comconsole.c W> @@ -85,6 +85,20 @@ comc_probe(struct console *cp) W> int speed, port; W> uint32_t locator; W> W> +#if defined(__amd64__) W> + extern bool efi_comconsole_avail; W> + W> + if (efi_comconsole_avail) { W> + /* W> + * If EFI provides serial I/O, then don't use this legacy W> + * com driver to avoid conflicts with the firmware's driver. W> + * Change c_name so that it cannot be found in the lookup. W> + */ W> + comconsole.c_name = "xcomconsole"; W> + return; W> + } W> +#endif W> + W> if (comc_curspeed == 0) { W> comc_curspeed = COMSPEED; W> /* -- Gleb Smirnoff From nobody Thu Mar 30 23:36: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 4Pnfvl0HqHz42X7k; Thu, 30 Mar 2023 23:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pnfvk6sXsz4H04; Thu, 30 Mar 2023 23:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WvuAFpFjiTI59+dtKi9tToqwyRIvvVZIzk5KLH+LF6M=; b=vnrY3lLFfXqnFIxg5Ngt2/Vhl82oeUmzb5x8kIVavyjV6UmyjVEk3OdCqtihXBvuu8L+rh m7FVRojPdFicPbS1wMPpyz4ZkQ6pJXyGC9M0jL+SZqPYbAh6cpt2gLyF8oLMV3NO4udElq 0qtzP5nFjFvlbd8Yquulg2PIIzkSY0VetFVR+moTJTl4x0BbZklhNc912sS+ck9U/tXBZ8 Ac+nkrV6hO1Z9QnZNFNH7kwaRGnaTadO/SnyBTWpspDqkz41HgJz5dAuWPDTwhuo1t4Mi+ qZqW8DKuLKSbFjVMp2I1mSR/L/BHSCcO/5AhcAv8ZcHVfJfjBXMSmgtTZlKRdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WvuAFpFjiTI59+dtKi9tToqwyRIvvVZIzk5KLH+LF6M=; b=x+c1pWL8ojfbeEtSHfbsPRZPLzZKqiSTTvZ/9ydPFfuU/UQVjZ5+SAoiViE99Me3Q8DDkp XUy6kXgzIzLkI4/AaRHSCvqjJiNak2WkBKcKPDKW1kgK6tc+DppHxqOlpp71MchqV4PJii n8aLZfA2RZdJHi2jMbLD8DDyL/T3urNcFVFZyMgB5FJI2LQSzUF1ZygmIL3AZHbGZktxzr Nuy2MIvUHF+rHC1xVj9ebLbBCFdCdKTgP7qn63Ganu8FaIJu5U+sUy98iS+/fuDQ9wO6T/ r1GswWY9YUAp2MMYEgvcDmmxEMIyL8JqxJbGVBiO9imKIUTFipzbolO+Zouw7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680219411; a=rsa-sha256; cv=none; b=rU5++XMPMEEjzAXNyVlGjjUost9X/JKdP011WD+l8cfglXjSe9pug6OHZ17E79nL8/T17e GV7Dt7djRyvbX17dZ7F8snTtO9jSD4/ZjHNe/L83EDaD4Rsb7BpNWmWITnjWs2/X9nfW1e g8Mh1YLQQaZagx2kPZXeynB0CIp5M2CKDzQLwDqJOd1ikSDS0iGLE74lxzQySLI0G1PjHg WBAZyeDEufU3gDbZH4+iehmypbOgsCneeTxmLgKCM0uRLnCJWyo6r/2ZhgpRWJqK7cxTfa BEcWET2VNVA6Y13j0Frt/FbCBj11Ha7jK5Moz9RG+2WN1B1uMaNv2YQkbtTwSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnfvk5kZXzWZ2; Thu, 30 Mar 2023 23:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UNaoKJ067519; Thu, 30 Mar 2023 23:36:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UNaoGr067518; Thu, 30 Mar 2023 23:36:50 GMT (envelope-from git) Date: Thu, 30 Mar 2023 23:36:50 GMT Message-Id: <202303302336.32UNaoGr067518@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: cdb192434cbc - main - netpfil tests: Serialize List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: cdb192434cbc6449778888a73c7bdbe2ae94c3c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cdb192434cbc6449778888a73c7bdbe2ae94c3c8 commit cdb192434cbc6449778888a73c7bdbe2ae94c3c8 Author: Mark Johnston AuthorDate: 2023-03-30 15:20:01 +0000 Commit: Mark Johnston CommitDate: 2023-03-30 23:35:59 +0000 netpfil tests: Serialize These tests reuse jail names and so cannot run in parallel. MFC after: 1 week --- tests/sys/netpfil/common/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile index 189b8b44cfce..5ea3e7d9b687 100644 --- a/tests/sys/netpfil/common/Makefile +++ b/tests/sys/netpfil/common/Makefile @@ -13,6 +13,9 @@ ATF_TESTS_SH+= \ fragments \ forward +# Tests reuse jail names and so cannot run in parallel. +TEST_METADATA+= is_exclusive=true + ${PACKAGE}FILES+= \ utils.subr \ runner.subr \ From nobody Thu Mar 30 23:36: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 4Pnfvm1Nh7z42Wjb; Thu, 30 Mar 2023 23:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pnfvm0YNbz4GmN; Thu, 30 Mar 2023 23:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o3jf3YUSLLdoZW2QKWvHYOXyFY3wD6Xkkzz6PqVcNbA=; b=Qib5oIZsJewihMPt2HpaQbgS+3dV2WtprISL4XSExEL/gWUzB4HyEVbWa5VyLAcAWc4HIh E9jXAydGQDqCuhs15u9cZTYmrWsypXNB9ZNp0OWTiOPatcCPEm0GXnGhLokaGK51mUseYH TDSwwFsJRX4t/1WAcdX4FHmlew40dR3iyuZl+WByjIcFz6nJ1reLt4ffd5gpcaDtpL/VfI 9C6ZWm4kjj32x1MooRNSS3p1zbRmS3nQ4kCRCK8fN/9vr7GYTv/IPdPzdemddLdfXZGT1N MoL3fXNTIjv4RswN7ulf6ymBxsWG3EmG9om5LJ6B0IuSgQGU9xhbED2ya8o4mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o3jf3YUSLLdoZW2QKWvHYOXyFY3wD6Xkkzz6PqVcNbA=; b=Ub+DEL0BUIPMsTzVAdaq41hOT4/m7EKvbNNHksnNrYSfjeFzDu8/jrQHyfB3Sx5kwuXFsy uDKkQgWdEdyzOmjQOFmM0FqXhnrncLKsu9h2ZZSO+Lter1Va8dhk2HGhHGVJzG9u6jsurY kA4GJoDC4sy0xPpikpbFRjPRhCpEnvYy0GnlqrcZ7K0W2jZxegA4fEHf14Tqx3tl0WqZDV 40ffR/mkmVJTF1LA6sE/L3Hv/QOEM49ddi+dgY8zpedtqwvFT6+q7UkHQHARMmQOjiszUf FH3a9gPvdsYVwinjNKIatDyli22vSQhVIwCbQxqTY+HqxrIpfHQ4DZUdtD2O7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680219412; a=rsa-sha256; cv=none; b=dCX1/i3bWj+M/AK1Ff84s8ZngxPcis3lE8dOQNJa3gqi2DCk+W5GfQomSuyjkwA2tCL91f ju3RrnwhfeeKYCg2P5gjXi6WtJieUcxtnRYGoncg0VaUcMNgetTdbhY/lt7UDW7JdhdGEl SCs38hvSRr6Vbqz0pqvv82tfZyVZwUCwXa4HGRq2/Dl5QqgHU6qm1W0xZ0rcrUEDltvTRr vUCchUUzHX8wLTIOzP91yMW9IJIv/Ck1FJBsLbII5Bjq0//1tSSMLEOSBge5JQRWbJRwAT LaFWdijTkIL42xA8B3EWLF0eTv3fv3UFIKJULjnHEoIlZEZJJ6qJFCmJ3M6+pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnfvl6QM9zWQt; Thu, 30 Mar 2023 23:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UNapDG067538; Thu, 30 Mar 2023 23:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UNapNp067537; Thu, 30 Mar 2023 23:36:51 GMT (envelope-from git) Date: Thu, 30 Mar 2023 23:36:51 GMT Message-Id: <202303302336.32UNapNp067537@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: 9cefc0fb1387 - main - aio tests: Use unique names for zvols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 9cefc0fb1387f6c5b0954e875b14e596167c9a45 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9cefc0fb1387f6c5b0954e875b14e596167c9a45 commit 9cefc0fb1387f6c5b0954e875b14e596167c9a45 Author: Mark Johnston AuthorDate: 2023-03-25 19:41:07 +0000 Commit: Mark Johnston CommitDate: 2023-03-30 23:35:59 +0000 aio tests: Use unique names for zvols Otherwise tests which create zvols cannot be run in parallel. MFC after: 1 week --- tests/sys/aio/aio_test.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/tests/sys/aio/aio_test.c b/tests/sys/aio/aio_test.c index 5d244af7c5ac..eeb455882210 100644 --- a/tests/sys/aio/aio_test.c +++ b/tests/sys/aio/aio_test.c @@ -976,11 +976,12 @@ ATF_TC_CLEANUP(md_waitcomplete, tc) #define ZVOL_NAME "aio_testvol" static int -aio_zvol_setup(void) +aio_zvol_setup(const char *unique) { FILE *pidfile; int fd; pid_t pid; + char vdev_name[160]; char pool_name[80]; char cmd[160]; char zvol_name[160]; @@ -989,40 +990,44 @@ aio_zvol_setup(void) ATF_REQUIRE_KERNEL_MODULE("aio"); ATF_REQUIRE_KERNEL_MODULE("zfs"); - fd = open(ZVOL_VDEV_PATHNAME, O_RDWR | O_CREAT, 0600); + pid = getpid(); + snprintf(vdev_name, sizeof(vdev_name), "%s", ZVOL_VDEV_PATHNAME); + snprintf(pool_name, sizeof(pool_name), "%s_%s.%d", POOL_NAME, unique, + pid); + snprintf(zvol_name, sizeof(zvol_name), "%s/%s_%s", pool_name, ZVOL_NAME, + unique); + + fd = open(vdev_name, O_RDWR | O_CREAT, 0600); ATF_REQUIRE_MSG(fd != -1, "open failed: %s", strerror(errno)); ATF_REQUIRE_EQ_MSG(0, ftruncate(fd, POOL_SIZE), "ftruncate failed: %s", strerror(errno)); close(fd); - pid = getpid(); pidfile = fopen("pidfile", "w"); ATF_REQUIRE_MSG(NULL != pidfile, "fopen: %s", strerror(errno)); fprintf(pidfile, "%d", pid); fclose(pidfile); - snprintf(pool_name, sizeof(pool_name), POOL_NAME ".%d", pid); - snprintf(zvol_name, sizeof(zvol_name), "%s/" ZVOL_NAME, pool_name); - snprintf(cmd, sizeof(cmd), "zpool create %s $PWD/" ZVOL_VDEV_PATHNAME, - pool_name); + snprintf(cmd, sizeof(cmd), "zpool create %s $PWD/%s", pool_name, + vdev_name); ATF_REQUIRE_EQ_MSG(0, system(cmd), "zpool create failed: %s", strerror(errno)); snprintf(cmd, sizeof(cmd), - "zfs create -o volblocksize=8192 -o volmode=dev -V " - ZVOL_SIZE " %s", zvol_name); + "zfs create -o volblocksize=8192 -o volmode=dev -V %s %s", + ZVOL_SIZE, zvol_name); ATF_REQUIRE_EQ_MSG(0, system(cmd), "zfs create failed: %s", strerror(errno)); snprintf(devname, sizeof(devname), "/dev/zvol/%s", zvol_name); do { fd = open(devname, O_RDWR); - } while (fd == -1 && errno == EINTR) ; + } while (fd == -1 && errno == EINTR); ATF_REQUIRE_MSG(fd != -1, "open failed: %s", strerror(errno)); return (fd); } static void -aio_zvol_cleanup(void) +aio_zvol_cleanup(const char *unique) { FILE *pidfile; pid_t testpid; @@ -1037,7 +1042,8 @@ aio_zvol_cleanup(void) ATF_REQUIRE_EQ(1, fscanf(pidfile, "%d", &testpid)); fclose(pidfile); - snprintf(cmd, sizeof(cmd), "zpool destroy " POOL_NAME ".%d", testpid); + snprintf(cmd, sizeof(cmd), "zpool destroy %s_%s.%d", POOL_NAME, unique, + testpid); system(cmd); } @@ -1961,7 +1967,7 @@ ATF_TC_BODY(vectored_unaligned, tc) * Use a zvol with volmode=dev, so it will allow .d_write with * unaligned uio. geom devices use physio, which doesn't allow that. */ - fd = aio_zvol_setup(); + fd = aio_zvol_setup(atf_tc_get_ident(tc)); aio_context_init(&ac, fd, fd, FILE_LEN); /* Break the buffer into 3 parts: @@ -2010,16 +2016,17 @@ ATF_TC_BODY(vectored_unaligned, tc) } ATF_TC_CLEANUP(vectored_unaligned, tc) { - aio_zvol_cleanup(); + aio_zvol_cleanup(atf_tc_get_ident(tc)); } static void -aio_zvol_test(completion comp, struct sigevent *sev, bool vectored) +aio_zvol_test(completion comp, struct sigevent *sev, bool vectored, + const char *unique) { struct aio_context ac; int fd; - fd = aio_zvol_setup(); + fd = aio_zvol_setup(unique); aio_context_init(&ac, fd, fd, MD_LEN); if (vectored) { aio_writev_test(&ac, comp, sev); @@ -2045,11 +2052,11 @@ ATF_TC_BODY(vectored_zvol_poll, tc) { if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) atf_tc_skip("https://bugs.freebsd.org/258766"); - aio_zvol_test(poll, NULL, true); + aio_zvol_test(poll, NULL, true, atf_tc_get_ident(tc)); } ATF_TC_CLEANUP(vectored_zvol_poll, tc) { - aio_zvol_cleanup(); + aio_zvol_cleanup(atf_tc_get_ident(tc)); } ATF_TP_ADD_TCS(tp) From nobody Thu Mar 30 23:36: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 4Pnfvn1rYkz42Wjg; Thu, 30 Mar 2023 23:36: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 4Pnfvn17Y6z4Gvm; Thu, 30 Mar 2023 23:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7PturdHVREK3YS6EdIHD7fuh6hdaYi0+zphvwjO2xs0=; b=hLMjm+Lgn3qayx3JR9aszy3aYexb80hZjMyceekfvo9EIGzPpZLc8GknQeix7lwnwhy7bn FLLvrJdsQD98iPUacwDDqKEkef0Rn0G7aEHzLwY9Mh4ucln62uhqHx7zzcA2+jFKZJsfCF ns3Al0u4DCcSFtcTJkNVSJSCUbVbWLPst3FJCGlMhQT1vPp/JT1MTlhIuESzVX7N+wZGG2 LKZA+INJKA1bO8wbcgRKPQAT1sqjmg7nXHUJLdqV4aO+6djwQS6FPmZxXQeq9mycbLjKdD 7XKT0LtyflnkfOeCGV/CwgOifsx455UEUXvYsGffqh7nwT6uCdvdwiJRZTVLPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7PturdHVREK3YS6EdIHD7fuh6hdaYi0+zphvwjO2xs0=; b=uMK4PGkzy/ubK6AvD/V3ut1zM5PXaGONiefQM9cqPqgHRy1VffzhXj4zqGCqA2fJOUDhp1 CbRWi42ehIfGTecheXG8rnvCY1tyE95Wj0++zTGPjV3nkj92udVF2gjDEY26iPFOdbMRKR cUPtnDbpO9K8Bjo0QDDiyifYCJLqBUjuKWnzY9l9Ly5/cbMK0RbcaxZDZghaXLETB8EnEY 3J7HWCKRIwJw0x7zXOv3emISj1eJ7SJvEFcZIMFVTAwYjasJpeI+oFTlxm1+tmsw2zsids PfHn2WMHi5LCFufaIxIA26MDxvvfb9mZUpmmKRF/65sPYkDvhiKgPU24z+0u3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680219413; a=rsa-sha256; cv=none; b=o/k+7wik4Hw8Rdx++R3BEFyxy9kmyY/HkhLTfu5yzh8GAaSSxi7oNHM3DegoxnGeIWuIt1 EEoBZxXErYnQIc2scXhiMkvBIs8wqNk8lfjQySuPrSZTWkS0eCAUuTFw1LSazvCBAfwJD5 0CksLfAGHhy9KXnhNleoxJdAOXbpOK/tJr2FvHH0ZVePOh/URgA83Xxd1Lj4XurBOY+WUZ spDzdtm2xNQrjTajJwx4e2VQHC0GhjCVJkSw1/9Snrag/KHWY48NytCtt9y0QyqweQr5Hr ErIibGpdY9AYlinsMOeEnDWAY+oxaVYb2D5SibVzvRAS1yIcIrcFXanChbUwKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnfvn0DjhzWxd; Thu, 30 Mar 2023 23:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UNaqDP067557; Thu, 30 Mar 2023 23:36:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UNaq96067556; Thu, 30 Mar 2023 23:36:52 GMT (envelope-from git) Date: Thu, 30 Mar 2023 23:36:52 GMT Message-Id: <202303302336.32UNaq96067556@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: 34b696e41259 - main - acl tests: Serialize List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 34b696e41259e41ae3ac61a539bd152d3afb73ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=34b696e41259e41ae3ac61a539bd152d3afb73ae commit 34b696e41259e41ae3ac61a539bd152d3afb73ae Author: Mark Johnston AuthorDate: 2023-03-25 19:09:48 +0000 Commit: Mark Johnston CommitDate: 2023-03-30 23:35:59 +0000 acl tests: Serialize Some of these tests import a ZFS pool with a hard-coded name, so they cannot run in parallel. MFC after: 1 week --- tests/sys/acl/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/sys/acl/Makefile b/tests/sys/acl/Makefile index abc505efe90b..0f2bc98b787b 100644 --- a/tests/sys/acl/Makefile +++ b/tests/sys/acl/Makefile @@ -23,7 +23,9 @@ TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 .for t in ${TAP_TESTS_SH} -TEST_METADATA.$t+= required_user="root" +# Tests hard-code a ZFS pool name of "acltools" and so cannot run in parallel. +TEST_METADATA.$t+= required_user="root" \ + is_exclusive=true .endfor _ACL_PROGS= getfacl setfacl From nobody Thu Mar 30 23:36: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 4Pnfvp2J0kz42Wjq; Thu, 30 Mar 2023 23:36: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 4Pnfvp1rdFz4H1H; Thu, 30 Mar 2023 23:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b+Py7f0foW2P3BY8aocDwpj9ZamDVKGYpHYzVekGBBU=; b=vwb6Wjv5fh/6fBvnrpn0tCzV9II5A0YhSaNRsUTKGIk3nZH9m+rFongS3FUSYGnph7ozGd MNNdKtOLJpoZymvAz+vAm/QELe6yovbItvUcHB9R6S8Y5PhDhaaF/hAMLRXhOnnpHiRNQR iXb13pgKAHHQzYlk9Jt1njh6k3+yAbrFUHJe6YAw4FLOlGVk7/i8ydJv57XNhzEsUbaGRT 2lcDBjRUX8r4GI+4oQ76ANJSJ/lzGGMJ1Ht7YirAOEfpyI3RdnkYBo2tXGIuB6dqyuqyso zLsRtyPk7maNDnJ7pu0x8XAHh4VMeZ8QAMpp7ETz3RDzjc3qAk/dw56TAg3tNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b+Py7f0foW2P3BY8aocDwpj9ZamDVKGYpHYzVekGBBU=; b=JgwGOeetcw8m5OkDaDfoODZR+ZWZxMRovkK4opn4nK42F6pztg5rx5lPXN3mirBILtUhu1 YR/OyhM2BAGdlLh7FlVqsOlC0RmfjPCsp8doYEec1RqqoVHQ250smuacO1mo5fiJNUYEQU UoWwIhKt+5cdDRupFzderNRUqIywlqhD1VJpeOGWncaTjBr7HBOVDRoocw9G1q6MeWnDz0 HidbiOY/3g7HaJQsAQwASRP4r1eCJlePR/AevlQsheChk2iCzOtNgfQlB1hfkgJ72je8o0 Rz50IrgcOKIQD8b+vqLYxgeEPGLyMdiM5FNdJD0e1d53FY2aFdb6lW/PFXqPMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680219414; a=rsa-sha256; cv=none; b=Y3vMpJU6vAWdBbsnVwdjJP2MsFAXOkDWdIXFweUYKBW+wZSHb4kueXjJn1F1OT/YM/ER6a a7G8jXZn8xFfcZAzmIFUnzUu/TBQ9gLz60aQ/0Nh0baN1FXMJX70BmTtN5aY5EwyRXpA9O p7SW/3+YULb8zDcRbqih1BrICd9Mdq6IMsF2vNRkZ4J84RxYKgxAx7FWAAqe+HymochyCi pfpshxxAnK7GcugoPhvOrV8lvcbEqTUdeydYLsQHI2A1nr2C31hr7yQ/2VtFOfstaTDL+H dSiJGBlTtY7YPHlELSyrE40cFNHZHecxG2T15m9OmNUMcVUzhWVfXQuVwTtn/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnfvp0wXvzWcD; Thu, 30 Mar 2023 23:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UNasQI067576; Thu, 30 Mar 2023 23:36:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UNas40067575; Thu, 30 Mar 2023 23:36:54 GMT (envelope-from git) Date: Thu, 30 Mar 2023 23:36:54 GMT Message-Id: <202303302336.32UNas40067575@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: 196f3901217e - main - if_ovpn tests: Serialize List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 196f3901217ecf320b3380f5b9f7f5013006b4c9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=196f3901217ecf320b3380f5b9f7f5013006b4c9 commit 196f3901217ecf320b3380f5b9f7f5013006b4c9 Author: Mark Johnston AuthorDate: 2023-03-25 12:59:50 +0000 Commit: Mark Johnston CommitDate: 2023-03-30 23:35:59 +0000 if_ovpn tests: Serialize These tests reuse jail names and so cannot run in parallel. MFC after: 1 week --- tests/sys/net/if_ovpn/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/sys/net/if_ovpn/Makefile b/tests/sys/net/if_ovpn/Makefile index 63fe05077f12..823ad06e76ee 100644 --- a/tests/sys/net/if_ovpn/Makefile +++ b/tests/sys/net/if_ovpn/Makefile @@ -6,6 +6,8 @@ TESTSDIR= ${TESTSBASE}/sys/net/if_ovpn .if ${MK_PF} != "no" ATF_TESTS_SH+= if_ovpn +# Tests reuse jail names and so cannot run in parallel. +TEST_METADATA.if_ovpn+= is_exclusive=true .endif ATF_TESTS_C+= if_ovpn_c From nobody Thu Mar 30 23:36: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 4Pnfvq3yB0z42WgL; Thu, 30 Mar 2023 23:36: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 4Pnfvq32NKz4H1p; Thu, 30 Mar 2023 23:36:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HGNI4YY7cH3mZBG1Jo1Y2rNRIJke4TfSCI1+lttWxiI=; b=AT/ZqxSXDluLxP6xzOIXpJMeXwJTVJK6mc4hF4cSkJalse3Ri3bzA0kDfbDuOv6OOlzFMH MgeC4N4K4vJkKEju8YQ6bIrlQJxjo94/Q6H+tE5DWwYptEH8b759lS5dcgZQuO96T7J4BZ cPnJ3DR2PngUmEUl5cgiDOBaSslgB3pwO7+26LQutnC5Z1FoSJAQyz8lc5UbsDZ+H+187j gowAUUpMR51hJbPN1Gs8Oedublb6yileYLsO6ryFtGaSmUp25sKbHMwdtblnnyymCsjBSJ GNUaJ3P2XXpW+McJQR7hNohW14pCg5p+0NQCoIHj4QVPLUyyl4JCU9RfNShjPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HGNI4YY7cH3mZBG1Jo1Y2rNRIJke4TfSCI1+lttWxiI=; b=yRzNMYYWwe4CaJZgbtEKQ51vCsKcpGugyYm9xDoykEaHQdDLUlbnr6892wvohMk7WWQ24U FGHbJ+3eFObf1/xSVrPW81ww33cWp0vhbHMr1tXYemWPDSq/n+0t2aBalSXOyR/Fs86URc F9QZPYhf1S5BZBmrRFIp6U9nFRjQi3dhw84M1SHodYZJcyLvhvEZzT+RDovnio/aXTdzbp 267Z2SnM5CtnqLniH24z3P3HVVtlnYL23cdkzJb8BaDSARoTBvSC/Dhrdggj+xVhFaH164 LNZCry+VzWmS1fiQ7vAW7u5oXDNcyL21/NgpfruFqLbsUfoeY7gz4yVBeFgA1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680219415; a=rsa-sha256; cv=none; b=W4hTAPaEwK6cVj94F+oo5f8UQcUs14caDhJ5kZwp0uk+WfkypZuLwbsvJCED9xeElNbJ4v q5f9Xgo/F1YqbAogzT5nJUs2hUqBPe0kzJc49DhWy7tIIfwcusIPnGjqC/DJuZtGRmIYiQ E/A1322nLdW1UxL6fK5nzdHtbcgCgRIIhWbtDdiAeEFqKE8IrKKQSVxYzJLPIB6B+4WsZg OvxS+Jc29U8DDj40p5BastG66HwNGCTIEUMVb7tjUhvG4sx+1BC2wVQCY/5i7quzODWxRW H1PcVcOicjx2VHszV+X1RaYE/NtTqZeP27TDFyNL5s+39FnCAnE6jd02ADxhyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnfvq25WvzWQv; Thu, 30 Mar 2023 23:36:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UNatVh067595; Thu, 30 Mar 2023 23:36:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UNatba067594; Thu, 30 Mar 2023 23:36:55 GMT (envelope-from git) Date: Thu, 30 Mar 2023 23:36:55 GMT Message-Id: <202303302336.32UNatba067594@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: b60600ceeb68 - main - pf tests: Serialize List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: b60600ceeb68d1001d61222830e0be3441ef0885 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b60600ceeb68d1001d61222830e0be3441ef0885 commit b60600ceeb68d1001d61222830e0be3441ef0885 Author: Mark Johnston AuthorDate: 2023-03-25 12:55:41 +0000 Commit: Mark Johnston CommitDate: 2023-03-30 23:35:59 +0000 pf tests: Serialize These tests reuse jail names and cannot run in parallel. Until this is fixed - which is desirable since these takes take a while to run - tell kyua to serialize them. MFC after: 1 week --- tests/sys/netpfil/pf/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 7256602a55a9..250299727697 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -38,6 +38,9 @@ ATF_TESTS_SH+= altq \ table \ tos +# Tests reuse jail names and so cannot run in parallel. +TEST_METADATA+= is_exclusive=true + ${PACKAGE}FILES+= CVE-2019-5597.py \ CVE-2019-5598.py \ daytime_inetd.conf \ From nobody Thu Mar 30 23:36: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 4Pnfvr4rD9z42X41; Thu, 30 Mar 2023 23:36: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 4Pnfvr3xwJz4H6p; Thu, 30 Mar 2023 23:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hcXAyq1QY5H5KSuXf61Zngml4yHrh0arNUHkBZ4lRSo=; b=Y0EGhngYZvScppaMI9XpQrTelQd/50SqlUEbqeVRJ5mWMW2+EUU4hPcNk+djiwf52fn0WE caVRESaGFS0Vh06QSVW9VkpL883no3gA6trMAwGEXJAnzKW9auR4tX2D6rMd/vJtVK4Ci8 8pPbAfJHAiNwkMPvoy3NpE/jZIL6uaNo9XLmSxEvVxW2A9N2mhRiEIan/V0vpSUpo9+OHY ptIn1iX1NXow38rM22eQBw0SxAqHXj4JkdztWw3fFLgjOphJZxkU5B2tU+4/MSMMaS2ydL zNyYYIv9dHvZyyEMe1/f0llkqL4U0NBpBzTu1Hd06o/hTgWRwtkWEr1qCB9mgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hcXAyq1QY5H5KSuXf61Zngml4yHrh0arNUHkBZ4lRSo=; b=qPDr/cX6EInJ+wBDK45EBCOxyl8TN8FAR6I8kXdk2NOo+ZPVy3m5YiQoLOoTNCke0BSTZK T2Z7hugK3B2oIVTFdqcioUzV6z2H6yIIFbN3nRsgAaIb905Pat3bxTiweIVzdnEwLi/AlJ rNTzGZlSeHoHw+bhOLD+JO0kgbM0q8VIAd2RdCtAzIjHNcvwdsxqSdiLUzw+wbKw5tSPYM Z5CfsNe8jYO4IRYTcl24ZPAx081mJjeCu1dweNucQgkt9PJZeqVlIlyZrOyr6Wm9qzv65W GKCLDkq/yMQhUXrroDCeZqFhn+8o8cg0MxMudRz89ItHyRS38x8kYH5RHCYdVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680219416; a=rsa-sha256; cv=none; b=WESItVKtiqTiP5oOGSbWOL0IJyWqafxRspX/jh8o70zz0m95JBVkMxyyNT29q4z73Rv+5q nMA7iacyXdXrtxugFJEY5dJ5UjT+sdBDMbppVwy7qvAnmMtQAHIIVEE0AfZuLwiIsvQPlQ d6xNZKqiSlsKsFsN8353biXnP9gkMokhwpMJmZfYLJbwD9SLNrAH0dZ1TsAtc3hF/V9DJo ra4leMNUmI4WTujvLYWWhWdbDqrkuOT8/qZUFIHwo42+bd4UWmOLta6O5recGzrN3nHzAq qKsiL+5Hmm431tmezfVR7dujmZSsrX0Ig1puYnlK0o1C/M7qKAZE9F3GKhc5oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnfvr31PmzWcF; Thu, 30 Mar 2023 23:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UNauaV067620; Thu, 30 Mar 2023 23:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UNauU8067619; Thu, 30 Mar 2023 23:36:56 GMT (envelope-from git) Date: Thu, 30 Mar 2023 23:36:56 GMT Message-Id: <202303302336.32UNauU8067619@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: 5d96ca7a3072 - main - cap_sysctl tests: Serialize List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 5d96ca7a307279cf4bdb191b7074cd1efcd3b8e8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5d96ca7a307279cf4bdb191b7074cd1efcd3b8e8 commit 5d96ca7a307279cf4bdb191b7074cd1efcd3b8e8 Author: Mark Johnston AuthorDate: 2023-03-24 16:26:20 +0000 Commit: Mark Johnston CommitDate: 2023-03-30 23:35:59 +0000 cap_sysctl tests: Serialize These tests fail spuriously when run in parallel, since some of them write a value to a global sysctl, read it back, and expect to see the written value. These tests complete quite quickly in any case. MFC after: 1 week --- lib/libcasper/services/cap_sysctl/tests/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libcasper/services/cap_sysctl/tests/Makefile b/lib/libcasper/services/cap_sysctl/tests/Makefile index d0d9f9bd7a0d..ec7439351c66 100644 --- a/lib/libcasper/services/cap_sysctl/tests/Makefile +++ b/lib/libcasper/services/cap_sysctl/tests/Makefile @@ -11,6 +11,9 @@ CFLAGS+=-DWITH_CASPER .endif LIBADD+= nv -TEST_METADATA.sysctl_test+= required_user="root" +# cap_sysctl tests modify global sysctl values and read them back, so +# cannot be run in parallel. +TEST_METADATA.sysctl_test+= required_user="root" \ + is_exclusive=true .include From nobody Thu Mar 30 23:36: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 4Pnfvs4sCYz42Wpc; Thu, 30 Mar 2023 23:36: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 4Pnfvs4fjzz4HT2; Thu, 30 Mar 2023 23:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3hrJUWASm1oEVnUPhi/eQGk0lJ/PtzBQCF9gqF/KyS0=; b=VtdnC05I8Id0R/2mm0tqgHW0WALkkWTtdC0ALu7JHTTFEzJIkUjUQmD8a+kSa1yFHG24Sh G7dZTKzeAjSqid01Elq5nzCR8m9xBltL+fCDXJ8KTyTe6ioDFplIsggedZLk4igYdqWJkb yCHtiipDct9Q5ofy3bCv/mQfvjfgjQT/cMdRszOpsv/ZG9LXVWLV2n25ZO+maYN5Q64fvM Oof1tkQBsO/1L55hGMdnC11kbNZMwIaz1ddaxFwKf7tyR0neV4Q4DfsiF9b8oCPA6eRetp yg8RQm3GwsE0YGvf2sNIQcXqXay/kmWknXL+WjjNMzYRrQ1XgOYMwuU6qiI2JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3hrJUWASm1oEVnUPhi/eQGk0lJ/PtzBQCF9gqF/KyS0=; b=ASxAhiO+SvxXYhZQD6rhidDx0EgNZOvJXwBuqA3P8kajh2ML0ery5xJnnV1ragv7U+/siU MMg2rhTq+sGY4ZhpkAZoXFi6CWKSGD2j6J6k9GAkYs1tsQEr1ecW52m5mggfTzp3fpWNWP lr0BKTUqiY8ALdJ/hVmkSM3VuC6t3y5cVv4gtbCrWpc6BOuL51fDxDm3BCwpiOGRmF5w7k 4FnKxEHlxVXhKcaYlT0MwzgJJWSjMoQjMC75krumom19FBfaKFM6KQrozF3Dlrc0oys8y2 iXGtl+iAOU3lCOrYYVJ9FEdRalxmhyLq3bUF+3D4b6u3PjlIGM/NL/6nOILcQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680219417; a=rsa-sha256; cv=none; b=HSxq2INvp7Yoppzgy1j3wM51CGSfchx24i9IDgGui9hvaiQWzrw1iNbrR9ezICbfCLjUU+ 1/dg+0UYlfz2fQOaqn+S7GVPs0VDTWWeZ6jghRg7tBLbOzET52AdorZTfrs5EIozq+bexq OlP/pIo0FazaCtdxPVS8tKbNf9cQjk7B7BZp/D8mguCWNe72+so+rGrBEhviIcxRwgm02R Vl4taNjI6Usx6sqJomvdosL4D3k1CX1ZBV7dzVGxgktFNLoog1XDj40xgCsnGThWs6jI6f +oiHc0Weu2QWOf/AVnVGRVcXCM4ZxxCenSvmuPZcT5LKtbh+5wJtNLjhdjwdkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnfvs3m8VzWQw; Thu, 30 Mar 2023 23:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UNavLx067640; Thu, 30 Mar 2023 23:36:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UNav84067639; Thu, 30 Mar 2023 23:36:57 GMT (envelope-from git) Date: Thu, 30 Mar 2023 23:36:57 GMT Message-Id: <202303302336.32UNav84067639@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: 615bf03e33e4 - main - cap_dns tests: Convert to ATF, avoid failing when lookups don't resolve List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 615bf03e33e466ca10e3f1d203f4c27188d28fc3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=615bf03e33e466ca10e3f1d203f4c27188d28fc3 commit 615bf03e33e466ca10e3f1d203f4c27188d28fc3 Author: Mark Johnston AuthorDate: 2023-03-30 23:27:36 +0000 Commit: Mark Johnston CommitDate: 2023-03-30 23:36:00 +0000 cap_dns tests: Convert to ATF, avoid failing when lookups don't resolve The cap_dns tests require Internet access. Currently they fail when that's not available, which for CI purposes is undesirable. Let's instead skip the tests if none of the non-casper name/addr lookups succeed. To that end: - Convert the tests to ATF so that skipping is easier to implement. - Break up the tests into separate test cases. - If one of the system (i.e., non-casper) lookup functions fails, skip the test if all of them failed, otherwise fail the tests, since partial failure indicates something is flaky and deserves a closer look. Reviewed by: oshogbo MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39241 --- lib/libcasper/services/cap_dns/tests/Makefile | 2 +- lib/libcasper/services/cap_dns/tests/dns_test.c | 636 ++++++++++++------------ 2 files changed, 328 insertions(+), 310 deletions(-) diff --git a/lib/libcasper/services/cap_dns/tests/Makefile b/lib/libcasper/services/cap_dns/tests/Makefile index f79e872049d1..564b4984e4f8 100644 --- a/lib/libcasper/services/cap_dns/tests/Makefile +++ b/lib/libcasper/services/cap_dns/tests/Makefile @@ -2,7 +2,7 @@ .include -TAP_TESTS_C= dns_test +ATF_TESTS_C= dns_test .if ${MK_CASPER} != "no" LIBADD+= casper diff --git a/lib/libcasper/services/cap_dns/tests/dns_test.c b/lib/libcasper/services/cap_dns/tests/dns_test.c index e25caf9c1c92..06856574fce9 100644 --- a/lib/libcasper/services/cap_dns/tests/dns_test.c +++ b/lib/libcasper/services/cap_dns/tests/dns_test.c @@ -48,29 +48,9 @@ __FBSDID("$FreeBSD$"); #include #include - #include -static int ntest = 1; - -#define CHECK(expr) do { \ - if ((expr)) \ - printf("ok %d # %s:%u\n", ntest, __FILE__, __LINE__); \ - else \ - printf("not ok %d # %s:%u\n", ntest, __FILE__, __LINE__); \ - fflush(stdout); \ - ntest++; \ -} while (0) -#define CHECKX(expr) do { \ - if ((expr)) { \ - printf("ok %d # %s:%u\n", ntest, __FILE__, __LINE__); \ - } else { \ - printf("not ok %d # %s:%u\n", ntest, __FILE__, __LINE__); \ - exit(1); \ - } \ - fflush(stdout); \ - ntest++; \ -} while (0) +#include #define GETHOSTBYNAME 0x01 #define GETHOSTBYNAME2_AF_INET 0x02 @@ -219,37 +199,47 @@ hostent_compare(const struct hostent *hp0, const struct hostent *hp1) return (true); } -static unsigned int -runtest(cap_channel_t *capdns) +static void +runtest(cap_channel_t *capdns, unsigned int expected) { - unsigned int result; + unsigned int result, failure; struct addrinfo *ais, *aic, hints, *hintsp; struct hostent *hps, *hpc; struct in_addr ip4; struct in6_addr ip6; + int caperr, syserr; - result = 0; + failure = result = 0; hps = gethostbyname("example.com"); - if (hps == NULL) + if (hps == NULL) { + failure |= GETHOSTBYNAME; fprintf(stderr, "Unable to resolve %s IPv4.\n", "example.com"); - hpc = cap_gethostbyname(capdns, "example.com"); - if (hostent_compare(hps, hpc)) - result |= GETHOSTBYNAME; + } else { + hpc = cap_gethostbyname(capdns, "example.com"); + if (hostent_compare(hps, hpc)) + result |= GETHOSTBYNAME; + } hps = gethostbyname2("example.com", AF_INET); - if (hps == NULL) + if (hps == NULL) { + failure |= GETHOSTBYNAME2_AF_INET; fprintf(stderr, "Unable to resolve %s IPv4.\n", "example.com"); - hpc = cap_gethostbyname2(capdns, "example.com", AF_INET); - if (hostent_compare(hps, hpc)) - result |= GETHOSTBYNAME2_AF_INET; + } else { + hpc = cap_gethostbyname2(capdns, "example.com", AF_INET); + if (hostent_compare(hps, hpc)) + result |= GETHOSTBYNAME2_AF_INET; + } hps = gethostbyname2("example.com", AF_INET6); - if (hps == NULL) + if (hps == NULL) { + failure |= GETHOSTBYNAME2_AF_INET6; fprintf(stderr, "Unable to resolve %s IPv6.\n", "example.com"); - hpc = cap_gethostbyname2(capdns, "example.com", AF_INET6); - if (hostent_compare(hps, hpc)) - result |= GETHOSTBYNAME2_AF_INET6; + } else { + hpc = cap_gethostbyname2(capdns, "example.com", AF_INET6); + if (hostent_compare(hps, hpc)) + result |= GETHOSTBYNAME2_AF_INET6; + } hints.ai_flags = 0; hints.ai_family = AF_UNSPEC; @@ -262,42 +252,57 @@ runtest(cap_channel_t *capdns) hintsp = &hints; - if (getaddrinfo("freebsd.org", "25", hintsp, &ais) != 0) { + syserr = getaddrinfo("freebsd.org", "25", hintsp, &ais); + if (syserr != 0) { + failure |= GETADDRINFO_AF_UNSPEC; fprintf(stderr, "Unable to issue [system] getaddrinfo() for AF_UNSPEC: %s\n", - gai_strerror(errno)); - } - if (cap_getaddrinfo(capdns, "freebsd.org", "25", hintsp, &aic) == 0) { - if (addrinfo_compare(ais, aic)) - result |= GETADDRINFO_AF_UNSPEC; - freeaddrinfo(ais); - freeaddrinfo(aic); + gai_strerror(syserr)); + } else { + caperr = cap_getaddrinfo(capdns, "freebsd.org", "25", hintsp, + &aic); + if (caperr == 0) { + if (addrinfo_compare(ais, aic)) + result |= GETADDRINFO_AF_UNSPEC; + freeaddrinfo(ais); + freeaddrinfo(aic); + } } hints.ai_family = AF_INET; - if (getaddrinfo("freebsd.org", "25", hintsp, &ais) != 0) { + syserr = getaddrinfo("freebsd.org", "25", hintsp, &ais); + if (syserr != 0) { + failure |= GETADDRINFO_AF_INET; fprintf(stderr, "Unable to issue [system] getaddrinfo() for AF_UNSPEC: %s\n", - gai_strerror(errno)); - } - if (cap_getaddrinfo(capdns, "freebsd.org", "25", hintsp, &aic) == 0) { - if (addrinfo_compare(ais, aic)) - result |= GETADDRINFO_AF_INET; - freeaddrinfo(ais); - freeaddrinfo(aic); + gai_strerror(syserr)); + } else { + caperr = cap_getaddrinfo(capdns, "freebsd.org", "25", hintsp, + &aic); + if (caperr == 0) { + if (addrinfo_compare(ais, aic)) + result |= GETADDRINFO_AF_INET; + freeaddrinfo(ais); + freeaddrinfo(aic); + } } hints.ai_family = AF_INET6; - if (getaddrinfo("freebsd.org", "25", hintsp, &ais) != 0) { + syserr = getaddrinfo("freebsd.org", "25", hintsp, &ais); + if (syserr != 0) { + failure |= GETADDRINFO_AF_INET6; fprintf(stderr, "Unable to issue [system] getaddrinfo() for AF_UNSPEC: %s\n", - gai_strerror(errno)); - } - if (cap_getaddrinfo(capdns, "freebsd.org", "25", hintsp, &aic) == 0) { - if (addrinfo_compare(ais, aic)) - result |= GETADDRINFO_AF_INET6; - freeaddrinfo(ais); - freeaddrinfo(aic); + gai_strerror(syserr)); + } else { + caperr = cap_getaddrinfo(capdns, "freebsd.org", "25", hintsp, + &aic); + if (caperr == 0) { + if (addrinfo_compare(ais, aic)) + result |= GETADDRINFO_AF_INET6; + freeaddrinfo(ais); + freeaddrinfo(aic); + } } /* XXX: hardcoded addresses for "google-public-dns-a.google.com". */ @@ -306,397 +311,410 @@ runtest(cap_channel_t *capdns) inet_pton(AF_INET, GOOGLE_DNS_IPV4, &ip4); hps = gethostbyaddr(&ip4, sizeof(ip4), AF_INET); - if (hps == NULL) + if (hps == NULL) { + failure |= GETHOSTBYADDR_AF_INET; fprintf(stderr, "Unable to resolve %s.\n", GOOGLE_DNS_IPV4); - hpc = cap_gethostbyaddr(capdns, &ip4, sizeof(ip4), AF_INET); - if (hostent_compare(hps, hpc)) - result |= GETHOSTBYADDR_AF_INET; + } else { + hpc = cap_gethostbyaddr(capdns, &ip4, sizeof(ip4), AF_INET); + if (hostent_compare(hps, hpc)) + result |= GETHOSTBYADDR_AF_INET; + } inet_pton(AF_INET6, GOOGLE_DNS_IPV6, &ip6); hps = gethostbyaddr(&ip6, sizeof(ip6), AF_INET6); if (hps == NULL) { + failure |= GETHOSTBYADDR_AF_INET6; fprintf(stderr, "Unable to resolve %s.\n", GOOGLE_DNS_IPV6); + } else { + hpc = cap_gethostbyaddr(capdns, &ip6, sizeof(ip6), AF_INET6); + if (hostent_compare(hps, hpc)) { + caperr = h_errno; + result |= GETHOSTBYADDR_AF_INET6; + } + } + + /* + * If we had any failures, make sure that all lookups failed. If some + * succeeded and some failed, there's a problem with the test or the DNS + * and we should not fail silently. + */ + if (failure != 0) { + ATF_REQUIRE_MSG(failure == (GETHOSTBYNAME | + GETHOSTBYNAME2_AF_INET | GETHOSTBYNAME2_AF_INET6 | + GETADDRINFO_AF_UNSPEC | GETADDRINFO_AF_INET | + GETADDRINFO_AF_INET6 | + GETHOSTBYADDR_AF_INET | GETHOSTBYADDR_AF_INET6), + "expected all tests to fail, got 0x%x", failure); + atf_tc_skip( + "no name lookups succeeded, tests require Internet access"); } - hpc = cap_gethostbyaddr(capdns, &ip6, sizeof(ip6), AF_INET6); - if (hostent_compare(hps, hpc)) - result |= GETHOSTBYADDR_AF_INET6; - return (result); + ATF_REQUIRE_MSG(result == expected, + "expected 0x%x, got 0x%x", expected, result); } -int -main(void) +static cap_channel_t * +cap_dns_init(void) { - cap_channel_t *capcas, *capdns, *origcapdns; - const char *types[2]; - int families[2]; - - printf("1..91\n"); - fflush(stdout); + cap_channel_t *capcas, *capdns; capcas = cap_init(); - CHECKX(capcas != NULL); + ATF_REQUIRE(capcas != NULL); - origcapdns = capdns = cap_service_open(capcas, "system.dns"); - CHECKX(capdns != NULL); + capdns = cap_service_open(capcas, "system.dns"); + ATF_REQUIRE(capdns != NULL); cap_close(capcas); - /* No limits set. */ + return (capdns); +} + +ATF_TC(dns_no_limits); +ATF_TC_HEAD(dns_no_limits, tc) +{ +} +ATF_TC_BODY(dns_no_limits, tc) +{ + cap_channel_t *capdns; + + capdns = cap_dns_init(); - CHECK(runtest(capdns) == + runtest(capdns, (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | GETHOSTBYNAME2_AF_INET6 | GETHOSTBYADDR_AF_INET | GETHOSTBYADDR_AF_INET6 | - GETADDRINFO_AF_UNSPEC | GETADDRINFO_AF_INET | GETADDRINFO_AF_INET6)); + GETADDRINFO_AF_UNSPEC | GETADDRINFO_AF_INET | + GETADDRINFO_AF_INET6)); - /* - * Allow: - * type: NAME, ADDR - * family: AF_INET, AF_INET6 - */ + cap_close(capdns); +} - capdns = cap_clone(origcapdns); - CHECK(capdns != NULL); +ATF_TC(dns_all_limits); +ATF_TC_HEAD(dns_all_limits, tc) +{ +} +ATF_TC_BODY(dns_all_limits, tc) +{ + cap_channel_t *capdns; + const char *types[2]; + int families[2]; + + capdns = cap_dns_init(); types[0] = "NAME2ADDR"; types[1] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 2) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 2) == 0); families[0] = AF_INET; families[1] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 2) == 0); + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 2) == 0); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, NULL, 0) == -1); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, NULL, 0) == -1); - CHECK(runtest(capdns) == + runtest(capdns, (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | GETHOSTBYNAME2_AF_INET6 | GETHOSTBYADDR_AF_INET | GETHOSTBYADDR_AF_INET6 | GETADDRINFO_AF_INET | GETADDRINFO_AF_INET6)); cap_close(capdns); +} - /* - * Allow: - * type: NAME - * family: AF_INET, AF_INET6 - */ +ATF_TC(dns_name_limit); +ATF_TC_HEAD(dns_name_limit, tc) +{ +} +ATF_TC_BODY(dns_name_limit, tc) +{ + cap_channel_t *capdns; + const char *types[2]; + int families[2]; - capdns = cap_clone(origcapdns); - CHECK(capdns != NULL); + capdns = cap_dns_init(); types[0] = "NAME2ADDR"; - CHECK(cap_dns_type_limit(capdns, types, 1) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 1) == 0); types[1] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 2) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, types, 2) == -1); types[0] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 1) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, types, 1) == -1); families[0] = AF_INET; families[1] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 2) == 0); + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 2) == 0); - CHECK(runtest(capdns) == + runtest(capdns, (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | GETHOSTBYNAME2_AF_INET6 | GETADDRINFO_AF_INET | GETADDRINFO_AF_INET6)); cap_close(capdns); +} - /* - * Allow: - * type: ADDR - * family: AF_INET, AF_INET6 - */ +ATF_TC(dns_addr_limit); +ATF_TC_HEAD(dns_addr_limit, tc) +{ +} +ATF_TC_BODY(dns_addr_limit, tc) +{ + cap_channel_t *capdns; + const char *types[2]; + int families[2]; - capdns = cap_clone(origcapdns); - CHECK(capdns != NULL); + capdns = cap_dns_init(); types[0] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 1) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 1) == 0); types[1] = "NAME2ADDR"; - CHECK(cap_dns_type_limit(capdns, types, 2) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, types, 2) == -1); types[0] = "NAME2ADDR"; - CHECK(cap_dns_type_limit(capdns, types, 1) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, types, 1) == -1); families[0] = AF_INET; families[1] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 2) == 0); + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 2) == 0); - CHECK(runtest(capdns) == + runtest(capdns, (GETHOSTBYADDR_AF_INET | GETHOSTBYADDR_AF_INET6)); + cap_close(capdns); +} - /* - * Allow: - * type: NAME, ADDR - * family: AF_INET - */ +ATF_TC(dns_inet_limit); +ATF_TC_HEAD(dns_inet_limit, tc) +{ +} +ATF_TC_BODY(dns_inet_limit, tc) +{ + cap_channel_t *capdns; + const char *types[2]; + int families[2]; - capdns = cap_clone(origcapdns); - CHECK(capdns != NULL); + capdns = cap_dns_init(); types[0] = "NAME2ADDR"; types[1] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 2) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 2) == 0); families[0] = AF_INET; - CHECK(cap_dns_family_limit(capdns, families, 1) == 0); + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 1) == 0); families[1] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 2) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, families, 2) == -1); families[0] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 1) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, families, 1) == -1); - CHECK(runtest(capdns) == + runtest(capdns, (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | GETHOSTBYADDR_AF_INET | GETADDRINFO_AF_INET)); cap_close(capdns); +} - /* - * Allow: - * type: NAME, ADDR - * family: AF_INET6 - */ +ATF_TC(dns_inet6_limit); +ATF_TC_HEAD(dns_inet6_limit, tc) +{ +} +ATF_TC_BODY(dns_inet6_limit, tc) +{ + cap_channel_t *capdns; + const char *types[2]; + int families[2]; - capdns = cap_clone(origcapdns); - CHECK(capdns != NULL); + capdns = cap_dns_init(); types[0] = "NAME2ADDR"; types[1] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 2) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 2) == 0); families[0] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 1) == 0); + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 1) == 0); families[1] = AF_INET; - CHECK(cap_dns_family_limit(capdns, families, 2) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, families, 2) == -1); families[0] = AF_INET; - CHECK(cap_dns_family_limit(capdns, families, 1) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, families, 1) == -1); - CHECK(runtest(capdns) == + runtest(capdns, (GETHOSTBYNAME2_AF_INET6 | GETHOSTBYADDR_AF_INET6 | GETADDRINFO_AF_INET6)); cap_close(capdns); +} - /* Below we also test further limiting capability. */ - - /* - * Allow: - * type: NAME - * family: AF_INET - */ +ATF_TC(dns_name_inet_limit); +ATF_TC_HEAD(dns_name_inet_limit, tc) +{ +} +ATF_TC_BODY(dns_name_inet_limit, tc) +{ + cap_channel_t *capdns; + const char *types[2]; + int families[2]; - capdns = cap_clone(origcapdns); - CHECK(capdns != NULL); + capdns = cap_dns_init(); types[0] = "NAME2ADDR"; types[1] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 2) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 2) == 0); families[0] = AF_INET; families[1] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 2) == 0); + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 2) == 0); types[0] = "NAME2ADDR"; - CHECK(cap_dns_type_limit(capdns, types, 1) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 1) == 0); types[1] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 2) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, types, 2) == -1); types[0] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 1) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, types, 1) == -1); families[0] = AF_INET; - CHECK(cap_dns_family_limit(capdns, families, 1) == 0); + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 1) == 0); families[1] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 2) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, families, 2) == -1); families[0] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 1) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, families, 1) == -1); - CHECK(runtest(capdns) == + runtest(capdns, (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | GETADDRINFO_AF_INET)); cap_close(capdns); +} - /* - * Allow: - * type: NAME - * family: AF_INET6 - */ +ATF_TC(dns_name_inet6_limit); +ATF_TC_HEAD(dns_name_inet6_limit, tc) +{ +} +ATF_TC_BODY(dns_name_inet6_limit, tc) +{ + cap_channel_t *capdns; + const char *types[2]; + int families[2]; - capdns = cap_clone(origcapdns); - CHECK(capdns != NULL); + capdns = cap_dns_init(); types[0] = "NAME2ADDR"; types[1] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 2) == 0); - families[0] = AF_INET; - families[1] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 2) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 2) == 0); + families[0] = AF_INET6; + families[1] = AF_INET; + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 2) == 0); types[0] = "NAME2ADDR"; - CHECK(cap_dns_type_limit(capdns, types, 1) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 1) == 0); types[1] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 2) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, types, 2) == -1); types[0] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 1) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, types, 1) == -1); families[0] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 1) == 0); + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 1) == 0); families[1] = AF_INET; - CHECK(cap_dns_family_limit(capdns, families, 2) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, families, 2) == -1); families[0] = AF_INET; - CHECK(cap_dns_family_limit(capdns, families, 1) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, families, 1) == -1); - CHECK(runtest(capdns) == + runtest(capdns, (GETHOSTBYNAME2_AF_INET6 | GETADDRINFO_AF_INET6)); cap_close(capdns); +} - /* - * Allow: - * type: ADDR - * family: AF_INET - */ +ATF_TC(dns_addr_inet_limit); +ATF_TC_HEAD(dns_addr_inet_limit, tc) +{ +} +ATF_TC_BODY(dns_addr_inet_limit, tc) +{ + cap_channel_t *capdns; + const char *types[2]; + int families[2]; - capdns = cap_clone(origcapdns); - CHECK(capdns != NULL); + capdns = cap_dns_init(); types[0] = "NAME2ADDR"; types[1] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 2) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 2) == 0); families[0] = AF_INET; families[1] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 2) == 0); + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 2) == 0); types[0] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 1) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 1) == 0); types[1] = "NAME2ADDR"; - CHECK(cap_dns_type_limit(capdns, types, 2) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, types, 2) == -1); types[0] = "NAME2ADDR"; - CHECK(cap_dns_type_limit(capdns, types, 1) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, types, 1) == -1); families[0] = AF_INET; - CHECK(cap_dns_family_limit(capdns, families, 1) == 0); + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 1) == 0); families[1] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 2) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, families, 2) == -1); families[0] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 1) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, families, 1) == -1); - CHECK(runtest(capdns) == GETHOSTBYADDR_AF_INET); + runtest(capdns, GETHOSTBYADDR_AF_INET); cap_close(capdns); +} - /* - * Allow: - * type: ADDR - * family: AF_INET6 - */ +ATF_TC(dns_addr_inet6_limit); +ATF_TC_HEAD(dns_addr_inet6_limit, tc) +{ +} +ATF_TC_BODY(dns_addr_inet6_limit, tc) +{ + cap_channel_t *capdns; + const char *types[2]; + int families[2]; - capdns = cap_clone(origcapdns); - CHECK(capdns != NULL); + capdns = cap_dns_init(); types[0] = "NAME2ADDR"; types[1] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 2) == 0); - families[0] = AF_INET; - families[1] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 2) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 2) == 0); + families[0] = AF_INET6; + families[1] = AF_INET; + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 2) == 0); types[0] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 1) == 0); + ATF_REQUIRE(cap_dns_type_limit(capdns, types, 1) == 0); types[1] = "NAME2ADDR"; - CHECK(cap_dns_type_limit(capdns, types, 2) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, types, 2) == -1); types[0] = "NAME2ADDR"; - CHECK(cap_dns_type_limit(capdns, types, 1) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_type_limit(capdns, types, 1) == -1); families[0] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 1) == 0); + ATF_REQUIRE(cap_dns_family_limit(capdns, families, 1) == 0); families[1] = AF_INET; - CHECK(cap_dns_family_limit(capdns, families, 2) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, families, 2) == -1); families[0] = AF_INET; - CHECK(cap_dns_family_limit(capdns, families, 1) == -1 && - errno == ENOTCAPABLE); + ATF_REQUIRE_ERRNO(ENOTCAPABLE, + cap_dns_family_limit(capdns, families, 1) == -1); - CHECK(runtest(capdns) == GETHOSTBYADDR_AF_INET6); + runtest(capdns, GETHOSTBYADDR_AF_INET6); cap_close(capdns); +} - /* Trying to rise the limits. */ - - capdns = cap_clone(origcapdns); - CHECK(capdns != NULL); - - types[0] = "NAME2ADDR"; - CHECK(cap_dns_type_limit(capdns, types, 1) == 0); - families[0] = AF_INET; - CHECK(cap_dns_family_limit(capdns, families, 1) == 0); - - types[0] = "NAME2ADDR"; - types[1] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 2) == -1 && - errno == ENOTCAPABLE); - families[0] = AF_INET; - families[1] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 2) == -1 && - errno == ENOTCAPABLE); - - types[0] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 1) == -1 && - errno == ENOTCAPABLE); - families[0] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 1) == -1 && - errno == ENOTCAPABLE); - - CHECK(cap_dns_type_limit(capdns, NULL, 0) == -1 && - errno == ENOTCAPABLE); - CHECK(cap_dns_family_limit(capdns, NULL, 0) == -1 && - errno == ENOTCAPABLE); - - /* Do the limits still hold? */ - CHECK(runtest(capdns) == (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | - GETADDRINFO_AF_INET)); - - cap_close(capdns); - - capdns = cap_clone(origcapdns); - CHECK(capdns != NULL); - - types[0] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 1) == 0); - families[0] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 1) == 0); - - types[0] = "NAME2ADDR"; - types[1] = "ADDR2NAME"; - CHECK(cap_dns_type_limit(capdns, types, 2) == -1 && - errno == ENOTCAPABLE); - families[0] = AF_INET; - families[1] = AF_INET6; - CHECK(cap_dns_family_limit(capdns, families, 2) == -1 && - errno == ENOTCAPABLE); - - types[0] = "NAME2ADDR"; - CHECK(cap_dns_type_limit(capdns, types, 1) == -1 && - errno == ENOTCAPABLE); - families[0] = AF_INET; - CHECK(cap_dns_family_limit(capdns, families, 1) == -1 && - errno == ENOTCAPABLE); - - CHECK(cap_dns_type_limit(capdns, NULL, 0) == -1 && - errno == ENOTCAPABLE); - CHECK(cap_dns_family_limit(capdns, NULL, 0) == -1 && - errno == ENOTCAPABLE); - - /* Do the limits still hold? */ - CHECK(runtest(capdns) == GETHOSTBYADDR_AF_INET6); - - cap_close(capdns); - - cap_close(origcapdns); - - exit(0); +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, dns_no_limits); + ATF_TP_ADD_TC(tp, dns_all_limits); + ATF_TP_ADD_TC(tp, dns_name_limit); + ATF_TP_ADD_TC(tp, dns_addr_limit); + ATF_TP_ADD_TC(tp, dns_inet_limit); + ATF_TP_ADD_TC(tp, dns_inet6_limit); + ATF_TP_ADD_TC(tp, dns_name_inet_limit); + ATF_TP_ADD_TC(tp, dns_name_inet6_limit); + ATF_TP_ADD_TC(tp, dns_addr_inet_limit); + ATF_TP_ADD_TC(tp, dns_addr_inet6_limit); + + return atf_no_error(); } From nobody Thu Mar 30 23:40: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 4Pnfzk2LNFz42XC0 for ; Thu, 30 Mar 2023 23:40:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (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 4Pnfzj6lsSz4K4p for ; Thu, 30 Mar 2023 23:40:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x535.google.com with SMTP id y4so83180646edo.2 for ; Thu, 30 Mar 2023 16:40:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; t=1680219617; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=zlx+B4WihXNHYGU+ErkilfOc3ejHM1Ri8I9Hi5dBjmU=; b=LFQBdyDNWwPCzumwLsir/DyCeHh9pgjxKvi98/b80exEPRMqov2xVxG/EnoEeDginz rPp/Iob0SnutrEflDQU15Kh63KgxxnaO7uFOaFwbf/NF5j6zDQOZ6bJtFR/CNqZrb4O8 zVQjU+x9RGeivIetw+5V6TxAsSOL/GYyJJdbt1QpRximdFsWqMyDFp+c3M1jyABy55+A uZMpKlDSgHnMVvVpdEBbK7goA24BRiK/37MxFwmlFjOjVYf3l/1QDmSTyWsb0/atC2bW 3Uwl1oWYYV18ElFiwMWwwYJlbw5pCGU2UyGH5Joa/9SChpjUQcohNTrJKEMAfczRogLi CM+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680219617; 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=zlx+B4WihXNHYGU+ErkilfOc3ejHM1Ri8I9Hi5dBjmU=; b=1WByrudy6pHshkfwSrYNeKkI5FWcAJqV2bu0FJjUI6nMjnw5o2GK5eY2tF5xjo6yl2 WWx+ox3y+TOxY8BBai8FugF7CXtrQCefyFvNxmWUYAVo+oksEt3ktI1gzsIiOxEcAkJu 2/9hceVleagP6GqNXmTXORwPyvpTqV5srEV97u3fcaFHwv9ehdlMpESRh6xmLMoVfbVY ampRPbIm5ZrYMfxEo6ZXKUxFFaQ2oSeMXa/FsXVFzsOEVWbVBB+8w03USImX6ON716cb 8be3qD6utg7OuXbZeFK809USsbW8nyK5dCBKQBOKaxB9j+wVpPPqWzkYjHOBxuLNqfrC UHYw== X-Gm-Message-State: AAQBX9crTNQoZtn/4B69xlZIbZh3nV3MGfm57beFbwCy6zQcx9sGm/1/ bdYCA2W9EWO8p0GDHOkMBYlA2Zfm1779RndFvtt/0A== X-Google-Smtp-Source: AKy350aB5gYvvzLvmYKDnuXS6Q9ptaM8eAdBGcFf2SYUlyLlNZWMv4nSisRuGeygHAJZTxVI3FRHUETGkIXvMg8Rn4c= X-Received: by 2002:a17:907:a0cd:b0:947:4b15:51e5 with SMTP id hw13-20020a170907a0cd00b009474b1551e5mr2327374ejc.2.1680219616587; Thu, 30 Mar 2023 16:40:16 -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: <202303180720.32I7KXOc030612@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Thu, 30 Mar 2023 17:40:05 -0600 Message-ID: Subject: Re: git: 927358dd98cb - main - amd64 loader: Use efiserialio for Hyper-V booted systems To: Gleb Smirnoff Cc: Wei Hu , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, imp@freebsd.org, gallatin@freebsd.org, kevans@freebsd.org Content-Type: multipart/alternative; boundary="00000000000064441305f8269db7" X-Rspamd-Queue-Id: 4Pnfzj6lsSz4K4p X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --00000000000064441305f8269db7 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Let's back it out. I didn't get a chance to review it and the duplicated name strikes me as massively unwise. Of course, the efi serial driver never should have had the name comconsole in the first place, imho. It was OK on arm where we couldn't conflict. So let's back it out and talk about how we should do this, including the need to possibly just rename the efi version of the console driver to something else. IMHO, it never should have been comconsole in the first place because it's configured differently than comconsole.... Warner On Thu, Mar 30, 2023 at 5:31=E2=80=AFPM Gleb Smirnoff = wrote: > Wei, Kyle, > > this commit hangs loader on real hardware, at least on some > of it. The loader prints list of consoles and hangs hard: > > [Thu Mar 30 20:46:12 2023]^M|^HLoading /boot/loader.conf^M > ^M/^Hconsole vidconsole is invalid!^M > ^MAvailable consoles:^M > ^M efi^M > ^M comconsole^M > ^M comconsole^M > ^M nullconsole^M > ^M spinconsole^M > > Machine is unrecoverable unless you got alternate boot media > and access to BMC console. > > First, please DO NOT MFC this as scheduled. Second, let's try > to fix it or back it out if we hear from any other CURRENT > user. > > Our configuration isn't special. This is what we got in > loader.conf, related to consoles: > > console=3D"comconsole vidconsole efi" > comconsole_speed=3D115200 > comconsole_port=3D0x3e8 > console=3D"efi" > hw.uart.console=3D"io:1016,br:115200" > > On Sat, Mar 18, 2023 at 07:20:33AM +0000, Wei Hu wrote: > W> The branch main has been updated by whu: > W> > W> URL: > https://cgit.FreeBSD.org/src/commit/?id=3D927358dd98cb902160093e0dc0bac00= 2d6b43858 > W> > W> commit 927358dd98cb902160093e0dc0bac002d6b43858 > W> Author: Wei Hu > W> AuthorDate: 2023-03-14 15:13:46 +0000 > W> Commit: Wei Hu > W> CommitDate: 2023-03-18 07:07:35 +0000 > W> > W> amd64 loader: Use efiserialio for Hyper-V booted systems > W> > W> UEFI provides ConIn/ConOut handles for consoles that it supports, > W> which include the text-video and serial ports. When the serial por= t > W> is available, use the UEFI driver instead of direct io-port access= es > W> to avoid conflicts between the firmware and direct hardware access= , > as > W> happens on Hyper-V (Azure) setups. > W> > W> This change enables efiserialio to be built for efi-amd64 and has > W> higher order priority vs comconsole, and only uses efiserialio > W> if the hypervisor is Hyper-V. When efiserialio successfully > W> probes, it will set efi_comconsole_avail=3Dtrue which will prevent > W> comconsole from probing in this setup. > W> > W> Tested on Hyper-V, ESXi and Azure VMs. > W> > W> PR: 264267 > W> Reviewed by: kevans, whu > W> Tested by: whu > W> Obtained from: Rubicon Communications, LLC (Netgate) > W> MFC after: 2 weeks > W> Sponsored by: Rubicon Communications, LLC (Netgate) > W> --- > W> stand/efi/loader/arch/amd64/Makefile.inc | 1 + > W> stand/efi/loader/bootinfo.c | 11 ++++++-- > W> stand/efi/loader/conf.c | 6 +++++ > W> stand/efi/loader/efiserialio.c | 43 > ++++++++++++++++++++++++++++---- > W> stand/i386/libi386/comconsole.c | 14 +++++++++++ > W> 5 files changed, 68 insertions(+), 7 deletions(-) > W> > W> diff --git a/stand/efi/loader/arch/amd64/Makefile.inc > b/stand/efi/loader/arch/amd64/Makefile.inc > W> index 0d9e2648cb59..bd89044bd6c7 100644 > W> --- a/stand/efi/loader/arch/amd64/Makefile.inc > W> +++ b/stand/efi/loader/arch/amd64/Makefile.inc > W> @@ -5,6 +5,7 @@ SRCS+=3D amd64_tramp.S \ > W> elf64_freebsd.c \ > W> trap.c \ > W> multiboot2.c \ > W> + efiserialio.c \ > W> exc.S > W> > W> .PATH: ${BOOTSRC}/i386/libi386 > W> diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c > W> index 939f2cf4c3fe..d79f59343af1 100644 > W> --- a/stand/efi/loader/bootinfo.c > W> +++ b/stand/efi/loader/bootinfo.c > W> @@ -119,10 +119,17 @@ bi_getboothowto(char *kargs) > W> if (tmp !=3D NULL) > W> speed =3D strtol(tmp, NULL, 0); > W> tmp =3D getenv("efi_com_port"); > W> - if (tmp =3D=3D NULL) > W> - tmp =3D getenv("comconsole_port"); > W> if (tmp !=3D NULL) > W> port =3D strtol(tmp, NULL, 0); > W> + if (port <=3D 0) { > W> + tmp =3D getenv("comconsole_port"); > W> + if (tmp !=3D NULL) > W> + port =3D strtol(tmp, NULL, 0); > W> + else { > W> + if (port =3D=3D 0) > W> + port =3D 0x3f8; > W> + } > W> + } > W> if (speed !=3D -1 && port !=3D -1) { > W> snprintf(buf, sizeof(buf), "io:%d,br:%d", > port, > W> speed); > W> diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c > W> index 863c9188c72c..051e1a3381d1 100644 > W> --- a/stand/efi/loader/conf.c > W> +++ b/stand/efi/loader/conf.c > W> @@ -81,6 +81,9 @@ struct netif_driver *netif_drivers[] =3D { > W> > W> extern struct console efi_console; > W> extern struct console comconsole; > W> +#if defined(__amd64__) > W> +extern struct console eficomconsole; > W> +#endif > W> #if defined(__amd64__) || defined(__i386__) > W> extern struct console nullconsole; > W> extern struct console spinconsole; > W> @@ -88,6 +91,9 @@ extern struct console spinconsole; > W> > W> struct console *consoles[] =3D { > W> &efi_console, > W> +#if defined(__amd64__) > W> + &eficomconsole, > W> +#endif > W> &comconsole, > W> #if defined(__amd64__) || defined(__i386__) > W> &nullconsole, > W> diff --git a/stand/efi/loader/efiserialio.c > b/stand/efi/loader/efiserialio.c > W> index 375e679d2590..5fbc700f6ac2 100644 > W> --- a/stand/efi/loader/efiserialio.c > W> +++ b/stand/efi/loader/efiserialio.c > W> @@ -69,6 +69,11 @@ static int comc_speed_set(struct env_var *, > int, const void *); > W> > W> static struct serial *comc_port; > W> extern struct console efi_console; > W> +bool efi_comconsole_avail =3D false; > W> + > W> +#if defined(__amd64__) > W> +#define comconsole eficomconsole > W> +#endif > W> > W> struct console comconsole =3D { > W> .c_name =3D "comconsole", > W> @@ -254,11 +259,22 @@ comc_probe(struct console *sc) > W> char *env, *buf, *ep; > W> size_t sz; > W> > W> +#if defined(__amd64__) > W> + /* > W> + * For x86-64, don't use this driver if not running in Hyper-V. > W> + */ > W> + env =3D getenv("smbios.bios.version"); > W> + if (env =3D=3D NULL || strncmp(env, "Hyper-V", 7) !=3D 0) { > W> + return; > W> + } > W> +#endif > W> + > W> if (comc_port =3D=3D NULL) { > W> comc_port =3D calloc(1, sizeof (struct serial)); > W> if (comc_port =3D=3D NULL) > W> return; > W> } > W> + > W> /* Use defaults from firmware */ > W> comc_port->databits =3D 8; > W> comc_port->parity =3D DefaultParity; > W> @@ -308,6 +324,10 @@ comc_probe(struct console *sc) > W> comc_port_set, env_nounset); > W> > W> env =3D getenv("efi_com_speed"); > W> + if (env =3D=3D NULL) > W> + /* fallback to comconsole setting */ > W> + env =3D getenv("comconsole_speed"); > W> + > W> if (comc_parse_intval(env, &val) =3D=3D CMD_OK) > W> comc_port->baudrate =3D val; > W> > W> @@ -318,8 +338,13 @@ comc_probe(struct console *sc) > W> comc_speed_set, env_nounset); > W> > W> comconsole.c_flags =3D 0; > W> - if (comc_setup()) > W> + if (comc_setup()) { > W> sc->c_flags =3D C_PRESENTIN | C_PRESENTOUT; > W> + efi_comconsole_avail =3D true; > W> + } else { > W> + /* disable being seen as "comconsole" */ > W> + comconsole.c_name =3D "efiserialio"; > W> + } > W> } > W> > W> static int > W> @@ -489,6 +514,7 @@ comc_setup(void) > W> { > W> EFI_STATUS status; > W> UINT32 control; > W> + char *ev; > W> > W> /* port is not usable */ > W> if (comc_port->sio =3D=3D NULL) > W> @@ -498,10 +524,17 @@ comc_setup(void) > W> if (EFI_ERROR(status)) > W> return (false); > W> > W> - status =3D comc_port->sio->SetAttributes(comc_port->sio, > W> - comc_port->baudrate, comc_port->receivefifodepth, > W> - comc_port->timeout, comc_port->parity, > W> - comc_port->databits, comc_port->stopbits); > W> + ev =3D getenv("smbios.bios.version"); > W> + if (ev !=3D NULL && strncmp(ev, "Hyper-V", 7) =3D=3D 0) { > W> + status =3D comc_port->sio->SetAttributes(comc_port->sio, > W> + 0, 0, 0, DefaultParity, 0, DefaultStopBits); > W> + } else { > W> + status =3D comc_port->sio->SetAttributes(comc_port->sio, > W> + comc_port->baudrate, comc_port->receivefifodepth, > W> + comc_port->timeout, comc_port->parity, > W> + comc_port->databits, comc_port->stopbits); > W> + } > W> + > W> if (EFI_ERROR(status)) > W> return (false); > W> > W> diff --git a/stand/i386/libi386/comconsole.c > b/stand/i386/libi386/comconsole.c > W> index ed1f1aa08ed7..3fbb6a292c19 100644 > W> --- a/stand/i386/libi386/comconsole.c > W> +++ b/stand/i386/libi386/comconsole.c > W> @@ -85,6 +85,20 @@ comc_probe(struct console *cp) > W> int speed, port; > W> uint32_t locator; > W> > W> +#if defined(__amd64__) > W> + extern bool efi_comconsole_avail; > W> + > W> + if (efi_comconsole_avail) { > W> + /* > W> + * If EFI provides serial I/O, then don't use this legacy > W> + * com driver to avoid conflicts with the firmware's > driver. > W> + * Change c_name so that it cannot be found in the lookup= . > W> + */ > W> + comconsole.c_name =3D "xcomconsole"; > W> + return; > W> + } > W> +#endif > W> + > W> if (comc_curspeed =3D=3D 0) { > W> comc_curspeed =3D COMSPEED; > W> /* > > -- > Gleb Smirnoff > --00000000000064441305f8269db7 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Let's back it out. I didn't get a chance to review= it and the duplicated name strikes me as massively unwise.
Of course, = the efi serial driver never should have had the name comconsole in the firs= t place, imho. It was OK
on arm where we couldn't conflict.

So let's back it out and talk about how we shou= ld do this, including the need to possibly just rename the efi
ve= rsion of the console driver to something else. IMHO, it never should have b= een comconsole in the first
place because it's configured dif= ferently than comconsole....

Warner

On Thu, Mar 30, 2023 at 5:31=E2=80=AFPM Gleb Smirnoff <glebius@freebsd.org> wrote:
=C2=A0 Wei, Kyle,

this commit hangs loader on real hardware, at least on some
of it.=C2=A0 The loader prints list of consoles and hangs hard:

[Thu Mar 30 20:46:12 2023]^M|^HLoading /boot/loader.conf^M
^M/^Hconsole vidconsole is invalid!^M
^MAvailable consoles:^M
^M=C2=A0 =C2=A0 efi^M
^M=C2=A0 =C2=A0 comconsole^M
^M=C2=A0 =C2=A0 comconsole^M
^M=C2=A0 =C2=A0 nullconsole^M
^M=C2=A0 =C2=A0 spinconsole^M

Machine is unrecoverable unless you got alternate boot media
and access to BMC console.

First, please DO NOT MFC this as scheduled. Second, let's try
to fix it or back it out if we hear from any other CURRENT
user.

Our configuration isn't special. This is what we got in
loader.conf, related to consoles:

console=3D"comconsole vidconsole efi"
comconsole_speed=3D115200
comconsole_port=3D0x3e8
console=3D"efi"
hw.uart.console=3D"io:1016,br:115200"

On Sat, Mar 18, 2023 at 07:20:33AM +0000, Wei Hu wrote:
W> The branch main has been updated by whu:
W>
W> URL: https:/= /cgit.FreeBSD.org/src/commit/?id=3D927358dd98cb902160093e0dc0bac002d6b43858=
W>
W> commit 927358dd98cb902160093e0dc0bac002d6b43858
W> Author:=C2=A0 =C2=A0 =C2=A0Wei Hu <whu@FreeBSD.org>
W> AuthorDate: 2023-03-14 15:13:46 +0000
W> Commit:=C2=A0 =C2=A0 =C2=A0Wei Hu <whu@FreeBSD.org>
W> CommitDate: 2023-03-18 07:07:35 +0000
W>
W>=C2=A0 =C2=A0 =C2=A0amd64 loader: Use efiserialio for Hyper-V booted s= ystems
W>=C2=A0 =C2=A0 =C2=A0
W>=C2=A0 =C2=A0 =C2=A0UEFI provides ConIn/ConOut handles for consoles th= at it supports,
W>=C2=A0 =C2=A0 =C2=A0which include the text-video and serial ports. Whe= n the serial port
W>=C2=A0 =C2=A0 =C2=A0is available, use the UEFI driver instead of direc= t io-port accesses
W>=C2=A0 =C2=A0 =C2=A0to avoid conflicts between the firmware and direct= hardware access, as
W>=C2=A0 =C2=A0 =C2=A0happens on Hyper-V (Azure) setups.
W>=C2=A0 =C2=A0 =C2=A0
W>=C2=A0 =C2=A0 =C2=A0This change enables efiserialio to be built for ef= i-amd64 and has
W>=C2=A0 =C2=A0 =C2=A0higher order priority vs comconsole, and only uses= efiserialio
W>=C2=A0 =C2=A0 =C2=A0if the hypervisor is Hyper-V. When efiserialio suc= cessfully
W>=C2=A0 =C2=A0 =C2=A0probes, it will set efi_comconsole_avail=3Dtrue wh= ich will prevent
W>=C2=A0 =C2=A0 =C2=A0comconsole from probing in this setup.
W>=C2=A0 =C2=A0 =C2=A0
W>=C2=A0 =C2=A0 =C2=A0Tested on Hyper-V, ESXi and Azure VMs.
W>=C2=A0 =C2=A0 =C2=A0
W>=C2=A0 =C2=A0 =C2=A0PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0264267
W>=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 kevans, whu
W>=C2=A0 =C2=A0 =C2=A0Tested by:=C2=A0 =C2=A0 =C2=A0 whu
W>=C2=A0 =C2=A0 =C2=A0Obtained from:=C2=A0 Rubicon Communications, LLC (= Netgate)
W>=C2=A0 =C2=A0 =C2=A0MFC after:=C2=A0 =C2=A0 =C2=A0 2 weeks
W>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0Rubicon Communications, = LLC (Netgate)
W> ---
W>=C2=A0 stand/efi/loader/arch/amd64/Makefile.inc |=C2=A0 1 +
W>=C2=A0 stand/efi/loader/bootinfo.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | 11 ++++++--
W>=C2=A0 stand/efi/loader/conf.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 6 +++++
W>=C2=A0 stand/efi/loader/efiserialio.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0| 43 ++++++++++++++++++++++++++++----
W>=C2=A0 stand/i386/libi386/comconsole.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 | 14 +++++++++++
W>=C2=A0 5 files changed, 68 insertions(+), 7 deletions(-)
W>
W> diff --git a/stand/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loa= der/arch/amd64/Makefile.inc
W> index 0d9e2648cb59..bd89044bd6c7 100644
W> --- a/stand/efi/loader/arch/amd64/Makefile.inc
W> +++ b/stand/efi/loader/arch/amd64/Makefile.inc
W> @@ -5,6 +5,7 @@ SRCS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0amd64_tramp.S \ W>=C2=A0 =C2=A0 =C2=A0 elf64_freebsd.c \
W>=C2=A0 =C2=A0 =C2=A0 trap.c \
W>=C2=A0 =C2=A0 =C2=A0 multiboot2.c \
W> +=C2=A0 =C2=A0 efiserialio.c \
W>=C2=A0 =C2=A0 =C2=A0 exc.S
W>=C2=A0
W>=C2=A0 .PATH:=C2=A0 =C2=A0 =C2=A0 ${BOOTSRC}/i386/libi386
W> diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.= c
W> index 939f2cf4c3fe..d79f59343af1 100644
W> --- a/stand/efi/loader/bootinfo.c
W> +++ b/stand/efi/loader/bootinfo.c
W> @@ -119,10 +119,17 @@ bi_getboothowto(char *kargs)
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 if (tmp !=3D NULL)
W>=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 speed =3D strtol(tmp, NULL, 0);
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 tmp =3D getenv("efi_com_port");
W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 if (tmp =3D=3D NULL)
W> -=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 tmp =3D getenv("comconsole_port")= ;
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 if (tmp !=3D NULL)
W>=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 port =3D strtol(tmp, NULL, 0);
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 if (port <=3D 0) {
W> +=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 tmp =3D getenv("comconsole_port")= ;
W> +=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 if (tmp !=3D NULL)
W> +=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 =C2=A0 port =3D strtol= (tmp, NULL, 0);
W> +=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 else {
W> +=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 =C2=A0 if (port =3D=3D= 0)
W> +=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 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 port =3D 0x3f8;
W> +=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 }
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 }
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 if (speed !=3D -1 && port !=3D -1) {
W>=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 snprintf(buf, sizeof(buf), "io:%d,b= r:%d", port,
W>=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 speed);
W> diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c
W> index 863c9188c72c..051e1a3381d1 100644
W> --- a/stand/efi/loader/conf.c
W> +++ b/stand/efi/loader/conf.c
W> @@ -81,6 +81,9 @@ struct netif_driver *netif_drivers[] =3D {
W>=C2=A0
W>=C2=A0 extern struct console efi_console;
W>=C2=A0 extern struct console comconsole;
W> +#if defined(__amd64__)
W> +extern struct console eficomconsole;
W> +#endif
W>=C2=A0 #if defined(__amd64__) || defined(__i386__)
W>=C2=A0 extern struct console nullconsole;
W>=C2=A0 extern struct console spinconsole;
W> @@ -88,6 +91,9 @@ extern struct console spinconsole;
W>=C2=A0
W>=C2=A0 struct console *consoles[] =3D {
W>=C2=A0 =C2=A0 =C2=A0 &efi_console,
W> +#if defined(__amd64__)
W> +=C2=A0 =C2=A0 &eficomconsole,
W> +#endif
W>=C2=A0 =C2=A0 =C2=A0 &comconsole,
W>=C2=A0 #if defined(__amd64__) || defined(__i386__)
W>=C2=A0 =C2=A0 =C2=A0 &nullconsole,
W> diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/loader/efiser= ialio.c
W> index 375e679d2590..5fbc700f6ac2 100644
W> --- a/stand/efi/loader/efiserialio.c
W> +++ b/stand/efi/loader/efiserialio.c
W> @@ -69,6 +69,11 @@ static int=C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_speed_s= et(struct env_var *, int, const void *);
W>=C2=A0
W>=C2=A0 static struct serial=C2=A0 =C2=A0 =C2=A0 =C2=A0 *comc_port;
W>=C2=A0 extern struct console efi_console;
W> +bool efi_comconsole_avail =3D false;
W> +
W> +#if defined(__amd64__)
W> +#define comconsole eficomconsole
W> +#endif
W>=C2=A0
W>=C2=A0 struct console comconsole =3D {
W>=C2=A0 =C2=A0 =C2=A0 .c_name =3D "comconsole",
W> @@ -254,11 +259,22 @@ comc_probe(struct console *sc)
W>=C2=A0 =C2=A0 =C2=A0 char *env, *buf, *ep;
W>=C2=A0 =C2=A0 =C2=A0 size_t sz;
W>=C2=A0
W> +#if defined(__amd64__)
W> +=C2=A0 =C2=A0 /*
W> +=C2=A0 =C2=A0 =C2=A0* For x86-64, don't use this driver if not r= unning in Hyper-V.
W> +=C2=A0 =C2=A0 =C2=A0*/
W> +=C2=A0 =C2=A0 env =3D getenv("smbios.bios.version");
W> +=C2=A0 =C2=A0 if (env =3D=3D NULL || strncmp(env, "Hyper-V"= ;, 7) !=3D 0) {
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return;
W> +=C2=A0 =C2=A0 }
W> +#endif
W> +
W>=C2=A0 =C2=A0 =C2=A0 if (comc_port =3D=3D NULL) {
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port =3D calloc(= 1, sizeof (struct serial));
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (comc_port =3D=3D = NULL)
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 return;
W>=C2=A0 =C2=A0 =C2=A0 }
W> +
W>=C2=A0 =C2=A0 =C2=A0 /* Use defaults from firmware */
W>=C2=A0 =C2=A0 =C2=A0 comc_port->databits =3D 8;
W>=C2=A0 =C2=A0 =C2=A0 comc_port->parity =3D DefaultParity;
W> @@ -308,6 +324,10 @@ comc_probe(struct console *sc)
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port_set, env_nounset);
W>=C2=A0
W>=C2=A0 =C2=A0 =C2=A0 env =3D getenv("efi_com_speed");
W> +=C2=A0 =C2=A0 if (env =3D=3D NULL)
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* fallback to comconsole = setting */
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 env =3D getenv("comco= nsole_speed");
W> +
W>=C2=A0 =C2=A0 =C2=A0 if (comc_parse_intval(env, &val) =3D=3D CMD_O= K)
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port->baudrat= e =3D val;
W>=C2=A0
W> @@ -318,8 +338,13 @@ comc_probe(struct console *sc)
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_speed_set, env_nounset);
W>=C2=A0
W>=C2=A0 =C2=A0 =C2=A0 comconsole.c_flags =3D 0;
W> -=C2=A0 =C2=A0 if (comc_setup())
W> +=C2=A0 =C2=A0 if (comc_setup()) {
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 sc->c_flags =3D C_= PRESENTIN | C_PRESENTOUT;
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 efi_comconsole_avail =3D t= rue;
W> +=C2=A0 =C2=A0 } else {
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* disable being seen as &= quot;comconsole" */
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comconsole.c_name =3D &quo= t;efiserialio";
W> +=C2=A0 =C2=A0 }
W>=C2=A0 }
W>=C2=A0
W>=C2=A0 static int
W> @@ -489,6 +514,7 @@ comc_setup(void)
W>=C2=A0 {
W>=C2=A0 =C2=A0 =C2=A0 EFI_STATUS status;
W>=C2=A0 =C2=A0 =C2=A0 UINT32 control;
W> +=C2=A0 =C2=A0 char *ev;
W>=C2=A0
W>=C2=A0 =C2=A0 =C2=A0 /* port is not usable */
W>=C2=A0 =C2=A0 =C2=A0 if (comc_port->sio =3D=3D NULL)
W> @@ -498,10 +524,17 @@ comc_setup(void)
W>=C2=A0 =C2=A0 =C2=A0 if (EFI_ERROR(status))
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (false);
W>=C2=A0
W> -=C2=A0 =C2=A0 status =3D comc_port->sio->SetAttributes(comc_po= rt->sio,
W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port->baudrate, comc_port->re= ceivefifodepth,
W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port->timeout, comc_port->par= ity,
W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port->databits, comc_port->st= opbits);
W> +=C2=A0 =C2=A0 ev =3D getenv("smbios.bios.version");
W> +=C2=A0 =C2=A0 if (ev !=3D NULL && strncmp(ev, "Hyper-V&= quot;, 7) =3D=3D 0) {
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 status =3D comc_port->s= io->SetAttributes(comc_port->sio,
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 0, 0, 0, Def= aultParity, 0, DefaultStopBits);
W> +=C2=A0 =C2=A0 } else {
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 status =3D comc_port->s= io->SetAttributes(comc_port->sio,
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port-&g= t;baudrate, comc_port->receivefifodepth,
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port-&g= t;timeout, comc_port->parity,
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port-&g= t;databits, comc_port->stopbits);
W> +=C2=A0 =C2=A0 }
W> +
W>=C2=A0 =C2=A0 =C2=A0 if (EFI_ERROR(status))
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (false);
W>=C2=A0
W> diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/com= console.c
W> index ed1f1aa08ed7..3fbb6a292c19 100644
W> --- a/stand/i386/libi386/comconsole.c
W> +++ b/stand/i386/libi386/comconsole.c
W> @@ -85,6 +85,20 @@ comc_probe(struct console *cp)
W>=C2=A0 =C2=A0 =C2=A0 int speed, port;
W>=C2=A0 =C2=A0 =C2=A0 uint32_t locator;
W>=C2=A0
W> +#if defined(__amd64__)
W> +=C2=A0 =C2=A0 extern bool efi_comconsole_avail;
W> +
W> +=C2=A0 =C2=A0 if (efi_comconsole_avail) {
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /*
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* If EFI provides se= rial I/O, then don't use this legacy
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* com driver to avoi= d conflicts with the firmware's driver.
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* Change c_name so t= hat it cannot be found in the lookup.
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*/
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comconsole.c_name =3D &quo= t;xcomconsole";
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return;
W> +=C2=A0 =C2=A0 }
W> +#endif
W> +
W>=C2=A0 =C2=A0 =C2=A0 if (comc_curspeed =3D=3D 0) {
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_curspeed =3D COM= SPEED;
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /*

--
Gleb Smirnoff
--00000000000064441305f8269db7-- From nobody Thu Mar 30 23:45: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 4Png5l21qrz42Xmc; Thu, 30 Mar 2023 23:45:31 +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 4Png5k6bLJz4Khp; Thu, 30 Mar 2023 23:45:30 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219930; 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=MFmHFjoPKzIMuLMSwK8jzfTrHjhzjM8nW3QYxyMO9v8=; b=KE+fhFxEezaGRtZFKaRt/kvk9RSATNMGX6wsLo9v6gFriaGnoW6I3sgjZUsr7i4X4mHAMB Ln2EzAAZ4NuBFwJO/s/Ilt7jDi9kNck7KKP4Xrw6jtQK6kI79hM44ObNMCYBVMHkG2wotJ qys7GR/Qz7hTfRq5hwjcA128f6shNK8K9N+Y+xNbfuXjHU6L3aw2OAYJe2cOXTm8gr0DrQ liXEgirra/kwIC4VVGYVVFAnoaK3MMgkdfdtRVZMIrXtJEwUOWgD8DYwhNilmxpq7XjzXy /RRbDyiGxlO/It1S0j4vz2PF2moxnZFpMpTG/WP0K/tpcOMMui0hY51eHJKt5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680219930; 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=MFmHFjoPKzIMuLMSwK8jzfTrHjhzjM8nW3QYxyMO9v8=; b=htTXNCnP7RMApFiWEMk7gC2JqCOaU6yKrAudSQv0HOJjKVRbE2VxrbDurv2ioD18YlC1X3 cTPH1WAxnPJCcj1/npaNejgRgB+3b9ZjSJZfgWEhOpRByhahvOjPI0E6EsaM6P6RfDZMNj 0+5tO+VzzmvkdL3iCB7k/oyCLC/ar3cPkCx1Je60PKI762HFzwU7PaAAiw+VotNgdMu9pk P4TNIY0XwK5JNcNRMckdcbvyEruzwwFLPekTtEdvy4Jz2GmpnNOpdXxvpYKKrdAg/EeydK OGEk9RqBHQp/bKwrUMYO5pFEs96sFv2cxygXyRMH07OzeTCiSq5uW1gMZHxwIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680219930; a=rsa-sha256; cv=none; b=RBqzIZbM8etzFWVPHElYHCfcZ3PCOlpX/NiOfLa7fHipLxkafDamp63ztYL+qQQq2aslNK ZRnsMVAgiPCiGGCHOs5Ffw5zq1Ne1QH5csXrl5AizQVLsMr772y3RU05/rVF5a5kOaGhR5 eH06lNZ2nZco5MOETdItdgZH3yqLz61jg2q6B/KuZ48yFGK6e4kzqBI1Smzok5F9U2FDrq mxq9F1V+bpa58zgkGe6G7RWDnVjxrdfrFP+MecqyCDqs5Ap6JuLvPfOtiU5gznQiCkLgO7 7Q9rP5J1bilqrqRLE10lWT4UxY0oJG4bVNn9nrPQMbc3FQLA/goUORh2mKfq3Q== Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) (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)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Png5k5WwSzmwP; Thu, 30 Mar 2023 23:45:30 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f171.google.com with SMTP id a5so20189680qto.6; Thu, 30 Mar 2023 16:45:30 -0700 (PDT) X-Gm-Message-State: AAQBX9d+FyQmf9RLSWTLHBZI4H0buX3kN+0Z0xuWZe8fG+W2gDusdk5D PvcbC087QJt1EUuhcUZajKeBP5Iw54C9hZh/mkw= X-Google-Smtp-Source: AKy350aUB6x6AsyuongUGbPpszXXrTneWaTVO4UzgSA+yTSKQ35p/XdY+TGFxVl5HP8pzinTWa3wKOQFoJTD1FySA4w= X-Received: by 2002:ac8:59c8:0:b0:3e4:de7a:d532 with SMTP id f8-20020ac859c8000000b003e4de7ad532mr7756042qtf.13.1680219930180; Thu, 30 Mar 2023 16:45:30 -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: <202303180720.32I7KXOc030612@gitrepo.freebsd.org> In-Reply-To: From: Kyle Evans Date: Thu, 30 Mar 2023 18:45:19 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 927358dd98cb - main - amd64 loader: Use efiserialio for Hyper-V booted systems To: Warner Losh Cc: Gleb Smirnoff , Wei Hu , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, imp@freebsd.org, gallatin@freebsd.org, kevans@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N On Thu, Mar 30, 2023 at 6:40=E2=80=AFPM Warner Losh wrote: > > Let's back it out. I didn't get a chance to review it and the duplicated = name strikes me as massively unwise. > Of course, the efi serial driver never should have had the name comconsol= e in the first place, imho. It was OK > on arm where we couldn't conflict. > > So let's back it out and talk about how we should do this, including the = need to possibly just rename the efi > version of the console driver to something else. IMHO, it never should ha= ve been comconsole in the first > place because it's configured differently than comconsole.... > Sure, no objection. > Warner > > On Thu, Mar 30, 2023 at 5:31=E2=80=AFPM Gleb Smirnoff wrote: >> >> Wei, Kyle, >> >> this commit hangs loader on real hardware, at least on some >> of it. The loader prints list of consoles and hangs hard: >> >> [Thu Mar 30 20:46:12 2023]^M|^HLoading /boot/loader.conf^M >> ^M/^Hconsole vidconsole is invalid!^M >> ^MAvailable consoles:^M >> ^M efi^M >> ^M comconsole^M >> ^M comconsole^M >> ^M nullconsole^M >> ^M spinconsole^M >> >> Machine is unrecoverable unless you got alternate boot media >> and access to BMC console. >> >> First, please DO NOT MFC this as scheduled. Second, let's try >> to fix it or back it out if we hear from any other CURRENT >> user. >> >> Our configuration isn't special. This is what we got in >> loader.conf, related to consoles: >> >> console=3D"comconsole vidconsole efi" >> comconsole_speed=3D115200 >> comconsole_port=3D0x3e8 >> console=3D"efi" >> hw.uart.console=3D"io:1016,br:115200" >> >> On Sat, Mar 18, 2023 at 07:20:33AM +0000, Wei Hu wrote: >> W> The branch main has been updated by whu: >> W> >> W> URL: https://cgit.FreeBSD.org/src/commit/?id=3D927358dd98cb902160093e= 0dc0bac002d6b43858 >> W> >> W> commit 927358dd98cb902160093e0dc0bac002d6b43858 >> W> Author: Wei Hu >> W> AuthorDate: 2023-03-14 15:13:46 +0000 >> W> Commit: Wei Hu >> W> CommitDate: 2023-03-18 07:07:35 +0000 >> W> >> W> amd64 loader: Use efiserialio for Hyper-V booted systems >> W> >> W> UEFI provides ConIn/ConOut handles for consoles that it supports, >> W> which include the text-video and serial ports. When the serial po= rt >> W> is available, use the UEFI driver instead of direct io-port acces= ses >> W> to avoid conflicts between the firmware and direct hardware acces= s, as >> W> happens on Hyper-V (Azure) setups. >> W> >> W> This change enables efiserialio to be built for efi-amd64 and has >> W> higher order priority vs comconsole, and only uses efiserialio >> W> if the hypervisor is Hyper-V. When efiserialio successfully >> W> probes, it will set efi_comconsole_avail=3Dtrue which will preven= t >> W> comconsole from probing in this setup. >> W> >> W> Tested on Hyper-V, ESXi and Azure VMs. >> W> >> W> PR: 264267 >> W> Reviewed by: kevans, whu >> W> Tested by: whu >> W> Obtained from: Rubicon Communications, LLC (Netgate) >> W> MFC after: 2 weeks >> W> Sponsored by: Rubicon Communications, LLC (Netgate) >> W> --- >> W> stand/efi/loader/arch/amd64/Makefile.inc | 1 + >> W> stand/efi/loader/bootinfo.c | 11 ++++++-- >> W> stand/efi/loader/conf.c | 6 +++++ >> W> stand/efi/loader/efiserialio.c | 43 ++++++++++++++++++++++= ++++++---- >> W> stand/i386/libi386/comconsole.c | 14 +++++++++++ >> W> 5 files changed, 68 insertions(+), 7 deletions(-) >> W> >> W> diff --git a/stand/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loa= der/arch/amd64/Makefile.inc >> W> index 0d9e2648cb59..bd89044bd6c7 100644 >> W> --- a/stand/efi/loader/arch/amd64/Makefile.inc >> W> +++ b/stand/efi/loader/arch/amd64/Makefile.inc >> W> @@ -5,6 +5,7 @@ SRCS+=3D amd64_tramp.S \ >> W> elf64_freebsd.c \ >> W> trap.c \ >> W> multiboot2.c \ >> W> + efiserialio.c \ >> W> exc.S >> W> >> W> .PATH: ${BOOTSRC}/i386/libi386 >> W> diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.= c >> W> index 939f2cf4c3fe..d79f59343af1 100644 >> W> --- a/stand/efi/loader/bootinfo.c >> W> +++ b/stand/efi/loader/bootinfo.c >> W> @@ -119,10 +119,17 @@ bi_getboothowto(char *kargs) >> W> if (tmp !=3D NULL) >> W> speed =3D strtol(tmp, NULL, 0); >> W> tmp =3D getenv("efi_com_port"); >> W> - if (tmp =3D=3D NULL) >> W> - tmp =3D getenv("comconsole_port"); >> W> if (tmp !=3D NULL) >> W> port =3D strtol(tmp, NULL, 0); >> W> + if (port <=3D 0) { >> W> + tmp =3D getenv("comconsole_port"); >> W> + if (tmp !=3D NULL) >> W> + port =3D strtol(tmp, NULL, 0); >> W> + else { >> W> + if (port =3D=3D 0) >> W> + port =3D 0x3f8; >> W> + } >> W> + } >> W> if (speed !=3D -1 && port !=3D -1) { >> W> snprintf(buf, sizeof(buf), "io:%d,br:%d"= , port, >> W> speed); >> W> diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c >> W> index 863c9188c72c..051e1a3381d1 100644 >> W> --- a/stand/efi/loader/conf.c >> W> +++ b/stand/efi/loader/conf.c >> W> @@ -81,6 +81,9 @@ struct netif_driver *netif_drivers[] =3D { >> W> >> W> extern struct console efi_console; >> W> extern struct console comconsole; >> W> +#if defined(__amd64__) >> W> +extern struct console eficomconsole; >> W> +#endif >> W> #if defined(__amd64__) || defined(__i386__) >> W> extern struct console nullconsole; >> W> extern struct console spinconsole; >> W> @@ -88,6 +91,9 @@ extern struct console spinconsole; >> W> >> W> struct console *consoles[] =3D { >> W> &efi_console, >> W> +#if defined(__amd64__) >> W> + &eficomconsole, >> W> +#endif >> W> &comconsole, >> W> #if defined(__amd64__) || defined(__i386__) >> W> &nullconsole, >> W> diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/loader/efiser= ialio.c >> W> index 375e679d2590..5fbc700f6ac2 100644 >> W> --- a/stand/efi/loader/efiserialio.c >> W> +++ b/stand/efi/loader/efiserialio.c >> W> @@ -69,6 +69,11 @@ static int comc_speed_set(struct env_var *,= int, const void *); >> W> >> W> static struct serial *comc_port; >> W> extern struct console efi_console; >> W> +bool efi_comconsole_avail =3D false; >> W> + >> W> +#if defined(__amd64__) >> W> +#define comconsole eficomconsole >> W> +#endif >> W> >> W> struct console comconsole =3D { >> W> .c_name =3D "comconsole", >> W> @@ -254,11 +259,22 @@ comc_probe(struct console *sc) >> W> char *env, *buf, *ep; >> W> size_t sz; >> W> >> W> +#if defined(__amd64__) >> W> + /* >> W> + * For x86-64, don't use this driver if not running in Hyper-V. >> W> + */ >> W> + env =3D getenv("smbios.bios.version"); >> W> + if (env =3D=3D NULL || strncmp(env, "Hyper-V", 7) !=3D 0) { >> W> + return; >> W> + } >> W> +#endif >> W> + >> W> if (comc_port =3D=3D NULL) { >> W> comc_port =3D calloc(1, sizeof (struct serial)); >> W> if (comc_port =3D=3D NULL) >> W> return; >> W> } >> W> + >> W> /* Use defaults from firmware */ >> W> comc_port->databits =3D 8; >> W> comc_port->parity =3D DefaultParity; >> W> @@ -308,6 +324,10 @@ comc_probe(struct console *sc) >> W> comc_port_set, env_nounset); >> W> >> W> env =3D getenv("efi_com_speed"); >> W> + if (env =3D=3D NULL) >> W> + /* fallback to comconsole setting */ >> W> + env =3D getenv("comconsole_speed"); >> W> + >> W> if (comc_parse_intval(env, &val) =3D=3D CMD_OK) >> W> comc_port->baudrate =3D val; >> W> >> W> @@ -318,8 +338,13 @@ comc_probe(struct console *sc) >> W> comc_speed_set, env_nounset); >> W> >> W> comconsole.c_flags =3D 0; >> W> - if (comc_setup()) >> W> + if (comc_setup()) { >> W> sc->c_flags =3D C_PRESENTIN | C_PRESENTOUT; >> W> + efi_comconsole_avail =3D true; >> W> + } else { >> W> + /* disable being seen as "comconsole" */ >> W> + comconsole.c_name =3D "efiserialio"; >> W> + } >> W> } >> W> >> W> static int >> W> @@ -489,6 +514,7 @@ comc_setup(void) >> W> { >> W> EFI_STATUS status; >> W> UINT32 control; >> W> + char *ev; >> W> >> W> /* port is not usable */ >> W> if (comc_port->sio =3D=3D NULL) >> W> @@ -498,10 +524,17 @@ comc_setup(void) >> W> if (EFI_ERROR(status)) >> W> return (false); >> W> >> W> - status =3D comc_port->sio->SetAttributes(comc_port->sio, >> W> - comc_port->baudrate, comc_port->receivefifodepth, >> W> - comc_port->timeout, comc_port->parity, >> W> - comc_port->databits, comc_port->stopbits); >> W> + ev =3D getenv("smbios.bios.version"); >> W> + if (ev !=3D NULL && strncmp(ev, "Hyper-V", 7) =3D=3D 0) { >> W> + status =3D comc_port->sio->SetAttributes(comc_port->sio, >> W> + 0, 0, 0, DefaultParity, 0, DefaultStopBits); >> W> + } else { >> W> + status =3D comc_port->sio->SetAttributes(comc_port->sio, >> W> + comc_port->baudrate, comc_port->receivefifodepth, >> W> + comc_port->timeout, comc_port->parity, >> W> + comc_port->databits, comc_port->stopbits); >> W> + } >> W> + >> W> if (EFI_ERROR(status)) >> W> return (false); >> W> >> W> diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/com= console.c >> W> index ed1f1aa08ed7..3fbb6a292c19 100644 >> W> --- a/stand/i386/libi386/comconsole.c >> W> +++ b/stand/i386/libi386/comconsole.c >> W> @@ -85,6 +85,20 @@ comc_probe(struct console *cp) >> W> int speed, port; >> W> uint32_t locator; >> W> >> W> +#if defined(__amd64__) >> W> + extern bool efi_comconsole_avail; >> W> + >> W> + if (efi_comconsole_avail) { >> W> + /* >> W> + * If EFI provides serial I/O, then don't use this legac= y >> W> + * com driver to avoid conflicts with the firmware's dri= ver. >> W> + * Change c_name so that it cannot be found in the looku= p. >> W> + */ >> W> + comconsole.c_name =3D "xcomconsole"; >> W> + return; >> W> + } >> W> +#endif >> W> + >> W> if (comc_curspeed =3D=3D 0) { >> W> comc_curspeed =3D COMSPEED; >> W> /* >> >> -- >> Gleb Smirnoff From nobody Thu Mar 30 23: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 4PngM50QT4z42Y2b; Thu, 30 Mar 2023 23:57:05 +0000 (UTC) (envelope-from kp@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 4PngM470xvz4LVf; Thu, 30 Mar 2023 23:57:04 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680220625; 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=cbpnmijc13wMCFh4J4kVgHCkI0G+X7Ngp/rSH/4sTTU=; b=cecWMYVH09prfYMHQ8B7vfYrzGDZJrJlSyyXA6Efe2vhtoI6/5mMtdzRPXYZCY0p7BNpwP uWNHfXRKNu4Ofi8YeDBQ1qFgsWlCw4AvOXP7yWVUS0aYSw5Bb9A2JeRmnRgyUr+0oZssAh bB1tfafSFBrOch8rFjJ4YROr85dMBMiUgz8vBFD6g0EJoW88jRpx+uBF7FW1+eiz7OXcET wyoUL6rH65UYSo7BPJHxs1JByrh0LaYwGGP9QvAZiyOlx6gGWpZgjaEoLLsc/B99N4kTQS Y365NHEJK/CZU545yGvLvlpZAqEuCFjc1w+PDQXEphBEfB+DpCt1ntBclnvRYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680220625; 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=cbpnmijc13wMCFh4J4kVgHCkI0G+X7Ngp/rSH/4sTTU=; b=uOntCk64gVN8OULRQHDID7gWMtw+e5TjNN9zaC60lYBZP5WWNDElnT+8SPN9lfmOWaKoEs ubEZZiie19BiXSTGz4Eaa6ptvfSU910Hh4p3Hjaj1VSbB7D7ODF6R4hVz2Gy1ubdgW6wzG BbUn4UFViQV2oFO3VvGTFrAwszr0MdSI6dQzYSjdqeFZ/+jqRmD63pJiQ7UP7oAZPpg9x8 5ywYuHnOSTC6NmO+XJl37oPThE686hm6UYFcW8iggA94p5v/xRXk/W1fiI/qlhrG2HubhS FyB/gkSTbppWzIdNivZb2g1HbZxTCox8+aMaqDcOyJiLq2MN/tjzG1AtZLnvdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680220625; a=rsa-sha256; cv=none; b=pFm8PScJ4P+qtBBHMUNHbXFJFCxWGGom4Os9Jhr3cfqejx/JaZP+l4s8NbfJ+F4dqhj2ov YF3NWTe8uJfuisRNer+fZswsL160xpYfrBiyNe2tDAt8eNDCqMGmc9XEcL7Kdc4gVMQvSm f9X3Wlx9OudCTXzS99Jgz/OMqeUbaeczkTYvN/Chc5jiibMnnQhbCzAsnn01j4M8z4ryGn jQEX/PpKaaTqNn1Z4PnduKJuadv6rsLbG+70S2Ne6iIKLjm0EjRXRl6j51xNJ6u/3NSnYx sTOW0ttjUCCLLyjz97kuJQNwitG3jRVhZ4BYITD4jN/Su6tQtQUpm2nO0d091A== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher 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 "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PngM45LRMznBy; Thu, 30 Mar 2023 23:57:04 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 916B7C5F4; Fri, 31 Mar 2023 01:57:01 +0200 (CEST) From: Kristof Provost To: Mark Johnston Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b60600ceeb68 - main - pf tests: Serialize Date: Fri, 31 Mar 2023 08:56:56 +0900 X-Mailer: MailMate (1.14r5937) Message-ID: <3A26AB82-357F-421F-853E-07320387ACBE@FreeBSD.org> In-Reply-To: <202303302336.32UNatba067594@gitrepo.freebsd.org> References: <202303302336.32UNatba067594@gitrepo.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=UTF-8 Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N On 31 Mar 2023, at 8:36, Mark Johnston wrote: > The branch main has been updated by markj: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Db60600ceeb68d1001d612228= 30e0be3441ef0885 > > commit b60600ceeb68d1001d61222830e0be3441ef0885 > Author: Mark Johnston > AuthorDate: 2023-03-25 12:55:41 +0000 > Commit: Mark Johnston > CommitDate: 2023-03-30 23:35:59 +0000 > > pf tests: Serialize > > These tests reuse jail names and cannot run in parallel. Until thi= s is > fixed - which is desirable since these takes take a while to run - = tell > kyua to serialize them. > The tests also recycle IP ranges, so merely changing the jail names is in= sufficient. Realistically the easiest way to get these to run in parallel would be to= run each test in its own vnet so both overlapping IP ranges and name con= flicts don=E2=80=99t matter. Best regards, Kristof From nobody Fri Mar 31 00:05: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 4PngYR64zRz42ZBK; Fri, 31 Mar 2023 00:06:03 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-yw1-x112e.google.com (mail-yw1-x112e.google.com [IPv6:2607:f8b0:4864:20::112e]) (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 4PngYR3CNwz3F6Q; Fri, 31 Mar 2023 00:06:03 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yw1-x112e.google.com with SMTP id 00721157ae682-544f7c176easo385569307b3.9; Thu, 30 Mar 2023 17:06:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680221162; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=icJJxEJBQNygIwihlq+XiG1IFGlTXZcTzrAf4SPxpME=; b=oZwdkdasJqExgaleyUMoz/GLpHXxvK4Qop0o+g50HTDlMztR2mtZTRq6wv7xS7MiVm x4Vv02jBUOjwJQVKN2kq8qFeS2Bul0S9UWXskQ/QqV68RvAL+f0xZ+g9JbeG71vozeE7 T3RYOtAaWJ5lqKcIIe7je/NYqWt6AVGHiCwcFUB45qJEn4fIdtI9/hIuiRCR5aufoFPz 87K89WVotMvlrVOZs1Tt6gyorAK0JILXr9rVoZUKLXIACzryPOxahyIHlaMjh2xHAuF0 TXa3I7vJgOBQ730zorpw4IhxI0GUROU/BJtliCiFxoBronGRXp2B025SP1o5okYa1Kw6 AqGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680221162; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=icJJxEJBQNygIwihlq+XiG1IFGlTXZcTzrAf4SPxpME=; b=fSS+c1ccCtrFOTg3djArFs2WFtXMiFM+pEwffmDC3+jPp1NhL8e9XR4zZ5+5ZIiQ02 RdnVOCQE/LzKkwHcjoFLYjnHu0TNFm7OKY5imvXWkr54t1+58kgtYFESNKb6mSLZgLH4 zHB9O1q2E7/3jPw1TI/snrVYUaTfFKUlihVz/MEKjGKwU+PwUgiAQnG58TVWY9GIWPqk lQ2Za85NVv/vuqMPvPGzF30gvvSRRryu0m6pl1+zytb4Pw60aeWxFz/hKmtkoQSFgt3k mwjNNdUBv7HnoOWm1WRvMSuyOjFFt3gOjPMscLHKRVQyR8xAY7mZyoHH6F9u2+c8kjf3 iThA== X-Gm-Message-State: AAQBX9d5IWUz+AxxuXBLw/uem9UrRRm4k4UqfsR39x09IUF/WMyf8zAx hriUQ0jiaFb4IxPtFjDgyKdMsl4LNao= X-Google-Smtp-Source: AKy350YMvucRLyenkBEegUeSgG0fqLm6pZVlOBKdJHyEK3+YVrzd2x8zz7Qq/pJBG+fuYcM8lsCTcg== X-Received: by 2002:a81:fd12:0:b0:533:9fa7:bbe9 with SMTP id g18-20020a81fd12000000b005339fa7bbe9mr24975886ywn.8.1680221162037; Thu, 30 Mar 2023 17:06:02 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id 125-20020a810d83000000b00545a08184c9sm169090ywn.89.2023.03.30.17.06.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 17:06:01 -0700 (PDT) Date: Thu, 30 Mar 2023 20:05:59 -0400 From: Mark Johnston To: Kristof Provost Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b60600ceeb68 - main - pf tests: Serialize Message-ID: References: <202303302336.32UNatba067594@gitrepo.freebsd.org> <3A26AB82-357F-421F-853E-07320387ACBE@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=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <3A26AB82-357F-421F-853E-07320387ACBE@FreeBSD.org> X-Rspamd-Queue-Id: 4PngYR3CNwz3F6Q X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Fri, Mar 31, 2023 at 08:56:56AM +0900, Kristof Provost wrote: > On 31 Mar 2023, at 8:36, Mark Johnston wrote: > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=b60600ceeb68d1001d61222830e0be3441ef0885 > > > > commit b60600ceeb68d1001d61222830e0be3441ef0885 > > Author: Mark Johnston > > AuthorDate: 2023-03-25 12:55:41 +0000 > > Commit: Mark Johnston > > CommitDate: 2023-03-30 23:35:59 +0000 > > > > pf tests: Serialize > > > > These tests reuse jail names and cannot run in parallel. Until this is > > fixed - which is desirable since these takes take a while to run - tell > > kyua to serialize them. > > > > The tests also recycle IP ranges, so merely changing the jail names is insufficient. Could you please give an example? I looked at some of the tests but can only see cases where addresses are assigned within the vnet jail(s) created by the tests, in which case I'd expect no problems. > Realistically the easiest way to get these to run in parallel would be to run each test in its own vnet so both overlapping IP ranges and name conflicts don’t matter. Yeah, I was wondering whether it'd be possible to have kyua handle the creation and teardown of a per-test jail, if only to avoid having to go through all of the tests which use static jail names. Though at the moment I'm more focused on getting the test suite to run cleanly with parallelism enabled before I try to make it run faster. From nobody Fri Mar 31 00:15: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 4PngmQ46fwz42Zb4; Fri, 31 Mar 2023 00:15:34 +0000 (UTC) (envelope-from kp@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 4PngmQ3Lmtz3GqG; Fri, 31 Mar 2023 00:15:34 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680221734; 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=b85aFZWbnVPK7nmIx64kWKso7AJH+qDqaAckbJi17no=; b=tyOAonBk+eo0tNOWiNaVInyNh/s01c7JoCCOOOpjsvSg/b1oLz+203GjnNumIIzYkSjfOM QYkL5/fjqCEjyOAAu9l5YtIw9lLshKCdtmOgj14IdCav03AkFsheFh9Sgv+mIIXYeBmKAr fuzCv1R4mJEmGpALxFXWgLyELy5XXjNAQ0Ptpxk6dnYFgGZWTEhMQ70k826uJnxI8Wh45Z oZd3tcvLkf6rQkyxDurJpVJqjcyUNKsEyLhZ3WADAncP6d/IkOGqFHLbIKVfxEvpwq1Wjq W1jDu4sZPXqaxtTQ7fMOe9wvhF75K7M3tMgpi4swtU/IIrsxssUJqJLzvO2F0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680221734; 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=b85aFZWbnVPK7nmIx64kWKso7AJH+qDqaAckbJi17no=; b=yn5km3i/0c6kzYN03kmWlpchZEFPySrvI52PvX2t976jR2Hf5kWaPGOvZWanRPrXydfAU0 +CNzR1nvu0fJIDd2vrDOABHRnQEKUrIc4MSx++vLsFXXFtnnSlYpHJQW82pR3SPQG0k/qa i20WnOQLO8MZ8aykaDE7Mm7kLJF++Y8IpUAB5U9oJ84GQbJ5UON1VGLzeXz5wuIhREPIk4 qrfCdTlpRRWXbrgVW/0wlKP8Zt8atOOpoPyPgvyTi63GD8QvUYrBQ1V+KRAV3K1V4TdZzC USBGUNHX5UAv+NuSbNOUwXTwRnnp2ix+OaD/n4/I6R6W2bxhYgM3w+Gs8YQ2UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680221734; a=rsa-sha256; cv=none; b=woDmu/lx8TQUI5ed5YqXaoj5GSJVlPYnb7aMWzW+neFhToxqbWPhPNEL4ul+77amP1aaKn Kx+KEBSawRQeoQw1ZQsskrOvrjrFRXzs1EyDClCX+i7swFnW4l2Gv+cKw/CmtF5MhGpgaD UrYk3shjRib2upbBHdGAaFUl1DKLv5+9MdB+9Jm1SRQ/WixUvhvVFTdgpYxzfaN98laz8N bJaIbwaX7rkA6iQngZ05nqexeQst3zg/e0HVNCk9qUJYUbgAP+3kmOANJ2AEISJ2mT4PVO IbjGIpnA0IU+B7Bby7JCvc8GsrnX9ANsmdYjj8rqo1g/1c/Y1QJgYAWVbg9sHQ== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher 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 "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PngmQ1hs0znKc; Fri, 31 Mar 2023 00:15:34 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 636F0CD04; Fri, 31 Mar 2023 02:15:31 +0200 (CEST) From: Kristof Provost To: Mark Johnston Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b60600ceeb68 - main - pf tests: Serialize Date: Fri, 31 Mar 2023 09:15:27 +0900 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: References: <202303302336.32UNatba067594@gitrepo.freebsd.org> <3A26AB82-357F-421F-853E-07320387ACBE@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=UTF-8 Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N On 31 Mar 2023, at 9:05, Mark Johnston wrote: > On Fri, Mar 31, 2023 at 08:56:56AM +0900, Kristof Provost wrote: >> On 31 Mar 2023, at 8:36, Mark Johnston wrote: >>> The branch main has been updated by markj: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=3Db60600ceeb68d1001d6122= 2830e0be3441ef0885 >>> >>> commit b60600ceeb68d1001d61222830e0be3441ef0885 >>> Author: Mark Johnston >>> AuthorDate: 2023-03-25 12:55:41 +0000 >>> Commit: Mark Johnston >>> CommitDate: 2023-03-30 23:35:59 +0000 >>> >>> pf tests: Serialize >>> >>> These tests reuse jail names and cannot run in parallel. Until t= his is >>> fixed - which is desirable since these takes take a while to run = - tell >>> kyua to serialize them. >>> >> >> The tests also recycle IP ranges, so merely changing the jail names is= insufficient. > > Could you please give an example? I looked at some of the tests but ca= n > only see cases where addresses are assigned within the vnet jail(s) > created by the tests, in which case I'd expect no problems. > Altq:hfsq assigns 192.0.2.1/24 on an epair on the host, so does altq:matc= h, altq:cbq_vlan, altq:codel_bridge, dup:dup_to, ether:mac, ether:proto a= nd .. then I got bored looking. It=E2=80=99s not just the pf tests either. For example the netinet/forwar= d:fwd_ip_icmp_iface_fast_success test does that too (well, 192.0.2.1/29, = but anyway). There are going to be more, this is just from a very quick l= ook. >> Realistically the easiest way to get these to run in parallel would be= to run each test in its own vnet so both overlapping IP ranges and name = conflicts don=E2=80=99t matter. > > Yeah, I was wondering whether it'd be possible to have kyua handle the > creation and teardown of a per-test jail, if only to avoid having to go= > through all of the tests which use static jail names. That=E2=80=99s what I was thinking as well, yes. We might be able to get to a point where all the tests have unique jail n= ames, but we=E2=80=99re never going to manage to de-conflict all of the I= P assignments. Even if we could, it=E2=80=99d make writing tests harder a= nd that=E2=80=99s counterproductive. The only issue I can think of with having the tests run in their own vnet= is that there may be some tests that play with non-vneted sysctls, so we= will have to make that vnet feature optional. Best regards, Kristof From nobody Fri Mar 31 00:26: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 4Pnh163P9Lz42bWt; Fri, 31 Mar 2023 00:26:34 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 4Pnh161TYHz3HYQ; Fri, 31 Mar 2023 00:26:34 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qv1-xf2a.google.com with SMTP id kr22so1410129qvb.5; Thu, 30 Mar 2023 17:26:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680222393; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=5slujqQJG/GptGzXid1sqlcXiZc+OJxF8OYdCLtqw/w=; b=PMX35DyR2nk/E254SA7RaLthfJN/1tZf1YhKDoH7cnS4N4RZnZih4O2jqjq/vjJjWO oBldUNanG8W7/dAgPQYUxsW3qKPVjuHU+K/A+qsi1jwIczdfY7xyuONP6b1XJaG0RAQy 30ninohCjFqbcKmg3CZeq0qbV2r+R542GfjeU0L8uMn2Cpme7TnkIjWluVoAhkZOTNuq zMYsRE42vCIUa8QU4u9bC0OMm6Q8NDVUQIl3Qci3hBWvpIW6DB6h9//utkDL1N6VMw6D Wl5i1BUNJ3x266AxU+BAO8HOwbBeWwdhMR6NHx0o2IC0qj+L01NXyrwt1yPGe1pbAT/d 4HyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680222393; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5slujqQJG/GptGzXid1sqlcXiZc+OJxF8OYdCLtqw/w=; b=FekYQ+KaflX4tUpP0BVgywNlByCTORqBKKzXG55jkiOgI/VaUmC4OIKb2iIw6x5wp+ 0bV71h8lfm6Qlp7HPy5Z/xvHsr7bWwT35ssG82nf4AOkz2qDCTe3LRzFKF26V14nGQwd JSXnXZPrVaANbsuL8ysR5RzIB62uJmUdjIskSRLtl6lYCkEW1lt34SBRuJCU4jzbdr4M Uf14408IFX0w4sMOcDPkPW+PWJW+CgWkc4rmkgJIKkq4Q3LTij+xS3i15CSvsR4h2x7R mnh6W7mcKVGdmzu55kH81B4uBmfQ4YNX6Rhm5aSsvtmQABfcfdzHCJ35/7l/ogVq6w7i atPg== X-Gm-Message-State: AAQBX9dZVwHqhj11IVrW86fCC7T60vPk1a5HpeF+0Q7S46BK6hfo6qds UQJq2uNPTsH5gPIMtkjsGcU790CjnC8= X-Google-Smtp-Source: AKy350ZPrQZyFlNVa++PqKVoD1qTEGP3RKsnX/J7GTymur/2wGkxhdD04ZwdKgI9lvTkeGzsUPCvBw== X-Received: by 2002:a05:6214:d05:b0:56e:9c11:651e with SMTP id 5-20020a0562140d0500b0056e9c11651emr42121511qvh.27.1680222392899; Thu, 30 Mar 2023 17:26:32 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id s11-20020a05621412cb00b005df44d4d953sm203301qvv.127.2023.03.30.17.26.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 17:26:32 -0700 (PDT) Date: Thu, 30 Mar 2023 20:26:30 -0400 From: Mark Johnston To: Kristof Provost Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b60600ceeb68 - main - pf tests: Serialize Message-ID: References: <202303302336.32UNatba067594@gitrepo.freebsd.org> <3A26AB82-357F-421F-853E-07320387ACBE@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=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: 4Pnh161TYHz3HYQ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Fri, Mar 31, 2023 at 09:15:27AM +0900, Kristof Provost wrote: > On 31 Mar 2023, at 9:05, Mark Johnston wrote: > > On Fri, Mar 31, 2023 at 08:56:56AM +0900, Kristof Provost wrote: > >> On 31 Mar 2023, at 8:36, Mark Johnston wrote: > >>> The branch main has been updated by markj: > >>> > >>> URL: https://cgit.FreeBSD.org/src/commit/?id=b60600ceeb68d1001d61222830e0be3441ef0885 > >>> > >>> commit b60600ceeb68d1001d61222830e0be3441ef0885 > >>> Author: Mark Johnston > >>> AuthorDate: 2023-03-25 12:55:41 +0000 > >>> Commit: Mark Johnston > >>> CommitDate: 2023-03-30 23:35:59 +0000 > >>> > >>> pf tests: Serialize > >>> > >>> These tests reuse jail names and cannot run in parallel. Until this is > >>> fixed - which is desirable since these takes take a while to run - tell > >>> kyua to serialize them. > >>> > >> > >> The tests also recycle IP ranges, so merely changing the jail names is insufficient. > > > > Could you please give an example? I looked at some of the tests but can > > only see cases where addresses are assigned within the vnet jail(s) > > created by the tests, in which case I'd expect no problems. > > > Altq:hfsq assigns 192.0.2.1/24 on an epair on the host, so does altq:match, altq:cbq_vlan, altq:codel_bridge, dup:dup_to, ether:mac, ether:proto and .. then I got bored looking. > > It’s not just the pf tests either. For example the netinet/forward:fwd_ip_icmp_iface_fast_success test does that too (well, 192.0.2.1/29, but anyway). There are going to be more, this is just from a very quick look. I see now, thanks. > >> Realistically the easiest way to get these to run in parallel would be to run each test in its own vnet so both overlapping IP ranges and name conflicts don’t matter. > > > > Yeah, I was wondering whether it'd be possible to have kyua handle the > > creation and teardown of a per-test jail, if only to avoid having to go > > through all of the tests which use static jail names. > > That’s what I was thinking as well, yes. > > We might be able to get to a point where all the tests have unique jail names, but we’re never going to manage to de-conflict all of the IP assignments. Even if we could, it’d make writing tests harder and that’s counterproductive. As it happens I'm looking at netinet6/forward6 tests, which have exactly the same problem. Each of those tests creates an epair, puts one end in a vnet jail, and configures the other on the host. It was pretty easy to simply create a second jail for the other end of the epair, and to my eye doesn't make the test much more complicated. Some more commands have to be prefixed with jexec is all. I'm sure that converting the pf tests would be much more tedious, if not more complicated. There is some downside to having kyua manage even more context, since that could make tests harder to debug, and kyua already makes that somewhat unpleasant. > The only issue I can think of with having the tests run in their own vnet is that there may be some tests that play with non-vneted sysctls, so we will have to make that vnet feature optional. Yeah, I think this would have to be opt-in. From nobody Fri Mar 31 00:27: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 4Pnh254zKXz42bRc; Fri, 31 Mar 2023 00:27: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 4Pnh253436z3Hxb; Fri, 31 Mar 2023 00:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680222445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gLDmh3lrqUDFYOdR3IZM1K/nmV+FZHYb0hVSHfV5MBs=; b=HhxDXxz96xBEbKQnKWCV33dNU9b1eNfr98sD5lLCVIxpfkQI32O5RpWjqNqplf4Yk8oxBt xdF1VIJc43xR71BFGwr1N1KS6DE1RF9nIdVHBUBmpNZbW70TZrQoai1Gi5GVuJ3R+MismV VUuJYclLG2vSfBqd9v02IjxWkw/VvqPbrtnq8ZsLj91auqI4IYv1ugDsX48QlMO64gctsM HseD1LakVWPUTgJbkk6Tq28DPTLqAB9WJoHcT9hj9NnzWnSc/4kPw2OpVgBjEtvwxDZHct lgbzQadF3Fg/je6jvyjx3TVur7ElMfEpKZqEKdQHwZ3/eYDTEB08QutE+Gbsqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680222445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gLDmh3lrqUDFYOdR3IZM1K/nmV+FZHYb0hVSHfV5MBs=; b=vZV851phk7sV9a8y2llveSqfaHsmYKRP3F+FaDiNWHVFyM4Wqb5YcILRcWrHbySVk8hYw+ 8oQC9zrvZbeVrOskBkwsYcLXOUy22yCaP9UzU0dRo31xvTGRU52cuyT18OXWvVYXGUPLm9 Ekjn/vVZGzruSZImDqWh83NyvOHxMleXFcgf9fNecZZhOY28Mry0SgMauPeCrUdCRs6WMG UCUnSF9T4SQRc69uB3QyD/cr2KoPSFngDlyVVWdXWMfCpcc8Jrg1qE/BnIEWp9b9iHqYE3 JSQDYekojf+jZRAcLnwqoEOZNUkwlp99kerkrzvd2RokGVOl45Z3Y6JzfI009g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680222445; a=rsa-sha256; cv=none; b=tKATV9BMY47DxL7SJQw1pyAMNFehS3mYQmhRmMO+C98WEMTAj3cH/01sixIozq5vAA76au WKerI48t4F5pULzEPsM1oM+o5sISjiTI6tI71BtbnIF0XCaSyfmx5nwpHUy062P6JT6Jgi PbJgrQqxaVj9LQtmwEjqYRiL+Vua5LzV+ri7d2g7QquFABxRxdqCTEbAJkWG9140R/VEDL IZQ3vaDLZi4dTaKCA7Ukto/Pv+6z7tUByShGuR/t/hiz78kRwSwd+5h9/pOX42Cb3ty3AW iG/mOmiilmgHMTyE8G7xkC5YgjHIHk370hUjuM8uQRa7TKlWa99LtHgXzXiyaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnh2529HzzXfQ; Fri, 31 Mar 2023 00:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V0RPa4052221; Fri, 31 Mar 2023 00:27:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V0RPXU052220; Fri, 31 Mar 2023 00:27:25 GMT (envelope-from git) Date: Fri, 31 Mar 2023 00:27:25 GMT Message-Id: <202303310027.32V0RPXU052220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: 134ced89c4ca - main - Add myself (cc) as a src commiter. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=134ced89c4ca7852f2a56b91e9fc848ce4d4fab0 commit 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0 Author: Cheng Cui AuthorDate: 2023-03-30 11:24:43 +0000 Commit: Cheng Cui CommitDate: 2023-03-30 20:27:02 +0000 Add myself (cc) as a src commiter. Summary: Adding mentor relationships for cc when committing new diffs. Reviewers: rscheff, tuexen Subscribers: imp Reviewed by: rscheff (mentor), tuexen (mentor) Approved by: rscheff (mentor), tuexen (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39342 --- share/misc/committers-src.dot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 6e7b5b6c63b3..76ab7441fd46 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -41,6 +41,7 @@ bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2002/01/29\n2009/09/13"] bmilekic [label="Bosko Milekic\nbmilekic@FreeBSD.org\n2000/09/21\n2008/11/10"] bushman [label="Michael Bushkov\nbushman@FreeBSD.org\n2007/03/10\n2010/04/29"] carl [label="Carl Delsey\ncarl@FreeBSD.org\n2013/01/14\n2014/03/06"] +cc [label="Cheng Cui\ncc@FreeBSD.org\n2023/02/15"] ceri [label="Ceri Davies\nceri@FreeBSD.org\n2006/11/07\n2012/03/07"] cjc [label="Crist J. Clark\ncjc@FreeBSD.org\n2001/06/01\n2006/12/29"] davidxu [label="David Xu\ndavidxu@FreeBSD.org\n2002/09/02\n2014/04/14"] @@ -845,6 +846,8 @@ rrs -> bcran rrs -> jchandra rrs -> tuexen +rscheff -> cc + rstone -> markj rstone -> mjoras @@ -920,6 +923,7 @@ thompsa -> eri trasz -> jh trasz -> mjg +tuexen -> cc tuexen -> rscheff ume -> jinmei From nobody Fri Mar 31 00:47: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 4PnhTP6pdQz42cjD; Fri, 31 Mar 2023 00:47: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 4PnhTP4JY9z3KLW; Fri, 31 Mar 2023 00:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680223657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M/WshDhzdF4ez9N8HfZrvCe7tFpiiNsyUkga8ykEVQU=; b=bocveCs9GL4K3D7P+MdvxpXQj4WkMmJFy2JFfz4fBzEDp++0xV96G3kWRiEflL9PJ4o8O5 c01q6v09f/l1YmT5/MA8Kaq1SQyOfmGJLqce0FcIM4j3VoYFtqeEu++PDKk39yd8lmgg0F nINTW+BZ5lPyAgb5Fs/QpqwEecOiFfdjngOuIEr0aThJ4xpPPvKg3IDIeucaL9jKVZLDc1 PPEZJ0roCcgrWgNwzsjtj1q9Y1ShAQl5Aa+dYtaD1197rBqmfyyu0TXtLa4t5TkMEFsZ/s Aqvwfvj2ewvWH9KKqAc+WuE5NpvBxIyYfp0K5qrFdh1l3Mw56NmtK8bmsvoHpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680223657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M/WshDhzdF4ez9N8HfZrvCe7tFpiiNsyUkga8ykEVQU=; b=i1YqJVUCz2cyDWRBbdzbbMVe9UdWG+U6sWiMp1/8mmHkLS5/SlZwmLyXlTsPnTCIY8SLNe KAemIpXqkHrjpP7bo1soAGyrhSdI2t4I8LkuMJ3YT9T6zRj1PEyre3DeaFXi5R/57a8Ndj jpUPazMPE2XckQz3/iRDeXxgWiel6VBJ6Go9+DAoy3oh6+NUPe88z7tJyLSS7P6lguje3Q 2ERDn5D0UPjr5ou95EsK+mwNuKuLwloh/lZw0+fGhwEbxfHuppkYgSaNJPaUTS1QcKU1Qx Q9TgQCQuMBHF14TsUn9uU1kbRZmT/s6GaTZ43zciC+Uh8fTIKqdIpTAd+A6Hgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680223657; a=rsa-sha256; cv=none; b=sxohQO+JLV18BKr4UUM3tP06cq6bM3HduuCS6it5TeX1ZYZmfJr/5wQgcsQ9RsiICP5gqS py+4Aj/6Qyg0Al1H2lPzBSg3P56C/nHuXkbElUHNdlt2k+K38JiDM2YJPc4JbIhZbFUL1T TC+FwHe2QDNHp/1vkypXEtWSPPtvjEqXXllCnRp3ZK1EAuaZZr0DtrFE2sVjc3wsGGuBj8 sOn9SJlfUh8u//DpMHsNsjZjYf4Yx3ZOjuEEy9VtKCyt7Nme74IYIMUpz0tEF9g565dxV5 tH++L5iNUACJWsOJTctLwOJVr00A8X8r7/kZS4P/dn/qOb/nxJbDDHNd/9op9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnhTP3JMyzY19; Fri, 31 Mar 2023 00:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V0lbBA084874; Fri, 31 Mar 2023 00:47:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V0lbpP084873; Fri, 31 Mar 2023 00:47:37 GMT (envelope-from git) Date: Fri, 31 Mar 2023 00:47:37 GMT Message-Id: <202303310047.32V0lbpP084873@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a92e3fa2ade5 - releng/13.2 - 13.2: update to RC6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: a92e3fa2ade5788e9c3d9e0ebac6c57b310ad66d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a92e3fa2ade5788e9c3d9e0ebac6c57b310ad66d commit a92e3fa2ade5788e9c3d9e0ebac6c57b310ad66d Author: Colin Percival AuthorDate: 2023-03-31 00:47:18 +0000 Commit: Colin Percival CommitDate: 2023-03-31 00:47:18 +0000 13.2: update to RC6 Approved by: re (implicit) --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 6348d9174c3b..9e3e370060e0 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.2" -BRANCH="RC5" +BRANCH="RC6" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Mar 31 00:59: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 4Pnhkw1fd4z42dDY; Fri, 31 Mar 2023 00:59: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 4Pnhkw0t1Lz3L7p; Fri, 31 Mar 2023 00:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680224360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eXjMoe0zpOxdsTiRQ1QvhuPXNkMVRQvRdE4BEr2kVas=; b=e1vrxFNoRQ6rNyFFGRmy36Z/LGYHVfCrxR9JzVpL+0K6MWHbhPeEHMVCcgP2Mzwv2tKz55 ovXyCzhsEvgaEvvfFjVMoY0AdzFbeU70s1Y/xsGkHMbYVD9ztPOabnF9DgLabS1Nb25w5T pm3X1Fdcx1N81n2uUF2wHjqojjO5X0Fmbhl/yBTaJvRYrE4CAnV4JQOdp+tmMgO+DIQgWv 2j/5UZ3k0hqJv7jX6jV+PdaPwfWqtzgzhSECI2NrRofe8hL/+X7eQX/AwjAL9djz0HnmwV aQkYLjxWh7diELDUvZea+ydOJ+Mh3l0CXt5pZTPv0qQC/thISqzsLW34fD9tyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680224360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eXjMoe0zpOxdsTiRQ1QvhuPXNkMVRQvRdE4BEr2kVas=; b=EwJXZzuOozZUCT6/y+fDI2QcY4mEppO5xkhxJQZhqTJpSZ4ELHAPL9tQ4S6+YjupeH0h3+ MsJLSU7zko0c1T34+7HONHT2OYBcfPUYOuJ3l1zw6SFzUFKiFtLbigHmiplzvcdJvfqYPi JqZUtOnnUYHRZkfOs+DjlzFVPVRBLyaardqoiY3u61gSoWhuSeiXpy9RtrFWOkpfZziuO4 yvguuNE4angStQ6hi5vksZYgEqqSypTvUPnENKjS1q7U1MMyogTJqt6iWyrnxQzm5ER2f/ wbAC7lEfqiRa26R1z9SRCcB5E9bncUbgaxcKrRBVF0PK7CgK/EbpselCBQXxCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680224360; a=rsa-sha256; cv=none; b=tvrXjZCoVJAiHSeKtP6F/ER1X5/nooMYS4bnuzaLRk7SSL0G8i2X8wUMd3/3oeDLjvPvGV XFF41Eo7aaOmLj2KAfBH+ntaAErevng0/sbsLJ8NCOzwEveAK7g5C54iRpLOPpirX7eQsA vg+cBnwzPa/bX4pd5bj7woDnbFqsORJG1QeSEF/kXcnof39YBGdU5Oq2vqkxowEuFDi8g0 ZR81HWeIy8l0ckibaDZP0LunwD5PuxpZ98YQgyl7HnaGME28oKiTY14SeTfBkvbL5dXDcO liFDBs9NOklifX5eIWT1TseecacfpIuLfpTP/aNYzuwn0Yd5udS5ewcDukFJvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnhkv6w9CzY1h; Fri, 31 Mar 2023 00:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V0xJvg001625; Fri, 31 Mar 2023 00:59:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V0xJWp001624; Fri, 31 Mar 2023 00:59:19 GMT (envelope-from git) Date: Fri, 31 Mar 2023 00:59:19 GMT Message-Id: <202303310059.32V0xJWp001624@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: df34c934a2d0 - stable/13 - fdescfs: remove useless XXX comment, unwrap 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: df34c934a2d0cfc149665af9e1a38e9fd51f9429 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=df34c934a2d0cfc149665af9e1a38e9fd51f9429 commit df34c934a2d0cfc149665af9e1a38e9fd51f9429 Author: Konstantin Belousov AuthorDate: 2023-03-21 21:28:16 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-31 00:47:52 +0000 fdescfs: remove useless XXX comment, unwrap line (cherry picked from commit fa3ea81b77e41e3f33a611e51fd8bcbb2f4c8a95) --- sys/fs/fdescfs/fdesc_vfsops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index 9d8fdda47cbf..edc2cdd61847 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -90,8 +90,7 @@ fdesc_mount(struct mount *mp) if (mp->mnt_flag & (MNT_UPDATE | MNT_ROOTFS)) return (EOPNOTSUPP); - fmp = malloc(sizeof(struct fdescmount), - M_FDESCMNT, M_WAITOK); /* XXX */ + fmp = malloc(sizeof(struct fdescmount), M_FDESCMNT, M_WAITOK); /* * We need to initialize a few bits of our local mount point struct to From nobody Fri Mar 31 00:59: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 4Pnhkx200Jz42dDV; Fri, 31 Mar 2023 00:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pnhkx1WmLz3L5C; Fri, 31 Mar 2023 00:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680224361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y9xOCFImd8CKGy0RlZ8jl+1ZP3Si0kTGLDgmrtZAND0=; b=wSVq2i+MfhwNfq4FpRwKz2UYuJbGAi8LHVMa/1S937K73AhAt/DvHaGpRrb//fpRoQ14QO y4Nwij2qPlHJMO7E+QXTxo7eeZQnEBj5KHyuhoDJt6tgmltW6uQQIxwKGUbSSXex+VXuHR bfiXk6JlRj+rj1R6gBJMBQLEeA54lkDsbCIxDKo2zimHfpiZzrHqENGeDS4SUptUliMEde 0m01JrouuwPcgEtDSvcnZ6pHskRoSvrEH7STtzvejM/7I5xazz4mIUp4EYS3KFO+cZv0Tp /aR4uqgba5hhlkCvPAGkKFFpvkXB0QpimpdpFg6aNC0bSYX8cXRaeM1UWmhZ1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680224361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y9xOCFImd8CKGy0RlZ8jl+1ZP3Si0kTGLDgmrtZAND0=; b=FiieJ+yZt/oyzsbCEpgI25BHJcajjcPo6RU4H3xlMmW4vN4KMFZRKkQnv3fTIOslQ/wvMw Bd9fV3UOTHuLczynSFgPXsMKEXeynx6cim9ZaKDhHwvQJEGhMzlzw1B4GP3N/fIkhTXBuM +9KwUXuYoT//Ugk6g5aEoPDx4SjrNV8ZPk8xGGk3Iv/FYc1j3K4ptaAHT4oL4A+pWm5Ag+ ymHHWV6RslyZzJEq33QHmM3CdAMN6TJixozBuoJ0T+ZkCFWKVI35pA5PQ8oJbMJW7FeW6z Gyv9QZ+WXz7WUaG6VVtRMBV75DDBr4WHcWPXiH0B8tPgVE2FHJ/Sfwl5F5Z8Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680224361; a=rsa-sha256; cv=none; b=wzi881cm2uSMJcBLB+QAmtrkffk03ZUrP03EKtdbdlRKDJSQC9muwOcNwBQIoo+Sqrrqta pIQuhn4DZSjvAnE9su8vzBJAv2ScUgzLATyglwEaeiWrc2trsvoiAlGWRcME/br4clpgBT +XXb6SQZDLXeMhBunksNdoff9lKsAi+j4Fl4RFa2Lv7lUf662prNB/j7VC0tUhXYv1SH1X DLLO25j52f6GoDUIJoROEN/mKmJNEbxixdv6Wp/mTcK3sEw1HoaXWY///McnP7dLYyVOsT rMosy3BDgnolQT9JmJ6az7DTDvZL1xHr6AnELYaxCzuYPwUwLPNWumfPYtylgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnhkx0KXBzYY2; Fri, 31 Mar 2023 00:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V0xKcF001645; Fri, 31 Mar 2023 00:59:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V0xK3F001644; Fri, 31 Mar 2023 00:59:20 GMT (envelope-from git) Date: Fri, 31 Mar 2023 00:59:20 GMT Message-Id: <202303310059.32V0xK3F001644@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: 35b68d0ac4d3 - stable/13 - fdesc_allocvp(): fix potential use after free List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 35b68d0ac4d3b88ce8e3fa866e42e8842f5227ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=35b68d0ac4d3b88ce8e3fa866e42e8842f5227ef commit 35b68d0ac4d3b88ce8e3fa866e42e8842f5227ef Author: Konstantin Belousov AuthorDate: 2023-03-21 21:24:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-31 00:47:52 +0000 fdesc_allocvp(): fix potential use after free (cherry picked from commit 51b8ffb95c4fe45f6825d551bd093889820a8115) --- sys/fs/fdescfs/fdesc_vnops.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 087f9b2551d1..17320b2c8354 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -160,6 +160,7 @@ fdesc_allocvp(fdntype ftype, unsigned fd_fd, int ix, struct mount *mp, struct fdescnode *fd, *fd2; struct vnode *vp, *vp2; struct thread *td; + enum vgetstate vgs; int error; td = curthread; @@ -180,9 +181,9 @@ loop: if (fd->fd_ix == ix && fd->fd_vnode->v_mount == mp) { /* Get reference to vnode in case it's being free'd */ vp = fd->fd_vnode; - VI_LOCK(vp); + vgs = vget_prep(vp); mtx_unlock(&fdesc_hashmtx); - if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK)) + if (vget_finish(vp, LK_EXCLUSIVE, vgs) != 0) goto loop; *vpp = vp; return (0); @@ -230,9 +231,9 @@ loop: if (fd2->fd_ix == ix && fd2->fd_vnode->v_mount == mp) { /* Get reference to vnode in case it's being free'd */ vp2 = fd2->fd_vnode; - VI_LOCK(vp2); + vgs = vget_prep(vp2); mtx_unlock(&fdesc_hashmtx); - error = vget(vp2, LK_EXCLUSIVE | LK_INTERLOCK); + error = vget_finish(vp2, LK_EXCLUSIVE, vgs); /* Someone beat us, dec use count and wait for reclaim */ vgone(vp); vput(vp); From nobody Fri Mar 31 00: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 4Pnhky3b83z42dPn; Fri, 31 Mar 2023 00:59: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 4Pnhky28Vlz3Lb4; Fri, 31 Mar 2023 00:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680224362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EH+zOJqCNMwRGBPBNIGc1LTvOiqVv8AdOr4oozIPPpQ=; b=F9WBGsZv8ekLayj37txTqmbdby1Vz8Y0hqMT91LfaleV3dHP5FRMwS6UFYo/jE4sPrcCOp 2RUuQ0AR+Ty4KCr+lb2zYKQx7zUoRSJ7lGkfNf+OY+jPxOE4i5CnpVU8BnCQnO83ngfgWC 75ml6LYM1tsDqWtN+c8yTBlkO6f0LCT0+LMqW80Mw84L9zwj5YoHTC4S9Zj9+q3Or1vf2S aYAzSsRelgUDrOBYzaAxQkKdjyOxGLWJfaExoO0aUizKwwF2Q9DlFHEHPyU0iaibw6eWa6 E1IMFWzXo+KGFbF63gK/7Z4ISVzrJSuzk5b2mE//hZCKz0zY319fv1AddF65xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680224362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EH+zOJqCNMwRGBPBNIGc1LTvOiqVv8AdOr4oozIPPpQ=; b=hOWnDMtq6TeNTNohOMA+KHgwQMfs1cbXKyiUG9etLUcuyl38/TAWTXAnlkUb/7mNby+N2Q eUdsLopJcx1nzizDDEpYLLBb10jPh6NQ+KEdYSNyNnGboyFFx4TceiT9A3aYtoKmvMsixX JCinpM+AtkQB/sZVX9u5tD5mlVHseiFrGIarbDvj/nalhvaAm+LmbwHsTE8/pyzHEtOp3D wL89Uk8j5kcZVhoXQIWwi40EwrTd/NaVo5UVHUVSKmECiF0dnklnYEd/QRYFoS8YadFvzJ LruV6O/H+h9uVLeK9MULq/h9XsY5GTKOdt6+DgeaaBm3sdSUSMesuWOJBYmbsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680224362; a=rsa-sha256; cv=none; b=SOhHwQR8eYW1IiCugmb3ORg46KXfRrOMiau+qNNapk8+sXr8EYTh3g1yq06q84VDiXVjI6 46wIP8RBRmBcFVZgpA0x9CtcnQJGkadHogASuF61VfdYWeH5+CZp2ceZg+kgAR7/8h5k8v 7OI63AGAlJGvPajfU5hVasR5VY6MmC3I2cl5DO3u038WPuHiZaOnyVIIIp5qEhgfttzKGB vO6l2ZLBBeBs/KW3cgZzu66K1p3WhoiY8S4niiGRssrTS9S2j+YqS5pwmI1N+pry4PlGrx xXyyDfsaxebpyf2OUwQrrfl5icFXsQfN80b8KdurhsrJweJEj3+WroUgwSlQdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnhky1DzFzYY3; Fri, 31 Mar 2023 00:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V0xMUn001665; Fri, 31 Mar 2023 00:59:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V0xMWA001664; Fri, 31 Mar 2023 00:59:22 GMT (envelope-from git) Date: Fri, 31 Mar 2023 00:59:22 GMT Message-Id: <202303310059.32V0xMWA001664@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: 464c507f5daa - stable/13 - vnode_pager_input: return runningbufspace back List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 464c507f5daa28512b934f71ccb8e1bf6af95071 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=464c507f5daa28512b934f71ccb8e1bf6af95071 commit 464c507f5daa28512b934f71ccb8e1bf6af95071 Author: Konstantin Belousov AuthorDate: 2023-03-24 21:12:21 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-31 00:47:52 +0000 vnode_pager_input: return runningbufspace back (cherry picked from commit 28f957b8b3a22086927451fee89789fdf596260b) --- sys/vm/vnode_pager.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 08927b5671f6..68e2916daad9 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -568,6 +568,13 @@ vnode_pager_addr(struct vnode *vp, vm_ooffset_t address, daddr_t *rtaddress, return (err); } +static void +vnode_pager_input_bdone(struct buf *bp) +{ + runningbufwakeup(bp); + bdone(bp); +} + /* * small block filesystem vnode pager input */ @@ -614,7 +621,7 @@ vnode_pager_input_smlfs(vm_object_t object, vm_page_t m) /* build a minimal buffer header */ bp->b_iocmd = BIO_READ; - bp->b_iodone = bdone; + bp->b_iodone = vnode_pager_input_bdone; KASSERT(bp->b_rcred == NOCRED, ("leaking read ucred")); KASSERT(bp->b_wcred == NOCRED, ("leaking write ucred")); bp->b_rcred = crhold(curthread->td_ucred); @@ -1132,6 +1139,8 @@ vnode_pager_generic_getpages_done(struct buf *bp) error = (bp->b_ioflags & BIO_ERROR) != 0 ? bp->b_error : 0; object = bp->b_vp->v_object; + runningbufwakeup(bp); + if (error == 0 && bp->b_bcount != bp->b_npages * PAGE_SIZE) { if (!buf_mapped(bp)) { bp->b_data = bp->b_kvabase; From nobody Fri Mar 31 06:03: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 4PnqTz0Xlnz42y8D; Fri, 31 Mar 2023 06:03: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 4PnqTy6sfxz45XN; Fri, 31 Mar 2023 06:03:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680242615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+6i7Dq3g3MbHWuVNlr4kdda/tRO2lYq0ibpD7m6wsCs=; b=lKwiDOm9soHlGFRH7pqJv7dHCN7whmCw63yIu/TLBbUNlXdUvf9+xdSe3A7v+G6aHl1yn8 MGLlsHo65xVTQisRcB5Je9EKG6z3cePa9slt8OT0obg9WPLtpXE/Tr5IxAW8L1/4HdlkOS EyCBbXUuYylxJxHFgkl/F13mQlrBXTvTafvUBNrRZ0DLssMTVegFbW+Qj8OG9Af5FnvVLg wNEKMmyKa+PrLjT17pdti4OQvRoZKyJ9mnLOx9DqZ/kBdH+48dgHCvEIwlRE5XP5XCD9J/ 9VcOIjc7GSIe9u/FoKbeLQe2+NXla9vOSvSAJ0X2kq5UoR2NbGYm07mdoWtv/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680242615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+6i7Dq3g3MbHWuVNlr4kdda/tRO2lYq0ibpD7m6wsCs=; b=BhoZ3myrkcWm8RZw5uPTgYPwPBRpwJxyau8DowlzaNPoFW26Un90Etf/aUyG9vlrazYOfO FXQZ1pn256PW43fKeuAqnwyKayInKHetHWF51kjhIgo/FaF541OYkYDkhGcF7BccA9jMnU 7xLWkTmqnvmhR+crhwWAUAGjDmhXIVtJNVTXFbp3adDHtFLaObOnOobSizgHzWZAe2l6iW B17RaRTUhhsKMsXURNZwfyBsM4ot0w1qT2AW1LyoTRlhIs3M/dXReUMexd/9ZUXfeunjcC nOpfrNkG6QIgGoUuYwa65R5CoPZVgF/VRDYVD6U6NZCGy6V7Wx04PDIMIne0ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680242615; a=rsa-sha256; cv=none; b=rPF76JY+fVF5rc0enK+MJSNOTnvPBbPKC89t7Kix6Sh4y0AuC+Awg4x81PqMTYNlh9BTbI RfQCp/qW3bp1sBYsjyL5+AB4uPzzTHEJzN/fEP5mzj8F2RYAkCiUxh31T6Mudgliwa8Jmh Ti36g85cr1wchkZn0mSM22nC7yeoOaF++vgbuzePehhNBfGvlcy0A+z6iDY8n6FqlKzrpz 25skzvqwZ07iaM8QS+/voq7YP/envO+hOb8XKyrXtGOFqR00AAfOeES4Vm2jc43Zte42+t m9Aduqbs2yApYdrueuznWXdsqzMFvIyJcC31BTwxUnn177B3ut4nBNvFqSy4Pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnqTy5wGDzjGD; Fri, 31 Mar 2023 06:03:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V63YYU011278; Fri, 31 Mar 2023 06:03:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V63YCP011277; Fri, 31 Mar 2023 06:03:34 GMT (envelope-from git) Date: Fri, 31 Mar 2023 06:03:34 GMT Message-Id: <202303310603.32V63YCP011277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: d3e03d235e31 - main - bhyve: scan PCI device functions to find host LPC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: d3e03d235e3133f79ff9e3879fd4ed61ace38d73 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=d3e03d235e3133f79ff9e3879fd4ed61ace38d73 commit d3e03d235e3133f79ff9e3879fd4ed61ace38d73 Author: Corvin Köhne AuthorDate: 2023-03-29 07:45:11 +0000 Commit: Corvin Köhne CommitDate: 2023-03-31 06:00:06 +0000 bhyve: scan PCI device functions to find host LPC At least on some AMD devices the host LPC bridge could be located as seperate function of another PCI device. Fixes: f4ceaff56ddaacc151df07d2d205a2d7fcb736a8 MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39310 --- usr.sbin/bhyve/pci_lpc.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c index 3b42947369a2..02105ef01bdf 100644 --- a/usr.sbin/bhyve/pci_lpc.c +++ b/usr.sbin/bhyve/pci_lpc.c @@ -461,10 +461,22 @@ pci_lpc_get_sel(struct pcisel *const sel) memset(sel, 0, sizeof(*sel)); for (uint8_t slot = 0; slot <= PCI_SLOTMAX; ++slot) { + uint8_t max_func = 0; + sel->pc_dev = slot; - if ((read_config(sel, PCIR_CLASS, 1) == PCIC_BRIDGE) && - (read_config(sel, PCIR_SUBCLASS, 1) == PCIS_BRIDGE_ISA)) { - return (0); + sel->pc_func = 0; + + if (read_config(sel, PCIR_HDRTYPE, 1) & PCIM_MFDEV) + max_func = PCI_FUNCMAX; + + for (uint8_t func = 0; func <= max_func; ++func) { + sel->pc_func = func; + + if ((read_config(sel, PCIR_CLASS, 1) == PCIC_BRIDGE) && + (read_config(sel, PCIR_SUBCLASS, 1) == + PCIS_BRIDGE_ISA)) { + return (0); + } } } From nobody Fri Mar 31 06:22: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 4Pnqvv5TbVz430Gd for ; Fri, 31 Mar 2023 06:22:35 +0000 (UTC) (envelope-from tsoome@me.com) Received: from pv50p00im-zteg10021301.me.com (pv50p00im-zteg10021301.me.com [17.58.6.46]) (using TLSv1.3 with cipher TLS_AES_256_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 4Pnqvv3128z46Pj for ; Fri, 31 Mar 2023 06:22:35 +0000 (UTC) (envelope-from tsoome@me.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1680243754; bh=svwnGwAlqrTxylvuWdnlSVe9OIE3t9pX+SrMsttmqzU=; h=From:Message-Id:Content-Type:Mime-Version:Subject:Date:To; b=hmstbAQtpeZYNfp4PdVoumIPU2xAs6hkHYwDDN0D3QGlesxIGoP6oqFQqfrY9yMmJ 2K8HECMifpIsSQzUoL+D21xjc2vai56o1L+2bLtCWGCSJqPbhqoAbaG6snElkhKqu2 CQ8J8WxWVOWG4GRbV7F7FLOZHsjulu3pQZcI6UCxD9V91NlnoI4O3Cn49H3kjDF5CK C2sVEeEOt+uPt02PjL+mXKFZXmjx/pXMkQWtHXhI7XYIZcvW0at0JdLDLgvInvYpIG yTWWS9oZVlO9qI/1QhH1ICAKA3FmI+ddF5Y8ruqdyWoWFYv+tk+Po0ihoSMFavvoac oA57r636lwDyw== Received: from smtpclient.apple (pv50p00im-dlb-asmtp-mailmevip.me.com [17.56.9.10]) by pv50p00im-zteg10021301.me.com (Postfix) with ESMTPSA id A95DC5001F2; Fri, 31 Mar 2023 06:22:30 +0000 (UTC) From: Toomas Soome Message-Id: <256C0F87-8B73-4E5E-9B5E-E9BF00DEC019@me.com> Content-Type: multipart/alternative; boundary="Apple-Mail=_CC2C5268-3B0E-412D-AB43-A76713CFE030" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: 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.400.51.1.1\)) Subject: Re: git: 927358dd98cb - main - amd64 loader: Use efiserialio for Hyper-V booted systems Date: Fri, 31 Mar 2023 09:22:17 +0300 In-Reply-To: Cc: Gleb Smirnoff , Wei Hu , src-committers , "" , "" , imp@freebsd.org, gallatin@freebsd.org, kevans@freebsd.org To: Warner Losh References: <202303180720.32I7KXOc030612@gitrepo.freebsd.org> X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Proofpoint-ORIG-GUID: T0X7ufiSx51uEnpvnIvdv8y8POAxGlWZ X-Proofpoint-GUID: T0X7ufiSx51uEnpvnIvdv8y8POAxGlWZ X-Proofpoint-Virus-Version: =?UTF-8?Q?vendor=3Dfsecure_engine=3D1.1.170-22c6f66c430a71ce266a39bfe25bc?= =?UTF-8?Q?2903e8d5c8f:6.0.517,18.0.572,17.0.605.474.0000000_definitions?= =?UTF-8?Q?=3D2022-06-21=5F01:2022-06-21=5F01,2020-02-14=5F11,2020-01-23?= =?UTF-8?Q?=5F02_signatures=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 clxscore=1011 adultscore=0 mlxscore=0 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2303310051 X-Rspamd-Queue-Id: 4Pnqvv3128z46Pj X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:714, ipnet:17.58.0.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail=_CC2C5268-3B0E-412D-AB43-A76713CFE030 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 31. Mar 2023, at 02:40, Warner Losh wrote: >=20 > Let's back it out. I didn't get a chance to review it and the = duplicated name strikes me as massively unwise. > Of course, the efi serial driver never should have had the name = comconsole in the first place, imho. It was OK > on arm where we couldn't conflict. >=20 > So let's back it out and talk about how we should do this, including = the need to possibly just rename the efi > version of the console driver to something else. IMHO, it never should = have been comconsole in the first > place because it's configured differently than comconsole.... >=20 > Warner ok, lets start from beginning. The loader device naming is total mess = and should not go this way - it is not understandable for users and not = understandable for developers. the config below is perfect example of the situation: First the config does set:=20 >> console=3D"comconsole vidconsole efi=E2=80=9D So, we do try to set serial console, bios video console and efi console. = So we have =E2=80=9Cshared=E2=80=9D config for BIOS and UEFI loader, = which should be totally reasonable from user point of view, but is = technically wrong, because BIOS loader has no idea what is efi console = and EFI loader has no idea what is vidconsole. So this mixture ends up = with message: >> console vidconsole is invalid!" And the user will get the similar error when booting BIOS setup. Then we just set console=3D=E2=80=9Cefi=E2=80=9D. Then there is setting for uart=E2=80=A6=20 With todays UEFI setups, the logic is that you set up your hardware, = that is, you configure serial port attributes from firmware setup, and = the UEFI firmware will populate its internal structures with those = values. Now, first issue is, while developing uefi loader, it was easy path to = reuse bits from BIOS loader. smbios, acpi, and sadly, comconsole. Sadly, = because comconsole is built assuming x86 IO port features which are not = available on other platforms. So yes, bios version of comconsole should not have been used to build = UEFI loader at all. Now the fun part, even as UEFI does provide SIO API to access serial = ports, to read from port, write to port and set attributes, it turns out = there are UEFI implementation(s?), where changing some attributes will = cause system to hung. Which is the reason, why we need to set up = hardware properly from firmware, and our generic config should not try = to enforce some other value(s). Default should pick up values from the = system. Sure, if the machine operator has some reason to change those = values and has tested the change, we should have method to change the = config, but again, defaults should come from system setup. While I see the reasoning to try to create all those different names, = maybe the first thing should be to look on this as innocent end user, = who has no idea about those fine technical details and historical = reasons and is just trying to get system to behave=E2=80=A6. just my 2 cents, toomas >=20 > On Thu, Mar 30, 2023 at 5:31=E2=80=AFPM Gleb Smirnoff = > wrote: >> Wei, Kyle, >>=20 >> this commit hangs loader on real hardware, at least on some >> of it. The loader prints list of consoles and hangs hard: >>=20 >> [Thu Mar 30 20:46:12 2023]^M|^HLoading /boot/loader.conf^M >> ^M/^Hconsole vidconsole is invalid!^M >> ^MAvailable consoles:^M >> ^M efi^M >> ^M comconsole^M >> ^M comconsole^M >> ^M nullconsole^M >> ^M spinconsole^M >>=20 >> Machine is unrecoverable unless you got alternate boot media >> and access to BMC console. >>=20 >> First, please DO NOT MFC this as scheduled. Second, let's try >> to fix it or back it out if we hear from any other CURRENT >> user. >>=20 >> Our configuration isn't special. This is what we got in >> loader.conf, related to consoles: >>=20 >> console=3D"comconsole vidconsole efi" >> comconsole_speed=3D115200 >> comconsole_port=3D0x3e8 >> console=3D"efi" >> hw.uart.console=3D"io:1016,br:115200" >>=20 >> On Sat, Mar 18, 2023 at 07:20:33AM +0000, Wei Hu wrote: >> W> The branch main has been updated by whu: >> W>=20 >> W> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D927358dd98cb902160093e0dc0bac002= d6b43858 = >> W>=20 >> W> commit 927358dd98cb902160093e0dc0bac002d6b43858 >> W> Author: Wei Hu >> W> AuthorDate: 2023-03-14 15:13:46 +0000 >> W> Commit: Wei Hu >> W> CommitDate: 2023-03-18 07:07:35 +0000 >> W>=20 >> W> amd64 loader: Use efiserialio for Hyper-V booted systems >> W> =20 >> W> UEFI provides ConIn/ConOut handles for consoles that it = supports, >> W> which include the text-video and serial ports. When the serial = port >> W> is available, use the UEFI driver instead of direct io-port = accesses >> W> to avoid conflicts between the firmware and direct hardware = access, as >> W> happens on Hyper-V (Azure) setups. >> W> =20 >> W> This change enables efiserialio to be built for efi-amd64 and = has >> W> higher order priority vs comconsole, and only uses efiserialio >> W> if the hypervisor is Hyper-V. When efiserialio successfully >> W> probes, it will set efi_comconsole_avail=3Dtrue which will = prevent >> W> comconsole from probing in this setup. >> W> =20 >> W> Tested on Hyper-V, ESXi and Azure VMs. >> W> =20 >> W> PR: 264267 >> W> Reviewed by: kevans, whu >> W> Tested by: whu >> W> Obtained from: Rubicon Communications, LLC (Netgate) >> W> MFC after: 2 weeks >> W> Sponsored by: Rubicon Communications, LLC (Netgate) >> W> --- >> W> stand/efi/loader/arch/amd64/Makefile.inc | 1 + >> W> stand/efi/loader/bootinfo.c | 11 ++++++-- >> W> stand/efi/loader/conf.c | 6 +++++ >> W> stand/efi/loader/efiserialio.c | 43 = ++++++++++++++++++++++++++++---- >> W> stand/i386/libi386/comconsole.c | 14 +++++++++++ >> W> 5 files changed, 68 insertions(+), 7 deletions(-) >> W>=20 >> W> diff --git a/stand/efi/loader/arch/amd64/Makefile.inc = b/stand/efi/loader/arch/amd64/Makefile.inc >> W> index 0d9e2648cb59..bd89044bd6c7 100644 >> W> --- a/stand/efi/loader/arch/amd64/Makefile.inc >> W> +++ b/stand/efi/loader/arch/amd64/Makefile.inc >> W> @@ -5,6 +5,7 @@ SRCS+=3D amd64_tramp.S \ >> W> elf64_freebsd.c \ >> W> trap.c \ >> W> multiboot2.c \ >> W> + efiserialio.c \ >> W> exc.S >> W> =20 >> W> .PATH: ${BOOTSRC}/i386/libi386 >> W> diff --git a/stand/efi/loader/bootinfo.c = b/stand/efi/loader/bootinfo.c >> W> index 939f2cf4c3fe..d79f59343af1 100644 >> W> --- a/stand/efi/loader/bootinfo.c >> W> +++ b/stand/efi/loader/bootinfo.c >> W> @@ -119,10 +119,17 @@ bi_getboothowto(char *kargs) >> W> if (tmp !=3D NULL) >> W> speed =3D strtol(tmp, NULL, 0); >> W> tmp =3D getenv("efi_com_port"); >> W> - if (tmp =3D=3D NULL) >> W> - tmp =3D getenv("comconsole_port"); >> W> if (tmp !=3D NULL) >> W> port =3D strtol(tmp, NULL, 0); >> W> + if (port <=3D 0) { >> W> + tmp =3D getenv("comconsole_port"); >> W> + if (tmp !=3D NULL) >> W> + port =3D strtol(tmp, NULL, = 0); >> W> + else { >> W> + if (port =3D=3D 0) >> W> + port =3D 0x3f8; >> W> + } >> W> + } >> W> if (speed !=3D -1 && port !=3D -1) { >> W> snprintf(buf, sizeof(buf), = "io:%d,br:%d", port, >> W> speed); >> W> diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c >> W> index 863c9188c72c..051e1a3381d1 100644 >> W> --- a/stand/efi/loader/conf.c >> W> +++ b/stand/efi/loader/conf.c >> W> @@ -81,6 +81,9 @@ struct netif_driver *netif_drivers[] =3D { >> W> =20 >> W> extern struct console efi_console; >> W> extern struct console comconsole; >> W> +#if defined(__amd64__) >> W> +extern struct console eficomconsole; >> W> +#endif >> W> #if defined(__amd64__) || defined(__i386__) >> W> extern struct console nullconsole; >> W> extern struct console spinconsole; >> W> @@ -88,6 +91,9 @@ extern struct console spinconsole; >> W> =20 >> W> struct console *consoles[] =3D { >> W> &efi_console, >> W> +#if defined(__amd64__) >> W> + &eficomconsole, >> W> +#endif >> W> &comconsole, >> W> #if defined(__amd64__) || defined(__i386__) >> W> &nullconsole, >> W> diff --git a/stand/efi/loader/efiserialio.c = b/stand/efi/loader/efiserialio.c >> W> index 375e679d2590..5fbc700f6ac2 100644 >> W> --- a/stand/efi/loader/efiserialio.c >> W> +++ b/stand/efi/loader/efiserialio.c >> W> @@ -69,6 +69,11 @@ static int comc_speed_set(struct env_var = *, int, const void *); >> W> =20 >> W> static struct serial *comc_port; >> W> extern struct console efi_console; >> W> +bool efi_comconsole_avail =3D false; >> W> + >> W> +#if defined(__amd64__) >> W> +#define comconsole eficomconsole >> W> +#endif >> W> =20 >> W> struct console comconsole =3D { >> W> .c_name =3D "comconsole", >> W> @@ -254,11 +259,22 @@ comc_probe(struct console *sc) >> W> char *env, *buf, *ep; >> W> size_t sz; >> W> =20 >> W> +#if defined(__amd64__) >> W> + /* >> W> + * For x86-64, don't use this driver if not running in = Hyper-V. >> W> + */ >> W> + env =3D getenv("smbios.bios.version"); >> W> + if (env =3D=3D NULL || strncmp(env, "Hyper-V", 7) !=3D 0) { >> W> + return; >> W> + } >> W> +#endif >> W> + >> W> if (comc_port =3D=3D NULL) { >> W> comc_port =3D calloc(1, sizeof (struct serial)); >> W> if (comc_port =3D=3D NULL) >> W> return; >> W> } >> W> + >> W> /* Use defaults from firmware */ >> W> comc_port->databits =3D 8; >> W> comc_port->parity =3D DefaultParity; >> W> @@ -308,6 +324,10 @@ comc_probe(struct console *sc) >> W> comc_port_set, env_nounset); >> W> =20 >> W> env =3D getenv("efi_com_speed"); >> W> + if (env =3D=3D NULL) >> W> + /* fallback to comconsole setting */ >> W> + env =3D getenv("comconsole_speed"); >> W> + >> W> if (comc_parse_intval(env, &val) =3D=3D CMD_OK) >> W> comc_port->baudrate =3D val; >> W> =20 >> W> @@ -318,8 +338,13 @@ comc_probe(struct console *sc) >> W> comc_speed_set, env_nounset); >> W> =20 >> W> comconsole.c_flags =3D 0; >> W> - if (comc_setup()) >> W> + if (comc_setup()) { >> W> sc->c_flags =3D C_PRESENTIN | C_PRESENTOUT; >> W> + efi_comconsole_avail =3D true; >> W> + } else { >> W> + /* disable being seen as "comconsole" */ >> W> + comconsole.c_name =3D "efiserialio"; >> W> + } >> W> } >> W> =20 >> W> static int >> W> @@ -489,6 +514,7 @@ comc_setup(void) >> W> { >> W> EFI_STATUS status; >> W> UINT32 control; >> W> + char *ev; >> W> =20 >> W> /* port is not usable */ >> W> if (comc_port->sio =3D=3D NULL) >> W> @@ -498,10 +524,17 @@ comc_setup(void) >> W> if (EFI_ERROR(status)) >> W> return (false); >> W> =20 >> W> - status =3D comc_port->sio->SetAttributes(comc_port->sio, >> W> - comc_port->baudrate, comc_port->receivefifodepth, >> W> - comc_port->timeout, comc_port->parity, >> W> - comc_port->databits, comc_port->stopbits); >> W> + ev =3D getenv("smbios.bios.version"); >> W> + if (ev !=3D NULL && strncmp(ev, "Hyper-V", 7) =3D=3D 0) { >> W> + status =3D = comc_port->sio->SetAttributes(comc_port->sio, >> W> + 0, 0, 0, DefaultParity, 0, DefaultStopBits); >> W> + } else { >> W> + status =3D = comc_port->sio->SetAttributes(comc_port->sio, >> W> + comc_port->baudrate, comc_port->receivefifodepth, >> W> + comc_port->timeout, comc_port->parity, >> W> + comc_port->databits, comc_port->stopbits); >> W> + } >> W> + >> W> if (EFI_ERROR(status)) >> W> return (false); >> W> =20 >> W> diff --git a/stand/i386/libi386/comconsole.c = b/stand/i386/libi386/comconsole.c >> W> index ed1f1aa08ed7..3fbb6a292c19 100644 >> W> --- a/stand/i386/libi386/comconsole.c >> W> +++ b/stand/i386/libi386/comconsole.c >> W> @@ -85,6 +85,20 @@ comc_probe(struct console *cp) >> W> int speed, port; >> W> uint32_t locator; >> W> =20 >> W> +#if defined(__amd64__) >> W> + extern bool efi_comconsole_avail; >> W> + >> W> + if (efi_comconsole_avail) { >> W> + /* >> W> + * If EFI provides serial I/O, then don't use this = legacy >> W> + * com driver to avoid conflicts with the firmware's = driver. >> W> + * Change c_name so that it cannot be found in the = lookup. >> W> + */ >> W> + comconsole.c_name =3D "xcomconsole"; >> W> + return; >> W> + } >> W> +#endif >> W> + >> W> if (comc_curspeed =3D=3D 0) { >> W> comc_curspeed =3D COMSPEED; >> W> /* >>=20 >> --=20 >> Gleb Smirnoff --Apple-Mail=_CC2C5268-3B0E-412D-AB43-A76713CFE030 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

On 31. = Mar 2023, at 02:40, Warner Losh <imp@bsdimp.com> wrote:

Let's back it = out. I didn't get a chance to review it and the duplicated name strikes = me as massively unwise.
Of course, the efi serial driver never = should have had the name comconsole in the first place, imho. It was = OK
on arm where we couldn't = conflict.

So let's back it out and talk about = how we should do this, including the need to possibly just rename the = efi
version of the console driver to something else. IMHO, it = never should have been comconsole in the first
place because = it's configured differently than = comconsole....

Warner

ok, lets start from beginning. The = loader device naming is total mess and should not go this way - it is = not understandable for users and not understandable for = developers.

the config below is perfect example = of the situation:

First the config does = set: 

console=3D"comconsole vidconsole = efi=E2=80=9D

So, we do try = to set serial console, bios video console and efi console. So we have = =E2=80=9Cshared=E2=80=9D config for BIOS and UEFI loader, which should = be totally reasonable from user point of view, but is technically wrong, = because BIOS loader has no idea what is efi console and EFI loader has = no idea what is vidconsole. So this mixture ends up with = message:

console = vidconsole is = invalid!"

And the = user will get the similar error when booting BIOS = setup.

Then we just set = console=3D=E2=80=9Cefi=E2=80=9D.

Then there is = setting for uart=E2=80=A6 

With todays = UEFI setups, the logic is that you set up your hardware, that is, you = configure serial port attributes from firmware setup, and the UEFI = firmware will populate its internal structures with those = values.

Now, first issue is, while developing = uefi loader, it was easy path to reuse bits from BIOS loader. smbios, = acpi, and sadly, comconsole. Sadly, because comconsole is built assuming = x86 IO port features which are not available on other = platforms.

So yes, bios version of comconsole = should not have been used to build UEFI loader at = all.

Now the fun part, even as UEFI does = provide SIO API to access serial ports, to read from port, write to port = and set attributes, it turns out there are UEFI implementation(s?), = where changing some attributes will cause system to hung. Which is the = reason, why we need to set up hardware properly from firmware, and our = generic config should not try to enforce some other value(s). Default = should pick up values from the system. Sure, if the machine operator has = some reason to change those values and has tested the change, we should = have method to change the config, but again, defaults should come from = system setup.

While I see the reasoning to try = to create all those different names, maybe the first thing should be to = look on this as innocent end user, who has no idea about those fine = technical details and historical reasons and is just trying to get = system to behave=E2=80=A6.

just my 2 = cents,
toomas


On Thu, Mar 30, 2023 at 5:31=E2=80=AFPM Gleb = Smirnoff <glebius@freebsd.org> = wrote:
  Wei, Kyle,

this commit hangs loader on real hardware, at least on some
of it.  The loader prints list of consoles and hangs hard:

[Thu Mar 30 20:46:12 2023]^M|^HLoading /boot/loader.conf^M
^M/^Hconsole vidconsole is invalid!^M
^MAvailable consoles:^M
^M    efi^M
^M    comconsole^M
^M    comconsole^M
^M    nullconsole^M
^M    spinconsole^M

Machine is unrecoverable unless you got alternate boot media
and access to BMC console.

First, please DO NOT MFC this as scheduled. Second, let's try
to fix it or back it out if we hear from any other CURRENT
user.

Our configuration isn't special. This is what we got in
loader.conf, related to consoles:

console=3D"comconsole vidconsole efi"
comconsole_speed=3D115200
comconsole_port=3D0x3e8
console=3D"efi"
hw.uart.console=3D"io:1016,br:115200"

On Sat, Mar 18, 2023 at 07:20:33AM +0000, Wei Hu wrote:
W> The branch main has been updated by whu:
W>
W> URL: https://cgit.FreeBSD.org/src/commit/?id=3D927358dd98cb90= 2160093e0dc0bac002d6b43858
W>
W> commit 927358dd98cb902160093e0dc0bac002d6b43858
W> Author:     Wei Hu <whu@FreeBSD.org>
W> AuthorDate: 2023-03-14 15:13:46 +0000
W> Commit:     Wei Hu <whu@FreeBSD.org>
W> CommitDate: 2023-03-18 07:07:35 +0000
W>
W>     amd64 loader: Use efiserialio for Hyper-V = booted systems
W>     
W>     UEFI provides ConIn/ConOut handles for consoles = that it supports,
W>     which include the text-video and serial ports. = When the serial port
W>     is available, use the UEFI driver instead of = direct io-port accesses
W>     to avoid conflicts between the firmware and = direct hardware access, as
W>     happens on Hyper-V (Azure) setups.
W>     
W>     This change enables efiserialio to be built for = efi-amd64 and has
W>     higher order priority vs comconsole, and only = uses efiserialio
W>     if the hypervisor is Hyper-V. When efiserialio = successfully
W>     probes, it will set efi_comconsole_avail=3Dtrue = which will prevent
W>     comconsole from probing in this setup.
W>     
W>     Tested on Hyper-V, ESXi and Azure VMs.
W>     
W>     PR:            =  264267
W>     Reviewed by:    kevans, whu
W>     Tested by:      whu
W>     Obtained from:  Rubicon Communications, = LLC (Netgate)
W>     MFC after:      2 weeks
W>     Sponsored by:   Rubicon = Communications, LLC (Netgate)
W> ---
W>  stand/efi/loader/arch/amd64/Makefile.inc |  1 +
W>  stand/efi/loader/bootinfo.c        =       | 11 ++++++--
W>  stand/efi/loader/conf.c          =         |  6 +++++
W>  stand/efi/loader/efiserialio.c        =    | 43 ++++++++++++++++++++++++++++----
W>  stand/i386/libi386/comconsole.c        =   | 14 +++++++++++
W>  5 files changed, 68 insertions(+), 7 deletions(-)
W>
W> diff --git a/stand/efi/loader/arch/amd64/Makefile.inc = b/stand/efi/loader/arch/amd64/Makefile.inc
W> index 0d9e2648cb59..bd89044bd6c7 100644
W> --- a/stand/efi/loader/arch/amd64/Makefile.inc
W> +++ b/stand/efi/loader/arch/amd64/Makefile.inc
W> @@ -5,6 +5,7 @@ SRCS+=3D       amd64_tramp.S = \
W>      elf64_freebsd.c \
W>      trap.c \
W>      multiboot2.c \
W> +    efiserialio.c \
W>      exc.S
W> 
W>  .PATH:      ${BOOTSRC}/i386/libi386
W> diff --git a/stand/efi/loader/bootinfo.c = b/stand/efi/loader/bootinfo.c
W> index 939f2cf4c3fe..d79f59343af1 100644
W> --- a/stand/efi/loader/bootinfo.c
W> +++ b/stand/efi/loader/bootinfo.c
W> @@ -119,10 +119,17 @@ bi_getboothowto(char *kargs)
W>                  =     if (tmp !=3D NULL)
W>                  =             speed =3D strtol(tmp, NULL, = 0);
W>                  =     tmp =3D getenv("efi_com_port");
W> -                  =   if (tmp =3D=3D NULL)
W> -                  =           tmp =3D = getenv("comconsole_port");
W>                  =     if (tmp !=3D NULL)
W>                  =             port =3D strtol(tmp, NULL, = 0);
W> +                  =   if (port <=3D 0) {
W> +                  =           tmp =3D = getenv("comconsole_port");
W> +                  =           if (tmp !=3D NULL)
W> +                  =                   port =3D = strtol(tmp, NULL, 0);
W> +                  =           else {
W> +                  =                   if (port = =3D=3D 0)
W> +                  =                     =       port =3D 0x3f8;
W> +                  =           }
W> +                  =   }
W>                  =     if (speed !=3D -1 && port !=3D -1) {
W>                  =             snprintf(buf, sizeof(buf), = "io:%d,br:%d", port,
W>                  =                 speed);
W> diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c
W> index 863c9188c72c..051e1a3381d1 100644
W> --- a/stand/efi/loader/conf.c
W> +++ b/stand/efi/loader/conf.c
W> @@ -81,6 +81,9 @@ struct netif_driver *netif_drivers[] =3D {
W> 
W>  extern struct console efi_console;
W>  extern struct console comconsole;
W> +#if defined(__amd64__)
W> +extern struct console eficomconsole;
W> +#endif
W>  #if defined(__amd64__) || defined(__i386__)
W>  extern struct console nullconsole;
W>  extern struct console spinconsole;
W> @@ -88,6 +91,9 @@ extern struct console spinconsole;
W> 
W>  struct console *consoles[] =3D {
W>      &efi_console,
W> +#if defined(__amd64__)
W> +    &eficomconsole,
W> +#endif
W>      &comconsole,
W>  #if defined(__amd64__) || defined(__i386__)
W>      &nullconsole,
W> diff --git a/stand/efi/loader/efiserialio.c = b/stand/efi/loader/efiserialio.c
W> index 375e679d2590..5fbc700f6ac2 100644
W> --- a/stand/efi/loader/efiserialio.c
W> +++ b/stand/efi/loader/efiserialio.c
W> @@ -69,6 +69,11 @@ static int        = comc_speed_set(struct env_var *, int, const void *);
W> 
W>  static struct serial        = *comc_port;
W>  extern struct console efi_console;
W> +bool efi_comconsole_avail =3D false;
W> +
W> +#if defined(__amd64__)
W> +#define comconsole eficomconsole
W> +#endif
W> 
W>  struct console comconsole =3D {
W>      .c_name =3D "comconsole",
W> @@ -254,11 +259,22 @@ comc_probe(struct console *sc)
W>      char *env, *buf, *ep;
W>      size_t sz;
W> 
W> +#if defined(__amd64__)
W> +    /*
W> +     * For x86-64, don't use this driver if not = running in Hyper-V.
W> +     */
W> +    env =3D getenv("smbios.bios.version");
W> +    if (env =3D=3D NULL || strncmp(env, "Hyper-V", 7) = !=3D 0) {
W> +            return;
W> +    }
W> +#endif
W> +
W>      if (comc_port =3D=3D NULL) {
W>              comc_port =3D = calloc(1, sizeof (struct serial));
W>              if (comc_port =3D=3D= NULL)
W>                  =     return;
W>      }
W> +
W>      /* Use defaults from firmware */
W>      comc_port->databits =3D 8;
W>      comc_port->parity =3D DefaultParity;
W> @@ -308,6 +324,10 @@ comc_probe(struct console *sc)
W>          comc_port_set, env_nounset);
W> 
W>      env =3D getenv("efi_com_speed");
W> +    if (env =3D=3D NULL)
W> +            /* fallback to = comconsole setting */
W> +            env =3D = getenv("comconsole_speed");
W> +
W>      if (comc_parse_intval(env, &val) =3D=3D = CMD_OK)
W>              = comc_port->baudrate =3D val;
W> 
W> @@ -318,8 +338,13 @@ comc_probe(struct console *sc)
W>          comc_speed_set, = env_nounset);
W> 
W>      comconsole.c_flags =3D 0;
W> -    if (comc_setup())
W> +    if (comc_setup()) {
W>              sc->c_flags =3D = C_PRESENTIN | C_PRESENTOUT;
W> +            efi_comconsole_avail =3D = true;
W> +    } else {
W> +            /* disable being seen = as "comconsole" */
W> +            comconsole.c_name =3D = "efiserialio";
W> +    }
W>  }
W> 
W>  static int
W> @@ -489,6 +514,7 @@ comc_setup(void)
W>  {
W>      EFI_STATUS status;
W>      UINT32 control;
W> +    char *ev;
W> 
W>      /* port is not usable */
W>      if (comc_port->sio =3D=3D NULL)
W> @@ -498,10 +524,17 @@ comc_setup(void)
W>      if (EFI_ERROR(status))
W>              return = (false);
W> 
W> -    status =3D = comc_port->sio->SetAttributes(comc_port->sio,
W> -        comc_port->baudrate, = comc_port->receivefifodepth,
W> -        comc_port->timeout, = comc_port->parity,
W> -        comc_port->databits, = comc_port->stopbits);
W> +    ev =3D getenv("smbios.bios.version");
W> +    if (ev !=3D NULL && strncmp(ev, "Hyper-V", = 7) =3D=3D 0) {
W> +            status =3D = comc_port->sio->SetAttributes(comc_port->sio,
W> +                0, 0, 0, = DefaultParity, 0, DefaultStopBits);
W> +    } else {
W> +            status =3D = comc_port->sio->SetAttributes(comc_port->sio,
W> +                = comc_port->baudrate, comc_port->receivefifodepth,
W> +                = comc_port->timeout, comc_port->parity,
W> +                = comc_port->databits, comc_port->stopbits);
W> +    }
W> +
W>      if (EFI_ERROR(status))
W>              return = (false);
W> 
W> diff --git a/stand/i386/libi386/comconsole.c = b/stand/i386/libi386/comconsole.c
W> index ed1f1aa08ed7..3fbb6a292c19 100644
W> --- a/stand/i386/libi386/comconsole.c
W> +++ b/stand/i386/libi386/comconsole.c
W> @@ -85,6 +85,20 @@ comc_probe(struct console *cp)
W>      int speed, port;
W>      uint32_t locator;
W> 
W> +#if defined(__amd64__)
W> +    extern bool efi_comconsole_avail;
W> +
W> +    if (efi_comconsole_avail) {
W> +            /*
W> +             * If EFI provides = serial I/O, then don't use this legacy
W> +             * com driver to = avoid conflicts with the firmware's driver.
W> +             * Change c_name = so that it cannot be found in the lookup.
W> +             */
W> +            comconsole.c_name =3D = "xcomconsole";
W> +            return;
W> +    }
W> +#endif
W> +
W>      if (comc_curspeed =3D=3D 0) {
W>              comc_curspeed =3D = COMSPEED;
W>              /*

--
Gleb Smirnoff

= --Apple-Mail=_CC2C5268-3B0E-412D-AB43-A76713CFE030-- From nobody Fri Mar 31 06:49: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 4PnrWy0GPsz422t9 for ; Fri, 31 Mar 2023 06:50:22 +0000 (UTC) (envelope-from Alexander@leidinger.net) Received: from mailgate.Leidinger.net (bastille.leidinger.net [89.238.82.207]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (P-256)) (Client CN "mailgate.leidinger.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PnrWx40Yfz49Tf for ; Fri, 31 Mar 2023 06:50:21 +0000 (UTC) (envelope-from Alexander@leidinger.net) Authentication-Results: mx1.freebsd.org; none Received: from outgoing.leidinger.net (p5b165130.dip0.t-ipconnect.de [91.22.81.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-256) client-signature ECDSA (P-256)) (Client CN "outgoing.leidinger.net", Issuer "R3" (verified OK)) by mailgate.Leidinger.net (Postfix) with ESMTPSA id 6209823BBB for ; Fri, 31 Mar 2023 08:50:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leidinger.net; s=outgoing-alex; t=1680245416; 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; bh=zUTnDr9gB8EecKMaFqSivzlk1OoN8Y6sD+Ddtu7p8wk=; b=HLw45wPWnpYyDcYa1BjsyXI0Eu2xZEErMzLJX4BpxngOO6uybUzfejysdBDHSmsa4prO5h 3jQQslxJjj3x286KhaYbtwHXw6iTEub+3EM8pMWbCEqvqbPPpD3Q4IXPywqrS8G+lr2scx w23W5dXB0uTNgzQGDYbj/a9cXTls1u60/x01VuFNq3GCPxzSbnRe2iYcwPKT2tM7R31MfQ r1y6oEr/fK4lq0kBkPmjB+GgWYE8OO/+G+Je3yQuM2/iS/JaFMhkrBA7DEz3PbO5ucPV2B Wsg3pcL6gwqeMmp/ZyyDcLeAEgGHUiitvrZpK54gGCJL3M2vQIH+X69iItkqEQ== Received: from webmail.leidinger.net (localhost [127.0.0.1]) by outgoing.leidinger.net (Postfix) with ESMTP id D5B883E86 for ; Fri, 31 Mar 2023 08:49:42 +0200 (CEST) Received: from www (uid 80) (envelope-from Alexander@leidinger.net) id a1066 by webmail.leidinger.net (DragonFly Mail Agent v0.13+ on webmail.leidinger.net); Fri, 31 Mar 2023 08:49:42 +0200 Date: Fri, 31 Mar 2023 08:49:41 +0200 Message-ID: <20230331084941.Horde.n61WXEbWu5b0PoAV6B7XguA@webmail.leidinger.net> From: Alexander Leidinger To: Fernando =?utf-8?b?QXBlc3RlZ3XDrWE=?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 5faf90050e6c - main - committers-ports.dot: Bring file up to date. In-Reply-To: <202303301222.32UCMbFN065031@gitrepo.freebsd.org> Accept-Language: de,en Content-Type: multipart/signed; boundary="=_ZYuJ3dX7QRWzwhGK046GgBZ"; 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 X-Rspamd-Queue-Id: 4PnrWx40Yfz49Tf X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:34240, ipnet:89.238.64.0/18, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N This message is in MIME format and has been PGP signed. --=_ZYuJ3dX7QRWzwhGK046GgBZ Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Quoting Fernando Apestegu=C3=ADa (from Thu, 30 Mar=20= =20 2023=2012:22:37 GMT): > The branch main has been updated by fernape: > > URL:=20=20 >=20https://cgit.FreeBSD.org/src/commit/?id=3D5faf90050e6c280c314bca58ee617= 07d8bfdbaf3 > > commit 5faf90050e6c280c314bca58ee61707d8bfdbaf3 > Author: Fernando Apestegu=C3=ADa > AuthorDate: 2023-03-30 10:03:00 +0000 > Commit: Fernando Apestegu=C3=ADa > CommitDate: 2023-03-30 12:17:10 +0000 > > committers-ports.dot: Bring file up to date. > > Many listed committers are actually alumni. > > Related to this change: 52f576459855 > > Approved by: bcr@ > Differential Revision: https://reviews.freebsd.org/D39340 I think I noticed some people to be put into the alumi section, which=20=20 are=20still active src committers (e.g. gnn). Given the recent=20=20 discussion=20about some relaxed handling of the commit bits (sort of:=20=20 all=20or nothing, but seek review when in an unfamiliar area): do we=20=20 really=20want to put someone into the X-alumni section, if this person=20= =20 is=20still active in the Y-area? From a bean-counting perspective, I understand that ports!=3Dsrc, but=20= =20 people=20looking at ports-alumni may understand that a particular person=20= =20 may=20have left the project, instead of not doing something anymore in a=20= =20 particular=20subset of the project. Bye, Alexander. --=20 http://www.Leidinger.net=20Alexander@Leidinger.net: PGP 0x8F31830F9F2772BF http://www.FreeBSD.org netchild@FreeBSD.org : PGP 0x8F31830F9F2772BF --=_ZYuJ3dX7QRWzwhGK046GgBZ Content-Type: application/pgp-signature Content-Description: Digitale PGP-Signatur Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIzBAABCAAdFiEER9UlYXp1PSd08nWXEg2wmwP42IYFAmQmgoUACgkQEg2wmwP4 2IaAFQ//XzqZBSf256n1if4MW5wFPXS/sncLU1dK80t9lg5k0gaBLSwmJm/rKHHF iPXve1ClnWss2OJEAPUKRlnvfnpL1OBdXVwZvhkYM+NMg1jMZIWHXFvhDkna4k3y 6v1Yk44b9rdnPIlNhDthVufXvje1kwWqD2gTr6PMNB8DhBkImInQktH/ktIWGllD JgxTrkZlz/F46tiTbrBi+wyYQJjc6Qf+SWs19v9YqfdkGuGfCbP671x6RymO4vkV urWphISIk97AN3ec4K7cWwbzji8PtZzd8lfaAtWm2KkSzUCrujjmiVK8bV7Q2Ghk zxktlOK8izPRV3wc2SVnJIo/FeK19O+DdXVBhgkmphpASOnQJvLIzLvIcfVJbKW4 cTUh668e/GPpWbUEoHti8nBWNTvVODWafI1OtZVX2HdXRWl1VHIeVw/Pi1zYfSCY 2ggF5dWtKjVxL6Sd3VFw4FhqKalLDCFl3tBSPt1bZevOjeM4a2O+Of9+o7+qz/An M7psDNPZ0n3j29fy9bn+KLEDDq071p0Z5GejCPrXX/6gTWyJKfeqWIc4suF2OjJG c6CRqyRhBMZQk7HZksKXIQvqXFluWpulq8bxK10wS4/w+aTld5s+f3MleREfhdHI r7ES93bsNedwRM7DNflYeeQI/6Rt9yedRt8vTSDomf5M4YrDss8= =kqmb -----END PGP SIGNATURE----- --=_ZYuJ3dX7QRWzwhGK046GgBZ-- From nobody Fri Mar 31 07:03: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 4PnrqG1FB9z423Fn; Fri, 31 Mar 2023 07: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 4PnrqG0hpfz4Cnm; Fri, 31 Mar 2023 07: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=1680246218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7/JidV82KIMYZ37wYYAzdsdAx/1GUNf5K/c7wumZAM=; b=oWBPqd46h6yXiTRc0CfK7jQH3pzp2hKSfBmWNQNPFk7YxB73077lmEPQnZ4zVQiIGuJMA4 psSLKlaGVoeeS2ZljBheaKtK9umEyGj60/jrnqPyWdMUXYRr7i7tS30AWUeDnoUTX41VI0 8LZ5LJ1Ihif3e0qOxMQcgmdsVG34EYtiA3qpnMhC2FLDkDmABATZ7758Kvqwe5Jigbg22j HGOkNwLFxej4kT5x4phqvPDoA8j2JGLilwl4ApCygqI1LXLrhRnx+GbAH2P2+2z4ag94iU JnYmlvPBmlFrZgnvopM4tF+ajsKJyJB1dHx5fhhZR68VyzQRMMPf3Bsha3Ho5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680246218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7/JidV82KIMYZ37wYYAzdsdAx/1GUNf5K/c7wumZAM=; b=Kmya8Maoee1BqIk9rYGS36Q+6zcOJTKyEyui4guKwICsBMrsBdy6WyzhPu8Xkh4EUX7kg8 EdSXdKN1GpcjJ5gs1qWsmqbmO0V8z+mjlffCxvaMKiZMnxMBJJKMyPZXUWhE/o2IWfjHwY rKqv2QWHIM23WvlDgl6G8g6bkoPIGEuffiuEdnBWUjW3cKegUFrkDveJTAx9VtWyvs3nPk WBzdTHkG4rS5oD451QNvxmC7f0IibtjPxqSfnDxanxL64bmsjzbkg5FHtNM3OiJddy6NSj IPXvz8voDSk6RBpoD0Sm4VPr5hnCKcvDZEiaMPEB7g2+xZrkqQMcGycKpAhUlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680246218; a=rsa-sha256; cv=none; b=r4HM44gwAsAwChA5er7BSLxsNbyj1efUqOlz22kSNm6Czw7CnE27WD91BaSkWTI66oy60c WdyQHz0dbabTYpXNXU5p7qfGS9P9bHZiU+yovl2fadhn4I89jKTewAZU2agxIeSCEl6i+4 vtdPw/rf5UAjhYjTod7LjkVuQUUXIGUJZU0m0TS5lXuJvUnTFBq6mhsde1RdnIMyLuOL8A yvC3EYIGuLqtctdJQNFl2Tj8X5iQg+JIFmCBdL3kyHGNH3QY8NQ4/z/Q5IImy1KGPzfkeJ ZvEYrpbqFNUF9Dd3lOJd7vNi/JTuTr+kuQw+U7UTmCNSHZpHZHij1k0EchOZmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnrqF6tbXzkkT; Fri, 31 Mar 2023 07:03:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V73bHw009862; Fri, 31 Mar 2023 07:03:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V73bBT009861; Fri, 31 Mar 2023 07:03:37 GMT (envelope-from git) Date: Fri, 31 Mar 2023 07:03:37 GMT Message-Id: <202303310703.32V73bBT009861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Juraj Lutter Subject: git: c322cf0f489b - main - committers-ports.dot: Fix double 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: otis X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c322cf0f489b9317fab48f4b12f26bc23ed10098 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/src/commit/?id=c322cf0f489b9317fab48f4b12f26bc23ed10098 commit c322cf0f489b9317fab48f4b12f26bc23ed10098 Author: Juraj Lutter AuthorDate: 2023-03-30 18:24:04 +0000 Commit: Juraj Lutter CommitDate: 2023-03-31 07:02:19 +0000 committers-ports.dot: Fix double space Fix double space in pgollucci's entry. Approved by: fernape Differential Revision: https://reviews.freebsd.org/D39345 --- share/misc/committers-ports.dot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 622b098dbcff..42d9032e94ba 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -108,7 +108,7 @@ pav [label="Pav Lucistnik\npav@FreeBSD.org\n2003/11/12\n2013/12/20"] pawel [label="Pawel Pekala\npawel@FreeBSD.org\n2011/03/11\n2018/02/24"] pclin [label="Po-Chien Lin\npclin@FreeBSD.org\n2013/02/11\n2014/10/17"] pgj [label="Gabor Pali\npgj@FreeBSD.org\n2009/04/12\n2018/11/06\n2018/11/06"] -pgollucci [label="Philip M. Gollucci\npgollucci@FreeBSD.org\n2008/07/21\n2017/03/29"] +pgollucci [label="Philip M. Gollucci\npgollucci@FreeBSD.org\n2008/07/21\n2017/03/29"] rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23\n2015/01/21"] rezny [label="Matthew Rezny\nrezny@FreeBSD.org\n2017/01/09\n2019/02/04"] rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/07/21\n2011/07/05"] From nobody Fri Mar 31 07:14: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 4Pns4L4Z6Zz424Cr; Fri, 31 Mar 2023 07:14: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 4Pns4L40vGz4FgQ; Fri, 31 Mar 2023 07:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680246898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rLkoBpnwMENiibgItwOM/wJI2kgbUmPEp/STlUvK7Zo=; b=fPiPXsamScx2KMWR9QD25rvTHSyehRGFnnSWvdjtCHmGPlFP9tOB62RMAxlgxvr5bdCapp PYUxAKK//gaeNnsxiwKSSLj3Si/C29Yn/psE0KhQP1AsHDmMHPmOjA42w8jF/hZ0otgG4K zmc2rmCqy7EcA913VnCfCkBxo6B8kDgU58WcycVg122jAy/t4DvIAc/u0RwqlZ4RX36DuW w7UR+Z3r9H+6Z13pljhu662stjIBMz1l4m2wffU7VEcDR8r3hNi31a+ACEdWd4TYDitGhe oSQ4vHQq9HNYFYBolN8di8aqWHgjqiu92dhPeAkVpsmL9U1xX+WGhnWg2Ywy5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680246898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rLkoBpnwMENiibgItwOM/wJI2kgbUmPEp/STlUvK7Zo=; b=vl2kT166eHceWsfjBVcrkfv4TPeLLRSg08C/xWEYYmIijR8hlr85SNwEX8dsXuxZtphuMg TBnu+lszIhtRPBiNTunMG70+Qes0XK8sm0ebyHWOoqKR91kob3MZnbDB55XVwZ9uJ/IN8M 7Kgz0CZoqq0JdPnPYetxXVe5n/TOiFqfNGlg1tJHTGjvPy8HYz7yfFq490kXIH62azTP9b /1BkEPypuxUiYfMTf8Emus561WYp6ORU2l0SONmfmjFsv63lBIPRRk6xnE0/0FfYtCUZ/M P4p5iM2mYur75gHtPuwok5M4P0dbbc83Wrw7upvNizFZWhPO7GyNlOUZtJSGaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680246898; a=rsa-sha256; cv=none; b=eLybP5KFoQF0ZFLgKu4lblZ6G7bEgMVyWNsOKa6johWbxLVv/f5BE8bsivuvz1hVYhRFyS CPPDnp01F7FC2A+6OkRBf20lL1wBcCIpllgZulCcERKz+BgoRPtjI5Xl8+Ub4RTLelV+KE WwuHnvn6+3l1MJJt26TYVuy4tlDF01yhAZJHg6v3vPowM4kZjS3rNNdPsIzXB2FWvgHOqx jasMdae8dBEc2C+xFyyZwSWRCi9ZyASKyJDNcgv0Kj9M1u9FICo1Ak7bKoyqe0nMwK5lD1 kTdUjPUDxZPra4wsb+RCgqYIQHeC0whObvz95/xcDcIkkr0A6g/0wGiwIUWAnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pns4L33wtzlFx; Fri, 31 Mar 2023 07:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V7EwX6026224; Fri, 31 Mar 2023 07:14:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V7EwoA026223; Fri, 31 Mar 2023 07:14:58 GMT (envelope-from git) Date: Fri, 31 Mar 2023 07:14:58 GMT Message-Id: <202303310714.32V7EwoA026223@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: 3f0083c4e30a - main - LinuxKPI: 802.11: use ic_printf more consistently List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 3f0083c4e30ab41fad1e93e4138767df42dbdf20 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3f0083c4e30ab41fad1e93e4138767df42dbdf20 commit 3f0083c4e30ab41fad1e93e4138767df42dbdf20 Author: Bjoern A. Zeeb AuthorDate: 2023-03-31 07:10:37 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-03-31 07:14:32 +0000 LinuxKPI: 802.11: use ic_printf more consistently Rather than printing ic_name ourselves (or not at all) use ic_printf() as a common function from net80211 where possible. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 5b9792ed664e..3b276fa2f2ec 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2172,7 +2172,7 @@ lkpi_wme_update(struct lkpi_hw *lhw, struct ieee80211vap *vap, bool planned) txqp.aifs = wmep->wmep_aifsn; error = lkpi_80211_mo_conf_tx(hw, vif, ac, &txqp); if (error != 0) - printf("%s: conf_tx ac %u failed %d\n", + ic_printf(ic, "%s: conf_tx ac %u failed %d\n", __func__, ac, error); } LKPI_80211_LHW_UNLOCK(lhw); @@ -2291,7 +2291,7 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], error = lkpi_80211_mo_start(hw); if (error != 0) { - printf("%s: failed to start hw: %d\n", __func__, error); + ic_printf(ic, "%s: failed to start hw: %d\n", __func__, error); mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); return (NULL); @@ -2300,7 +2300,7 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], error = lkpi_80211_mo_add_interface(hw, vif); if (error != 0) { IMPROVE(); /* XXX-BZ mo_stop()? */ - printf("%s: failed to add interface: %d\n", __func__, error); + ic_printf(ic, "%s: failed to add interface: %d\n", __func__, error); mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); return (NULL); @@ -3100,7 +3100,7 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) */ skb = dev_alloc_skb(hw->extra_tx_headroom + m->m_pkthdr.len); if (skb == NULL) { - printf("XXX ERROR %s: skb alloc failed\n", __func__); + ic_printf(ic, "ERROR %s: skb alloc failed\n", __func__); ieee80211_free_node(ni); m_freem(m); return; @@ -3288,8 +3288,8 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, int cflags = chan_flags; if (channels[i].flags & IEEE80211_CHAN_DISABLED) { - printf("%s: %s: Skipping disabled chan " - "[%u/%u/%#x]\n", ic->ic_name, __func__, + ic_printf(ic, "%s: Skipping disabled chan " + "[%u/%u/%#x]\n", __func__, channels[i].hw_value, channels[i].center_freq, channels[i].flags); continue; @@ -3312,8 +3312,8 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, nflags, bands, chan_flags); /* net80211::ENOBUFS: *n >= maxchans */ if (error != 0 && error != ENOBUFS) - printf("%s: %s: Adding chan %u/%u/%#x/%#x/%#x/%#x " - "returned error %d\n", ic->ic_name, + ic_printf(ic, "%s: Adding chan %u/%u/%#x/%#x/%#x/%#x " + "returned error %d\n", __func__, channels[i].hw_value, channels[i].center_freq, channels[i].flags, nflags, chan_flags, cflags, error); @@ -3358,8 +3358,8 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, int cflags = chan_flags; if (channels[i].flags & IEEE80211_CHAN_DISABLED) { - printf("%s: %s: Skipping disabled chan " - "[%u/%u/%#x]\n", ic->ic_name, __func__, + ic_printf(ic, "%s: Skipping disabled chan " + "[%u/%u/%#x]\n", __func__, channels[i].hw_value, channels[i].center_freq, channels[i].flags); continue; @@ -3382,8 +3382,8 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, nflags, bands, chan_flags); /* net80211::ENOBUFS: *n >= maxchans */ if (error != 0 && error != ENOBUFS) - printf("%s: %s: Adding chan %u/%u/%#x/%#x/%#x/%#x " - "returned error %d\n", ic->ic_name, + ic_printf(ic, "%s: Adding chan %u/%u/%#x/%#x/%#x/%#x " + "returned error %d\n", __func__, channels[i].hw_value, channels[i].center_freq, channels[i].flags, nflags, chan_flags, cflags, error); From nobody Fri Mar 31 07:50: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 4PnssF6mgbz4265V; Fri, 31 Mar 2023 07:50: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 4PnssF6GDwz4JZN; Fri, 31 Mar 2023 07:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680249025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q4Y88Rm/zrJXM+Nq7mU4RldCuQ0CCQgN7HRxXLTEXkE=; b=vVK2gHOyWghHnKZi+6Yi+NIkytyqySahTkd2dzOeDjRjja4Ql2kjK/CFCP57NtJRK8oJlM iOSTzFfxK89qbucDe64kln/Fdr4H/hV1iHQQcLdzlJ3Y/iCmvxpTN48Aux11SzaAgcL1ep kvKG3w7Llj6Cqu5pDzMSzZ+SxVcBoPndjlnV/LBjo5gVDRrou89HvDg2ZjqSvu21zCn3as c3RKvgGotkBEFOYMxwX42wbSVTToL7i8lAFZVJcNqQBGJE09HlzGVzsu8dDMaaycQe4opU jJG1griKhzhwmdkCs3z7bcq3YheEjrqhzbCo4Yh6fo3MGIJmmx+SDdHDdaC/Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680249025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q4Y88Rm/zrJXM+Nq7mU4RldCuQ0CCQgN7HRxXLTEXkE=; b=KeWtsJCQsmnuwy7ksxD5I8pJtf6yQlBrWPrja0mMKohnkx4LkRg+d7mA5nr+XR7reESKLp 8wg2j/7g/IQDBM4z2riGtHOt0iCUmysgh9BT+QqsdeGNA1DZU5rG6cUqDnLTbqu1rnqbyV mL8WBBAM/ALG5r+3dKz4kOYA8/QC/sWkwi3wGWv1/nVBCP+maCF0DWC+MtEPHoqiX66flA i8XPQcRqTfRDnqKHZb/5ZBszoKd5+3/ZS6gUD7yZqTXWxSWo7TKvZ9kP2fLk/hLpCTI3W4 7RrzPArC4shU15DyorOtVkEwfTOY1GllNY48qwWMPTtZNAuRhWaVB4i6d3trBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680249025; a=rsa-sha256; cv=none; b=iLyAfNpiPUC/gapaYfM3BTN76NJeM1PgU2B2KMwWwJezE1YimHXSJJsinYLIQ6xoowXiXq t9Ul97Yk92WRqHaTDMRU12sh1FsUcb6BgvFvCFjYbigqn3vUBBk9TIK62wibEU2dJjWIEw QASPi8S0ysBGBu5WJi9BVMMQ1F/edZD0CumHkLH95om4W2AtBs/B8Fflu9t4EVcTJ5i/7H yAnUZf75lnZPhe0vTRi6k+W5n2MRsGe9bdg9NuEZLKse1yUY9MUIgScEYkY7Aw02H/olOA DUOkLHFbk1BpHsTNJS89sG0Yh2kgDO9ofuMtlVns7Q5MnqZZiUBHelNF4dHMlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnssF5Mmtzm33; Fri, 31 Mar 2023 07:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V7oPfj084481; Fri, 31 Mar 2023 07:50:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V7oPK5084480; Fri, 31 Mar 2023 07:50:25 GMT (envelope-from git) Date: Fri, 31 Mar 2023 07:50:25 GMT Message-Id: <202303310750.32V7oPK5084480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 589b82662409 - stable/12 - devd.conf.5: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 589b8266240955601985ffc8ba917ec3571204be Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=589b8266240955601985ffc8ba917ec3571204be commit 589b8266240955601985ffc8ba917ec3571204be Author: Gordon Bergling AuthorDate: 2023-03-26 07:43:58 +0000 Commit: Gordon Bergling CommitDate: 2023-03-31 07:50:11 +0000 devd.conf.5: Fix a typo in the manual page - s/deteted/detected/ (cherry picked from commit 328ebd4680563d62d79c724ab6bbeaadafba7997) --- sbin/devd/devd.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5 index 76560e23f490..b0bdb0c28636 100644 --- a/sbin/devd/devd.conf.5 +++ b/sbin/devd/devd.conf.5 @@ -547,7 +547,7 @@ device has detected the lid openinging. .It Li PMU Ta Li POWER Ta ACLINE Ta The .Xr pmc 4 -device has deteted an AC line state ($notify=0x00 is offline, 0x01 is online). +device has detected an AC line state ($notify=0x00 is offline, 0x01 is online). .It Li PMU Ta Li USB Ta overvoltage Ta An over-voltage condition on the power lines for the USB power pins. .It Li PMU Ta Li USB Ta plugged Ta From nobody Fri Mar 31 07:50: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 4Pnssh2479z42693; Fri, 31 Mar 2023 07:50: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 4Pnssh1HYsz4Jpj; Fri, 31 Mar 2023 07:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680249048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=60U20L+tRmQhQAm4rsQqusnHh3J5GmtFKRS9PGPh5O8=; b=TFlz9fy0O4gKYysRyhl9F9GxGzZtxI/TIJwmvSXkMaHSjxuKhCHqNGw+kUaHpazsVP7ztm OrpR+IANXtv+sM/gVs9AHePKqq1HRsM8C/X9ZeB9fXrsmqB7p+ik+XC4fSbzthDYvA3uZm LuF76Jk/igos+wBKOEqhE3Xiy0QtAtTE0rMsI4Cydvu9sZo3QxulvLoyaYQ6tHUGELIPZ2 ahDeOCUVaHrRNTIZWDQY2D6X4KO1VB//CcFhJOCHiIJ/JEBBYoWl+MmSbTboH33PtDoPu2 Y1bM+yDNoGheWD+pPQzup94p7hjQG30i+emTYMZvoc6AYcELzbks9/RADilBdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680249048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=60U20L+tRmQhQAm4rsQqusnHh3J5GmtFKRS9PGPh5O8=; b=fSdttldbTrvAuhUewM5bfh43WPOhpv04XLi2Psrkv1R4nWUnUNedSErVoOIROUFJBhGp2l Qn+R/BpliVpwSegJhFy7N41wbywAcMqncmOm6GXTU+bHH9tszx7cwX7RZhIdl4y4nzTtl9 hTH8PBkGRNfuFOv4OrtJRsFKV+M6dhax183KVHNMM2cxvbayOdp0LB2EXakbapVIvDw9uD FLqcm8A6sjIPeaeEn/UGjakigkhkb0V220TqA5sMx0crKUPw15hhqKHcJuwxDYRIiC7BSQ zvAP4gm1IESmQkBIGBLa46Q3gsS5JupFA8pULt2SZ8VnfcJ9T9rWY6USTQ7zMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680249048; a=rsa-sha256; cv=none; b=B0QJnOD3XxD9mnwuGBbF4byOn4PMvKxBh8bcogXFX1OQwOsK5wWOnI9hc/39AxVFuSjjgP FsLt8xaSMek2UgtYqPKt4J5G+0nidqPIsgRsYZzwpqjitBbYWNmAJHx09qvjSUNI6WhsTA KAP9UE76aCNUqNF3GpPWqGSI5KYNjFC8oM8mr312yC4ajZ8AW44CNYvtfT9UFVFy6Xn3KU F5AKF1UySg81o7XkmQCCm+i4j5tbYJZvbQNdrYhGiW3Jf0YjqaQD0aKoaZtPqzQQXtZWvT trbNEZyptFuot1U/ycrB23InJ9dbrzxymOoTFOa+R8ThQphDblXfK/m7NNRKNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnssh0L1rzlxc; Fri, 31 Mar 2023 07:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V7olUU085540; Fri, 31 Mar 2023 07:50:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V7olJW085539; Fri, 31 Mar 2023 07:50:47 GMT (envelope-from git) Date: Fri, 31 Mar 2023 07:50:47 GMT Message-Id: <202303310750.32V7olJW085539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 374f3920c72a - stable/13 - devd.conf.5: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 374f3920c72a8d5708a49810a32482c270a576b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=374f3920c72a8d5708a49810a32482c270a576b4 commit 374f3920c72a8d5708a49810a32482c270a576b4 Author: Gordon Bergling AuthorDate: 2023-03-26 07:43:58 +0000 Commit: Gordon Bergling CommitDate: 2023-03-31 07:50:37 +0000 devd.conf.5: Fix a typo in the manual page - s/deteted/detected/ (cherry picked from commit 328ebd4680563d62d79c724ab6bbeaadafba7997) --- sbin/devd/devd.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5 index 632bc759ddc1..58900112fb73 100644 --- a/sbin/devd/devd.conf.5 +++ b/sbin/devd/devd.conf.5 @@ -545,7 +545,7 @@ device has detected the lid openinging. .It Li PMU Ta Li POWER Ta ACLINE Ta The .Xr pmc 4 -device has deteted an AC line state ($notify=0x00 is offline, 0x01 is online). +device has detected an AC line state ($notify=0x00 is offline, 0x01 is online). .It Li PMU Ta Li USB Ta overvoltage Ta An over-voltage condition on the power lines for the USB power pins. .It Li PMU Ta Li USB Ta plugged Ta From nobody Fri Mar 31 10:17: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 4Pnx7Z493lz42GfN for ; Fri, 31 Mar 2023 10:18:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (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 4Pnx7Z0TnTz3JHj for ; Fri, 31 Mar 2023 10:18:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x535.google.com with SMTP id eg48so87530238edb.13 for ; Fri, 31 Mar 2023 03:18:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; t=1680257880; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=REyLu3OyMSUMDwiUUbHWmBuAEX3tTANEihNpeyKTC4g=; b=vQjgXLLHQ/FQAu9FuQRrcPNH0dDP5mOysFnNvzhOslOW4QxXLz4IulrL88L22zoAVR cZhr2QlMosljVJlnUtbfoOJdK1dm0LaLamLMoF67M/2KoKU6P/vXekglkMpuS7tTNnJW 9RLkPYPQK1joi2ikF3DEX4/UepSD3QGlSpVBXni6ID/v0oBLJ2jLepQbhLQjFROjG8Gx d0t+FoQAjIAOiQeY6NqL1tUxA/u22LleLFLJGBoYGMQPWqccWV31DTQ8+AkqjWd1vHE0 G7MbONoJlV8K48W0jp4wZFH0jkTp9oTKtpSz7aAi/6eTqAJGHUpMv0oVZErLveyrH6ND vnTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680257880; 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=REyLu3OyMSUMDwiUUbHWmBuAEX3tTANEihNpeyKTC4g=; b=IlhxUDcPk3ZRdGW7a+ktZF9fUOGrSUwEhpiI6wCDKwUMWP3/I30fbmlymBjXa/97/z 658DUakR1KjjtUg18R3O2Ip6zvaycw+6OfhugEyZ1yrXiVK0cRHxrycFy5VdjeWYNXvN hz4SZp89LFmC/mJg6FEV+hTqYXbZZKYmd0slZ9vjbF/4mm+s/nzhW8dC80FDG7sPhu1N DMnC4x19ooHpoa1CpCblarXiA+J9K1tuvuk3SuU6Lvt/9KkO6kixFvVhtwEg3nVAhA0O sztQMC/+9fD2ROyEDb6lMPVLCLzfnZxpIPvyO+6DThZzjfjh08mBRmyOExIpE9Pm8a4F mMTg== X-Gm-Message-State: AAQBX9ehrF2R62syuCkp1e+0cl0c0dvnUxAm0snN69y5asKZohxU1nLT VGbh15TlG496b824nHjwS7bZbDTKz0R1BBVEVrKb8w== X-Google-Smtp-Source: AKy350bxL8irKOoon0PRgGRANzKIElG7DdGGiJkNweoqkDPbi0xkVqSol51xl1EFqJdDyVatod8dC7AwWFiT2uE/TvA= X-Received: by 2002:a17:906:9f0b:b0:8b1:38d6:9853 with SMTP id fy11-20020a1709069f0b00b008b138d69853mr12036464ejc.2.1680257880552; Fri, 31 Mar 2023 03:18:00 -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: <202303180720.32I7KXOc030612@gitrepo.freebsd.org> <256C0F87-8B73-4E5E-9B5E-E9BF00DEC019@me.com> In-Reply-To: <256C0F87-8B73-4E5E-9B5E-E9BF00DEC019@me.com> From: Warner Losh Date: Fri, 31 Mar 2023 04:17:49 -0600 Message-ID: Subject: Re: git: 927358dd98cb - main - amd64 loader: Use efiserialio for Hyper-V booted systems To: Toomas Soome Cc: Gleb Smirnoff , Wei Hu , src-committers , "" , "" , imp@freebsd.org, gallatin@freebsd.org, kevans@freebsd.org Content-Type: multipart/alternative; boundary="0000000000001a12e105f82f8633" X-Rspamd-Queue-Id: 4Pnx7Z0TnTz3JHj X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --0000000000001a12e105f82f8633 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Mar 31, 2023 at 12:22=E2=80=AFAM Toomas Soome wrote= : > > > On 31. Mar 2023, at 02:40, Warner Losh wrote: > > Let's back it out. I didn't get a chance to review it and the duplicated > name strikes me as massively unwise. > Of course, the efi serial driver never should have had the name comconsol= e > in the first place, imho. It was OK > on arm where we couldn't conflict. > > So let's back it out and talk about how we should do this, including the > need to possibly just rename the efi > version of the console driver to something else. IMHO, it never should > have been comconsole in the first > place because it's configured differently than comconsole.... > > Warner > > > ok, lets start from beginning. The loader device naming is total mess and > should not go this way - it is not understandable for users and not > understandable for developers. > > the config below is perfect example of the situation: > > First the config does set: > > console=3D"comconsole vidconsole efi=E2=80=9D > > > So, we do try to set serial console, bios video console and efi console. > So we have =E2=80=9Cshared=E2=80=9D config for BIOS and UEFI loader, whic= h should be > totally reasonable from user point of view, but is technically wrong, > because BIOS loader has no idea what is efi console and EFI loader has no > idea what is vidconsole. So this mixture ends up with message: > I strongly disagree this is wrong. You have a boot loader that may have one of many console devices. Not all may be present. > console vidconsole is invalid!" > > > And the user will get the similar error when booting BIOS setup. > Yes. This message is a bit bogus: it just means we don't have a comconsole configured. And that's fine. It's like if I had ifconfig_ixl0=3DDHCP and ifconfig_xe0=3DDHCP in my rc.co= nf file, imho. It says if they are there, use them. Otherwise don't. We don't have a eth device that's a generic thing. Nor should comconsole be all possible uarts. > Then we just set console=3D=E2=80=9Cefi=E2=80=9D. > > Then there is setting for uart=E2=80=A6 > This is an orthogonal issue. > With todays UEFI setups, the logic is that you set up your hardware, that > is, you configure serial port attributes from firmware setup, and the UEF= I > firmware will populate its internal structures with those values. > Agreed. Still orthogonal to the naming issue. > Now, first issue is, while developing uefi loader, it was easy path to > reuse bits from BIOS loader. smbios, acpi, and sadly, comconsole. Sadly, > because comconsole is built assuming x86 IO port features which are not > available on other platforms. > Agreed. However, we are stuck with comconsole =3D=3D talk to the hardware a= nd bypass the UEFI firmware. We need to have a efiserial and efivideo device, even for x86, so that we can specify things more closely. Overloading comconsole is unwise. > So yes, bios version of comconsole should not have been used to build UEF= I > loader at all. > Yes and no. It's in use today, so saying it shouldn't is about 10 years too late. > Now the fun part, even as UEFI does provide SIO API to access serial > ports, to read from port, write to port and set attributes, it turns out > there are UEFI implementation(s?), where changing some attributes will > cause system to hung. Which is the reason, why we need to set up hardware > properly from firmware, and our generic config should not try to enforce > some other value(s). Default should pick up values from the system. Sure, > if the machine operator has some reason to change those values and has > tested the change, we should have method to change the config, but again, > defaults should come from system setup. > Agreed. And it mostly does today. If you have serial redirect, the efi driver does all that automatically. > While I see the reasoning to try to create all those different names, > maybe the first thing should be to look on this as innocent end user, who > has no idea about those fine technical details and historical reasons and > is just trying to get system to behave=E2=80=A6. > It has to be a new name. You can't just overload comconsole and have it work reliably. The user has to understand the technical details. Part of the problem here too is that comconsole's interface says 'use the one at port 0x378' which is impossible without parsing ACPI tables, which the efi loader doesn't do. So there's already a new, kludgy interface to specify the UID of the efiserial device. This UID is just a number with no relationship to the port from machine to machine. So we're already forcing changes on the user. It's no longer transparent: it takes effort to configure and you already have to know the differences because the simple port simply doesn't work. This is why I've been advocating for efi (use CONOUT text interface), efiserial (use the efi's uart routines) and efivideo (use graphic frame buffer) for years. Having this separation will allow people to configure the consoles on their systems more deterministically. For those that have nice serial redirect, 'efi' is the way to go. It just does the right thing. For those that do not, then you can use one or more of efiserial and efivideo to get the combination you want. Plus we can move the graphics dependencies into efivideo and get rid of the crazy stubs that things like kboot need that can never ever have graphical video. I'm still mad that my desire for this was ignored when the graphics stuff was added When we bring this driver back, it absolutely must have a new name. It cannot try to 'fake' it by doing the games it's doing. That simply won't work and breaks many working configurations today. So my suggestion is that we have a new efiserial driver, hyperV uses it. We rename the current efi serial interface to be efiserial. On aarch64 (and on aarch64 only) we have a new comconsole driver that just redirects to efiserial. It doesn't try to change the name of anything, nor try to do anything else. Plus it should start warning when you are trying to use the x86-only configuration knobs of comconsole. And starting after the 14 branch, it should start warning people should use efiserial insteaed. And we never, ever ever again try to do aliases that aren't really the same device and have different configuration needs under the covers. Warner > just my 2 cents, > toomas > > > On Thu, Mar 30, 2023 at 5:31=E2=80=AFPM Gleb Smirnoff wrote: > >> Wei, Kyle, >> >> this commit hangs loader on real hardware, at least on some >> of it. The loader prints list of consoles and hangs hard: >> >> [Thu Mar 30 20:46:12 2023]^M|^HLoading /boot/loader.conf^M >> ^M/^Hconsole vidconsole is invalid!^M >> ^MAvailable consoles:^M >> ^M efi^M >> ^M comconsole^M >> ^M comconsole^M >> ^M nullconsole^M >> ^M spinconsole^M >> >> Machine is unrecoverable unless you got alternate boot media >> and access to BMC console. >> >> First, please DO NOT MFC this as scheduled. Second, let's try >> to fix it or back it out if we hear from any other CURRENT >> user. >> >> Our configuration isn't special. This is what we got in >> loader.conf, related to consoles: >> >> console=3D"comconsole vidconsole efi" >> comconsole_speed=3D115200 >> comconsole_port=3D0x3e8 >> console=3D"efi" >> hw.uart.console=3D"io:1016,br:115200" >> >> On Sat, Mar 18, 2023 at 07:20:33AM +0000, Wei Hu wrote: >> W> The branch main has been updated by whu: >> W> >> W> URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D927358dd98cb902160093e0dc0bac0= 02d6b43858 >> >> W> >> W> commit 927358dd98cb902160093e0dc0bac002d6b43858 >> W> Author: Wei Hu >> W> AuthorDate: 2023-03-14 15:13:46 +0000 >> W> Commit: Wei Hu >> W> CommitDate: 2023-03-18 07:07:35 +0000 >> W> >> W> amd64 loader: Use efiserialio for Hyper-V booted systems >> W> >> W> UEFI provides ConIn/ConOut handles for consoles that it supports, >> W> which include the text-video and serial ports. When the serial po= rt >> W> is available, use the UEFI driver instead of direct io-port >> accesses >> W> to avoid conflicts between the firmware and direct hardware >> access, as >> W> happens on Hyper-V (Azure) setups. >> W> >> W> This change enables efiserialio to be built for efi-amd64 and has >> W> higher order priority vs comconsole, and only uses efiserialio >> W> if the hypervisor is Hyper-V. When efiserialio successfully >> W> probes, it will set efi_comconsole_avail=3Dtrue which will preven= t >> W> comconsole from probing in this setup. >> W> >> W> Tested on Hyper-V, ESXi and Azure VMs. >> W> >> W> PR: 264267 >> W> Reviewed by: kevans, whu >> W> Tested by: whu >> W> Obtained from: Rubicon Communications, LLC (Netgate) >> W> MFC after: 2 weeks >> W> Sponsored by: Rubicon Communications, LLC (Netgate) >> W> --- >> W> stand/efi/loader/arch/amd64/Makefile.inc | 1 + >> W> stand/efi/loader/bootinfo.c | 11 ++++++-- >> W> stand/efi/loader/conf.c | 6 +++++ >> W> stand/efi/loader/efiserialio.c | 43 >> ++++++++++++++++++++++++++++---- >> W> stand/i386/libi386/comconsole.c | 14 +++++++++++ >> W> 5 files changed, 68 insertions(+), 7 deletions(-) >> W> >> W> diff --git a/stand/efi/loader/arch/amd64/Makefile.inc >> b/stand/efi/loader/arch/amd64/Makefile.inc >> W> index 0d9e2648cb59..bd89044bd6c7 100644 >> W> --- a/stand/efi/loader/arch/amd64/Makefile.inc >> W> +++ b/stand/efi/loader/arch/amd64/Makefile.inc >> W> @@ -5,6 +5,7 @@ SRCS+=3D amd64_tramp.S \ >> W> elf64_freebsd.c \ >> W> trap.c \ >> W> multiboot2.c \ >> W> + efiserialio.c \ >> W> exc.S >> W> >> W> .PATH: ${BOOTSRC}/i386/libi386 >> W> diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.= c >> W> index 939f2cf4c3fe..d79f59343af1 100644 >> W> --- a/stand/efi/loader/bootinfo.c >> W> +++ b/stand/efi/loader/bootinfo.c >> W> @@ -119,10 +119,17 @@ bi_getboothowto(char *kargs) >> W> if (tmp !=3D NULL) >> W> speed =3D strtol(tmp, NULL, 0); >> W> tmp =3D getenv("efi_com_port"); >> W> - if (tmp =3D=3D NULL) >> W> - tmp =3D getenv("comconsole_port"); >> W> if (tmp !=3D NULL) >> W> port =3D strtol(tmp, NULL, 0); >> W> + if (port <=3D 0) { >> W> + tmp =3D getenv("comconsole_port"); >> W> + if (tmp !=3D NULL) >> W> + port =3D strtol(tmp, NULL, 0); >> W> + else { >> W> + if (port =3D=3D 0) >> W> + port =3D 0x3f8; >> W> + } >> W> + } >> W> if (speed !=3D -1 && port !=3D -1) { >> W> snprintf(buf, sizeof(buf), "io:%d,br:%d"= , >> port, >> W> speed); >> W> diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c >> W> index 863c9188c72c..051e1a3381d1 100644 >> W> --- a/stand/efi/loader/conf.c >> W> +++ b/stand/efi/loader/conf.c >> W> @@ -81,6 +81,9 @@ struct netif_driver *netif_drivers[] =3D { >> W> >> W> extern struct console efi_console; >> W> extern struct console comconsole; >> W> +#if defined(__amd64__) >> W> +extern struct console eficomconsole; >> W> +#endif >> W> #if defined(__amd64__) || defined(__i386__) >> W> extern struct console nullconsole; >> W> extern struct console spinconsole; >> W> @@ -88,6 +91,9 @@ extern struct console spinconsole; >> W> >> W> struct console *consoles[] =3D { >> W> &efi_console, >> W> +#if defined(__amd64__) >> W> + &eficomconsole, >> W> +#endif >> W> &comconsole, >> W> #if defined(__amd64__) || defined(__i386__) >> W> &nullconsole, >> W> diff --git a/stand/efi/loader/efiserialio.c >> b/stand/efi/loader/efiserialio.c >> W> index 375e679d2590..5fbc700f6ac2 100644 >> W> --- a/stand/efi/loader/efiserialio.c >> W> +++ b/stand/efi/loader/efiserialio.c >> W> @@ -69,6 +69,11 @@ static int comc_speed_set(struct env_var *, >> int, const void *); >> W> >> W> static struct serial *comc_port; >> W> extern struct console efi_console; >> W> +bool efi_comconsole_avail =3D false; >> W> + >> W> +#if defined(__amd64__) >> W> +#define comconsole eficomconsole >> W> +#endif >> W> >> W> struct console comconsole =3D { >> W> .c_name =3D "comconsole", >> W> @@ -254,11 +259,22 @@ comc_probe(struct console *sc) >> W> char *env, *buf, *ep; >> W> size_t sz; >> W> >> W> +#if defined(__amd64__) >> W> + /* >> W> + * For x86-64, don't use this driver if not running in Hyper-V. >> W> + */ >> W> + env =3D getenv("smbios.bios.version"); >> W> + if (env =3D=3D NULL || strncmp(env, "Hyper-V", 7) !=3D 0) { >> W> + return; >> W> + } >> W> +#endif >> W> + >> W> if (comc_port =3D=3D NULL) { >> W> comc_port =3D calloc(1, sizeof (struct serial)); >> W> if (comc_port =3D=3D NULL) >> W> return; >> W> } >> W> + >> W> /* Use defaults from firmware */ >> W> comc_port->databits =3D 8; >> W> comc_port->parity =3D DefaultParity; >> W> @@ -308,6 +324,10 @@ comc_probe(struct console *sc) >> W> comc_port_set, env_nounset); >> W> >> W> env =3D getenv("efi_com_speed"); >> W> + if (env =3D=3D NULL) >> W> + /* fallback to comconsole setting */ >> W> + env =3D getenv("comconsole_speed"); >> W> + >> W> if (comc_parse_intval(env, &val) =3D=3D CMD_OK) >> W> comc_port->baudrate =3D val; >> W> >> W> @@ -318,8 +338,13 @@ comc_probe(struct console *sc) >> W> comc_speed_set, env_nounset); >> W> >> W> comconsole.c_flags =3D 0; >> W> - if (comc_setup()) >> W> + if (comc_setup()) { >> W> sc->c_flags =3D C_PRESENTIN | C_PRESENTOUT; >> W> + efi_comconsole_avail =3D true; >> W> + } else { >> W> + /* disable being seen as "comconsole" */ >> W> + comconsole.c_name =3D "efiserialio"; >> W> + } >> W> } >> W> >> W> static int >> W> @@ -489,6 +514,7 @@ comc_setup(void) >> W> { >> W> EFI_STATUS status; >> W> UINT32 control; >> W> + char *ev; >> W> >> W> /* port is not usable */ >> W> if (comc_port->sio =3D=3D NULL) >> W> @@ -498,10 +524,17 @@ comc_setup(void) >> W> if (EFI_ERROR(status)) >> W> return (false); >> W> >> W> - status =3D comc_port->sio->SetAttributes(comc_port->sio, >> W> - comc_port->baudrate, comc_port->receivefifodepth, >> W> - comc_port->timeout, comc_port->parity, >> W> - comc_port->databits, comc_port->stopbits); >> W> + ev =3D getenv("smbios.bios.version"); >> W> + if (ev !=3D NULL && strncmp(ev, "Hyper-V", 7) =3D=3D 0) { >> W> + status =3D comc_port->sio->SetAttributes(comc_port->sio, >> W> + 0, 0, 0, DefaultParity, 0, DefaultStopBits); >> W> + } else { >> W> + status =3D comc_port->sio->SetAttributes(comc_port->sio, >> W> + comc_port->baudrate, comc_port->receivefifodepth, >> W> + comc_port->timeout, comc_port->parity, >> W> + comc_port->databits, comc_port->stopbits); >> W> + } >> W> + >> W> if (EFI_ERROR(status)) >> W> return (false); >> W> >> W> diff --git a/stand/i386/libi386/comconsole.c >> b/stand/i386/libi386/comconsole.c >> W> index ed1f1aa08ed7..3fbb6a292c19 100644 >> W> --- a/stand/i386/libi386/comconsole.c >> W> +++ b/stand/i386/libi386/comconsole.c >> W> @@ -85,6 +85,20 @@ comc_probe(struct console *cp) >> W> int speed, port; >> W> uint32_t locator; >> W> >> W> +#if defined(__amd64__) >> W> + extern bool efi_comconsole_avail; >> W> + >> W> + if (efi_comconsole_avail) { >> W> + /* >> W> + * If EFI provides serial I/O, then don't use this legac= y >> W> + * com driver to avoid conflicts with the firmware's >> driver. >> W> + * Change c_name so that it cannot be found in the looku= p. >> W> + */ >> W> + comconsole.c_name =3D "xcomconsole"; >> W> + return; >> W> + } >> W> +#endif >> W> + >> W> if (comc_curspeed =3D=3D 0) { >> W> comc_curspeed =3D COMSPEED; >> W> /* >> >> -- >> Gleb Smirnoff >> > > --0000000000001a12e105f82f8633 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Fri, Mar 31, 2023 at 12:22=E2=80= =AFAM Toomas Soome <tsoome@me.com&g= t; wrote:
<= br>

On 31. Mar 2023, at 02:40, Warne= r Losh <imp@bsdimp.c= om> wrote:

Let's back it out. I d= idn't get a chance to review it and the duplicated name strikes me as m= assively unwise.
Of course, the efi serial driver never should have had= the name comconsole in the first place, imho. It was OK
on arm w= here we couldn't conflict.

So let's back i= t out and talk about how we should do this, including the need to possibly = just rename the efi
version of the console driver to something el= se. IMHO, it never should have been comconsole in the first
place= because it's configured differently than comconsole....

Warner

<= div>ok, lets start from beginning. The loader device naming is total mess a= nd should not go this way - it is not understandable for users and not unde= rstandable for developers.

the config below is per= fect example of the situation:

First the config do= es set:=C2=A0

console= =3D"comconsole vidconsole efi=E2=80=9D
=
So, we do try to set serial console, bios video console and = efi console. So we have =E2=80=9Cshared=E2=80=9D config for BIOS and UEFI l= oader, which should be totally reasonable from user point of view, but is t= echnically wrong, because BIOS loader has no idea what is efi console and E= FI loader has no idea what is vidconsole. So this mixture ends up with mess= age:

I strongly disagree = this is wrong. You have a boot loader that may have one of many console dev= ices. Not all may be present.

=C2=A0
console vidconsole is invalid!"

And the user will get the similar error when bo= oting BIOS setup.

Yes. Th= is message is a bit bogus: it just means we don't have a comconsole con= figured. And that's fine.

It's like if I h= ad ifconfig_ixl0=3DDHCP and ifconfig_xe0=3DDHCP in my rc.conf file, imho. I= t says if they are there, use them. Otherwise don't. We don't have = a eth device that's a generic thing. Nor should comconsole be all possi= ble uarts.
=C2=A0
Then we just set console=3D=E2=80=9Cefi=E2=80=9D.

Then there is setting for uart=E2=80=A6=C2=A0
<= /div>

This is an orthogonal=C2=A0issu= e.
=C2=A0
=
With todays UEFI setups, the logic is that you set up your h= ardware, that is, you configure serial port attributes from firmware setup,= and the UEFI firmware will populate its internal structures with those val= ues.

Agreed. Still orthog= onal to the naming issue.
=C2=A0
Now, first issue is, while developing= uefi loader, it was easy path to reuse bits from BIOS loader. smbios, acpi= , and sadly, comconsole. Sadly, because comconsole is built assuming x86 IO= port features which are not available on other platforms.

Agreed. However, we are stuck with comcon= sole =3D=3D talk to the hardware and bypass the UEFI firmware. We need to h= ave a efiserial=C2=A0and efivideo=C2=A0device, even for x86, so that we can= specify things more closely. Overloading comconsole is unwise.
= =C2=A0
So yes, bios version of comconsole should not have been used to build UEF= I loader at all.

Yes and = no. It's in use today, so saying it shouldn't is about 10 years too= late.
=C2=A0
Now the fun part, even as UEFI does provide SIO API to a= ccess serial ports, to read from port, write to port and set attributes, it= turns out there are UEFI implementation(s?), where changing some attribute= s will cause system to hung. Which is the reason, why we need to set up har= dware properly from firmware, and our generic config should not try to enfo= rce some other value(s). Default should pick up values from the system. Sur= e, if the machine operator has some reason to change those values and has t= ested the change, we should have method to change the config, but again, de= faults should come from system setup.
Agreed. And it mostly does today. If you have serial redirect,= the efi driver does all that automatically.
=C2=A0
While I see the re= asoning to try to create all those different names, maybe the first thing s= hould be to look on this as innocent end user, who has no idea about those = fine technical details and historical reasons and is just trying to get sys= tem to behave=E2=80=A6.

I= t has to be a new name. You can't just overload comconsole and have it = work reliably. The user has to understand the technical details.
=
Part of the problem here too is that comconsole's=C2=A0i= nterface says 'use the one at port 0x378' which is impossible witho= ut parsing ACPI tables, which the efi loader doesn't do. So there's= already a new, kludgy interface to specify the UID of the efiserial device= . This UID is just a number with no relationship to the port from machine t= o machine. So we're already forcing changes on the user. It's no lo= nger transparent: it takes effort to configure and you already have to know= the differences because the simple port simply doesn't work.

This is why I've been advocating for efi (use CONOUT te= xt interface), efiserial=C2=A0(use the efi's uart routines) and efivide= o=C2=A0(use graphic frame buffer) for years. Having this separation will al= low people to configure the consoles on their systems more deterministicall= y. For those that have nice serial redirect, 'efi' is the way to go= . It just does the right thing. For those that do not, then you can use one= or more of efiserial=C2=A0and efivideo to get the combination you want. Pl= us we can move the graphics dependencies into efivideo=C2=A0and get rid of = the crazy stubs that things like kboot need that can never ever have graphi= cal video. I'm still mad that my desire for this was ignored when the g= raphics stuff was added

When we bring this driver = back, it absolutely must have a new name. It cannot try to 'fake' i= t by doing the games it's doing. That simply won't work and breaks = many working configurations today.

So my suggestio= n is that we have a new efiserial=C2=A0driver, hyperV uses it. We rename th= e current efi serial interface to be efiserial. On aarch64 (and on aarch64 = only) we have a new comconsole driver that just redirects to efiserial. It = doesn't try to change the name of anything, nor try to do anything else= . Plus it should start warning when you are trying to use the x86-only conf= iguration knobs of comconsole. And starting after the 14 branch, it should = start warning people should use efiserial=C2=A0insteaed. And we never, ever= ever again try to do aliases that aren't really the same device and ha= ve different configuration needs under the covers.

Warner
=C2=A0
just my 2 cents,
toomas

<= blockquote type=3D"cite">

On Thu, Mar 30, 2023 at 5:31=E2=80=AFPM Gleb Smirno= ff <glebius@fre= ebsd.org> wrote:
=C2=A0 Wei, Kyle,

this commit hangs loader on real hardware, at least on some
of it.=C2=A0 The loader prints list of consoles and hangs hard:

[Thu Mar 30 20:46:12 2023]^M|^HLoading /boot/loader.conf^M
^M/^Hconsole vidconsole is invalid!^M
^MAvailable consoles:^M
^M=C2=A0 =C2=A0 efi^M
^M=C2=A0 =C2=A0 comconsole^M
^M=C2=A0 =C2=A0 comconsole^M
^M=C2=A0 =C2=A0 nullconsole^M
^M=C2=A0 =C2=A0 spinconsole^M

Machine is unrecoverable unless you got alternate boot media
and access to BMC console.

First, please DO NOT MFC this as scheduled. Second, let's try
to fix it or back it out if we hear from any other CURRENT
user.

Our configuration isn't special. This is what we got in
loader.conf, related to consoles:

console=3D"comconsole vidconsole efi"
comconsole_speed=3D115200
comconsole_port=3D0x3e8
console=3D"efi"
hw.uart.console=3D"io:1016,br:115200"

On Sat, Mar 18, 2023 at 07:20:33AM +0000, Wei Hu wrote:
W> The branch main has been updated by whu:
W>
W> URL: https:/= /cgit.FreeBSD.org/src/commit/?id=3D927358dd98cb902160093e0dc0bac002d6b43858=
W>
W> commit 927358dd98cb902160093e0dc0bac002d6b43858
W> Author:=C2=A0 =C2=A0 =C2=A0Wei Hu <whu@FreeBSD.org>
W> AuthorDate: 2023-03-14 15:13:46 +0000
W> Commit:=C2=A0 =C2=A0 =C2=A0Wei Hu <whu@FreeBSD.org>
W> CommitDate: 2023-03-18 07:07:35 +0000
W>
W>=C2=A0 =C2=A0 =C2=A0amd64 loader: Use efiserialio for Hyper-V booted s= ystems
W>=C2=A0 =C2=A0 =C2=A0
W>=C2=A0 =C2=A0 =C2=A0UEFI provides ConIn/ConOut handles for consoles th= at it supports,
W>=C2=A0 =C2=A0 =C2=A0which include the text-video and serial ports. Whe= n the serial port
W>=C2=A0 =C2=A0 =C2=A0is available, use the UEFI driver instead of direc= t io-port accesses
W>=C2=A0 =C2=A0 =C2=A0to avoid conflicts between the firmware and direct= hardware access, as
W>=C2=A0 =C2=A0 =C2=A0happens on Hyper-V (Azure) setups.
W>=C2=A0 =C2=A0 =C2=A0
W>=C2=A0 =C2=A0 =C2=A0This change enables efiserialio to be built for ef= i-amd64 and has
W>=C2=A0 =C2=A0 =C2=A0higher order priority vs comconsole, and only uses= efiserialio
W>=C2=A0 =C2=A0 =C2=A0if the hypervisor is Hyper-V. When efiserialio suc= cessfully
W>=C2=A0 =C2=A0 =C2=A0probes, it will set efi_comconsole_avail=3Dtrue wh= ich will prevent
W>=C2=A0 =C2=A0 =C2=A0comconsole from probing in this setup.
W>=C2=A0 =C2=A0 =C2=A0
W>=C2=A0 =C2=A0 =C2=A0Tested on Hyper-V, ESXi and Azure VMs.
W>=C2=A0 =C2=A0 =C2=A0
W>=C2=A0 =C2=A0 =C2=A0PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0264267
W>=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 kevans, whu
W>=C2=A0 =C2=A0 =C2=A0Tested by:=C2=A0 =C2=A0 =C2=A0 whu
W>=C2=A0 =C2=A0 =C2=A0Obtained from:=C2=A0 Rubicon Communications, LLC (= Netgate)
W>=C2=A0 =C2=A0 =C2=A0MFC after:=C2=A0 =C2=A0 =C2=A0 2 weeks
W>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0Rubicon Communications, = LLC (Netgate)
W> ---
W>=C2=A0 stand/efi/loader/arch/amd64/Makefile.inc |=C2=A0 1 +
W>=C2=A0 stand/efi/loader/bootinfo.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | 11 ++++++--
W>=C2=A0 stand/efi/loader/conf.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 6 +++++
W>=C2=A0 stand/efi/loader/efiserialio.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0| 43 ++++++++++++++++++++++++++++----
W>=C2=A0 stand/i386/libi386/comconsole.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 | 14 +++++++++++
W>=C2=A0 5 files changed, 68 insertions(+), 7 deletions(-)
W>
W> diff --git a/stand/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loa= der/arch/amd64/Makefile.inc
W> index 0d9e2648cb59..bd89044bd6c7 100644
W> --- a/stand/efi/loader/arch/amd64/Makefile.inc
W> +++ b/stand/efi/loader/arch/amd64/Makefile.inc
W> @@ -5,6 +5,7 @@ SRCS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0amd64_tramp.S \ W>=C2=A0 =C2=A0 =C2=A0 elf64_freebsd.c \
W>=C2=A0 =C2=A0 =C2=A0 trap.c \
W>=C2=A0 =C2=A0 =C2=A0 multiboot2.c \
W> +=C2=A0 =C2=A0 efiserialio.c \
W>=C2=A0 =C2=A0 =C2=A0 exc.S
W>=C2=A0
W>=C2=A0 .PATH:=C2=A0 =C2=A0 =C2=A0 ${BOOTSRC}/i386/libi386
W> diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.= c
W> index 939f2cf4c3fe..d79f59343af1 100644
W> --- a/stand/efi/loader/bootinfo.c
W> +++ b/stand/efi/loader/bootinfo.c
W> @@ -119,10 +119,17 @@ bi_getboothowto(char *kargs)
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 if (tmp !=3D NULL)
W>=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 speed =3D strtol(tmp, NULL, 0);
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 tmp =3D getenv("efi_com_port");
W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 if (tmp =3D=3D NULL)
W> -=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 tmp =3D getenv("comconsole_port")= ;
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 if (tmp !=3D NULL)
W>=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 port =3D strtol(tmp, NULL, 0);
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 if (port <=3D 0) {
W> +=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 tmp =3D getenv("comconsole_port")= ;
W> +=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 if (tmp !=3D NULL)
W> +=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 =C2=A0 port =3D strtol= (tmp, NULL, 0);
W> +=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 else {
W> +=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 =C2=A0 if (port =3D=3D= 0)
W> +=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 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 port =3D 0x3f8;
W> +=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 }
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 }
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 if (speed !=3D -1 && port !=3D -1) {
W>=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 snprintf(buf, sizeof(buf), "io:%d,b= r:%d", port,
W>=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 speed);
W> diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c
W> index 863c9188c72c..051e1a3381d1 100644
W> --- a/stand/efi/loader/conf.c
W> +++ b/stand/efi/loader/conf.c
W> @@ -81,6 +81,9 @@ struct netif_driver *netif_drivers[] =3D {
W>=C2=A0
W>=C2=A0 extern struct console efi_console;
W>=C2=A0 extern struct console comconsole;
W> +#if defined(__amd64__)
W> +extern struct console eficomconsole;
W> +#endif
W>=C2=A0 #if defined(__amd64__) || defined(__i386__)
W>=C2=A0 extern struct console nullconsole;
W>=C2=A0 extern struct console spinconsole;
W> @@ -88,6 +91,9 @@ extern struct console spinconsole;
W>=C2=A0
W>=C2=A0 struct console *consoles[] =3D {
W>=C2=A0 =C2=A0 =C2=A0 &efi_console,
W> +#if defined(__amd64__)
W> +=C2=A0 =C2=A0 &eficomconsole,
W> +#endif
W>=C2=A0 =C2=A0 =C2=A0 &comconsole,
W>=C2=A0 #if defined(__amd64__) || defined(__i386__)
W>=C2=A0 =C2=A0 =C2=A0 &nullconsole,
W> diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/loader/efiser= ialio.c
W> index 375e679d2590..5fbc700f6ac2 100644
W> --- a/stand/efi/loader/efiserialio.c
W> +++ b/stand/efi/loader/efiserialio.c
W> @@ -69,6 +69,11 @@ static int=C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_speed_s= et(struct env_var *, int, const void *);
W>=C2=A0
W>=C2=A0 static struct serial=C2=A0 =C2=A0 =C2=A0 =C2=A0 *comc_port;
W>=C2=A0 extern struct console efi_console;
W> +bool efi_comconsole_avail =3D false;
W> +
W> +#if defined(__amd64__)
W> +#define comconsole eficomconsole
W> +#endif
W>=C2=A0
W>=C2=A0 struct console comconsole =3D {
W>=C2=A0 =C2=A0 =C2=A0 .c_name =3D "comconsole",
W> @@ -254,11 +259,22 @@ comc_probe(struct console *sc)
W>=C2=A0 =C2=A0 =C2=A0 char *env, *buf, *ep;
W>=C2=A0 =C2=A0 =C2=A0 size_t sz;
W>=C2=A0
W> +#if defined(__amd64__)
W> +=C2=A0 =C2=A0 /*
W> +=C2=A0 =C2=A0 =C2=A0* For x86-64, don't use this driver if not r= unning in Hyper-V.
W> +=C2=A0 =C2=A0 =C2=A0*/
W> +=C2=A0 =C2=A0 env =3D getenv("smbios.bios.version");
W> +=C2=A0 =C2=A0 if (env =3D=3D NULL || strncmp(env, "Hyper-V"= ;, 7) !=3D 0) {
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return;
W> +=C2=A0 =C2=A0 }
W> +#endif
W> +
W>=C2=A0 =C2=A0 =C2=A0 if (comc_port =3D=3D NULL) {
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port =3D calloc(= 1, sizeof (struct serial));
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (comc_port =3D=3D = NULL)
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 return;
W>=C2=A0 =C2=A0 =C2=A0 }
W> +
W>=C2=A0 =C2=A0 =C2=A0 /* Use defaults from firmware */
W>=C2=A0 =C2=A0 =C2=A0 comc_port->databits =3D 8;
W>=C2=A0 =C2=A0 =C2=A0 comc_port->parity =3D DefaultParity;
W> @@ -308,6 +324,10 @@ comc_probe(struct console *sc)
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port_set, env_nounset);
W>=C2=A0
W>=C2=A0 =C2=A0 =C2=A0 env =3D getenv("efi_com_speed");
W> +=C2=A0 =C2=A0 if (env =3D=3D NULL)
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* fallback to comconsole = setting */
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 env =3D getenv("comco= nsole_speed");
W> +
W>=C2=A0 =C2=A0 =C2=A0 if (comc_parse_intval(env, &val) =3D=3D CMD_O= K)
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port->baudrat= e =3D val;
W>=C2=A0
W> @@ -318,8 +338,13 @@ comc_probe(struct console *sc)
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_speed_set, env_nounset);
W>=C2=A0
W>=C2=A0 =C2=A0 =C2=A0 comconsole.c_flags =3D 0;
W> -=C2=A0 =C2=A0 if (comc_setup())
W> +=C2=A0 =C2=A0 if (comc_setup()) {
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 sc->c_flags =3D C_= PRESENTIN | C_PRESENTOUT;
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 efi_comconsole_avail =3D t= rue;
W> +=C2=A0 =C2=A0 } else {
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* disable being seen as &= quot;comconsole" */
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comconsole.c_name =3D &quo= t;efiserialio";
W> +=C2=A0 =C2=A0 }
W>=C2=A0 }
W>=C2=A0
W>=C2=A0 static int
W> @@ -489,6 +514,7 @@ comc_setup(void)
W>=C2=A0 {
W>=C2=A0 =C2=A0 =C2=A0 EFI_STATUS status;
W>=C2=A0 =C2=A0 =C2=A0 UINT32 control;
W> +=C2=A0 =C2=A0 char *ev;
W>=C2=A0
W>=C2=A0 =C2=A0 =C2=A0 /* port is not usable */
W>=C2=A0 =C2=A0 =C2=A0 if (comc_port->sio =3D=3D NULL)
W> @@ -498,10 +524,17 @@ comc_setup(void)
W>=C2=A0 =C2=A0 =C2=A0 if (EFI_ERROR(status))
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (false);
W>=C2=A0
W> -=C2=A0 =C2=A0 status =3D comc_port->sio->SetAttributes(comc_po= rt->sio,
W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port->baudrate, comc_port->re= ceivefifodepth,
W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port->timeout, comc_port->par= ity,
W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port->databits, comc_port->st= opbits);
W> +=C2=A0 =C2=A0 ev =3D getenv("smbios.bios.version");
W> +=C2=A0 =C2=A0 if (ev !=3D NULL && strncmp(ev, "Hyper-V&= quot;, 7) =3D=3D 0) {
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 status =3D comc_port->s= io->SetAttributes(comc_port->sio,
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 0, 0, 0, Def= aultParity, 0, DefaultStopBits);
W> +=C2=A0 =C2=A0 } else {
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 status =3D comc_port->s= io->SetAttributes(comc_port->sio,
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port-&g= t;baudrate, comc_port->receivefifodepth,
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port-&g= t;timeout, comc_port->parity,
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port-&g= t;databits, comc_port->stopbits);
W> +=C2=A0 =C2=A0 }
W> +
W>=C2=A0 =C2=A0 =C2=A0 if (EFI_ERROR(status))
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (false);
W>=C2=A0
W> diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/com= console.c
W> index ed1f1aa08ed7..3fbb6a292c19 100644
W> --- a/stand/i386/libi386/comconsole.c
W> +++ b/stand/i386/libi386/comconsole.c
W> @@ -85,6 +85,20 @@ comc_probe(struct console *cp)
W>=C2=A0 =C2=A0 =C2=A0 int speed, port;
W>=C2=A0 =C2=A0 =C2=A0 uint32_t locator;
W>=C2=A0
W> +#if defined(__amd64__)
W> +=C2=A0 =C2=A0 extern bool efi_comconsole_avail;
W> +
W> +=C2=A0 =C2=A0 if (efi_comconsole_avail) {
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /*
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* If EFI provides se= rial I/O, then don't use this legacy
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* com driver to avoi= d conflicts with the firmware's driver.
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* Change c_name so t= hat it cannot be found in the lookup.
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*/
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comconsole.c_name =3D &quo= t;xcomconsole";
W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return;
W> +=C2=A0 =C2=A0 }
W> +#endif
W> +
W>=C2=A0 =C2=A0 =C2=A0 if (comc_curspeed =3D=3D 0) {
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_curspeed =3D COM= SPEED;
W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /*

--
Gleb Smirnoff

--0000000000001a12e105f82f8633-- From nobody Fri Mar 31 10:50: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 4Pnxs760Rkz42Jcl; Fri, 31 Mar 2023 10:50: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 4Pnxs75YlPz3N7W; Fri, 31 Mar 2023 10:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680259835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AXzbM6xD7VfDu9feWWBHC7BwRERpTLYpo+jm1mx+sRI=; b=joJ4NEGDmxecNJNuKWInFWJuncp8zElx3OVow5VXSkSwsm2BRREtkd0FZUU4qaNH6I7GI5 aG+WGdJWnjE6jcuNYHfzEeDyX5vJWAJCuIB4yoEend48FLyfV1piG4m+ea3RH90EqYdMDM T08m7ZML8B7gTK21Ae64c1PDfycrEsuai3zNknxv1FjGBYkSAp7arfK1AgwWZ3C4s2VgeZ vg5QXXMvvNIhdd90dz1qyVKUIy74lR11mzQcrUjnhxDrFvAL7bR+34xvwEhLdvStYrn7xy IW19jIG/S5gUYnomg/irFvm9QKK2qNnAideiB6tZO0ghUipXOWwxwML80n2ITQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680259835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AXzbM6xD7VfDu9feWWBHC7BwRERpTLYpo+jm1mx+sRI=; b=MtQHRl5gbSi978fkUwBP4pECXeKSdeTGSD7VI9+0h4DX/9pppDFeMG5A5qqgu9QI03hYWb SHLi2FexKqgFQJcEOs8HE6UbyaVgRmqH3sp98HqsLTsifUcWoRMZSpGpOm0AWalBDvxuN3 rXorMHuerUzRf8c3Bwd+HzVloUBZrxJ7GDE/yB6apnM2qpPH67x3+dIjNg0fOziJIgzCtE TnA0P+8rAQMhn5fht012eFH4v2GhpwPljXfjSqo6jgR/wvDlfBPQvRsljzuPvOjG32Sakm /dwvyuvnw4oSa3gUZ31A6wfi63y1oQbxxgQ15aJm26vxnASBDCnSPyTgWEmUZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680259835; a=rsa-sha256; cv=none; b=jQeXdqRyadrM2JqbmSJQdO7tCY7YAPI/+Ms5E/RT6F8vRae9a4fbYxhj1YFo8Z+4pZ4vu+ N+/lwRm4kf9BqJa542VoYVu9MyFkWZbCrdpY4ey++AAH9pxW85zfoUWI2qy7SPGwXqzj4u fUkG6uxTTa3IS8TC2nF5yDAMkmiQEv/0wWlOdHNyNiON9L7/bgJ8NQTvdJaCpTMb41XKYJ gbWGPSFB/eDNqgZziyty33khiL3SzuiSj/wU8a0NgQNrlFArQS+BEE4dMZyg0XO8iMCDX8 7Hzf+Kq7v19yZxe0VnzPmHj7sA/NWuyI7/ESqrG8xFgtr72HbDJFFy7JQsT2kQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pnxs74d8RzrHC; Fri, 31 Mar 2023 10:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VAoZhV082787; Fri, 31 Mar 2023 10:50:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VAoZ09082786; Fri, 31 Mar 2023 10:50:35 GMT (envelope-from git) Date: Fri, 31 Mar 2023 10:50:35 GMT Message-Id: <202303311050.32VAoZ09082786@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: 3a0cc6fe61ea - main - Handle the arm64 unknown exception separately List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 3a0cc6fe61ea29334c17dfb71bf24ba9e604ab4c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3a0cc6fe61ea29334c17dfb71bf24ba9e604ab4c commit 3a0cc6fe61ea29334c17dfb71bf24ba9e604ab4c Author: Andrew Turner AuthorDate: 2023-03-31 09:15:45 +0000 Commit: Andrew Turner CommitDate: 2023-03-31 09:15:45 +0000 Handle the arm64 unknown exception separately Rather than falling through to the default case handle the unknown exception with its own panic message. As ESR_EL1 is zero for this exception stop printing it. Sponsored by: Arm Ltd --- sys/arm64/arm64/trap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 367a31cbe1de..0ee1bed0c35a 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -549,9 +549,11 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) case EXCP_UNKNOWN: if (undef_insn(1, frame)) break; - printf("Undefined instruction: %08x\n", + print_registers(frame); + print_gp_register("far", far); + panic("Undefined instruction: %08x", *(uint32_t *)frame->tf_elr); - /* FALLTHROUGH */ + break; default: print_registers(frame); print_gp_register("far", far); From nobody Fri Mar 31 11:36: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 4PnytM0D9Yz42Mjx; Fri, 31 Mar 2023 11:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PnytL6sv1z3jC1; Fri, 31 Mar 2023 11:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680262603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HOnVrUEwn3TenTQmTGioc4scLbnC7VB3DMPkfwGYxhY=; b=BlVBKP1YUlXR6rZ2zkyT2ts2QtqczG2NhEVlbm3t/6J6MTyPzTDpivrs3cBlLo5Wzdq6Ct h/OQt+Tx/KU19a5xQNYCQ/MnjCbJFRcgxr9onhvg5gPZWvRCUb8Fs3V/ouCGOzpcu9PGrC 9B2bCDCN5xLIWn2n3LH3nTlz9fW7VXCLmRxJpg3v6D/A4kBRVIuXWISPxwghoDjK08mRJi YBg3ZeBTyhMvCqgktH8loVNfyKBF7I7PNiJr/wPkWLe0bOvriJ6rDlOKEFyEYi+Eo/KIfl NBiJll8Ch5IjIezW7Ww3g1T703ePwmLOsCURAKAr1CBSTEOdCDpfD4SgNCWJTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680262603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HOnVrUEwn3TenTQmTGioc4scLbnC7VB3DMPkfwGYxhY=; b=HmCjMfSQGjyEtQWiI66ruGJJn97tRmQ0+r5WFmCcnwrAgKwjBHS+a+EyxJg8+1oqYIFi+1 XORmerFT7JlEs27l3E2DhNI6ONiLhUU61tCeLP9XvKkGMVvBezkt1lV3k8YydX9irfl86T ZbFLlvCi2g8mXRbKQ0L9Qhc1/+DH41c6j6oJTUPoIdjGc4fWFl5QaiuQZasUXovaX2NJ1a 4mIWXr4V4QTjKVHBF/1lUDokGqR3RXMmcejnZHozwL7UqRF+/YZcjBE1c9qR/ij7K4Vd+U biE/B1NhdgGigsPPOTMD8JPm5eGVorRb8/XGDHp6KyIvuU1p4rGESuI2wZHumw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680262603; a=rsa-sha256; cv=none; b=EXukbOAhki6XR1foO/FfTkEMqHQK2/V4OYAut4NCm4QgyWfH3O3ipZDKugmtYdzdXkfyTJ yd4iXPBDSiUiFp1fh4GpE5LsG6aqMjVoJhDenN4edXKEAontEQhXmA375ioRCfPwjR+5Bh IR37FTGfbxltH9544PT0ZlujDgVAEmWG/3H7y4Fclysa4vkhnEI+WTlbhHNpwQgy1vMoOf 6jTMjeLFX8Ltr66movFY5k2ljcN1neAJfNbWoq8p/gqW2kvPtoWcxlWs/hOYvKITMxRd7o 7XMx0XWcoERaZL2kc51v6UINqwmShrIE2LKTcEi4Q6415WQv2t5bVIKWyfXD7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnytL5xJyzsMY; Fri, 31 Mar 2023 11:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VBag9F054267; Fri, 31 Mar 2023 11:36:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VBagJl054266; Fri, 31 Mar 2023 11:36:42 GMT (envelope-from git) Date: Fri, 31 Mar 2023 11:36:42 GMT Message-Id: <202303311136.32VBagJl054266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 28921c4f7de6 - main - carp: allow commands to use interface name rather than index List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/main X-Git-Reftype: branch X-Git-Commit: 28921c4f7de6d8641b4deaa8942526309018668a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=28921c4f7de6d8641b4deaa8942526309018668a commit 28921c4f7de6d8641b4deaa8942526309018668a Author: Kristof Provost AuthorDate: 2023-03-30 23:34:03 +0000 Commit: Kristof Provost CommitDate: 2023-03-31 09:29:58 +0000 carp: allow commands to use interface name rather than index Get/set commands can now choose to provide the interface name rather than the interface index. This allows userspace to avoid a call to if_nametoindex(). Suggested by: melifaro Reviewed by: melifaro Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39359 --- lib/libifconfig/libifconfig_carp.c | 18 ++---------------- sys/netinet/ip_carp.c | 16 ++++++++++++---- sys/netinet/ip_carp_nl.h | 1 + 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/lib/libifconfig/libifconfig_carp.c b/lib/libifconfig/libifconfig_carp.c index 5729362ffef9..501ca81782eb 100644 --- a/lib/libifconfig/libifconfig_carp.c +++ b/lib/libifconfig/libifconfig_carp.c @@ -73,17 +73,10 @@ _ifconfig_carp_get(ifconfig_handle_t *h, const char *name, struct nlmsghdr *hdr; size_t i = 0; uint32_t seq_id; - unsigned int ifindex; int family_id; ifconfig_error_clear(h); - ifindex = if_nametoindex(name); - if (ifindex == 0) { - ifconfig_error(h, NETLINK, ENOENT); - return (-1); - } - if (! snl_init(&ss, NETLINK_GENERIC)) { ifconfig_error(h, NETLINK, ENOTSUP); return (-1); @@ -100,7 +93,7 @@ _ifconfig_carp_get(ifconfig_handle_t *h, const char *name, hdr = snl_create_genl_msg_request(&nw, family_id, CARP_NL_CMD_GET); hdr->nlmsg_flags |= NLM_F_DUMP; - snl_add_msg_attr_u32(&nw, CARP_NL_IFINDEX, ifindex); + snl_add_msg_attr_string(&nw, CARP_NL_IFNAME, name); if (vhid != 0) snl_add_msg_attr_u32(&nw, CARP_NL_VHID, vhid); @@ -153,18 +146,11 @@ ifconfig_carp_set_info(ifconfig_handle_t *h, const char *name, struct snl_state ss = {}; struct snl_writer nw; struct nlmsghdr *hdr; - unsigned int ifindex; int family_id; uint32_t seq_id; ifconfig_error_clear(h); - ifindex = if_nametoindex(name); - if (ifindex == 0) { - ifconfig_error(h, NETLINK, ENOENT); - return (-1); - } - if (! snl_init(&ss, NETLINK_GENERIC)) { ifconfig_error(h, NETLINK, ENOTSUP); return (-1); @@ -183,7 +169,7 @@ ifconfig_carp_set_info(ifconfig_handle_t *h, const char *name, snl_add_msg_attr_u32(&nw, CARP_NL_STATE, carpr->carpr_state); snl_add_msg_attr_s32(&nw, CARP_NL_ADVBASE, carpr->carpr_advbase); snl_add_msg_attr_s32(&nw, CARP_NL_ADVSKEW, carpr->carpr_advskew); - snl_add_msg_attr_u32(&nw, CARP_NL_IFINDEX, ifindex); + snl_add_msg_attr_string(&nw, CARP_NL_IFNAME, name); snl_add_msg_attr(&nw, CARP_NL_ADDR, sizeof(carpr->carpr_addr), &carpr->carpr_addr); snl_add_msg_attr(&nw, CARP_NL_ADDR6, sizeof(carpr->carpr_addr6), diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 2e1c8e084b4b..a6a89d0f87d8 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -2301,6 +2301,7 @@ carp_nl_send(void *arg, struct carp_softc *sc, int priv) struct nl_carp_parsed { unsigned int ifindex; + char *ifname; uint32_t state; uint32_t vhid; int32_t advbase; @@ -2322,6 +2323,7 @@ static const struct nlattr_parser nla_p_set[] = { { .type = CARP_NL_IFINDEX, .off = _OUT(ifindex), .cb = nlattr_get_uint32 }, { .type = CARP_NL_ADDR, .off = _OUT(addr), .cb = nlattr_get_in_addr }, { .type = CARP_NL_ADDR6, .off = _OUT(addr6), .cb = nlattr_get_in6_addr }, + { .type = CARP_NL_IFNAME, .off = _OUT(ifname), .cb = nlattr_get_string }, }; static const struct nlfield_parser nlf_p_set[] = { }; @@ -2337,7 +2339,7 @@ carp_nl_get(struct nlmsghdr *hdr, struct nl_pstate *npt) struct carp_nl_send_args args; struct carpreq carpr = { }; struct epoch_tracker et; - if_t ifp; + if_t ifp = NULL; int error; error = nl_parse_nlmsg(hdr, &carp_parser, npt, &attrs); @@ -2345,7 +2347,10 @@ carp_nl_get(struct nlmsghdr *hdr, struct nl_pstate *npt) return (error); NET_EPOCH_ENTER(et); - ifp = ifnet_byindex_ref(attrs.ifindex); + if (attrs.ifname != NULL) + ifp = ifunit_ref(attrs.ifname); + else if (attrs.ifindex != 0) + ifp = ifnet_byindex_ref(attrs.ifindex); NET_EPOCH_EXIT(et); if ((error = carp_is_supported_if(ifp)) != 0) @@ -2379,7 +2384,7 @@ carp_nl_set(struct nlmsghdr *hdr, struct nl_pstate *npt) struct nl_carp_parsed attrs = { }; struct carpkreq carpr; struct epoch_tracker et; - if_t ifp; + if_t ifp = NULL; int error; error = nl_parse_nlmsg(hdr, &carp_parser, npt, &attrs); @@ -2398,7 +2403,10 @@ carp_nl_set(struct nlmsghdr *hdr, struct nl_pstate *npt) return (EINVAL); NET_EPOCH_ENTER(et); - ifp = ifnet_byindex_ref(attrs.ifindex); + if (attrs.ifname != NULL) + ifp = ifunit_ref(attrs.ifname); + else if (attrs.ifindex != 0) + ifp = ifnet_byindex_ref(attrs.ifindex); NET_EPOCH_EXIT(et); if ((error = carp_is_supported_if(ifp)) != 0) diff --git a/sys/netinet/ip_carp_nl.h b/sys/netinet/ip_carp_nl.h index 60e8c569a05d..89720af3e0dc 100644 --- a/sys/netinet/ip_carp_nl.h +++ b/sys/netinet/ip_carp_nl.h @@ -31,6 +31,7 @@ enum carp_nl_type_t { CARP_NL_IFINDEX = 6, /* u32 */ CARP_NL_ADDR = 7, /* in_addr_t */ CARP_NL_ADDR6 = 8, /* in6_addr_t */ + CARP_NL_IFNAME = 9, /* string */ }; #endif From nobody Fri Mar 31 11:57: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 4PnzKx4j85z42P95; Fri, 31 Mar 2023 11:57: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 4PnzKx4H5mz3mXK; Fri, 31 Mar 2023 11: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=1680263829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KteH9UedicgKkAeqW0iBm7Wl9Un81HQ37BWPEr+8ee4=; b=yzuxjZcBd6PyNPu2uJwrmX5r4gbAZ6fDlDdZtBX3VSGPyZQofI/ZEfYaVG4stwU/GDjiAX osCd1jGj7wqL18fAAWTb6ZZgOwqKA2lCzq+GbPjeYL7/+5TpD/PeSOXwCWqDI2cr/oQlSY qeMyVtqRCE4zzWmA3thtdMX11zXQE32LkG82v8lI5FrCZI0JM8s277E+6gmY2gwqppLHSC lBbKFIdTBHl9IdvZovC1q3RMPtRPbQrfN3o0C2BDQd/qACknEtJ99i6z/ToNyUP243OShI M1bmxkki456v/bLIOetC725iP8Ui2O4Wt+OhrkMmYcHwZWYNLjjX48kykc9o6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680263829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KteH9UedicgKkAeqW0iBm7Wl9Un81HQ37BWPEr+8ee4=; b=rm+82XI/w7cG2ZckCG1NlNqr5iis0W2OOhzoJMterp26kHuUsCHLj30m6GtNSwOw9yTMfS JjHdPH27LJlOikOvSdhk3gWNNfhjcujUL9mPLYXSfaQcwHijNXqNAdLob1edre7NvhtVOF rU9IIxJNUsAioyL4xQPElCs3PG/ACqewPMNlIwS3nJm5Gu81GARkjD6H1ud82ydYs7bVyy ManEqCHnHhibHNvn+E8qnzL6F7cvkS/umU7vobM/KVE1BqoYX1hBOWA8C4I/KUQYHgL5Kn aYhx3jaUMkv06DBNaSmhlh+yM3QVQJ8c3akWuTToJGkQ+Rw0W4CevGD1T66+Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680263829; a=rsa-sha256; cv=none; b=x3qv/YogBvMnmIBWCvVVO5N4xnTeSG4agDgHdDEd5VgJXPxLHPJxHxHXqXu1PjTCZit0sR tRNsqJzKhP0N/oU7cq77LPRDp7Uo/8ZbPJgbpCcrKlZLRMKu0M+7ybpFdb71DhIdZC+CKl y69sgn3vbMjq7oRBkT8ZU7eXz1He7E7MJrcdhmwW8p99CCamH2VE5Imx1XIZg+FMsgmKk4 ILo2+685ODgedWaC9/QJY6gHTCbNDPsMk4vLYJ9TLdbl2YYGZVOks+5TFG9EBpKd2NuzZ8 4Z4bSfv0o5i7/A2TpxCTEXWww3qZxLUW1bwLM37PTjIjrxJpiPzxbIDH0zyMoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnzKx3Lc6zsxN; Fri, 31 Mar 2023 11:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VBv98n086622; Fri, 31 Mar 2023 11:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VBv9tW086621; Fri, 31 Mar 2023 11:57:09 GMT (envelope-from git) Date: Fri, 31 Mar 2023 11:57:09 GMT Message-Id: <202303311157.32VBv9tW086621@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: f94b5734bce1 - main - Revert "linsysfs(4): Reimplement listnics() using ifAPI" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: f94b5734bce1a28f65156855f45ea9756b739894 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=f94b5734bce1a28f65156855f45ea9756b739894 commit f94b5734bce1a28f65156855f45ea9756b739894 Author: Dmitry Chagin AuthorDate: 2023-03-31 11:54:33 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-31 11:54:33 +0000 Revert "linsysfs(4): Reimplement listnics() using ifAPI" This reverts commit 0b56641cfcda30d06243223f37781ccc18455bef. As it poorly interacts with vnet subsystem --- sys/compat/linsysfs/linsysfs.c | 186 ++++++++++++++++++++- sys/compat/linsysfs/linsysfs.h | 38 ----- sys/compat/linsysfs/linsysfs_net.c | 326 ------------------------------------- sys/modules/linsysfs/Makefile | 2 +- 4 files changed, 179 insertions(+), 373 deletions(-) diff --git a/sys/compat/linsysfs/linsysfs.c b/sys/compat/linsysfs/linsysfs.c index 23abd2c32743..356f1af7f1ac 100644 --- a/sys/compat/linsysfs/linsysfs.c +++ b/sys/compat/linsysfs/linsysfs.c @@ -37,19 +37,22 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include +#include +#include +#include + +#include +#include #include #include -#include - -MALLOC_DEFINE(M_LINSYSFS, "linsysfs", "Linsysfs structures"); - struct scsi_host_queue { TAILQ_ENTRY(scsi_host_queue) scsi_host_next; char *path; @@ -66,6 +69,175 @@ atoi(const char *str) return (int)strtol(str, (char **)NULL, 10); } +static int +linsysfs_ifnet_addr(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + struct l_sockaddr lsa; + struct ifnet *ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) + error = sbuf_printf(sb, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n", + lsa.sa_data[0], lsa.sa_data[1], lsa.sa_data[2], + lsa.sa_data[3], lsa.sa_data[4], lsa.sa_data[5]); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_ifnet_addrlen(PFS_FILL_ARGS) +{ + + sbuf_printf(sb, "%d\n", LINUX_IFHWADDRLEN); + return (0); +} + +static int +linsysfs_ifnet_flags(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + struct ifnet *ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL) + error = sbuf_printf(sb, "0x%x\n", linux_ifflags(ifp)); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_ifnet_ifindex(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + struct ifnet *ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL) + error = sbuf_printf(sb, "%u\n", if_getindex(ifp)); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_ifnet_mtu(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + struct ifnet *ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL) + error = sbuf_printf(sb, "%u\n", if_getmtu(ifp)); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_ifnet_tx_queue_len(PFS_FILL_ARGS) +{ + + /* XXX */ + sbuf_printf(sb, "1000\n"); + return (0); +} + +static int +linsysfs_ifnet_type(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + struct l_sockaddr lsa; + struct ifnet *ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) + error = sbuf_printf(sb, "%d\n", lsa.sa_family); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static void +linsysfs_listnics(struct pfs_node *dir) +{ + struct pfs_node *nic; + struct pfs_node *lo; + + nic = pfs_create_dir(dir, "eth0", NULL, NULL, NULL, 0); + + pfs_create_file(nic, "address", &linsysfs_ifnet_addr, + NULL, NULL, NULL, PFS_RD); + + pfs_create_file(nic, "addr_len", &linsysfs_ifnet_addrlen, + NULL, NULL, NULL, PFS_RD); + + pfs_create_file(nic, "flags", &linsysfs_ifnet_flags, + NULL, NULL, NULL, PFS_RD); + + pfs_create_file(nic, "ifindex", &linsysfs_ifnet_ifindex, + NULL, NULL, NULL, PFS_RD); + + pfs_create_file(nic, "mtu", &linsysfs_ifnet_mtu, + NULL, NULL, NULL, PFS_RD); + + pfs_create_file(nic, "tx_queue_len", &linsysfs_ifnet_tx_queue_len, + NULL, NULL, NULL, PFS_RD); + + pfs_create_file(nic, "type", &linsysfs_ifnet_type, + NULL, NULL, NULL, PFS_RD); + + lo = pfs_create_dir(dir, "lo", NULL, NULL, NULL, 0); + + pfs_create_file(lo, "address", &linsysfs_ifnet_addr, + NULL, NULL, NULL, PFS_RD); + + pfs_create_file(lo, "addr_len", &linsysfs_ifnet_addrlen, + NULL, NULL, NULL, PFS_RD); + + pfs_create_file(lo, "flags", &linsysfs_ifnet_flags, + NULL, NULL, NULL, PFS_RD); + + pfs_create_file(lo, "ifindex", &linsysfs_ifnet_ifindex, + NULL, NULL, NULL, PFS_RD); + + pfs_create_file(lo, "mtu", &linsysfs_ifnet_mtu, + NULL, NULL, NULL, PFS_RD); + + pfs_create_file(lo, "tx_queue_len", &linsysfs_ifnet_tx_queue_len, + NULL, NULL, NULL, PFS_RD); + + pfs_create_file(lo, "type", &linsysfs_ifnet_type, + NULL, NULL, NULL, PFS_RD); +} + /* * Filler function for proc_name */ @@ -478,6 +650,7 @@ linsysfs_init(PFS_INIT_ARGS) struct pfs_node *drm; struct pfs_node *pci; struct pfs_node *scsi; + struct pfs_node *net; struct pfs_node *devdir, *chardev; struct pfs_node *kernel; devclass_t devclass; @@ -529,14 +702,13 @@ linsysfs_init(PFS_INIT_ARGS) NULL, NULL, NULL, PFS_RD); linsysfs_listcpus(cpu); + linsysfs_listnics(net); /* /sys/kernel */ kernel = pfs_create_dir(root, "kernel", NULL, NULL, NULL, 0); /* /sys/kernel/debug, mountpoint for lindebugfs. */ pfs_create_dir(kernel, "debug", NULL, NULL, NULL, 0); - linsysfs_net_init(); - return (0); } @@ -555,8 +727,6 @@ linsysfs_uninit(PFS_INIT_ARGS) free(scsi_host, M_TEMP); } - linsysfs_net_uninit(); - return (0); } diff --git a/sys/compat/linsysfs/linsysfs.h b/sys/compat/linsysfs/linsysfs.h deleted file mode 100644 index 005c0e090a6b..000000000000 --- a/sys/compat/linsysfs/linsysfs.h +++ /dev/null @@ -1,38 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2023 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. - * 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. - */ - -#ifndef _COMPAT_LINSYSFS_LINSYSFS_H_ -#define _COMPAT_LINSYSFS_LINSYSFS_H_ - -MALLOC_DECLARE(M_LINSYSFS); - -extern struct pfs_node *net; - -void linsysfs_net_init(void); -void linsysfs_net_uninit(void); - -#endif /* _COMPAT_LINSYSFS_LINSYSFS_H_ */ diff --git a/sys/compat/linsysfs/linsysfs_net.c b/sys/compat/linsysfs/linsysfs_net.c deleted file mode 100644 index 00eb642f1db2..000000000000 --- a/sys/compat/linsysfs/linsysfs_net.c +++ /dev/null @@ -1,326 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2023 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. - * 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 -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include - -#include - -struct pfs_node *net; -static eventhandler_tag if_arrival_tag, if_departure_tag; - -static uint32_t net_latch_count = 0; -static struct mtx net_latch_mtx; -MTX_SYSINIT(net_latch_mtx, &net_latch_mtx, "lsfnet", MTX_DEF); - -struct ifp_nodes_queue { - TAILQ_ENTRY(ifp_nodes_queue) ifp_nodes_next; - if_t ifp; - struct pfs_node *pn; -}; -TAILQ_HEAD(,ifp_nodes_queue) ifp_nodes_q; - -static void -linsysfs_net_latch_hold(void) -{ - - mtx_lock(&net_latch_mtx); - if (net_latch_count++ > 0) - mtx_sleep(&net_latch_count, &net_latch_mtx, PDROP, "lsfnet", 0); - else - mtx_unlock(&net_latch_mtx); -} - -static void -linsysfs_net_latch_rele(void) -{ - - mtx_lock(&net_latch_mtx); - if (--net_latch_count > 0) - wakeup_one(&net_latch_count); - mtx_unlock(&net_latch_mtx); -} - -static int -linsysfs_ifnet_addr(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct l_sockaddr lsa; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) - error = sbuf_printf(sb, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n", - lsa.sa_data[0], lsa.sa_data[1], lsa.sa_data[2], - lsa.sa_data[3], lsa.sa_data[4], lsa.sa_data[5]); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static int -linsysfs_ifnet_addrlen(PFS_FILL_ARGS) -{ - - sbuf_printf(sb, "%d\n", LINUX_IFHWADDRLEN); - return (0); -} - -static int -linsysfs_ifnet_flags(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL) - error = sbuf_printf(sb, "0x%x\n", linux_ifflags(ifp)); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static int -linsysfs_ifnet_ifindex(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL) - error = sbuf_printf(sb, "%u\n", if_getindex(ifp)); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static int -linsysfs_ifnet_mtu(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL) - error = sbuf_printf(sb, "%u\n", if_getmtu(ifp)); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static int -linsysfs_ifnet_tx_queue_len(PFS_FILL_ARGS) -{ - - /* XXX */ - sbuf_printf(sb, "1000\n"); - return (0); -} - -static int -linsysfs_ifnet_type(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct l_sockaddr lsa; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) - error = sbuf_printf(sb, "%d\n", lsa.sa_family); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static struct pfs_node * -linsysfs_net_find_node(if_t ifp) -{ - struct ifp_nodes_queue *nq, *nq_tmp; - - TAILQ_FOREACH_SAFE(nq, &ifp_nodes_q, ifp_nodes_next, nq_tmp) { - if (nq->ifp == ifp) - return (nq->pn); - } - return (NULL); -} - -static int -linsysfs_net_addnic(if_t ifp, void *arg) -{ - char ifname[LINUX_IFNAMSIZ]; - struct ifp_nodes_queue *nq; - struct epoch_tracker et; - struct pfs_node *dir = arg; - struct pfs_node *nic = NULL; - int ret __diagused; - - NET_EPOCH_ENTER(et); - ret = ifname_bsd_to_linux_ifp(ifp, ifname, sizeof(ifname)); - NET_EPOCH_EXIT(et); - KASSERT(ret > 0, ("Interface (%s) is not converted", if_name(ifp))); - - nic = linsysfs_net_find_node(ifp); - MPASS(nic == NULL); - - nic = pfs_create_dir(dir, ifname, NULL, NULL, NULL, 0); - pfs_create_file(nic, "address", &linsysfs_ifnet_addr, - NULL, NULL, NULL, PFS_RD); - pfs_create_file(nic, "addr_len", &linsysfs_ifnet_addrlen, - NULL, NULL, NULL, PFS_RD); - pfs_create_file(nic, "flags", &linsysfs_ifnet_flags, - NULL, NULL, NULL, PFS_RD); - pfs_create_file(nic, "ifindex", &linsysfs_ifnet_ifindex, - NULL, NULL, NULL, PFS_RD); - pfs_create_file(nic, "mtu", &linsysfs_ifnet_mtu, - NULL, NULL, NULL, PFS_RD); - pfs_create_file(nic, "tx_queue_len", &linsysfs_ifnet_tx_queue_len, - NULL, NULL, NULL, PFS_RD); - pfs_create_file(nic, "type", &linsysfs_ifnet_type, - NULL, NULL, NULL, PFS_RD); - - nq = malloc(sizeof(*nq), M_LINSYSFS, M_WAITOK); - nq->pn = nic; - nq->ifp = ifp; - TAILQ_INSERT_TAIL(&ifp_nodes_q, nq, ifp_nodes_next); - return (0); -} - -static int -linsysfs_net_delnic(if_t ifp, void *arg) -{ - struct ifp_nodes_queue *nq, *nq_tmp; - - TAILQ_FOREACH_SAFE(nq, &ifp_nodes_q, ifp_nodes_next, nq_tmp) { - if (nq->ifp == ifp) { - TAILQ_REMOVE(&ifp_nodes_q, nq, ifp_nodes_next); - pfs_destroy(nq->pn); - free(nq, M_LINSYSFS); - return (0); - } - } - return (1); -} - -static void -linsysfs_net_listnics(struct pfs_node *dir) -{ - - CURVNET_SET(TD_TO_VNET(curthread)); - if_foreach_sleep(NULL, NULL, linsysfs_net_addnic, dir); - CURVNET_RESTORE(); -} - -static void -linsysfs_ifnet_arrival(void *arg __unused, struct ifnet *ifp) -{ - - linsysfs_net_latch_hold(); - linsysfs_net_addnic(ifp, net); - linsysfs_net_latch_rele(); -} - -static void -linsysfs_ifnet_departure(void *arg __unused, struct ifnet *ifp) -{ - - linsysfs_net_latch_hold(); - linsysfs_net_delnic(ifp, net); - linsysfs_net_latch_rele(); -} - -void -linsysfs_net_init(void) -{ - - MPASS(net != NULL); - TAILQ_INIT(&ifp_nodes_q); - if_arrival_tag = EVENTHANDLER_REGISTER(ifnet_arrival_event, - linsysfs_ifnet_arrival, NULL, EVENTHANDLER_PRI_ANY); - if_departure_tag = EVENTHANDLER_REGISTER(ifnet_departure_event, - linsysfs_ifnet_departure, NULL, EVENTHANDLER_PRI_ANY); - - linsysfs_net_latch_hold(); - linsysfs_net_listnics(net); - linsysfs_net_latch_rele(); -} - -void -linsysfs_net_uninit(void) -{ - struct ifp_nodes_queue *nq, *nq_tmp; - - EVENTHANDLER_DEREGISTER(ifnet_arrival_event, if_arrival_tag); - EVENTHANDLER_DEREGISTER(ifnet_departure_event, if_departure_tag); - - linsysfs_net_latch_hold(); - TAILQ_FOREACH_SAFE(nq, &ifp_nodes_q, ifp_nodes_next, nq_tmp) { - TAILQ_REMOVE(&ifp_nodes_q, nq, ifp_nodes_next); - free(nq, M_LINSYSFS); - } - linsysfs_net_latch_rele(); -} diff --git a/sys/modules/linsysfs/Makefile b/sys/modules/linsysfs/Makefile index 8ec02da435e4..058fbbc521b1 100644 --- a/sys/modules/linsysfs/Makefile +++ b/sys/modules/linsysfs/Makefile @@ -5,7 +5,7 @@ KMOD= linsysfs SRCS= vnode_if.h \ device_if.h bus_if.h pci_if.h \ - linsysfs.c linsysfs_net.c + linsysfs.c .if !defined(KERNBUILDDIR) .warning Building Linuxulator outside of a kernel does not make sense From nobody Fri Mar 31 11: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 4PnzKy5y8Bz42NxX; Fri, 31 Mar 2023 11: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 4PnzKy5Qjrz3mRy; Fri, 31 Mar 2023 11: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=1680263830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9wT8MM5rqocCKQ5mSvu8VNCttl1bpjYRFcs/i7kBkP4=; b=hm1MxJ0UFBrf9LrJpLG6dSjuP9eAd5eOeumfv1Fkv9d+/ryyX/UmqWfVQzcb1G2IjAE/0Z hPWC9BbsrvLGZkABr37d+aJE8pbVJBYUoSbpsZtGfqcQZil0oFuC+GsLMQSZBHcYSeMq77 XPM4hyx8SSewQJyKjbmdqDgILB5bWCN+YRacki8qs/ARtj6+Bh+xAvK3EGMjLP6C6EOA0I EcRADFLLWBC/Wgq9NOi8Q4+JkKLQ8VaXPB54yHS9BKyfHfeMPtraONQiUNxcj9wpbIdsxS dWnWzdrFhUEBNIX5iChTn7gM5HzNdBPzUD6/ZVW3e9nl8KhQqaS4gv0vkSopGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680263830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9wT8MM5rqocCKQ5mSvu8VNCttl1bpjYRFcs/i7kBkP4=; b=hAmXwgMXoyPPV5BEcgOgJujD999U14mPrFDUuEl6tngMryd4sOihYRPcI87vBeASmZwbPT C3jUeTYVFlbi+Q277eBKPGz13fL+iJVjo/5Y3JXjg10NJYajgCUEMNUKirMr5/QnebCAMH zfOvuGHQ9ZipHJOQOh8KtRvvkYQjtPRR8erfJzK+7ZCshDLdekXvsSe9wu0ecyKZzPfZ6s GScMtdvauN2b1B8goNMWmLa0S1yUHeZ5Jg5KXhIzgijWPzDIlG9LnRvru4bGwSK97baV9y 02ktGJVPRGhIviUWuJ/5nAbooZL4hq3r/w8F+PzYVTied35tiBHDLb59waoEXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680263830; a=rsa-sha256; cv=none; b=IrO7Ds6oZx1aN3DWeAZwf6tPoos65CLizialAkfQ+54ZF5YJfZOzVWN+BEh6wo+RlFU+XW Dubq11VuUq4zP0IiFqX6+kZeH4wacM0OQZl+1lvCwTedrt/TJG6+75vA17vXhkO1ma55rj Yzhu+0D1AoNVQrmxXiS44FA1kBx2+TW0epH8N9fQeuaLTvsHy9Jc62fSyK7w4A0FusrcSV 22z2KGyun8h1qu+JJv/sZYKBWPIVZLfcrUR48uQhd0mqC7s2RENcb+X4XunJloKkTqTUt9 +p8+5PuN+JHXl9N3milHVUHFugM8cZMaejZ+HWRqJuffibi0FU89cI8CFY9jvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnzKy4XJhzt0l; Fri, 31 Mar 2023 11:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VBvAew086643; Fri, 31 Mar 2023 11:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VBvA4r086642; Fri, 31 Mar 2023 11:57:10 GMT (envelope-from git) Date: Fri, 31 Mar 2023 11:57:10 GMT Message-Id: <202303311157.32VBvA4r086642@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: 126df352f516 - main - linux(4): Move inclusion of i386-specific files under common condition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 126df352f5161c89516f9db83bdb892a170f04fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=126df352f5161c89516f9db83bdb892a170f04fb commit 126df352f5161c89516f9db83bdb892a170f04fb Author: Dmitry Chagin AuthorDate: 2023-03-31 11:56:29 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-31 11:56:29 +0000 linux(4): Move inclusion of i386-specific files under common condition --- sys/modules/linux/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 43d7f2c240b8..8efdb3220585 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -47,9 +47,6 @@ VDSODEPS=linux_vdso_gettc_x86.inc .endif .if ${MACHINE_CPUARCH} == "amd64" SRCS+= linux${SFX}_support.S -.else -SRCS+= linux_copyout.c -SRCS+= linux_netlink.c .endif DPSRCS= assym.inc linux${SFX}_genassym.c @@ -72,7 +69,9 @@ SRCS+= imgact_linux.c \ linux_ptrace_machdep.c \ linux_util.c \ linux_vdso_selector_x86.c \ - linux_x86.c + linux_x86.c \ + linux_copyout.c \ + linux_netlink.c .endif .if ${MACHINE_CPUARCH} == "i386" From nobody Fri Mar 31 11: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 4PnzKz6v9nz42PNL; Fri, 31 Mar 2023 11: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 4PnzKz6Qwnz3mbM; Fri, 31 Mar 2023 11: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=1680263831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xgV4mZF/QcCPAvjr4lgkZUYn5fy4Tjs9S0Wagw0FVoI=; b=wjuPVNUDH52r9Rqrf5l8bG5+nmWuyiuUYJxX9B0BRq8sL52F2Wth7Dzq6FsynsMsJfnXGV TI/sbFKJPJiHAM1mvoDaoQwCcukKArEaIJo0RfQuVXw4IpyAGAxLij5kR/+LWdS4sBPSJ6 d/egxMrfMrtMwkChdMfmCezIlTUBMqsQIpLp0VWMAMp6A6grYRjW5kFxfiIq5FgcTQK1La RoI8s3EUAxB8Aj6bidfjZiFIFbT/cTKFrlhcE6lAl02nm0nF2AFzldf5TYeLRdSsWNyAkE nqPvNTOJtlX/WiWsEO9jOLa55wR8WFJYwa4Mh35AS+YiwyieYKbrnJzu+32fAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680263831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xgV4mZF/QcCPAvjr4lgkZUYn5fy4Tjs9S0Wagw0FVoI=; b=Jzz3gGPghakZZ3AaB6tsm6nZ8fJpBoEMIrDgJs/g31dvSyiym/eZHTOYNsJj3LOozQmt+t NhRHoCJGo2T0VtYD7gjTMK3oDyyZhyBmzcBu4dDyIquGSOKdQKm1BH0ADeyAb2GhSnREhF 9oiPA8JBQFf8aYWbIvciqxKLkiJrmE4JxJMZX0c8pv6rBUJytQgqb97GvoO0UiE4IHTrdP Jrl028PCDeusVkIUSZj2KCOK51p+dfMAMFfN9BOV9BpVskAJeHYBrpYDLqCALo++AVV9jn eqxDu4j+dKSOqVblrVL28d+m2XDrn4YjS6tKlPG2EDYevQ+mioox7NBj/5iu9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680263831; a=rsa-sha256; cv=none; b=SpCQN16wWHiX9wmGmSbJ4QYTdApBtDbNE7vcSCmlPsXImgpPbqSyVwinjfB8UWIayfDomB UneIwlqNDDwe3z2GLsS4oQp3cyOGEiacnetx8dHEIhOmLwibrnHE+Kqfuqf8y6EUr9JO3T mPu6tqWKxPviO5Zb3kiokN6PTJT+8tG6zNZpYQoijV42CdaJzpTJPkSJR58+IRnMdUQNsl swI9SbjY65tQ0n66sHMBB6TwNYavR4o93PrnsT+ThJCQ7WsaJ6NiC9PKZpJjhjmOpSyYGW GDAxU8u8qTspI8JG5GjK9yYa7FvqNCNA8IheiI7Jxys5KMt4mFO2rFDIjW+B9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PnzKz5V5Czsb7; Fri, 31 Mar 2023 11:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VBvBWF086662; Fri, 31 Mar 2023 11:57:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VBvBjL086661; Fri, 31 Mar 2023 11:57:11 GMT (envelope-from git) Date: Fri, 31 Mar 2023 11:57:11 GMT Message-Id: <202303311157.32VBvBjL086661@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: 960562652c7a - main - linux(4): Fix opt_netlink.h inclusion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 960562652c7a92b8dc97a63105b04e3548f8408c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=960562652c7a92b8dc97a63105b04e3548f8408c commit 960562652c7a92b8dc97a63105b04e3548f8408c Author: Dmitry Chagin AuthorDate: 2023-03-31 11:56:59 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-31 11:56:59 +0000 linux(4): Fix opt_netlink.h inclusion Add opt_netlink.h to the linux_common module, on i386, where we don't uses linux_common module, move opt_netlink.h inclusion under i386 condition. MFC after: 2 weeks --- sys/modules/linux/Makefile | 4 ++-- sys/modules/linux_common/Makefile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 8efdb3220585..2c6aa41a1a18 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -36,7 +36,6 @@ SRCS= linux${SFX}_dummy_machdep.c \ linux_vdso.c \ opt_inet6.h \ opt_ktrace.h \ - opt_netlink.h \ opt_posix.h \ bus_if.h \ device_if.h \ @@ -71,7 +70,8 @@ SRCS+= imgact_linux.c \ linux_vdso_selector_x86.c \ linux_x86.c \ linux_copyout.c \ - linux_netlink.c + linux_netlink.c \ + opt_netlink.h .endif .if ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 7ebb56ba6473..b7e59e0ac764 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -8,7 +8,8 @@ KMOD= linux_common SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \ linux_dummy.c linux_errno.c linux_netlink.c \ - linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h + linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h \ + opt_netlink.h .if ${MACHINE_CPUARCH} == "amd64" SRCS+= linux_x86.c linux_vdso_selector_x86.c From nobody Fri Mar 31 13: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 4Pp1y63G1qz42mGg; Fri, 31 Mar 2023 13:55: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 4Pp1y62fRYz42QW; Fri, 31 Mar 2023 13:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680270910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaUYgeLciN4sYuiEXg7f7Pejc7fzQuAN5HDSJYvZ0l0=; b=xLNB3IAzwn33X56e2P/LOPHnVB9sKzzLgR69tRtzj/j3SCw1RYwidkHIknMZ85XfGPEzP9 01yXh6BHh/05aAqme2x/pHA8jQs6M4qZ8TW+i9x57qoKZHmKJD5PlS2kG5gH/ApV5T7F19 PlBHHFCQOV+2JnUoFD3WTBL1Ah/b47ri5fIL7XmOUOSUa/a9dE+Hj7QAJG4pxsKmhf0O8g JHCgAyEmZLtgGhxhNh1PvNpJ/YjW+ZdB0BqXySQRYTLW0XmLvZNXZYoh5u0Uk4Fg2kcd9d yUWdjzBUL0dKXXopNWN4nDhKzDjEH3Berh82ypmqlbSNIHntS/pEFeblbEbNmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680270910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaUYgeLciN4sYuiEXg7f7Pejc7fzQuAN5HDSJYvZ0l0=; b=oz2RRwReq3wxTWYLFOmCwpaG4D907Pgq73PsDcZpre36bVconF55+R5SgwyRpBwTexwfIO rEdWYO7NXjbSTaeijmxu8fFT0bwV4dt54mSl9aHJzSS5ysdMYsP9q0f0PCu6sKRog4QXnm WS4jw8qwWw+NmhEUqPeRxRqRAWUqW/gxhs/icuYS6aicHotL8qa1/xFJXg8RpWvyWb0NWY mjDYldnerkHaWv5gSxn6lS9BsJ/8Ep8Je47AzWnyHdkozssNuM5i8zOD1OHl31XRyRviM+ wxPQWvsdg+o83OHXFsTIYqWKD+IltmlX2oNPhCa4yiIioy0PZKDlJ9vF1noPtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680270910; a=rsa-sha256; cv=none; b=ODEvpgis9GX87M59LkB2ewoO3bKeGBRIwf9dF6Fwfw+u9OR1+aPQZbbkFhQcEVP7aCf1GR 1rvqeVbrwPy1CvE8xx9mxO7pMySoci6ujD4xzuD0lPYsRC2sbRcoiMR5kYOuzbkgsK13Wm zsJ5DC30NAUFdkXdj6XgFLD+cabCuN9qDnbaC4+aMp89OzqqCtYqvEc8rjESB6z42X7QBO C15yLx6xFPyZteWtAEDd3A3z5D8jvmifeN7BTgo0aw5x0+zNaEYQOr52VLf9vt1ETXTand udaes5Rrft4gnboaDDtbh/4BmGzXEs6CPlNA82yVlN2lPVXzodL4nI40qsTOtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp1y61hLFzwrf; Fri, 31 Mar 2023 13:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VDtAQk083101; Fri, 31 Mar 2023 13:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VDtAFq083100; Fri, 31 Mar 2023 13:55:10 GMT (envelope-from git) Date: Fri, 31 Mar 2023 13:55:10 GMT Message-Id: <202303311355.32VDtAFq083100@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: a54370f4abb6 - main - arm64: Ensure that thread0's PCB flags are initialized List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: a54370f4abb6bc4e3ef25da97adb3262bacb5a4b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a54370f4abb6bc4e3ef25da97adb3262bacb5a4b commit a54370f4abb6bc4e3ef25da97adb3262bacb5a4b Author: Mark Johnston AuthorDate: 2023-03-31 13:50:34 +0000 Commit: Mark Johnston CommitDate: 2023-03-31 13:50:34 +0000 arm64: Ensure that thread0's PCB flags are initialized On arm64, the PCB is stored at the top of the thread stack. For thread0 this comes from the static "initstack" region, which is placed in the .init_pagetable section, which is not part of the BSS and thus doesn't get zeroed by locore. (See the comment in ldscript.arm64.) It is thus possible for the pcb_flags field to be uninitialized, which can result in PCB_SINGLE_STEP being set. Fix this by simply initializing the field. A separate commit will move initstack out of the .init_pagetable section, since it has no reason to be there, but it is preferable to explicitly initialize PCB fields anyway. In particular, regular kernel stacks are not zeroed upon allocation, so we should be consistent here. Reviewed by: andrew MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks Differential Revision: https://reviews.freebsd.org/D39343 --- sys/arm64/arm64/machdep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index b87c635048de..d9ea06952c54 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -380,6 +380,7 @@ init_proc0(vm_offset_t kstack) #endif thread0.td_pcb = (struct pcb *)(thread0.td_kstack + thread0.td_kstack_pages * PAGE_SIZE) - 1; + thread0.td_pcb->pcb_flags = 0; thread0.td_pcb->pcb_fpflags = 0; thread0.td_pcb->pcb_fpusaved = &thread0.td_pcb->pcb_fpustate; thread0.td_pcb->pcb_vfpcpu = UINT_MAX; From nobody Fri Mar 31 13:58: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 4Pp21s4lJnz42mfX; Fri, 31 Mar 2023 13:58: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 4Pp21s4Bp4z42vS; Fri, 31 Mar 2023 13:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680271105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4yHefAN2DKk2GJOj8jmKSXiSYOBMxyeY0hGtRW2RA4U=; b=sCDIYhEo0P1SjtwKDPlxWvOjYeeEeQlELHMvG1XUx85swqyek8cv14ULeNAw4+tKhYS1rJ WDQ9MSGrhOtPac/o4Y4xU//8P46E3X/znhhSnyDXM3lrFp3CKQpVjMRwqA+x+nakE6ZTvl y6PsE/IoYV8FrsFqNoRffvRCxm49GuTkJU8DQLUGPe/l3R5z5p78y9WkXlOVC0NBkEzqvr 32DQh7AF+BibB+bkZIJYiTz4ZiJ4mXe6kx5CkaxNvpu/z9VHQDjAhnP9hsp2pvD9pg+DqJ WotnUO+CBpE874BjfkpdXkKfGQjQ42JwW7cpSU/nIVKhL8RYz/a9P7Kk2cNP8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680271105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4yHefAN2DKk2GJOj8jmKSXiSYOBMxyeY0hGtRW2RA4U=; b=rtFCcNowPphHbyMBTau1M3FGQzKdf3Ig/ekZAkpEThxi2WTX3MgQiolwKnGfVHWq1OGPhU fDg5LIE6XKsn1K31BLXjCRxoWDQZdE9XhXA+daHWv65noi4b26dGSHDhbP9HPfurxDStGZ 7kukGNf3Bbw/RLuuqQ99l+JMmoE6K/zyFlk0Nh32u+PXrsGtHIzWBVCJvDCdI6yZyXixuS XDNGsaSdYLt0/zrpUvs4ARC6ktysOBeMqrE0pyZnimn8SZ3G/PpMEXQNbaYc6GZH/64iWt LqQfRydD+8dtwBrFiRSvpaEZ/ScylucS6mJW9fUGZj1Tl2AAzYlwDuzXa1Clmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680271105; a=rsa-sha256; cv=none; b=NKcMkMS81UDOc9M/27b/S2HPGF6V4IC4GZDFJI27nwOUAs8tQ1jiGfCs9+am60KXs0tX50 zXFbxzgvJFfAZckH4fn7ts5jw8eux1v90qPvu6cDH8aCJp5OoaEsAr0Yg4vgICsw7VSf8k 87YidHx4uuCBbVw76gsiQensDUEGmig5JClaZIz3wa1GP08fflxzIdcFPGUxoYXWd4b2Cs 7wRNhjx7Qyxcp3PggQKegwRf1zh+LPgG3VAs+wsq8E/c+8BmFWwMEQlPneVpuPMQPak30A CpEGB2l8vDiRbkLK0gmbMqJ5unDc/27siBDRvQj2O49mG+YMixdRhvarS2xc7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp21s3CwyzwnQ; Fri, 31 Mar 2023 13:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VDwPaA083637; Fri, 31 Mar 2023 13:58:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VDwPUA083636; Fri, 31 Mar 2023 13:58:25 GMT (envelope-from git) Date: Fri, 31 Mar 2023 13:58:25 GMT Message-Id: <202303311358.32VDwPUA083636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: fcad8ada9afc - main - Revert "Add myself (cc) as a src commiter." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcad8ada9afcc60cec50880e3ac957681badf55f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=fcad8ada9afcc60cec50880e3ac957681badf55f commit fcad8ada9afcc60cec50880e3ac957681badf55f Author: Cheng Cui AuthorDate: 2023-03-31 06:53:16 +0000 Commit: Cheng Cui CommitDate: 2023-03-31 09:58:14 +0000 Revert "Add myself (cc) as a src commiter." Summary: This reverts commit 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0. Reviewers: rscheff, tuexen Subscribers: imp Approved by: tuexen (mentor) Differential Revision: https://reviews.freebsd.org/D39363 --- share/misc/committers-src.dot | 4 ---- 1 file changed, 4 deletions(-) diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 76ab7441fd46..6e7b5b6c63b3 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -41,7 +41,6 @@ bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2002/01/29\n2009/09/13"] bmilekic [label="Bosko Milekic\nbmilekic@FreeBSD.org\n2000/09/21\n2008/11/10"] bushman [label="Michael Bushkov\nbushman@FreeBSD.org\n2007/03/10\n2010/04/29"] carl [label="Carl Delsey\ncarl@FreeBSD.org\n2013/01/14\n2014/03/06"] -cc [label="Cheng Cui\ncc@FreeBSD.org\n2023/02/15"] ceri [label="Ceri Davies\nceri@FreeBSD.org\n2006/11/07\n2012/03/07"] cjc [label="Crist J. Clark\ncjc@FreeBSD.org\n2001/06/01\n2006/12/29"] davidxu [label="David Xu\ndavidxu@FreeBSD.org\n2002/09/02\n2014/04/14"] @@ -846,8 +845,6 @@ rrs -> bcran rrs -> jchandra rrs -> tuexen -rscheff -> cc - rstone -> markj rstone -> mjoras @@ -923,7 +920,6 @@ thompsa -> eri trasz -> jh trasz -> mjg -tuexen -> cc tuexen -> rscheff ume -> jinmei From nobody Fri Mar 31 14:06: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 4Pp2Bn3WtNz42nYv; Fri, 31 Mar 2023 14:06: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 4Pp2Bn2vJRz43Xs; Fri, 31 Mar 2023 14:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680271569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NV2/mUJt4P6TwTMBdbZo7BuTQ6YG1spcbbBiqnTnAfI=; b=WYupT5Hu+g7qh7Pt6t9Nad0y4t4ERMlSZT6w62I9j5UPoDJ10QR5VYOEKfocaoCF86qYM2 gD9ZtMNDbP+ggKssw0/sAGeDSe6P5dZR8B9X29uBGQkn2Iwsxj01/Sv1ZXg4Rt5kwCKvwX BAZLMGgbh8/TJ9hFb197EJ5/O0fSP5xenugLgH1Dzf7gn7mx/NFkOhg+eAPU6VfMUtK1hw Gl/n8DXatnexDkw53mtkif77ryjCCa/tjcJy80NdmVw1q8TwHLqG3KBe68xDCAWx70whWv mSM4u/nUX2CahbUiz4PG4/Z2ZFcKRQquSUNf8ZFsomhaRWzL/CpzSqMejyxR5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680271569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NV2/mUJt4P6TwTMBdbZo7BuTQ6YG1spcbbBiqnTnAfI=; b=v17zlTMHDdYdITV9+YYM33qIE+ZTgcwz5FhtJJ+mIu+PypAWwhIFaHZ931u9Z29ScqwetK yeKkWba+SQbgqkVDjBl65aVcgkJnWDJoKMELA/Q9ze1GvdcT/5GDrAi9zsZ75nmehAqZX4 0+5mtM1nqnECVgkODwkVznlqQwXe+alL0zKuQRT9F3Mlq4seM81OkAJRob3XiJv/o5+Kt5 CM4/MU8bOmmEV5/fL25Di1Ji35cA8VP9yNSD1yUI+iNF5+paj/x+JUr0uzMorynaTk4I3/ x0tu52LqGNevKvepkuEsFKfqVEu9vPLirnLEs0e7gYMndAc0/1++DHzGmyyutQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680271569; a=rsa-sha256; cv=none; b=cIiG2G3N0kzAeEkd9aQ4S1gQ8C6b4iVMZLLk6YvNM1mO1VyUCIRMEB6z8Vvxm+4khFSfEx oXR3q+cJLdgpf270BhGUADgTeQRH9rs8aFN1vQLPXNMU5FL3Muxp7PJor2JcHPxHCn033J hl1usZPJOrhvySiq+t9VDiJPlLNHIGkFXoQaZsyyoXB03peEB8LrbaubqANC6FLIw2PmfY o5F9EBWX7Xm3ePtTR5tVC2J+25snM1F62fg3I8AxDkMc6m5DOlLfDMW7QnNCngbVNpVqD1 MG2zxh5PWcVG4s/aOoJURE1aeKWPCqPEiX/io6E2vMb7aik1wHBR/8+vLcRBXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp2Bn1xdGzwk0; Fri, 31 Mar 2023 14:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VE695w000631; Fri, 31 Mar 2023 14:06:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VE69wG000630; Fri, 31 Mar 2023 14:06:09 GMT (envelope-from git) Date: Fri, 31 Mar 2023 14:06:09 GMT Message-Id: <202303311406.32VE69wG000630@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: c6ed8694ac58 - main - makefs: improve some cd9660 error messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: c6ed8694ac58c8b81a5e4944cb96c2fa19b6ca79 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c6ed8694ac58c8b81a5e4944cb96c2fa19b6ca79 commit c6ed8694ac58c8b81a5e4944cb96c2fa19b6ca79 Author: Ed Maste AuthorDate: 2023-03-30 23:36:37 +0000 Commit: Ed Maste CommitDate: 2023-03-31 14:03:05 +0000 makefs: improve some cd9660 error messages Obtained from: OpenBSD Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/cd9660.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 7a795f82bd16..40b2488e99e5 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -334,7 +334,7 @@ cd9660_arguments_set_string(const char *val, const char *fieldtitle, int length, int len, test; if (val == NULL) - warnx("error: The %s requires a string argument", fieldtitle); + warnx("error: '%s' requires a string argument", fieldtitle); else if ((len = strlen(val)) <= length) { if (testmode == 'd') test = cd9660_valid_d_chars(val); @@ -346,10 +346,10 @@ cd9660_arguments_set_string(const char *val, const char *fieldtitle, int length, cd9660_uppercase_characters(dest, len); return 1; } else - warnx("error: The %s must be composed of " - "%c-characters", fieldtitle, testmode); + warnx("error: '%s' must be composed of %c-characters", + fieldtitle, testmode); } else - warnx("error: The %s must be at most 32 characters long", + warnx("error: '%s' must be at most 32 characters long", fieldtitle); return 0; } From nobody Fri Mar 31 14:16: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 4Pp2RG4zT3z42nwZ; Fri, 31 Mar 2023 14:16:58 +0000 (UTC) (envelope-from weh@microsoft.com) Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2090.outbound.protection.outlook.com [40.107.215.90]) (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 4Pp2RF3WHVz44nl; Fri, 31 Mar 2023 14:16:57 +0000 (UTC) (envelope-from weh@microsoft.com) Authentication-Results: mx1.freebsd.org; none ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i8kA9Or3jNqLl4C5KaftvSiChNFlXfavyz3r3m630Z8yxjXGxCjNo2weVFE0OxSH5jv9mrl3L17gH/QQkxWfTjN3xqa6mWaWWXZSjFJHdmROcytqcKV0HRrr2rBL3jHmD/GrLNBt1+/LcpDVwDZzgDQKzGH9/tmGpQLjJDatFkYa3IHOf1khjins1i9KbTZgoZ47H4x77fgCZmQ3klyIUEU+T/kBXOEdPheIYx5Hu8u1wkD43eT7XDv4pFHs0qNTopJ0V4tF7YPxYy4FmUIYiCq6SuWd/sIIXfrGWoXcZ7EC8yTHzV87iLi1+YtKxGzwpsGHwfb7nQXSDc8O9mWDjQ== 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=Bsjk17R6BT/9SOtm+h7G8bV5xiAM8612/1fmTo9uPnE=; b=htMUP+0hM66Eb0pZnd+RnKAqD31K55f5fQsTtwGFxtkhXHZQcFGNRU6eOZ1ni1FOF7am7GyNcD/sJ5MpMML8QWf+pPSsO8Jq0UI8413MaZ6d8IRtRAt4tt43UyYavW2BettcWDyN6+ClhiuKTSSKYY74L5IDct4jeJCvRD2o91AU535GFfGwNNjUbfZH/lyYw/tohtm+iWqMQjkoATfU3W2Shym8mA9OsPQD/yzPv92EQHYVnrBIn2HPp918mR0kSf2WPenFvIed41o6bYXz4z/9dDuNkjsQ9iD0HE5E5Er/bk3MRUPK9430E1WTXEMel/w8qXuCIjrFpjSpSTIHhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Bsjk17R6BT/9SOtm+h7G8bV5xiAM8612/1fmTo9uPnE=; b=Yrpogiqhr7GghHF4pihzMqh2K4nZfJb5aqxfO5sTOmGBiiIPlJWIqc130ipbxynNDDIR0S5ok0wDFgciFjCjxzZjXAsQvvldmh2HbKJjqbYoYYxrEp/s//loLb4fEkxiOZtd6J80rQo/gmxkec1mgLYNBSZ5f4TkXarnPwii/Aw= Received: from SI2P153MB0441.APCP153.PROD.OUTLOOK.COM (2603:1096:4:fc::7) by TY2P153MB0382.APCP153.PROD.OUTLOOK.COM (2603:1096:404:8012::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.14; Fri, 31 Mar 2023 14:16:50 +0000 Received: from SI2P153MB0441.APCP153.PROD.OUTLOOK.COM ([fe80::9544:9f03:90e7:b2cb]) by SI2P153MB0441.APCP153.PROD.OUTLOOK.COM ([fe80::9544:9f03:90e7:b2cb%5]) with mapi id 15.20.6277.014; Fri, 31 Mar 2023 14:16:49 +0000 From: Wei Hu To: Warner Losh , Toomas Soome , Gleb Smirnoff CC: src-committers , "" , "" , "imp@freebsd.org" , "gallatin@freebsd.org" , "kevans@freebsd.org" Subject: RE: git: 927358dd98cb - main - amd64 loader: Use efiserialio for Hyper-V booted systems Thread-Topic: git: 927358dd98cb - main - amd64 loader: Use efiserialio for Hyper-V booted systems Thread-Index: AQHZWWomaSYqP3JuuUSL+lhmv0H8N68UDMCAgAACVICAAHBfgIAAQc+AgAA+UEA= Date: Fri, 31 Mar 2023 14:16:49 +0000 Message-ID: References: <202303180720.32I7KXOc030612@gitrepo.freebsd.org> <256C0F87-8B73-4E5E-9B5E-E9BF00DEC019@me.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-Mentions: glebius@freebsd.org X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=2e3ec799-9f8a-4a52-ba98-957d685a31fa;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2023-03-31T14:00:50Z;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SI2P153MB0441:EE_|TY2P153MB0382:EE_ x-ms-office365-filtering-correlation-id: 81abb8c1-0fd2-473d-0a97-08db31f2914d x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: E8r6f5+ZRCTTT7xJrMIZdJmNUgP07+TCCLxftF7xBAtKtAVxI9rAaUYJ1J2xTtHTjvkvOuzoL2KB0otoWPw48tu3C1YdtPs+DBEW+wZ87eWIeYrFKPBYVR00FM5b5gss1aPgzDrS5yY+yaz/aWerxHqjWwyrH4okagAGxu9adN9+GQoOo6ZtPO0+L3ciqYCtV27U084dbKUDGjFM7MCo6QelOgcrv1/sg4g1GYR4eH8zc13u/7DvBVsNPcW2J7KViN2pGTXGY+lsNHu1ApmJIxZPFsBbQFWd3QI4isW11nfxOVg8cw0a7bO1Lt4yoa/Xfb4k6qgxRfRwguBM3w5blQkh9HIpG0qdWO2xRtI+RJIibA6deeeVJ3rbwM7Pxdr0DZmEdr4cnDyV87kBgcTqnflv8d80Fw44FAS1GpR3fpaFRTbrpS5jhVs6jSsjwNBP8AfLvXwnW2YJCME+GMAV36bDWfirawRdmRPyhUMZ7q31XkFpbTEaWVg+d7e7fZvsyJ4Rq5magdB/kQswwY6zqEwwisDwfl7Bt+QDxaUNEFWGH+kKbaxlWYmUNMTJTg69KLfAaIhsw6REGsb40DCe40JccooN6rwOwMAtAxoNixE9oS975zB9N3/cIccSXh0O0GF3/2h3YHpVxQ9ZdwAkqA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2P153MB0441.APCP153.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(4636009)(376002)(39860400002)(396003)(366004)(136003)(346002)(451199021)(10290500003)(478600001)(186003)(54906003)(83380400001)(9686003)(7696005)(26005)(6506007)(966005)(71200400001)(4326008)(66476007)(8676002)(66556008)(64756008)(66446008)(786003)(66946007)(110136005)(316002)(76116006)(53546011)(122000001)(5660300002)(82950400001)(41300700001)(82960400001)(30864003)(166002)(38070700005)(38100700002)(2906002)(8936002)(52536014)(9326002)(86362001)(55016003)(8990500004)(33656002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?Z1R2UEJGWGdzTzJITlQwekVDQm0wZ2Fsek15UnQrQ1hTTW54dGdKWE5qTHhK?= =?utf-8?B?M0pPMkdock5NWEsyNW5WT3BGT2V4QkRrQVkreHRma3dIeHRqNnBBTGxDU0VJ?= =?utf-8?B?VURvUUxOSWxVcmZRbzBpNVI2NlVralpzcDBNRFAydC93aUlMaUpNUnNPWUxu?= =?utf-8?B?SzJsN0VGNzNhSENJUzlrUlE5Y1U2Z2t5YVE1OVpIdnNKVEw5clpJNjZRYzly?= =?utf-8?B?SUNwaHB6eXdyM0dtYXZPUkhHMWhKMURVbVdZZjRXYkJGamtKNGFiNmpaZzFP?= =?utf-8?B?ZzIvMThOOVBxTmNTdkxqbVdWNHdGZGZwZFBrODlOV1NIL1BONzF3bzViSDM4?= =?utf-8?B?SUV0aDVpazltWlFWUjY4TkcrQWxCVWdSYWcvTWJqV3dsYmgvd3JkOG9EWHQy?= =?utf-8?B?MlBTcWdlZFRaRzU1ZHR1Y3hUQkJ3aHRwejVVQWY1WjE1RUFMaTNhVHBCYkxJ?= =?utf-8?B?KytSL1dlZzBEQ3NDUU51OWdsNUZQa3FzaXNkbm1zbGQyZVdEcFFCRDV0bjdv?= =?utf-8?B?RE51RUJMWklpWDU4Z1l2R0lacDMzT0ZQSjJqQWR4SHlaeHdsUXJRN01UMUts?= =?utf-8?B?cUw3SW5aU1JOY0VSVFNRTllEYU9hd3RoSk95VU1lbElaTUQ5NWE0amhFY0VO?= =?utf-8?B?WXRQUVg1b3NuQVZhOUFoRERRWUovNEhGZnBKVU9QSEFOTERGamRJbUI1QWFx?= =?utf-8?B?c3hEUlBQNkhBeUlwaForOWkybkw2WENVcDQ1TDhieC9nZUt0eGkwMU5qTDZO?= =?utf-8?B?S1FySFlHQTZwQlZBeHBFcHI1dE9obTMzMk9hTUljTVFqanBXSmMvRmlyZjVs?= =?utf-8?B?TXowdHlsOXlnaHUwcnhuVk9jdHJ4bHA3NHlKZmczQ09pcFE3MEV5cmd1bXpQ?= =?utf-8?B?eWFTQlR0MmZ5MTAwMWdtYVpKclBRR0pMUVpyUXRxalZpVkFxOXdrRXpiVDFr?= =?utf-8?B?ckhETzZKem8zQVZWVWtOdDdEajBUdE9VL2UxaDVZSzM2OTd5T3k0QVF5OS9i?= =?utf-8?B?T1RsMGlVWUQ0ZzZEUDl4RGZrTkszdFFBQTkySnp0VHNEV0I5dTk0em1lckpD?= =?utf-8?B?azdNYm5hZDI4T2pZMi9EcTh1SHlPWlgwTFR5Znh3bHhrK0lZbDFIRStOeDRq?= =?utf-8?B?QS9zMlF5bTkrRlN4RkNhUjh3ZlhSUWFBQmd1SG1tOXVzMWNPNGZ2TmoyWFBW?= =?utf-8?B?c1drdUw2ZUs5VE5EcnZYa3lvVi9mUk04ZTArZHRZazhkQ094eXNIVTZCcnB5?= =?utf-8?B?NmZKeFBpdHEweGxwbUREblNRZTJFamUzNFh2Zk9mZk9KVG43S2xYZUU2Vjhk?= =?utf-8?B?cW1QbXRBaWtFZzU3ZDlqblcrUGxRQlV2dXppZWpUajZobEFyWHdRRHdNbmgz?= =?utf-8?B?a1JMaTlUSmE0UVljT1dmdjgzU2VmK0VvSms2UGozQzhMcXg3RzFNdGtuOEZl?= =?utf-8?B?R0xPbXYvbGQ0N2dVZHNScGVpVytUaTdRZVBVRkdOc2xVRTFrbng2SkpycWZz?= =?utf-8?B?LzFwcm9HUjRPYnRGZEFCSFE4Z3FUQzNmTllnaDd2ZHVpRzNQMjlXSytKdUQ2?= =?utf-8?B?QXJTNHBmelVMUDBNTDhBZWJhR0Z4aTNKbVFZWDZCZkh0aUVVd0tLdWl3VFA4?= =?utf-8?B?V2NnbDFxd3hLTnhnajdrckVMcHpYS1k3d2RvYWovRzFkWnZtYy9ZN1lOZWxJ?= =?utf-8?B?c2JLQnl2RFJRbXQ0VVZBRnd6bWVtQTFTTUFnZ1ZuQk45aDBuZWo4WkhlRjVD?= =?utf-8?B?Y0d6LzhQeTZWWjk2VW11cEwzQkc5eTR2VS9lUXMxdnJIVVdjYTUxU1l4bDR4?= =?utf-8?B?dlFHWkF4dkpHSUVxb1RlaUh0a1JSeTU0Wmx1YTJNcWdpL2FrY0ZCS2lBTnhJ?= =?utf-8?B?V2FOSFgxMzZYUXBvTWFlWHVqMHBkUDJad1YrQ2VucndlSDBDaHNQM2VJeTd6?= =?utf-8?B?RGI5T2NhMkFiekRNZi9kWVhxRzgyaGxOYUlPWDdXa04xRzd1UFRBcnQ1TXRU?= =?utf-8?B?L0h6bENXTXdDeUJUeGRWSWxBTDU5dWJLUVc5VDZFTHVKMzU2eTBWbTRFTWIx?= =?utf-8?B?MmRuVVlEZ3ozWEJtTzdzQXdLWnFvSkxjWDhpdXk5aFNlcmY5MjFTSWp6VXhZ?= =?utf-8?Q?1q0GLMnpXpdoHjbhxVwlcMuMI?= Content-Type: multipart/alternative; boundary="_000_SI2P153MB0441F026F04D1479A30ACF73BB8F9SI2P153MB0441APCP_" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: 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: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SI2P153MB0441.APCP153.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 81abb8c1-0fd2-473d-0a97-08db31f2914d X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Mar 2023 14:16:49.2085 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ScDGNwXv+14X0cTCXmaVNy0sfVulfwCVJIGibzqHklZaqn3l4RMP2RtrqwTS9v4J1wbPzWXLMUJcI5Kq5hyB6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2P153MB0382 X-Rspamd-Queue-Id: 4Pp2RF3WHVz44nl X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:8075, ipnet:40.104.0.0/14, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --_000_SI2P153MB0441F026F04D1479A30ACF73BB8F9SI2P153MB0441APCP_ Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 SGksDQoNCkkgYW0gbm8gZXhwZXJ0IG9uIGNvbnNvbGUgZHJpdmVycy4gU28gSSBkb27igJl0IGhh dmUgYW55IHRlY2huaWNhbCBpbnB1dC4gV2hhdCBJIGhvcGUgaXMgdG8gaGF2ZSBhIEZyZWVCU0Qg d29yayBvbiBHZW4gMiAoVUVGSSkgSHlwZXJWIGFzIHNvb24gYXMgcG9zc2libGUuIElmIHdlIGJh Y2sgb3V0IHRoaXMgcGF0Y2gsIHdlIGFyZSBiYWNrIHRvIHRoZSBvcmlnaW5hbCBzdGF0ZSB0aGF0 IEZyZWVCU0QgaXMgbm90IHN1cHBvcnRlZCBvbiBHZW4gMiBIeXBlclYgZm9yIGFtZDY0LCB3aGlj aCBpcyB2ZXJ5IHVuZm9ydHVuYXRlLg0KDQpCYWNrIHRvIHRoaXMgcGF0Y2gsIHN0aWxsIG5vdCBz dXJlIHdoeSB0aGlzIGhhbmcgaGFwcGVucyBvbiByZWFkIGhhcmR3YXJlLCBzaW5jZSBpdCBzaG91 bGRuJ3QgYmUgdXNpbmcgdGhhdCBlZmlzZXJpYWxpbyBkcml2ZXIgaWYgaXQncyBub3QgSHlwZXIt Vi4gVGhlIG9ubHkgdGhpbmcgdGhhdCB0aGUgb3JpZ2luYWwgb3duZXIgb2YgdGhlIHBhdGNoIGNv dWxkIHRoaW5rIG9mIGlzIGluIHRoZSBwcm9iZSB0byByZW5hbWUgdGhlIGRyaXZlciBiYWNrIHRv IGVmaXNlcmlhbGlvIGlmIGl0J3Mgbm90IEh5cGVyLVYuDQoNCkBHbGViIFNtaXJub2ZmPG1haWx0 bzpnbGViaXVzQGZyZWVic2Qub3JnPiwgYXJlIHlvdSBhYmxlIHRvIHRyeSBmb2xsb3dpbmcgaW4g YWRkaXRpb24gdG8gc2VlIGlmIGl0IHdvcmtzPw0KDQpkaWZmIC0tZ2l0IGEvc3RhbmQvZWZpL2xv YWRlci9lZmlzZXJpYWxpby5jIGIvc3RhbmQvZWZpL2xvYWRlci9lZmlzZXJpYWxpby5jDQppbmRl eCA1ZmJjNzAwZjZhYzIuLjI0ZmU3ZTA1YzI2MSAxMDA2NDQNCi0tLSBhL3N0YW5kL2VmaS9sb2Fk ZXIvZWZpc2VyaWFsaW8uYw0KKysrIGIvc3RhbmQvZWZpL2xvYWRlci9lZmlzZXJpYWxpby5jDQpA QCAtMjY1LDYgKzI2NSw4IEBAIGNvbWNfcHJvYmUoc3RydWN0IGNvbnNvbGUgKnNjKQ0KICAgICAg ICAgKi8NCiAgICAgICAgZW52ID0gZ2V0ZW52KCJzbWJpb3MuYmlvcy52ZXJzaW9uIik7DQogICAg ICAgIGlmIChlbnYgPT0gTlVMTCB8fCBzdHJuY21wKGVudiwgIkh5cGVyLVYiLCA3KSAhPSAwKSB7 DQorICAgICAgICAgICAgICAgLyogZGlzYWJsZSBiZWluZyBzZWVuIGFzICJjb21jb25zb2xlIiAq Lw0KKyAgICAgICAgICAgICAgIGNvbWNvbnNvbGUuY19uYW1lID0gImVmaXNlcmlhbGlvIjsNCiAg ICAgICAgICAgICAgICByZXR1cm47DQogICAgICAgIH0NCiNlbmRpZg0KDQpJZiBub3QgSSB3aWxs IGJhY2sgaXQgb3V0Lg0KDQpNYW55IHRoYW5rcywNCldlaQ0KDQoNCkZyb206IFdhcm5lciBMb3No IDxpbXBAYnNkaW1wLmNvbT4NClNlbnQ6IEZyaWRheSwgTWFyY2ggMzEsIDIwMjMgNjoxOCBQTQ0K VG86IFRvb21hcyBTb29tZSA8dHNvb21lQG1lLmNvbT4NCkNjOiBHbGViIFNtaXJub2ZmIDxnbGVi aXVzQGZyZWVic2Qub3JnPjsgV2VpIEh1IDx3aHVAZnJlZWJzZC5vcmc+OyBzcmMtY29tbWl0dGVy cyA8c3JjLWNvbW1pdHRlcnNAZnJlZWJzZC5vcmc+OyA8ZGV2LWNvbW1pdHMtc3JjLWFsbEBmcmVl YnNkLm9yZz4gPGRldi1jb21taXRzLXNyYy1hbGxAZnJlZWJzZC5vcmc+OyA8ZGV2LWNvbW1pdHMt c3JjLW1haW5AZnJlZWJzZC5vcmc+IDxkZXYtY29tbWl0cy1zcmMtbWFpbkBmcmVlYnNkLm9yZz47 IGltcEBmcmVlYnNkLm9yZzsgZ2FsbGF0aW5AZnJlZWJzZC5vcmc7IGtldmFuc0BmcmVlYnNkLm9y Zw0KU3ViamVjdDogUmU6IGdpdDogOTI3MzU4ZGQ5OGNiIC0gbWFpbiAtIGFtZDY0IGxvYWRlcjog VXNlIGVmaXNlcmlhbGlvIGZvciBIeXBlci1WIGJvb3RlZCBzeXN0ZW1zDQoNCg0KDQpPbiBGcmks IE1hciAzMSwgMjAyMyBhdCAxMjoyMuKAr0FNIFRvb21hcyBTb29tZSA8dHNvb21lQG1lLmNvbTxt YWlsdG86dHNvb21lQG1lLmNvbT4+IHdyb3RlOg0KDQoNCg0KT24gMzEuIE1hciAyMDIzLCBhdCAw Mjo0MCwgV2FybmVyIExvc2ggPGltcEBic2RpbXAuY29tPG1haWx0bzppbXBAYnNkaW1wLmNvbT4+ IHdyb3RlOg0KDQpMZXQncyBiYWNrIGl0IG91dC4gSSBkaWRuJ3QgZ2V0IGEgY2hhbmNlIHRvIHJl dmlldyBpdCBhbmQgdGhlIGR1cGxpY2F0ZWQgbmFtZSBzdHJpa2VzIG1lIGFzIG1hc3NpdmVseSB1 bndpc2UuDQpPZiBjb3Vyc2UsIHRoZSBlZmkgc2VyaWFsIGRyaXZlciBuZXZlciBzaG91bGQgaGF2 ZSBoYWQgdGhlIG5hbWUgY29tY29uc29sZSBpbiB0aGUgZmlyc3QgcGxhY2UsIGltaG8uIEl0IHdh cyBPSw0Kb24gYXJtIHdoZXJlIHdlIGNvdWxkbid0IGNvbmZsaWN0Lg0KDQpTbyBsZXQncyBiYWNr IGl0IG91dCBhbmQgdGFsayBhYm91dCBob3cgd2Ugc2hvdWxkIGRvIHRoaXMsIGluY2x1ZGluZyB0 aGUgbmVlZCB0byBwb3NzaWJseSBqdXN0IHJlbmFtZSB0aGUgZWZpDQp2ZXJzaW9uIG9mIHRoZSBj b25zb2xlIGRyaXZlciB0byBzb21ldGhpbmcgZWxzZS4gSU1ITywgaXQgbmV2ZXIgc2hvdWxkIGhh dmUgYmVlbiBjb21jb25zb2xlIGluIHRoZSBmaXJzdA0KcGxhY2UgYmVjYXVzZSBpdCdzIGNvbmZp Z3VyZWQgZGlmZmVyZW50bHkgdGhhbiBjb21jb25zb2xlLi4uLg0KDQpXYXJuZXINCg0Kb2ssIGxl dHMgc3RhcnQgZnJvbSBiZWdpbm5pbmcuIFRoZSBsb2FkZXIgZGV2aWNlIG5hbWluZyBpcyB0b3Rh bCBtZXNzIGFuZCBzaG91bGQgbm90IGdvIHRoaXMgd2F5IC0gaXQgaXMgbm90IHVuZGVyc3RhbmRh YmxlIGZvciB1c2VycyBhbmQgbm90IHVuZGVyc3RhbmRhYmxlIGZvciBkZXZlbG9wZXJzLg0KDQp0 aGUgY29uZmlnIGJlbG93IGlzIHBlcmZlY3QgZXhhbXBsZSBvZiB0aGUgc2l0dWF0aW9uOg0KDQpG aXJzdCB0aGUgY29uZmlnIGRvZXMgc2V0Og0KDQpjb25zb2xlPSJjb21jb25zb2xlIHZpZGNvbnNv bGUgZWZp4oCdDQoNClNvLCB3ZSBkbyB0cnkgdG8gc2V0IHNlcmlhbCBjb25zb2xlLCBiaW9zIHZp ZGVvIGNvbnNvbGUgYW5kIGVmaSBjb25zb2xlLiBTbyB3ZSBoYXZlIOKAnHNoYXJlZOKAnSBjb25m aWcgZm9yIEJJT1MgYW5kIFVFRkkgbG9hZGVyLCB3aGljaCBzaG91bGQgYmUgdG90YWxseSByZWFz b25hYmxlIGZyb20gdXNlciBwb2ludCBvZiB2aWV3LCBidXQgaXMgdGVjaG5pY2FsbHkgd3Jvbmcs IGJlY2F1c2UgQklPUyBsb2FkZXIgaGFzIG5vIGlkZWEgd2hhdCBpcyBlZmkgY29uc29sZSBhbmQg RUZJIGxvYWRlciBoYXMgbm8gaWRlYSB3aGF0IGlzIHZpZGNvbnNvbGUuIFNvIHRoaXMgbWl4dHVy ZSBlbmRzIHVwIHdpdGggbWVzc2FnZToNCg0KSSBzdHJvbmdseSBkaXNhZ3JlZSB0aGlzIGlzIHdy b25nLiBZb3UgaGF2ZSBhIGJvb3QgbG9hZGVyIHRoYXQgbWF5IGhhdmUgb25lIG9mIG1hbnkgY29u c29sZSBkZXZpY2VzLiBOb3QgYWxsIG1heSBiZSBwcmVzZW50Lg0KDQoNCmNvbnNvbGUgdmlkY29u c29sZSBpcyBpbnZhbGlkISINCg0KQW5kIHRoZSB1c2VyIHdpbGwgZ2V0IHRoZSBzaW1pbGFyIGVy cm9yIHdoZW4gYm9vdGluZyBCSU9TIHNldHVwLg0KDQpZZXMuIFRoaXMgbWVzc2FnZSBpcyBhIGJp dCBib2d1czogaXQganVzdCBtZWFucyB3ZSBkb24ndCBoYXZlIGEgY29tY29uc29sZSBjb25maWd1 cmVkLiBBbmQgdGhhdCdzIGZpbmUuDQoNCkl0J3MgbGlrZSBpZiBJIGhhZCBpZmNvbmZpZ19peGww PURIQ1AgYW5kIGlmY29uZmlnX3hlMD1ESENQIGluIG15IHJjLmNvbmYgZmlsZSwgaW1oby4gSXQg c2F5cyBpZiB0aGV5IGFyZSB0aGVyZSwgdXNlIHRoZW0uIE90aGVyd2lzZSBkb24ndC4gV2UgZG9u J3QgaGF2ZSBhIGV0aCBkZXZpY2UgdGhhdCdzIGEgZ2VuZXJpYyB0aGluZy4gTm9yIHNob3VsZCBj b21jb25zb2xlIGJlIGFsbCBwb3NzaWJsZSB1YXJ0cy4NCg0KVGhlbiB3ZSBqdXN0IHNldCBjb25z b2xlPeKAnGVmaeKAnS4NCg0KVGhlbiB0aGVyZSBpcyBzZXR0aW5nIGZvciB1YXJ04oCmDQoNClRo aXMgaXMgYW4gb3J0aG9nb25hbCBpc3N1ZS4NCg0KV2l0aCB0b2RheXMgVUVGSSBzZXR1cHMsIHRo ZSBsb2dpYyBpcyB0aGF0IHlvdSBzZXQgdXAgeW91ciBoYXJkd2FyZSwgdGhhdCBpcywgeW91IGNv bmZpZ3VyZSBzZXJpYWwgcG9ydCBhdHRyaWJ1dGVzIGZyb20gZmlybXdhcmUgc2V0dXAsIGFuZCB0 aGUgVUVGSSBmaXJtd2FyZSB3aWxsIHBvcHVsYXRlIGl0cyBpbnRlcm5hbCBzdHJ1Y3R1cmVzIHdp dGggdGhvc2UgdmFsdWVzLg0KDQpBZ3JlZWQuIFN0aWxsIG9ydGhvZ29uYWwgdG8gdGhlIG5hbWlu ZyBpc3N1ZS4NCg0KTm93LCBmaXJzdCBpc3N1ZSBpcywgd2hpbGUgZGV2ZWxvcGluZyB1ZWZpIGxv YWRlciwgaXQgd2FzIGVhc3kgcGF0aCB0byByZXVzZSBiaXRzIGZyb20gQklPUyBsb2FkZXIuIHNt YmlvcywgYWNwaSwgYW5kIHNhZGx5LCBjb21jb25zb2xlLiBTYWRseSwgYmVjYXVzZSBjb21jb25z b2xlIGlzIGJ1aWx0IGFzc3VtaW5nIHg4NiBJTyBwb3J0IGZlYXR1cmVzIHdoaWNoIGFyZSBub3Qg YXZhaWxhYmxlIG9uIG90aGVyIHBsYXRmb3Jtcy4NCg0KQWdyZWVkLiBIb3dldmVyLCB3ZSBhcmUg c3R1Y2sgd2l0aCBjb21jb25zb2xlID09IHRhbGsgdG8gdGhlIGhhcmR3YXJlIGFuZCBieXBhc3Mg dGhlIFVFRkkgZmlybXdhcmUuIFdlIG5lZWQgdG8gaGF2ZSBhIGVmaXNlcmlhbCBhbmQgZWZpdmlk ZW8gZGV2aWNlLCBldmVuIGZvciB4ODYsIHNvIHRoYXQgd2UgY2FuIHNwZWNpZnkgdGhpbmdzIG1v cmUgY2xvc2VseS4gT3ZlcmxvYWRpbmcgY29tY29uc29sZSBpcyB1bndpc2UuDQoNClNvIHllcywg YmlvcyB2ZXJzaW9uIG9mIGNvbWNvbnNvbGUgc2hvdWxkIG5vdCBoYXZlIGJlZW4gdXNlZCB0byBi dWlsZCBVRUZJIGxvYWRlciBhdCBhbGwuDQoNClllcyBhbmQgbm8uIEl0J3MgaW4gdXNlIHRvZGF5 LCBzbyBzYXlpbmcgaXQgc2hvdWxkbid0IGlzIGFib3V0IDEwIHllYXJzIHRvbyBsYXRlLg0KDQpO b3cgdGhlIGZ1biBwYXJ0LCBldmVuIGFzIFVFRkkgZG9lcyBwcm92aWRlIFNJTyBBUEkgdG8gYWNj ZXNzIHNlcmlhbCBwb3J0cywgdG8gcmVhZCBmcm9tIHBvcnQsIHdyaXRlIHRvIHBvcnQgYW5kIHNl dCBhdHRyaWJ1dGVzLCBpdCB0dXJucyBvdXQgdGhlcmUgYXJlIFVFRkkgaW1wbGVtZW50YXRpb24o cz8pLCB3aGVyZSBjaGFuZ2luZyBzb21lIGF0dHJpYnV0ZXMgd2lsbCBjYXVzZSBzeXN0ZW0gdG8g aHVuZy4gV2hpY2ggaXMgdGhlIHJlYXNvbiwgd2h5IHdlIG5lZWQgdG8gc2V0IHVwIGhhcmR3YXJl IHByb3Blcmx5IGZyb20gZmlybXdhcmUsIGFuZCBvdXIgZ2VuZXJpYyBjb25maWcgc2hvdWxkIG5v dCB0cnkgdG8gZW5mb3JjZSBzb21lIG90aGVyIHZhbHVlKHMpLiBEZWZhdWx0IHNob3VsZCBwaWNr IHVwIHZhbHVlcyBmcm9tIHRoZSBzeXN0ZW0uIFN1cmUsIGlmIHRoZSBtYWNoaW5lIG9wZXJhdG9y IGhhcyBzb21lIHJlYXNvbiB0byBjaGFuZ2UgdGhvc2UgdmFsdWVzIGFuZCBoYXMgdGVzdGVkIHRo ZSBjaGFuZ2UsIHdlIHNob3VsZCBoYXZlIG1ldGhvZCB0byBjaGFuZ2UgdGhlIGNvbmZpZywgYnV0 IGFnYWluLCBkZWZhdWx0cyBzaG91bGQgY29tZSBmcm9tIHN5c3RlbSBzZXR1cC4NCg0KQWdyZWVk LiBBbmQgaXQgbW9zdGx5IGRvZXMgdG9kYXkuIElmIHlvdSBoYXZlIHNlcmlhbCByZWRpcmVjdCwg dGhlIGVmaSBkcml2ZXIgZG9lcyBhbGwgdGhhdCBhdXRvbWF0aWNhbGx5Lg0KDQpXaGlsZSBJIHNl ZSB0aGUgcmVhc29uaW5nIHRvIHRyeSB0byBjcmVhdGUgYWxsIHRob3NlIGRpZmZlcmVudCBuYW1l cywgbWF5YmUgdGhlIGZpcnN0IHRoaW5nIHNob3VsZCBiZSB0byBsb29rIG9uIHRoaXMgYXMgaW5u b2NlbnQgZW5kIHVzZXIsIHdobyBoYXMgbm8gaWRlYSBhYm91dCB0aG9zZSBmaW5lIHRlY2huaWNh bCBkZXRhaWxzIGFuZCBoaXN0b3JpY2FsIHJlYXNvbnMgYW5kIGlzIGp1c3QgdHJ5aW5nIHRvIGdl dCBzeXN0ZW0gdG8gYmVoYXZl4oCmLg0KDQpJdCBoYXMgdG8gYmUgYSBuZXcgbmFtZS4gWW91IGNh bid0IGp1c3Qgb3ZlcmxvYWQgY29tY29uc29sZSBhbmQgaGF2ZSBpdCB3b3JrIHJlbGlhYmx5LiBU aGUgdXNlciBoYXMgdG8gdW5kZXJzdGFuZCB0aGUgdGVjaG5pY2FsIGRldGFpbHMuDQoNClBhcnQg b2YgdGhlIHByb2JsZW0gaGVyZSB0b28gaXMgdGhhdCBjb21jb25zb2xlJ3MgaW50ZXJmYWNlIHNh eXMgJ3VzZSB0aGUgb25lIGF0IHBvcnQgMHgzNzgnIHdoaWNoIGlzIGltcG9zc2libGUgd2l0aG91 dCBwYXJzaW5nIEFDUEkgdGFibGVzLCB3aGljaCB0aGUgZWZpIGxvYWRlciBkb2Vzbid0IGRvLiBT byB0aGVyZSdzIGFscmVhZHkgYSBuZXcsIGtsdWRneSBpbnRlcmZhY2UgdG8gc3BlY2lmeSB0aGUg VUlEIG9mIHRoZSBlZmlzZXJpYWwgZGV2aWNlLiBUaGlzIFVJRCBpcyBqdXN0IGEgbnVtYmVyIHdp dGggbm8gcmVsYXRpb25zaGlwIHRvIHRoZSBwb3J0IGZyb20gbWFjaGluZSB0byBtYWNoaW5lLiBT byB3ZSdyZSBhbHJlYWR5IGZvcmNpbmcgY2hhbmdlcyBvbiB0aGUgdXNlci4gSXQncyBubyBsb25n ZXIgdHJhbnNwYXJlbnQ6IGl0IHRha2VzIGVmZm9ydCB0byBjb25maWd1cmUgYW5kIHlvdSBhbHJl YWR5IGhhdmUgdG8ga25vdyB0aGUgZGlmZmVyZW5jZXMgYmVjYXVzZSB0aGUgc2ltcGxlIHBvcnQg c2ltcGx5IGRvZXNuJ3Qgd29yay4NCg0KVGhpcyBpcyB3aHkgSSd2ZSBiZWVuIGFkdm9jYXRpbmcg Zm9yIGVmaSAodXNlIENPTk9VVCB0ZXh0IGludGVyZmFjZSksIGVmaXNlcmlhbCAodXNlIHRoZSBl ZmkncyB1YXJ0IHJvdXRpbmVzKSBhbmQgZWZpdmlkZW8gKHVzZSBncmFwaGljIGZyYW1lIGJ1ZmZl cikgZm9yIHllYXJzLiBIYXZpbmcgdGhpcyBzZXBhcmF0aW9uIHdpbGwgYWxsb3cgcGVvcGxlIHRv IGNvbmZpZ3VyZSB0aGUgY29uc29sZXMgb24gdGhlaXIgc3lzdGVtcyBtb3JlIGRldGVybWluaXN0 aWNhbGx5LiBGb3IgdGhvc2UgdGhhdCBoYXZlIG5pY2Ugc2VyaWFsIHJlZGlyZWN0LCAnZWZpJyBp cyB0aGUgd2F5IHRvIGdvLiBJdCBqdXN0IGRvZXMgdGhlIHJpZ2h0IHRoaW5nLiBGb3IgdGhvc2Ug dGhhdCBkbyBub3QsIHRoZW4geW91IGNhbiB1c2Ugb25lIG9yIG1vcmUgb2YgZWZpc2VyaWFsIGFu ZCBlZml2aWRlbyB0byBnZXQgdGhlIGNvbWJpbmF0aW9uIHlvdSB3YW50LiBQbHVzIHdlIGNhbiBt b3ZlIHRoZSBncmFwaGljcyBkZXBlbmRlbmNpZXMgaW50byBlZml2aWRlbyBhbmQgZ2V0IHJpZCBv ZiB0aGUgY3Jhenkgc3R1YnMgdGhhdCB0aGluZ3MgbGlrZSBrYm9vdCBuZWVkIHRoYXQgY2FuIG5l dmVyIGV2ZXIgaGF2ZSBncmFwaGljYWwgdmlkZW8uIEknbSBzdGlsbCBtYWQgdGhhdCBteSBkZXNp cmUgZm9yIHRoaXMgd2FzIGlnbm9yZWQgd2hlbiB0aGUgZ3JhcGhpY3Mgc3R1ZmYgd2FzIGFkZGVk DQoNCldoZW4gd2UgYnJpbmcgdGhpcyBkcml2ZXIgYmFjaywgaXQgYWJzb2x1dGVseSBtdXN0IGhh dmUgYSBuZXcgbmFtZS4gSXQgY2Fubm90IHRyeSB0byAnZmFrZScgaXQgYnkgZG9pbmcgdGhlIGdh bWVzIGl0J3MgZG9pbmcuIFRoYXQgc2ltcGx5IHdvbid0IHdvcmsgYW5kIGJyZWFrcyBtYW55IHdv cmtpbmcgY29uZmlndXJhdGlvbnMgdG9kYXkuDQoNClNvIG15IHN1Z2dlc3Rpb24gaXMgdGhhdCB3 ZSBoYXZlIGEgbmV3IGVmaXNlcmlhbCBkcml2ZXIsIGh5cGVyViB1c2VzIGl0LiBXZSByZW5hbWUg dGhlIGN1cnJlbnQgZWZpIHNlcmlhbCBpbnRlcmZhY2UgdG8gYmUgZWZpc2VyaWFsLiBPbiBhYXJj aDY0IChhbmQgb24gYWFyY2g2NCBvbmx5KSB3ZSBoYXZlIGEgbmV3IGNvbWNvbnNvbGUgZHJpdmVy IHRoYXQganVzdCByZWRpcmVjdHMgdG8gZWZpc2VyaWFsLiBJdCBkb2Vzbid0IHRyeSB0byBjaGFu Z2UgdGhlIG5hbWUgb2YgYW55dGhpbmcsIG5vciB0cnkgdG8gZG8gYW55dGhpbmcgZWxzZS4gUGx1 cyBpdCBzaG91bGQgc3RhcnQgd2FybmluZyB3aGVuIHlvdSBhcmUgdHJ5aW5nIHRvIHVzZSB0aGUg eDg2LW9ubHkgY29uZmlndXJhdGlvbiBrbm9icyBvZiBjb21jb25zb2xlLiBBbmQgc3RhcnRpbmcg YWZ0ZXIgdGhlIDE0IGJyYW5jaCwgaXQgc2hvdWxkIHN0YXJ0IHdhcm5pbmcgcGVvcGxlIHNob3Vs ZCB1c2UgZWZpc2VyaWFsIGluc3RlYWVkLiBBbmQgd2UgbmV2ZXIsIGV2ZXIgZXZlciBhZ2FpbiB0 cnkgdG8gZG8gYWxpYXNlcyB0aGF0IGFyZW4ndCByZWFsbHkgdGhlIHNhbWUgZGV2aWNlIGFuZCBo YXZlIGRpZmZlcmVudCBjb25maWd1cmF0aW9uIG5lZWRzIHVuZGVyIHRoZSBjb3ZlcnMuDQoNCldh cm5lcg0KDQpqdXN0IG15IDIgY2VudHMsDQp0b29tYXMNCg0KDQpPbiBUaHUsIE1hciAzMCwgMjAy MyBhdCA1OjMx4oCvUE0gR2xlYiBTbWlybm9mZiA8Z2xlYml1c0BmcmVlYnNkLm9yZzxtYWlsdG86 Z2xlYml1c0BmcmVlYnNkLm9yZz4+IHdyb3RlOg0KICBXZWksIEt5bGUsDQoNCnRoaXMgY29tbWl0 IGhhbmdzIGxvYWRlciBvbiByZWFsIGhhcmR3YXJlLCBhdCBsZWFzdCBvbiBzb21lDQpvZiBpdC4g IFRoZSBsb2FkZXIgcHJpbnRzIGxpc3Qgb2YgY29uc29sZXMgYW5kIGhhbmdzIGhhcmQ6DQoNCltU aHUgTWFyIDMwIDIwOjQ2OjEyIDIwMjNdXk18XkhMb2FkaW5nIC9ib290L2xvYWRlci5jb25mXk0N Cl5NL15IY29uc29sZSB2aWRjb25zb2xlIGlzIGludmFsaWQhXk0NCl5NQXZhaWxhYmxlIGNvbnNv bGVzOl5NDQpeTSAgICBlZmleTQ0KXk0gICAgY29tY29uc29sZV5NDQpeTSAgICBjb21jb25zb2xl Xk0NCl5NICAgIG51bGxjb25zb2xlXk0NCl5NICAgIHNwaW5jb25zb2xlXk0NCg0KTWFjaGluZSBp cyB1bnJlY292ZXJhYmxlIHVubGVzcyB5b3UgZ290IGFsdGVybmF0ZSBib290IG1lZGlhDQphbmQg YWNjZXNzIHRvIEJNQyBjb25zb2xlLg0KDQpGaXJzdCwgcGxlYXNlIERPIE5PVCBNRkMgdGhpcyBh cyBzY2hlZHVsZWQuIFNlY29uZCwgbGV0J3MgdHJ5DQp0byBmaXggaXQgb3IgYmFjayBpdCBvdXQg aWYgd2UgaGVhciBmcm9tIGFueSBvdGhlciBDVVJSRU5UDQp1c2VyLg0KDQpPdXIgY29uZmlndXJh dGlvbiBpc24ndCBzcGVjaWFsLiBUaGlzIGlzIHdoYXQgd2UgZ290IGluDQpsb2FkZXIuY29uZiwg cmVsYXRlZCB0byBjb25zb2xlczoNCg0KY29uc29sZT0iY29tY29uc29sZSB2aWRjb25zb2xlIGVm aSINCmNvbWNvbnNvbGVfc3BlZWQ9MTE1MjAwDQpjb21jb25zb2xlX3BvcnQ9MHgzZTgNCmNvbnNv bGU9ImVmaSINCmh3LnVhcnQuY29uc29sZT0iaW86MTAxNixicjoxMTUyMDAiDQoNCk9uIFNhdCwg TWFyIDE4LCAyMDIzIGF0IDA3OjIwOjMzQU0gKzAwMDAsIFdlaSBIdSB3cm90ZToNClc+IFRoZSBi cmFuY2ggbWFpbiBoYXMgYmVlbiB1cGRhdGVkIGJ5IHdodToNClc+DQpXPiBVUkw6IGh0dHBzOi8v Y2dpdC5GcmVlQlNELm9yZy9zcmMvY29tbWl0Lz9pZD05MjczNThkZDk4Y2I5MDIxNjAwOTNlMGRj MGJhYzAwMmQ2YjQzODU4PGh0dHBzOi8vY2dpdC5mcmVlYnNkLm9yZy9zcmMvY29tbWl0Lz9pZD05 MjczNThkZDk4Y2I5MDIxNjAwOTNlMGRjMGJhYzAwMmQ2YjQzODU4Pg0KVz4NClc+IGNvbW1pdCA5 MjczNThkZDk4Y2I5MDIxNjAwOTNlMGRjMGJhYzAwMmQ2YjQzODU4DQpXPiBBdXRob3I6ICAgICBX ZWkgSHUgPHdodUBGcmVlQlNELm9yZzxtYWlsdG86d2h1QEZyZWVCU0Qub3JnPj4NClc+IEF1dGhv ckRhdGU6IDIwMjMtMDMtMTQgMTU6MTM6NDYgKzAwMDANClc+IENvbW1pdDogICAgIFdlaSBIdSA8 d2h1QEZyZWVCU0Qub3JnPG1haWx0bzp3aHVARnJlZUJTRC5vcmc+Pg0KVz4gQ29tbWl0RGF0ZTog MjAyMy0wMy0xOCAwNzowNzozNSArMDAwMA0KVz4NClc+ICAgICBhbWQ2NCBsb2FkZXI6IFVzZSBl ZmlzZXJpYWxpbyBmb3IgSHlwZXItViBib290ZWQgc3lzdGVtcw0KVz4NClc+ICAgICBVRUZJIHBy b3ZpZGVzIENvbkluL0Nvbk91dCBoYW5kbGVzIGZvciBjb25zb2xlcyB0aGF0IGl0IHN1cHBvcnRz LA0KVz4gICAgIHdoaWNoIGluY2x1ZGUgdGhlIHRleHQtdmlkZW8gYW5kIHNlcmlhbCBwb3J0cy4g V2hlbiB0aGUgc2VyaWFsIHBvcnQNClc+ICAgICBpcyBhdmFpbGFibGUsIHVzZSB0aGUgVUVGSSBk cml2ZXIgaW5zdGVhZCBvZiBkaXJlY3QgaW8tcG9ydCBhY2Nlc3Nlcw0KVz4gICAgIHRvIGF2b2lk IGNvbmZsaWN0cyBiZXR3ZWVuIHRoZSBmaXJtd2FyZSBhbmQgZGlyZWN0IGhhcmR3YXJlIGFjY2Vz cywgYXMNClc+ICAgICBoYXBwZW5zIG9uIEh5cGVyLVYgKEF6dXJlKSBzZXR1cHMuDQpXPg0KVz4g ICAgIFRoaXMgY2hhbmdlIGVuYWJsZXMgZWZpc2VyaWFsaW8gdG8gYmUgYnVpbHQgZm9yIGVmaS1h bWQ2NCBhbmQgaGFzDQpXPiAgICAgaGlnaGVyIG9yZGVyIHByaW9yaXR5IHZzIGNvbWNvbnNvbGUs IGFuZCBvbmx5IHVzZXMgZWZpc2VyaWFsaW8NClc+ICAgICBpZiB0aGUgaHlwZXJ2aXNvciBpcyBI eXBlci1WLiBXaGVuIGVmaXNlcmlhbGlvIHN1Y2Nlc3NmdWxseQ0KVz4gICAgIHByb2JlcywgaXQg d2lsbCBzZXQgZWZpX2NvbWNvbnNvbGVfYXZhaWw9dHJ1ZSB3aGljaCB3aWxsIHByZXZlbnQNClc+ ICAgICBjb21jb25zb2xlIGZyb20gcHJvYmluZyBpbiB0aGlzIHNldHVwLg0KVz4NClc+ICAgICBU ZXN0ZWQgb24gSHlwZXItViwgRVNYaSBhbmQgQXp1cmUgVk1zLg0KVz4NClc+ICAgICBQUjogICAg ICAgICAgICAgMjY0MjY3DQpXPiAgICAgUmV2aWV3ZWQgYnk6ICAgIGtldmFucywgd2h1DQpXPiAg ICAgVGVzdGVkIGJ5OiAgICAgIHdodQ0KVz4gICAgIE9idGFpbmVkIGZyb206ICBSdWJpY29uIENv bW11bmljYXRpb25zLCBMTEMgKE5ldGdhdGUpDQpXPiAgICAgTUZDIGFmdGVyOiAgICAgIDIgd2Vl a3MNClc+ICAgICBTcG9uc29yZWQgYnk6ICAgUnViaWNvbiBDb21tdW5pY2F0aW9ucywgTExDIChO ZXRnYXRlKQ0KVz4gLS0tDQpXPiAgc3RhbmQvZWZpL2xvYWRlci9hcmNoL2FtZDY0L01ha2VmaWxl LmluYyB8ICAxICsNClc+ICBzdGFuZC9lZmkvbG9hZGVyL2Jvb3RpbmZvLmMgICAgICAgICAgICAg IHwgMTEgKysrKysrLS0NClc+ICBzdGFuZC9lZmkvbG9hZGVyL2NvbmYuYyAgICAgICAgICAgICAg ICAgIHwgIDYgKysrKysNClc+ICBzdGFuZC9lZmkvbG9hZGVyL2VmaXNlcmlhbGlvLmMgICAgICAg ICAgIHwgNDMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0NClc+ICBzdGFuZC9pMzg2 L2xpYmkzODYvY29tY29uc29sZS5jICAgICAgICAgIHwgMTQgKysrKysrKysrKysNClc+ICA1IGZp bGVzIGNoYW5nZWQsIDY4IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pDQpXPg0KVz4gZGlm ZiAtLWdpdCBhL3N0YW5kL2VmaS9sb2FkZXIvYXJjaC9hbWQ2NC9NYWtlZmlsZS5pbmMgYi9zdGFu ZC9lZmkvbG9hZGVyL2FyY2gvYW1kNjQvTWFrZWZpbGUuaW5jDQpXPiBpbmRleCAwZDllMjY0OGNi NTkuLmJkODkwNDRiZDZjNyAxMDA2NDQNClc+IC0tLSBhL3N0YW5kL2VmaS9sb2FkZXIvYXJjaC9h bWQ2NC9NYWtlZmlsZS5pbmMNClc+ICsrKyBiL3N0YW5kL2VmaS9sb2FkZXIvYXJjaC9hbWQ2NC9N YWtlZmlsZS5pbmMNClc+IEBAIC01LDYgKzUsNyBAQCBTUkNTKz0gICAgICAgYW1kNjRfdHJhbXAu UyBcDQpXPiAgICAgIGVsZjY0X2ZyZWVic2QuYyBcDQpXPiAgICAgIHRyYXAuYyBcDQpXPiAgICAg IG11bHRpYm9vdDIuYyBcDQpXPiArICAgIGVmaXNlcmlhbGlvLmMgXA0KVz4gICAgICBleGMuUw0K Vz4NClc+ICAuUEFUSDogICAgICAke0JPT1RTUkN9L2kzODYvbGliaTM4Ng0KVz4gZGlmZiAtLWdp dCBhL3N0YW5kL2VmaS9sb2FkZXIvYm9vdGluZm8uYyBiL3N0YW5kL2VmaS9sb2FkZXIvYm9vdGlu Zm8uYw0KVz4gaW5kZXggOTM5ZjJjZjRjM2ZlLi5kNzlmNTkzNDNhZjEgMTAwNjQ0DQpXPiAtLS0g YS9zdGFuZC9lZmkvbG9hZGVyL2Jvb3RpbmZvLmMNClc+ICsrKyBiL3N0YW5kL2VmaS9sb2FkZXIv Ym9vdGluZm8uYw0KVz4gQEAgLTExOSwxMCArMTE5LDE3IEBAIGJpX2dldGJvb3Rob3d0byhjaGFy ICprYXJncykNClc+ICAgICAgICAgICAgICAgICAgICAgIGlmICh0bXAgIT0gTlVMTCkNClc+ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc3BlZWQgPSBzdHJ0b2wodG1wLCBOVUxMLCAwKTsN Clc+ICAgICAgICAgICAgICAgICAgICAgIHRtcCA9IGdldGVudigiZWZpX2NvbV9wb3J0Iik7DQpX PiAtICAgICAgICAgICAgICAgICAgICBpZiAodG1wID09IE5VTEwpDQpXPiAtICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHRtcCA9IGdldGVudigiY29tY29uc29sZV9wb3J0Iik7DQpXPiAgICAg ICAgICAgICAgICAgICAgICBpZiAodG1wICE9IE5VTEwpDQpXPiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHBvcnQgPSBzdHJ0b2wodG1wLCBOVUxMLCAwKTsNClc+ICsgICAgICAgICAgICAg ICAgICAgIGlmIChwb3J0IDw9IDApIHsNClc+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAg dG1wID0gZ2V0ZW52KCJjb21jb25zb2xlX3BvcnQiKTsNClc+ICsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKHRtcCAhPSBOVUxMKQ0KVz4gKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHBvcnQgPSBzdHJ0b2wodG1wLCBOVUxMLCAwKTsNClc+ICsgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZWxzZSB7DQpXPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKHBvcnQgPT0gMCkNClc+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHBvcnQgPSAweDNmODsNClc+ICsgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfQ0KVz4gKyAgICAgICAgICAgICAgICAgICAgfQ0KVz4gICAgICAgICAgICAgICAgICAgICAg aWYgKHNwZWVkICE9IC0xICYmIHBvcnQgIT0gLTEpIHsNClc+ICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc25wcmludGYoYnVmLCBzaXplb2YoYnVmKSwgImlvOiVkLGJyOiVkIiwgcG9ydCwN Clc+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNwZWVkKTsNClc+IGRpZmYgLS1n aXQgYS9zdGFuZC9lZmkvbG9hZGVyL2NvbmYuYyBiL3N0YW5kL2VmaS9sb2FkZXIvY29uZi5jDQpX PiBpbmRleCA4NjNjOTE4OGM3MmMuLjA1MWUxYTMzODFkMSAxMDA2NDQNClc+IC0tLSBhL3N0YW5k L2VmaS9sb2FkZXIvY29uZi5jDQpXPiArKysgYi9zdGFuZC9lZmkvbG9hZGVyL2NvbmYuYw0KVz4g QEAgLTgxLDYgKzgxLDkgQEAgc3RydWN0IG5ldGlmX2RyaXZlciAqbmV0aWZfZHJpdmVyc1tdID0g ew0KVz4NClc+ICBleHRlcm4gc3RydWN0IGNvbnNvbGUgZWZpX2NvbnNvbGU7DQpXPiAgZXh0ZXJu IHN0cnVjdCBjb25zb2xlIGNvbWNvbnNvbGU7DQpXPiArI2lmIGRlZmluZWQoX19hbWQ2NF9fKQ0K Vz4gK2V4dGVybiBzdHJ1Y3QgY29uc29sZSBlZmljb21jb25zb2xlOw0KVz4gKyNlbmRpZg0KVz4g ICNpZiBkZWZpbmVkKF9fYW1kNjRfXykgfHwgZGVmaW5lZChfX2kzODZfXykNClc+ICBleHRlcm4g c3RydWN0IGNvbnNvbGUgbnVsbGNvbnNvbGU7DQpXPiAgZXh0ZXJuIHN0cnVjdCBjb25zb2xlIHNw aW5jb25zb2xlOw0KVz4gQEAgLTg4LDYgKzkxLDkgQEAgZXh0ZXJuIHN0cnVjdCBjb25zb2xlIHNw aW5jb25zb2xlOw0KVz4NClc+ICBzdHJ1Y3QgY29uc29sZSAqY29uc29sZXNbXSA9IHsNClc+ICAg ICAgJmVmaV9jb25zb2xlLA0KVz4gKyNpZiBkZWZpbmVkKF9fYW1kNjRfXykNClc+ICsgICAgJmVm aWNvbWNvbnNvbGUsDQpXPiArI2VuZGlmDQpXPiAgICAgICZjb21jb25zb2xlLA0KVz4gICNpZiBk ZWZpbmVkKF9fYW1kNjRfXykgfHwgZGVmaW5lZChfX2kzODZfXykNClc+ICAgICAgJm51bGxjb25z b2xlLA0KVz4gZGlmZiAtLWdpdCBhL3N0YW5kL2VmaS9sb2FkZXIvZWZpc2VyaWFsaW8uYyBiL3N0 YW5kL2VmaS9sb2FkZXIvZWZpc2VyaWFsaW8uYw0KVz4gaW5kZXggMzc1ZTY3OWQyNTkwLi41ZmJj NzAwZjZhYzIgMTAwNjQ0DQpXPiAtLS0gYS9zdGFuZC9lZmkvbG9hZGVyL2VmaXNlcmlhbGlvLmMN Clc+ICsrKyBiL3N0YW5kL2VmaS9sb2FkZXIvZWZpc2VyaWFsaW8uYw0KVz4gQEAgLTY5LDYgKzY5 LDExIEBAIHN0YXRpYyBpbnQgICAgICAgIGNvbWNfc3BlZWRfc2V0KHN0cnVjdCBlbnZfdmFyICos IGludCwgY29uc3Qgdm9pZCAqKTsNClc+DQpXPiAgc3RhdGljIHN0cnVjdCBzZXJpYWwgICAgICAg ICpjb21jX3BvcnQ7DQpXPiAgZXh0ZXJuIHN0cnVjdCBjb25zb2xlIGVmaV9jb25zb2xlOw0KVz4g K2Jvb2wgZWZpX2NvbWNvbnNvbGVfYXZhaWwgPSBmYWxzZTsNClc+ICsNClc+ICsjaWYgZGVmaW5l ZChfX2FtZDY0X18pDQpXPiArI2RlZmluZSBjb21jb25zb2xlIGVmaWNvbWNvbnNvbGUNClc+ICsj ZW5kaWYNClc+DQpXPiAgc3RydWN0IGNvbnNvbGUgY29tY29uc29sZSA9IHsNClc+ICAgICAgLmNf bmFtZSA9ICJjb21jb25zb2xlIiwNClc+IEBAIC0yNTQsMTEgKzI1OSwyMiBAQCBjb21jX3Byb2Jl KHN0cnVjdCBjb25zb2xlICpzYykNClc+ICAgICAgY2hhciAqZW52LCAqYnVmLCAqZXA7DQpXPiAg ICAgIHNpemVfdCBzejsNClc+DQpXPiArI2lmIGRlZmluZWQoX19hbWQ2NF9fKQ0KVz4gKyAgICAv Kg0KVz4gKyAgICAgKiBGb3IgeDg2LTY0LCBkb24ndCB1c2UgdGhpcyBkcml2ZXIgaWYgbm90IHJ1 bm5pbmcgaW4gSHlwZXItVi4NClc+ICsgICAgICovDQpXPiArICAgIGVudiA9IGdldGVudigic21i aW9zLmJpb3MudmVyc2lvbiIpOw0KVz4gKyAgICBpZiAoZW52ID09IE5VTEwgfHwgc3RybmNtcChl bnYsICJIeXBlci1WIiwgNykgIT0gMCkgew0KVz4gKyAgICAgICAgICAgIHJldHVybjsNClc+ICsg ICAgfQ0KVz4gKyNlbmRpZg0KVz4gKw0KVz4gICAgICBpZiAoY29tY19wb3J0ID09IE5VTEwpIHsN Clc+ICAgICAgICAgICAgICBjb21jX3BvcnQgPSBjYWxsb2MoMSwgc2l6ZW9mIChzdHJ1Y3Qgc2Vy aWFsKSk7DQpXPiAgICAgICAgICAgICAgaWYgKGNvbWNfcG9ydCA9PSBOVUxMKQ0KVz4gICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuOw0KVz4gICAgICB9DQpXPiArDQpXPiAgICAgIC8qIFVzZSBk ZWZhdWx0cyBmcm9tIGZpcm13YXJlICovDQpXPiAgICAgIGNvbWNfcG9ydC0+ZGF0YWJpdHMgPSA4 Ow0KVz4gICAgICBjb21jX3BvcnQtPnBhcml0eSA9IERlZmF1bHRQYXJpdHk7DQpXPiBAQCAtMzA4 LDYgKzMyNCwxMCBAQCBjb21jX3Byb2JlKHN0cnVjdCBjb25zb2xlICpzYykNClc+ICAgICAgICAg IGNvbWNfcG9ydF9zZXQsIGVudl9ub3Vuc2V0KTsNClc+DQpXPiAgICAgIGVudiA9IGdldGVudigi ZWZpX2NvbV9zcGVlZCIpOw0KVz4gKyAgICBpZiAoZW52ID09IE5VTEwpDQpXPiArICAgICAgICAg ICAgLyogZmFsbGJhY2sgdG8gY29tY29uc29sZSBzZXR0aW5nICovDQpXPiArICAgICAgICAgICAg ZW52ID0gZ2V0ZW52KCJjb21jb25zb2xlX3NwZWVkIik7DQpXPiArDQpXPiAgICAgIGlmIChjb21j X3BhcnNlX2ludHZhbChlbnYsICZ2YWwpID09IENNRF9PSykNClc+ICAgICAgICAgICAgICBjb21j X3BvcnQtPmJhdWRyYXRlID0gdmFsOw0KVz4NClc+IEBAIC0zMTgsOCArMzM4LDEzIEBAIGNvbWNf cHJvYmUoc3RydWN0IGNvbnNvbGUgKnNjKQ0KVz4gICAgICAgICAgY29tY19zcGVlZF9zZXQsIGVu dl9ub3Vuc2V0KTsNClc+DQpXPiAgICAgIGNvbWNvbnNvbGUuY19mbGFncyA9IDA7DQpXPiAtICAg IGlmIChjb21jX3NldHVwKCkpDQpXPiArICAgIGlmIChjb21jX3NldHVwKCkpIHsNClc+ICAgICAg ICAgICAgICBzYy0+Y19mbGFncyA9IENfUFJFU0VOVElOIHwgQ19QUkVTRU5UT1VUOw0KVz4gKyAg ICAgICAgICAgIGVmaV9jb21jb25zb2xlX2F2YWlsID0gdHJ1ZTsNClc+ICsgICAgfSBlbHNlIHsN Clc+ICsgICAgICAgICAgICAvKiBkaXNhYmxlIGJlaW5nIHNlZW4gYXMgImNvbWNvbnNvbGUiICov DQpXPiArICAgICAgICAgICAgY29tY29uc29sZS5jX25hbWUgPSAiZWZpc2VyaWFsaW8iOw0KVz4g KyAgICB9DQpXPiAgfQ0KVz4NClc+ICBzdGF0aWMgaW50DQpXPiBAQCAtNDg5LDYgKzUxNCw3IEBA IGNvbWNfc2V0dXAodm9pZCkNClc+ICB7DQpXPiAgICAgIEVGSV9TVEFUVVMgc3RhdHVzOw0KVz4g ICAgICBVSU5UMzIgY29udHJvbDsNClc+ICsgICAgY2hhciAqZXY7DQpXPg0KVz4gICAgICAvKiBw b3J0IGlzIG5vdCB1c2FibGUgKi8NClc+ICAgICAgaWYgKGNvbWNfcG9ydC0+c2lvID09IE5VTEwp DQpXPiBAQCAtNDk4LDEwICs1MjQsMTcgQEAgY29tY19zZXR1cCh2b2lkKQ0KVz4gICAgICBpZiAo RUZJX0VSUk9SKHN0YXR1cykpDQpXPiAgICAgICAgICAgICAgcmV0dXJuIChmYWxzZSk7DQpXPg0K Vz4gLSAgICBzdGF0dXMgPSBjb21jX3BvcnQtPnNpby0+U2V0QXR0cmlidXRlcyhjb21jX3BvcnQt PnNpbywNClc+IC0gICAgICAgIGNvbWNfcG9ydC0+YmF1ZHJhdGUsIGNvbWNfcG9ydC0+cmVjZWl2 ZWZpZm9kZXB0aCwNClc+IC0gICAgICAgIGNvbWNfcG9ydC0+dGltZW91dCwgY29tY19wb3J0LT5w YXJpdHksDQpXPiAtICAgICAgICBjb21jX3BvcnQtPmRhdGFiaXRzLCBjb21jX3BvcnQtPnN0b3Bi aXRzKTsNClc+ICsgICAgZXYgPSBnZXRlbnYoInNtYmlvcy5iaW9zLnZlcnNpb24iKTsNClc+ICsg ICAgaWYgKGV2ICE9IE5VTEwgJiYgc3RybmNtcChldiwgIkh5cGVyLVYiLCA3KSA9PSAwKSB7DQpX PiArICAgICAgICAgICAgc3RhdHVzID0gY29tY19wb3J0LT5zaW8tPlNldEF0dHJpYnV0ZXMoY29t Y19wb3J0LT5zaW8sDQpXPiArICAgICAgICAgICAgICAgIDAsIDAsIDAsIERlZmF1bHRQYXJpdHks IDAsIERlZmF1bHRTdG9wQml0cyk7DQpXPiArICAgIH0gZWxzZSB7DQpXPiArICAgICAgICAgICAg c3RhdHVzID0gY29tY19wb3J0LT5zaW8tPlNldEF0dHJpYnV0ZXMoY29tY19wb3J0LT5zaW8sDQpX PiArICAgICAgICAgICAgICAgIGNvbWNfcG9ydC0+YmF1ZHJhdGUsIGNvbWNfcG9ydC0+cmVjZWl2 ZWZpZm9kZXB0aCwNClc+ICsgICAgICAgICAgICAgICAgY29tY19wb3J0LT50aW1lb3V0LCBjb21j X3BvcnQtPnBhcml0eSwNClc+ICsgICAgICAgICAgICAgICAgY29tY19wb3J0LT5kYXRhYml0cywg Y29tY19wb3J0LT5zdG9wYml0cyk7DQpXPiArICAgIH0NClc+ICsNClc+ICAgICAgaWYgKEVGSV9F UlJPUihzdGF0dXMpKQ0KVz4gICAgICAgICAgICAgIHJldHVybiAoZmFsc2UpOw0KVz4NClc+IGRp ZmYgLS1naXQgYS9zdGFuZC9pMzg2L2xpYmkzODYvY29tY29uc29sZS5jIGIvc3RhbmQvaTM4Ni9s aWJpMzg2L2NvbWNvbnNvbGUuYw0KVz4gaW5kZXggZWQxZjFhYTA4ZWQ3Li4zZmJiNmEyOTJjMTkg MTAwNjQ0DQpXPiAtLS0gYS9zdGFuZC9pMzg2L2xpYmkzODYvY29tY29uc29sZS5jDQpXPiArKysg Yi9zdGFuZC9pMzg2L2xpYmkzODYvY29tY29uc29sZS5jDQpXPiBAQCAtODUsNiArODUsMjAgQEAg Y29tY19wcm9iZShzdHJ1Y3QgY29uc29sZSAqY3ApDQpXPiAgICAgIGludCBzcGVlZCwgcG9ydDsN Clc+ICAgICAgdWludDMyX3QgbG9jYXRvcjsNClc+DQpXPiArI2lmIGRlZmluZWQoX19hbWQ2NF9f KQ0KVz4gKyAgICBleHRlcm4gYm9vbCBlZmlfY29tY29uc29sZV9hdmFpbDsNClc+ICsNClc+ICsg ICAgaWYgKGVmaV9jb21jb25zb2xlX2F2YWlsKSB7DQpXPiArICAgICAgICAgICAgLyoNClc+ICsg ICAgICAgICAgICAgKiBJZiBFRkkgcHJvdmlkZXMgc2VyaWFsIEkvTywgdGhlbiBkb24ndCB1c2Ug dGhpcyBsZWdhY3kNClc+ICsgICAgICAgICAgICAgKiBjb20gZHJpdmVyIHRvIGF2b2lkIGNvbmZs aWN0cyB3aXRoIHRoZSBmaXJtd2FyZSdzIGRyaXZlci4NClc+ICsgICAgICAgICAgICAgKiBDaGFu Z2UgY19uYW1lIHNvIHRoYXQgaXQgY2Fubm90IGJlIGZvdW5kIGluIHRoZSBsb29rdXAuDQpXPiAr ICAgICAgICAgICAgICovDQpXPiArICAgICAgICAgICAgY29tY29uc29sZS5jX25hbWUgPSAieGNv bWNvbnNvbGUiOw0KVz4gKyAgICAgICAgICAgIHJldHVybjsNClc+ICsgICAgfQ0KVz4gKyNlbmRp Zg0KVz4gKw0KVz4gICAgICBpZiAoY29tY19jdXJzcGVlZCA9PSAwKSB7DQpXPiAgICAgICAgICAg ICAgY29tY19jdXJzcGVlZCA9IENPTVNQRUVEOw0KVz4gICAgICAgICAgICAgIC8qDQoNCi0tDQpH bGViIFNtaXJub2ZmDQoNCg== --_000_SI2P153MB0441F026F04D1479A30ACF73BB8F9SI2P153MB0441APCP_ Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: base64 PGh0bWwgeG1sbnM6dj0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp2bWwiIHhtbG5zOm89InVy bjpzY2hlbWFzLW1pY3Jvc29mdC1jb206b2ZmaWNlOm9mZmljZSIgeG1sbnM6dz0idXJuOnNjaGVt YXMtbWljcm9zb2Z0LWNvbTpvZmZpY2U6d29yZCIgeG1sbnM6bT0iaHR0cDovL3NjaGVtYXMubWlj cm9zb2Z0LmNvbS9vZmZpY2UvMjAwNC8xMi9vbW1sIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv VFIvUkVDLWh0bWw0MCI+DQo8aGVhZD4NCjxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIg Y29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04Ij4NCjxtZXRhIG5hbWU9IkdlbmVyYXRv ciIgY29udGVudD0iTWljcm9zb2Z0IFdvcmQgMTUgKGZpbHRlcmVkIG1lZGl1bSkiPg0KPHN0eWxl PjwhLS0NCi8qIEZvbnQgRGVmaW5pdGlvbnMgKi8NCkBmb250LWZhY2UNCgl7Zm9udC1mYW1pbHk6 IkNhbWJyaWEgTWF0aCI7DQoJcGFub3NlLTE6MiA0IDUgMyA1IDQgNiAzIDIgNDt9DQpAZm9udC1m YWNlDQoJe2ZvbnQtZmFtaWx5Ouetiee6vzsNCglwYW5vc2UtMToyIDEgNiAwIDMgMSAxIDEgMSAx O30NCkBmb250LWZhY2UNCgl7Zm9udC1mYW1pbHk6Q2FsaWJyaTsNCglwYW5vc2UtMToyIDE1IDUg MiAyIDIgNCAzIDIgNDt9DQpAZm9udC1mYWNlDQoJe2ZvbnQtZmFtaWx5OiJcQOetiee6vyI7DQoJ cGFub3NlLTE6MiAxIDYgMCAzIDEgMSAxIDEgMTt9DQovKiBTdHlsZSBEZWZpbml0aW9ucyAqLw0K cC5Nc29Ob3JtYWwsIGxpLk1zb05vcm1hbCwgZGl2Lk1zb05vcm1hbA0KCXttYXJnaW46MGluOw0K CWZvbnQtc2l6ZToxMS4wcHQ7DQoJZm9udC1mYW1pbHk6IkNhbGlicmkiLHNhbnMtc2VyaWY7fQ0K YTpsaW5rLCBzcGFuLk1zb0h5cGVybGluaw0KCXttc28tc3R5bGUtcHJpb3JpdHk6OTk7DQoJY29s b3I6Ymx1ZTsNCgl0ZXh0LWRlY29yYXRpb246dW5kZXJsaW5lO30NCnNwYW4uRW1haWxTdHlsZTIw DQoJe21zby1zdHlsZS10eXBlOnBlcnNvbmFsLWNvbXBvc2U7DQoJZm9udC1mYW1pbHk6IkNhbGli cmkiLHNhbnMtc2VyaWY7DQoJY29sb3I6d2luZG93dGV4dDt9DQouTXNvQ2hwRGVmYXVsdA0KCXtt c28tc3R5bGUtdHlwZTpleHBvcnQtb25seTsNCglmb250LWZhbWlseToiQ2FsaWJyaSIsc2Fucy1z ZXJpZjt9DQpAcGFnZSBXb3JkU2VjdGlvbjENCgl7c2l6ZTo4LjVpbiAxMS4waW47DQoJbWFyZ2lu OjEuMGluIDEuMjVpbiAxLjBpbiAxLjI1aW47fQ0KZGl2LldvcmRTZWN0aW9uMQ0KCXtwYWdlOldv cmRTZWN0aW9uMTt9DQotLT48L3N0eWxlPjwhLS1baWYgZ3RlIG1zbyA5XT48eG1sPg0KPG86c2hh cGVkZWZhdWx0cyB2OmV4dD0iZWRpdCIgc3BpZG1heD0iMTAyNiIgLz4NCjwveG1sPjwhW2VuZGlm XS0tPjwhLS1baWYgZ3RlIG1zbyA5XT48eG1sPg0KPG86c2hhcGVsYXlvdXQgdjpleHQ9ImVkaXQi Pg0KPG86aWRtYXAgdjpleHQ9ImVkaXQiIGRhdGE9IjEiIC8+DQo8L286c2hhcGVsYXlvdXQ+PC94 bWw+PCFbZW5kaWZdLS0+DQo8L2hlYWQ+DQo8Ym9keSBsYW5nPSJFTi1VUyIgbGluaz0iYmx1ZSIg dmxpbms9InB1cnBsZSIgc3R5bGU9IndvcmQtd3JhcDpicmVhay13b3JkIj4NCjxkaXYgY2xhc3M9 IldvcmRTZWN0aW9uMSI+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj5IaSw8bzpwPjwvbzpwPjwvcD4N CjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxvOnA+Jm5ic3A7PC9vOnA+PC9wPg0KPHAgY2xhc3M9Ik1z b05vcm1hbCI+SSBhbSBubyBleHBlcnQgb24gY29uc29sZSBkcml2ZXJzLiBTbyBJIGRvbuKAmXQg aGF2ZSBhbnkgdGVjaG5pY2FsIGlucHV0LiBXaGF0IEkgaG9wZSBpcyB0byBoYXZlIGEgRnJlZUJT RCB3b3JrIG9uIEdlbiAyIChVRUZJKSBIeXBlclYgYXMgc29vbiBhcyBwb3NzaWJsZS4gSWYgd2Ug YmFjayBvdXQgdGhpcyBwYXRjaCwgd2UgYXJlIGJhY2sgdG8gdGhlIG9yaWdpbmFsIHN0YXRlIHRo YXQgRnJlZUJTRCBpcyBub3Qgc3VwcG9ydGVkDQogb24gR2VuIDIgSHlwZXJWIGZvciBhbWQ2NCwg d2hpY2ggaXMgdmVyeSB1bmZvcnR1bmF0ZS48bzpwPjwvbzpwPjwvcD4NCjxwIGNsYXNzPSJNc29O b3JtYWwiPjxvOnA+Jm5ic3A7PC9vOnA+PC9wPg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+QmFjayB0 byB0aGlzIHBhdGNoLCBzdGlsbCBub3Qgc3VyZSB3aHkgdGhpcyBoYW5nIGhhcHBlbnMgb24gcmVh ZCBoYXJkd2FyZSwgc2luY2UgaXQgc2hvdWxkbid0IGJlIHVzaW5nIHRoYXQgZWZpc2VyaWFsaW8g ZHJpdmVyIGlmIGl0J3Mgbm90IEh5cGVyLVYuIFRoZSBvbmx5IHRoaW5nIHRoYXQgdGhlIG9yaWdp bmFsIG93bmVyIG9mIHRoZSBwYXRjaCBjb3VsZCB0aGluayBvZiBpcyBpbiB0aGUgcHJvYmUgdG8g cmVuYW1lDQogdGhlIGRyaXZlciBiYWNrIHRvIGVmaXNlcmlhbGlvIGlmIGl0J3Mgbm90IEh5cGVy LVYuIDxvOnA+PC9vOnA+PC9wPg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+PG86cD4mbmJzcDs8L286 cD48L3A+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48YSBpZD0iT1dBQU0zMjZGMkEzQjZGNEE0MTRB QjZENTMxRjk1NTM2MjEwMyIgaHJlZj0ibWFpbHRvOmdsZWJpdXNAZnJlZWJzZC5vcmciPjxzcGFu IHN0eWxlPSJmb250LWZhbWlseTomcXVvdDtDYWxpYnJpJnF1b3Q7LHNhbnMtc2VyaWY7dGV4dC1k ZWNvcmF0aW9uOm5vbmUiPkBHbGViIFNtaXJub2ZmPC9zcGFuPjwvYT4sIGFyZSB5b3UgYWJsZSB0 byB0cnkgZm9sbG93aW5nIGluIGFkZGl0aW9uIHRvIHNlZSBpZiBpdCB3b3Jrcz88bzpwPjwvbzpw PjwvcD4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxvOnA+Jm5ic3A7PC9vOnA+PC9wPg0KPHAgY2xh c3M9Ik1zb05vcm1hbCI+ZGlmZiAtLWdpdCBhL3N0YW5kL2VmaS9sb2FkZXIvZWZpc2VyaWFsaW8u YyBiL3N0YW5kL2VmaS9sb2FkZXIvZWZpc2VyaWFsaW8uYzxvOnA+PC9vOnA+PC9wPg0KPHAgY2xh c3M9Ik1zb05vcm1hbCI+aW5kZXggNWZiYzcwMGY2YWMyLi4yNGZlN2UwNWMyNjEgMTAwNjQ0PG86 cD48L286cD48L3A+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj4tLS0gYS9zdGFuZC9lZmkvbG9hZGVy L2VmaXNlcmlhbGlvLmM8bzpwPjwvbzpwPjwvcD4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPisrKyBi L3N0YW5kL2VmaS9sb2FkZXIvZWZpc2VyaWFsaW8uYzxvOnA+PC9vOnA+PC9wPg0KPHAgY2xhc3M9 Ik1zb05vcm1hbCI+QEAgLTI2NSw2ICsyNjUsOCBAQCBjb21jX3Byb2JlKHN0cnVjdCBjb25zb2xl ICpzYyk8bzpwPjwvbzpwPjwvcD4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPiZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyAqLzxvOnA+PC9vOnA+PC9wPg0KPHAg Y2xhc3M9Ik1zb05vcm1hbCI+Jm5ic3A7ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwO2VudiA9IGdldGVudigmcXVvdDtzbWJpb3MuYmlvcy52ZXJzaW9uJnF1b3Q7KTs8bzpwPjwv bzpwPjwvcD4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPiZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyBpZiAoZW52ID09IE5VTEwgfHwgc3RybmNtcChlbnYsICZxdW90O0h5 cGVyLVYmcXVvdDssIDcpICE9IDApIHs8bzpwPjwvbzpwPjwvcD4NCjxwIGNsYXNzPSJNc29Ob3Jt YWwiPismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJz cDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgLyogZGlzYWJsZSBiZWluZyBzZWVuIGFz ICZxdW90O2NvbWNvbnNvbGUmcXVvdDsgKi88bzpwPjwvbzpwPjwvcD4NCjxwIGNsYXNzPSJNc29O b3JtYWwiPismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsm bmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgY29tY29uc29sZS5jX25hbWUgPSAm cXVvdDtlZmlzZXJpYWxpbyZxdW90Ozs8bzpwPjwvbzpwPjwvcD4NCjxwIGNsYXNzPSJNc29Ob3Jt YWwiPiZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyByZXR1cm47PG86cD48L286cD48 L3A+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj4mbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsm bmJzcDsmbmJzcDsgfTxvOnA+PC9vOnA+PC9wPg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+I2VuZGlm PG86cD48L286cD48L3A+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwv cD4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPklmIG5vdCBJIHdpbGwgYmFjayBpdCBvdXQuPG86cD48 L286cD48L3A+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD4NCjxw IGNsYXNzPSJNc29Ob3JtYWwiPk1hbnkgdGhhbmtzLDxvOnA+PC9vOnA+PC9wPg0KPHAgY2xhc3M9 Ik1zb05vcm1hbCI+V2VpPG86cD48L286cD48L3A+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48bzpw PiZuYnNwOzwvbzpwPjwvcD4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxvOnA+Jm5ic3A7PC9vOnA+ PC9wPg0KPGRpdiBzdHlsZT0iYm9yZGVyOm5vbmU7Ym9yZGVyLWxlZnQ6c29saWQgYmx1ZSAxLjVw dDtwYWRkaW5nOjBpbiAwaW4gMGluIDQuMHB0Ij4NCjxkaXY+DQo8ZGl2IHN0eWxlPSJib3JkZXI6 bm9uZTtib3JkZXItdG9wOnNvbGlkICNFMUUxRTEgMS4wcHQ7cGFkZGluZzozLjBwdCAwaW4gMGlu IDBpbiI+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48Yj5Gcm9tOjwvYj4gV2FybmVyIExvc2ggJmx0 O2ltcEBic2RpbXAuY29tJmd0OyA8YnI+DQo8Yj5TZW50OjwvYj4gRnJpZGF5LCBNYXJjaCAzMSwg MjAyMyA2OjE4IFBNPGJyPg0KPGI+VG86PC9iPiBUb29tYXMgU29vbWUgJmx0O3Rzb29tZUBtZS5j b20mZ3Q7PGJyPg0KPGI+Q2M6PC9iPiBHbGViIFNtaXJub2ZmICZsdDtnbGViaXVzQGZyZWVic2Qu b3JnJmd0OzsgV2VpIEh1ICZsdDt3aHVAZnJlZWJzZC5vcmcmZ3Q7OyBzcmMtY29tbWl0dGVycyAm bHQ7c3JjLWNvbW1pdHRlcnNAZnJlZWJzZC5vcmcmZ3Q7OyAmbHQ7ZGV2LWNvbW1pdHMtc3JjLWFs bEBmcmVlYnNkLm9yZyZndDsgJmx0O2Rldi1jb21taXRzLXNyYy1hbGxAZnJlZWJzZC5vcmcmZ3Q7 OyAmbHQ7ZGV2LWNvbW1pdHMtc3JjLW1haW5AZnJlZWJzZC5vcmcmZ3Q7ICZsdDtkZXYtY29tbWl0 cy1zcmMtbWFpbkBmcmVlYnNkLm9yZyZndDs7DQogaW1wQGZyZWVic2Qub3JnOyBnYWxsYXRpbkBm cmVlYnNkLm9yZzsga2V2YW5zQGZyZWVic2Qub3JnPGJyPg0KPGI+U3ViamVjdDo8L2I+IFJlOiBn aXQ6IDkyNzM1OGRkOThjYiAtIG1haW4gLSBhbWQ2NCBsb2FkZXI6IFVzZSBlZmlzZXJpYWxpbyBm b3IgSHlwZXItViBib290ZWQgc3lzdGVtczxvOnA+PC9vOnA+PC9wPg0KPC9kaXY+DQo8L2Rpdj4N CjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxvOnA+Jm5ic3A7PC9vOnA+PC9wPg0KPGRpdj4NCjxkaXY+ DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD4NCjwvZGl2Pg0KPHAg Y2xhc3M9Ik1zb05vcm1hbCI+PG86cD4mbmJzcDs8L286cD48L3A+DQo8ZGl2Pg0KPGRpdj4NCjxw IGNsYXNzPSJNc29Ob3JtYWwiPk9uIEZyaSwgTWFyIDMxLCAyMDIzIGF0IDEyOjIy4oCvQU0gVG9v bWFzIFNvb21lICZsdDs8YSBocmVmPSJtYWlsdG86dHNvb21lQG1lLmNvbSI+dHNvb21lQG1lLmNv bTwvYT4mZ3Q7IHdyb3RlOjxvOnA+PC9vOnA+PC9wPg0KPC9kaXY+DQo8YmxvY2txdW90ZSBzdHls ZT0iYm9yZGVyOm5vbmU7Ym9yZGVyLWxlZnQ6c29saWQgI0NDQ0NDQyAxLjBwdDtwYWRkaW5nOjBp biAwaW4gMGluIDYuMHB0O21hcmdpbi1sZWZ0OjQuOHB0O21hcmdpbi1yaWdodDowaW4iPg0KPGRp dj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxvOnA+Jm5ic3A7PC9vOnA+PC9wPg0KPGRpdj4NCjxw IGNsYXNzPSJNc29Ob3JtYWwiPjxicj4NCjxicj4NCjxvOnA+PC9vOnA+PC9wPg0KPGJsb2NrcXVv dGUgc3R5bGU9Im1hcmdpbi10b3A6NS4wcHQ7bWFyZ2luLWJvdHRvbTo1LjBwdCI+DQo8ZGl2Pg0K PHAgY2xhc3M9Ik1zb05vcm1hbCI+T24gMzEuIE1hciAyMDIzLCBhdCAwMjo0MCwgV2FybmVyIExv c2ggJmx0OzxhIGhyZWY9Im1haWx0bzppbXBAYnNkaW1wLmNvbSIgdGFyZ2V0PSJfYmxhbmsiPmlt cEBic2RpbXAuY29tPC9hPiZndDsgd3JvdGU6PG86cD48L286cD48L3A+DQo8L2Rpdj4NCjxwIGNs YXNzPSJNc29Ob3JtYWwiPjxvOnA+Jm5ic3A7PC9vOnA+PC9wPg0KPGRpdj4NCjxkaXY+DQo8cCBj bGFzcz0iTXNvTm9ybWFsIj5MZXQncyBiYWNrIGl0IG91dC4gSSBkaWRuJ3QgZ2V0IGEgY2hhbmNl IHRvIHJldmlldyBpdCBhbmQgdGhlIGR1cGxpY2F0ZWQgbmFtZSBzdHJpa2VzIG1lIGFzIG1hc3Np dmVseSB1bndpc2UuPG86cD48L286cD48L3A+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+ T2YgY291cnNlLCB0aGUgZWZpIHNlcmlhbCBkcml2ZXIgbmV2ZXIgc2hvdWxkIGhhdmUgaGFkIHRo ZSBuYW1lIGNvbWNvbnNvbGUgaW4gdGhlIGZpcnN0IHBsYWNlLCBpbWhvLiBJdCB3YXMgT0s8bzpw PjwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPm9uIGFybSB3 aGVyZSB3ZSBjb3VsZG4ndCBjb25mbGljdC48bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4N CjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxvOnA+Jm5ic3A7PC9vOnA+PC9wPg0KPC9kaXY+DQo8ZGl2 Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+U28gbGV0J3MgYmFjayBpdCBvdXQgYW5kIHRhbGsgYWJv dXQgaG93IHdlIHNob3VsZCBkbyB0aGlzLCBpbmNsdWRpbmcgdGhlIG5lZWQgdG8gcG9zc2libHkg anVzdCByZW5hbWUgdGhlIGVmaTxvOnA+PC9vOnA+PC9wPg0KPC9kaXY+DQo8ZGl2Pg0KPHAgY2xh c3M9Ik1zb05vcm1hbCI+dmVyc2lvbiBvZiB0aGUgY29uc29sZSBkcml2ZXIgdG8gc29tZXRoaW5n IGVsc2UuIElNSE8sIGl0IG5ldmVyIHNob3VsZCBoYXZlIGJlZW4gY29tY29uc29sZSBpbiB0aGUg Zmlyc3Q8bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwi PnBsYWNlIGJlY2F1c2UgaXQncyBjb25maWd1cmVkIGRpZmZlcmVudGx5IHRoYW4gY29tY29uc29s ZS4uLi48bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNv Tm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJN c29Ob3JtYWwiPldhcm5lcjxvOnA+PC9vOnA+PC9wPg0KPC9kaXY+DQo8L2Rpdj4NCjwvZGl2Pg0K PC9kaXY+DQo8L2Jsb2NrcXVvdGU+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+PG86cD4m bmJzcDs8L286cD48L3A+DQo8L2Rpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj5vaywg bGV0cyBzdGFydCBmcm9tIGJlZ2lubmluZy4gVGhlIGxvYWRlciBkZXZpY2UgbmFtaW5nIGlzIHRv dGFsIG1lc3MgYW5kIHNob3VsZCBub3QgZ28gdGhpcyB3YXkgLSBpdCBpcyBub3QgdW5kZXJzdGFu ZGFibGUgZm9yIHVzZXJzIGFuZCBub3QgdW5kZXJzdGFuZGFibGUgZm9yIGRldmVsb3BlcnMuPG86 cD48L286cD48L3A+DQo8L2Rpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48bzpwPiZu YnNwOzwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPnRoZSBj b25maWcgYmVsb3cgaXMgcGVyZmVjdCBleGFtcGxlIG9mIHRoZSBzaXR1YXRpb246PG86cD48L286 cD48L3A+DQo8L2Rpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48bzpwPiZuYnNwOzwv bzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPkZpcnN0IHRoZSBj b25maWcgZG9lcyBzZXQ6Jm5ic3A7PG86cD48L286cD48L3A+DQo8L2Rpdj4NCjxkaXY+DQo8cCBj bGFzcz0iTXNvTm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxi bG9ja3F1b3RlIHN0eWxlPSJtYXJnaW4tdG9wOjUuMHB0O21hcmdpbi1ib3R0b206NS4wcHQiPg0K PGRpdj4NCjxibG9ja3F1b3RlIHN0eWxlPSJib3JkZXI6bm9uZTtib3JkZXItbGVmdDpzb2xpZCAj Q0NDQ0NDIDEuMHB0O3BhZGRpbmc6MGluIDBpbiAwaW4gNi4wcHQ7bWFyZ2luLWxlZnQ6NC44cHQ7 bWFyZ2luLXJpZ2h0OjBpbiI+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj5jb25zb2xlPSZxdW90O2Nv bWNvbnNvbGUgdmlkY29uc29sZSBlZmnigJ08bzpwPjwvbzpwPjwvcD4NCjwvYmxvY2txdW90ZT4N CjwvZGl2Pg0KPC9ibG9ja3F1b3RlPg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+PG86cD4mbmJzcDs8 L286cD48L3A+DQo8L2Rpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj5Tbywgd2UgZG8g dHJ5IHRvIHNldCBzZXJpYWwgY29uc29sZSwgYmlvcyB2aWRlbyBjb25zb2xlIGFuZCBlZmkgY29u c29sZS4gU28gd2UgaGF2ZSDigJxzaGFyZWTigJ0gY29uZmlnIGZvciBCSU9TIGFuZCBVRUZJIGxv YWRlciwgd2hpY2ggc2hvdWxkIGJlIHRvdGFsbHkgcmVhc29uYWJsZSBmcm9tIHVzZXIgcG9pbnQg b2YgdmlldywgYnV0IGlzIHRlY2huaWNhbGx5IHdyb25nLCBiZWNhdXNlIEJJT1MgbG9hZGVyIGhh cw0KIG5vIGlkZWEgd2hhdCBpcyBlZmkgY29uc29sZSBhbmQgRUZJIGxvYWRlciBoYXMgbm8gaWRl YSB3aGF0IGlzIHZpZGNvbnNvbGUuIFNvIHRoaXMgbWl4dHVyZSBlbmRzIHVwIHdpdGggbWVzc2Fn ZTo8bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPC9kaXY+DQo8L2Rpdj4NCjwvYmxvY2txdW90ZT4N CjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD4NCjwvZGl2 Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPkkgc3Ryb25nbHkgZGlzYWdyZWUgdGhpcyBp cyB3cm9uZy4gWW91IGhhdmUgYSBib290IGxvYWRlciB0aGF0IG1heSBoYXZlIG9uZSBvZiBtYW55 IGNvbnNvbGUgZGV2aWNlcy4gTm90IGFsbCBtYXkgYmUgcHJlc2VudC48bzpwPjwvbzpwPjwvcD4N CjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxvOnA+Jm5ic3A7PC9vOnA+PC9w Pg0KPC9kaXY+DQo8YmxvY2txdW90ZSBzdHlsZT0iYm9yZGVyOm5vbmU7Ym9yZGVyLWxlZnQ6c29s aWQgI0NDQ0NDQyAxLjBwdDtwYWRkaW5nOjBpbiAwaW4gMGluIDYuMHB0O21hcmdpbi1sZWZ0OjQu OHB0O21hcmdpbi1yaWdodDowaW4iPg0KPGRpdj4NCjxkaXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1z b05vcm1hbCI+Jm5ic3A7PG86cD48L286cD48L3A+DQo8L2Rpdj4NCjwvZGl2Pg0KPC9kaXY+DQo8 L2Jsb2NrcXVvdGU+DQo8YmxvY2txdW90ZSBzdHlsZT0iYm9yZGVyOm5vbmU7Ym9yZGVyLWxlZnQ6 c29saWQgI0NDQ0NDQyAxLjBwdDtwYWRkaW5nOjBpbiAwaW4gMGluIDYuMHB0O21hcmdpbi1sZWZ0 OjQuOHB0O21hcmdpbi1yaWdodDowaW4iPg0KPGRpdj4NCjxkaXY+DQo8YmxvY2txdW90ZSBzdHls ZT0ibWFyZ2luLXRvcDo1LjBwdDttYXJnaW4tYm90dG9tOjUuMHB0Ij4NCjxkaXY+DQo8YmxvY2tx dW90ZSBzdHlsZT0iYm9yZGVyOm5vbmU7Ym9yZGVyLWxlZnQ6c29saWQgI0NDQ0NDQyAxLjBwdDtw YWRkaW5nOjBpbiAwaW4gMGluIDYuMHB0O21hcmdpbi1sZWZ0OjQuOHB0O21hcmdpbi1yaWdodDow aW4iPg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+Y29uc29sZSB2aWRjb25zb2xlIGlzIGludmFsaWQh JnF1b3Q7PG86cD48L286cD48L3A+DQo8L2Jsb2NrcXVvdGU+DQo8L2Rpdj4NCjwvYmxvY2txdW90 ZT4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD4NCjwv ZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPkFuZCB0aGUgdXNlciB3aWxsIGdldCB0 aGUgc2ltaWxhciBlcnJvciB3aGVuIGJvb3RpbmcgQklPUyBzZXR1cC48bzpwPjwvbzpwPjwvcD4N CjwvZGl2Pg0KPC9kaXY+DQo8L2Rpdj4NCjwvYmxvY2txdW90ZT4NCjxkaXY+DQo8cCBjbGFzcz0i TXNvTm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNz PSJNc29Ob3JtYWwiPlllcy4gVGhpcyBtZXNzYWdlIGlzIGEgYml0IGJvZ3VzOiBpdCBqdXN0IG1l YW5zIHdlIGRvbid0IGhhdmUgYSBjb21jb25zb2xlIGNvbmZpZ3VyZWQuIEFuZCB0aGF0J3MgZmlu ZS48bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxv OnA+Jm5ic3A7PC9vOnA+PC9wPg0KPC9kaXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+ SXQncyBsaWtlIGlmIEkgaGFkIGlmY29uZmlnX2l4bDA9REhDUCBhbmQgaWZjb25maWdfeGUwPURI Q1AgaW4gbXkgcmMuY29uZiBmaWxlLCBpbWhvLiBJdCBzYXlzIGlmIHRoZXkgYXJlIHRoZXJlLCB1 c2UgdGhlbS4gT3RoZXJ3aXNlIGRvbid0LiBXZSBkb24ndCBoYXZlIGEgZXRoIGRldmljZSB0aGF0 J3MgYSBnZW5lcmljIHRoaW5nLiBOb3Igc2hvdWxkIGNvbWNvbnNvbGUgYmUgYWxsIHBvc3NpYmxl IHVhcnRzLjxvOnA+PC9vOnA+PC9wPg0KPC9kaXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1h bCI+Jm5ic3A7PG86cD48L286cD48L3A+DQo8L2Rpdj4NCjxibG9ja3F1b3RlIHN0eWxlPSJib3Jk ZXI6bm9uZTtib3JkZXItbGVmdDpzb2xpZCAjQ0NDQ0NDIDEuMHB0O3BhZGRpbmc6MGluIDBpbiAw aW4gNi4wcHQ7bWFyZ2luLWxlZnQ6NC44cHQ7bWFyZ2luLXJpZ2h0OjBpbiI+DQo8ZGl2Pg0KPGRp dj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj5UaGVuIHdlIGp1c3Qgc2V0IGNvbnNvbGU9 4oCcZWZp4oCdLjxvOnA+PC9vOnA+PC9wPg0KPC9kaXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05v cm1hbCI+PG86cD4mbmJzcDs8L286cD48L3A+DQo8L2Rpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNv Tm9ybWFsIj5UaGVuIHRoZXJlIGlzIHNldHRpbmcgZm9yIHVhcnTigKYmbmJzcDs8bzpwPjwvbzpw PjwvcD4NCjwvZGl2Pg0KPC9kaXY+DQo8L2Rpdj4NCjwvYmxvY2txdW90ZT4NCjxkaXY+DQo8cCBj bGFzcz0iTXNvTm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxw IGNsYXNzPSJNc29Ob3JtYWwiPlRoaXMgaXMgYW4gb3J0aG9nb25hbCZuYnNwO2lzc3VlLjxvOnA+ PC9vOnA+PC9wPg0KPC9kaXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+Jm5ic3A7PG86 cD48L286cD48L3A+DQo8L2Rpdj4NCjxibG9ja3F1b3RlIHN0eWxlPSJib3JkZXI6bm9uZTtib3Jk ZXItbGVmdDpzb2xpZCAjQ0NDQ0NDIDEuMHB0O3BhZGRpbmc6MGluIDBpbiAwaW4gNi4wcHQ7bWFy Z2luLWxlZnQ6NC44cHQ7bWFyZ2luLXJpZ2h0OjBpbiI+DQo8ZGl2Pg0KPGRpdj4NCjxkaXY+DQo8 cCBjbGFzcz0iTXNvTm9ybWFsIj5XaXRoIHRvZGF5cyBVRUZJIHNldHVwcywgdGhlIGxvZ2ljIGlz IHRoYXQgeW91IHNldCB1cCB5b3VyIGhhcmR3YXJlLCB0aGF0IGlzLCB5b3UgY29uZmlndXJlIHNl cmlhbCBwb3J0IGF0dHJpYnV0ZXMgZnJvbSBmaXJtd2FyZSBzZXR1cCwgYW5kIHRoZSBVRUZJIGZp cm13YXJlIHdpbGwgcG9wdWxhdGUgaXRzIGludGVybmFsIHN0cnVjdHVyZXMgd2l0aCB0aG9zZSB2 YWx1ZXMuPG86cD48L286cD48L3A+DQo8L2Rpdj4NCjwvZGl2Pg0KPC9kaXY+DQo8L2Jsb2NrcXVv dGU+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+PG86cD4mbmJzcDs8L286cD48L3A+DQo8 L2Rpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj5BZ3JlZWQuIFN0aWxsIG9ydGhvZ29u YWwgdG8gdGhlIG5hbWluZyBpc3N1ZS48bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxw IGNsYXNzPSJNc29Ob3JtYWwiPiZuYnNwOzxvOnA+PC9vOnA+PC9wPg0KPC9kaXY+DQo8YmxvY2tx dW90ZSBzdHlsZT0iYm9yZGVyOm5vbmU7Ym9yZGVyLWxlZnQ6c29saWQgI0NDQ0NDQyAxLjBwdDtw YWRkaW5nOjBpbiAwaW4gMGluIDYuMHB0O21hcmdpbi1sZWZ0OjQuOHB0O21hcmdpbi1yaWdodDow aW4iPg0KPGRpdj4NCjxkaXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+Tm93LCBmaXJz dCBpc3N1ZSBpcywgd2hpbGUgZGV2ZWxvcGluZyB1ZWZpIGxvYWRlciwgaXQgd2FzIGVhc3kgcGF0 aCB0byByZXVzZSBiaXRzIGZyb20gQklPUyBsb2FkZXIuIHNtYmlvcywgYWNwaSwgYW5kIHNhZGx5 LCBjb21jb25zb2xlLiBTYWRseSwgYmVjYXVzZSBjb21jb25zb2xlIGlzIGJ1aWx0IGFzc3VtaW5n IHg4NiBJTyBwb3J0IGZlYXR1cmVzIHdoaWNoIGFyZSBub3QgYXZhaWxhYmxlIG9uIG90aGVyIHBs YXRmb3Jtcy48bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPC9kaXY+DQo8L2Rpdj4NCjwvYmxvY2tx dW90ZT4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD4N CjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPkFncmVlZC4gSG93ZXZlciwgd2Ug YXJlIHN0dWNrIHdpdGggY29tY29uc29sZSA9PSB0YWxrIHRvIHRoZSBoYXJkd2FyZSBhbmQgYnlw YXNzIHRoZSBVRUZJIGZpcm13YXJlLiBXZSBuZWVkIHRvIGhhdmUgYSBlZmlzZXJpYWwmbmJzcDth bmQgZWZpdmlkZW8mbmJzcDtkZXZpY2UsIGV2ZW4gZm9yIHg4Niwgc28gdGhhdCB3ZSBjYW4gc3Bl Y2lmeSB0aGluZ3MgbW9yZSBjbG9zZWx5LiBPdmVybG9hZGluZyBjb21jb25zb2xlIGlzIHVud2lz ZS48bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPiZu YnNwOzxvOnA+PC9vOnA+PC9wPg0KPC9kaXY+DQo8YmxvY2txdW90ZSBzdHlsZT0iYm9yZGVyOm5v bmU7Ym9yZGVyLWxlZnQ6c29saWQgI0NDQ0NDQyAxLjBwdDtwYWRkaW5nOjBpbiAwaW4gMGluIDYu MHB0O21hcmdpbi1sZWZ0OjQuOHB0O21hcmdpbi1yaWdodDowaW4iPg0KPGRpdj4NCjxkaXY+DQo8 ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+U28geWVzLCBiaW9zIHZlcnNpb24gb2YgY29tY29u c29sZSBzaG91bGQgbm90IGhhdmUgYmVlbiB1c2VkIHRvIGJ1aWxkIFVFRkkgbG9hZGVyIGF0IGFs bC48bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPC9kaXY+DQo8L2Rpdj4NCjwvYmxvY2txdW90ZT4N CjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD4NCjwvZGl2 Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPlllcyBhbmQgbm8uIEl0J3MgaW4gdXNlIHRv ZGF5LCBzbyBzYXlpbmcgaXQgc2hvdWxkbid0IGlzIGFib3V0IDEwIHllYXJzIHRvbyBsYXRlLjxv OnA+PC9vOnA+PC9wPg0KPC9kaXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+Jm5ic3A7 PG86cD48L286cD48L3A+DQo8L2Rpdj4NCjxibG9ja3F1b3RlIHN0eWxlPSJib3JkZXI6bm9uZTti b3JkZXItbGVmdDpzb2xpZCAjQ0NDQ0NDIDEuMHB0O3BhZGRpbmc6MGluIDBpbiAwaW4gNi4wcHQ7 bWFyZ2luLWxlZnQ6NC44cHQ7bWFyZ2luLXJpZ2h0OjBpbiI+DQo8ZGl2Pg0KPGRpdj4NCjxkaXY+ DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj5Ob3cgdGhlIGZ1biBwYXJ0LCBldmVuIGFzIFVFRkkgZG9l cyBwcm92aWRlIFNJTyBBUEkgdG8gYWNjZXNzIHNlcmlhbCBwb3J0cywgdG8gcmVhZCBmcm9tIHBv cnQsIHdyaXRlIHRvIHBvcnQgYW5kIHNldCBhdHRyaWJ1dGVzLCBpdCB0dXJucyBvdXQgdGhlcmUg YXJlIFVFRkkgaW1wbGVtZW50YXRpb24ocz8pLCB3aGVyZSBjaGFuZ2luZyBzb21lIGF0dHJpYnV0 ZXMgd2lsbCBjYXVzZSBzeXN0ZW0gdG8gaHVuZy4gV2hpY2gNCiBpcyB0aGUgcmVhc29uLCB3aHkg d2UgbmVlZCB0byBzZXQgdXAgaGFyZHdhcmUgcHJvcGVybHkgZnJvbSBmaXJtd2FyZSwgYW5kIG91 ciBnZW5lcmljIGNvbmZpZyBzaG91bGQgbm90IHRyeSB0byBlbmZvcmNlIHNvbWUgb3RoZXIgdmFs dWUocykuIERlZmF1bHQgc2hvdWxkIHBpY2sgdXAgdmFsdWVzIGZyb20gdGhlIHN5c3RlbS4gU3Vy ZSwgaWYgdGhlIG1hY2hpbmUgb3BlcmF0b3IgaGFzIHNvbWUgcmVhc29uIHRvIGNoYW5nZSB0aG9z ZSB2YWx1ZXMNCiBhbmQgaGFzIHRlc3RlZCB0aGUgY2hhbmdlLCB3ZSBzaG91bGQgaGF2ZSBtZXRo b2QgdG8gY2hhbmdlIHRoZSBjb25maWcsIGJ1dCBhZ2FpbiwgZGVmYXVsdHMgc2hvdWxkIGNvbWUg ZnJvbSBzeXN0ZW0gc2V0dXAuPG86cD48L286cD48L3A+DQo8L2Rpdj4NCjwvZGl2Pg0KPC9kaXY+ DQo8L2Jsb2NrcXVvdGU+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+PG86cD4mbmJzcDs8 L286cD48L3A+DQo8L2Rpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj5BZ3JlZWQuIEFu ZCBpdCBtb3N0bHkgZG9lcyB0b2RheS4gSWYgeW91IGhhdmUgc2VyaWFsIHJlZGlyZWN0LCB0aGUg ZWZpIGRyaXZlciBkb2VzIGFsbCB0aGF0IGF1dG9tYXRpY2FsbHkuPG86cD48L286cD48L3A+DQo8 L2Rpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj4mbmJzcDs8bzpwPjwvbzpwPjwvcD4N CjwvZGl2Pg0KPGJsb2NrcXVvdGUgc3R5bGU9ImJvcmRlcjpub25lO2JvcmRlci1sZWZ0OnNvbGlk ICNDQ0NDQ0MgMS4wcHQ7cGFkZGluZzowaW4gMGluIDBpbiA2LjBwdDttYXJnaW4tbGVmdDo0Ljhw dDttYXJnaW4tcmlnaHQ6MGluIj4NCjxkaXY+DQo8ZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29O b3JtYWwiPldoaWxlIEkgc2VlIHRoZSByZWFzb25pbmcgdG8gdHJ5IHRvIGNyZWF0ZSBhbGwgdGhv c2UgZGlmZmVyZW50IG5hbWVzLCBtYXliZSB0aGUgZmlyc3QgdGhpbmcgc2hvdWxkIGJlIHRvIGxv b2sgb24gdGhpcyBhcyBpbm5vY2VudCBlbmQgdXNlciwgd2hvIGhhcyBubyBpZGVhIGFib3V0IHRo b3NlIGZpbmUgdGVjaG5pY2FsIGRldGFpbHMgYW5kIGhpc3RvcmljYWwgcmVhc29ucyBhbmQgaXMg anVzdCB0cnlpbmcgdG8NCiBnZXQgc3lzdGVtIHRvIGJlaGF2ZeKApi48bzpwPjwvbzpwPjwvcD4N CjwvZGl2Pg0KPC9kaXY+DQo8L2Rpdj4NCjwvYmxvY2txdW90ZT4NCjxkaXY+DQo8cCBjbGFzcz0i TXNvTm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNz PSJNc29Ob3JtYWwiPkl0IGhhcyB0byBiZSBhIG5ldyBuYW1lLiBZb3UgY2FuJ3QganVzdCBvdmVy bG9hZCBjb21jb25zb2xlIGFuZCBoYXZlIGl0IHdvcmsgcmVsaWFibHkuIFRoZSB1c2VyIGhhcyB0 byB1bmRlcnN0YW5kIHRoZSB0ZWNobmljYWwgZGV0YWlscy48bzpwPjwvbzpwPjwvcD4NCjwvZGl2 Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxvOnA+Jm5ic3A7PC9vOnA+PC9wPg0KPC9k aXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+UGFydCBvZiB0aGUgcHJvYmxlbSBoZXJl IHRvbyBpcyB0aGF0IGNvbWNvbnNvbGUncyZuYnNwO2ludGVyZmFjZSBzYXlzICd1c2UgdGhlIG9u ZSBhdCBwb3J0IDB4Mzc4JyB3aGljaCBpcyBpbXBvc3NpYmxlIHdpdGhvdXQgcGFyc2luZyBBQ1BJ IHRhYmxlcywgd2hpY2ggdGhlIGVmaSBsb2FkZXIgZG9lc24ndCBkby4gU28gdGhlcmUncyBhbHJl YWR5IGEgbmV3LCBrbHVkZ3kgaW50ZXJmYWNlIHRvIHNwZWNpZnkgdGhlIFVJRA0KIG9mIHRoZSBl ZmlzZXJpYWwgZGV2aWNlLiBUaGlzIFVJRCBpcyBqdXN0IGEgbnVtYmVyIHdpdGggbm8gcmVsYXRp b25zaGlwIHRvIHRoZSBwb3J0IGZyb20gbWFjaGluZSB0byBtYWNoaW5lLiBTbyB3ZSdyZSBhbHJl YWR5IGZvcmNpbmcgY2hhbmdlcyBvbiB0aGUgdXNlci4gSXQncyBubyBsb25nZXIgdHJhbnNwYXJl bnQ6IGl0IHRha2VzIGVmZm9ydCB0byBjb25maWd1cmUgYW5kIHlvdSBhbHJlYWR5IGhhdmUgdG8g a25vdyB0aGUgZGlmZmVyZW5jZXMNCiBiZWNhdXNlIHRoZSBzaW1wbGUgcG9ydCBzaW1wbHkgZG9l c24ndCB3b3JrLjxvOnA+PC9vOnA+PC9wPg0KPC9kaXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05v cm1hbCI+PG86cD4mbmJzcDs8L286cD48L3A+DQo8L2Rpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNv Tm9ybWFsIj5UaGlzIGlzIHdoeSBJJ3ZlIGJlZW4gYWR2b2NhdGluZyBmb3IgZWZpICh1c2UgQ09O T1VUIHRleHQgaW50ZXJmYWNlKSwgZWZpc2VyaWFsJm5ic3A7KHVzZSB0aGUgZWZpJ3MgdWFydCBy b3V0aW5lcykgYW5kIGVmaXZpZGVvJm5ic3A7KHVzZSBncmFwaGljIGZyYW1lIGJ1ZmZlcikgZm9y IHllYXJzLiBIYXZpbmcgdGhpcyBzZXBhcmF0aW9uIHdpbGwgYWxsb3cgcGVvcGxlIHRvIGNvbmZp Z3VyZSB0aGUgY29uc29sZXMgb24gdGhlaXINCiBzeXN0ZW1zIG1vcmUgZGV0ZXJtaW5pc3RpY2Fs bHkuIEZvciB0aG9zZSB0aGF0IGhhdmUgbmljZSBzZXJpYWwgcmVkaXJlY3QsICdlZmknIGlzIHRo ZSB3YXkgdG8gZ28uIEl0IGp1c3QgZG9lcyB0aGUgcmlnaHQgdGhpbmcuIEZvciB0aG9zZSB0aGF0 IGRvIG5vdCwgdGhlbiB5b3UgY2FuIHVzZSBvbmUgb3IgbW9yZSBvZiBlZmlzZXJpYWwmbmJzcDth bmQgZWZpdmlkZW8gdG8gZ2V0IHRoZSBjb21iaW5hdGlvbiB5b3Ugd2FudC4gUGx1cyB3ZSBjYW4g bW92ZQ0KIHRoZSBncmFwaGljcyBkZXBlbmRlbmNpZXMgaW50byBlZml2aWRlbyZuYnNwO2FuZCBn ZXQgcmlkIG9mIHRoZSBjcmF6eSBzdHVicyB0aGF0IHRoaW5ncyBsaWtlIGtib290IG5lZWQgdGhh dCBjYW4gbmV2ZXIgZXZlciBoYXZlIGdyYXBoaWNhbCB2aWRlby4gSSdtIHN0aWxsIG1hZCB0aGF0 IG15IGRlc2lyZSBmb3IgdGhpcyB3YXMgaWdub3JlZCB3aGVuIHRoZSBncmFwaGljcyBzdHVmZiB3 YXMgYWRkZWQ8bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3Jt YWwiPjxvOnA+Jm5ic3A7PC9vOnA+PC9wPg0KPC9kaXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05v cm1hbCI+V2hlbiB3ZSBicmluZyB0aGlzIGRyaXZlciBiYWNrLCBpdCBhYnNvbHV0ZWx5IG11c3Qg aGF2ZSBhIG5ldyBuYW1lLiBJdCBjYW5ub3QgdHJ5IHRvICdmYWtlJyBpdCBieSBkb2luZyB0aGUg Z2FtZXMgaXQncyBkb2luZy4gVGhhdCBzaW1wbHkgd29uJ3Qgd29yayBhbmQgYnJlYWtzIG1hbnkg d29ya2luZyBjb25maWd1cmF0aW9ucyB0b2RheS48bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRp dj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxvOnA+Jm5ic3A7PC9vOnA+PC9wPg0KPC9kaXY+DQo8 ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+U28gbXkgc3VnZ2VzdGlvbiBpcyB0aGF0IHdlIGhh dmUgYSBuZXcgZWZpc2VyaWFsJm5ic3A7ZHJpdmVyLCBoeXBlclYgdXNlcyBpdC4gV2UgcmVuYW1l IHRoZSBjdXJyZW50IGVmaSBzZXJpYWwgaW50ZXJmYWNlIHRvIGJlIGVmaXNlcmlhbC4gT24gYWFy Y2g2NCAoYW5kIG9uIGFhcmNoNjQgb25seSkgd2UgaGF2ZSBhIG5ldyBjb21jb25zb2xlIGRyaXZl ciB0aGF0IGp1c3QgcmVkaXJlY3RzIHRvIGVmaXNlcmlhbC4gSXQgZG9lc24ndA0KIHRyeSB0byBj aGFuZ2UgdGhlIG5hbWUgb2YgYW55dGhpbmcsIG5vciB0cnkgdG8gZG8gYW55dGhpbmcgZWxzZS4g UGx1cyBpdCBzaG91bGQgc3RhcnQgd2FybmluZyB3aGVuIHlvdSBhcmUgdHJ5aW5nIHRvIHVzZSB0 aGUgeDg2LW9ubHkgY29uZmlndXJhdGlvbiBrbm9icyBvZiBjb21jb25zb2xlLiBBbmQgc3RhcnRp bmcgYWZ0ZXIgdGhlIDE0IGJyYW5jaCwgaXQgc2hvdWxkIHN0YXJ0IHdhcm5pbmcgcGVvcGxlIHNo b3VsZCB1c2UgZWZpc2VyaWFsJm5ic3A7aW5zdGVhZWQuDQogQW5kIHdlIG5ldmVyLCBldmVyIGV2 ZXIgYWdhaW4gdHJ5IHRvIGRvIGFsaWFzZXMgdGhhdCBhcmVuJ3QgcmVhbGx5IHRoZSBzYW1lIGRl dmljZSBhbmQgaGF2ZSBkaWZmZXJlbnQgY29uZmlndXJhdGlvbiBuZWVkcyB1bmRlciB0aGUgY292 ZXJzLjxvOnA+PC9vOnA+PC9wPg0KPC9kaXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+ PG86cD4mbmJzcDs8L286cD48L3A+DQo8L2Rpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFs Ij5XYXJuZXI8bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3Jt YWwiPiZuYnNwOzxvOnA+PC9vOnA+PC9wPg0KPC9kaXY+DQo8YmxvY2txdW90ZSBzdHlsZT0iYm9y ZGVyOm5vbmU7Ym9yZGVyLWxlZnQ6c29saWQgI0NDQ0NDQyAxLjBwdDtwYWRkaW5nOjBpbiAwaW4g MGluIDYuMHB0O21hcmdpbi1sZWZ0OjQuOHB0O21hcmdpbi1yaWdodDowaW4iPg0KPGRpdj4NCjxk aXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+anVzdCBteSAyIGNlbnRzLDxvOnA+PC9v OnA+PC9wPg0KPC9kaXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+dG9vbWFzPG86cD48 L286cD48L3A+DQo8L2Rpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48bzpwPiZuYnNw OzwvbzpwPjwvcD4NCjwvZGl2Pg0KPGJsb2NrcXVvdGUgc3R5bGU9Im1hcmdpbi10b3A6NS4wcHQ7 bWFyZ2luLWJvdHRvbTo1LjBwdCI+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+PG86cD4m bmJzcDs8L286cD48L3A+DQo8ZGl2Pg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPk9uIFRo dSwgTWFyIDMwLCAyMDIzIGF0IDU6MzHigK9QTSBHbGViIFNtaXJub2ZmICZsdDs8YSBocmVmPSJt YWlsdG86Z2xlYml1c0BmcmVlYnNkLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPmdsZWJpdXNAZnJlZWJz ZC5vcmc8L2E+Jmd0OyB3cm90ZTo8bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPGJsb2NrcXVvdGUg c3R5bGU9ImJvcmRlcjpub25lO2JvcmRlci1sZWZ0OnNvbGlkICNDQ0NDQ0MgMS4wcHQ7cGFkZGlu ZzowaW4gMGluIDBpbiA2LjBwdDttYXJnaW4tbGVmdDo0LjhwdDttYXJnaW4tcmlnaHQ6MGluIj4N CjxwIGNsYXNzPSJNc29Ob3JtYWwiPiZuYnNwOyBXZWksIEt5bGUsPGJyPg0KPGJyPg0KdGhpcyBj b21taXQgaGFuZ3MgbG9hZGVyIG9uIHJlYWwgaGFyZHdhcmUsIGF0IGxlYXN0IG9uIHNvbWU8YnI+ DQpvZiBpdC4mbmJzcDsgVGhlIGxvYWRlciBwcmludHMgbGlzdCBvZiBjb25zb2xlcyBhbmQgaGFu Z3MgaGFyZDo8YnI+DQo8YnI+DQpbVGh1IE1hciAzMCAyMDo0NjoxMiAyMDIzXV5NfF5ITG9hZGlu ZyAvYm9vdC9sb2FkZXIuY29uZl5NPGJyPg0KXk0vXkhjb25zb2xlIHZpZGNvbnNvbGUgaXMgaW52 YWxpZCFeTTxicj4NCl5NQXZhaWxhYmxlIGNvbnNvbGVzOl5NPGJyPg0KXk0mbmJzcDsgJm5ic3A7 IGVmaV5NPGJyPg0KXk0mbmJzcDsgJm5ic3A7IGNvbWNvbnNvbGVeTTxicj4NCl5NJm5ic3A7ICZu YnNwOyBjb21jb25zb2xlXk08YnI+DQpeTSZuYnNwOyAmbmJzcDsgbnVsbGNvbnNvbGVeTTxicj4N Cl5NJm5ic3A7ICZuYnNwOyBzcGluY29uc29sZV5NPGJyPg0KPGJyPg0KTWFjaGluZSBpcyB1bnJl Y292ZXJhYmxlIHVubGVzcyB5b3UgZ290IGFsdGVybmF0ZSBib290IG1lZGlhPGJyPg0KYW5kIGFj Y2VzcyB0byBCTUMgY29uc29sZS48YnI+DQo8YnI+DQpGaXJzdCwgcGxlYXNlIERPIE5PVCBNRkMg dGhpcyBhcyBzY2hlZHVsZWQuIFNlY29uZCwgbGV0J3MgdHJ5PGJyPg0KdG8gZml4IGl0IG9yIGJh Y2sgaXQgb3V0IGlmIHdlIGhlYXIgZnJvbSBhbnkgb3RoZXIgQ1VSUkVOVDxicj4NCnVzZXIuPGJy Pg0KPGJyPg0KT3VyIGNvbmZpZ3VyYXRpb24gaXNuJ3Qgc3BlY2lhbC4gVGhpcyBpcyB3aGF0IHdl IGdvdCBpbjxicj4NCmxvYWRlci5jb25mLCByZWxhdGVkIHRvIGNvbnNvbGVzOjxicj4NCjxicj4N CmNvbnNvbGU9JnF1b3Q7Y29tY29uc29sZSB2aWRjb25zb2xlIGVmaSZxdW90Ozxicj4NCmNvbWNv bnNvbGVfc3BlZWQ9MTE1MjAwPGJyPg0KY29tY29uc29sZV9wb3J0PTB4M2U4PGJyPg0KY29uc29s ZT0mcXVvdDtlZmkmcXVvdDs8YnI+DQpody51YXJ0LmNvbnNvbGU9JnF1b3Q7aW86MTAxNixicjox MTUyMDAmcXVvdDs8YnI+DQo8YnI+DQpPbiBTYXQsIE1hciAxOCwgMjAyMyBhdCAwNzoyMDozM0FN ICswMDAwLCBXZWkgSHUgd3JvdGU6PGJyPg0KVyZndDsgVGhlIGJyYW5jaCBtYWluIGhhcyBiZWVu IHVwZGF0ZWQgYnkgd2h1Ojxicj4NClcmZ3Q7IDxicj4NClcmZ3Q7IFVSTDogPGEgaHJlZj0iaHR0 cHM6Ly9jZ2l0LmZyZWVic2Qub3JnL3NyYy9jb21taXQvP2lkPTkyNzM1OGRkOThjYjkwMjE2MDA5 M2UwZGMwYmFjMDAyZDZiNDM4NTgiIHRhcmdldD0iX2JsYW5rIj4NCmh0dHBzOi8vY2dpdC5GcmVl QlNELm9yZy9zcmMvY29tbWl0Lz9pZD05MjczNThkZDk4Y2I5MDIxNjAwOTNlMGRjMGJhYzAwMmQ2 YjQzODU4PC9hPjxicj4NClcmZ3Q7IDxicj4NClcmZ3Q7IGNvbW1pdCA5MjczNThkZDk4Y2I5MDIx NjAwOTNlMGRjMGJhYzAwMmQ2YjQzODU4PGJyPg0KVyZndDsgQXV0aG9yOiZuYnNwOyAmbmJzcDsg Jm5ic3A7V2VpIEh1ICZsdDs8YSBocmVmPSJtYWlsdG86d2h1QEZyZWVCU0Qub3JnIj53aHVARnJl ZUJTRC5vcmc8L2E+Jmd0Ozxicj4NClcmZ3Q7IEF1dGhvckRhdGU6IDIwMjMtMDMtMTQgMTU6MTM6 NDYgKzAwMDA8YnI+DQpXJmd0OyBDb21taXQ6Jm5ic3A7ICZuYnNwOyAmbmJzcDtXZWkgSHUgJmx0 OzxhIGhyZWY9Im1haWx0bzp3aHVARnJlZUJTRC5vcmciPndodUBGcmVlQlNELm9yZzwvYT4mZ3Q7 PGJyPg0KVyZndDsgQ29tbWl0RGF0ZTogMjAyMy0wMy0xOCAwNzowNzozNSArMDAwMDxicj4NClcm Z3Q7IDxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDthbWQ2NCBsb2FkZXI6IFVzZSBlZmlz ZXJpYWxpbyBmb3IgSHlwZXItViBib290ZWQgc3lzdGVtczxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNw OyAmbmJzcDs8YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7VUVGSSBwcm92aWRlcyBDb25J bi9Db25PdXQgaGFuZGxlcyBmb3IgY29uc29sZXMgdGhhdCBpdCBzdXBwb3J0cyw8YnI+DQpXJmd0 OyZuYnNwOyAmbmJzcDsgJm5ic3A7d2hpY2ggaW5jbHVkZSB0aGUgdGV4dC12aWRlbyBhbmQgc2Vy aWFsIHBvcnRzLiBXaGVuIHRoZSBzZXJpYWwgcG9ydDxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAm bmJzcDtpcyBhdmFpbGFibGUsIHVzZSB0aGUgVUVGSSBkcml2ZXIgaW5zdGVhZCBvZiBkaXJlY3Qg aW8tcG9ydCBhY2Nlc3Nlczxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDt0byBhdm9pZCBj b25mbGljdHMgYmV0d2VlbiB0aGUgZmlybXdhcmUgYW5kIGRpcmVjdCBoYXJkd2FyZSBhY2Nlc3Ms IGFzPGJyPg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwO2hhcHBlbnMgb24gSHlwZXItViAoQXp1 cmUpIHNldHVwcy48YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7PGJyPg0KVyZndDsmbmJz cDsgJm5ic3A7ICZuYnNwO1RoaXMgY2hhbmdlIGVuYWJsZXMgZWZpc2VyaWFsaW8gdG8gYmUgYnVp bHQgZm9yIGVmaS1hbWQ2NCBhbmQgaGFzPGJyPg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwO2hp Z2hlciBvcmRlciBwcmlvcml0eSB2cyBjb21jb25zb2xlLCBhbmQgb25seSB1c2VzIGVmaXNlcmlh bGlvPGJyPg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwO2lmIHRoZSBoeXBlcnZpc29yIGlzIEh5 cGVyLVYuIFdoZW4gZWZpc2VyaWFsaW8gc3VjY2Vzc2Z1bGx5PGJyPg0KVyZndDsmbmJzcDsgJm5i c3A7ICZuYnNwO3Byb2JlcywgaXQgd2lsbCBzZXQgZWZpX2NvbWNvbnNvbGVfYXZhaWw9dHJ1ZSB3 aGljaCB3aWxsIHByZXZlbnQ8YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7Y29tY29uc29s ZSBmcm9tIHByb2JpbmcgaW4gdGhpcyBzZXR1cC48YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5i c3A7PGJyPg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwO1Rlc3RlZCBvbiBIeXBlci1WLCBFU1hp IGFuZCBBenVyZSBWTXMuPGJyPg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwOzxicj4NClcmZ3Q7 Jm5ic3A7ICZuYnNwOyAmbmJzcDtQUjombmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7 ICZuYnNwOyAmbmJzcDsyNjQyNjc8YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7UmV2aWV3 ZWQgYnk6Jm5ic3A7ICZuYnNwOyBrZXZhbnMsIHdodTxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAm bmJzcDtUZXN0ZWQgYnk6Jm5ic3A7ICZuYnNwOyAmbmJzcDsgd2h1PGJyPg0KVyZndDsmbmJzcDsg Jm5ic3A7ICZuYnNwO09idGFpbmVkIGZyb206Jm5ic3A7IFJ1Ymljb24gQ29tbXVuaWNhdGlvbnMs IExMQyAoTmV0Z2F0ZSk8YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7TUZDIGFmdGVyOiZu YnNwOyAmbmJzcDsgJm5ic3A7IDIgd2Vla3M8YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7 U3BvbnNvcmVkIGJ5OiZuYnNwOyAmbmJzcDtSdWJpY29uIENvbW11bmljYXRpb25zLCBMTEMgKE5l dGdhdGUpPGJyPg0KVyZndDsgLS0tPGJyPg0KVyZndDsmbmJzcDsgc3RhbmQvZWZpL2xvYWRlci9h cmNoL2FtZDY0L01ha2VmaWxlLmluYyB8Jm5ic3A7IDEgKzxicj4NClcmZ3Q7Jm5ic3A7IHN0YW5k L2VmaS9sb2FkZXIvYm9vdGluZm8uYyZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsg Jm5ic3A7ICZuYnNwOyB8IDExICsrKysrKy0tPGJyPg0KVyZndDsmbmJzcDsgc3RhbmQvZWZpL2xv YWRlci9jb25mLmMmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJz cDsgJm5ic3A7ICZuYnNwOyB8Jm5ic3A7IDYgKysrKys8YnI+DQpXJmd0OyZuYnNwOyBzdGFuZC9l ZmkvbG9hZGVyL2VmaXNlcmlhbGlvLmMmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7 ICZuYnNwO3wgNDMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS08YnI+DQpXJmd0OyZu YnNwOyBzdGFuZC9pMzg2L2xpYmkzODYvY29tY29uc29sZS5jJm5ic3A7ICZuYnNwOyAmbmJzcDsg Jm5ic3A7ICZuYnNwOyB8IDE0ICsrKysrKysrKysrPGJyPg0KVyZndDsmbmJzcDsgNSBmaWxlcyBj aGFuZ2VkLCA2OCBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKTxicj4NClcmZ3Q7IDxicj4N ClcmZ3Q7IGRpZmYgLS1naXQgYS9zdGFuZC9lZmkvbG9hZGVyL2FyY2gvYW1kNjQvTWFrZWZpbGUu aW5jIGIvc3RhbmQvZWZpL2xvYWRlci9hcmNoL2FtZDY0L01ha2VmaWxlLmluYzxicj4NClcmZ3Q7 IGluZGV4IDBkOWUyNjQ4Y2I1OS4uYmQ4OTA0NGJkNmM3IDEwMDY0NDxicj4NClcmZ3Q7IC0tLSBh L3N0YW5kL2VmaS9sb2FkZXIvYXJjaC9hbWQ2NC9NYWtlZmlsZS5pbmM8YnI+DQpXJmd0OyArKysg Yi9zdGFuZC9lZmkvbG9hZGVyL2FyY2gvYW1kNjQvTWFrZWZpbGUuaW5jPGJyPg0KVyZndDsgQEAg LTUsNiArNSw3IEBAIFNSQ1MrPSZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwO2FtZDY0X3RyYW1w LlMgXDxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgZWxmNjRfZnJlZWJzZC5jIFw8YnI+ DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7IHRyYXAuYyBcPGJyPg0KVyZndDsmbmJzcDsgJm5i c3A7ICZuYnNwOyBtdWx0aWJvb3QyLmMgXDxicj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7IGVmaXNl cmlhbGlvLmMgXDxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgZXhjLlM8YnI+DQpXJmd0 OyZuYnNwOyA8YnI+DQpXJmd0OyZuYnNwOyAuUEFUSDombmJzcDsgJm5ic3A7ICZuYnNwOyAke0JP T1RTUkN9L2kzODYvbGliaTM4Njxicj4NClcmZ3Q7IGRpZmYgLS1naXQgYS9zdGFuZC9lZmkvbG9h ZGVyL2Jvb3RpbmZvLmMgYi9zdGFuZC9lZmkvbG9hZGVyL2Jvb3RpbmZvLmM8YnI+DQpXJmd0OyBp bmRleCA5MzlmMmNmNGMzZmUuLmQ3OWY1OTM0M2FmMSAxMDA2NDQ8YnI+DQpXJmd0OyAtLS0gYS9z dGFuZC9lZmkvbG9hZGVyL2Jvb3RpbmZvLmM8YnI+DQpXJmd0OyArKysgYi9zdGFuZC9lZmkvbG9h ZGVyL2Jvb3RpbmZvLmM8YnI+DQpXJmd0OyBAQCAtMTE5LDEwICsxMTksMTcgQEAgYmlfZ2V0Ym9v dGhvd3RvKGNoYXIgKmthcmdzKTxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7 ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyBpZiAodG1w ICE9IE5VTEwpPGJyPg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZu YnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5i c3A7ICZuYnNwOyBzcGVlZCA9IHN0cnRvbCh0bXAsIE5VTEwsIDApOzxicj4NClcmZ3Q7Jm5ic3A7 ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsg Jm5ic3A7ICZuYnNwOyB0bXAgPSBnZXRlbnYoJnF1b3Q7ZWZpX2NvbV9wb3J0JnF1b3Q7KTs8YnI+ DQpXJmd0OyAtJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7 ICZuYnNwOyAmbmJzcDsgJm5ic3A7IGlmICh0bXAgPT0gTlVMTCk8YnI+DQpXJmd0OyAtJm5ic3A7 ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsg Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyB0bXAgPSBnZXRlbnYoJnF1b3Q7Y29t Y29uc29sZV9wb3J0JnF1b3Q7KTs8YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNw OyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgaWYgKHRt cCAhPSBOVUxMKTxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAm bmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZu YnNwOyAmbmJzcDsgcG9ydCA9IHN0cnRvbCh0bXAsIE5VTEwsIDApOzxicj4NClcmZ3Q7ICsmbmJz cDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNw OyAmbmJzcDsgaWYgKHBvcnQgJmx0Oz0gMCkgezxicj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7ICZu YnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5i c3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7IHRtcCA9IGdldGVudigmcXVvdDtjb21jb25zb2xlX3Bv cnQmcXVvdDspOzxicj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7 ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsg Jm5ic3A7IGlmICh0bXAgIT0gTlVMTCk8YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNwOyAmbmJzcDsg Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAm bmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgcG9ydCA9IHN0 cnRvbCh0bXAsIE5VTEwsIDApOzxicj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJz cDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNw OyAmbmJzcDsgJm5ic3A7IGVsc2Ugezxicj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7ICZuYnNwOyAm bmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZu YnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyBpZiAocG9ydCA9 PSAwKTxicj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNw OyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7 ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsg cG9ydCA9IDB4M2Y4Ozxicj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5i c3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJz cDsgJm5ic3A7IH08YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNw OyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7IH08YnI+DQpXJmd0OyZuYnNwOyAm bmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZu YnNwOyAmbmJzcDsgaWYgKHNwZWVkICE9IC0xICZhbXA7JmFtcDsgcG9ydCAhPSAtMSkgezxicj4N ClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZu YnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgc25w cmludGYoYnVmLCBzaXplb2YoYnVmKSwgJnF1b3Q7aW86JWQsYnI6JWQmcXVvdDssIHBvcnQsPGJy Pg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsg Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAm bmJzcDsgJm5ic3A7IHNwZWVkKTs8YnI+DQpXJmd0OyBkaWZmIC0tZ2l0IGEvc3RhbmQvZWZpL2xv YWRlci9jb25mLmMgYi9zdGFuZC9lZmkvbG9hZGVyL2NvbmYuYzxicj4NClcmZ3Q7IGluZGV4IDg2 M2M5MTg4YzcyYy4uMDUxZTFhMzM4MWQxIDEwMDY0NDxicj4NClcmZ3Q7IC0tLSBhL3N0YW5kL2Vm aS9sb2FkZXIvY29uZi5jPGJyPg0KVyZndDsgKysrIGIvc3RhbmQvZWZpL2xvYWRlci9jb25mLmM8 YnI+DQpXJmd0OyBAQCAtODEsNiArODEsOSBAQCBzdHJ1Y3QgbmV0aWZfZHJpdmVyICpuZXRpZl9k cml2ZXJzW10gPSB7PGJyPg0KVyZndDsmbmJzcDsgPGJyPg0KVyZndDsmbmJzcDsgZXh0ZXJuIHN0 cnVjdCBjb25zb2xlIGVmaV9jb25zb2xlOzxicj4NClcmZ3Q7Jm5ic3A7IGV4dGVybiBzdHJ1Y3Qg Y29uc29sZSBjb21jb25zb2xlOzxicj4NClcmZ3Q7ICsjaWYgZGVmaW5lZChfX2FtZDY0X18pPGJy Pg0KVyZndDsgK2V4dGVybiBzdHJ1Y3QgY29uc29sZSBlZmljb21jb25zb2xlOzxicj4NClcmZ3Q7 ICsjZW5kaWY8YnI+DQpXJmd0OyZuYnNwOyAjaWYgZGVmaW5lZChfX2FtZDY0X18pIHx8IGRlZmlu ZWQoX19pMzg2X18pPGJyPg0KVyZndDsmbmJzcDsgZXh0ZXJuIHN0cnVjdCBjb25zb2xlIG51bGxj b25zb2xlOzxicj4NClcmZ3Q7Jm5ic3A7IGV4dGVybiBzdHJ1Y3QgY29uc29sZSBzcGluY29uc29s ZTs8YnI+DQpXJmd0OyBAQCAtODgsNiArOTEsOSBAQCBleHRlcm4gc3RydWN0IGNvbnNvbGUgc3Bp bmNvbnNvbGU7PGJyPg0KVyZndDsmbmJzcDsgPGJyPg0KVyZndDsmbmJzcDsgc3RydWN0IGNvbnNv bGUgKmNvbnNvbGVzW10gPSB7PGJyPg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmYW1wO2Vm aV9jb25zb2xlLDxicj4NClcmZ3Q7ICsjaWYgZGVmaW5lZChfX2FtZDY0X18pPGJyPg0KVyZndDsg KyZuYnNwOyAmbmJzcDsgJmFtcDtlZmljb21jb25zb2xlLDxicj4NClcmZ3Q7ICsjZW5kaWY8YnI+ DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7ICZhbXA7Y29tY29uc29sZSw8YnI+DQpXJmd0OyZu YnNwOyAjaWYgZGVmaW5lZChfX2FtZDY0X18pIHx8IGRlZmluZWQoX19pMzg2X18pPGJyPg0KVyZn dDsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmYW1wO251bGxjb25zb2xlLDxicj4NClcmZ3Q7IGRpZmYg LS1naXQgYS9zdGFuZC9lZmkvbG9hZGVyL2VmaXNlcmlhbGlvLmMgYi9zdGFuZC9lZmkvbG9hZGVy L2VmaXNlcmlhbGlvLmM8YnI+DQpXJmd0OyBpbmRleCAzNzVlNjc5ZDI1OTAuLjVmYmM3MDBmNmFj MiAxMDA2NDQ8YnI+DQpXJmd0OyAtLS0gYS9zdGFuZC9lZmkvbG9hZGVyL2VmaXNlcmlhbGlvLmM8 YnI+DQpXJmd0OyArKysgYi9zdGFuZC9lZmkvbG9hZGVyL2VmaXNlcmlhbGlvLmM8YnI+DQpXJmd0 OyBAQCAtNjksNiArNjksMTEgQEAgc3RhdGljIGludCZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNw OyBjb21jX3NwZWVkX3NldChzdHJ1Y3QgZW52X3ZhciAqLCBpbnQsIGNvbnN0IHZvaWQgKik7PGJy Pg0KVyZndDsmbmJzcDsgPGJyPg0KVyZndDsmbmJzcDsgc3RhdGljIHN0cnVjdCBzZXJpYWwmbmJz cDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgKmNvbWNfcG9ydDs8YnI+DQpXJmd0OyZuYnNwOyBleHRl cm4gc3RydWN0IGNvbnNvbGUgZWZpX2NvbnNvbGU7PGJyPg0KVyZndDsgK2Jvb2wgZWZpX2NvbWNv bnNvbGVfYXZhaWwgPSBmYWxzZTs8YnI+DQpXJmd0OyArPGJyPg0KVyZndDsgKyNpZiBkZWZpbmVk KF9fYW1kNjRfXyk8YnI+DQpXJmd0OyArI2RlZmluZSBjb21jb25zb2xlIGVmaWNvbWNvbnNvbGU8 YnI+DQpXJmd0OyArI2VuZGlmPGJyPg0KVyZndDsmbmJzcDsgPGJyPg0KVyZndDsmbmJzcDsgc3Ry dWN0IGNvbnNvbGUgY29tY29uc29sZSA9IHs8YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7 IC5jX25hbWUgPSAmcXVvdDtjb21jb25zb2xlJnF1b3Q7LDxicj4NClcmZ3Q7IEBAIC0yNTQsMTEg KzI1OSwyMiBAQCBjb21jX3Byb2JlKHN0cnVjdCBjb25zb2xlICpzYyk8YnI+DQpXJmd0OyZuYnNw OyAmbmJzcDsgJm5ic3A7IGNoYXIgKmVudiwgKmJ1ZiwgKmVwOzxicj4NClcmZ3Q7Jm5ic3A7ICZu YnNwOyAmbmJzcDsgc2l6ZV90IHN6Ozxicj4NClcmZ3Q7Jm5ic3A7IDxicj4NClcmZ3Q7ICsjaWYg ZGVmaW5lZChfX2FtZDY0X18pPGJyPg0KVyZndDsgKyZuYnNwOyAmbmJzcDsgLyo8YnI+DQpXJmd0 OyArJm5ic3A7ICZuYnNwOyAmbmJzcDsqIEZvciB4ODYtNjQsIGRvbid0IHVzZSB0aGlzIGRyaXZl ciBpZiBub3QgcnVubmluZyBpbiBIeXBlci1WLjxicj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7ICZu YnNwOyovPGJyPg0KVyZndDsgKyZuYnNwOyAmbmJzcDsgZW52ID0gZ2V0ZW52KCZxdW90O3NtYmlv cy5iaW9zLnZlcnNpb24mcXVvdDspOzxicj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7IGlmIChlbnYg PT0gTlVMTCB8fCBzdHJuY21wKGVudiwgJnF1b3Q7SHlwZXItViZxdW90OywgNykgIT0gMCkgezxi cj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyByZXR1 cm47PGJyPg0KVyZndDsgKyZuYnNwOyAmbmJzcDsgfTxicj4NClcmZ3Q7ICsjZW5kaWY8YnI+DQpX Jmd0OyArPGJyPg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwOyBpZiAoY29tY19wb3J0ID09IE5V TEwpIHs8YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7 ICZuYnNwOyBjb21jX3BvcnQgPSBjYWxsb2MoMSwgc2l6ZW9mIChzdHJ1Y3Qgc2VyaWFsKSk7PGJy Pg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsg aWYgKGNvbWNfcG9ydCA9PSBOVUxMKTxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5i c3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyByZXR1 cm47PGJyPg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwOyB9PGJyPg0KVyZndDsgKzxicj4NClcm Z3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgLyogVXNlIGRlZmF1bHRzIGZyb20gZmlybXdhcmUgKi88 YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7IGNvbWNfcG9ydC0mZ3Q7ZGF0YWJpdHMgPSA4 Ozxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgY29tY19wb3J0LSZndDtwYXJpdHkgPSBE ZWZhdWx0UGFyaXR5Ozxicj4NClcmZ3Q7IEBAIC0zMDgsNiArMzI0LDEwIEBAIGNvbWNfcHJvYmUo c3RydWN0IGNvbnNvbGUgKnNjKTxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7 ICZuYnNwOyBjb21jX3BvcnRfc2V0LCBlbnZfbm91bnNldCk7PGJyPg0KVyZndDsmbmJzcDsgPGJy Pg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwOyBlbnYgPSBnZXRlbnYoJnF1b3Q7ZWZpX2NvbV9z cGVlZCZxdW90Oyk7PGJyPg0KVyZndDsgKyZuYnNwOyAmbmJzcDsgaWYgKGVudiA9PSBOVUxMKTxi cj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAvKiBm YWxsYmFjayB0byBjb21jb25zb2xlIHNldHRpbmcgKi88YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNw OyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgZW52ID0gZ2V0ZW52KCZxdW90O2NvbWNvbnNv bGVfc3BlZWQmcXVvdDspOzxicj4NClcmZ3Q7ICs8YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5i c3A7IGlmIChjb21jX3BhcnNlX2ludHZhbChlbnYsICZhbXA7dmFsKSA9PSBDTURfT0spPGJyPg0K VyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgY29t Y19wb3J0LSZndDtiYXVkcmF0ZSA9IHZhbDs8YnI+DQpXJmd0OyZuYnNwOyA8YnI+DQpXJmd0OyBA QCAtMzE4LDggKzMzOCwxMyBAQCBjb21jX3Byb2JlKHN0cnVjdCBjb25zb2xlICpzYyk8YnI+DQpX Jmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgY29tY19zcGVlZF9zZXQsIGVu dl9ub3Vuc2V0KTs8YnI+DQpXJmd0OyZuYnNwOyA8YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5i c3A7IGNvbWNvbnNvbGUuY19mbGFncyA9IDA7PGJyPg0KVyZndDsgLSZuYnNwOyAmbmJzcDsgaWYg KGNvbWNfc2V0dXAoKSk8YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNwOyBpZiAoY29tY19zZXR1cCgp KSB7PGJyPg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAm bmJzcDsgc2MtJmd0O2NfZmxhZ3MgPSBDX1BSRVNFTlRJTiB8IENfUFJFU0VOVE9VVDs8YnI+DQpX Jmd0OyArJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgZWZpX2NvbWNv bnNvbGVfYXZhaWwgPSB0cnVlOzxicj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7IH0gZWxzZSB7PGJy Pg0KVyZndDsgKyZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7IC8qIGRp c2FibGUgYmVpbmcgc2VlbiBhcyAmcXVvdDtjb21jb25zb2xlJnF1b3Q7ICovPGJyPg0KVyZndDsg KyZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7IGNvbWNvbnNvbGUuY19u YW1lID0gJnF1b3Q7ZWZpc2VyaWFsaW8mcXVvdDs7PGJyPg0KVyZndDsgKyZuYnNwOyAmbmJzcDsg fTxicj4NClcmZ3Q7Jm5ic3A7IH08YnI+DQpXJmd0OyZuYnNwOyA8YnI+DQpXJmd0OyZuYnNwOyBz dGF0aWMgaW50PGJyPg0KVyZndDsgQEAgLTQ4OSw2ICs1MTQsNyBAQCBjb21jX3NldHVwKHZvaWQp PGJyPg0KVyZndDsmbmJzcDsgezxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgRUZJX1NU QVRVUyBzdGF0dXM7PGJyPg0KVyZndDsmbmJzcDsgJm5ic3A7ICZuYnNwOyBVSU5UMzIgY29udHJv bDs8YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNwOyBjaGFyICpldjs8YnI+DQpXJmd0OyZuYnNwOyA8 YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7IC8qIHBvcnQgaXMgbm90IHVzYWJsZSAqLzxi cj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgaWYgKGNvbWNfcG9ydC0mZ3Q7c2lvID09IE5V TEwpPGJyPg0KVyZndDsgQEAgLTQ5OCwxMCArNTI0LDE3IEBAIGNvbWNfc2V0dXAodm9pZCk8YnI+ DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7IGlmIChFRklfRVJST1Ioc3RhdHVzKSk8YnI+DQpX Jmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyByZXR1 cm4gKGZhbHNlKTs8YnI+DQpXJmd0OyZuYnNwOyA8YnI+DQpXJmd0OyAtJm5ic3A7ICZuYnNwOyBz dGF0dXMgPSBjb21jX3BvcnQtJmd0O3Npby0mZ3Q7U2V0QXR0cmlidXRlcyhjb21jX3BvcnQtJmd0 O3Npbyw8YnI+DQpXJmd0OyAtJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7IGNvbWNfcG9ydC0m Z3Q7YmF1ZHJhdGUsIGNvbWNfcG9ydC0mZ3Q7cmVjZWl2ZWZpZm9kZXB0aCw8YnI+DQpXJmd0OyAt Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7IGNvbWNfcG9ydC0mZ3Q7dGltZW91dCwgY29tY19w b3J0LSZndDtwYXJpdHksPGJyPg0KVyZndDsgLSZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyBj b21jX3BvcnQtJmd0O2RhdGFiaXRzLCBjb21jX3BvcnQtJmd0O3N0b3BiaXRzKTs8YnI+DQpXJmd0 OyArJm5ic3A7ICZuYnNwOyBldiA9IGdldGVudigmcXVvdDtzbWJpb3MuYmlvcy52ZXJzaW9uJnF1 b3Q7KTs8YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNwOyBpZiAoZXYgIT0gTlVMTCAmYW1wOyZhbXA7 IHN0cm5jbXAoZXYsICZxdW90O0h5cGVyLVYmcXVvdDssIDcpID09IDApIHs8YnI+DQpXJmd0OyAr Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgc3RhdHVzID0gY29tY19w b3J0LSZndDtzaW8tJmd0O1NldEF0dHJpYnV0ZXMoY29tY19wb3J0LSZndDtzaW8sPGJyPg0KVyZn dDsgKyZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJz cDsgMCwgMCwgMCwgRGVmYXVsdFBhcml0eSwgMCwgRGVmYXVsdFN0b3BCaXRzKTs8YnI+DQpXJmd0 OyArJm5ic3A7ICZuYnNwOyB9IGVsc2Ugezxicj4NClcmZ3Q7ICsmbmJzcDsgJm5ic3A7ICZuYnNw OyAmbmJzcDsgJm5ic3A7ICZuYnNwOyBzdGF0dXMgPSBjb21jX3BvcnQtJmd0O3Npby0mZ3Q7U2V0 QXR0cmlidXRlcyhjb21jX3BvcnQtJmd0O3Npbyw8YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNwOyAm bmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyBjb21jX3BvcnQtJmd0O2Jh dWRyYXRlLCBjb21jX3BvcnQtJmd0O3JlY2VpdmVmaWZvZGVwdGgsPGJyPg0KVyZndDsgKyZuYnNw OyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgY29tY19w b3J0LSZndDt0aW1lb3V0LCBjb21jX3BvcnQtJmd0O3Bhcml0eSw8YnI+DQpXJmd0OyArJm5ic3A7 ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyBjb21jX3Bv cnQtJmd0O2RhdGFiaXRzLCBjb21jX3BvcnQtJmd0O3N0b3BiaXRzKTs8YnI+DQpXJmd0OyArJm5i c3A7ICZuYnNwOyB9PGJyPg0KVyZndDsgKzxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsg aWYgKEVGSV9FUlJPUihzdGF0dXMpKTxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5i c3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7IHJldHVybiAoZmFsc2UpOzxicj4NClcmZ3Q7Jm5ic3A7 IDxicj4NClcmZ3Q7IGRpZmYgLS1naXQgYS9zdGFuZC9pMzg2L2xpYmkzODYvY29tY29uc29sZS5j IGIvc3RhbmQvaTM4Ni9saWJpMzg2L2NvbWNvbnNvbGUuYzxicj4NClcmZ3Q7IGluZGV4IGVkMWYx YWEwOGVkNy4uM2ZiYjZhMjkyYzE5IDEwMDY0NDxicj4NClcmZ3Q7IC0tLSBhL3N0YW5kL2kzODYv bGliaTM4Ni9jb21jb25zb2xlLmM8YnI+DQpXJmd0OyArKysgYi9zdGFuZC9pMzg2L2xpYmkzODYv Y29tY29uc29sZS5jPGJyPg0KVyZndDsgQEAgLTg1LDYgKzg1LDIwIEBAIGNvbWNfcHJvYmUoc3Ry dWN0IGNvbnNvbGUgKmNwKTxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgaW50IHNwZWVk LCBwb3J0Ozxicj4NClcmZ3Q7Jm5ic3A7ICZuYnNwOyAmbmJzcDsgdWludDMyX3QgbG9jYXRvcjs8 YnI+DQpXJmd0OyZuYnNwOyA8YnI+DQpXJmd0OyArI2lmIGRlZmluZWQoX19hbWQ2NF9fKTxicj4N ClcmZ3Q7ICsmbmJzcDsgJm5ic3A7IGV4dGVybiBib29sIGVmaV9jb21jb25zb2xlX2F2YWlsOzxi cj4NClcmZ3Q7ICs8YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNwOyBpZiAoZWZpX2NvbWNvbnNvbGVf YXZhaWwpIHs8YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAm bmJzcDsgLyo8YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAm bmJzcDsgJm5ic3A7KiBJZiBFRkkgcHJvdmlkZXMgc2VyaWFsIEkvTywgdGhlbiBkb24ndCB1c2Ug dGhpcyBsZWdhY3k8YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNw OyAmbmJzcDsgJm5ic3A7KiBjb20gZHJpdmVyIHRvIGF2b2lkIGNvbmZsaWN0cyB3aXRoIHRoZSBm aXJtd2FyZSdzIGRyaXZlci48YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7 ICZuYnNwOyAmbmJzcDsgJm5ic3A7KiBDaGFuZ2UgY19uYW1lIHNvIHRoYXQgaXQgY2Fubm90IGJl IGZvdW5kIGluIHRoZSBsb29rdXAuPGJyPg0KVyZndDsgKyZuYnNwOyAmbmJzcDsgJm5ic3A7ICZu YnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyovPGJyPg0KVyZndDsgKyZuYnNwOyAmbmJzcDsgJm5i c3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7IGNvbWNvbnNvbGUuY19uYW1lID0gJnF1b3Q7eGNvbWNv bnNvbGUmcXVvdDs7PGJyPg0KVyZndDsgKyZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJz cDsgJm5ic3A7IHJldHVybjs8YnI+DQpXJmd0OyArJm5ic3A7ICZuYnNwOyB9PGJyPg0KVyZndDsg KyNlbmRpZjxicj4NClcmZ3Q7ICs8YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7IGlmIChj b21jX2N1cnNwZWVkID09IDApIHs8YnI+DQpXJmd0OyZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNw OyAmbmJzcDsgJm5ic3A7ICZuYnNwOyBjb21jX2N1cnNwZWVkID0gQ09NU1BFRUQ7PGJyPg0KVyZn dDsmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgLyo8YnI+ DQo8YnI+DQotLSA8YnI+DQpHbGViIFNtaXJub2ZmPG86cD48L286cD48L3A+DQo8L2Jsb2NrcXVv dGU+DQo8L2Rpdj4NCjwvZGl2Pg0KPC9ibG9ja3F1b3RlPg0KPC9kaXY+DQo8cCBjbGFzcz0iTXNv Tm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD4NCjwvZGl2Pg0KPC9ibG9ja3F1b3RlPg0KPC9k aXY+DQo8L2Rpdj4NCjwvZGl2Pg0KPC9kaXY+DQo8L2JvZHk+DQo8L2h0bWw+DQo= --_000_SI2P153MB0441F026F04D1479A30ACF73BB8F9SI2P153MB0441APCP_-- From nobody Fri Mar 31 14:37: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 4Pp2v01Sybz42qHq; Fri, 31 Mar 2023 14:37: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 4Pp2v00yMRz46rs; Fri, 31 Mar 2023 14:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680273452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p8A7mIBFALfix6Ka5x+pxpYBnA0LYpoXzfaGimT0mjA=; b=ZTbF7R1rYxDagnP8Z54pzlt++aCBA3cLUUb3/vpHirpLFSM/2m6eihYRrF63j2zhJlgGtt vnaf4eEHo5ch3bAw7Sl+u9JhFI80SVoAe5it5dYlYoDBYv9AZTbZ1qERf5Jb6YjHWPOs+n VSu9GRjYiHglVY65Q9TVaJqgTzATxT13w299AMlEsJVOd7coCG07n79a5ueUE/wW0qFYz7 j905iI31+EqLcaRT/OTNyKXf82HrkAoD3i46qQ9SRMzgANZ1T56vSzP42qsMUeHWgLHDnC OFs6JlBcXmRsTaSIL5NITASkEjJAFYKSIrMrsICII6mZYg4GbywG/Yr3kqPI3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680273452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p8A7mIBFALfix6Ka5x+pxpYBnA0LYpoXzfaGimT0mjA=; b=cQQJ8/RdQ3R7I8zuNLORjpB7YBPCBfp7ai26Ww1kSAKylsN/ax7jHz6cHXoQTGm3e7je6b 7W8/NlAIe3benEyT2xPvgwD/Mk8wSxB1N/bLf3UZav7Ygpx+BC78rgkPrm+tMYu4fTsHx7 HMH5LIOYa8c8GCDqFVRutRWNZwt+egIgXut2wJT41qlXHIUaELg1Bl8BuflUcjU/YzhVrm b2+PBBnNTjR7nrITICTxUSYH6cEmODUfRWVS3BehwU1n0kavsxpYDIus9LQl8cwSt76ztn /NYIGSii4frRc33z6eXxtQkIsBLeYKUxLerEerWeahFbaiSvtDMth0FEznHrnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680273452; a=rsa-sha256; cv=none; b=Wgr3tDzIqofd6P5q4G8przTS1cszpEdh9J+mmZtHW5QHpZrVu3cuQg6QbKxIwuxdZa9mOB ocfJlb1Yps7N9OhhINEiHLwfAY5ov3PMKaKXwcpKwuog7COovdS/xpnNP/BMWWM9nxy8WM c7gZXBHHczPS9jGQ16RCc9eCD7w+TeK221kECFYe57EwSmyDhI5HuAL3v157UimbBiLq96 XBplsed6eP+Td/bYhKDRUwuaCdux0KR9pOIjbjr22/X/SVMwF6X6ienClWcvq2jEsQdpxz IcZ1kGHgeBjeWCSXVF9Q2JKzPUOl/Vn/iNtXgterUlP/atiarArYpH2RuHZgEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp2v001M9zxqS; Fri, 31 Mar 2023 14:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VEbVxe049515; Fri, 31 Mar 2023 14:37:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VEbVrJ049514; Fri, 31 Mar 2023 14:37:31 GMT (envelope-from git) Date: Fri, 31 Mar 2023 14:37:31 GMT Message-Id: <202303311437.32VEbVrJ049514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 588f03ec9b9e - main - bectl: Improve error message when ZFS root is not found. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 588f03ec9b9ebd3c17b3e978140ff3f3e4bcad73 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=588f03ec9b9ebd3c17b3e978140ff3f3e4bcad73 commit 588f03ec9b9ebd3c17b3e978140ff3f3e4bcad73 Author: Andrew Gallatin AuthorDate: 2023-03-30 21:57:26 +0000 Commit: Andrew Gallatin CommitDate: 2023-03-31 14:27:38 +0000 bectl: Improve error message when ZFS root is not found. When recovering a system that is unbootable due to some problem with the active BE, it is likely you'll be booted from a rescue image running UFS. In this case, bectl needs help finding the zpool root that you want to operate on. In this case, improve the error message to suggest specifying a root, rather than just emitting a generic error message that might imply, to the naive user, that there is a ZFS compatibility issue between the rescue image and the on-disk ZFS pool. Reviewed by: imp, kevans Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D39346 --- sbin/bectl/bectl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 2b7af4e55419..814b98ba8a8a 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -584,9 +584,13 @@ main(int argc, char *argv[]) } if ((be = libbe_init(root)) == NULL) { - if (!cmd->silent) + if (!cmd->silent) { fprintf(stderr, "libbe_init(\"%s\") failed.\n", root != NULL ? root : ""); + if (root == NULL) + fprintf(stderr, + "Try specifying ZFS root using -r.\n"); + } return (-1); } From nobody Fri Mar 31 15:46: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 4Pp4Qd17X9z42tpc; Fri, 31 Mar 2023 15:46:33 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pp4Qc6gbNz4GJl; Fri, 31 Mar 2023 15:46:32 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680277592; 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=PI4TFhcQ1/0G/EqxbAICY+2ANV6gli5NUhHmvCYj4VU=; b=Qqtxp0B6jKSzvqSML0YkIbvD1dkt9oof/cu075kTnbMslW0OzXw4rjpeqa2cXuR8oXbhJS QXu+2C1Xss1ddgrF22gKCe1hMPFeGbWy77EqhiNFsoT4oH4OFxV/PWka1HTtHLEAJ9YrFf QmOmSChVnoEu1bIAwjHtTFlFoOO24uDo8WxI6alonDQaRc76lKJFELFOUl6oLJZtQt1rYB zWcrXLEKnMw+oZMJFQ5bshqTcj7fOAAtfHDDTUveDc1GbgHgIvdGWe+4EnfONqh4U94fP3 kevaf23VgkzV+tBUth/jloypvT7LLQqkrJTt5I0zNjLHTfNk8wtfjwhQI47r8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680277592; 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=PI4TFhcQ1/0G/EqxbAICY+2ANV6gli5NUhHmvCYj4VU=; b=gO9gjjqTOIzXKB7GubTX5Qqt7aVhIMHxnGhtIfhBrePed2PneKRgmIjdw+skV2TUNJa/wK 3zGQbCS2Onbm07hH1DpBef2cmOVkMOMenv/Sw9L9tYvXBVqHPAy2CXLiBCVRPDbZ2dRfwE +hpuBqb9Lxb+HDdOLzxj7dvpFdcqsaMvoZZrk2NQ6RYAJzDRIHS6hC5zOSKxi2/fW4YbyJ Sfa0H456PXjmDP0W/uvgB/oHololkxaRsHWxCMf72rGZJSZX2YaUzV56ExhvECr7VU54Bu FXCkvbQr9IkZE71cgHNvZ9R1ga6mjAFgkFj5W+ehCQRqyYqPS+TxghwUPnyVNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680277592; a=rsa-sha256; cv=none; b=Opli5bXUEiJPllT70Q3uBDUpVL0j8U30kSQIHxZaz0Wt3NJ2bot3ujj/a4m640nxVqYoLa jSyUyhOMMy0FtrVJHoB5vxwdCW6raLGFdCzrnzU0zuCaWY7pH+ABmSUscKeemahWi3RTld 5sjguBULfCT/Ltj1fvQLi6mRLAYrRc1ChoxuJhvrAlu8IWAEkd8Kg8F/uMnPMV0o2cLVYR DzTUYGy4iYu92Lr0VXFcaCgOwQ+TLZvTwsdundKpsJWxa6uN5yPDqKq9cdJknhc6+e9xzt EfmvQszQy9Z/a7vVc9LwnO1qzv/br8EGE9lCyuqjCn4DUT7vMVWtWQrhIDL6Sw== Received: from smtpclient.apple (unknown [IPv6:2001:19f0:6001:9db:98f0:9fe0:3545:10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pp4QY6S62z16m2; Fri, 31 Mar 2023 15:46:29 +0000 (UTC) (envelope-from zlei@FreeBSD.org) 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 \(3696.120.41.1.2\)) Subject: Re: git: fcad8ada9afc - main - Revert "Add myself (cc) as a src commiter." From: Zhenlei Huang In-Reply-To: <202303311358.32VDwPUA083636@gitrepo.freebsd.org> Date: Fri, 31 Mar 2023 23:46:11 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202303311358.32VDwPUA083636@gitrepo.freebsd.org> To: Cheng Cui X-Mailer: Apple Mail (2.3696.120.41.1.2) X-ThisMailContainsUnwantedMimeParts: N Hi Cheng, Is there something wrong with 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0 ? Best regards, Zhenlei > On Mar 31, 2023, at 9:58 PM, Cheng Cui wrote: >=20 > The branch main has been updated by cc: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dfcad8ada9afcc60cec50880e3ac95768= 1badf55f >=20 > commit fcad8ada9afcc60cec50880e3ac957681badf55f > Author: Cheng Cui > AuthorDate: 2023-03-31 06:53:16 +0000 > Commit: Cheng Cui > CommitDate: 2023-03-31 09:58:14 +0000 >=20 > Revert "Add myself (cc) as a src commiter." >=20 > Summary: This reverts commit = 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0. >=20 > Reviewers: rscheff, tuexen > Subscribers: imp > Approved by: tuexen (mentor) > Differential Revision: https://reviews.freebsd.org/D39363 > --- > share/misc/committers-src.dot | 4 ---- > 1 file changed, 4 deletions(-) >=20 > diff --git a/share/misc/committers-src.dot = b/share/misc/committers-src.dot > index 76ab7441fd46..6e7b5b6c63b3 100644 > --- a/share/misc/committers-src.dot > +++ b/share/misc/committers-src.dot > @@ -41,7 +41,6 @@ bmah [label=3D"Bruce A. = Mah\nbmah@FreeBSD.org\n2002/01/29\n2009/09/13"] > bmilekic [label=3D"Bosko = Milekic\nbmilekic@FreeBSD.org\n2000/09/21\n2008/11/10"] > bushman [label=3D"Michael = Bushkov\nbushman@FreeBSD.org\n2007/03/10\n2010/04/29"] > carl [label=3D"Carl Delsey\ncarl@FreeBSD.org\n2013/01/14\n2014/03/06"] > -cc [label=3D"Cheng Cui\ncc@FreeBSD.org\n2023/02/15"] > ceri [label=3D"Ceri Davies\nceri@FreeBSD.org\n2006/11/07\n2012/03/07"] > cjc [label=3D"Crist J. = Clark\ncjc@FreeBSD.org\n2001/06/01\n2006/12/29"] > davidxu [label=3D"David = Xu\ndavidxu@FreeBSD.org\n2002/09/02\n2014/04/14"] > @@ -846,8 +845,6 @@ rrs -> bcran > rrs -> jchandra > rrs -> tuexen >=20 > -rscheff -> cc > - > rstone -> markj > rstone -> mjoras >=20 > @@ -923,7 +920,6 @@ thompsa -> eri > trasz -> jh > trasz -> mjg >=20 > -tuexen -> cc > tuexen -> rscheff >=20 > ume -> jinmei From nobody Fri Mar 31 15: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 4Pp4dr6tbCz42vmc; Fri, 31 Mar 2023 15: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 4Pp4dr60Nqz4HTh; Fri, 31 Mar 2023 15: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=1680278176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dwhrkLqHzzXU3En2KFPOVLCLGKnb8IhVAD18ruAX5+I=; b=YdTwZyG1XYGSUF+CY5oRNAofbwS82fgHQkh4mb8xT8bDWa1sUDT4U8OjjcaviY+I36fRnf OZqDjTFEXpATjvtKnvGCPa8ChC7nE9IsaS2h7M0kjjXbsoqXwQn/usGYNnDZygN0C/z3T8 2m+Y9v394vV1EFECtLIrRWIsyagyDMMrz0zeFlgsMTLq1JBQM+qz5SaNCIwI8N6hs9iJXc cftOzi3zvuctIved5dw7TST9YyyidurO4BzDiXtF05ya/SNtUYbmdGauIpp4Lcrzuq9hKH q04Ge9flKibkysw2y5VxY60p9gETV3UHu1+eb0hKuSI+EN6nZ+CdLtHsrbHtRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680278176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dwhrkLqHzzXU3En2KFPOVLCLGKnb8IhVAD18ruAX5+I=; b=qq1c8a6LWd039bTqFcUOE8DNQy9sYj9ckfOCmmkbfC/plwqAnf3gQuxtJnfZlD2pGLQnKv kxEOcM4e1gOZgdzAZhC2y3a2PJJeNbeXM4KvTjqdSrkV8NvWltIkgvprhx5cotVoIEfp0v iFMi0deNo8IZTsE7C0LO9TBGvYyMVg35yeLk3o9g0AUCbmbThX5poC4pTKIWd2k55oyuT4 hjzA8kWjjatN/Rm2Kg9cyU52/OUALYx7s7vu+DM/okiRFSUODxi/YdUfwppeiqwsuh/+VU yoVi3gTU5+rpp9C525PBvH/E4l9Vq3xYljo+JIz6elegqvZg6b+lL4jDzDVc/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680278176; a=rsa-sha256; cv=none; b=DTiQuWUp/7f1QlY1Nhp8U7j2Eq0xURxdsIXY3uPEOx3yo8PQ1lO3ZDpwbe1VxkPwOCvMA+ 9bzyw9HF6JLWmoEwqEZbWXEXPbzfV6kDxxsxzQw1BxF8tZnn8WLTSrjwKtOmVACdVPmrvh s0DAhbBWtZanRMKZZ8i6iRMeDiiRsmtEdk5mE1LzrR+4oT5qiwQ2zVnZlR1unv2A9uWnWU o5D3jTnz+LMG/aMnaUYdWi5XbEYdueOD/AgBblt7nIf4Mhgn6JpQUwdg4gPHOkIV4jtsFW uXuoOWMDnUZtaviA0N298rlSCSEdEDpriMHejTu8fw2gufLyXRQpVYcORMitGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp4dr544Gz10VT; Fri, 31 Mar 2023 15:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VFuGao080990; Fri, 31 Mar 2023 15:56:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VFuGQT080989; Fri, 31 Mar 2023 15:56:16 GMT (envelope-from git) Date: Fri, 31 Mar 2023 15:56:16 GMT Message-Id: <202303311556.32VFuGQT080989@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: 47ff149afaea - main - Move arm64 EENTRY uses before ENTRY List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 47ff149afaea6a403b8d044e26673bc3cd605fe4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=47ff149afaea6a403b8d044e26673bc3cd605fe4 commit 47ff149afaea6a403b8d044e26673bc3cd605fe4 Author: Andrew Turner AuthorDate: 2023-03-31 12:34:51 +0000 Commit: Andrew Turner CommitDate: 2023-03-31 15:45:31 +0000 Move arm64 EENTRY uses before ENTRY The ENTRY macro adds instructions to the start of a function but not EENTRY. To use these instructions in both functions move the EENTRY use before the ENTRY use. Sponsored by: Arm Ltd --- sys/arm64/arm64/memcpy.S | 4 ++-- sys/arm64/arm64/support.S | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/memcpy.S b/sys/arm64/arm64/memcpy.S index d5fbfa64e0fa..b394d6c1d30a 100644 --- a/sys/arm64/arm64/memcpy.S +++ b/sys/arm64/arm64/memcpy.S @@ -55,8 +55,8 @@ The loop tail is handled by always copying 64 bytes from the end. */ -ENTRY(memcpy) EENTRY(memmove) +ENTRY(memcpy) add srcend, src, count add dstend, dstin, count cmp count, 128 @@ -237,6 +237,6 @@ L(copy64_from_start): stp B_l, B_h, [dstin, 16] stp C_l, C_h, [dstin] ret -EEND(memmove) END(memcpy) +EEND(memmove) diff --git a/sys/arm64/arm64/support.S b/sys/arm64/arm64/support.S index 885af5676159..28ac1d553fbc 100644 --- a/sys/arm64/arm64/support.S +++ b/sys/arm64/arm64/support.S @@ -175,15 +175,15 @@ END(fueword32) * long fueword(volatile const void *, int64_t *) * int64_t fueword64(volatile const void *, int64_t *) */ -ENTRY(fueword) EENTRY(fueword64) +ENTRY(fueword) check_user_access 0, (VM_MAXUSER_ADDRESS-7), fsu_fault_nopcb fsudata ldtr, x0, 0 str x0, [x1] /* Save the data in kernel space */ mov x0, #0 /* Success */ ret /* Return */ -EEND(fueword64) END(fueword) +EEND(fueword64) /* * int subyte(volatile void *, int) @@ -218,14 +218,14 @@ END(suword32) /* * int suword(volatile void *, long) */ -ENTRY(suword) EENTRY(suword64) +ENTRY(suword) check_user_access 0, (VM_MAXUSER_ADDRESS-7), fsu_fault_nopcb fsudata sttr, x1, 0 mov x0, #0 /* Success */ ret /* Return */ -EEND(suword64) END(suword) +EEND(suword64) ENTRY(setjmp) /* Store the stack pointer */ From nobody Fri Mar 31 15:57: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 4Pp4gk5nv6z42vhq; Fri, 31 Mar 2023 15:57: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 4Pp4gk5FV3z4HsR; Fri, 31 Mar 2023 15:57:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680278274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7mQALmmkOSbiMZ/eeWb9DB24GSPApDFribXP2O/22o=; b=KA1pN2/TkSG35oXOw0T8efl7C/NoN2zUDeHONL8vltroByn1l9tjOaJaBnBcS5u0RoR4eK miwgq4CPZHbEtPJSunrMmETZkezmRABQc9I0S/Hl8iYQW7jpDJn2t4Ehqh33XacdqVd58U tEaaq37vhnygdWoUmUiNb+tAwAuGg3Sw466BVq4BLGG9IEZQZAe4wtWmxmAqIInc+E0cJJ /fzXjhUC3lPtlXZ2rMocxu1yirNkw67ysDD+AwSUhu7Jim7UMOOmfr9xWtXjTmBbhc3MKX d+Gd7MTWbys+ouHTyuqMg3N2JotEWlAeq60fD2FTrWwYcWDnkrGLukORxbL2bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680278274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7mQALmmkOSbiMZ/eeWb9DB24GSPApDFribXP2O/22o=; b=p8Ae0tRZk+XYmLeQwjSWCW3ndz93pDY1mLJHkOi7hzIVLvw8njox9x5/LKrlFm2/Ye9zsH qp4a79pY4zenV4uaxSGrxOpvlAh/N2v+4IVXc8A7S3PPqz7RLXfFCDvbTT8z6eT4G/l9f5 2sSN+OoliKHakBNIAe/IKIRrs8zIH405SRh6XwC6CCNX8+IbAF0vFonq7/dtPCwT/5pmPd Hn6lH20gYvIjjMvhnz2xlseB0geC5bV/faJtVjeV9rMvqwNWjbA6NYZP+aQt5YT9C5D7MT kTztv5mBKSKkNRywEwzerLt9r09a68KPL7O4DHLcocViLRa5jdd1l9xJ1i4L5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680278274; a=rsa-sha256; cv=none; b=uKXZ1uIyq0e185PtBVOj342EdJqftpgCLtXhsOlsPss1EyUJTcK0Jc3sEyFJw0LTyxUUNg Y7TRfuOtZOdCvBf+rSR+zjBbJckQtcK2nTFn+/mI+Rrraqt3M1x63RTiPws8uWz7uxIQxv U8Wck161ubi6eiBdZ2HUATvo+JViAGSZBdJ+bBw1zhPLjRpS681eEsdTuPztFbSmgS36Ox 2pCOahzcQyG6TB2y7nyoF1PDEPB1UvhAc5u8tA/eQf3DSORfw6TrRz3JiHkiSBPQQ7UDJb 3Hng9G+xqgGwG5BUzermUAMxjkqcUwlksED//7+WCeHVb+WZXLuBXOXvmzRLdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp4gk4KTsz10Hq; Fri, 31 Mar 2023 15:57:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VFvsHP081272; Fri, 31 Mar 2023 15:57:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VFvsJk081271; Fri, 31 Mar 2023 15:57:54 GMT (envelope-from git) Date: Fri, 31 Mar 2023 15:57:54 GMT Message-Id: <202303311557.32VFvsJk081271@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: 1a3cb489e5aa - main - arm64: Move the initial kernel stack out of the init_pagetables section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 1a3cb489e5aac260eb9f48567dd6c086d62a8ea7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1a3cb489e5aac260eb9f48567dd6c086d62a8ea7 commit 1a3cb489e5aac260eb9f48567dd6c086d62a8ea7 Author: Mark Johnston AuthorDate: 2023-03-31 15:04:37 +0000 Commit: Mark Johnston CommitDate: 2023-03-31 15:57:26 +0000 arm64: Move the initial kernel stack out of the init_pagetables section init_pagetables is mapped into the segment containing the BSS, but does not get zeroed by locore. It is used for bootstrap page table pages. It happens that the bootstrap kernel stack is also placed in that section, but there's no reason it shouldn't live in the BSS, so move it there. No functional change intended. Reviewed by: andrew MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks Differential Revision: https://reviews.freebsd.org/D39367 --- sys/arm64/arm64/locore.S | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index a73941a01492..e17f897baeab 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -877,6 +877,12 @@ ENTRY(abort) b abort END(abort) +.bss + .align PAGE_SHIFT +initstack: + .space (PAGE_SIZE * KSTACK_PAGES) +initstack_end: + .section .init_pagetable, "aw", %nobits .align PAGE_SHIFT /* @@ -907,18 +913,11 @@ pagetable_l0_ttbr0_boostrap: .space PAGE_SIZE pagetable_l0_ttbr0: .space PAGE_SIZE - pagetable_end: el2_pagetable: .space PAGE_SIZE - .align 4 -initstack: - .space (PAGE_SIZE * KSTACK_PAGES) -initstack_end: - - .text EENTRY(aarch32_sigcode) .word 0xe1a0000d // mov r0, sp From nobody Fri Mar 31 16:00: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 4Pp4l466Wpz42w8l for ; Fri, 31 Mar 2023 16:00:48 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 4Pp4l448qCz4JXh for ; Fri, 31 Mar 2023 16:00:48 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f41.google.com with SMTP id v6-20020a05600c470600b003f034269c96so3977965wmo.4 for ; Fri, 31 Mar 2023 09:00:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680278446; 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=zFsD5Rm1Mak3T76TBymx2pTUixkIolXZIfn082AOti8=; b=c/BsOnXUxISP6mpVyThmtEvUvbFIqBQZYuIIJoTR+CWZvwW/WLE4h1iqsf97EeD4th 8Qf7rTHjxU4EeEpeidqL8u0P/O6ldUF7BM49cbxxCVhxcP8Pqn7+ms2rDxugTwnXFHyO sxVxoBTsXNJb93Ejx1UNW1aumrT4wJffljqZYeU9LqIbsKWhNCy4GkF10hugK/Zuo97K 4iBy/WeeKSCyrqOKOb+/IRfrnfV/nQ6RIVDilHXSEEjiTU8XgPUlHsE4/uaP2cabOvR9 BZpu3SvyKLkFhWIPPGjzBSbDkM8V5vvyMslxOBg5mGL2W7iOyaoBquC3MUty0isOvoAX Z/Kg== X-Gm-Message-State: AO0yUKWuBCDysPsyMi9XF+na5+3EF21IUP5LjGAAK9/aVsUiaeXihzVY FSETCuMz7hWSAI4bNv+S74pfSQ== X-Google-Smtp-Source: AK7set9WijhMWDG+gLx6UrmNDva9L5b7lX+qwgR6Ur3fs8tHKujXzwShkKEtSGvVtsXWg1+zSal6jg== X-Received: by 2002:a1c:790b:0:b0:3ee:7022:5eda with SMTP id l11-20020a1c790b000000b003ee70225edamr20795577wme.7.1680278446599; Fri, 31 Mar 2023 09:00:46 -0700 (PDT) Received: from smtpclient.apple (global-5-144.n-2.net.cam.ac.uk. [131.111.5.144]) by smtp.gmail.com with ESMTPSA id 3-20020a05600c228300b003ed2384566fsm3100702wmf.21.2023.03.31.09.00.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2023 09:00:46 -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 \(3696.120.41.1.1\)) Subject: Re: git: 47ff149afaea - main - Move arm64 EENTRY uses before ENTRY From: Jessica Clarke In-Reply-To: <202303311556.32VFuGQT080989@gitrepo.freebsd.org> Date: Fri, 31 Mar 2023 17:00:45 +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: <1D6F1E29-6EA8-4ABA-BA63-A9D91B1C8A0A@freebsd.org> References: <202303311556.32VFuGQT080989@gitrepo.freebsd.org> To: Andrew Turner X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Rspamd-Queue-Id: 4Pp4l448qCz4JXh X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 31 Mar 2023, at 16:56, Andrew Turner wrote: >=20 > The branch main has been updated by andrew: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D47ff149afaea6a403b8d044e26673bc3= cd605fe4 >=20 > commit 47ff149afaea6a403b8d044e26673bc3cd605fe4 > Author: Andrew Turner > AuthorDate: 2023-03-31 12:34:51 +0000 > Commit: Andrew Turner > CommitDate: 2023-03-31 15:45:31 +0000 >=20 > Move arm64 EENTRY uses before ENTRY >=20 > The ENTRY macro adds instructions to the start of a function but = not > EENTRY. To use these instructions in both functions move the EENTRY > use before the ENTRY use. This doesn=E2=80=99t work. ENTRY is what has the .text and .align 2, so = this could have the EENTRY symbols be unaligned or in the wrong section. In this specific case it happens to work, but in general this is broken and so your original problem needs fixing another way. Or I guess you could make both ENTRY and EENTRY include the .text and .align 2 (but on other architectures with variable-length instructions, or even on arm64 were you to ever want to over-align functions, this would still be insufficient). Jess > Sponsored by: Arm Ltd > --- > sys/arm64/arm64/memcpy.S | 4 ++-- > sys/arm64/arm64/support.S | 8 ++++---- > 2 files changed, 6 insertions(+), 6 deletions(-) >=20 > diff --git a/sys/arm64/arm64/memcpy.S b/sys/arm64/arm64/memcpy.S > index d5fbfa64e0fa..b394d6c1d30a 100644 > --- a/sys/arm64/arm64/memcpy.S > +++ b/sys/arm64/arm64/memcpy.S > @@ -55,8 +55,8 @@ > The loop tail is handled by always copying 64 bytes from the end. > */ >=20 > -ENTRY(memcpy) > EENTRY(memmove) > +ENTRY(memcpy) > add srcend, src, count > add dstend, dstin, count > cmp count, 128 > @@ -237,6 +237,6 @@ L(copy64_from_start): > stp B_l, B_h, [dstin, 16] > stp C_l, C_h, [dstin] > ret > -EEND(memmove) > END(memcpy) > +EEND(memmove) >=20 > diff --git a/sys/arm64/arm64/support.S b/sys/arm64/arm64/support.S > index 885af5676159..28ac1d553fbc 100644 > --- a/sys/arm64/arm64/support.S > +++ b/sys/arm64/arm64/support.S > @@ -175,15 +175,15 @@ END(fueword32) > * long fueword(volatile const void *, int64_t *) > * int64_t fueword64(volatile const void *, int64_t *) > */ > -ENTRY(fueword) > EENTRY(fueword64) > +ENTRY(fueword) > check_user_access 0, (VM_MAXUSER_ADDRESS-7), fsu_fault_nopcb > fsudata ldtr, x0, 0 > str x0, [x1] /* Save the data in kernel space = */ > mov x0, #0 /* Success */ > ret /* Return */ > -EEND(fueword64) > END(fueword) > +EEND(fueword64) >=20 > /* > * int subyte(volatile void *, int) > @@ -218,14 +218,14 @@ END(suword32) > /* > * int suword(volatile void *, long) > */ > -ENTRY(suword) > EENTRY(suword64) > +ENTRY(suword) > check_user_access 0, (VM_MAXUSER_ADDRESS-7), fsu_fault_nopcb > fsudata sttr, x1, 0 > mov x0, #0 /* Success */ > ret /* Return */ > -EEND(suword64) > END(suword) > +EEND(suword64) >=20 > ENTRY(setjmp) > /* Store the stack pointer */ From nobody Fri Mar 31 16:27: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 4Pp5L80j21z42xqf; Fri, 31 Mar 2023 16:27: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 4Pp5L80FJvz4MPv; Fri, 31 Mar 2023 16:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680280064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zJiKs1hq90YrnAzGYvjT3t87GHWZbFGOLZOWfvMoMdA=; b=UEw3zaLmTbCVCfXbTeTKtyytJ2zara8M9N4Xgr5VQIkB+VlYbdctJdbEAOhpGwnTnULi+B qTtB197USPbcWd96Qfk5JUoEd7YnWpRCo5NnHc6wrBYAHbYvIihRF5wg/DNyVkynrG6ARm Ecvl4dxaNYyQkHoEL/JbMTAufD6RCfSWnqvdJ+JwECu37hBkubIzEn4fABorvoUY1WzlDH cSjDc5uLs3chSZrbjOHBriw9ZgDYqBr5AIF56RULJT3TfjE08KdIoyuF3g1Y1toipffype pFX2OT5M2f+OImkO+UsAvqMPQU3pTWIm/2zjt0FeeCl+04BlKHkZix60nAP3jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680280064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zJiKs1hq90YrnAzGYvjT3t87GHWZbFGOLZOWfvMoMdA=; b=dwf73E63g3lzJ2bpGswLqOBmKyG6nUB3DCNRl7xIC2YZmJSVK5xWvw5AdmVyj/OZf6PE7r v9hGLALmXpczEMASae84nLmozwWFuaPklBddI+ijlHm4y6SYclyHvSavcibDZoYxZpJZH6 y46nrs4sAZQPIoznCDqsgQ1sypqXUHualudAwVyRAF/21ZqJCkBPbKF+/wZKtduSybd5kb CDcChhVrPf1gwhpEcM3/mcB8lwbvpAgSJ0PKXCJgjJ9hWAvDGydTek0kdtabECFDuUhZ5z iko49vVNDjFqrG02+Kk5ISN0dsC6FP60kZb8oVoLu8fmGLKPRuv/9FSvM1Q8kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680280064; a=rsa-sha256; cv=none; b=x4w+suywa2tmFy17WjR8LUnFHi6XUnNtWjBPC4qv4n9wEScnvg4EHE3HWAcHF5Zl+j6vvX 9Oh/hpAcRfvFXqj4x2Z/KzaeYTCtYvHt468wU8zODIhcHRImpsZwqQo/45WSRYkMAfUQo5 nSLmPy0XpHphlMk1mljSHsxFseXmYSQcU1o8ftZOCpq4G7uwr+rkboMMCiBRGufAQDVHRp LMX4lOKbVegmYcZiCgVmTNfGgDAkFuIgXyc/VaESmdM3orllbyJ4wWLbJWFTSF0fg1IGT/ 5hzAEQjfgaqJuaiv0//Jkh66FFpWFqys+gMadiKGidrjwrjFMI8xzqsGU068gQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp5L76Ndlz117h; Fri, 31 Mar 2023 16:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VGRhto030651; Fri, 31 Mar 2023 16:27:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VGRhXj030650; Fri, 31 Mar 2023 16:27:43 GMT (envelope-from git) Date: Fri, 31 Mar 2023 16:27:43 GMT Message-Id: <202303311627.32VGRhXj030650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 3462c371c256 - main - arm64/gicv3: correct the size of the distributor resource List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3462c371c2562a8144f4245f9967df99874e505f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3462c371c2562a8144f4245f9967df99874e505f commit 3462c371c2562a8144f4245f9967df99874e505f Author: Mitchell Horne AuthorDate: 2023-03-31 15:32:39 +0000 Commit: Mitchell Horne CommitDate: 2023-03-31 16:26:22 +0000 arm64/gicv3: correct the size of the distributor resource Use the GICD_SIZE macro (0x10000), which is half the size of the current fixed-sized mapping (128 * 1024 == 0x20000). In ARM64 Hyper-V instances, it seems the Distributor's registers are located immediately preceding a range of physical memory in the bus address space. Thus, when ram0 is attaching and attempts to reserve SYS_RES_MEMORY resources corresponding to its physmem ranges, it fails, because the first 0x10000 bytes of this range are already owned by gic0. PR: 270415 Reported by: whu Tested by: whu Differential Revision: https://reviews.freebsd.org/D39260 --- sys/arm64/arm64/gic_v3_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c index 090c61429441..9c4e02c15706 100644 --- a/sys/arm64/arm64/gic_v3_acpi.c +++ b/sys/arm64/arm64/gic_v3_acpi.c @@ -215,7 +215,7 @@ gic_v3_acpi_identify(driver_t *driver, device_t parent) /* Add the MADT data */ BUS_SET_RESOURCE(parent, dev, SYS_RES_MEMORY, 0, - madt_data.dist->BaseAddress, 128 * 1024); + madt_data.dist->BaseAddress, GICD_SIZE); madt_data.dev = dev; madt_data.rdist_use_gicc = false; From nobody Fri Mar 31 16:38: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 4Pp5Zy6Rgmz42yR5; Fri, 31 Mar 2023 16:38:50 +0000 (UTC) (envelope-from vishwin@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 4Pp5Zy5wcdz4NF5; Fri, 31 Mar 2023 16:38:50 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680280730; 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=vtzmpGGeeJR5d+PkylZ/sNU6+hmVONfO6sCEznvxPWg=; b=BZWBeRJP0/yfJ8cU/I6xTegZ34FLctppoXQ6VuyYW5QuhgQpb8MJ6f/qVaBQ9/Pw4DvCda z0/3EDPZ+WzWA6Ju/GZZLfFuSHaQbXFlO98AiU1CXSU0SDnvs7cAVzKHLwWRU2ooaTqV4v KYh0DQ1Ls3TJgYIPRr/kw4ogaTDonn+dXIhfyAmkOy+geiF+Vss+4qsHCYq8o9MHnRaYVE +HK8aAZHP1w9sJacNWEOyJjZkkpW0VDF/KgREaA105xjwj5Ek4LJ6aFQwxlD7qS6p3d8Ap jXVkrdyRZM4M18oq7+6FgWHbPmrZds5Zmy/r3WEA9fzJu9hnt78L+mU+H+tElw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680280730; 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=vtzmpGGeeJR5d+PkylZ/sNU6+hmVONfO6sCEznvxPWg=; b=G143KKxJpGO1Oan8G+qF3y+SiyAOI/HMHqQDLNhqaI5K/8dYOsstb2wmK1EKwRh959KPag L6Gb0HjQZWQEVZ3U8DSiGExJnNSjLPAwMhTP1ruKX8Z8tzftMVHgXghK3XbB2DPxlNCY28 3UWchqEk5G6pT5fDUqTFC9SMwyx6EbKfN3I17YxPH/TdFzuiq0LFFa5rc7hFOFbGIkkeeP xrNavzPMzqm1f18Ny/AOAx9Idu/LoUJ21nK03j5E8VhIy2FQlOTWtBPPpLc3a02X6mQQZq gQitU1trzDcS6zgq+y6xlaTkRgFtSlodG8d5KR1EgWcNpALV9OM8n1sfAI4P4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680280730; a=rsa-sha256; cv=none; b=HPbIafKVGh6H8QTiC3QsvQwMaUTvo4img+CfG9Gt843aG+rtyc7PGY/O50S16BkUvVpjNq 0efqNqtDQZPVHzxeEs1cKSDQp27foxMTeF2RMBRxRWqqtNJLKbNegf8TMKwgfdZftpY+CV Qyvk/eZ3n4HikAgV0aRZa7hN7w7szAqzGox8ESCpozlYHFq/9C6PbCRV/9CmYdeqOzM0vX RNp7JPwEjHoe/pCKskqEYPAgXpp8KnH0FCploPQ6BY/X8x+oATYZFARa8kvj5ZUYRWYQqX tONsEbI2VYpl3QeK15w2V48w5DLFvHqaHmJTMi15YkcHC5HrrESwqnV2qKl43w== Received: from [IPV6:2601:98a:602:da0:1fa8:be6c:38d1:bd] (unknown [IPv6:2601:98a:602:da0:1fa8:be6c:38d1:bd]) (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: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pp5Zy35HRz17hw; Fri, 31 Mar 2023 16:38:50 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: Date: Fri, 31 Mar 2023 12:38:47 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: 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.9.1 To: Konstantin Belousov , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202303272339.32RNdWPD063667@gitrepo.freebsd.org> Content-Language: en-GB From: Charlie Li Organization: FreeBSD Project Cc: "freebsd-x11@freebsd.org" , FreeBSD Current Subject: Re: git: 61194e9852e6 - main - Add kqueue1() syscall In-Reply-To: <202303272339.32RNdWPD063667@gitrepo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------ZMDb4rFfEn9S5XEg62katY2m" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------ZMDb4rFfEn9S5XEg62katY2m Content-Type: multipart/mixed; boundary="------------XRCoa2njIvhPHKEa980uSpLt"; protected-headers="v1" From: Charlie Li To: Konstantin Belousov , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: "freebsd-x11@freebsd.org" , FreeBSD Current Message-ID: Subject: Re: git: 61194e9852e6 - main - Add kqueue1() syscall References: <202303272339.32RNdWPD063667@gitrepo.freebsd.org> In-Reply-To: <202303272339.32RNdWPD063667@gitrepo.freebsd.org> --------------XRCoa2njIvhPHKEa980uSpLt Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 S29uc3RhbnRpbiBCZWxvdXNvdiB3cm90ZToNCj4gVGhlIGJyYW5jaCBtYWluIGhhcyBiZWVu IHVwZGF0ZWQgYnkga2liOg0KPiANCj4gVVJMOiBodHRwczovL2NnaXQuRnJlZUJTRC5vcmcv c3JjL2NvbW1pdC8/aWQ9NjExOTRlOTg1MmU2NDFkMTUzM2NkMDRhNTY3OWQ2MDQyZmY5NzVk Mw0KPiANCj4gY29tbWl0IDYxMTk0ZTk4NTJlNjQxZDE1MzNjZDA0YTU2NzlkNjA0MmZmOTc1 ZDMNCj4gQXV0aG9yOiAgICAgS29uc3RhbnRpbiBCZWxvdXNvdiA8a2liQEZyZWVCU0Qub3Jn Pg0KPiBBdXRob3JEYXRlOiAyMDIzLTAzLTI1IDIzOjM5OjAyICswMDAwDQo+IENvbW1pdDog ICAgIEtvbnN0YW50aW4gQmVsb3Vzb3YgPGtpYkBGcmVlQlNELm9yZz4NCj4gQ29tbWl0RGF0 ZTogMjAyMy0wMy0yNyAyMzozOToyNiArMDAwMA0KPiANCj4gICAgICBBZGQga3F1ZXVlMSgp IHN5c2NhbGwNCj4gICAgICANCj4gICAgICBJdCB0YWtlcyB0aGUgZmxhZ3MgYXJndW1lbnQu ICBJbW1lZGlhdGUgdXNlIGlzIHRvIHByb3ZpZGUgdGhlIEtRVUVVRV9DTE9FWEVDDQo+ICAg ICAgZmxhZyBmb3Iga3F1ZXVlKDIpLg0KPiAgICAgIA0KVGhpcyBjb21taXQgc2VyaWVzIGNh dXNlcyB4MTEvbGliaW5wdXQgdG8gaGl0IGFuIGFzc2VydCAod2hpY2ggYWxzbyANCnNpbGVu dGx5IGNyYXNoZXMgWCBvbiBsYXVuY2gpOg0KPiBBc3NlcnRpb24gZmFpbGVkOiAobGliaW5w dXQtPnJlZmNvdW50ID4gMCksIGZ1bmN0aW9uIGxpYmlucHV0X3VucmVmLCBmaWxlIC4uL3Ny Yy9saWJpbnB1dC5jLCBsaW5lIDE5NTcuIA0KDQpkZXZlbC9saWJlcG9sbC1zaGltLCB4MTEv bGliaW5wdXQncyBwcmltZSBkZXBlbmRlbmN5LCBoYXMgaXRzIG93biANCmtxdWV1ZTEoKSBp bXBsZW1lbnRhdGlvbiwgd2hpY2ggaXMgdXNlZCB3aGVuIHRoZSBzeXN0ZW0gZG9lcyBub3Qg YWxyZWFkeSANCmhhdmUgb25lLiBSZXZlcnRpbmcgdGhpcyBzZXJpZXMgYW5kIHJlYnVpbGRp bmcgZGV2ZWwvbGliZXBvbGwtc2hpbSB0byANCnVzZSBpdHMgaW5jbHVkZWQgaW1wbGVtZW50 YXRpb24gYWxsb3dzIHgxMS9saWJpbnB1dCB0byB3b3JrIGFnYWluLg0KDQotLSANCkNoYXJs aWUgTGkNCuKApm5vcGUsIHN0aWxsIGRvbid0IGhhdmUgYW4gZXhpdCBsaW5lLg0KDQo= --------------XRCoa2njIvhPHKEa980uSpLt-- --------------ZMDb4rFfEn9S5XEg62katY2m Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEJXd5utNNhpeHcBMx/reFK+KbPocFAmQnDJgFAwAAAAAACgkQ/reFK+KbPoeG YQ/7BsJ4lI3a4VVjs9edsQ1gKd9mS5vbxljUSAW5gVKzxQSa5kVBEmJxSNFTbyFht5idxQmABxXY IFe4EXNOjhZhVOVJwNigm+rjp3OB5IOYBU0s7EmWQ4CAUAJV0GBquXJeGECSXfPORq7Eo3YqDo3b /Znut1Kbu12fC2Ea9EKYw0Lf0O/io9ztjjfw+L2+dsiK3ewdJnzLywJGH3Ld12bZYktc+rX5N7Ym /6CybQYDy2UyCyRX5WeeKD9b185rMkynFzEXICaB1Kpg+3Zf8uPraklGZN1XfPHpz8HcNyIyQKby r62acXsKCWnupbUCuMY6tNvD+KAz7IosWQYl9OTaEgnAdGWksCDidUmFoAEoDOWUoVsQQV08ZsDB 5JMWYYNP9PoM1p0k2PqzRoXMZ2jGQOKtVEXB5dwmEVhXb8YcC1EcKVX2W5gROiRi9IeYxQqaRgYf 88tZ8nXe7vRNr786JgmcSeozXLk3CbRLrYCTCGXD+IOL5UcykJwlKmAOzOn8Qq/TkJx4/LFUnTTD b5TgCxKDaRAeBqWiwM47WeUGKbgoD3LxpKiKrmH13sWPC5Lp3qco1TUVJkpmrvXz06ZAqmAvuHzl mezGMLRXyogGPF00SjO55sAXLt0xm0JV/fF8Vwm9g53n+ODBTD6TmghBYo+YpS0OAZWwo7uq9RAB SWs= =22OT -----END PGP SIGNATURE----- --------------ZMDb4rFfEn9S5XEg62katY2m-- From nobody Fri Mar 31 17:27: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 4Pp6gt4R7Xz432KC; Fri, 31 Mar 2023 17:28:10 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 4Pp6gt2hnhz4SVS; Fri, 31 Mar 2023 17:28:10 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f50.google.com with SMTP id g19so16743983lfr.9; Fri, 31 Mar 2023 10:28:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680283688; 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=M4qMo8N3etndLGBuwEuOuvJccmcRQK6f8yK/yI3kXwI=; b=bmG9MvFpP9m5O/bzGNjrSVygN1jaN8dpUocf0XYZaf1kAQ/OdxtuBHQGn8tVrPoZ8e lBwlBu6EI7joCzvEJ2juhK313q5tHsVkQ7OZWZ6Z13//JEBhpc4Tksx8Av144wNTk5jX gZZBV9qvh2BqoFm3TyVHZ2isduV6cREVMU20JCu920QL+ksB+BPcg/+yZ94KHlhFqthV zNRLe+b4rkB+neeLgcmxc3pMxKC433haXtuc/9IjO0oxzqdj4UBIz9AJuYukqKz4XxVP 6aLNU+N1ztt7HMyVBdvTq/laV/qjxmyv9pZY9NfJU9VN3UNZyw2VZorlRwb01UAlHhl0 z/hA== X-Gm-Message-State: AAQBX9eNmrwgoH62q2Y0gpmAVU4Na6iTKsRQSo4m8tVtxdXqpvAGfYn1 XX9ktlF8d/L465CG7L7GWdtfqvKmxKm3mlEUf1fdKZGRpv8= X-Google-Smtp-Source: AKy350bol5zOO/f/n+0FujtCvHVpJ/AAbHgxMdVNs9xyArVJALcn4uISQdGLS1vQVxEJIEEmUZhA5uSfyjkmsmE0jWI= X-Received: by 2002:ac2:4844:0:b0:4db:1ae1:318b with SMTP id 4-20020ac24844000000b004db1ae1318bmr8255015lfy.5.1680283687606; Fri, 31 Mar 2023 10:28:07 -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: <202303272339.32RNdWPD063667@gitrepo.freebsd.org> In-Reply-To: From: Ed Maste Date: Fri, 31 Mar 2023 13:27:54 -0400 Message-ID: Subject: Re: git: 61194e9852e6 - main - Add kqueue1() syscall To: Charlie Li Cc: Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, "freebsd-x11@freebsd.org" , FreeBSD Current Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Pp6gt2hnhz4SVS X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Fri, 31 Mar 2023 at 12:38, Charlie Li wrote: > > Konstantin Belousov wrote: > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=61194e9852e641d1533cd04a5679d6042ff975d3 > > > > commit 61194e9852e641d1533cd04a5679d6042ff975d3 > > Author: Konstantin Belousov > > AuthorDate: 2023-03-25 23:39:02 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2023-03-27 23:39:26 +0000 > > > > Add kqueue1() syscall > > > > It takes the flags argument. Immediate use is to provide the KQUEUE_CLOEXEC > > flag for kqueue(2). > > > This commit series causes x11/libinput to hit an assert (which also > silently crashes X on launch): > > Assertion failed: (libinput->refcount > 0), function libinput_unref, file ../src/libinput.c, line 1957. > > devel/libepoll-shim, x11/libinput's prime dependency, has its own > kqueue1() implementation, which is used when the system does not already > have one. Reverting this series and rebuilding devel/libepoll-shim to > use its included implementation allows x11/libinput to work again. Ah, NetBSD added kqueue1 some time ago, and it uses the already existing flags (O_CLOEXEC etc.) If it's easy to test, can you try changing libepoll-shim to call kqueue1(KQUEUE_CLOEXEC)? From nobody Fri Mar 31 17:51: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 4Pp7CG6kMbz433Gx; Fri, 31 Mar 2023 17:51: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 4Pp7CG6H7rz4XRX; Fri, 31 Mar 2023 17:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680285114; h=from:from:reply-to:subject:subject: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/pLhSJ/Nqt4DKCwR2kh8aCiqjh1qlQ4T+9FH8/5nfc=; b=tVllWJcP6QWRYqJ7/inBB9lErSomc6xUPfvQ2oXqUCsTNx0CMfPR33eCsVj6Ng5kkHMbAS ZjzFKcPLBrotnM7K8qRgZYOVHpwHf2MAwflDNZsxIWAvNvCYoWkAshPe7CWY6kUNi5nMMV +GOWvjr/41/ZxpN1NGq3hBk1NU5VmfCuVH6Af2SS7xOKi8GW6ezPeSNKBrF+5zsezsGaVq kwHShWV6e1BEKcDgTxBRWP1GwAcSGjwqyYOTm//m6kMynfHlOfAF1uaeK/Y6FYpAH3U9YP O7bzjHbcrghHtt2GJJuwlfCltMk8edSkth5+VUDpwm+aWwWf9HEOTJ9QkARFwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680285114; h=from:from:reply-to:subject:subject: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/pLhSJ/Nqt4DKCwR2kh8aCiqjh1qlQ4T+9FH8/5nfc=; b=QL+oXGawLwk9VplpeniCQLEGbs2ppl+UHGJ0H/b3QMXARSFdtJpF/+hBcM/ExWPf0QNgCz C7L92ppcHmqGaR/P2ANJ820MNBp2v0tyrXpePUfKYF67+2fNIY5+5Wr5pOpH91CW7k637f fMoaMaMU8CGfe9vRVtym8n62AEcOP98hq1jgzHQSlYxiz7DhUdsYptt3en4eN5LjC6kTMX REX02XGOgPYpPrbrf7zawYrN6rbph3hAtSjFyZeSdMkvoQCajefBzTImUpil4uxkRWb9mn DqUZ6LX20+vHBUGDX0NQkAALkV59B5J6a9GUQ91QxZ7jY0SPhQB4RAsAIfvIWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680285114; a=rsa-sha256; cv=none; b=Ff6rJnUwYCeV6E/JNF26ixejmfGKmEEEjdhLKpLj3fTL1Z8xT62/5zpU7mHTaxIswIigYY OUcIwFcxm4ZCdHxhgpRjIcHF7uvMfAxDrkyzy4jjvLpuTQ1jBjQSZyJWeRhRhenmoF0yl/ a00j1E+rxfdCyOcBECsAXHqmwEj4Soy27eo7ZTukeY9tuVEzaN39MGvfXPYkr0Bc7KSSwJ vwhL3PzqnqoxmabOJi73aDdZUfkBc+zTmC1V1trG4hcATP0sN9CBGYSpX4HtLkP+29SOI/ t+tZW5IjcuP5pFekIZ+xluZfgPTYSVLrJTHBUrMDOmjFIwVfsUcgiYIn2kgsFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp7CG5LnBz13QG; Fri, 31 Mar 2023 17:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VHps0d073973; Fri, 31 Mar 2023 17:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VHpsGN073972; Fri, 31 Mar 2023 17:51:54 GMT (envelope-from git) Date: Fri, 31 Mar 2023 17:51:54 GMT Message-Id: <202303311751.32VHpsGN073972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 5a8abd0a298e - main - lacp: Use C99 bool for boolean return value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a8abd0a298e6e7a8bf938a7eb171b647b1860cd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5a8abd0a298e6e7a8bf938a7eb171b647b1860cd commit 5a8abd0a298e6e7a8bf938a7eb171b647b1860cd Author: Zhenlei Huang AuthorDate: 2023-03-31 17:48:36 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-31 17:48:36 +0000 lacp: Use C99 bool for boolean return value This improves readability. No functional change intended. MFC after: 1 week --- sys/net/ieee8023ad_lacp.c | 38 +++++++++++++++++--------------------- sys/net/ieee8023ad_lacp.h | 15 ++++++--------- sys/net/if_lagg.c | 2 +- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index 78345aae68e5..52b4b478bbc7 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -117,9 +117,9 @@ static void lacp_fill_aggregator_id(struct lacp_aggregator *, const struct lacp_port *); static void lacp_fill_aggregator_id_peer(struct lacp_peerinfo *, const struct lacp_peerinfo *); -static int lacp_aggregator_is_compatible(const struct lacp_aggregator *, +static bool lacp_aggregator_is_compatible(const struct lacp_aggregator *, const struct lacp_port *); -static int lacp_peerinfo_is_compatible(const struct lacp_peerinfo *, +static bool lacp_peerinfo_is_compatible(const struct lacp_peerinfo *, const struct lacp_peerinfo *); static struct lacp_aggregator *lacp_aggregator_get(struct lacp_softc *, @@ -1365,44 +1365,40 @@ lacp_fill_aggregator_id_peer(struct lacp_peerinfo *lpi_aggr, * lacp_aggregator_is_compatible: check if a port can join to an aggregator. */ -static int +static bool lacp_aggregator_is_compatible(const struct lacp_aggregator *la, const struct lacp_port *lp) { if (!(lp->lp_state & LACP_STATE_AGGREGATION) || !(lp->lp_partner.lip_state & LACP_STATE_AGGREGATION)) { - return (0); + return (false); } - if (!(la->la_actor.lip_state & LACP_STATE_AGGREGATION)) { - return (0); - } + if (!(la->la_actor.lip_state & LACP_STATE_AGGREGATION)) + return (false); - if (!lacp_peerinfo_is_compatible(&la->la_partner, &lp->lp_partner)) { - return (0); - } + if (!lacp_peerinfo_is_compatible(&la->la_partner, &lp->lp_partner)) + return (false); - if (!lacp_peerinfo_is_compatible(&la->la_actor, &lp->lp_actor)) { - return (0); - } + if (!lacp_peerinfo_is_compatible(&la->la_actor, &lp->lp_actor)) + return (false); - return (1); + return (true); } -static int +static bool lacp_peerinfo_is_compatible(const struct lacp_peerinfo *a, const struct lacp_peerinfo *b) { if (memcmp(&a->lip_systemid, &b->lip_systemid, - sizeof(a->lip_systemid))) { - return (0); + sizeof(a->lip_systemid)) != 0) { + return (false); } - if (memcmp(&a->lip_key, &b->lip_key, sizeof(a->lip_key))) { - return (0); - } + if (memcmp(&a->lip_key, &b->lip_key, sizeof(a->lip_key)) != 0) + return (false); - return (1); + return (true); } static void diff --git a/sys/net/ieee8023ad_lacp.h b/sys/net/ieee8023ad_lacp.h index 0610ed855d50..629bdc25cfc5 100644 --- a/sys/net/ieee8023ad_lacp.h +++ b/sys/net/ieee8023ad_lacp.h @@ -307,7 +307,7 @@ void lacp_linkstate(struct lagg_port *); void lacp_req(struct lagg_softc *, void *); void lacp_portreq(struct lagg_port *, void *); -static __inline int +static __inline bool lacp_isactive(struct lagg_port *lgp) { struct lacp_port *lp = LACP_PORT(lgp); @@ -315,26 +315,23 @@ lacp_isactive(struct lagg_port *lgp) struct lacp_aggregator *la = lp->lp_aggregator; /* This port is joined to the active aggregator */ - if (la != NULL && la == lsc->lsc_active_aggregator) - return (1); - - return (0); + return (la != NULL && la == lsc->lsc_active_aggregator); } -static __inline int +static __inline bool lacp_iscollecting(struct lagg_port *lgp) { struct lacp_port *lp = LACP_PORT(lgp); - return ((lp->lp_state & LACP_STATE_COLLECTING) != 0); + return (lp->lp_state & LACP_STATE_COLLECTING); } -static __inline int +static __inline bool lacp_isdistributing(struct lagg_port *lgp) { struct lacp_port *lp = LACP_PORT(lgp); - return ((lp->lp_state & LACP_STATE_DISTRIBUTING) != 0); + return (lp->lp_state & LACP_STATE_DISTRIBUTING); } /* following constants don't include terminating NUL */ diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 063782b49ad7..cf78b55f4c34 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -2685,7 +2685,7 @@ lagg_lacp_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) * If the port is not collecting or not in the active aggregator then * free and return. */ - if (lacp_iscollecting(lp) == 0 || lacp_isactive(lp) == 0) { + if (!lacp_iscollecting(lp) || !lacp_isactive(lp)) { m_freem(m); return (NULL); } From nobody Fri Mar 31 17:55: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 4Pp7HT2CSVz433Nq; Fri, 31 Mar 2023 17:55: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 4Pp7HT1TQ3z4YCr; Fri, 31 Mar 2023 17:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680285333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5206Gt3iNxh1LSJ9bTeRAtwT5t+28VAFb4DgNUaQxIo=; b=vx3vAsO8+5EcGGOsSXZQ3lkx57UShPaNrzIN4Ij1HvJXNKeWhAri2ngoyjqCxj7KQF+byu BEN1fZco86ZZUkjvo/SciKljPSbpqMm2lV1nsOKM3fZt/RTsfuUqakpoi1KQwwyi+8lv7i zRDkDTOy5BmJYPv7MZg9bQAf5BCUiiXqtv+/2em0DP0R0ApxSVQGHaMDn0/gnJcHOdu5rC FmSIVXw60pGPvQRfn+Y4AVcd5zmuXqPAkJcSCnUsLBAAiakX9CBmhUuPv5vrUcTp0hd9xR ptqbnomciA2isisLT7UUYeGjynAZ7gUMDi1xKVoIbQIZJbHZXYoEBpzsFhoS/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680285333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5206Gt3iNxh1LSJ9bTeRAtwT5t+28VAFb4DgNUaQxIo=; b=o7Hjixyv3OURwlOUjSiHHGubf4W4S5pXagSsuVKKyAK2TiYqMjlKlCzCX+4Jyv3uIvFv7I rzWHRQvj1/DMaVgre7ik/yIHPjJhq+GcdeaBtgoS7uDNIJFuSI007BNXjmdivpK0zBT7Sn icV24CSjumSrGiF6bCWaeXcS36W/theOfvTq0FwjghJ65NsseVsVaf5uVc3AFD0P3fs7Ta ff+JX/yhr71/foYETnclpGz0QzTr4UEUgzLVKnM++zWNakcIwC/CjEmSYNmsoPXZZ3n60y OIlOV/yHMsQ2Vd/z5kT/r5aozsAU3jMpfZXF+eu9EHp1uakDsuFokbgedwiIGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680285333; a=rsa-sha256; cv=none; b=oCagZ6msfZtL2k9I+QEyEmJ0cypigSx8QXKN681IJgPhL9k+lrfMUj7g8TtmEUpsvJGFE9 G3tIR2Yu2NqlVkysxMjTZg4IgL7CKYkHfSaEn2pvF/Y+0pRraLUjQfoQqIEubiVSpx+uQv xu9vsPnibSrHYwpajMrHyv6yOdK9CFMPZT3VaMz9g56agaDW2iihbNU6g+jKGXEn9ugJYq q/BGJ7P1C+tjiEhBWRUOpTo2Xssk/7Dhv7M3lgiTJGpwSfaJsdqt7D66kBKXSrgtDT2lun rIrO55VblDO2J5u+v0dXnCFrIz470UcYJoK7tnVu5lj8wByWbK3YXXTzsIGGcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp7HT0R1lz13fd; Fri, 31 Mar 2023 17:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VHtWh0078296; Fri, 31 Mar 2023 17:55:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VHtWgU078295; Fri, 31 Mar 2023 17:55:32 GMT (envelope-from git) Date: Fri, 31 Mar 2023 17:55:32 GMT Message-Id: <202303311755.32VHtWgU078295@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: e93da76b073a - main - nanobsd: Remove MIPS configurations. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: e93da76b073a9cf9e350d512fb43b60e96c0a47d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e93da76b073a9cf9e350d512fb43b60e96c0a47d commit e93da76b073a9cf9e350d512fb43b60e96c0a47d Author: John Baldwin AuthorDate: 2023-03-31 17:55:22 +0000 Commit: John Baldwin CommitDate: 2023-03-31 17:55:22 +0000 nanobsd: Remove MIPS configurations. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D39332 --- tools/tools/nanobsd/embedded/README | 4 ---- tools/tools/nanobsd/embedded/common | 14 ----------- tools/tools/nanobsd/embedded/qemu-mips.cfg | 36 ---------------------------- tools/tools/nanobsd/embedded/qemu-mips64.cfg | 36 ---------------------------- 4 files changed, 90 deletions(-) diff --git a/tools/tools/nanobsd/embedded/README b/tools/tools/nanobsd/embedded/README index b77d3302d861..736e1c47673c 100644 --- a/tools/tools/nanobsd/embedded/README +++ b/tools/tools/nanobsd/embedded/README @@ -23,10 +23,6 @@ Config Short description beaglebone.cfg Create a bootable beaglebone image qemu-amd64.cfg Create a bootable amd64 image for qemu (W) qemu-i386.cfg Create a bootable i386 image for qemu (W) -qemu-mips.cfg Create a bootable mips malta board image for - qemu -qemu-mips64.cfg Create a bootable mips malta board (64-bit - mode) image for qemu qemu-powerpc.cfg Create a bootable 32-bit powerpc image for qemu qemu-powerpc64.cfg Create a bootable 64-bit IBM-flavor image for diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index ba7ac643820e..0e799be96e30 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -522,20 +522,6 @@ std_i386 ( ) { : ${NANO_BOOT_BSD:=${NANO_WORLDDIR}/boot/boot} } -std_mips ( ) { - NANO_ENDIAN=big -} - -std_mipsel ( ) { -} - -std_mips64 ( ) { - NANO_ENDIAN=big -} - -std_mips64el ( ) { -} - std_powerpc ( ) { NANO_ENDIAN=big } diff --git a/tools/tools/nanobsd/embedded/qemu-mips.cfg b/tools/tools/nanobsd/embedded/qemu-mips.cfg deleted file mode 100644 index 341f7f9c1430..000000000000 --- a/tools/tools/nanobsd/embedded/qemu-mips.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# $FreeBSD$ - -#- -# Copyright (c) 2015 M. Warner Losh -# Copyright (c) 2010-2011 iXsystems, Inc. -# -# 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 iXsystems, Inc. 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. -# - -NANO_ARCH=mips -NANO_KERNEL=MALTA -NANO_DRIVE=ada0 -NANO_NAME=qemu-mips - -. common # Pull in common definitions - -qemu_env diff --git a/tools/tools/nanobsd/embedded/qemu-mips64.cfg b/tools/tools/nanobsd/embedded/qemu-mips64.cfg deleted file mode 100644 index 6e936b156757..000000000000 --- a/tools/tools/nanobsd/embedded/qemu-mips64.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# $FreeBSD$ - -#- -# Copyright (c) 2015 M. Warner Losh -# Copyright (c) 2010-2011 iXsystems, Inc. -# -# 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 iXsystems, Inc. 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. -# - -NANO_ARCH=mips -NANO_KERNEL=MALTA64 -NANO_DRIVE=ada0 -NANO_NAME=qemu-mips64 - -. common # Pull in common definitions - -qemu_env From nobody Fri Mar 31 17:59: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 4Pp7Mp0XbCz433Xd; Fri, 31 Mar 2023 17:59: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 4Pp7Mp06RSz4YYW; Fri, 31 Mar 2023 17:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680285558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PBoFb+8o4kl1vkpeBnFfvpCiQrhlqY5NSRHfZGrhOhE=; b=jRdxk/CeXBqYgfsoNXI6iBdOF/3dOsz/8ETogqrU2mt8M0ugox0BB1d4oAOZfqXpON/1RA DDbKGS3l1t+RoZ4zTpNEtSFiUXp79FBjxYbmFrTuY/4ODbWffEFoCgrELkvhCiF6HXKbcd /q+S6OqyzS5Rw14ievutjJlyYvRW05ihyLaQiBfPu/uS2EJne8eLAQ1NGsUf0kqQRF5m05 RSiDRqAe5Gm+k1S409cgiaKYmcCY8KhuSouDaYTA25HPWvJxQs8pVDV1D2AtNDGA860Cub PCi+EdJGKfqF1HJPrdW4h1SpGGEiAyXGmD+ecRTPRVFKkKJWmuLXCn9WUQZ6+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680285558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PBoFb+8o4kl1vkpeBnFfvpCiQrhlqY5NSRHfZGrhOhE=; b=WQcTMc5xY/GbF6k++HX9y692x7td2c/6yGkxbaP92ja4djgABD2HnqpjvBcE2bKGGPHPNN 6hRIRSGc8vyhSTp+Et7E2f2JOVa+hmvDhmsF12WHyCNKJWK5v5iubCgtIBralzovJaFsgk ckdf2teC5gJ6inVe2Ml+aw3YhBk+lSuK9WYhTunXjTxxobBkmipO1xicv7N3W2NQJNGM/6 Ho8UZpHjlTDhxe3fR4qXCRJ/8HH5YfEkrH+TBwotPQt+r7faU02jp3M9+42lLmxBksc2PI v5ZYw+0MSmm+P5KzmYB3jC7paqFpXV72s60+X8yS7QndVhDvmshwXkZE/VuZGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680285558; a=rsa-sha256; cv=none; b=vCOGBYMZPb6jqzXQgGoCgV+ZRmgdFMWuW8QkjNnA9tc4TK4GCMQX/n8qG/nvTgpjnUIWbY A1nMRkkrI11hReR9H2afLLTy41h8xroBI1ZcKXwoUao7d6GvPHe+t0EcGFVU1aTPRzAKuq yLbpGM7KiDYs3R4BowQ8jGn/hVrvSyZ/Vmv3NAMuFFc1M5mVWJzQB4tI0Xc0s4tEqvNJn6 n/iNM/I2Jm/iNj4AgILC4UZ8HrkKC/18aq0t5325ncVSAeSHXslkS04Rde3it4DF+enBSZ 2DFBXiI3+jCk4XfG2s+6Z35uzlkFJwuUqpVomM7Z/qiIrJb2wN7vHXnf161RQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp7Mn6HCQz13j2; Fri, 31 Mar 2023 17:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VHxHeJ078843; Fri, 31 Mar 2023 17:59:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VHxHYU078842; Fri, 31 Mar 2023 17:59:17 GMT (envelope-from git) Date: Fri, 31 Mar 2023 17:59:17 GMT Message-Id: <202303311759.32VHxHYU078842@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: ad83dd2b2b6b - main - LinuxKPI: Appease -Wunused-but-set-variable warnings from GCC. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: ad83dd2b2b6bb56c002a93fcf800b30f2ec448d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ad83dd2b2b6bb56c002a93fcf800b30f2ec448d5 commit ad83dd2b2b6bb56c002a93fcf800b30f2ec448d5 Author: John Baldwin AuthorDate: 2023-03-31 17:56:33 +0000 Commit: John Baldwin CommitDate: 2023-03-31 17:56:33 +0000 LinuxKPI: Appease -Wunused-but-set-variable warnings from GCC. - Mark assert dummy variables as __unused. - Use a dummy (void) cast of the flags argument passed to spin_unlock_irqrestore so it gets treated as used. Reviewed by: manu, hselasky Differential Revision: https://reviews.freebsd.org/D39349 --- sys/compat/linuxkpi/common/include/linux/kernel.h | 2 +- sys/compat/linuxkpi/common/include/linux/spinlock.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 22b25a202395..4fd9f8613895 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -103,7 +103,7 @@ #define _O_CTASSERT(x) _O__CTASSERT(x, __LINE__) #define _O__CTASSERT(x, y) _O___CTASSERT(x, y) #define _O___CTASSERT(x, y) while (0) { \ - typedef char __assert_line_ ## y[(x) ? 1 : -1]; \ + typedef char __unused __assert_line_ ## y[(x) ? 1 : -1]; \ __assert_line_ ## y _x; \ _x[0] = '\0'; \ } diff --git a/sys/compat/linuxkpi/common/include/linux/spinlock.h b/sys/compat/linuxkpi/common/include/linux/spinlock.h index a87cb7180b28..f72a295d2a40 100644 --- a/sys/compat/linuxkpi/common/include/linux/spinlock.h +++ b/sys/compat/linuxkpi/common/include/linux/spinlock.h @@ -128,6 +128,7 @@ typedef struct { } while (0) #define spin_unlock_irqrestore(_l, flags) do { \ + (void)(flags); \ spin_unlock(_l); \ } while (0) From nobody Fri Mar 31 17:59: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 4Pp7Mq2Bp3z433h3; Fri, 31 Mar 2023 17:59: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 4Pp7Mq1G9Bz4YYq; Fri, 31 Mar 2023 17:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680285559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wO+nRnjFuRKabEKnTK8cMSOX9encVMWHF3iJoL7eklo=; b=dHKAvQPk/yP2a4veO/8WzSeHDfDG1+eEtY5WaDPCzAXaUvHPFzdLVnwF63tgdBbX3Pe8aW Xvw7XzcSau6C/dzEDSM/FsawJljEQ1QC8j3tanbzYqVNg/3rSjv/gbbNNUKaCpHts000xY 30VD8peVY86mmt4T1ix4HTWlTgc0CRRtmeglr+UaQKMZcI3FP7I7YRtECnbYEWKcUMjB3H 3DNfsrOm13xf/PbfcxotqQ3BV1rgVSMZQ8yNxu/148Xg10AzBzK+Nc2C208uGCYqglxSJe 7x+AF7lC1lSXpiWKzbiPWCvnlpbnrAtJ2g1QdOJHsEGBq/rrwxqyecfEEV6WJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680285559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wO+nRnjFuRKabEKnTK8cMSOX9encVMWHF3iJoL7eklo=; b=oLBasXTJKRsBLClk7sikw/kKDDK/+/mAHuJaM/16fvV2ESnvGuDxRSAE/y8spQxmGUP2mF I39ZkVIzXZLdgUI3Cm61Gs2m1DhiVJdyVkiwr7dLmV8ySI34R2MYtdWSLiohfH26kyb+ef wumCXxOVUD185C1LUa3ktw7TsH4qfPKLcj/LMyniqSTGFIn3ifQ/n6kJqDTm0RFiGBa8q1 RTSUf6kmvO/uXkEWKvZv3DSuWn4F2NwLW8PBbTUsDY7t8L0Ft1dyfAJTe7cu4/e555zpA6 LiVylGog/bzEEblw3kOns1rl0giQ5RYeTsO/ssBkS1fpzzZwX3BjuxXsEgknAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680285559; a=rsa-sha256; cv=none; b=TmCijZWq68WpWLO+sz/nSC+xL2ar9KpsjKoCDpFnn9ruEl09lcgeLwvAA9bK3sM0lAbVyZ OWRc2MpCzqX9wfc1bAP24MGG3CC2xq5V2Ng5tos3DP5bJhzr+WlkCWT8gzTvieJlU6oFQe g9QdAJpXYzxbBwb5VZzvNYNCThF5tDAtjGh0uKVo6hNCGMlaC42jskWwcRHohCKPraFL5S fvEy9b9QXS7J3cjUKu1izWpb6icbKchcnT4+HmYVfwmNeXbUqGDs18wHxHi0qFJvRyC/C8 1d0OSyRt3sIGLkXdLHutqML2Bl7q55syL9K/3GEqmaUVxHbLWeo/Ap942iustA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp7Mq0Jykz13Bw; Fri, 31 Mar 2023 17:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VHxIMM078863; Fri, 31 Mar 2023 17:59:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VHxIh1078862; Fri, 31 Mar 2023 17:59:18 GMT (envelope-from git) Date: Fri, 31 Mar 2023 17:59:18 GMT Message-Id: <202303311759.32VHxIh1078862@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: cb750f7f5afb - main - fuse: Remove set but unused cr_gid variable. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: cb750f7f5afb3df6d32aa6557d9b9f217fdb1eff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cb750f7f5afb3df6d32aa6557d9b9f217fdb1eff commit cb750f7f5afb3df6d32aa6557d9b9f217fdb1eff Author: John Baldwin AuthorDate: 2023-03-31 17:57:13 +0000 Commit: John Baldwin CommitDate: 2023-03-31 17:57:13 +0000 fuse: Remove set but unused cr_gid variable. Reviewed by: asomers Reported by: GCC Differential Revision: https://reviews.freebsd.org/D39350 --- sys/fs/fuse/fuse_vnops.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index f97a1a52eaad..6ed44d73a8b9 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -2218,16 +2218,11 @@ fuse_vnop_setattr(struct vop_setattr_args *ap) accmode_t accmode = 0; bool checkperm; bool drop_suid = false; - gid_t cr_gid; mp = vnode_mount(vp); data = fuse_get_mpdata(mp); dataflags = data->dataflags; checkperm = dataflags & FSESS_DEFAULT_PERMISSIONS; - if (cred->cr_ngroups > 0) - cr_gid = cred->cr_groups[0]; - else - cr_gid = 0; if (fuse_isdeadfs(vp)) { return ENXIO; From nobody Fri Mar 31 18: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 4Pp7g06c2zz434r0; Fri, 31 Mar 2023 18:12:28 +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 4Pp7g016YTz4b5K; Fri, 31 Mar 2023 18:12:28 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 162.251.186.162 is neither permitted nor denied by domain of glebius@freebsd.org) smtp.mailfrom=glebius@freebsd.org; dmarc=none Received: by glebi.us (Postfix, from userid 1000) id 8091D6133E; Fri, 31 Mar 2023 11:12:26 -0700 (PDT) Date: Fri, 31 Mar 2023 11:12:26 -0700 From: Gleb Smirnoff To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f5a365e51fee - main - inet6: protect address manipulation with a lock Message-ID: References: <202303300847.32U8l1UM004219@gitrepo.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: <202303300847.32U8l1UM004219@gitrepo.freebsd.org> X-Spamd-Result: default: False [0.50 / 15.00]; VIOLATED_DIRECT_SPF(3.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US]; ARC_NA(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; DMARC_NA(0.00)[freebsd.org]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[glebius]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Queue-Id: 4Pp7g016YTz4b5K X-Spamd-Bar: / X-ThisMailContainsUnwantedMimeParts: N Mateusz, On Thu, Mar 30, 2023 at 08:47:01AM +0000, Mateusz Guzik wrote: M> diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c M> index 27dc3550177c..3d967e9a40c7 100644 M> --- a/sys/netinet6/in6.c M> +++ b/sys/netinet6/in6.c M> @@ -168,6 +168,9 @@ static void in6_leave_proxy_ndp_mc(struct ifnet *, const struct in6_addr *); M> #define ifa2ia6(ifa) ((struct in6_ifaddr *)(ifa)) M> #define ia62ifa(ia6) (&((ia6)->ia_ifa)) M> M> +static struct sx in6_control_sx; M> +SX_SYSINIT(in6_control_sx, &in6_control_sx, "in6_control"); M> + M> void M> in6_newaddrmsg(struct in6_ifaddr *ia, int cmd) M> { M> @@ -254,6 +257,7 @@ in6_control(struct socket *so, u_long cmd, void *data, M> struct in6_aliasreq *ifra = (struct in6_aliasreq *)data; M> struct sockaddr_in6 *sa6; M> int error; M> + bool control_locked = false; M> M> /* M> * Compat to make pre-10.x ifconfig(8) operable. M> @@ -411,6 +415,8 @@ in6_control(struct socket *so, u_long cmd, void *data, M> if (td != NULL && (error = prison_check_ip6(td->td_ucred, M> &sa6->sin6_addr)) != 0) M> return (error); M> + sx_xlock(&in6_control_sx); M> + control_locked = true; M> ia = in6ifa_ifpwithaddr(ifp, &sa6->sin6_addr); M> } else M> ia = NULL; M> @@ -582,6 +588,9 @@ in6_control(struct socket *so, u_long cmd, void *data, M> M> error = 0; M> out: M> + if (control_locked) M> + sx_xunlock(&in6_control_sx); M> + M> if (ia != NULL) M> ifa_free(&ia->ia_ifa); M> return (error); Why do you prefer a bool over using sx_xlocked()? -- Gleb Smirnoff From nobody Fri Mar 31 18:20: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 4Pp7rs0lGcz435KG; Fri, 31 Mar 2023 18:21:01 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oa1-x2b.google.com (mail-oa1-x2b.google.com [IPv6:2001:4860:4864:20::2b]) (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 4Pp7rr5rbsz4kt8; Fri, 31 Mar 2023 18:21:00 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-17fcc07d6c4so10017006fac.8; Fri, 31 Mar 2023 11:21:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680286859; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=CXLcKmoTdO0bXzSSxbL2ng1QfUvCQYKnBCa9f2mPwHk=; b=FthCxPlN+sLoacOSDqEowsIhtsEYfaytseFeTdGX02LnL/rkarpUFj/USoQrE1a25L cpDMKqi3KUnZ1wN2MwH7J3k+Q99y+i9fz7gGTvr8RT/76qboJk2aCAW3CWcIyat4aZHw sU3EeRHRd8n+gavJxDib6h+ZmulUm9n8hLE91qN66qBZZwoLnF5/Aj40nGbzVv3y21jw mgxnGpn4d96qonwhamJJDA5aw9WRpegg5NQrFg+CZYdKzyHRn8V4dkS5IOfIXahP1NzT h2IvtLDE4wD+i5Iq8bXH1ugy2wEmAYfdZ+CtUPAe6sIcjNn7BAieu4Hab3BANfu5AyHF anJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680286859; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CXLcKmoTdO0bXzSSxbL2ng1QfUvCQYKnBCa9f2mPwHk=; b=Bk64iw9oaTLoK4T7eEfBlT8AV0uLs9KW3GJgAk8pLRdxOqasUhB3f1uhfIG0NxHs1G 7ThqmyC0EG2JsDn+VPJcmyZGmePnhNtZKg8EU1zOalPzg/7GacpkXdgcEPOYlHnRcV+V XD+pmaCpsjOOl/mD/6hZknUZNle1fSGv/lBLcnLDMGPug0jPNSGs8axo/0JcwzgsP39x zf1psk5Of1DMR2CKgn0DJTAKitpPwfeyuS2MZMcyu1uyQ4dm98rJI+H4rBQ2rvWxrmVW CwyZqB5ToA5BFnoeoXpgP0eS1usf299OAEybAMwIBeOhGiB81o9ct2r7rwBI6+8TYJJ0 4YvQ== X-Gm-Message-State: AAQBX9d8qM4z+Lh1WtszWrsIo91JnyIPhlFbNB/rRZA67ISvEp2L0wEl wFTtx6l0v3Ncj40+JwXJqjEip8krqo5wUbffANWdkuWW X-Google-Smtp-Source: AKy350YYvq/xljiouuYG8ljwN45M8iF3I3T8aP2Z8eM1s7hrpeq+vhVElQpWN2AlRDIrbvSmM8dGDGLWbnqubOjFLEQ= X-Received: by 2002:a05:6870:55:b0:177:c436:feb8 with SMTP id 21-20020a056870005500b00177c436feb8mr10795011oaz.4.1680286859148; Fri, 31 Mar 2023 11:20:59 -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 Received: by 2002:ac9:7598:0:b0:49c:b071:b1e3 with HTTP; Fri, 31 Mar 2023 11:20:58 -0700 (PDT) In-Reply-To: References: <202303300847.32U8l1UM004219@gitrepo.freebsd.org> From: Mateusz Guzik Date: Fri, 31 Mar 2023 20:20:58 +0200 Message-ID: Subject: Re: git: f5a365e51fee - main - inet6: protect address manipulation with a lock To: Gleb Smirnoff 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-Rspamd-Queue-Id: 4Pp7rr5rbsz4kt8 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2001:4860:4864::/48, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 3/31/23, Gleb Smirnoff wrote: > Mateusz, > > On Thu, Mar 30, 2023 at 08:47:01AM +0000, Mateusz Guzik wrote: > M> diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c > M> index 27dc3550177c..3d967e9a40c7 100644 > M> --- a/sys/netinet6/in6.c > M> +++ b/sys/netinet6/in6.c > M> @@ -168,6 +168,9 @@ static void in6_leave_proxy_ndp_mc(struct ifnet *, > const struct in6_addr *); > M> #define ifa2ia6(ifa) ((struct in6_ifaddr *)(ifa)) > M> #define ia62ifa(ia6) (&((ia6)->ia_ifa)) > M> > M> +static struct sx in6_control_sx; > M> +SX_SYSINIT(in6_control_sx, &in6_control_sx, "in6_control"); > M> + > M> void > M> in6_newaddrmsg(struct in6_ifaddr *ia, int cmd) > M> { > M> @@ -254,6 +257,7 @@ in6_control(struct socket *so, u_long cmd, void > *data, > M> struct in6_aliasreq *ifra = (struct in6_aliasreq *)data; > M> struct sockaddr_in6 *sa6; > M> int error; > M> + bool control_locked = false; > M> > M> /* > M> * Compat to make pre-10.x ifconfig(8) operable. > M> @@ -411,6 +415,8 @@ in6_control(struct socket *so, u_long cmd, void > *data, > M> if (td != NULL && (error = prison_check_ip6(td->td_ucred, > M> &sa6->sin6_addr)) != 0) > M> return (error); > M> + sx_xlock(&in6_control_sx); > M> + control_locked = true; > M> ia = in6ifa_ifpwithaddr(ifp, &sa6->sin6_addr); > M> } else > M> ia = NULL; > M> @@ -582,6 +588,9 @@ in6_control(struct socket *so, u_long cmd, void > *data, > M> > M> error = 0; > M> out: > M> + if (control_locked) > M> + sx_xunlock(&in6_control_sx); > M> + > M> if (ia != NULL) > M> ifa_free(&ia->ia_ifa); > M> return (error); > > Why do you prefer a bool over using sx_xlocked()? > It does not read from the lock but now that you mention it, perhaps i should assert it is not taken in the else clause -- Mateusz Guzik From nobody Fri Mar 31 18: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 4Pp7vc5DqJz4356h; Fri, 31 Mar 2023 18: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 4Pp7vc4kp4z4kns; Fri, 31 Mar 2023 18: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=1680287004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGMbndblfMy49JZIT6MkTx3aYMc3PM+07AEEkZZl4dU=; b=bciPdk/YF6n2Xw8S3n13Bnaa/ISdn0rMlGA80Y3f4sK00Jc6husNqV2ZbVXDuXcJTlHAgK 9s+V1gN5UBOw8qleZXu+nVOEb3RXzWOlyASqJz5uN/0U6a9Pu+9FQQudZlzx4cgEmOCBbu xa5j6BYi4TRfQw1v+lzSbIWIArmu5+MQ9gCBBl/QzoGZZxd8dSpjispwu5aRjvYWrLr6W7 2KuZsyhXM4laANbkB2Zyuzo2Kp8QjTv/ydHxMwCd6o35RAmUzYqJGlZo0vBWX/kdRCvepv +KpEDiOoh9gjzO/5OwEa0S3G7fCilgzZh5giXb6pOijBl2F9mm6MU76MEE6alA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680287004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGMbndblfMy49JZIT6MkTx3aYMc3PM+07AEEkZZl4dU=; b=k9x+i1al1KI7K5Y6CTkNfqcWi5+8xsDQFEQJQAiMWN1AmSnvJ+E2io85ZEqC5tVomysvyP qtAJ1M2bTT7yvlwD+pZ/ZR1DsffohuDpFKqgtpwYvKERLe7okLul0594lGf+B3dSxLqDYN a34lw6mUoNDwQW5IXwir3qEP0MoEZbG6ty9JElUkrCOeRdk9GFxjXSgkNBRHUOXrkNJBZA HuvnN9RktD0j5aBy11ffbhbPN8SQBuq7la8wVj/7oBV2ZlsY46QZZ+71+xI1iXUTAEm0BO HJCqGexdQ5T0ps5rcWvf4sSIL/s6kQQCrF9YiYinEIIkValaD4QNBcpspaYPBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680287004; a=rsa-sha256; cv=none; b=UIPxJ1sJ3GCsJREVZ8HiRIxUIm+A+irxqcZ25/0Y87QZFTFSqAooMWnQ4wGfA7XRUBzUVa nkjtSEru37lDDlGNEz+URgOxi5LuYBVL8wxSM7NEEnI/Oq2kMEK4TWh3SiRoHQYUF49qlE 38U9fnvI5YUjuve+yqg2xBhGS6O2r4l+6l9nXWWOgro+hIgdnZfQVsWP9FQQnKhA3yZNKE s9igsdg6KsWr9I6nocjEzAEuGoteyzxlY794nHxRD9WQj5dWLt5jrb+uWwjp1QFxQTJHWt eeDdK91PmuWXf4yXsWWA6uo6HjezAjhXP02yOuysxC0T3dZArz3asTpL9X5ecQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp7vc3pSJz14M2; Fri, 31 Mar 2023 18:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VINOhj027797; Fri, 31 Mar 2023 18:23:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VINOlr027796; Fri, 31 Mar 2023 18:23:24 GMT (envelope-from git) Date: Fri, 31 Mar 2023 18:23:24 GMT Message-Id: <202303311823.32VINOlr027796@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: 4358928e235c - main - amd64 loader: plug hard hang with serial console 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4358928e235c1e188ad6b4650d78bcceb225b909 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4358928e235c1e188ad6b4650d78bcceb225b909 commit 4358928e235c1e188ad6b4650d78bcceb225b909 Author: Gleb Smirnoff AuthorDate: 2023-03-31 18:19:25 +0000 Commit: Gleb Smirnoff CommitDate: 2023-03-31 18:19:25 +0000 amd64 loader: plug hard hang with serial console enabled The hang basically bricks a physical box and it can be recovered only if you are able to boot from alternate media. This isn't a perfect fix, but throw it in before loader experts decide on proper one. Submitted by: whu Fixes: 927358dd98cb902160093e0dc0bac002d6b43858 --- stand/efi/loader/efiserialio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/loader/efiserialio.c index 5fbc700f6ac2..0f37ef8b87dd 100644 --- a/stand/efi/loader/efiserialio.c +++ b/stand/efi/loader/efiserialio.c @@ -265,6 +265,8 @@ comc_probe(struct console *sc) */ env = getenv("smbios.bios.version"); if (env == NULL || strncmp(env, "Hyper-V", 7) != 0) { + /* Disable being seen as "comconsole". */ + comconsole.c_name = "efiserialio"; return; } #endif From nobody Fri Mar 31 18:48: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 4Pp8Sy4mV0z436gG; Fri, 31 Mar 2023 18:48: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 4Pp8Sy4JXCz3DnX; Fri, 31 Mar 2023 18:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680288530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Ehmk6qBPbi0tgMPffMrnMy7BpbVLYTZEVfCub1EGvA=; b=WL9ZR9w459yTF+mU8zYSJwFzrGptYsMTLqqtd3gVFMEQ0QFqRcAPYtC8PAJZNuknGT0CVp DTV7pdWnk/C09XCJf4eknTcG1zOq+L5OYk/zAjmPr1Q/Ht3qmcAalten6mHEHg+ODdV+da xjqN9CkV3Ja8AZ7HQ1wqo0KJXjIhbdRVFpOtuOiLr/ZMQz02ux957q+GLMkwjuyw8521KN eUrhLATG8Vfo/YJlC4xycZl7q/x7R8Nkm+hcCgDnNaCqvqPh57h8WqJVuEXPgevtbU8nA/ 8+yr1PqRonRYaUZq3CeGkSl6UJbNoODlR4RbNiD6PvMQ8QhG1Qc6Ur57Z6cbpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680288530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Ehmk6qBPbi0tgMPffMrnMy7BpbVLYTZEVfCub1EGvA=; b=wuKraRE7KCTl2xDUKYHNQCB9IEZwuUcK8pz4apELrQFo/CjqfWO41z4ZHcXO0l3zteLP0/ mr+Kzd2DxuvoOXYhj8MyLtuPt05AsIBuMTtO6Lc49Bs8pFLdSTJsMAXPWVAAwJAU072SF8 yc54FDgcgtNfVMeNg5o1xc8XQEKVxWq7aFJEeDOZ3cUT5QmNtSu8DR65K2xL4a08wQfe4g LrznwwSa576eRBfVqo6Z0lHO5DFrwXLE82bj6wWEd3b6TUAqX3r8gNTJhc25Jl4e7lXW4X d70ArssC71vsCdeT/ngszdizTcgPi95BSChsdAvY7uldzudgBgBBmxhZ7NG0iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680288530; a=rsa-sha256; cv=none; b=qQw4LKg5t4Zaz6NSnDbq/T9aaxehtmB+r7RNTaSXrpYbxVR3+e5kU+ApKVB1NbI44QNo+f Yos8N6e72CLQ4LFbXYsIzpKlHm00IS0m9PE/QZVz1p+J9Gx1cYHjoXgFMqyRrBHHRIEza8 aVgAlRjlacHfSb4CQnRHBYNwgVc72xeAAeselwWRi1FEGO72Jry4m13CWAg+ddpzvUnFTc acJk6m8ERTeS7q6MDyT28AeowQp6NfInQjj+xwilJkdWQ0v+NFtt37PHh1We+iO2RMSCBb FvwfbaiNrm0pELMzFOhCJBy1e3jH6R40cFGMpYknPb3x2sNlQfqWm1AmBHpKBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp8Sy3MX7z14fn; Fri, 31 Mar 2023 18:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VImoW7060728; Fri, 31 Mar 2023 18:48:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VImoWN060727; Fri, 31 Mar 2023 18:48:50 GMT (envelope-from git) Date: Fri, 31 Mar 2023 18:48:50 GMT Message-Id: <202303311848.32VImoWN060727@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: d860991a7289 - main - kqueue: tidy up indentation in man page example List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: d860991a7289c673d19467ea7faae46df7681db1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d860991a7289c673d19467ea7faae46df7681db1 commit d860991a7289c673d19467ea7faae46df7681db1 Author: Ed Maste AuthorDate: 2023-03-31 18:45:04 +0000 Commit: Ed Maste CommitDate: 2023-03-31 18:48:39 +0000 kqueue: tidy up indentation in man page example Fixes: e07b0c12ba64 ("[patch][doc] Fix EXAMPLE in kqueue(2)") Sponsored by: The FreeBSD Foundation --- lib/libc/sys/kqueue.2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2 index c263fa550244..a2470696d4df 100644 --- a/lib/libc/sys/kqueue.2 +++ b/lib/libc/sys/kqueue.2 @@ -771,8 +771,7 @@ main(int argc, char **argv) errx(EXIT_FAILURE, "Event error: %s", strerror(event.data)); else printf("Something was written in '%s'\en", argv[1]); -} - + } } } .Ed From nobody Fri Mar 31 19:03: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 4Pp8nt2Tfkz437fQ; Fri, 31 Mar 2023 19:03: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 4Pp8nt2FYfz3HM2; Fri, 31 Mar 2023 19:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680289410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9MVDhl61IbvDlla7iVsHhMSuvMyvtrFQ1YVJJe1Atmg=; b=NWDLZVL+2MX1JUCJQHtGnsPU4rkcOt85RwbDaNJYdaQNn3TB7gcFPLDP9EOz21MsuEkvk0 qtdz3lRzV7X6fKb/59b4GW+I7Df7XNW4G2kX+NdGNo3EnhbH9zzdkuEwWjHgjzbQAb/MAA O0WfhBhrkfU5QEJEZUSUaOh/7624GYm/nrJ8sICh1dqBZrdaPkxYwckttePCZzs0+HVBIs nb+A0rUT+QgfODFm9FBL6M98IRqzgFzAqT+iY9BhvZ8rC6AwdsxTZliTeLtUue7Te9H4vj xZAN/12V9Vt2Qz7P/fjxnOoind1+23zGlXhrYNOKDBk3MKGNulCNzJdPybwF3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680289410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9MVDhl61IbvDlla7iVsHhMSuvMyvtrFQ1YVJJe1Atmg=; b=b+QUgevC54TtIATecXglEilUW+NQZkl1tFR+gPkvkGpRsjfrahn5KDEXRUv14rbtlhG5Ld DSCY4aT8aQRZArTwln77RHbHiodePHmHj5Bw5e4fvA82muq75hJMCJzJ0C0QfdvygFF96x 4OQdW1dbvPrQ95yaZ8vPbIaNJewwZ0TWSkN3hkGTu28QkGIwcjojEgbEGGxXcqohO1QYzu hV9TuQzgYwsOKAEogsEMpPSrkMWHcmDotKv221W6B2rf4dGCRpPf0InB4TRo8quKcx1wMG jonSJrVuCJM1MPvBMXdcaBuSKRIaaO2PQZ7vdJYark8OdFKJj5pEAf7/wQxTCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680289410; a=rsa-sha256; cv=none; b=AMXoRknGXZuEVy0jYWcjDaoz5tJDo6gZL7eZEohU1x1lnqMUAlWbkAVQitYTZo6UOc0izY LXn0o2naO9cKZQfz5xqDebjXXw3d8pripLfYYLVvVR7k5zVuu4/N7gIH8x4RrbEm+FE+gg e251jml0msgsanp6ypYTw+4Mm03btIzICnr9jhm5i/8gqPx0UQYXGLZRsSI4iLoWjn4jLZ N8W4smjqwheN1r8UKgPqLtImk6SpZHanfMAyessECVCFqBdTV0/ALOh3dlThFTLRA0Kjcb yaHYbW25em6tlxtwVLvox18wUYsatHKdIuJpV5Xhz+6L3B9uz2ewwe9mf0m8kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp8nt1HJZz1593; Fri, 31 Mar 2023 19:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VJ3UeZ094106; Fri, 31 Mar 2023 19:03:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VJ3RHp094105; Fri, 31 Mar 2023 19:03:27 GMT (envelope-from git) Date: Fri, 31 Mar 2023 19:03:27 GMT Message-Id: <202303311903.32VJ3RHp094105@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 6f9cba8f8b5e - main - libpcap: Update to 1.10.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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f9cba8f8b5efd16249633e52483ea351876b67b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=6f9cba8f8b5efd16249633e52483ea351876b67b commit 6f9cba8f8b5efd16249633e52483ea351876b67b Merge: d860991a7289 35af88c96350 Author: Joseph Mingrone AuthorDate: 2023-03-31 19:01:44 +0000 Commit: Joseph Mingrone CommitDate: 2023-03-31 19:02:22 +0000 libpcap: Update to 1.10.3 Local changes: - In contrib/libpcap/pcap/bpf.h, do not include pcap/dlt.h. Our system net/dlt.h is pulled in from net/bpf.h. - sys/net/dlt.h: Incorporate changes from libpcap 1.10.3. - lib/libpcap/Makefile: Update for libpcap 1.10.3. Changelog: https://git.tcpdump.org/libpcap/blob/95691ebe7564afa3faa5c6ba0dbd17e351be455a:/CHANGES Reviewed by: emaste Obtained from: https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz Sponsored by: The FreeBSD Foundation contrib/libpcap/CHANGES | 448 +- contrib/libpcap/CMakeLists.txt | 1627 ++++- contrib/libpcap/CONTRIBUTING.md | 6 +- contrib/libpcap/CREDITS | 83 +- contrib/libpcap/INSTALL.md | 481 +- contrib/libpcap/Makefile-devel-adds | 4 +- contrib/libpcap/Makefile.in | 175 +- contrib/libpcap/README.md | 73 +- contrib/libpcap/TODO | 2 - contrib/libpcap/VERSION | 2 +- contrib/libpcap/Win32/Prj/wpcap.sln | 28 - contrib/libpcap/Win32/Prj/wpcap.vcxproj | 233 - contrib/libpcap/Win32/Prj/wpcap.vcxproj.filters | 107 - contrib/libpcap/aclocal.m4 | 585 +- contrib/libpcap/atmuni31.h | 2 +- contrib/libpcap/bpf_filter.c | 86 +- contrib/libpcap/bpf_image.c | 156 +- contrib/libpcap/charconv.c | 217 + contrib/libpcap/charconv.h | 44 + contrib/libpcap/cmake/Modules/FindAirPcap.cmake | 69 + contrib/libpcap/cmake/Modules/FindDAG.cmake | 7 + contrib/libpcap/cmake/Modules/FindPacket.cmake | 63 +- contrib/libpcap/cmake/Modules/FindSNF.cmake | 6 + contrib/libpcap/cmake/Modules/Finddpdk.cmake | 118 + contrib/libpcap/cmakeconfig.h.in | 85 +- contrib/libpcap/config.guess | 1510 +++-- contrib/libpcap/config.h.in | 96 +- contrib/libpcap/config.sub | 1686 ++--- contrib/libpcap/configure | 6968 ++++++++++++++------ contrib/libpcap/configure.ac | 1684 +++-- contrib/libpcap/diag-control.h | 241 +- contrib/libpcap/dlpisubs.c | 31 +- contrib/libpcap/doc/DLT_ALLOCATE_HOWTO.md | 29 - contrib/libpcap/doc/README.Win32.md | 199 +- contrib/libpcap/doc/README.aix | 24 +- contrib/libpcap/doc/README.dag | 6 +- contrib/libpcap/doc/README.hpux | 10 +- contrib/libpcap/doc/README.linux | 36 + contrib/libpcap/doc/README.linux.md | 108 - contrib/libpcap/doc/README.septel | 4 +- contrib/libpcap/doc/README.sita | 13 +- contrib/libpcap/doc/README.solaris.md | 58 + contrib/libpcap/doc/README.tru64 | 49 - contrib/libpcap/etherent.c | 20 +- contrib/libpcap/ethertype.h | 38 +- contrib/libpcap/extract.h | 302 +- contrib/libpcap/fad-getad.c | 3 +- contrib/libpcap/fad-gifc.c | 10 +- contrib/libpcap/fad-glifc.c | 3 +- contrib/libpcap/fmtutils.c | 308 +- contrib/libpcap/fmtutils.h | 8 + contrib/libpcap/ftmacros.h | 28 +- contrib/libpcap/gencode.c | 1045 ++- contrib/libpcap/gencode.h | 82 +- contrib/libpcap/{grammar.y => grammar.y.in} | 246 +- contrib/libpcap/ieee80211.h | 2 +- contrib/libpcap/lbl/os-osf4.h | 4 +- contrib/libpcap/lbl/os-osf5.h | 6 +- contrib/libpcap/lbl/os-solaris2.h | 2 +- contrib/libpcap/lbl/os-sunos4.h | 2 +- contrib/libpcap/libpcap.pc.in | 5 +- contrib/libpcap/missing/asprintf.c | 2 +- contrib/libpcap/missing/getopt.c | 17 +- contrib/libpcap/missing/snprintf.c | 631 -- contrib/libpcap/missing/win_asprintf.c | 4 +- contrib/libpcap/missing/win_snprintf.c | 43 - contrib/libpcap/mkdep | 53 +- contrib/libpcap/msdos/readme.dos | 8 +- contrib/libpcap/nametoaddr.c | 66 +- contrib/libpcap/nomkdep | 0 contrib/libpcap/optimize.c | 677 +- contrib/libpcap/org.tcpdump.chmod_bpf.plist | 2 +- contrib/libpcap/pcap-airpcap.c | 1054 +++ contrib/libpcap/pcap-airpcap.h | 36 + contrib/libpcap/pcap-bpf.c | 688 +- contrib/libpcap/pcap-bt-linux.c | 54 +- contrib/libpcap/pcap-bt-monitor-linux.c | 31 +- contrib/libpcap/pcap-common.c | 450 +- contrib/libpcap/pcap-common.h | 25 - contrib/libpcap/pcap-config.1 | 4 +- contrib/libpcap/pcap-config.in | 98 +- contrib/libpcap/pcap-dag.c | 93 +- contrib/libpcap/pcap-dbus.c | 28 +- contrib/libpcap/pcap-dll.rc | 6 +- contrib/libpcap/pcap-dlpi.c | 148 +- contrib/libpcap/pcap-dos.c | 50 +- contrib/libpcap/pcap-dpdk.c | 1086 +++ contrib/libpcap/pcap-dpdk.h | 28 + contrib/libpcap/pcap-enet.c | 4 +- contrib/libpcap/pcap-filter.manmisc.in | 651 +- contrib/libpcap/pcap-haiku.cpp | 305 + contrib/libpcap/pcap-int.h | 177 +- contrib/libpcap/pcap-libdlpi.c | 52 +- contrib/libpcap/pcap-linktype.manmisc.in | 8 +- contrib/libpcap/pcap-linux.c | 5447 +++++---------- contrib/libpcap/pcap-netfilter-linux.c | 74 +- contrib/libpcap/pcap-netmap.c | 7 +- contrib/libpcap/pcap-new.c | 54 +- contrib/libpcap/pcap-nit.c | 12 +- contrib/libpcap/pcap-npf.c | 803 ++- contrib/libpcap/pcap-pf.c | 26 +- contrib/libpcap/pcap-rdmasniff.c | 63 +- contrib/libpcap/pcap-rpcap.c | 767 ++- contrib/libpcap/pcap-savefile.manfile.in | 8 +- contrib/libpcap/pcap-septel.c | 40 +- contrib/libpcap/pcap-sita.c | 61 +- contrib/libpcap/pcap-sita.html | 28 +- contrib/libpcap/pcap-snf.c | 62 +- contrib/libpcap/pcap-snit.c | 22 +- contrib/libpcap/pcap-snoop.c | 8 +- contrib/libpcap/pcap-tc.c | 178 +- contrib/libpcap/pcap-tstamp.manmisc.in | 61 +- contrib/libpcap/pcap-types.h | 1 - contrib/libpcap/pcap-usb-linux-common.c | 130 + contrib/libpcap/pcap-usb-linux-common.h | 26 + contrib/libpcap/pcap-usb-linux.c | 877 +-- contrib/libpcap/pcap-util.c | 474 ++ contrib/libpcap/pcap-util.h | 55 + contrib/libpcap/pcap.3pcap.in | 136 +- contrib/libpcap/pcap.c | 783 ++- contrib/libpcap/pcap/bpf.h | 44 +- contrib/libpcap/pcap/can_socketcan.h | 7 +- contrib/libpcap/pcap/compiler-tests.h | 52 +- contrib/libpcap/pcap/dlt.h | 210 +- contrib/libpcap/pcap/funcattrs.h | 130 +- contrib/libpcap/pcap/namedb.h | 4 +- contrib/libpcap/pcap/pcap-inttypes.h | 85 +- contrib/libpcap/pcap/pcap.h | 327 +- contrib/libpcap/pcap/socket.h | 9 - contrib/libpcap/pcap_activate.3pcap | 35 +- contrib/libpcap/pcap_breakloop.3pcap | 101 +- contrib/libpcap/pcap_can_set_rfmon.3pcap | 28 +- contrib/libpcap/pcap_close.3pcap | 4 +- contrib/libpcap/pcap_compile.3pcap.in | 26 +- contrib/libpcap/pcap_create.3pcap | 8 +- contrib/libpcap/pcap_datalink.3pcap.in | 15 +- contrib/libpcap/pcap_datalink_name_to_val.3pcap | 8 +- contrib/libpcap/pcap_datalink_val_to_name.3pcap | 22 +- contrib/libpcap/pcap_dump.3pcap | 12 +- contrib/libpcap/pcap_dump_close.3pcap | 6 +- contrib/libpcap/pcap_dump_file.3pcap | 6 +- contrib/libpcap/pcap_dump_flush.3pcap | 13 +- contrib/libpcap/pcap_dump_ftell.3pcap | 16 +- contrib/libpcap/pcap_dump_open.3pcap.in | 51 +- contrib/libpcap/pcap_file.3pcap | 20 +- contrib/libpcap/pcap_fileno.3pcap | 20 +- contrib/libpcap/pcap_findalldevs.3pcap | 30 +- contrib/libpcap/pcap_freecode.3pcap | 8 +- .../libpcap/pcap_get_required_select_timeout.3pcap | 156 +- contrib/libpcap/pcap_get_selectable_fd.3pcap | 77 +- contrib/libpcap/pcap_get_tstamp_precision.3pcap.in | 12 +- contrib/libpcap/pcap_geterr.3pcap | 6 +- contrib/libpcap/pcap_init.3pcap | 99 + contrib/libpcap/pcap_inject.3pcap | 46 +- contrib/libpcap/pcap_is_swapped.3pcap | 16 +- contrib/libpcap/pcap_lib_version.3pcap | 4 +- contrib/libpcap/pcap_list_datalinks.3pcap.in | 22 +- contrib/libpcap/pcap_list_tstamp_types.3pcap.in | 21 +- contrib/libpcap/pcap_lookupdev.3pcap | 33 +- contrib/libpcap/pcap_lookupnet.3pcap | 10 +- contrib/libpcap/pcap_loop.3pcap | 102 +- contrib/libpcap/pcap_major_version.3pcap | 10 +- contrib/libpcap/pcap_next_ex.3pcap | 65 +- contrib/libpcap/pcap_offline_filter.3pcap | 8 +- contrib/libpcap/pcap_open_dead.3pcap.in | 25 +- contrib/libpcap/pcap_open_live.3pcap | 16 +- contrib/libpcap/pcap_open_offline.3pcap.in | 31 +- contrib/libpcap/pcap_set_buffer_size.3pcap | 12 +- contrib/libpcap/pcap_set_datalink.3pcap | 21 +- contrib/libpcap/pcap_set_immediate_mode.3pcap.in | 32 +- contrib/libpcap/pcap_set_promisc.3pcap | 12 +- contrib/libpcap/pcap_set_protocol_linux.3pcap | 20 +- contrib/libpcap/pcap_set_rfmon.3pcap | 14 +- contrib/libpcap/pcap_set_snaplen.3pcap | 12 +- contrib/libpcap/pcap_set_timeout.3pcap | 13 +- contrib/libpcap/pcap_set_tstamp_precision.3pcap.in | 20 +- contrib/libpcap/pcap_set_tstamp_type.3pcap.in | 22 +- contrib/libpcap/pcap_setdirection.3pcap | 22 +- contrib/libpcap/pcap_setfilter.3pcap | 22 +- contrib/libpcap/pcap_setnonblock.3pcap | 55 +- contrib/libpcap/pcap_snapshot.3pcap | 14 +- contrib/libpcap/pcap_stats.3pcap | 23 +- contrib/libpcap/pcap_statustostr.3pcap | 4 +- contrib/libpcap/pcap_strerror.3pcap | 4 +- contrib/libpcap/pcap_tstamp_type_name_to_val.3pcap | 7 +- contrib/libpcap/pcap_tstamp_type_val_to_name.3pcap | 7 +- contrib/libpcap/pflog.h | 157 + contrib/libpcap/portability.h | 70 +- contrib/libpcap/rpcap-protocol.c | 6 +- contrib/libpcap/rpcap-protocol.h | 56 +- contrib/libpcap/rpcapd/CMakeLists.txt | 39 +- contrib/libpcap/rpcapd/Makefile.in | 5 +- contrib/libpcap/rpcapd/daemon.c | 803 ++- contrib/libpcap/rpcapd/daemon.h | 8 +- contrib/libpcap/rpcapd/fileconf.c | 32 +- contrib/libpcap/rpcapd/log.c | 2 +- contrib/libpcap/rpcapd/org.tcpdump.rpcapd.plist | 2 +- contrib/libpcap/rpcapd/rpcapd-config.manfile.in | 8 +- contrib/libpcap/rpcapd/rpcapd.c | 172 +- contrib/libpcap/rpcapd/rpcapd.manadmin.in | 91 +- contrib/libpcap/rpcapd/win32-svc.c | 13 +- contrib/libpcap/rpcapd/win32-svc.h | 2 +- contrib/libpcap/savefile.c | 249 +- contrib/libpcap/scanner.l | 255 +- contrib/libpcap/sf-pcap.c | 147 +- contrib/libpcap/sf-pcapng.c | 114 +- contrib/libpcap/sockutils.c | 817 ++- contrib/libpcap/sockutils.h | 31 +- contrib/libpcap/sslutils.c | 239 + contrib/libpcap/sslutils.h | 66 + contrib/libpcap/testprogs/CMakeLists.txt | 13 +- contrib/libpcap/testprogs/Makefile.in | 54 +- contrib/libpcap/testprogs/can_set_rfmon_test.c | 1 - contrib/libpcap/testprogs/capturetest.c | 89 +- contrib/libpcap/testprogs/filtertest.c | 44 +- contrib/libpcap/testprogs/findalldevstest-perf.c | 97 + contrib/libpcap/testprogs/findalldevstest.c | 29 +- contrib/libpcap/testprogs/fuzz/CMakeLists.txt | 43 + contrib/libpcap/testprogs/fuzz/fuzz_both.c | 101 + contrib/libpcap/testprogs/fuzz/fuzz_both.options | 2 + contrib/libpcap/testprogs/fuzz/fuzz_filter.c | 43 + contrib/libpcap/testprogs/fuzz/fuzz_filter.options | 2 + contrib/libpcap/testprogs/fuzz/fuzz_pcap.c | 80 + contrib/libpcap/testprogs/fuzz/fuzz_pcap.options | 2 + contrib/libpcap/testprogs/fuzz/onefile.c | 54 + contrib/libpcap/testprogs/nonblocktest.c | 187 + contrib/libpcap/testprogs/opentest.c | 19 +- contrib/libpcap/testprogs/reactivatetest.c | 1 - contrib/libpcap/testprogs/selpolltest.c | 66 +- contrib/libpcap/testprogs/threadsignaltest.c | 58 +- contrib/libpcap/testprogs/valgrindtest.c | 34 +- contrib/libpcap/testprogs/visopts.py | 317 + contrib/libpcap/testprogs/writecaptest.c | 556 ++ contrib/libpcap/tests/pcap-invalid-version-1.pcap | Bin 0 -> 530 bytes contrib/libpcap/tests/pcap-invalid-version-2.pcap | Bin 0 -> 530 bytes contrib/libpcap/tests/pcapng-invalid-vers-1.pcapng | Bin 0 -> 260 bytes contrib/libpcap/tests/pcapng-invalid-vers-2.pcapng | Bin 0 -> 260 bytes lib/libpcap/Makefile | 11 +- sys/net/dlt.h | 260 +- 239 files changed, 29060 insertions(+), 15234 deletions(-) diff --cc contrib/libpcap/CONTRIBUTING.md index 69b597260f79,000000000000..fb22c5e38159 mode 100644,000000..100644 --- a/contrib/libpcap/CONTRIBUTING.md +++ b/contrib/libpcap/CONTRIBUTING.md @@@ -1,29 -1,0 +1,29 @@@ +Guidelines for contributing +=========================== + +To report a security issue (segfault, buffer overflow, infinite loop, arbitrary +code execution etc) please send an e-mail to security@tcpdump.org, do not use +the bug tracker! + +To report a non-security problem (failure to compile, failure to capture packets +properly, missing support for a network interface type or DLT) please check +first that it reproduces with the latest stable release of libpcap. If it does, +please check that the problem reproduces with the current git master branch of +libpcap. If it does (and it is not a security-related problem, otherwise see +above), please navigate to https://github.com/the-tcpdump-group/libpcap/issues +and check if the problem has already been reported. If it has not, please open +a new issue and provide the following details: + - * libpcap version (e.g. from tcpdump --version) ++* libpcap version (e.g. from `tcpdump --version`) +* operating system name and version and any other details that may be relevant - (uname -a, compiler name and version, CPU type etc.) - * configure flags if any were used ++ (`uname -a`, compiler name and version, CPU type etc.) ++* `configure` or `cmake` flags if any were used +* statement of the problem +* steps to reproduce + +Please note that if you know exactly how to solve the problem and the solution +would not be too intrusive, it would be best to contribute some development time +and open a pull request instead. + +Still not sure how to do? Feel free to [subscribe](https://www.tcpdump.org/#mailing-lists) +to the mailing list tcpdump-workers@lists.tcpdump.org and ask! diff --cc contrib/libpcap/README.md index 78cc3c4b41b5,000000000000..46c33c24125e mode 100644,000000..100644 --- a/contrib/libpcap/README.md +++ b/contrib/libpcap/README.md @@@ -1,93 -1,0 +1,76 @@@ - To report a security issue please send an e-mail to security@tcpdump.org. ++# LIBPCAP 1.x.y by [The Tcpdump Group](https://www.tcpdump.org) + - To report bugs and other problems, contribute patches, request a - feature, provide generic feedback etc please see the file - [CONTRIBUTING](CONTRIBUTING.md) in the libpcap source tree root. ++**To report a security issue please send an e-mail to security@tcpdump.org.** + - The directory doc/ has README files about specific operating systems and - options. ++To report bugs and other problems, contribute patches, request a ++feature, provide generic feedback etc please see the ++[guidelines for contributing](CONTRIBUTING.md). + - LIBPCAP 1.x.y - Now maintained by "The Tcpdump Group" - https://www.tcpdump.org ++The [documentation directory](doc/) has README files about specific ++operating systems and options. + +Anonymous Git is available via: - https://github.com/the-tcpdump-group/libpcap.git + - formerly from Lawrence Berkeley National Laboratory - Network Research Group - ftp://ftp.ee.lbl.gov/old/libpcap-0.4a7.tar.Z ++ https://github.com/the-tcpdump-group/libpcap.git + +This directory contains source code for libpcap, a system-independent +interface for user-level packet capture. libpcap provides a portable +framework for low-level network monitoring. Applications include +network statistics collection, security monitoring, network debugging, +etc. Since almost every system vendor provides a different interface +for packet capture, and since we've developed several tools that +require this functionality, we've created this system-independent API +to ease in porting and to alleviate the need for several +system-dependent packet capture modules in each application. + - For some platforms there are README.{system} files that discuss issues ++```text ++formerly from Lawrence Berkeley National Laboratory ++ Network Research Group ++ ftp://ftp.ee.lbl.gov/old/libpcap-0.4a7.tar.Z ++``` ++ ++### Support for particular platforms and BPF ++For some platforms there are `README.{system}` files that discuss issues +with the OS's interface for packet capture on those platforms, such as +how to enable support for that interface in the OS, if it's not built in +by default. + +The libpcap interface supports a filtering mechanism based on the +architecture in the BSD packet filter. BPF is described in the 1993 +Winter Usenix paper ``The BSD Packet Filter: A New Architecture for - User-level Packet Capture''. A compressed PostScript version can be - found at - - ftp://ftp.ee.lbl.gov/papers/bpf-usenix93.ps.Z - - or - - https://www.tcpdump.org/papers/bpf-usenix93.ps.Z - - and a gzipped version can be found at - - https://www.tcpdump.org/papers/bpf-usenix93.ps.gz - - A PDF version can be found at - - https://www.tcpdump.org/papers/bpf-usenix93.pdf ++User-level Packet Capture'' ++([compressed PostScript](https://www.tcpdump.org/papers/bpf-usenix93.ps.Z), ++[gzipped PostScript](https://www.tcpdump.org/papers/bpf-usenix93.ps.gz), ++[PDF](https://www.tcpdump.org/papers/bpf-usenix93.pdf)). + +Although most packet capture interfaces support in-kernel filtering, +libpcap utilizes in-kernel filtering only for the BPF interface. +On systems that don't have BPF, all packets are read into user-space +and the BPF filters are evaluated in the libpcap library, incurring +added overhead (especially, for selective filters). Ideally, libpcap +would translate BPF filters into a filter program that is compatible +with the underlying kernel subsystem, but this is not yet implemented. + +BPF is standard in 4.4BSD, BSD/OS, NetBSD, FreeBSD, OpenBSD, DragonFly - BSD, and macOS; an older, modified and undocumented version is standard - in AIX. {DEC OSF/1, Digital UNIX, Tru64 UNIX} uses the packetfilter - interface but has been extended to accept BPF filters (which libpcap - utilizes). Also, you can add BPF filter support to Ultrix using the - kernel source and/or object patches available in: - - https://www.tcpdump.org/other/bpfext42.tar.Z ++BSD, macOS, and Solaris 11; an older, modified and undocumented version ++is standard in AIX. {DEC OSF/1, Digital UNIX, Tru64 UNIX} uses the ++packetfilter interface but has been extended to accept BPF filters ++(which libpcap utilizes). + +Linux has a number of BPF based systems, and libpcap does not support +any of the eBPF mechanisms as yet, although it supports many of the +memory mapped receive mechanisms. - See the [README.linux](doc/README.linux.md) file for more information. ++See the [Linux-specific README](doc/README.linux) for more information. + - Note to Linux distributions and *BSD systems that include libpcap: ++### Note to Linux distributions and *BSD systems that include libpcap: + +There's now a rule to make a shared library, which should work on Linux +and *BSD, among other platforms. + - It sets the soname of the library to "libpcap.so.1"; this is what it - should be, *NOT* libpcap.so.1.x or libpcap.so.1.x.y or something such as ++It sets the soname of the library to `libpcap.so.1`; this is what it ++should be, **NOT** `libpcap.so.1.x` or `libpcap.so.1.x.y` or something such as +that. + +We've been maintaining binary compatibility between libpcap releases for +quite a while; there's no reason to tie a binary linked with libpcap to +a particular release of libpcap. - - Current versions can be found at https://www.tcpdump.org. - - - The TCPdump group diff --cc contrib/libpcap/charconv.c index 000000000000,5f97509ab4e3..5f97509ab4e3 mode 000000,100644..100644 --- a/contrib/libpcap/charconv.c +++ b/contrib/libpcap/charconv.c diff --cc contrib/libpcap/charconv.h index 000000000000,93103d461ef7..93103d461ef7 mode 000000,100644..100644 --- a/contrib/libpcap/charconv.h +++ b/contrib/libpcap/charconv.h diff --cc contrib/libpcap/cmake/Modules/FindAirPcap.cmake index 000000000000,56c71b7bf10d..56c71b7bf10d mode 000000,100644..100644 --- a/contrib/libpcap/cmake/Modules/FindAirPcap.cmake +++ b/contrib/libpcap/cmake/Modules/FindAirPcap.cmake diff --cc contrib/libpcap/cmake/Modules/Finddpdk.cmake index 000000000000,323262afa642..323262afa642 mode 000000,100644..100644 --- a/contrib/libpcap/cmake/Modules/Finddpdk.cmake +++ b/contrib/libpcap/cmake/Modules/Finddpdk.cmake diff --cc contrib/libpcap/config.guess index 2b79f6d837b9,000000000000..a419d8643b62 mode 100755,000000..100755 --- a/contrib/libpcap/config.guess +++ b/contrib/libpcap/config.guess @@@ -1,1476 -1,0 +1,1768 @@@ +#! /bin/sh +# Attempt to guess a canonical system name. - # Copyright 1992-2018 Free Software Foundation, Inc. ++# Copyright 1992-2022 Free Software Foundation, Inc. + - timestamp='2018-07-06' ++# shellcheck disable=SC2006,SC2268 # see below for rationale ++ ++timestamp='2022-08-01' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by - # the Free Software Foundation; either version 3 of the License, or ++# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. +# +# You can get the latest version of this script from: - # https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess ++# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess +# +# Please send patches to . + + ++# The "shellcheck disable" line above the timestamp inhibits complaints ++# about features and limitations of the classic Bourne shell that were ++# superseded or lifted in POSIX. However, this script identifies a wide ++# variety of pre-POSIX systems that do not have POSIX shells at all, and ++# even some reasonably current systems (Solaris 10 as case-in-point) still ++# have a pre-POSIX /bin/sh. ++ ++ +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Options: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. - Copyright 1992-2018 Free Software Foundation, Inc. ++Copyright 1992-2022 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + - trap 'exit 1' 1 2 15 ++# Just in case it came from the environment. ++GUESS= + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + - set_cc_for_build=' - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp 2>/dev/null) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; - dummy=$tmp/dummy ; - tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; - case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in - ,,) echo "int x;" > "$dummy.c" ; - for c in cc gcc c89 c99 ; do - if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; - esac ; set_cc_for_build= ;' ++tmp= ++# shellcheck disable=SC2172 ++trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 ++ ++set_cc_for_build() { ++ # prevent multiple calls if $tmp is already set ++ test "$tmp" && return 0 ++ : "${TMPDIR=/tmp}" ++ # shellcheck disable=SC2039,SC3028 ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || ++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ++ dummy=$tmp/dummy ++ case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in ++ ,,) echo "int x;" > "$dummy.c" ++ for driver in cc gcc c89 c99 ; do ++ if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then ++ CC_FOR_BUILD=$driver ++ break ++ fi ++ done ++ if test x"$CC_FOR_BUILD" = x ; then ++ CC_FOR_BUILD=no_compiler_found ++ fi ++ ;; ++ ,,*) CC_FOR_BUILD=$CC ;; ++ ,*,*) CC_FOR_BUILD=$HOST_CC ;; ++ esac ++} + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) - if (test -f /.attbin/uname) >/dev/null 2>&1 ; then ++if test -f /.attbin/uname ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown ++UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + - case "$UNAME_SYSTEM" in ++case $UNAME_SYSTEM in +Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu ++ LIBC=unknown + - eval "$set_cc_for_build" ++ set_cc_for_build + cat <<-EOF > "$dummy.c" + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc - #else ++ #elif defined(__GLIBC__) + LIBC=gnu ++ #else ++ #include ++ /* First heuristic to detect musl libc. */ ++ #ifdef __DEFINED_va_list ++ LIBC=musl ++ #endif + #endif + EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" ++ cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ++ eval "$cc_set_libc" + - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl ++ # Second heuristic to detect musl libc. ++ if [ "$LIBC" = unknown ] && ++ command -v ldd >/dev/null && ++ ldd --version 2>&1 | grep -q ^musl; then ++ LIBC=musl ++ fi ++ ++ # If the system lacks a compiler, then just pick glibc. ++ # We could probably try harder. ++ if [ "$LIBC" = unknown ]; then ++ LIBC=gnu + fi + ;; +esac + +# Note: order is significant - the case branches are not exclusive. + - case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in ++case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - "/sbin/$sysctl" 2>/dev/null || \ - "/usr/sbin/$sysctl" 2>/dev/null || \ ++ /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ ++ /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + echo unknown)` - case "$UNAME_MACHINE_ARCH" in ++ case $UNAME_MACHINE_ARCH in ++ aarch64eb) machine=aarch64_be-unknown ;; + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine="${arch}${endian}"-unknown ++ machine=${arch}${endian}-unknown + ;; - *) machine="$UNAME_MACHINE_ARCH"-unknown ;; ++ *) machine=$UNAME_MACHINE_ARCH-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently (or will in the future) and ABI. - case "$UNAME_MACHINE_ARCH" in ++ case $UNAME_MACHINE_ARCH in + earm*) + os=netbsdelf + ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval "$set_cc_for_build" ++ set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # Determine ABI tags. - case "$UNAME_MACHINE_ARCH" in ++ case $UNAME_MACHINE_ARCH in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. - case "$UNAME_VERSION" in ++ case $UNAME_VERSION in + Debian*) + release='-gnu' + ;; + *) + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi-}" - exit ;; ++ GUESS=$machine-${os}${release}${abi-} ++ ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" - exit ;; ++ GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE ++ ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" - exit ;; ++ GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE ++ ;; ++ *:SecBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` ++ GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE ++ ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" - exit ;; ++ GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE ++ ;; + *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" - exit ;; ++ GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE ++ ;; + *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" - exit ;; ++ GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE ++ ;; + *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" - exit ;; ++ GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE ++ ;; ++ *:OS108:*:*) ++ GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE ++ ;; + macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" - exit ;; ++ GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE ++ ;; + *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" - exit ;; ++ GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE ++ ;; + *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix - exit ;; ++ GUESS=$UNAME_MACHINE-unknown-sortix ++ ;; ++ *:Twizzler:*:*) ++ GUESS=$UNAME_MACHINE-unknown-twizzler ++ ;; + *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox - exit ;; ++ GUESS=$UNAME_MACHINE-unknown-redox ++ ;; + mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; ++ GUESS=mips-dec-osf1 ++ ;; + alpha:OSF1:*:*) ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ trap '' 0 + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in ++ case $ALPHA_CPU_TYPE in + "EV4 (21064)") + UNAME_MACHINE=alpha ;; + "EV4.5 (21064)") + UNAME_MACHINE=alpha ;; + "LCA4 (21066/21068)") + UNAME_MACHINE=alpha ;; + "EV5 (21164)") + UNAME_MACHINE=alphaev5 ;; + "EV5.6 (21164A)") + UNAME_MACHINE=alphaev56 ;; + "EV5.6 (21164PC)") + UNAME_MACHINE=alphapca56 ;; + "EV5.7 (21164PC)") + UNAME_MACHINE=alphapca57 ;; + "EV6 (21264)") + UNAME_MACHINE=alphaev6 ;; + "EV6.7 (21264A)") + UNAME_MACHINE=alphaev67 ;; + "EV6.8CB (21264C)") + UNAME_MACHINE=alphaev68 ;; + "EV6.8AL (21264B)") + UNAME_MACHINE=alphaev68 ;; + "EV6.8CX (21264D)") + UNAME_MACHINE=alphaev68 ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE=alphaev69 ;; + "EV7 (21364)") + UNAME_MACHINE=alphaev7 ;; + "EV7.9 (21364A)") + UNAME_MACHINE=alphaev79 ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; ++ OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` ++ GUESS=$UNAME_MACHINE-dec-osf$OSF_REL ++ ;; + Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; ++ GUESS=m68k-unknown-sysv4 ++ ;; + *:[Aa]miga[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-amigaos - exit ;; ++ GUESS=$UNAME_MACHINE-unknown-amigaos ++ ;; + *:[Mm]orph[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-morphos - exit ;; ++ GUESS=$UNAME_MACHINE-unknown-morphos ++ ;; + *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; ++ GUESS=i370-ibm-openedition ++ ;; + *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; ++ GUESS=s390-ibm-zvmoe ++ ;; + *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; ++ GUESS=powerpc-ibm-os400 ++ ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix"$UNAME_RELEASE" - exit ;; ++ GUESS=arm-acorn-riscix$UNAME_RELEASE ++ ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; ++ GUESS=arm-unknown-riscos ++ ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; ++ GUESS=hppa1.1-hitachi-hiuxmpp ++ ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; ++ case `(/bin/universe) 2>/dev/null` in ++ att) GUESS=pyramid-pyramid-sysv3 ;; ++ *) GUESS=pyramid-pyramid-bsd ;; ++ esac ++ ;; + NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; ++ GUESS=pyramid-pyramid-svr4 ++ ;; + DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; ++ GUESS=sparc-icl-nx6 ++ ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; ++ sparc) GUESS=sparc-icl-nx7 ;; ++ esac *** 6630 LINES SKIPPED *** From nobody Fri Mar 31 19:55: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 4Pp9yH2F9bz43BR0; Fri, 31 Mar 2023 19:55: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 4Pp9yH101Dz3NVd; Fri, 31 Mar 2023 19: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=1680292551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WueU7HbrVmhOKqwn58IYPPKmb34gqq/pISH3NyRJZ/E=; b=sqGukqAWbsf8FaYQXIFY5/ISaQol5OrfcJ+j8vDZmtNqISfGLsaFSKUpqZFAycvR9joRXy DWdwIrocq5uBH8NQNd4a3CgxaL3dcrWlRvn4Q1jnDodcHy80sxjNbe5T/PqKuBuOxXHlc4 eno36vqj9K0WQoSFOf45jCfY5iJG9BrLf1QLSqmPDqP6hJQsvgvEE9Jja7gVp75/rrBrCK fNgD+0T8ucyRLScJMOyk0hQequERWTkaVAKAVTw5hskRUYHxaPnKY4We2+1uQzAu4DAYht i7BnMiWbeSq6cCAhKZkypgs5Ca3+lFhTGQ/78Pdmj6HrxVK47LfQM1Vc/q6egw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680292551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WueU7HbrVmhOKqwn58IYPPKmb34gqq/pISH3NyRJZ/E=; b=YjP0Uv7BU11lejAWH72hQN/z5eh6xr1KxYzouenHW4XAH+8QtqHMGwCSGxP9Be5Pk97bxS ZGGAtgpg2eTtRhvxJWlYAJ7Ztl+NE8vjbAEvr0guL4i7c9ctkQCUKYeeC5++Fm6FGV89xV 1ShzuzCZ/qAcCRq7JDFOCa6Oiat1EfBrGn70lQQv8S/jNNEsicJ7TR47yD65RK6fo44WAt y/ODFOH73BS+mU0G4efOZDTdQ6OXJVW3yyjwsp9lBvF9V2b1Wrs+vhAuADFZmEYGX7aUUT GIQ0ExrhEHC+Q5Lh5aw3u2GsPuupmhF8jb8c/PWD24rWHHNvupQK7kgY8Po3yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680292551; a=rsa-sha256; cv=none; b=qXgn966CTvUHT6lOAEJah86/fg/3+6Ew61FxqBb/x2K7Orz7hVU0RhbkjsdWKLR7VxIbxG z/8s5JGVYwXaTeATGUlCXGmJ/59KgYEaJdhekE3yoyL20cZ06QlTMb88ItufEgLyuFMjmh w11ZNPzV3nFiJ0FIGGMLI8W7q/v7vPlszPYCrnT1gghS9IaRvNG8ynRifgR018kxLlOhwZ UD3FtGL6l9XhIjY2fw5BCbAkbP4wUW92qnLn+DxKItLf/Vs1V6sWojTfyK79tj1OvKIpdj GsdAxcmM+by9C+3bNaWf9E0GTUTK1YhHud4DzdigSw7JKX7N88QD8DoXtvPuQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pp9yH01pwz16L5; Fri, 31 Mar 2023 19:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VJtoXa075716; Fri, 31 Mar 2023 19:55:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VJtoHY075715; Fri, 31 Mar 2023 19:55:50 GMT (envelope-from git) Date: Fri, 31 Mar 2023 19:55:50 GMT Message-Id: <202303311955.32VJtoHY075715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Yuri Pankov Subject: git: 21f4e817fde7 - stable/13 - hv_hid: Hyper-V HID 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: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 21f4e817fde79d5de79bfbdf180d358ca5f48bf9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=21f4e817fde79d5de79bfbdf180d358ca5f48bf9 commit 21f4e817fde79d5de79bfbdf180d358ca5f48bf9 Author: Yuri AuthorDate: 2023-02-05 15:32:08 +0000 Commit: Yuri Pankov CommitDate: 2023-03-31 18:44:04 +0000 hv_hid: Hyper-V HID driver Hyper-V HID driver using hidbus/hms. Reviewed by: wulf MFC after: 1 week PR: 221074 Differential revision: https://reviews.freebsd.org/D38140 (cherry picked from commit e4d3f1e40ab3327e4ff6f689f54a64bd2ebc0568) --- sys/amd64/conf/NOTES | 1 + sys/conf/files.x86 | 1 + sys/dev/hid/hidbus.c | 1 + sys/dev/hyperv/input/hv_hid.c | 564 ++++++++++++++++++++++++++++++++++++++++ sys/i386/conf/NOTES | 1 + sys/modules/hyperv/Makefile | 2 +- sys/modules/hyperv/hid/Makefile | 12 + 7 files changed, 581 insertions(+), 1 deletion(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 300a8a48bab7..a72e9f2623bb 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -508,6 +508,7 @@ device kvm_clock # KVM paravirtual clock driver # Microsoft Hyper-V enhancement support device hyperv # HyperV drivers +device hvhid # HyperV HID device # Xen HVM Guest Optimizations options XENHVM # Xen HVM kernel infrastructure diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index a5a565483fe8..07ecb9fe1e01 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -134,6 +134,7 @@ dev/hwpmc/hwpmc_uncore.c optional hwpmc dev/hwpmc/hwpmc_tsc.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc dev/hyperv/hvsock/hv_sock.c optional hyperv +dev/hyperv/input/hv_hid.c optional hyperv hvhid dev/hyperv/input/hv_kbd.c optional hyperv dev/hyperv/input/hv_kbdc.c optional hyperv dev/hyperv/pcib/vmbus_pcib.c optional hyperv pci diff --git a/sys/dev/hid/hidbus.c b/sys/dev/hid/hidbus.c index 9ff00fece820..c10f17748e8d 100644 --- a/sys/dev/hid/hidbus.c +++ b/sys/dev/hid/hidbus.c @@ -926,5 +926,6 @@ driver_t hidbus_driver = { MODULE_DEPEND(hidbus, hid, 1, 1, 1); MODULE_VERSION(hidbus, 1); +DRIVER_MODULE(hidbus, hvhid, hidbus_driver, hidbus_devclass, 0, 0); DRIVER_MODULE(hidbus, iichid, hidbus_driver, hidbus_devclass, 0, 0); DRIVER_MODULE(hidbus, usbhid, hidbus_driver, hidbus_devclass, 0, 0); diff --git a/sys/dev/hyperv/input/hv_hid.c b/sys/dev/hyperv/input/hv_hid.c new file mode 100644 index 000000000000..d576b292e12e --- /dev/null +++ b/sys/dev/hyperv/input/hv_hid.c @@ -0,0 +1,564 @@ +/*- + * Copyright (c) 2017 Microsoft Corp. + * Copyright (c) 2023 Yuri + * + * 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. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +#include +#include +#include +#include +#include + +#include "hid_if.h" +#include "vmbus_if.h" + +#define HV_HID_VER_MAJOR 2 +#define HV_HID_VER_MINOR 0 +#define HV_HID_VER (HV_HID_VER_MINOR | (HV_HID_VER_MAJOR) << 16) + +#define HV_BUFSIZ (4 * PAGE_SIZE) +#define HV_HID_RINGBUFF_SEND_SZ (10 * PAGE_SIZE) +#define HV_HID_RINGBUFF_RECV_SZ (10 * PAGE_SIZE) + +typedef struct { + device_t dev; + struct mtx mtx; + /* vmbus */ + struct vmbus_channel *hs_chan; + struct vmbus_xact_ctx *hs_xact_ctx; + uint8_t *buf; + int buflen; + /* hid */ + struct hid_device_info hdi; + hid_intr_t *intr; + bool intr_on; + void *intr_ctx; + uint8_t *rdesc; +} hv_hid_sc; + +typedef enum { + SH_PROTO_REQ, + SH_PROTO_RESP, + SH_DEVINFO, + SH_DEVINFO_ACK, + SH_INPUT_REPORT, +} sh_msg_type; + +typedef struct { + sh_msg_type type; + uint32_t size; +} __packed sh_msg_hdr; + +typedef struct { + sh_msg_hdr hdr; + char data[]; +} __packed sh_msg; + +typedef struct { + sh_msg_hdr hdr; + uint32_t ver; +} __packed sh_proto_req; + +typedef struct { + sh_msg_hdr hdr; + uint32_t ver; + uint32_t app; +} __packed sh_proto_resp; + +typedef struct { + u_int size; + u_short vendor; + u_short product; + u_short version; + u_short reserved[11]; +} __packed sh_devinfo; + +/* Copied from linux/hid.h */ +typedef struct { + uint8_t bDescriptorType; + uint16_t wDescriptorLength; +} __packed sh_hcdesc; + +typedef struct { + uint8_t bLength; + uint8_t bDescriptorType; + uint16_t bcdHID; + uint8_t bCountryCode; + uint8_t bNumDescriptors; + sh_hcdesc hcdesc[1]; +} __packed sh_hdesc; + +typedef struct { + sh_msg_hdr hdr; + sh_devinfo devinfo; + sh_hdesc hdesc; +} __packed sh_devinfo_resp; + +typedef struct { + sh_msg_hdr hdr; + uint8_t rsvd; +} __packed sh_devinfo_ack; + +typedef struct { + sh_msg_hdr hdr; + char buffer[]; +} __packed sh_input_report; + +typedef enum { + HV_HID_MSG_INVALID, + HV_HID_MSG_DATA, +} hv_hid_msg_type; + +typedef struct { + hv_hid_msg_type type; + uint32_t size; + char data[]; +} hv_hid_pmsg; + +typedef struct { + hv_hid_msg_type type; + uint32_t size; + union { + sh_msg msg; + sh_proto_req req; + sh_proto_resp resp; + sh_devinfo_resp dresp; + sh_devinfo_ack ack; + sh_input_report irep; + }; +} hv_hid_msg; + +#define HV_HID_REQ_SZ (sizeof(hv_hid_pmsg) + sizeof(sh_proto_req)) +#define HV_HID_RESP_SZ (sizeof(hv_hid_pmsg) + sizeof(sh_proto_resp)) +#define HV_HID_ACK_SZ (sizeof(hv_hid_pmsg) + sizeof(sh_devinfo_ack)) + +/* Somewhat arbitrary, enough to get the devinfo response */ +#define HV_HID_REQ_MAX 256 +#define HV_HID_RESP_MAX 256 + +static const struct vmbus_ic_desc vmbus_hid_descs[] = { + { + .ic_guid = { .hv_guid = { + 0x9e, 0xb6, 0xa8, 0xcf, 0x4a, 0x5b, 0xc0, 0x4c, + 0xb9, 0x8b, 0x8b, 0xa1, 0xa1, 0xf3, 0xf9, 0x5a} }, + .ic_desc = "Hyper-V HID device" + }, + VMBUS_IC_DESC_END +}; + +/* TODO: add GUID support to devmatch(8) to export vmbus_hid_descs directly */ +const struct { + char *guid; +} vmbus_hid_descs_pnp[] = {{ "cfa8b69e-5b4a-4cc0-b98b-8ba1a1f3f95a" }}; + +static int hv_hid_attach(device_t dev); +static int hv_hid_detach(device_t dev); + +static int +hv_hid_connect_vsp(hv_hid_sc *sc) +{ + struct vmbus_xact *xact; + hv_hid_msg *req; + const hv_hid_msg *resp; + size_t resplen; + int ret; + + xact = vmbus_xact_get(sc->hs_xact_ctx, HV_HID_REQ_SZ); + if (xact == NULL) { + device_printf(sc->dev, "no xact for init"); + return (ENODEV); + } + req = vmbus_xact_req_data(xact); + req->type = HV_HID_MSG_DATA; + req->size = sizeof(sh_proto_req); + req->req.hdr.type = SH_PROTO_REQ; + req->req.hdr.size = sizeof(u_int); + req->req.ver = HV_HID_VER; + + vmbus_xact_activate(xact); + ret = vmbus_chan_send(sc->hs_chan, + VMBUS_CHANPKT_TYPE_INBAND, + VMBUS_CHANPKT_FLAG_RC, + req, HV_HID_REQ_SZ, (uint64_t)(uintptr_t)xact); + if (ret != 0) { + device_printf(sc->dev, "failed to send proto req\n"); + vmbus_xact_deactivate(xact); + return (ret); + } + resp = vmbus_chan_xact_wait(sc->hs_chan, xact, &resplen, true); + if (resplen != HV_HID_RESP_SZ || !resp->resp.app) { + device_printf(sc->dev, "proto req failed\n"); + ret = ENODEV; + } + + vmbus_xact_put(xact); + return (ret); +} + +static void +hv_hid_receive(hv_hid_sc *sc, struct vmbus_chanpkt_hdr *pkt) +{ + const hv_hid_msg *msg; + sh_msg_type msg_type; + uint32_t msg_len; + void *rdesc; + + msg = VMBUS_CHANPKT_CONST_DATA(pkt); + msg_len = VMBUS_CHANPKT_DATALEN(pkt); + + if (msg->type != HV_HID_MSG_DATA) + return; + + if (msg_len <= sizeof(hv_hid_pmsg)) { + device_printf(sc->dev, "invalid packet length\n"); + return; + } + msg_type = msg->msg.hdr.type; + switch (msg_type) { + case SH_PROTO_RESP: { + struct vmbus_xact_ctx *xact_ctx; + + xact_ctx = sc->hs_xact_ctx; + if (xact_ctx != NULL) { + vmbus_xact_ctx_wakeup(xact_ctx, + VMBUS_CHANPKT_CONST_DATA(pkt), + VMBUS_CHANPKT_DATALEN(pkt)); + } + break; + } + case SH_DEVINFO: { + struct vmbus_xact *xact; + struct hid_device_info *hdi; + hv_hid_msg ack; + const sh_devinfo *devinfo; + const sh_hdesc *hdesc; + + /* Send ack */ + ack.type = HV_HID_MSG_DATA; + ack.size = sizeof(sh_devinfo_ack); + ack.ack.hdr.type = SH_DEVINFO_ACK; + ack.ack.hdr.size = 1; + ack.ack.rsvd = 0; + + xact = vmbus_xact_get(sc->hs_xact_ctx, HV_HID_ACK_SZ); + if (xact == NULL) + break; + vmbus_xact_activate(xact); + (void) vmbus_chan_send(sc->hs_chan, VMBUS_CHANPKT_TYPE_INBAND, + 0, &ack, HV_HID_ACK_SZ, (uint64_t)(uintptr_t)xact); + vmbus_xact_deactivate(xact); + vmbus_xact_put(xact); + + /* Check for resume from hibernation */ + if (sc->rdesc != NULL) + break; + + /* Parse devinfo response */ + devinfo = &msg->dresp.devinfo; + hdesc = &msg->dresp.hdesc; + if (hdesc->bLength == 0) + break; + hdi = &sc->hdi; + memset(hdi, 0, sizeof(*hdi)); + hdi->rdescsize = le16toh(hdesc->hcdesc[0].wDescriptorLength); + if (hdi->rdescsize == 0) + break; + strlcpy(hdi->name, "Hyper-V", sizeof(hdi->name)); + hdi->idBus = BUS_VIRTUAL; + hdi->idVendor = le16toh(devinfo->vendor); + hdi->idProduct = le16toh(devinfo->product); + hdi->idVersion = le16toh(devinfo->version); + /* Save rdesc copy */ + rdesc = malloc(hdi->rdescsize, M_DEVBUF, M_WAITOK | M_ZERO); + memcpy(rdesc, (const uint8_t *)hdesc + hdesc->bLength, + hdi->rdescsize); + mtx_lock(&sc->mtx); + sc->rdesc = rdesc; + wakeup(sc); + mtx_unlock(&sc->mtx); + break; + } + case SH_INPUT_REPORT: { + mtx_lock(&sc->mtx); + if (sc->intr != NULL && sc->intr_on) + sc->intr(sc->intr_ctx, + __DECONST(void *, msg->irep.buffer), + msg->irep.hdr.size); + mtx_unlock(&sc->mtx); + break; + } + default: + break; + } +} + +static void +hv_hid_read_channel(struct vmbus_channel *channel, void *ctx) +{ + hv_hid_sc *sc; + uint8_t *buf; + int buflen; + int ret; + + sc = ctx; + buf = sc->buf; + buflen = sc->buflen; + for (;;) { + struct vmbus_chanpkt_hdr *pkt; + int rcvd; + + pkt = (struct vmbus_chanpkt_hdr *)buf; + rcvd = buflen; + ret = vmbus_chan_recv_pkt(channel, pkt, &rcvd); + if (__predict_false(ret == ENOBUFS)) { + buflen = sc->buflen * 2; + while (buflen < rcvd) + buflen *= 2; + buf = malloc(buflen, M_DEVBUF, M_WAITOK | M_ZERO); + device_printf(sc->dev, "expand recvbuf %d -> %d\n", + sc->buflen, buflen); + free(sc->buf, M_DEVBUF); + sc->buf = buf; + sc->buflen = buflen; + continue; + } else if (__predict_false(ret == EAGAIN)) { + /* No more channel packets; done! */ + break; + } + KASSERT(ret == 0, ("vmbus_chan_recv_pkt failed: %d", ret)); + + switch (pkt->cph_type) { + case VMBUS_CHANPKT_TYPE_COMP: + case VMBUS_CHANPKT_TYPE_RXBUF: + device_printf(sc->dev, "unhandled event: %d\n", + pkt->cph_type); + break; + case VMBUS_CHANPKT_TYPE_INBAND: + hv_hid_receive(sc, pkt); + break; + default: + device_printf(sc->dev, "unknown event: %d\n", + pkt->cph_type); + break; + } + } +} + +static int +hv_hid_probe(device_t dev) +{ + device_t bus; + const struct vmbus_ic_desc *d; + + if (resource_disabled(device_get_name(dev), 0)) + return (ENXIO); + + bus = device_get_parent(dev); + for (d = vmbus_hid_descs; d->ic_desc != NULL; ++d) { + if (VMBUS_PROBE_GUID(bus, dev, &d->ic_guid) == 0) { + device_set_desc(dev, d->ic_desc); + return (BUS_PROBE_DEFAULT); + } + } + + return (ENXIO); +} + +static int +hv_hid_attach(device_t dev) +{ + device_t child; + hv_hid_sc *sc; + int ret; + + sc = device_get_softc(dev); + sc->dev = dev; + mtx_init(&sc->mtx, "hvhid lock", NULL, MTX_DEF); + sc->hs_chan = vmbus_get_channel(dev); + sc->hs_xact_ctx = vmbus_xact_ctx_create(bus_get_dma_tag(dev), + HV_HID_REQ_MAX, HV_HID_RESP_MAX, 0); + if (sc->hs_xact_ctx == NULL) { + ret = ENOMEM; + goto out; + } + sc->buflen = HV_BUFSIZ; + sc->buf = malloc(sc->buflen, M_DEVBUF, M_WAITOK | M_ZERO); + vmbus_chan_set_readbatch(sc->hs_chan, false); + ret = vmbus_chan_open(sc->hs_chan, HV_HID_RINGBUFF_SEND_SZ, + HV_HID_RINGBUFF_RECV_SZ, NULL, 0, hv_hid_read_channel, sc); + if (ret != 0) + goto out; + ret = hv_hid_connect_vsp(sc); + if (ret != 0) + goto out; + + /* Wait until we have devinfo (or arbitrary timeout of 3s) */ + mtx_lock(&sc->mtx); + if (sc->rdesc == NULL) + ret = mtx_sleep(sc, &sc->mtx, 0, "hvhid", hz * 3); + mtx_unlock(&sc->mtx); + if (ret != 0) { + ret = ENODEV; + goto out; + } + child = device_add_child(sc->dev, "hidbus", -1); + if (child == NULL) { + device_printf(sc->dev, "failed to add hidbus\n"); + ret = ENOMEM; + goto out; + } + device_set_ivars(child, &sc->hdi); + ret = bus_generic_attach(dev); + if (ret != 0) + device_printf(sc->dev, "failed to attach hidbus\n"); +out: + if (ret != 0) + hv_hid_detach(dev); + return (ret); +} + +static int +hv_hid_detach(device_t dev) +{ + hv_hid_sc *sc; + int ret; + + sc = device_get_softc(dev); + ret = device_delete_children(dev); + if (ret != 0) + return (ret); + if (sc->hs_xact_ctx != NULL) + vmbus_xact_ctx_destroy(sc->hs_xact_ctx); + vmbus_chan_close(vmbus_get_channel(dev)); + free(sc->buf, M_DEVBUF); + free(sc->rdesc, M_DEVBUF); + mtx_destroy(&sc->mtx); + + return (0); +} + +static void +hv_hid_intr_setup(device_t dev, hid_intr_t intr, void *ctx, + struct hid_rdesc_info *rdesc) +{ + hv_hid_sc *sc; + + if (intr == NULL) + return; + + sc = device_get_softc(dev); + sc->intr = intr; + sc->intr_on = false; + sc->intr_ctx = ctx; + rdesc->rdsize = rdesc->isize; +} + +static void +hv_hid_intr_unsetup(device_t dev) +{ + hv_hid_sc *sc; + + sc = device_get_softc(dev); + sc->intr = NULL; + sc->intr_on = false; + sc->intr_ctx = NULL; +} + +static int +hv_hid_intr_start(device_t dev) +{ + hv_hid_sc *sc; + + sc = device_get_softc(dev); + mtx_lock(&sc->mtx); + sc->intr_on = true; + mtx_unlock(&sc->mtx); + return (0); +} + +static int +hv_hid_intr_stop(device_t dev) +{ + hv_hid_sc *sc; + + sc = device_get_softc(dev); + mtx_lock(&sc->mtx); + sc->intr_on = false; + mtx_unlock(&sc->mtx); + return (0); +} + +static int +hv_hid_get_rdesc(device_t dev, void *buf, hid_size_t len) +{ + hv_hid_sc *sc; + + sc = device_get_softc(dev); + if (len < sc->hdi.rdescsize) + return (EMSGSIZE); + memcpy(buf, sc->rdesc, len); + return (0); +} + +static device_method_t hv_hid_methods[] = { + DEVMETHOD(device_probe, hv_hid_probe), + DEVMETHOD(device_attach, hv_hid_attach), + DEVMETHOD(device_detach, hv_hid_detach), + + DEVMETHOD(hid_intr_setup, hv_hid_intr_setup), + DEVMETHOD(hid_intr_unsetup, hv_hid_intr_unsetup), + DEVMETHOD(hid_intr_start, hv_hid_intr_start), + DEVMETHOD(hid_intr_stop, hv_hid_intr_stop), + + DEVMETHOD(hid_get_rdesc, hv_hid_get_rdesc), + DEVMETHOD_END, +}; + +static driver_t hv_hid_driver = { + .name = "hvhid", + .methods = hv_hid_methods, + .size = sizeof(hv_hid_sc), +}; + +DRIVER_MODULE(hv_hid, vmbus, hv_hid_driver, NULL, NULL); +MODULE_VERSION(hv_hid, 1); +MODULE_DEPEND(hv_hid, hidbus, 1, 1, 1); +MODULE_DEPEND(hv_hid, hms, 1, 1, 1); +MODULE_DEPEND(hv_hid, vmbus, 1, 1, 1); +MODULE_PNP_INFO("Z:classid", vmbus, hv_hid, vmbus_hid_descs_pnp, + nitems(vmbus_hid_descs_pnp)); diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 763ba321380a..2c069e1c52b8 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -725,6 +725,7 @@ device kvm_clock # KVM paravirtual clock driver options HYPERV device hyperv # HyperV drivers +device hvhid # HyperV HID device ##################################################################### diff --git a/sys/modules/hyperv/Makefile b/sys/modules/hyperv/Makefile index e94b441e876d..0e9ca2495ef6 100644 --- a/sys/modules/hyperv/Makefile +++ b/sys/modules/hyperv/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR = vmbus netvsc storvsc utilities hvsock +SUBDIR = vmbus netvsc storvsc utilities hvsock hid .include diff --git a/sys/modules/hyperv/hid/Makefile b/sys/modules/hyperv/hid/Makefile new file mode 100644 index 000000000000..40b991065d2a --- /dev/null +++ b/sys/modules/hyperv/hid/Makefile @@ -0,0 +1,12 @@ +# $FreeBSD$ + +.PATH: ${SRCTOP}/sys/dev/hyperv/input + +KMOD= hv_hid +SRCS= hv_hid.c +SRCS+= bus_if.h device_if.h hid_if.h vmbus_if.h + +CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/include \ + -I${SRCTOP}/sys/dev/hyperv/vmbus + +.include From nobody Fri Mar 31 20:00: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 4PpB3Q0FjKz43BkS; Fri, 31 Mar 2023 20:00: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 4PpB3P5l3pz3PB1; Fri, 31 Mar 2023 20:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680292817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZUEMvSPFyYfrdAcXyDE2CznNcVv77XI0GQhpB/BmXko=; b=rJk7f5+fbcZOh9Pemclunj2KEhEUeJCbB/13YOOgak8mgFEw/AL9cAEqDN+23eTt6OotFz fAIdIop1v0sCwqVY3b8zcosq/WcxtIUOMKyEdubyqSCdlhe4Z2WiUl5mD+YjSqQfum5H5C oBh0qiJpD03hwGJpVltFnctBRvU+RtnaLfFpSN8AZKXWfED1N/yqQ6ACk3vonUdBIFl2uv MengLkC2+gNJ9vHNBI1u+gg7bi0ApG95rwEBBRguvPBvZUynziG13Pxe46lnQRY364ycBw fChLZr4E8ipPbewuArdPmfeSFZIsybxB1EzqczvCqxJ8qJRysJn9EyQKt/NVJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680292817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZUEMvSPFyYfrdAcXyDE2CznNcVv77XI0GQhpB/BmXko=; b=I8B5rm66Y+blqE1ct9Ex0c7/eeGrARoCGeGDxUlCVJCzjh/zFQZtq0/eawioox7/Xvh32g UqxgRzpsFdZEZ/giw3Su05KZLjff1BFLM2adGe6mZ1pVGZZLpexJj7A7gz3qryUjQ5rNwR PB4krflf+YBq6HmtxIaHmFs8ap+/dVhBavXCtdwao7lhZnnjYtSScZEeVtpNppCf22B2be +hfepZwn+J8OrM16AxWW64lpPyXJoFhwXBOjdQvOM8P9XN5YySSuLsninYdHqUGao6cUyk 4+m2FMMZpyvt0mEIy88mzlXgE0ktFDgM+nAv4Dy7lCmsibwD90ac+f2ppJ2T9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680292817; a=rsa-sha256; cv=none; b=PskMFRYJ0LsYqqQjnKLx2dDMXcu11XrZPUfPVr1OpNo+5eNVU13ztkIF+KOL3L2tgQSXdP ShMJGJlMxdkesT0xGhlqsFxGeR1poAitR2o/JQPDxzfqFTRjNrPcFekZdtXHLGqEyUMe0C dOnz/5CNvQh+M+VGZBKPtgEbYkQx/LIoUqT7/QycLoyB7KpW5p6iltLKbPjAkt3zrTHRV5 bZrvlxyJ20IjlISf7pTt0cB40AR+vxn3QoVDlRZfng4FT4H/w/1vrXB6nSmyDduxiWL9Oa bjIFQ2AzKYrrJtfyjuL4jN4jONBHdFfdHQQ1pkwhCVHSHINr+wD0DBClTrQ/8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpB3P4nPgz16LC; Fri, 31 Mar 2023 20:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VK0HnK085819; Fri, 31 Mar 2023 20:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VK0Hd4085811; Fri, 31 Mar 2023 20:00:17 GMT (envelope-from git) Date: Fri, 31 Mar 2023 20:00:17 GMT Message-Id: <202303312000.32VK0Hd4085811@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: 8ac540d3b8bf - main - LinuxKPI: 802.11: adjust locking List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: 8ac540d3b8bf9746216c4687b4629296357cf146 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8ac540d3b8bf9746216c4687b4629296357cf146 commit 8ac540d3b8bf9746216c4687b4629296357cf146 Author: Bjoern A. Zeeb AuthorDate: 2023-03-31 19:52:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-03-31 19:59:50 +0000 LinuxKPI: 802.11: adjust locking Split up the lhw lock and the scan lock. The latter is a mtx while the former changes from mtx to sx as mac80211 downcalls may sleep (and the ic lock is not usable in that case either and a larger project to fix). This will also enforce some lookups under lock (mostly scan) as well as general protection for more compat code and avoid a possible deadlock with one of the upcoming callbacks from driver into the compat code. Sponsored by: The FreeBSD Foundation MFC after: 7 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 92 +++++++++++++++++++++++----- sys/compat/linuxkpi/common/src/linux_80211.h | 37 ++++++++--- 2 files changed, 105 insertions(+), 24 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 3b276fa2f2ec..453230d54452 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2022 The FreeBSD Foundation + * Copyright (c) 2020-2023 The FreeBSD Foundation * Copyright (c) 2020-2022 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from @@ -792,8 +792,12 @@ lkpi_stop_hw_scan(struct lkpi_hw *lhw, struct ieee80211_vif *vif) { struct ieee80211_hw *hw; int error; + bool cancel; - if ((lhw->scan_flags & LKPI_LHW_SCAN_RUNNING) == 0) + LKPI_80211_LHW_SCAN_LOCK(lhw); + cancel = (lhw->scan_flags & LKPI_LHW_SCAN_RUNNING) != 0; + LKPI_80211_LHW_SCAN_UNLOCK(lhw); + if (!cancel) return; hw = LHW_TO_HW(lhw); @@ -802,13 +806,18 @@ lkpi_stop_hw_scan(struct lkpi_hw *lhw, struct ieee80211_vif *vif) LKPI_80211_LHW_LOCK(lhw); /* Need to cancel the scan. */ lkpi_80211_mo_cancel_hw_scan(hw, vif); + LKPI_80211_LHW_UNLOCK(lhw); /* Need to make sure we see ieee80211_scan_completed. */ - error = msleep(lhw, &lhw->mtx, 0, "lhwscanstop", hz/2); - LKPI_80211_LHW_UNLOCK(lhw); + LKPI_80211_LHW_SCAN_LOCK(lhw); + if ((lhw->scan_flags & LKPI_LHW_SCAN_RUNNING) != 0) + error = msleep(lhw, &lhw->scan_mtx, 0, "lhwscanstop", hz/2); + cancel = (lhw->scan_flags & LKPI_LHW_SCAN_RUNNING) != 0; + LKPI_80211_LHW_SCAN_UNLOCK(lhw); + IEEE80211_LOCK(lhw->ic); - if ((lhw->scan_flags & LKPI_LHW_SCAN_RUNNING) != 0) + if (cancel) ic_printf(lhw->ic, "%s: failed to cancel scan: %d (%p, %p)\n", __func__, error, lhw, vif); } @@ -935,6 +944,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int ni = ieee80211_ref_node(vap->iv_bss); IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); /* Add chanctx (or if exists, change it). */ if (vif->chanctx_conf != NULL) { @@ -1078,6 +1088,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int */ out: + LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); if (ni != NULL) ieee80211_free_node(ni); @@ -1110,6 +1121,7 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); /* flush, drop. */ lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); @@ -1170,6 +1182,7 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int } out: + LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); if (ni != NULL) ieee80211_free_node(ni); @@ -1205,6 +1218,7 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in vif = LVIF_TO_VIF(lvif); IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); ni = NULL; /* Finish auth. */ @@ -1252,6 +1266,7 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in */ out: + LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); if (ni != NULL) ieee80211_free_node(ni); @@ -1278,6 +1293,7 @@ lkpi_sta_a_to_a(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) ni = ieee80211_ref_node(vap->iv_bss); IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); lsta = ni->ni_drv_data; IMPROVE("event callback?"); @@ -1300,6 +1316,7 @@ lkpi_sta_a_to_a(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) lsta->in_mgd = true; } + LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); if (ni != NULL) ieee80211_free_node(ni); @@ -1334,6 +1351,7 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i lkpi_lsta_dump(lsta, ni, __func__, __LINE__); IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); /* flush, drop. */ lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); @@ -1347,6 +1365,7 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i lsta->in_mgd = true; } + LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); /* Call iv_newstate first so we get potential DISASSOC packet out. */ @@ -1355,6 +1374,7 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i goto outni; IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1438,6 +1458,7 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i error = EALREADY; out: + LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); outni: if (ni != NULL) @@ -1498,6 +1519,7 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int vif = LVIF_TO_VIF(lvif); IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); ni = NULL; IMPROVE("ponder some of this moved to ic_newassoc, scan_assoc_success, " @@ -1608,6 +1630,7 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); out: + LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); if (ni != NULL) ieee80211_free_node(ni); @@ -1654,6 +1677,7 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); /* flush, drop. */ lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); @@ -1667,6 +1691,7 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta->in_mgd = true; } + LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); /* Call iv_newstate first so we get potential DISASSOC packet out. */ @@ -1675,6 +1700,7 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int goto outni; IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1729,6 +1755,7 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int error = EALREADY; out: + LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); outni: if (ni != NULL) @@ -1763,6 +1790,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); /* flush, drop. */ lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); @@ -1776,6 +1804,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta->in_mgd = true; } + LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); /* Call iv_newstate first so we get potential DISASSOC packet out. */ @@ -1784,6 +1813,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int goto outni; IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1890,6 +1920,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int error = EALREADY; out: + LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); outni: if (ni != NULL) @@ -2439,6 +2470,8 @@ lkpi_ic_parent(struct ieee80211com *ic) hw = LHW_TO_HW(lhw); start_all = false; + /* IEEE80211_UNLOCK(ic); */ + LKPI_80211_LHW_LOCK(lhw); if (ic->ic_nrunning > 0) { error = lkpi_80211_mo_start(hw); if (error == 0) @@ -2446,6 +2479,8 @@ lkpi_ic_parent(struct ieee80211com *ic) } else { lkpi_80211_mo_stop(hw); } + LKPI_80211_LHW_UNLOCK(lhw); + /* IEEE80211_LOCK(ic); */ if (start_all) ieee80211_start_all(ic); @@ -2587,12 +2622,17 @@ lkpi_ic_scan_start(struct ieee80211com *ic) struct ieee80211_scan_state *ss; struct ieee80211vap *vap; int error; + bool is_hw_scan; lhw = ic->ic_softc; + LKPI_80211_LHW_SCAN_LOCK(lhw); if ((lhw->scan_flags & LKPI_LHW_SCAN_RUNNING) != 0) { /* A scan is still running. */ + LKPI_80211_LHW_SCAN_UNLOCK(lhw); return; } + is_hw_scan = (lhw->scan_flags & LKPI_LHW_SCAN_HW) != 0; + LKPI_80211_LHW_SCAN_UNLOCK(lhw); ss = ic->ic_scan; vap = ss->ss_vap; @@ -2602,7 +2642,7 @@ lkpi_ic_scan_start(struct ieee80211com *ic) } hw = LHW_TO_HW(lhw); - if ((lhw->scan_flags & LKPI_LHW_SCAN_HW) == 0) { + if (!is_hw_scan) { /* If hw_scan is cleared clear FEXT_SCAN_OFFLOAD too. */ vap->iv_flags_ext &= ~IEEE80211_FEXT_SCAN_OFFLOAD; sw_scan: @@ -2747,7 +2787,9 @@ sw_scan: * not possible. Fall back to sw scan in that case. */ if (error == 1) { + LKPI_80211_LHW_SCAN_LOCK(lhw); lhw->scan_flags &= ~LKPI_LHW_SCAN_HW; + LKPI_80211_LHW_SCAN_UNLOCK(lhw); ieee80211_start_scan(vap, IEEE80211_SCAN_ACTIVE | IEEE80211_SCAN_NOPICK | @@ -2769,13 +2811,18 @@ static void lkpi_ic_scan_end(struct ieee80211com *ic) { struct lkpi_hw *lhw; + bool is_hw_scan; lhw = ic->ic_softc; + LKPI_80211_LHW_SCAN_LOCK(lhw); if ((lhw->scan_flags & LKPI_LHW_SCAN_RUNNING) == 0) { + LKPI_80211_LHW_SCAN_UNLOCK(lhw); return; } + is_hw_scan = (lhw->scan_flags & LKPI_LHW_SCAN_HW) != 0; + LKPI_80211_LHW_SCAN_UNLOCK(lhw); - if ((lhw->scan_flags & LKPI_LHW_SCAN_HW) == 0) { + if (!is_hw_scan) { struct ieee80211_scan_state *ss; struct ieee80211vap *vap; struct ieee80211_hw *hw; @@ -2802,9 +2849,13 @@ lkpi_ic_scan_curchan(struct ieee80211_scan_state *ss, unsigned long maxdwell) { struct lkpi_hw *lhw; + bool is_hw_scan; lhw = ss->ss_ic->ic_softc; - if ((lhw->scan_flags & LKPI_LHW_SCAN_HW) == 0) + LKPI_80211_LHW_SCAN_LOCK(lhw); + is_hw_scan = (lhw->scan_flags & LKPI_LHW_SCAN_HW) != 0; + LKPI_80211_LHW_SCAN_UNLOCK(lhw); + if (!is_hw_scan) lhw->ic_scan_curchan(ss, maxdwell); } @@ -2812,9 +2863,13 @@ static void lkpi_ic_scan_mindwell(struct ieee80211_scan_state *ss) { struct lkpi_hw *lhw; + bool is_hw_scan; lhw = ss->ss_ic->ic_softc; - if ((lhw->scan_flags & LKPI_LHW_SCAN_HW) == 0) + LKPI_80211_LHW_SCAN_LOCK(lhw); + is_hw_scan = (lhw->scan_flags & LKPI_LHW_SCAN_HW) != 0; + LKPI_80211_LHW_SCAN_UNLOCK(lhw); + if (!is_hw_scan) lhw->ic_scan_mindwell(ss); } @@ -2826,6 +2881,7 @@ lkpi_ic_set_channel(struct ieee80211com *ic) struct ieee80211_channel *c; struct linuxkpi_ieee80211_channel *chan; int error; + bool hw_scan_running; lhw = ic->ic_softc; @@ -2834,8 +2890,12 @@ lkpi_ic_set_channel(struct ieee80211com *ic) return; /* If we have a hw_scan running do not switch channels. */ - if ((lhw->scan_flags & (LKPI_LHW_SCAN_RUNNING|LKPI_LHW_SCAN_HW)) == - (LKPI_LHW_SCAN_RUNNING|LKPI_LHW_SCAN_HW)) + LKPI_80211_LHW_SCAN_LOCK(lhw); + hw_scan_running = + (lhw->scan_flags & (LKPI_LHW_SCAN_RUNNING|LKPI_LHW_SCAN_HW)) == + (LKPI_LHW_SCAN_RUNNING|LKPI_LHW_SCAN_HW); + LKPI_80211_LHW_SCAN_UNLOCK(lhw); + if (hw_scan_running) return; c = ic->ic_curchan; @@ -3424,7 +3484,8 @@ linuxkpi_ieee80211_alloc_hw(size_t priv_len, const struct ieee80211_ops *ops) lhw = wiphy_priv(wiphy); lhw->ops = ops; - mtx_init(&lhw->mtx, "lhw", NULL, MTX_DEF | MTX_RECURSE); + LKPI_80211_LHW_LOCK_INIT(lhw); + LKPI_80211_LHW_SCAN_LOCK_INIT(lhw); sx_init_flags(&lhw->lvif_sx, "lhw-lvif", SX_RECURSE | SX_DUPOK); TAILQ_INIT(&lhw->lvif_head); @@ -3460,7 +3521,8 @@ linuxkpi_ieee80211_iffree(struct ieee80211_hw *hw) /* Cleanup more of lhw here or in wiphy_free()? */ sx_destroy(&lhw->lvif_sx); - mtx_destroy(&lhw->mtx); + LKPI_80211_LHW_LOCK_DESTROY(lhw); + LKPI_80211_LHW_SCAN_LOCK_DESTROY(lhw); IMPROVE(); } @@ -3867,12 +3929,12 @@ linuxkpi_ieee80211_scan_completed(struct ieee80211_hw *hw, ieee80211_scan_done(ss->ss_vap); - LKPI_80211_LHW_LOCK(lhw); + LKPI_80211_LHW_SCAN_LOCK(lhw); free(lhw->hw_req, M_LKPI80211); lhw->hw_req = NULL; lhw->scan_flags &= ~LKPI_LHW_SCAN_RUNNING; wakeup(lhw); - LKPI_80211_LHW_UNLOCK(lhw); + LKPI_80211_LHW_SCAN_UNLOCK(lhw); return; } diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 4d44ca07948e..42b4192bac63 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2022 The FreeBSD Foundation + * Copyright (c) 2020-2023 The FreeBSD Foundation * Copyright (c) 2020-2021 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from @@ -173,7 +173,7 @@ struct lkpi_hw { /* name it mac80211_sc? */ TAILQ_HEAD(, lkpi_vif) lvif_head; struct sx lvif_sx; - struct mtx mtx; + struct sx sx; uint32_t txq_generation[IEEE80211_NUM_ACS]; TAILQ_HEAD(, lkpi_txq) scheduled_txqs[IEEE80211_NUM_ACS]; @@ -195,6 +195,7 @@ struct lkpi_hw { /* name it mac80211_sc? */ #define LKPI_LHW_SCAN_RUNNING 0x00000001 #define LKPI_LHW_SCAN_HW 0x00000002 uint32_t scan_flags; + struct mtx scan_mtx; int supbands; /* Number of supported bands. */ int max_rates; /* Maximum number of bitrates supported in any channel. */ @@ -218,13 +219,31 @@ struct lkpi_wiphy { #define WIPHY_TO_LWIPHY(_wiphy) container_of(_wiphy, struct lkpi_wiphy, wiphy) #define LWIPHY_TO_WIPHY(_lwiphy) (&(_lwiphy)->wiphy) - -#define LKPI_80211_LHW_LOCK(_lhw) mtx_lock(&(_lhw)->mtx) -#define LKPI_80211_LHW_UNLOCK(_lhw) mtx_unlock(&(_lhw)->mtx) -#define LKPI_80211_LHW_LOCK_ASSERT(_lhw) \ - mtx_assert(&(_lhw)->mtx, MA_OWNED) -#define LKPI_80211_LHW_UNLOCK_ASSERT(_lhw) \ - mtx_assert(&(_lhw)->mtx, MA_NOTOWNED) +#define LKPI_80211_LHW_LOCK_INIT(_lhw) \ + sx_init_flags(&(_lhw)->sx, "lhw", SX_RECURSE); +#define LKPI_80211_LHW_LOCK_DESTROY(_lhw) \ + sx_destroy(&(_lhw)->sx); +#define LKPI_80211_LHW_LOCK(_lhw) \ + sx_xlock(&(_lhw)->sx) +#define LKPI_80211_LHW_UNLOCK(_lhw) \ + sx_xunlock(&(_lhw)->sx) +#define LKPI_80211_LHW_LOCK_ASSERT(_lhw) \ + sx_assert(&(_lhw)->sx, SA_LOCKED) +#define LKPI_80211_LHW_UNLOCK_ASSERT(_lhw) \ + sx_assert(&(_lhw)->sx, SA_UNLOCKED) + +#define LKPI_80211_LHW_SCAN_LOCK_INIT(_lhw) \ + mtx_init(&(_lhw)->scan_mtx, "lhw-scan", NULL, MTX_DEF | MTX_RECURSE); +#define LKPI_80211_LHW_SCAN_LOCK_DESTROY(_lhw) \ + mtx_destroy(&(_lhw)->scan_mtx); +#define LKPI_80211_LHW_SCAN_LOCK(_lhw) \ + mtx_lock(&(_lhw)->scan_mtx) +#define LKPI_80211_LHW_SCAN_UNLOCK(_lhw) \ + mtx_unlock(&(_lhw)->scan_mtx) +#define LKPI_80211_LHW_SCAN_LOCK_ASSERT(_lhw) \ + mtx_assert(&(_lhw)->scan_mtx, MA_OWNED) +#define LKPI_80211_LHW_SCAN_UNLOCK_ASSERT(_lhw) \ + mtx_assert(&(_lhw)->scan_mtx, MA_NOTOWNED) #define LKPI_80211_LHW_LVIF_LOCK(_lhw) sx_xlock(&(_lhw)->lvif_sx) #define LKPI_80211_LHW_LVIF_UNLOCK(_lhw) sx_xunlock(&(_lhw)->lvif_sx) From nobody Fri Mar 31 20:50: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 4PpC970GxLz43FDr for ; Fri, 31 Mar 2023 20:50: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 4PpC965Gqzz3jwt; Fri, 31 Mar 2023 20:50:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680295818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JkQ+80wz7gBaD/C9MmlJb4aGSqQeCPaW83SjH7J1FdQ=; b=EMgOb/gJb+lpeaEd8jaV2VSQPTFEyDTpXMPiemEYCvQaEgQTMUa4jcE2SricPtxK+AeWfZ PnCmgn64+cAvqQrmSb52gyxsZPh6+FkS+OVAufNwP1zhdK+6x9NUEsKgAp8Hmu8PDgXsXr /QnW8vQMMqJlg3zaFmf6RFW4rQ9JvdNd3nz0nczSYdYv89gFlqOhfAmWVTq5Tv4BNiLMLp sAvRBx3+2Gu74MxM+sC388KxW6djeWRqNOxUG5QX1OAwL0ixJt4QsVTmU5+nda1PX/Eh5v iPKBY0czbWLfl+WJHm/BxgLQMBtDRdyUxHUQuLL9ql7eBCeV08i2tsoG9AJeYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680295818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JkQ+80wz7gBaD/C9MmlJb4aGSqQeCPaW83SjH7J1FdQ=; b=WVB8N8zH1LtI6PeIEDkyy8PsyXUvZo31K99XHWWEAASDDVyTF8Qn/Quw78NiXSy3MPAfqc odpYZVDph8vvBSw+LlZjbJ/sV4dNhL6cDcBKP7km/Hwi9I18WZj9jqGMv3EuUKgZx+Chho NvMc3/xV9tJGeF7OcEepCiwa0VWeqM8ZgBYtE1u9HVFA252Ru7UmjDQkf74xhTYQGd9Es/ wzC+MGa3jnJG29tgB8yTcii/F1TZMobZA0wVvK5n1itgvIfkNlwhK+U+ISh9hORVI51Azl sL98K46Zfy6BeUDDLRG2Krg5Sf6hBDCGjBqSS8mNYbTMa5ySWsLSOXElNIH6Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680295818; a=rsa-sha256; cv=none; b=J2wuXOxVlALKacmOfSMxF/zIDxXJaa4J6a65zC6EiqT0lWBncmK/pcPUyhedGDhAIqMQYc 3AV9NFHR7WTWCAZufK81+EPnjZoKptaALKMyMDStxQalrXh9+ItVXSRc7Fr9gz6Fk1dePC k+/vMfsxvDC/o+sJucvSjV34epRxqnTD4cJLD4cUc9EF9yxCetB3s4yGsbgW1LFV0jzmUn ixUDkoBq+0qAehXxGSFyzqYv6u2Mb9hOFIjz8TGedCW4vXsu9BdURjBki85lz6B2oFHLaO rBdmoHPE7KSwUbSHno2sVZGv6y0UmaVdktTMPiedo3FBCPNYTT8nvANKFYNABQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpC964Mlbz17F6; Fri, 31 Mar 2023 20:50:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VKoIxW067535; Fri, 31 Mar 2023 20:50:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VKoIvb067534; Fri, 31 Mar 2023 20:50:18 GMT (envelope-from git) Date: Fri, 31 Mar 2023 20:50:18 GMT Message-Id: <202303312050.32VKoIvb067534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: a12250285e4f - Create tag vendor/llvm-project/llvmorg-16.0.0-0-g08d094a0e457 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/tags/vendor/llvm-project/llvmorg-16.0.0-0-g08d094a0e457 X-Git-Reftype: annotated tag X-Git-Commit: a12250285e4f498fd88482d207b66103569caa33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The annotated tag vendor/llvm-project/llvmorg-16.0.0-0-g08d094a0e457 has been created by dim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/llvm-project/llvmorg-16.0.0-0-g08d094a0e457 tag vendor/llvm-project/llvmorg-16.0.0-0-g08d094a0e457 Tagger: Dimitry Andric TaggerDate: 2023-03-31 20:49:51 +0000 Tag llvm-project branch release/16.x llvmorg-16.0.0-0-g08d094a0e457 (aka 16.0.0 release). commit 11ee15ea4ee1ea5555f8d7ba1ec5ffe956df2a8c Author: Dimitry Andric AuthorDate: 2023-03-31 20:49:22 +0000 Commit: Dimitry Andric CommitDate: 2023-03-31 20:49:22 +0000 Vendor import of llvm-project branch release/16.x llvmorg-16.0.0-0-g08d094a0e457 (aka 16.0.0 release). From nobody Fri Mar 31 20:50: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 4PpC970GySz43FYS for ; Fri, 31 Mar 2023 20:50: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 4PpC9659Dvz3jrC; Fri, 31 Mar 2023 20:50:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680295818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HcgqCXUcFnlrDhDSvAK8ZSdK7af3Vuf4unyHMqt3zCE=; b=JAI3PTovrj1xkAqNsMYU7ytoQ4deuY6t9y2C5JaJY0WmG4Cou+bejOGbQLbKyWCGDGYmO3 PaYbsIWrpHYMbNRp1G/SVn0r5bD8YO1PIU4WcieESiczuKhJ2kyaUCP05E4uAWYPeeMuC5 gjSQ6/gDUXNn8X2/IIE/Lf44Y5pYmH9t75GnUldLAMKEtEoVWADwayS8ytwxZV3lBhJ3sn X0SeRe/V814KDwWb8CWe14kqJX5sQUaMB5XL8/v2auGpYoddFAxEv0bmWhQMXc7qB5iCcH iNkr+6odA8vK1DxhTf/kQfg2nT1ecILCvuFKsvZeHops/dL2hxCTrY+fHMpYyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680295818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HcgqCXUcFnlrDhDSvAK8ZSdK7af3Vuf4unyHMqt3zCE=; b=rIdz+1FF/scPmc9C8qgGy6WNcSJ1TY849pC3XBsLV7FI9ZH6XuVF8AaLSdY/qKRU1FH7Ak 1BQVyNqw1K8JyeIQWxMHE+Al27mSFETNvQTdBNyP/KPOE0O1ugYluluePr4V6bQF/lgFZl WRl00EL+NC99kwDPM/FVyYQoSanbWyqpHyHhtTzuPoxBKhWPCoW/kMJUdrSK0AkWhR3Xiy BMoY3CpnoQS0L1LSOV+Zitup1rG+96+jec2C00baGY0EWSZ6D7/OVMm2vZIx57xeubUjjK jfPgpLU9TC+AhXdE4XYPEHR+DIxsWg0WSxzq42uif4inrfU/URvNQDxdC/l2fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680295818; a=rsa-sha256; cv=none; b=NZIOxL8W0x6/PYXXr8eYq6Y7aZGNcR1w24FczJkC1zY6KyiXoLhAFUOf/aLEkl/zucUrzX jGqvS6+tqfePHdRBC9mprsy3x7jZ1jf/QAyph5lZXZbI049i4a5PZCuw6mQejCnynVWji/ bWsUNq33l7XZPo1TVSq2d1GLgxTLxhw3lAMX6Gu++Pkj9UpSo0sXKwfYx4utTe8HG1p4gC DpeMKB0EZd3OqvpjFJB4yhp7kQWwqYwInB+Vf55RIPIMH+1D6SFKrk0M/QcOkmWIrLtLXg ySSDD1SpYdFq9mqvcIwlrpD/mDFMtrxkrGNS2NMWwV8p83cZ4JVZuxg7TDXvnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpC963xJWz170H; Fri, 31 Mar 2023 20:50:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VKoItb067516; Fri, 31 Mar 2023 20:50:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VKoIG0067515; Fri, 31 Mar 2023 20:50:18 GMT (envelope-from git) Date: Fri, 31 Mar 2023 20:50:18 GMT Message-Id: <202303312050.32VKoIG0067515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 11edbfca22fe..11ee15ea4ee1 - vendor/llvm-project/release-16.x - 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/llvm-project/release-16.x X-Git-Reftype: branch X-Git-Commit: 11ee15ea4ee1ea5555f8d7ba1ec5ffe956df2a8c X-Git-Oldrev: 11edbfca22fe6e8280caeb77832f4dfbb68ed274 X-Git-Newrev: 11ee15ea4ee1ea5555f8d7ba1ec5ffe956df2a8c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch vendor/llvm-project/release-16.x has been updated by dim: URL: https://cgit.FreeBSD.org/src/log/?id=11edbfca22fe..11ee15ea4ee1 11ee15ea4ee1 Vendor import of llvm-project branch release/16.x llvmorg-16.0.0-0-g08d094a0e457 (aka 16.0.0 release). From nobody Fri Mar 31 20:56: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 4PpCJN0LX5z43FfM for ; Fri, 31 Mar 2023 20:56: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 4PpCJM6xMDz3kmD; Fri, 31 Mar 2023 20:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680296196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rYwjWEjLfFAFw+pleuDCeC8NQgB3yb6SSBgg4XrWPNg=; b=DC1u9NGaml3sQq5IQjyUFg7P0u97IdAS/i3bj1J4yk3C8qA2JSC13sJSRn7GCjRPN0QH5u k+9AryB/O07XClywfu/NEY420aPrhqiGg2TisnnFDnCS1k4pdeFY2cUK7wD+bWpnL0G8FY UDo8qDBI9uc24vW3yYX9KKoz83jKtwsN5MU5iMUeyKekpoTloCNve7i3BbWyucfztqkbTi hQ8wrG2TVzYdqDV43x8Y89TgiTT0nKlV+Wz+gdLAdB6JQxtmanG4SFuFDnNdyoq1n4g4jL xm0uYsRRCBbCmTa6VPafqTUtGP/mP/hA9cyXX0fp39qktQcubN0nnVyXbhLj3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680296196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rYwjWEjLfFAFw+pleuDCeC8NQgB3yb6SSBgg4XrWPNg=; b=mu4uBPzXl7auiW1izHepXu6JA6q+4vhCfRUWchBVoxn0GJ138elhY9olkmdr4DJHvE/I4m L0OPR78alMoo/YaC1ayrNp4aJ1LDVooXvp6PWfJ92TGmDat7apnJb/AwbobXNtoIJKUm+H pQXPnQ7xKHxH+YB4UsZV0S1CQqqmqoLJ/flTrEiVEqzrgS9Pqp8DYxgYauQzcBXChCfwAe pazXqU5PMgsCQT+Pb2zqpW49g1bIzGKUAUCIy8nk0y6xlwyBjt9adSqJUO6nPFZjxraVJr gX+4kD+OpGujqAan0CGIXyCuwis7j/RExrwdSAHc/IbI6Lw4rmY2CA47Jp/iiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680296196; a=rsa-sha256; cv=none; b=JNKr9QvST3Pfg07O7UTWjj7ksnMUGj9a5P01lfM3/97ZNG7PyCuxb1brk7+E19+VnG+G67 PtFYGZ1ZUbq/TGsBC2iDvDlfUBPxSFwx9LjQE6UxVMp/cwtSFsFxY6WjLAkNBATJ05QGh2 UY29+5upyVTEkixrKC6yX+KgO/qx87eJlKnpjfSJZSQWG/RKmlLMDLN5zgq5YS+0yx82sy PDl/KFOBFfDKRYAAiiYDBZecCkN3KpWCmX9WKonz1KkW3nJDRep8ocLmB8WoqbMnGBKmMu VyPDS12W4d0f/4wHflzfIp6qRMzx54jeHTrvzZcNrCamfCADAQ2HoYdq0T6tBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpCJM5vdpz17jD; Fri, 31 Mar 2023 20:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VKuZ3D075010; Fri, 31 Mar 2023 20:56:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VKuZUV075009; Fri, 31 Mar 2023 20:56:35 GMT (envelope-from git) Date: Fri, 31 Mar 2023 20:56:35 GMT Message-Id: <202303312056.32VKuZUV075009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: be8907a471ba - Create tag vendor/llvm-project/llvmorg-16.0.0-45-g42d1b276f779 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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/tags/vendor/llvm-project/llvmorg-16.0.0-45-g42d1b276f779 X-Git-Reftype: annotated tag X-Git-Commit: be8907a471ba333e755a6ca24cc15701791e98a0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The annotated tag vendor/llvm-project/llvmorg-16.0.0-45-g42d1b276f779 has been created by dim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/llvm-project/llvmorg-16.0.0-45-g42d1b276f779 tag vendor/llvm-project/llvmorg-16.0.0-45-g42d1b276f779 Tagger: Dimitry Andric TaggerDate: 2023-03-31 20:56:14 +0000 Tag llvm-project branch release/16.x llvmorg-16.0.0-45-g42d1b276f779. commit 5bcd187b307a70f29854eb0c5ccdf30ff3770fe1 Author: Dimitry Andric AuthorDate: 2023-03-31 20:55:52 +0000 Commit: Dimitry Andric CommitDate: 2023-03-31 20:55:52 +0000 Vendor import of llvm-project branch release/16.x llvmorg-16.0.0-45-g42d1b276f779. From nobody Fri Mar 31 20:56: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 4PpCJN0QcRz43FnK for ; Fri, 31 Mar 2023 20:56: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 4PpCJM6lRSz3kgH; Fri, 31 Mar 2023 20:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680296195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mbl/ctB21gEdTXGXONqnFvm69d2d/zyhDqKjxDU2EjQ=; b=Vuf6yrrstSCqMN0cQe2tu8FtmcMg0sKgG5+tqlrNVIcYy1vGpVxj5WurrWXEoycQR9mXRd DdczfO41UiBeZUN/8h6SQIHXK2tvp8C740Wp5TCtjDT/B+1RhEA4skLfWUuHF+AgWWF14D mCL2AA1SeR897fT6foS2SOahCG+N6XhQ/+wWSLD+vKUOVsJhCTzZ+FGrALPcdvhardkPjK UvuijA51dmDK4zxAcR76m8PFb7VeJYVuIKAizB/zGz0acsdnYzEUohCu+8MGZ74uDPCgei jHsQn8TDR4VkK+CSwJF4CD3LkIJiINMkjth2vrK3wa5GY/3RIG3TZIkYSo0ULA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680296195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mbl/ctB21gEdTXGXONqnFvm69d2d/zyhDqKjxDU2EjQ=; b=W6M7d4MSNT1FCnyNF8Dn+hzVBFDJnK1do/9Whu0JvyTD7U24Sfo9Or8+q8dxju4aMXihmk gGisshuxdbHzLS3izzMTdCba2PfiqtOkxpeMEobA5O9KFi7oii973GkB68eHgBKIapUh6l hODVsb34xpwZKs92PU5Q8XmHRTrjK91Dg+PVvmHr/UIkyanPfXMmb8jARh3LowrLeXsxw1 nhHp2PnAN3OOYsm74thEe/XTS02ESYskDMgRsTFAo6juUPuVknkWBROESoTQ7oKR9T3qbB LM4jKAiD/O+S0SKRHNliBdFM7h5DHFuz5LjA2saJD1znKFn0+TdkKDn+WTIkmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680296195; a=rsa-sha256; cv=none; b=EAQzQS2HROH6orhEC0YUl5n0w0HXN7JwGVtpuwIn/WMmCITttg/CMqo5YwAZ+0NYAXxaBp 6l4UgGAGTq4gOAr6F1YFyF1hlL0jjB0pmf1dEytsD7UeOvGakECpS2ifFJFJf3IkUD4GHc CBjPYNQOvSZiJwm7ElehcqOCaTcQd4oI1f7G4XzQ+0h1gSkHNjPvZzOHGIxgU/UMm3nk2S c8jOFnKtlB1zJ9/XtjXEWG5HRaUShWr+QtmTaD8XUK9TBi28yOYWlkAdVcIVFhXrb7zuE/ IIUhFHsuiwjXkQxZ/hrD8G4a84wKandUySKJKBFeRkMg/Ja3vKGsQFrPK84zJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpCJM5XHCz17mM; Fri, 31 Mar 2023 20:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VKuZDa074991; Fri, 31 Mar 2023 20:56:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VKuZDC074990; Fri, 31 Mar 2023 20:56:35 GMT (envelope-from git) Date: Fri, 31 Mar 2023 20:56:35 GMT Message-Id: <202303312056.32VKuZDC074990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 11ee15ea4ee1..5bcd187b307a - vendor/llvm-project/release-16.x - 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/llvm-project/release-16.x X-Git-Reftype: branch X-Git-Commit: 5bcd187b307a70f29854eb0c5ccdf30ff3770fe1 X-Git-Oldrev: 11ee15ea4ee1ea5555f8d7ba1ec5ffe956df2a8c X-Git-Newrev: 5bcd187b307a70f29854eb0c5ccdf30ff3770fe1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch vendor/llvm-project/release-16.x has been updated by dim: URL: https://cgit.FreeBSD.org/src/log/?id=11ee15ea4ee1..5bcd187b307a 5bcd187b307a Vendor import of llvm-project branch release/16.x llvmorg-16.0.0-45-g42d1b276f779. From nobody Fri Mar 31 21:41: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 4PpDHk4Jkmz43JP0; Fri, 31 Mar 2023 21:41:06 +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 4PpDHk2FKDz3p2c; Fri, 31 Mar 2023 21:41:06 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1140:c3d:601c:1b1c:b913:8986]) (Authenticated sender: micmac) by mail-n.franken.de (Postfix) with ESMTPSA id EC671722B540A; Fri, 31 Mar 2023 23:41:01 +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.500.231\)) Subject: Re: git: fcad8ada9afc - main - Revert "Add myself (cc) as a src commiter." From: tuexen@freebsd.org In-Reply-To: Date: Fri, 31 Mar 2023 23:41:01 +0200 Cc: Cheng Cui , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <38A24743-D82B-4B3B-8A8A-2E4399198158@freebsd.org> References: <202303311358.32VDwPUA083636@gitrepo.freebsd.org> To: Zhenlei Huang X-Mailer: Apple Mail (2.3731.500.231) 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: 4PpDHk2FKDz3p2c X-Spamd-Bar: ---- 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] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N > On 31. Mar 2023, at 17:46, Zhenlei Huang wrote: >=20 > Hi Cheng, >=20 > Is there something wrong with 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0 = ? Yes, he added himself to the alumni section, not to the committer = section. Correct patch is upcoming. Best regards Michael >=20 > Best regards, > Zhenlei >=20 >> On Mar 31, 2023, at 9:58 PM, Cheng Cui wrote: >>=20 >> The branch main has been updated by cc: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dfcad8ada9afcc60cec50880e3ac95768= 1badf55f >>=20 >> commit fcad8ada9afcc60cec50880e3ac957681badf55f >> Author: Cheng Cui >> AuthorDate: 2023-03-31 06:53:16 +0000 >> Commit: Cheng Cui >> CommitDate: 2023-03-31 09:58:14 +0000 >>=20 >> Revert "Add myself (cc) as a src commiter." >>=20 >> Summary: This reverts commit = 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0. >>=20 >> Reviewers: rscheff, tuexen >> Subscribers: imp >> Approved by: tuexen (mentor) >> Differential Revision: https://reviews.freebsd.org/D39363 >> --- >> share/misc/committers-src.dot | 4 ---- >> 1 file changed, 4 deletions(-) >>=20 >> diff --git a/share/misc/committers-src.dot = b/share/misc/committers-src.dot >> index 76ab7441fd46..6e7b5b6c63b3 100644 >> --- a/share/misc/committers-src.dot >> +++ b/share/misc/committers-src.dot >> @@ -41,7 +41,6 @@ bmah [label=3D"Bruce A. = Mah\nbmah@FreeBSD.org\n2002/01/29\n2009/09/13"] >> bmilekic [label=3D"Bosko = Milekic\nbmilekic@FreeBSD.org\n2000/09/21\n2008/11/10"] >> bushman [label=3D"Michael = Bushkov\nbushman@FreeBSD.org\n2007/03/10\n2010/04/29"] >> carl [label=3D"Carl = Delsey\ncarl@FreeBSD.org\n2013/01/14\n2014/03/06"] >> -cc [label=3D"Cheng Cui\ncc@FreeBSD.org\n2023/02/15"] >> ceri [label=3D"Ceri = Davies\nceri@FreeBSD.org\n2006/11/07\n2012/03/07"] >> cjc [label=3D"Crist J. = Clark\ncjc@FreeBSD.org\n2001/06/01\n2006/12/29"] >> davidxu [label=3D"David = Xu\ndavidxu@FreeBSD.org\n2002/09/02\n2014/04/14"] >> @@ -846,8 +845,6 @@ rrs -> bcran >> rrs -> jchandra >> rrs -> tuexen >>=20 >> -rscheff -> cc >> - >> rstone -> markj >> rstone -> mjoras >>=20 >> @@ -923,7 +920,6 @@ thompsa -> eri >> trasz -> jh >> trasz -> mjg >>=20 >> -tuexen -> cc >> tuexen -> rscheff >>=20 >> ume -> jinmei >=20 >=20 >=20 From nobody Fri Mar 31 23:43: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 4PpH0h0tXcz43QVM; Fri, 31 Mar 2023 23:43:16 +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 4PpH0g1QhYz3xNT; Fri, 31 Mar 2023 23:43:15 +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 32VNh0F0027958 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 1 Apr 2023 02:43:03 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 32VNh0F0027958 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 32VNh0Xw027957; Sat, 1 Apr 2023 02:43:00 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 1 Apr 2023 02:43:00 +0300 From: Konstantin Belousov To: Ed Maste Cc: Charlie Li , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, "freebsd-x11@freebsd.org" , FreeBSD Current Subject: Re: git: 61194e9852e6 - main - Add kqueue1() syscall Message-ID: References: <202303272339.32RNdWPD063667@gitrepo.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: 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: 4PpH0g1QhYz3xNT X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Fri, Mar 31, 2023 at 01:27:54PM -0400, Ed Maste wrote: > On Fri, 31 Mar 2023 at 12:38, Charlie Li wrote: > > > > Konstantin Belousov wrote: > > > The branch main has been updated by kib: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=61194e9852e641d1533cd04a5679d6042ff975d3 > > > > > > commit 61194e9852e641d1533cd04a5679d6042ff975d3 > > > Author: Konstantin Belousov > > > AuthorDate: 2023-03-25 23:39:02 +0000 > > > Commit: Konstantin Belousov > > > CommitDate: 2023-03-27 23:39:26 +0000 > > > > > > Add kqueue1() syscall > > > > > > It takes the flags argument. Immediate use is to provide the KQUEUE_CLOEXEC > > > flag for kqueue(2). > > > > > This commit series causes x11/libinput to hit an assert (which also > > silently crashes X on launch): > > > Assertion failed: (libinput->refcount > 0), function libinput_unref, file ../src/libinput.c, line 1957. > > > > devel/libepoll-shim, x11/libinput's prime dependency, has its own > > kqueue1() implementation, which is used when the system does not already > > have one. Reverting this series and rebuilding devel/libepoll-shim to > > use its included implementation allows x11/libinput to work again. > > Ah, NetBSD added kqueue1 some time ago, and it uses the already > existing flags (O_CLOEXEC etc.) > If it's easy to test, can you try changing libepoll-shim to call > kqueue1(KQUEUE_CLOEXEC)? Overloading open(2) flags this way is not wise IMO. Not to mention that a lot of them do not make sense in kqueue(2) context, and that we might want to add other flags which would put even more pressure on the limited O_* bit set. Please see https://reviews.freebsd.org/D39377 for my attempt to somewhat mitigate the mess. From nobody Sat Apr 1 00:00: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 4PpHNN26zYz43QkT for ; Sat, 1 Apr 2023 00:00:20 +0000 (UTC) (envelope-from gjb@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 4PpHNN1KT7z41BG; Sat, 1 Apr 2023 00:00:20 +0000 (UTC) (envelope-from gjb@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680307220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=rcThSgxs7vaXiET8sGZPLnPd0oIo3IF1UGTxY3aY3xk=; b=eKt4qiRUgQz+Ld6iUr5cfFijgoh2zpN8LNoyKeB3TZSPWjABMoirjlNmkas59qc7VVIkVq jaGG6tYrdE6hX9iereC/ne6Wwmn1ZcvdPTzNcFsc2NJshkfSfaJqYgS9XXxyVcV+Xwpgv0 jg3+mcb99gykqcRNWQR8cRXXeDPtEncq3JVKgdLJL5YVo9yX3L5LoirEWS2+gJYOQdXQkO MbEj14iofHePJDBLhEKVbnXHbq44M5FMVCJB0Nkg8V76kYFutWvx/WrRDWy1LW03xWJvwa hXDjtBxz2wqDE8JwzaBkQX8THfoMyAK9guQAmXmphc9nlErY0zpAyqtaqMymlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680307220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=rcThSgxs7vaXiET8sGZPLnPd0oIo3IF1UGTxY3aY3xk=; b=XXQijEPF5UzvLaZshRcPOfXEgib5CtKxrfr3GMC/PJjERxgYUAd01xRXJY86K/ztUE67rL popRXcguK7znvtskzZlagmkVTeqOuvd2ixTL2gXJ0GwT3osG8j0tPUhbBulzs8hNfqW6QT dQmCNKJkhPhdiqke/n75Ey4rxzmpaSGcRfV3Mgdg31m32dqYQf+P4xKpH5YVr7/tS4kL1O NAOJLBTcl2LmhQIc1m/MYlqEKqMEgDFg0pQ6JLX/q2n1TT6kBVisfNebwEPXSEGRWtFF2B YZpen6soBQYPDPv8tdw24bC9IRI6coCZTmSpFSFO9PhzKB61Q79g36vnSfOMXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680307220; a=rsa-sha256; cv=none; b=Tq7SzNsf4h5N6lrhEaQX2xKak3htoBssd4Lyza+yfgt7KU9CLzn3EfoJEqiCo3Ud49sYTT BXHyg0+Bgn0MsQ4LffhEltksvujF3IFkrbaQMA3dEDi/Yy8hJpXUXGpf6Ngl8hB6x2mcFt o1xCpmRfkcf/gYyfWlSaxZuu03Q8VQ0l7FJ+9MLDMdl1O14DQvUsvoaz4E2fCddolg7/F/ rXTyd2s8bN7ycyDzmDNJ7NE41HhfK5ab5egSdzp+X4A1oeS2kyZv5j+uX4ARqizQhu8qEg hg1hTuigG3h8QLFNeVBU1r2RYgF47kbFsbt2aw884pvdse9bffDI7t6s5exMHA== Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id B4478CEE7; Sat, 1 Apr 2023 00:00:19 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Sat, 1 Apr 2023 00:00:12 +0000 From: Glen Barber To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org Subject: git: f001edfb5d41 - internal/admin - Add Charles Root Message-ID: <20230401000012.GQ31697@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: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="00hq2S6J2Jlg6EbK" Content-Disposition: inline X-ThisMailContainsUnwantedMimeParts: N --00hq2S6J2Jlg6EbK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The branch internal/admin has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=f001edfb5d04012023 commit f001edfb5d04012023 Author: Glen Barber AuthorDate: 2023-04-01 00:00:00 +0000 Commit: Glen Barber CommitDate: 2023-04-01 00:00:00 +0000 Add Charles Root Charles Root (toor@) will be contributing to various areas. gjb@ (myself) to mentor. --- access | 1 + mentors | 1 + 2 files changed, 2 insertions(+) diff --git a/access b/access index 1efa6c66bf90..bf7c931c312b 100644 --- a/access +++ b/access @@ -166,6 +166,7 @@ sjg sobomax ssaxena tmunro +toor trasz tsoome tuexen diff --git a/mentors b/mentors index 6d5e9754f2c3..784c3297b841 100644 --- a/mentors +++ b/mentors @@ -28,5 +28,6 @@ sam emaste ssaxena imp theraven markj +toor gjb wosch cem --00hq2S6J2Jlg6EbK Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmQndAwACgkQAxRYpUeP 4pP+UA//ZWarrEC6YcVM8K/8gGr860RDNjQBV1R/bCTpKjxGQ0F7F+1wcZ4omDfy Q9jZsJ21sbBUdPoZ1KdJbLt1iLMJX8+JZVedoAkNds1pkwrZG+SSDAGbs6dUKbuu O7QeriUo5uGzQ8uf7p0TIGZsmEc/4NE3XotgIKpnVxl259AOFsXlZsR1Xk8XXVCW IpWDQhlChpMN0JNuTPb+VILw6qt67xtWXVUI0pvY0U+4EQjNxgnkZ9o1/WxyFF0v /CoHzuNE9s1Qm8aeN2m2N3xd74/4NMswXfuvLoE9Jbi/J3eeL+KRcAzTIe5kxyi9 HaOUwZ02oz8zaR9tkBenBdBKce+1hTwWKAVMYNKHrq+EQyE2qJ7D2UP3pJPW69x+ lF9o31NsEgi0eHAzzj174MvvWWYSllSc5+Wvs+MAoPcFWleaUp3XEtzAIuFtmcjE cWYXzx41p+CvzGr6FRsC+P4ziQIpkQNnvDL8niHsEbRMlZDjQcj3JpKdAgFYh8Qu gwuXjERY9U+gpckCuswT5aU6IVvSTm1DjnnPelEMTaP7FO8K+dEWbI2R1KKmqCEH 0xf7TGOgnUYs+AlzXWRyiy6XQ8617XdwhpMw4H49LlDVn/BmFgzb8OjfRE8SzRy+ Sfh2hkK+JV+UqIpPe7O6xM6TXwUUUgx7u/BP3Ba75RUqBNmbA18= =mK0v -----END PGP SIGNATURE----- --00hq2S6J2Jlg6EbK-- From nobody Sat Apr 1 00:03: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 4PpHSL6Jh0z43RVK for ; Sat, 1 Apr 2023 00:03:46 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) (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 4PpHSL4H5hz41mY; Sat, 1 Apr 2023 00:03:46 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x233.google.com with SMTP id bj20so17918596oib.3; Fri, 31 Mar 2023 17:03:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680307425; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=4JrqIA5LubUbZBLdurtDYFlnBK4lcxMxzhvO9irHijo=; b=KKG51ReF+C/ldH34QUPkRzK7a2G3eTTfUMpCzeN0CiitB5wCgacd0NsTcG9hvGFREs PhLl6uxuGYK1zb06bdhWDwia503LZEEJVOb0xEfzCAsNBPTDoLWuVkWOsfby68kJVNyE osGNccnKK+FzYbVHwmNgC40xlXR4u6LSHpI949keiWXzI6mTJbjBhN61l72R+G4RymU2 XgfNi81E8/rinOymECaEofrcnhdfwQnDUpxXv97Jxw8trScVKV2OtHwIw/lq4vzCPXe4 rhmsTQ1y9S8ld9dqwxM4/6VKyvl0TO4+5OLXDyO01nIEYWnXrlxrqah5+R0ahKGsIM38 flcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680307425; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4JrqIA5LubUbZBLdurtDYFlnBK4lcxMxzhvO9irHijo=; b=GOOVe+EuUNknJFqcvIK+ej7zz7gotk0sDuqMJvHff1+fUHdaWqwFaKYc0EC17rqQP/ YtATMOEbc/+KHLV61q5BXWTL87J2UawEREFSYNzfL/qMcWH9ndVUp4SD2WDVQIo/n+Qz d6jdzdLUu6v5IYrsFW3b0ak3ptZSmJE8qHPouX8znsWObA48Gi9g2e2dqiKkKhEVZS6u GH9RuijhXnW91N4ogCjt3h6bpRxfKGD2/137pb4LI6WYu3rhbpKNAWR51ofQuxqmGBwb G5KsdQ9Ak+OIpzuFO+RXsbTjZHV0qNpht2V9CnPDY7KUk6BKOBmBmsI892mBHeb0pyAC xZpA== X-Gm-Message-State: AAQBX9dgEav/M6XTpZCN5vwxRnfi4XHG5exqiembYvAKKDgVd1sJwRFD Tqg7mbIONx+4Zahl5vTKksjSoUGN/jiMD2aeUIuIhVFn X-Google-Smtp-Source: AKy350ZeXK2CXDXFeeezKt9SobSNUCibb5jdpX6O4tPSFff66VwzdqFpEtreNBMDLT6dSK4Adc4MhENvkI1sscqeIzE= X-Received: by 2002:aca:2813:0:b0:389:1274:be51 with SMTP id 19-20020aca2813000000b003891274be51mr6846320oix.4.1680307425578; Fri, 31 Mar 2023 17:03:45 -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 Received: by 2002:a8a:115:0:b0:49c:b071:b1e3 with HTTP; Fri, 31 Mar 2023 17:03:45 -0700 (PDT) In-Reply-To: <20230401000012.GQ31697@FreeBSD.org> References: <20230401000012.GQ31697@FreeBSD.org> From: Mateusz Guzik Date: Sat, 1 Apr 2023 02:03:45 +0200 Message-ID: Subject: Re: git: f001edfb5d41 - internal/admin - Add Charles Root To: Glen Barber Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4PpHSL4H5hz41mY X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/1/23, Glen Barber wrote: > The branch internal/admin has been updated by gjb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f001edfb5d04012023 > > commit f001edfb5d04012023 > Author: Glen Barber > AuthorDate: 2023-04-01 00:00:00 +0000 > Commit: Glen Barber > CommitDate: 2023-04-01 00:00:00 +0000 > > Add Charles Root > > Charles Root (toor@) will be contributing to various areas. > gjb@ (myself) to mentor. Approved by: core (mjg) > --- > access | 1 + > mentors | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/access b/access > index 1efa6c66bf90..bf7c931c312b 100644 > --- a/access > +++ b/access > @@ -166,6 +166,7 @@ sjg > sobomax > ssaxena > tmunro > +toor > trasz > tsoome > tuexen > diff --git a/mentors b/mentors > index 6d5e9754f2c3..784c3297b841 100644 > --- a/mentors > +++ b/mentors > @@ -28,5 +28,6 @@ sam emaste > ssaxena imp > theraven markj > +toor gjb > wosch cem > -- Mateusz Guzik From nobody Sat Apr 1 00:11: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 4PpHdT5zG5z43RjX for ; Sat, 1 Apr 2023 00:11:41 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 4PpHdT476Rz43fW for ; Sat, 1 Apr 2023 00:11:41 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f49.google.com with SMTP id j18-20020a05600c1c1200b003ee5157346cso16428165wms.1 for ; Fri, 31 Mar 2023 17:11:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680307900; 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=eoK92/fSNVfnZDsy+GZ8EOgzkn+c/39/ymQv9HoxB1M=; b=Rb6L4BE/0IM1kkos4X4gaeZB5GNlR1bdETXDodwHPfgk99fGeUYvC+a/rUP5G9s1c7 l5qwpqdwahH7O/xHIW6Pxn4OGc3TzVenk6o4l+6hv+MuxULfarskSjdHy5/X5DC5P2MX qiLWRkiYcr+k4lwcRdBVL255XTn9mtJHd36+0y3lHTv6/kRJcdgfVwNQY8UrKuFJZtnq 1Na4ig4m3/cdg37QifS8mkgnIJtoB+5gVKBByYJjLTJCW5dibW35AvI+1g2pqaUcYWu+ 2mQNXDJ8LawhrSuXLEGtsRncPPGKv29K5loNETcLbNzZn83bNZrZ6ZeS0JnvO6OoCIwt /SFg== X-Gm-Message-State: AO0yUKV4KpMop6Dftfgv7rH6j15BhtqMBHkaoIZkyepxeEas5O2i17D7 QOsPlXksMshvT7KHgWDYVTdx3Q== X-Google-Smtp-Source: AK7set+/EBAD8HtAyJE9AMDeD2O+6vTFHAlNYSWHTxZCyGdxbERyExSinLlXEUxTnzpE6Dn9GzZx2Q== X-Received: by 2002:a1c:790b:0:b0:3ee:8e3d:4b9c with SMTP id l11-20020a1c790b000000b003ee8e3d4b9cmr22059214wme.21.1680307900203; Fri, 31 Mar 2023 17:11:40 -0700 (PDT) Received: from smtpclient.apple (global-184-7.n-1.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id q13-20020a7bce8d000000b003ef71d541cbsm4210576wmj.1.2023.03.31.17.11.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2023 17:11: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 \(3696.120.41.1.1\)) Subject: Re: git: f001edfb5d41 - internal/admin - Add Charles Root From: Jessica Clarke In-Reply-To: <20230401000012.GQ31697@FreeBSD.org> Date: Sat, 1 Apr 2023 01:11:39 +0100 Cc: src-committers , dev-commits-src-all@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <7AF33D79-2328-4126-A2A6-BEF7556A2AFC@freebsd.org> References: <20230401000012.GQ31697@FreeBSD.org> To: Glen Barber X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Rspamd-Queue-Id: 4PpHdT476Rz43fW X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 1 Apr 2023, at 01:00, Glen Barber wrote: >=20 > The branch internal/admin has been updated by gjb: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Df001edfb5d04012023 >=20 > commit f001edfb5d04012023 > Author: Glen Barber > AuthorDate: 2023-04-01 00:00:00 +0000 > Commit: Glen Barber > CommitDate: 2023-04-01 00:00:00 +0000 >=20 > Add Charles Root >=20 > Charles Root (toor@) will be contributing to various areas. > gjb@ (myself) to mentor. Is this really not reserved? I can=E2=80=99t imagine that being able to = log in as toor on the cluster is going to end well?.. Jess > --- > access | 1 + > mentors | 1 + > 2 files changed, 2 insertions(+) >=20 > diff --git a/access b/access > index 1efa6c66bf90..bf7c931c312b 100644 > --- a/access > +++ b/access > @@ -166,6 +166,7 @@ sjg > sobomax > ssaxena > tmunro > +toor > trasz > tsoome > tuexen > diff --git a/mentors b/mentors > index 6d5e9754f2c3..784c3297b841 100644 > --- a/mentors > +++ b/mentors > @@ -28,5 +28,6 @@ sam emaste > ssaxena imp > theraven markj > +toor gjb > wosch cem From nobody Sat Apr 1 00:18: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 4PpHms12sxz43SGY for ; Sat, 1 Apr 2023 00:18:05 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) (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 4PpHmr66Rtz43sG; Sat, 1 Apr 2023 00:18:04 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x234.google.com with SMTP id y184so17931531oiy.8; Fri, 31 Mar 2023 17:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680308284; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=7A61LpSADNvB/obL8p5XTGCJ1fB9qWwNN8A2UtnrxqM=; b=lkPkc1mp3XY/uzuqO3MeyQnH0qHDnt/8RAGtcYNsPf8mqTObywR/a7GCeDPXN/c8Je LVoEbflIYpPzA1SbQrpDRUMYF0wk2udkbQEWnUcXwXR7Eo8mIWXEDSEro8cUX09w+TCE QNAouuh3Kb9MGrOdlkSNGwfnDwZSmz3nzsVBHCs522FYZadjJHpumOlc/VrFhdw2X61o VsWV7Ny9eMWkSfrF20IaoZAG+i0RT7N44Kgkj7TNKGpeH3URa4MvuoQrMSDn7LvCjTd8 mFRBAaKAin6PpFoI+ahvWN+zNmz+8uWlOxiQ4evAk0E0ksG4hwPfIvA1Wl81u24eG2LY R7KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680308284; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7A61LpSADNvB/obL8p5XTGCJ1fB9qWwNN8A2UtnrxqM=; b=bu+xe2PoQ3ut6D3/yiqFmhOkro1Ft1Lz76AfARPxlRPfUr0Q+UsQYHBvKelTtFApb+ MDapM9DWbmuZKpZEzwUzR08OLXf+cunvcqQv82uFLdL02gzqlb5nO4qAhe30JAm0G8XI N/3KjIwpQWqtqm7HGljXrPQExcn01xJBrZCd/Ax4fPSeajz0uppYb1xf3WGknxZUsrOx qaoJszDabzGAO3OEmrPd+pTeJUXgfi9X03+fyiZXI2QmKDaeY5FKjsIBo7OCngE5q9GB 19Jyx7YZ4zYRI2DQayidGs2LvabCm+yoJHxrromaQ8mkqGZ8FLMuSdUntHBfXhLyvH/1 MOlQ== X-Gm-Message-State: AO0yUKV20KGlaWJOEAaq/6A3HHld6rc1GAyvoCSuZToIjGeMGyvorXLH FKoh9w8aoYTvJueo6EALsD/CRFfMqCg3zsTaRRu3zP8G X-Google-Smtp-Source: AK7set+yoRXS+8bQmZ/GNrvryLrv0geiLvCWaLezutUKv8RtWetvxjzHJMw05+OMaifzIGh4rio74JLu5yNFzV/R5Wk= X-Received: by 2002:a05:6808:189f:b0:387:82c4:6425 with SMTP id bi31-20020a056808189f00b0038782c46425mr7871598oib.4.1680308283831; Fri, 31 Mar 2023 17:18: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 Received: by 2002:a8a:115:0:b0:49c:b071:b1e3 with HTTP; Fri, 31 Mar 2023 17:18:03 -0700 (PDT) In-Reply-To: <7AF33D79-2328-4126-A2A6-BEF7556A2AFC@freebsd.org> References: <20230401000012.GQ31697@FreeBSD.org> <7AF33D79-2328-4126-A2A6-BEF7556A2AFC@freebsd.org> From: Mateusz Guzik Date: Sat, 1 Apr 2023 02:18:03 +0200 Message-ID: Subject: Re: git: f001edfb5d41 - internal/admin - Add Charles Root To: Jessica Clarke Cc: Glen Barber , src-committers , dev-commits-src-all@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4PpHmr66Rtz43sG X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/1/23, Jessica Clarke wrote: > On 1 Apr 2023, at 01:00, Glen Barber wrote: >> >> The branch internal/admin has been updated by gjb: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3Df001edfb5d04012023 >> >> commit f001edfb5d04012023 >> Author: Glen Barber >> AuthorDate: 2023-04-01 00:00:00 +0000 >> Commit: Glen Barber >> CommitDate: 2023-04-01 00:00:00 +0000 >> >> Add Charles Root >> >> Charles Root (toor@) will be contributing to various areas. >> gjb@ (myself) to mentor. > > Is this really not reserved? I can=E2=80=99t imagine that being able to l= og in > as toor on the cluster is going to end well?.. > I made sure Charles has a secure password -- some letters and a number. After some deliberation we settled on: hunter2. --=20 Mateusz Guzik From nobody Sat Apr 1 04:10: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 4PpNwX4nmtz42l13 for ; Sat, 1 Apr 2023 04:10:04 +0000 (UTC) (envelope-from rene@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 4PpNwX4Ghbz3Brn; Sat, 1 Apr 2023 04:10:04 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680322204; 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=CA3IUHe46q/TIlp+QjKWYOIeX1CVNEbtBA3f6EvMk/E=; b=ZGH3bU23sqOD40wTBeRcYl/1mUp0cIIUP9oQybCWIJgg9cWPjfZaxUpR+lK8OvsOTtSP3f NT5537R3Z7T+Bmu/PjoUxpVJYBK4KVXlyrqIPM7tbJ6h5tvzWdLtRHoeHRieRUO+m2fg9a NPIULQk2e2by5ce9cA08/I6E2pksNmUYBSTuhWk1+YolJJugdAnyx2loLAmQF+X7i/90xN JGwkhvysRqEe5Gg4ACyYoufdl4aex/KnPh4H5hV7BFv9BCEROaPeThXAVLTDN6gJsUfe6C QnYRX1y2zdR8CS4wkp2xALf0fL1jwgsI2qPHU+bnCoJ1yZjMB4a4rPwZuqi31g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680322204; 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=CA3IUHe46q/TIlp+QjKWYOIeX1CVNEbtBA3f6EvMk/E=; b=ynvNYIowCa/M1qbndkr75GOK9Y48eNbBndq3IwcRnvYh5WiWX1zLSfz4cG/XdcslHJw/gd 2pQEkI/gCtSMenp6nulaZcVE5W3+YdaVsL0fnYc6pp4Q7MScjYBdzZI3GHirbso9sH+Kc+ 1hgMY6O4Uuv4I9sY9beDsV/LoIQVjgedsGk6CGcD9t3lcGFgMfziMP7Pfg6cmuBP9JyydK 71Z5W3R6TXhftJbcZorSTn/0zRrxSK0eMkbJBNisp7vrT6cbeiKo1DcdpqHew/tKeKWAHe sIofc0CptYnVngvNrAbYW6kpmAvrkNCShcv+nABA3tqmyxYy0c4YSCkxGC24eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680322204; a=rsa-sha256; cv=none; b=BC8zdeXFjAE+KqfD9PowHPYu5NNWq4UsZ00KkCxAYdulGPl+MpgmN8mbkh1IiY/OS2TRf/ 6yvsEziVwYWk0Nkk99Y1BLshirGxvhZjd4S0UZCXlliEhY2fTyjm5twKbL4ZyUI3clYusT 6tqwpiS5xIdk5zE5srqK/776oHmGZ0mrjk61r4B9lHl5KXAIAeBfgMhO7uBVR3VT36UBkF kuRYImiy6J9anBMOAZkMta10Tw48MR0p0gHHVVsVp1y7hhqFQGXnCOjkY2mHwHruKOJKk2 soNu5LOKlm97ooVg4SqjGOL+ASN2VWRYhu3In5IFk1MtiuIw+IjbC06OJrTNyA== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 6F80BDA30; Sat, 1 Apr 2023 04:10:04 +0000 (UTC) Date: Sat, 1 Apr 2023 04:10:04 +0000 From: Rene Ladan To: Glen Barber Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org Subject: Re: git: f001edfb5d41 - internal/admin - Add Charles Root Message-ID: References: <20230401000012.GQ31697@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: <20230401000012.GQ31697@FreeBSD.org> X-ThisMailContainsUnwantedMimeParts: N On Sat, Apr 01, 2023 at 12:00:12AM +0000, Glen Barber wrote: > The branch internal/admin has been updated by gjb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f001edfb5d04012023 > > commit f001edfb5d04012023 > Author: Glen Barber > AuthorDate: 2023-04-01 00:00:00 +0000 > Commit: Glen Barber > CommitDate: 2023-04-01 00:00:00 +0000 > > Add Charles Root > > Charles Root (toor@) will be contributing to various areas. > gjb@ (myself) to mentor. It is good to see that Charlie is finally getting the status he deserves. René From nobody Sat Apr 1 04: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 4PpPTd61zmz42mD1 for ; Sat, 1 Apr 2023 04:35:17 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (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 4PpPTd36vfz3Drg; Sat, 1 Apr 2023 04:35:17 +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 iGAEpkfYyuZMSiSxQpnqKS; Sat, 01 Apr 2023 04:35:16 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id iSxOp1tXXHFsOiSxPp3kN1; Sat, 01 Apr 2023 04:35:16 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=6427b484 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=8nJEP1OIZ-IA:10 a=k__wU0fu6RkA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=9X5CrC-oVv_52mSTrq0A:9 a=wPNLvfGTeEIA:10 a=zgiPjhLxNE0A: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 7813AE6C; Fri, 31 Mar 2023 21:35:14 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 3BCCB408; Fri, 31 Mar 2023 21:35:14 -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: Rene Ladan cc: Glen Barber , src-committers@freebsd.org, dev-commits-src-all@freebsd.org Subject: Re: git: f001edfb5d41 - internal/admin - Add Charles Root In-reply-to: References: <20230401000012.GQ31697@FreeBSD.org> Comments: In-reply-to Rene Ladan message dated "Sat, 01 Apr 2023 04:10:04 -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=iso-8859-1 Content-Transfer-Encoding: 8bit Date: Fri, 31 Mar 2023 21:35:14 -0700 Message-Id: <20230401043514.3BCCB408@slippy.cwsent.com> X-CMAE-Envelope: MS4xfOiLxXu6e6UyRwLWypS0vTFMNHbIrlTOXDNbje8Ddh62v3rfStGBegtIU90y956SE+ZjcgS7x1TRPe+/XyAizLcMqCYcdiNzfROpUjKY2O4Kqb6v8RKo p/9NhKQ22HtlhhoigNT6DCGlqZ+5r8IxROrJV5qBvmQwMHgHhMb+WelNlGBNohGGc7sGaYm+MdmnadwmyCTpsJC1HkV5RTTOkiLOZ3aVp83FlSj1FsKcpGoA JePSuhXI2HpYavmniHZDgqK7LlIXOOV0ec7+HSzLf+jVAypUxZ9cKGyQ2utsXmMX99mjH/T7YElwbB4AARgMGw== X-Rspamd-Queue-Id: 4PpPTd36vfz3Drg X-Spamd-Bar: ---- 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] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message , Rene Ladan writes: > On Sat, Apr 01, 2023 at 12:00:12AM +0000, Glen Barber wrote: > > The branch internal/admin has been updated by gjb: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=f001edfb5d04012023 > > > > commit f001edfb5d04012023 > > Author: Glen Barber > > AuthorDate: 2023-04-01 00:00:00 +0000 > > Commit: Glen Barber > > CommitDate: 2023-04-01 00:00:00 +0000 > > > > Add Charles Root > > > > Charles Root (toor@) will be contributing to various areas. > > gjb@ (myself) to mentor. > It is good to see that Charlie is finally getting the status he deserves. Agreed. He's had an account on each of my systems here for years. Can't work without him. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Sat Apr 1 04:41: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 4PpPcr4Hgbz42mtP; Sat, 1 Apr 2023 04:41: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 4PpPcr3c1Zz3FfF; Sat, 1 Apr 2023 04:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680324092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=maj2qyty2LTqYx6BXmu99zkXjx9UnjloioPRkn6TMuI=; b=aNM2xXH3JNXFyvZOPpduIZv2UQP+KHtAnFlBV6w2C45q9uDIwyR6nfFjt6pXquzjnvyQsB X5YjUk67zgYn8s6x1gEhWcR6OFwMbsT18/ZtRvcnS/Lw8FGEnUvkMy87oQ2uPVCH5Mw35W GqDDSqRkddgSrp18+iIiT8fJ6T+u28EElZldRWvDL59GyLFiesgUAvU9972SKB1On06zR3 W2/I8FHFzVKSX/gvQZH67HdnakkJHz7QJ6ChZvVTtIsjiYPLpIqQAQnx4pN0AbWIgQm/sm CvdIMxRbuSK94Ak3zAQEhQe6iYUtOPUoMHt8+pzAhL4ZuKj7I0rLcnRbIs3MaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680324092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=maj2qyty2LTqYx6BXmu99zkXjx9UnjloioPRkn6TMuI=; b=OYa6VqpheSPv+Gbvh1mHVnfQJuPYu58/bi6CbySgGJgP5DYm74NiEAC/m1wqV6HmSVuUr/ 3DNnafvXaiybShrNSrXMycogJaupjR0u1txt/csWfWCZPZOy42UASwK9PtImF14qk7zqOZ hHLmEtDnwy44GiSk1dM0mNk3BViXMBOHsr3FEyzDu/BF8dtMrGaSAwJ8yq2pvaiKbADX7U z7bFBIOezxPtSVxX7iEzBs79hB+oJeg5sRGCM/XgDbbJ45Yz3//Yx6mJe6NDsKHhhBHJfP opqF8dRpT91tREiRfnllmBwOq9nzmEK/TJ79a73bKTiRWoom+MK0aAegCeVOcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680324092; a=rsa-sha256; cv=none; b=QHhe3Iu9CwVp7qZ2Dd4ZT6wT1m3LsG1gt2FGZswW5T4kn1r09VaDPFjIhBjA26UU79+BBa KUW00LGk39zmRiUpx/NrMBJblvKdEpjbPWnExi6a3eOYzSBQffkHZj+FFlERq6il90PcI8 KfmtVS37ZIbAnfwIXk7BQ9LoqhdVyEEEAut9rXHMwfCVwp97nsvuIcD4/3aPF1h9vpMyHe 2s1AvHYqPHIbyDGsMiiyr39YHFDwENnRAhg3z6mo/s2vcTEw9XdJRGTrYwQIUV7QTNfMmZ 59Lobjic2EWqyfX4OE9frd8lwEozdYuKur79pRO5OZw0j6RrWoNS0TJFXx1Khw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpPcr2fZzzMd6; Sat, 1 Apr 2023 04:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3314fWhn047754; Sat, 1 Apr 2023 04:41:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3314fW3G047753; Sat, 1 Apr 2023 04:41:32 GMT (envelope-from git) Date: Sat, 1 Apr 2023 04:41:32 GMT Message-Id: <202304010441.3314fW3G047753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rene Ladan Subject: git: 4e703f445ef2 - main - Complete my mentees list. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: rene X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e703f445ef26f7658c859b0feedb4d830c837e4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/src/commit/?id=4e703f445ef26f7658c859b0feedb4d830c837e4 commit 4e703f445ef26f7658c859b0feedb4d830c837e4 Author: Rene Ladan AuthorDate: 2023-04-01 04:39:48 +0000 Commit: Rene Ladan CommitDate: 2023-04-01 04:41:09 +0000 Complete my mentees list. Originally submitted by rnagy. --- share/misc/committers-ports.dot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 42d9032e94ba..a8075e865fa0 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -265,6 +265,7 @@ rhurlin [label="Rainer Hurling\nrhurlin@FreeBSD.org\n2020/08/31"] riggs [label="Thomas Zander\nriggs@FreeBSD.org\n2014/01/09"] rigoletto [label="Alexandre C. Guimaraes\nrigoletto@FreeBSD.org\n2018/10/01"] rm [label="Ruslan Makhmatkhanov\nrm@FreeBSD.org\n2011/11/06"] +rnagy [label="Robert Nagy\nrnagy@FreeBSD.org\n2023/02/08"] robak [label="Bartek Rutkowski\nrobak@FreeBSD.org\n2014/06/10"] rodrigo [label="Rodrigo Osorio\nrodrigo@FreeBSD.org\n2014/01/15"] romain [label="Romain Tartiere\nromain@FreeBSD.org\n2010/01/24"] @@ -718,6 +719,7 @@ rene -> joneum rene -> ler rene -> olivierd rene -> ronald +rene -> rnagy rm -> koobs rm -> vg From nobody Sat Apr 1 05:54: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 4PpRFJ2Pglz42t65; Sat, 1 Apr 2023 05:54: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 4PpRFJ1dfJz3M8D; Sat, 1 Apr 2023 05:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680328484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxjcFJQ0Ha+L3XoKfneHNt27vg3wrLOPWbnoEfijHUg=; b=X87AMN/fFPvP3hxhDVd9oBBCX/bE3Znca2J4rqOM40UjdXX3BQQXoUM23UCMQnsqCIa8yE yQhu3gCQ7BURmesd/6G7cMyLnm1hB7uzRKeb4s+VYf/edVPOccQkzgseYUYNTd51/63eXA uG0uBMV874sodzvKY676NRzLMuRR9rBs1nb7F8s0SKqUCn3h/Bjlq61hKUZFNG/tb92wow wh9ylh/brUeiWg4PiBCDWibP00mkt0AquHxZSWw93qKmpgEukvKWaovMBezFj4b7vuCIOY tXP28aiMgpUh0bzP6sYA/Pzshu3m9/TNOlcsgZUSpO70Ndfc1yM27QDP0VLiFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680328484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxjcFJQ0Ha+L3XoKfneHNt27vg3wrLOPWbnoEfijHUg=; b=e4tUQH5rUuw55OZ2mWrBKGF+Mz9kCxjZ/Lzdkys0/EDJt8hqAAXWnXw4hEIcL3T/7LG+9J lhb87bgi23AZQBFzER+5j9ifI000ZT+vwl5dprNwXmk7HyjB9PD+AzriO8Rwu+AOpU9Sun o2LHKpic7YAIZdEqwiSkWhTgxTGSd5mXykXtZFkR7GbNEGo37kMntgM36E4nlB3bUhaazt O+m+OV2DzV7rz+K27+oHYPAQoz0h3pgU2RyJw6p1HIU/msOZHC5Kz47FvR+qQSdVMBpQgl zidVlvNISoghK26wxjMYrH1Su10z0Ax/a+PSRaSaM0oqwEiYcGlBK469tXM6Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680328484; a=rsa-sha256; cv=none; b=YYjcJUvbptEkptfly80lGQ9hjLcQuhxb9r5Kz6Gqn4Z5WjybgPVImX8IjZJP84vSzgU+Jm 1+qmIVOCj18rK/SzmzX06RDjOnO2V9fPsA1OERnRg6zopRppi2u90De8FFr6oIdkjEwC2t 9mJqJTX3/9I959JiEgcGpCjdfRp/kyeVggaOdR/3N6em96XMhlhRyNY7ZcaG4xm0S4XgQD DfVWONisP16jxpltHkuc3rV4jvKIZ/97GPE9wR5omOmn4z4Y9TlMJgkAY1+/7QyhDbBqY3 p5n0Zgh3Ch3yE3y7movUkhP1RXdzEEuNEBNVTW7XVJRh66F/DgfeSrEqIt6T3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpRFJ0jGHzPZB; Sat, 1 Apr 2023 05:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3315siDD065302; Sat, 1 Apr 2023 05:54:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3315siww065301; Sat, 1 Apr 2023 05:54:44 GMT (envelope-from git) Date: Sat, 1 Apr 2023 05:54:44 GMT Message-Id: <202304010554.3315siww065301@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: 285d85f4f96b - main - arcmsr(4): Fix reading buffer empty length 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 285d85f4f96bf3b5aecccad865a8855724241c32 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=285d85f4f96bf3b5aecccad865a8855724241c32 commit 285d85f4f96bf3b5aecccad865a8855724241c32 Author: 黃清隆 AuthorDate: 2023-04-01 05:43:43 +0000 Commit: Xin LI CommitDate: 2023-04-01 05:43:43 +0000 arcmsr(4): Fix reading buffer empty length error. MFC after: 2 weeks --- sys/dev/arcmsr/arcmsr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index dcb940bf339c..ac56c072cd38 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -87,6 +87,7 @@ ** scatter-gather count large than some number ** 1.50.00.03 05/04/2021 Ching Huang Fixed doorbell status arrived late on ARC-1886 ** 1.50.00.04 12/08/2021 Ching Huang Fixed boot up hung under ARC-1886 with no volume created +** 1.50.00.05 03/23/2023 Ching Huang Fixed reading buffer empty length error ****************************************************************************************** */ @@ -144,7 +145,7 @@ __FBSDID("$FreeBSD$"); #define arcmsr_callout_init(a) callout_init(a, /*mpsafe*/1); -#define ARCMSR_DRIVER_VERSION "arcmsr version 1.50.00.04 2021-12-08" +#define ARCMSR_DRIVER_VERSION "arcmsr version 1.50.00.05 2023-03-23" #include /* ************************************************************************** @@ -1555,8 +1556,10 @@ static void arcmsr_iop2drv_data_wrote_handle(struct AdapterControlBlock *acb) /*check this iop data if overflow my rqbuffer*/ ARCMSR_LOCK_ACQUIRE(&acb->qbuffer_lock); prbuffer = arcmsr_get_iop_rqbuffer(acb); - my_empty_len = (acb->rqbuf_lastindex - acb->rqbuf_firstindex - 1) & - (ARCMSR_MAX_QBUFFER-1); + if (acb->rqbuf_lastindex >= acb->rqbuf_firstindex) + my_empty_len = (ARCMSR_MAX_QBUFFER - 1) - (acb->rqbuf_lastindex - acb->rqbuf_firstindex); + else + my_empty_len = acb->rqbuf_firstindex - acb->rqbuf_lastindex - 1; if(my_empty_len >= prbuffer->data_len) { if(arcmsr_Read_iop_rqbuffer_data(acb, prbuffer) == 0) acb->acb_flags |= ACB_F_IOPDATA_OVERFLOW; From nobody Sat Apr 1 08:01: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 4PpV3g5mRhz433xk for ; Sat, 1 Apr 2023 08:01:35 +0000 (UTC) (envelope-from developer@lorenzosalvadore.it) Received: from mail-4317.proton.ch (mail-4317.proton.ch [185.70.43.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "protonmail.com", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PpV3f4MSpz3qDh for ; Sat, 1 Apr 2023 08:01:34 +0000 (UTC) (envelope-from developer@lorenzosalvadore.it) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=lorenzosalvadore.it header.s=protonmail2 header.b=nWN+y3Wm; spf=pass (mx1.freebsd.org: domain of developer@lorenzosalvadore.it designates 185.70.43.17 as permitted sender) smtp.mailfrom=developer@lorenzosalvadore.it; dmarc=pass (policy=quarantine) header.from=lorenzosalvadore.it Date: Sat, 01 Apr 2023 08:01:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lorenzosalvadore.it; s=protonmail2; t=1680336092; x=1680595292; bh=3+bjjCo8tVe2dhCO442fxDbxDwG22nrBC6pDOHtELoo=; h=Date:To:From:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=nWN+y3WmorX+eAskNRXign1nB70RIuK04EzodO/GzSB7cSB7CkGQD8LbzvOFtaFJP Vjmf7AchufsyjtPhjbEg7Y1nBOvRypN1rotjamrVL9STfk9hfckEMpasGXW7hGs0U7 SKSabR9QUGc5uWxp1/J0ptaln2ksmHtm/7LD7Z6YJRnI1ISR75X7nsUsAY7BMPC0J5 RLHiBhj9NiP2y97lQNCWpKzq3x4nvUlkO+ykhCwhmoG+mZ70SOjoJ9L6PcKoCpVQUM 7tUvN7EnPo+x0F9Z/WWKLFnJHSvfh9XqMTg9THpRem/HLdWwrfF2waHSOwHWrJkrgD d4s8BlHXUDD3g== To: dev-commits-src-all@freebsd.org From: Lorenzo Salvadore Subject: Re: git: f001edfb5d41 - internal/admin - Add Charles Root Message-ID: <_LctmXcSQsRTIN-HvvVEUm4d1cFuKK4w-roE2kQoVZyFiOsJ0wYZMQ-7cxsopFMQbljJXobn0VcbQUDEcPQuEx8rJwWQc2uQZinjJElC2-s=@lorenzosalvadore.it> In-Reply-To: <20230401043514.3BCCB408@slippy.cwsent.com> References: <20230401000012.GQ31697@FreeBSD.org> <20230401043514.3BCCB408@slippy.cwsent.com> Feedback-ID: 53711648:user:proton List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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 X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.997]; DMARC_POLICY_ALLOW(-0.50)[lorenzosalvadore.it,quarantine]; R_SPF_ALLOW(-0.20)[+ip4:185.70.43.0/24:c]; R_DKIM_ALLOW(-0.20)[lorenzosalvadore.it:s=protonmail2]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_ZERO(0.00)[0]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ASN(0.00)[asn:62371, ipnet:185.70.43.0/24, country:CH]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[lorenzosalvadore.it:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Queue-Id: 4PpV3f4MSpz3qDh X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N ------- Original Message ------- On Saturday, April 1st, 2023 at 6:35 AM, Cy Schubert wrote: >=20 >=20 > In message ZCeunCRbfpKVc6hB@freefall.freebsd.org, Rene Ladan writes: >=20 > > On Sat, Apr 01, 2023 at 12:00:12AM +0000, Glen Barber wrote: > >=20 > > > The branch internal/admin has been updated by gjb: > > >=20 > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Df001edfb5d04012023 > > >=20 > > > commit f001edfb5d04012023 > > > Author: Glen Barber gjb@FreeBSD.org > > > AuthorDate: 2023-04-01 00:00:00 +0000 > > > Commit: Glen Barber gjb@FreeBSD.org > > > CommitDate: 2023-04-01 00:00:00 +0000 > > >=20 > > > Add Charles Root > > >=20 > > > Charles Root (toor@) will be contributing to various areas. > > > gjb@ (myself) to mentor. > > > It is good to see that Charlie is finally getting the status he deser= ves. >=20 >=20 > Agreed. He's had an account on each of my systems here for years. Can't > work without him. I assume the toor@ we are all welcoming is the standard toor account on FreeBSD and not a new contributor with a funny username, am I correct? If yes, could anyone please explain why toor@ needs access to any git repository? What problem does it solve? Thanks, Lorenzo Salvadore From nobody Sat Apr 1 09:33: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 4PpX5f1Q3Qz43B4b for ; Sat, 1 Apr 2023 09:33:26 +0000 (UTC) (envelope-from garyj@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PpX5d4YyFz40mF for ; Sat, 1 Apr 2023 09:33:25 +0000 (UTC) (envelope-from garyj@gmx.de) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1680341602; i=garyj@gmx.de; bh=wX/GENOiv2DIRAfADsHyeODu8GQHfhpIMvJ8sCRo8E0=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References: Reply-To; b=bvsmKhj6yV84rWLE4O7Gt0MRTAlLYeOALQiiQ6Ud4Upx9XqazaVHJtjVy4qZzagFK m584KHpyCrHfkGESHLDP3uc8qh/bhSgR9iJibAv2SUoT4v2jH/kJBsR117QHUYpz4U cUPDxAqPM89tcq0DZlBwekUfnjLejB21k//eLr3vmvyGhmCTuCojTgaWWYv8GLPc8T Cvr+ZEBgzyM8qDwsUVc1P2JaW4cnAANIMUimXkoLhTW7cW6irVRvAqsiZeebIbhdf/ Nu8LzCPctqGHAKT8omveRgBuUaullVpuAYcBYi76Ta2X27KsAOlvWY82Qy7c+i+ysd d8H03Se/r9Ibw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from ernst.home ([91.59.229.34]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N6bfq-1qVDwq0fp0-0184Xv; Sat, 01 Apr 2023 11:33:22 +0200 Date: Sat, 1 Apr 2023 09:33:17 +0000 From: Gary Jennejohn To: Lorenzo Salvadore Cc: dev-commits-src-all@freebsd.org Subject: Re: git: f001edfb5d41 - internal/admin - Add Charles Root Message-ID: <20230401113317.74c4c615@ernst.home> In-Reply-To: <_LctmXcSQsRTIN-HvvVEUm4d1cFuKK4w-roE2kQoVZyFiOsJ0wYZMQ-7cxsopFMQbljJXobn0VcbQUDEcPQuEx8rJwWQc2uQZinjJElC2-s=@lorenzosalvadore.it> References: <20230401000012.GQ31697@FreeBSD.org> <20230401043514.3BCCB408@slippy.cwsent.com> <_LctmXcSQsRTIN-HvvVEUm4d1cFuKK4w-roE2kQoVZyFiOsJ0wYZMQ-7cxsopFMQbljJXobn0VcbQUDEcPQuEx8rJwWQc2uQZinjJElC2-s=@lorenzosalvadore.it> Reply-To: garyj@gmx.de X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.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=US-ASCII Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:gg4i3w+IIR4AnMNyI70CSVvVhRhzh31NQ2ZsLfDxtyFvmDHk7YG NnafY9qc9zAnWO+MgUwb70eX3hArdUpLH4yIH4mC0MHLOM1bTAaRKulTlM/FLg4zXs/8cfs 2JjLgSxEe+UZnwlOF95ciFcId6o9XGzbD+FvkwFv0KOGDOdZ4L6dGeheV3KXzEcOtVChd+K h5eV2tbpo1Ou8c6N3kM0w== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:HyDvr+X5GUY=;THdwjkJwzEk3mk3a/sPLKdZGKgt sUmFf4FVmHS1hbgZ+JbXGvNWvjRz5+BYy1aqQ33uRJbkCa0i13YwIqnpC6fdYA0AiElT65533 jBv8R7Ms4Olgh45ZJhD57aJqz3fpY2tl/kCQwCohvi9sxr+OIoK8S6sUdUoHanLBeWBkcAitF +3/HmE8gna4sgdkPTH/IA9DSLve6+OJT3H/0ZHUR6wEyzbKZgM72ubCjqbRwPQywpI5kxlsh2 tntCyZM4RA+X5B6gdsMi+2qU+2lJnMabee2n8i8oa1lTOG3essv1NOIRPttz0jlYaa144Mqup Bb6IUOvtHOh3XZq3OyRfR4DrD4+ZiM9YZtr7UI9c21iVvnmtebQoHZP01xVxCJMcL79TCk2js PtAzv1G7UbigDILj9L5uJxlN4ZOD7iUjDFWDvEDryP6l0z+r3OxO7dtV25KLkpQaW0Tnt90WN v3QE9rv/uAv6L9Y701sDmt4f7mFj0b8v51ZROdn7JsxBV/x1SNOnStLPlCZlQ7fakFwtkcBGP 7eC2lF25TFQwi9mGbcXvc8EHFbScNUE7drh8inxXVB/4ZEzvDIlqv1YwOHVMrCJ/r6oJjpwjQ D8+tRTUrlgbquyD4Kf5lfAy0N8MtSho5eAlgzm8ANmnRD9gRlZ518MDSEaExbW+OB1T5wsf2D AlR8oYADnJl2lqmHTtYTahhuaw/jFV9epTsPNHWq1mXJ2wE5lPjtgPsValjzYJfyDmCUzd2a7 owJIEoasuMQeDsNoCFrDGFlb+3ENp4O0NsdjmSHlMoBp1ZowLj+awqVys7tKHsOT/RkEL7zYg xHOh00shi0ucF3epCopBAYCojxJEPkb3xhmI+f2fBdkMSVCX1JFbpP7Czsm5Frc3SzthbXpnf 5YH7ZW160QZoAP9kGXrDfQL+dstec6R3RsvWiBQdcWIEaLp6gmsKJd2KxJ2xbwpfOcoJF4ZCv iqVCmWUQeMlRqz5na0k7pvY5Teg= X-Rspamd-Queue-Id: 4PpX5d4YyFz40mF X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Sat, 01 Apr 2023 08:01:26 +0000 Lorenzo Salvadore wrote: > ------- Original Message ------- > On Saturday, April 1st, 2023 at 6:35 AM, Cy Schubert wrote: > > > > > > > > In message ZCeunCRbfpKVc6hB@freefall.freebsd.org, Rene Ladan writes: > > > > > On Sat, Apr 01, 2023 at 12:00:12AM +0000, Glen Barber wrote: > > > > > > > The branch internal/admin has been updated by gjb: > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Df001edfb5d04012023 > > > > > > > > commit f001edfb5d04012023 > > > > Author: Glen Barber gjb@FreeBSD.org > > > > AuthorDate: 2023-04-01 00:00:00 +0000 > > > > Commit: Glen Barber gjb@FreeBSD.org > > > > CommitDate: 2023-04-01 00:00:00 +0000 > > > > > > > > Add Charles Root > > > > > > > > Charles Root (toor@) will be contributing to various areas. > > > > gjb@ (myself) to mentor. > > > > It is good to see that Charlie is finally getting the status he de= serves. > > > > > > Agreed. He's had an account on each of my systems here for years. Can'= t > > work without him. > > I assume the toor@ we are all welcoming is the standard toor account on > FreeBSD and not a new contributor with a funny username, am I correct? > > If yes, could anyone please explain why toor@ needs access to any git > repository? What problem does it solve? > It's April Fools Day. This kind of idiocy happens every year. =2D- Gary Jennejohn From nobody Sat Apr 1 09:36: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 4PpX9z53K4z43BMq for ; Sat, 1 Apr 2023 09:37:11 +0000 (UTC) (envelope-from developer@lorenzosalvadore.it) Received: from mail-4323.proton.ch (mail-4323.proton.ch [185.70.43.23]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "protonmail.com", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PpX9z4FKtz415l for ; Sat, 1 Apr 2023 09:37:11 +0000 (UTC) (envelope-from developer@lorenzosalvadore.it) Authentication-Results: mx1.freebsd.org; none Date: Sat, 01 Apr 2023 09:36:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lorenzosalvadore.it; s=protonmail2; t=1680341828; x=1680601028; bh=4g8fzpCeJO7j/35pz0+97OzFu2P5XowbqrRQ2pyFVO0=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=BUo3zkhs4+pWYSYOeE2uYc/77Fkvh2exjBH38OHc9f5iuyj+PoYR7JS8ENCbIpCaq XAJ/4wyKaqE+Tf9eTrzlRvNY3QG8Xc4ZV+i5CvQGPNOshjjPg8yZn+g37Wq++oI9KF 8FflQStP76T8KAW49YsjfWuVq7Fwl5S/hGn5hbKbA4S6QU0lCJmcx75lDMJAy3cnpm EikhOYEqyfj5Za1jaIARLT4Bnx+/ZvV4b7lH1fAuYlw/TC+Y1Pu4ZJTIfXjCa4qkC8 D+e9ooE756FTGV+VNYVzdpu6eeCXhrHXjH72YaKnbHQobPiaFJ3Cq8nahMzAmhYLgu u+s0FR6VQlfww== To: garyj@gmx.de From: Lorenzo Salvadore Cc: dev-commits-src-all@freebsd.org Subject: Re: git: f001edfb5d41 - internal/admin - Add Charles Root Message-ID: In-Reply-To: <20230401113317.74c4c615@ernst.home> References: <20230401000012.GQ31697@FreeBSD.org> <20230401043514.3BCCB408@slippy.cwsent.com> <_LctmXcSQsRTIN-HvvVEUm4d1cFuKK4w-roE2kQoVZyFiOsJ0wYZMQ-7cxsopFMQbljJXobn0VcbQUDEcPQuEx8rJwWQc2uQZinjJElC2-s=@lorenzosalvadore.it> <20230401113317.74c4c615@ernst.home> Feedback-ID: 53711648:user:proton List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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 X-Rspamd-Queue-Id: 4PpX9z4FKtz415l X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:62371, ipnet:185.70.43.0/24, country:CH] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N ------- Original Message ------- On Saturday, April 1st, 2023 at 11:33 AM, Gary Jennejohn wro= te: >=20 >=20 > On Sat, 01 Apr 2023 08:01:26 +0000 > Lorenzo Salvadore developer@lorenzosalvadore.it wrote: >=20 > > ------- Original Message ------- > > On Saturday, April 1st, 2023 at 6:35 AM, Cy Schubert Cy.Schubert@cschub= ert.com wrote: > >=20 > > > In message ZCeunCRbfpKVc6hB@freefall.freebsd.org, Rene Ladan writes: > > >=20 > > > > On Sat, Apr 01, 2023 at 12:00:12AM +0000, Glen Barber wrote: > > > >=20 > > > > > The branch internal/admin has been updated by gjb: > > > > >=20 > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Df001edfb5d04012023 > > > > >=20 > > > > > commit f001edfb5d04012023 > > > > > Author: Glen Barber gjb@FreeBSD.org > > > > > AuthorDate: 2023-04-01 00:00:00 +0000 > > > > > Commit: Glen Barber gjb@FreeBSD.org > > > > > CommitDate: 2023-04-01 00:00:00 +0000 > > > > >=20 > > > > > Add Charles Root > > > > >=20 > > > > > Charles Root (toor@) will be contributing to various areas. > > > > > gjb@ (myself) to mentor. > > > > > It is good to see that Charlie is finally getting the status he d= eserves. > > >=20 > > > Agreed. He's had an account on each of my systems here for years. Can= 't > > > work without him. > >=20 > > I assume the toor@ we are all welcoming is the standard toor account on > > FreeBSD and not a new contributor with a funny username, am I correct? > >=20 > > If yes, could anyone please explain why toor@ needs access to any git > > repository? What problem does it solve? >=20 >=20 > It's April Fools Day. This kind of idiocy happens every year. Indeed, they got me this year too :D Two in a row! Thanks, Lorenzo Salvadore From nobody Sat Apr 1 09:38: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 4PpXCz0dBfz43BMw; Sat, 1 Apr 2023 09:38:55 +0000 (UTC) (envelope-from garyj@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PpXCy40Xjz41Sj; Sat, 1 Apr 2023 09:38:54 +0000 (UTC) (envelope-from garyj@gmx.de) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1680341933; i=garyj@gmx.de; bh=93p7k8tEwviJDgwqhG8uYD2s9QEb/zVbAXuKHgdfWe0=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References: Reply-To; b=XHszbjzf7I/zb51JE+FgG7mszg/JtlEoVsB3ywR8TteOW1LcvNZCL7KlITvsi9Lts pQfbJL2P2FQLCRQoufvSF2h+suzIsoRm1ybggSdcglX+RdU9dLLFLbLzNqxMDSkdxZ xIsPgootMr+AuC+MgEvSI3S9y50NbdqUgpmZUxDGTMW3eF45rGuiFK002PRETSSZ3P hW5DjJd+0wXxLKKh8hJJtT8DCtozPQwoHjoTbWpqecQs3fPj9Uvin9RzHdGyKBSKip yBapm8LAVsL6rpio0lzQBnLAr0P2gJ1HVk8qB+Z/MSdLhYhAvkZV++SguZCml8jgYb IjFjJf5bBffXw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from ernst.home ([91.59.229.34]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MbRfl-1qJW8j3drl-00bpAn; Sat, 01 Apr 2023 11:38:52 +0200 Date: Sat, 1 Apr 2023 09:38:48 +0000 From: Gary Jennejohn To: Gleb Smirnoff Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 4358928e235c - main - amd64 loader: plug hard hang with serial console enabled Message-ID: <20230401113848.3dc4fd8a@ernst.home> In-Reply-To: <202303311823.32VINOlr027796@gitrepo.freebsd.org> References: <202303311823.32VINOlr027796@gitrepo.freebsd.org> Reply-To: garyj@gmx.de X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.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=US-ASCII Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:acWyKf4WME36x/bvj2Te3rkqaKAL7fqalrXIWq4z3nH/4nY2voF FL28smkWfb5UYWbKoGCH13SHc3M/Jt34fq/c9XYyOMP8Y2PkIWun8+ZA2FuVcap+KM29pU7 yi+kpXNWG5T6Dka7uBjbfjKO8eIDzkDFskW+YRHCnDZJAUIDalyW//q1jYxT+fBC5j3J4Tf ntrW2Zg3ZGRBO1/Cnl//g== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:wmZpOGw+kcM=;JYaXa73DTYaT0X2ACAb3dy4htZm ZN+kvrZN1S/JLrNvsW1rC96JSq++4nKkxL3uNRYYxSsyqr6mC5EUQvb1VPOEjtvjUMXp6hMrm aFLaRGn2uuVMbsbfkgez0p8ZYRBjIFu4oOMKDn0NpPLw3vpkpReE097eDGGEYxizlCnmWRFwr OQB2rlRi/CYgSKyvLn0vQ2wsFdEIQvI0YH4w1OJV+RSyrD6dMtBlSTSi5cQ6hlTwW84yxHkif fGP5L+Xt+c0o/UIEOdbdvoD7uaz5vIg+n1oI3KYN8trm8M8e+NxS1ze+lHUM+G9TMagautghh URSo8oFKad1bwZu7Ac0HGYot9fRpmUfPvn1+hcQj+VpEWkzZziuZyM6TMGbIXFG7Fl0vBUHHB Ml9BqfUBDPbVZwafVYT1+LTyTJAIzgKLWLIP4tWhfFrtCDBUxbaa6ml31Jzx29pBwdms5ee1a G9D2GcNGIq6fE1pSzdH0NNahlnhDEBjyRjuKm8oyB2mF9wfGcDNUEXKY7eineONEfW1bGPHmw NJBACspEYe5vQ3oJEaeS2JxPsks/YPbmbSLO8EvHWcO9SYBEXLwsk+jI7aCwZ4O6Fh3koZPma qRvS+ovtaolxPpgwBt+cQsHy2pwELwnZAyszYDNhnK3/KHbVUleSLGbpOARnNMnxtdVJuI5ZC ahHrAzYNleZVJxlh22vwhBZxUX7uh4A6VTNSavA87d9NbbHxXM6Isn45iZwN5Lq4OXoQ+6slA TONL36Cp5NfxX6B2RkLBHjM/hRJeU1rHPINXrP4Jz94HPIA+fxr8t6WgIJLFbAihVVZClPXhk r2V4kr6J9OK1SLIQAPf+99k0bQ0DeU02jH3cgq6pxfNsldbjhbuROph72FYZJUMbuSdYa6FT4 Xdt3XqBhY2rofme409t2Wmo77LdjmMnFpsdnmy31WCVxqxv4a3Bp7IpxDt2lDX0AZJSSevaY4 zJCqpvXLQLWwLZJygTr0VAfDRzw= X-Rspamd-Queue-Id: 4PpXCy40Xjz41Sj X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Fri, 31 Mar 2023 18:23:24 GMT Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D4358928e235c1e188ad6b4650= d78bcceb225b909 > > commit 4358928e235c1e188ad6b4650d78bcceb225b909 > Author: Gleb Smirnoff > AuthorDate: 2023-03-31 18:19:25 +0000 > Commit: Gleb Smirnoff > CommitDate: 2023-03-31 18:19:25 +0000 > > amd64 loader: plug hard hang with serial console enabled > > The hang basically bricks a physical box and it can be recovered > only if you are able to boot from alternate media. This isn't a > perfect fix, but throw it in before loader experts decide on > proper one. > > Submitted by: whu > Fixes: 927358dd98cb902160093e0dc0bac002d6b43858 > --- > stand/efi/loader/efiserialio.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/loader/efiserial= io.c > index 5fbc700f6ac2..0f37ef8b87dd 100644 > --- a/stand/efi/loader/efiserialio.c > +++ b/stand/efi/loader/efiserialio.c > @@ -265,6 +265,8 @@ comc_probe(struct console *sc) > */ > env =3D getenv("smbios.bios.version"); > if (env =3D=3D NULL || strncmp(env, "Hyper-V", 7) !=3D 0) { > + /* Disable being seen as "comconsole". */ > + comconsole.c_name =3D "efiserialio"; > return; > } > #endif > What if env is NULL? Shouldn't the code return without changing anything? Seems to me that this if() should be split into two if() clauses. =2D- Gary Jennejohn From nobody Sat Apr 1 16:20: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 4Ppj7H4NpVz43066; Sat, 1 Apr 2023 16:20: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 4Ppj7H3zLVz3qsb; Sat, 1 Apr 2023 16:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680366027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=611SH+TRnVXyFue6XSUwkRNarYgaNUUm2zI0ChoU86Q=; b=ubeqSWFX1RKdLaQWt6BnjfxpqIu5eNbAqU4ZwQpOzMB2UlNYeISkN44uoUMJcdeYW8V3S0 M06rRcvdPDJABGFVOx+oEBvmfHZZYQyL2yTMtGc0QMQhUr0Ng87j8ok3vANta6wiXj49Mb M/WL+PAOXc/1i2devfzfI6vMwR/EOEG+3E+Qs17OubEuFXyAicDtn7ybcu2eibZT2zAIrF YhWUPQA6CLEKaz2BDK49efcNX9lzIXsEsANn+nCrSrS1/Bv2aLgqSYB7kuU8qtPzpxLq93 9ewHB+MbKkBL8k+UuZEjPLEL7RKk+E2dyeC9XdBQ9XvSQE30HvwNTlcvXPigJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680366027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=611SH+TRnVXyFue6XSUwkRNarYgaNUUm2zI0ChoU86Q=; b=yjTFUArXL5AX7hI7hhIIvVupCgDUSaiGXjm0TGvZ/bo6OxrUUt7EsZeTACM+twDkTy0ZIc 0AbIRA/8tQIGJmMImdvW/20gz2j8z8sNmEBsl7xfW74ztN1MyCIkSuOBQ/1r7VOob9gnTC ZwNe+ioz0qUomqohKvjKqw2hyIRb8menCHpJBvXhhIZ5OSQmZphXLvV7xDDb84weKlv5X+ yrCcRiDckfobV/fMD7RZVJTeQNhu+XgEgt4hhoFP5NTUaK2PNG6lkO45fvFOeIXwG3tktz JdgKabmnltB0sKeDzvXNGZI+M/rvy9KPY0JvZ5d0d/xNzcR2gH3c1uQB2HPBxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680366027; a=rsa-sha256; cv=none; b=Prtd7LYR6JdGqvhxHt+k0MNd0og5nuyxkvX4uSxlXhD6YoKI/mJMOuu3aLlguQNS8sbJzh nYswljmwjPffQ8z9OLJS66+pFTyEWJQRRex8sgVNVNQp4TS2ikNiqCAwnHi7uNetBe4snc thot53xYnbNtY5+wdHMXXmT5Tp6eh2gHM+24R72IJXrQ6WIlwQGT+sbPlaI3wEEFMEfiU6 zkFtr89PeAfmC1o0+AVH2ZKRecjauaaw5Qut+jxma0FFInXyCe9w/D6Me2GcmYkmNVGiF0 82YWtdslSUo/6c43gfeuE+7B9Jjmtleas8B1Dzq3/+1VKCx+MnRckT3X0vsroA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ppj7H32WBzhqD; Sat, 1 Apr 2023 16:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 331GKRNu094119; Sat, 1 Apr 2023 16:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 331GKR81094118; Sat, 1 Apr 2023 16:20:27 GMT (envelope-from git) Date: Sat, 1 Apr 2023 16:20:27 GMT Message-Id: <202304011620.331GKR81094118@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: 95940a2d2442 - main - Add myself (cc) as a src commiter. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95940a2d2442c4ae47013b8ddb5bfb8bb5e40b39 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=95940a2d2442c4ae47013b8ddb5bfb8bb5e40b39 commit 95940a2d2442c4ae47013b8ddb5bfb8bb5e40b39 Author: Cheng Cui AuthorDate: 2023-03-31 10:06:52 +0000 Commit: Cheng Cui CommitDate: 2023-04-01 12:17:21 +0000 Add myself (cc) as a src commiter. Summary: Adding mentor relationships for cc when committing new diffs. Reviewed by: rscheff (mentor), tuexen (mentor) Approved by: rscheff (mentor), tuexen (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39368 --- share/misc/committers-src.dot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 6e7b5b6c63b3..b2e927d4d9fd 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -140,6 +140,7 @@ bryanv [label="Bryan Venteicher\nbryanv@FreeBSD.org\n2012/11/03"] bschmidt [label="Bernhard Schmidt\nbschmidt@FreeBSD.org\n2010/02/06"] bwidawsk [label="Ben Widawsky\nbwidawsk@FreeBSD.org\n2018/07/05"] bz [label="Bjoern A. Zeeb\nbz@FreeBSD.org\n2004/07/27"] +cc [label="Cheng Cui\ncc@FreeBSD.org\n2023/02/15"] cem [label="Conrad Meyer\ncem@FreeBSD.org\n2015/07/05"] chuck [label="Chuck Tuffli\nchuck@FreeBSD.org\n2017/09/06"] cognet [label="Olivier Houchard\ncognet@FreeBSD.org\n2002/10/09"] @@ -845,6 +846,8 @@ rrs -> bcran rrs -> jchandra rrs -> tuexen +rscheff -> cc + rstone -> markj rstone -> mjoras @@ -920,6 +923,7 @@ thompsa -> eri trasz -> jh trasz -> mjg +tuexen -> cc tuexen -> rscheff ume -> jinmei From nobody Sat Apr 1 16:27: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 4PpjJ52VZ5z430Qt; Sat, 1 Apr 2023 16:28:05 +0000 (UTC) (envelope-from ccfreebsd@gmail.com) Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 4PpjJ36qzDz3rKG; Sat, 1 Apr 2023 16:28:03 +0000 (UTC) (envelope-from ccfreebsd@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of ccfreebsd@gmail.com designates 209.85.167.41 as permitted sender) smtp.mailfrom=ccfreebsd@gmail.com; dmarc=none Received: by mail-lf1-f41.google.com with SMTP id bi9so32753463lfb.12; Sat, 01 Apr 2023 09:28:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680366481; 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=nZUZbX8uIwYqVkjq+gukUw6SD1yq4lnuiormJWUjj6I=; b=c6Ke5WEMmBnrSnn9CsUiU5shvzEY04GSl6u5RGdBKdNMXkXH5KQPwS0QdrJmLDp/ri 8x944NmbZvMX77SKYOwRVqrbE8EYckP/XQAexRrytPmtft2TRTbCsXFdGc6YW//I+Kf9 zxzLHDxyGRPuZ/vbbcqVpqxi8ZxneeA2umVfp3dhwhQYgN0Vx1GoiGphVYVzf+DqMj60 +sN4hQTrpfjbvmIUho43akJ4LMO0Lotor5YvAMatfGUevOcbtn7eJ5Jo3bN5ihwBy4D6 bVUejvBykVNAzsmyrselvNkh/GtuG36ZeWJNOhKDJahPZ1Y4du/jVmgELzUeyKMnebqk kK8w== X-Gm-Message-State: AAQBX9fz/szkX3NBDCvP/fbE5Ryz37nQz0vVH0QbyglrVzmoJznGOv4P PGPsC8bUZue1lxeIHIDwNzfhy74Q+XUC1A== X-Google-Smtp-Source: AKy350bhcHpijAvTIpkXcrkgEvp/s5vWuHp2fZwPk7Fd1nIgaubzsTbKQDizoUiCOTqtpCc0bB9Qlg== X-Received: by 2002:a05:6512:62:b0:4b5:87da:8b35 with SMTP id i2-20020a056512006200b004b587da8b35mr4958221lfo.61.1680366481023; Sat, 01 Apr 2023 09:28:01 -0700 (PDT) Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com. [209.85.167.54]) by smtp.gmail.com with ESMTPSA id f16-20020a2e9510000000b00295663a8441sm881816ljh.88.2023.04.01.09.28.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 01 Apr 2023 09:28:00 -0700 (PDT) Received: by mail-lf1-f54.google.com with SMTP id k37so32841865lfv.0; Sat, 01 Apr 2023 09:28:00 -0700 (PDT) X-Received: by 2002:ac2:568f:0:b0:4ea:ef08:8d30 with SMTP id 15-20020ac2568f000000b004eaef088d30mr8999410lfr.9.1680366480768; Sat, 01 Apr 2023 09:28:00 -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: <202303311358.32VDwPUA083636@gitrepo.freebsd.org> In-Reply-To: From: Cheng Cui Date: Sat, 1 Apr 2023 12:27:49 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: fcad8ada9afc - main - Revert "Add myself (cc) as a src commiter." To: Zhenlei Huang Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="0000000000002dc41605f848cf13" X-Spamd-Result: default: False [-1.89 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; FORGED_SENDER(0.30)[cc@freebsd.org,ccfreebsd@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_SPAM_SHORT(0.11)[0.111]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.41:from,209.85.167.54:received]; FREEMAIL_ENVFROM(0.00)[gmail.com]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.41:from]; RCVD_COUNT_THREE(0.00)[4]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; FROM_NEQ_ENVFROM(0.00)[cc@freebsd.org,ccfreebsd@gmail.com] X-Rspamd-Queue-Id: 4PpjJ36qzDz3rKG X-Spamd-Bar: - X-ThisMailContainsUnwantedMimeParts: N --0000000000002dc41605f848cf13 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Thanks for the concern. It was a mistake that placed my name in the wrong place. The correct change is in 95940a2d2442. Best Regards, Cheng Cui On Fri, Mar 31, 2023 at 11:46=E2=80=AFAM Zhenlei Huang w= rote: > Hi Cheng, > > Is there something wrong with 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0 ? > > Best regards, > Zhenlei > > > On Mar 31, 2023, at 9:58 PM, Cheng Cui wrote: > > > > The branch main has been updated by cc: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dfcad8ada9afcc60cec50880e3ac9576= 81badf55f > > > > commit fcad8ada9afcc60cec50880e3ac957681badf55f > > Author: Cheng Cui > > AuthorDate: 2023-03-31 06:53:16 +0000 > > Commit: Cheng Cui > > CommitDate: 2023-03-31 09:58:14 +0000 > > > > Revert "Add myself (cc) as a src commiter." > > > > Summary: This reverts commit 134ced89c4ca7852f2a56b91e9fc848ce4d4fab= 0. > > > > Reviewers: rscheff, tuexen > > Subscribers: imp > > Approved by: tuexen (mentor) > > Differential Revision: https://reviews.freebsd.org/D39363 > > --- > > share/misc/committers-src.dot | 4 ---- > > 1 file changed, 4 deletions(-) > > > > diff --git a/share/misc/committers-src.dot > b/share/misc/committers-src.dot > > index 76ab7441fd46..6e7b5b6c63b3 100644 > > --- a/share/misc/committers-src.dot > > +++ b/share/misc/committers-src.dot > > @@ -41,7 +41,6 @@ bmah [label=3D"Bruce A. Mah\nbmah@FreeBSD.org > \n2002/01/29\n2009/09/13"] > > bmilekic [label=3D"Bosko Milekic\nbmilekic@FreeBSD.org > \n2000/09/21\n2008/11/10"] > > bushman [label=3D"Michael Bushkov\nbushman@FreeBSD.org > \n2007/03/10\n2010/04/29"] > > carl [label=3D"Carl Delsey\ncarl@FreeBSD.org\n2013/01/14\n2014/03/06"] > > -cc [label=3D"Cheng Cui\ncc@FreeBSD.org\n2023/02/15"] > > ceri [label=3D"Ceri Davies\nceri@FreeBSD.org\n2006/11/07\n2012/03/07"] > > cjc [label=3D"Crist J. Clark\ncjc@FreeBSD.org\n2001/06/01\n2006/12/29"] > > davidxu [label=3D"David Xu\ndavidxu@FreeBSD.org\n2002/09/02\n2014/04/14= "] > > @@ -846,8 +845,6 @@ rrs -> bcran > > rrs -> jchandra > > rrs -> tuexen > > > > -rscheff -> cc > > - > > rstone -> markj > > rstone -> mjoras > > > > @@ -923,7 +920,6 @@ thompsa -> eri > > trasz -> jh > > trasz -> mjg > > > > -tuexen -> cc > > tuexen -> rscheff > > > > ume -> jinmei > > > > --0000000000002dc41605f848cf13 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Thanks for the concern. It was a mistake = that placed my name in the wrong place.
The correct change is in = 95940a2d2442.
=

Best Regards,
Cheng Cui


On Fri, Mar 31, 2023 at 11:46=E2=80=AFAM Zhenlei Huang <zlei@freebsd.org> wrote:
Hi Cheng,

Is there something wrong with 134ced89c4ca7852f2a56b91e9fc848ce4d4fab0 ?
Best regards,
Zhenlei

> On Mar 31, 2023, at 9:58 PM, Cheng Cui <cc@FreeBSD.org> wrote: >
> The branch main has been updated by cc:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3Dfcad8ada9afcc60cec50880e3ac957681badf55f<= /a>
>
> commit fcad8ada9afcc60cec50880e3ac957681badf55f
> Author:=C2=A0 =C2=A0 =C2=A0Cheng Cui <cc@FreeBSD.org>
> AuthorDate: 2023-03-31 06:53:16 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Cheng Cui <cc@FreeBSD.org>
> CommitDate: 2023-03-31 09:58:14 +0000
>
>=C2=A0 =C2=A0 Revert "Add myself (cc) as a src commiter."
>
>=C2=A0 =C2=A0 Summary: This reverts commit 134ced89c4ca7852f2a56b91e9fc= 848ce4d4fab0.
>
>=C2=A0 =C2=A0 Reviewers: rscheff, tuexen
>=C2=A0 =C2=A0 Subscribers: imp
>=C2=A0 =C2=A0 Approved by: tuexen (mentor)
>=C2=A0 =C2=A0 Differential Revision: https://reviews.freebsd.o= rg/D39363
> ---
> share/misc/committers-src.dot | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/share/misc/committers-src.dot b/share/misc/committers-src= .dot
> index 76ab7441fd46..6e7b5b6c63b3 100644
> --- a/share/misc/committers-src.dot
> +++ b/share/misc/committers-src.dot
> @@ -41,7 +41,6 @@ bmah [label=3D"Bruce A. Mah\nbmah@FreeBSD.org\n= 2002/01/29\n2009/09/13"]
> bmilekic [label=3D"Bosko Milekic\nbmilekic@FreeBSD.org\n2000/09/2= 1\n2008/11/10"]
> bushman [label=3D"Michael Bushkov\nbushman@FreeBSD.org\n2007/03/1= 0\n2010/04/29"]
> carl [label=3D"Carl Delsey\ncarl@FreeBSD.org\n2013/01/14\n2014/03= /06"]
> -cc [label=3D"Cheng Cui\ncc@FreeBSD.org\n2023/02/15"]
> ceri [label=3D"Ceri Davies\nceri@FreeBSD.org\n2006/11/07\n2012/03= /07"]
> cjc [label=3D"Crist J. Clark\ncjc@FreeBSD.org\n2001/06/01\n2006/1= 2/29"]
> davidxu [label=3D"David Xu\ndavidxu@FreeBSD.org\n2002/09/02\n2014= /04/14"]
> @@ -846,8 +845,6 @@ rrs -> bcran
> rrs -> jchandra
> rrs -> tuexen
>
> -rscheff -> cc
> -
> rstone -> markj
> rstone -> mjoras
>
> @@ -923,7 +920,6 @@ thompsa -> eri
> trasz -> jh
> trasz -> mjg
>
> -tuexen -> cc
> tuexen -> rscheff
>
> ume -> jinmei



--0000000000002dc41605f848cf13-- From nobody Sat Apr 1 19:36: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 4PpnV00fw2z43Fqw; Sat, 1 Apr 2023 19:36: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 4PpnV00S2mz4KC6; Sat, 1 Apr 2023 19:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680377816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y0CrpAOsHMb6KZXLMdhQY62FiGNCbnzuTzRYHtbPY7Q=; b=qTdG8yxXADgBF9DUHk+WDQOLkyLL4EhjCPC+Fgw+x2tzOoyuIqbyjK1o9O2d8yeZLqt0wP CVY9lelZBCACdY9EhCysCdxWSDAcbHFns6ZPILNoDQQkg7mYGCWy9qDV5CJ1chEJ4xsvmW sVYLKTJ99AoF2xi9M/XgX1GPToQb2dwAzau8vMJAKWAq9Mn0U9Bf0BohTg7CNQC24+TnFS 8PBdG3Ab9PE+acwDT1D41dsgqxxNbm7M5X8VBvgF5hFX1b487ZXBlT/h8eyJ0yPi5OhqdH Gn0lzR3M2eEV+fUoKkCVkVfTGew6BG4F0WokISc2Kxs7XRGTMvKLX7R60zds2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680377816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y0CrpAOsHMb6KZXLMdhQY62FiGNCbnzuTzRYHtbPY7Q=; b=S6SnwidG2wslMh+yuXnsRAraMKDHOJUkTdtSNTR1AKLY4qz9jdOWMKBcw5iValHm3CajsS pcXbqT0qim9S61Yoj/BkGE/vOEHWIturGt0VpP6P0iRWu4keio+7dp4TY/+NNpu+d6r0aj lDRyWF5V81zKAlvTG0tYuUg+mlp5PGHoLlO4SgDA91ONYnRpE5I9OF57qAVcomFKQzwahX iVHNjGoQNT7vdrEs2m8cVxgpUo3XOg5E44tYoSbo6tWKlgAj0cyJwP8x52MHANy68NI/j6 e5iyx7DaNTjA0wjNS5o1VdtP+sT9DsZRn1wrecOTmIueBPJUnCWA8Vo0yLE+mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680377816; a=rsa-sha256; cv=none; b=kPIuVcruRKBdJ+RMjJkgocFIEKJ5XP8IkITB8e7ml8Pcv/N6JRps/OZZD4ADBAWIeP+/XL uPXoHVa4zGFkPlmukB+5UvmU66Prw5Hpr9qM07TMcsZTWAKtkLOeVahpY46FyqNKWBzGOm PJbPFCl6t2RpPms3PC6Ju3cHh1aAAEFp6YbBGsLlWyYCqlSEbxvMfN3c2dPVtDjCI3O7dh WEGLVlpTVwzyCpklkWDUWEXJUTNGTfah+H3VqPoU75EX7pQoFnDz+nJT276eP1nfVdU8Gj GIh7YEbCzhbkdXTMR0hw5n4LVKngz6wjEuTMGbWDOEiBjY/lShjfjZI1rqMjQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpnTz6cdjznLW; Sat, 1 Apr 2023 19:36:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 331Jat6L013550; Sat, 1 Apr 2023 19:36:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 331JatO2013549; Sat, 1 Apr 2023 19:36:55 GMT (envelope-from git) Date: Sat, 1 Apr 2023 19:36:55 GMT Message-Id: <202304011936.331JatO2013549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: fee65b7e21ee - main - tests: split netlink.py into multiple files to impove maintainability. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fee65b7e21eeeb625dcaba8cf2b9e0cf5af83498 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=fee65b7e21eeeb625dcaba8cf2b9e0cf5af83498 commit fee65b7e21eeeb625dcaba8cf2b9e0cf5af83498 Author: Alexander V. Chernikov AuthorDate: 2023-03-31 09:55:36 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-01 19:31:38 +0000 tests: split netlink.py into multiple files to impove maintainability. This diff does not contain any functional changes. Its sole purpose is splitting netlink.py into smaller chunks. The new code simplifies the upcoming generic netlink support introduction. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D39365 --- tests/atf_python/sys/Makefile | 2 +- tests/atf_python/sys/net/Makefile | 2 +- tests/atf_python/sys/net/netlink.py | 1728 ------------------------- tests/atf_python/sys/netlink/Makefile | 11 + tests/atf_python/sys/netlink/__init__.py | 0 tests/atf_python/sys/netlink/attrs.py | 287 ++++ tests/atf_python/sys/netlink/base_headers.py | 65 + tests/atf_python/sys/netlink/message.py | 201 +++ tests/atf_python/sys/netlink/netlink.py | 368 ++++++ tests/atf_python/sys/netlink/netlink_route.py | 727 +++++++++++ tests/atf_python/sys/netlink/utils.py | 74 ++ tests/sys/netlink/test_nl_core.py | 4 +- tests/sys/netlink/test_rtnl_iface.py | 32 +- tests/sys/netlink/test_rtnl_ifaddr.py | 19 +- tests/sys/netlink/test_rtnl_neigh.py | 12 +- tests/sys/netlink/test_rtnl_route.py | 22 +- 16 files changed, 1778 insertions(+), 1776 deletions(-) diff --git a/tests/atf_python/sys/Makefile b/tests/atf_python/sys/Makefile index ff4cf17b85d2..540c3803ada5 100644 --- a/tests/atf_python/sys/Makefile +++ b/tests/atf_python/sys/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR} FILES= __init__.py -SUBDIR= net +SUBDIR= net netlink .include FILESDIR= ${TESTSBASE}/atf_python/sys diff --git a/tests/atf_python/sys/net/Makefile b/tests/atf_python/sys/net/Makefile index 63efefd27142..05b1d8afe863 100644 --- a/tests/atf_python/sys/net/Makefile +++ b/tests/atf_python/sys/net/Makefile @@ -2,7 +2,7 @@ .PATH: ${.CURDIR} -FILES= __init__.py netlink.py rtsock.py tools.py vnet.py +FILES= __init__.py rtsock.py tools.py vnet.py .include FILESDIR= ${TESTSBASE}/atf_python/sys/net diff --git a/tests/atf_python/sys/net/netlink.py b/tests/atf_python/sys/net/netlink.py deleted file mode 100644 index 053eb432e915..000000000000 --- a/tests/atf_python/sys/net/netlink.py +++ /dev/null @@ -1,1728 +0,0 @@ -#!/usr/local/bin/python3 -import os -import socket -import struct -import sys -import unittest -from ctypes import c_int -from ctypes import c_ubyte -from ctypes import c_uint -from ctypes import c_ushort -from ctypes import sizeof -from ctypes import Structure -from enum import auto -from enum import Enum -from typing import Any -from typing import Dict -from typing import List -from typing import NamedTuple - - -def roundup2(val: int, num: int) -> int: - if val % num: - return (val | (num - 1)) + 1 - else: - return val - - -def align4(val: int) -> int: - return roundup2(val, 4) - - -def enum_or_int(val) -> int: - if isinstance(val, Enum): - return val.value - return val - - -class SockaddrNl(Structure): - _fields_ = [ - ("nl_len", c_ubyte), - ("nl_family", c_ubyte), - ("nl_pad", c_ushort), - ("nl_pid", c_uint), - ("nl_groups", c_uint), - ] - - -class Nlmsghdr(Structure): - _fields_ = [ - ("nlmsg_len", c_uint), - ("nlmsg_type", c_ushort), - ("nlmsg_flags", c_ushort), - ("nlmsg_seq", c_uint), - ("nlmsg_pid", c_uint), - ] - - -class Nlmsgdone(Structure): - _fields_ = [ - ("error", c_int), - ] - - -class Nlmsgerr(Structure): - _fields_ = [ - ("error", c_int), - ("msg", Nlmsghdr), - ] - - -class NlErrattrType(Enum): - NLMSGERR_ATTR_UNUSED = 0 - NLMSGERR_ATTR_MSG = auto() - NLMSGERR_ATTR_OFFS = auto() - NLMSGERR_ATTR_COOKIE = auto() - NLMSGERR_ATTR_POLICY = auto() - - -class RtattrType(Enum): - RTA_UNSPEC = 0 - RTA_DST = 1 - RTA_SRC = 2 - RTA_IIF = 3 - RTA_OIF = 4 - RTA_GATEWAY = 5 - RTA_PRIORITY = 6 - RTA_PREFSRC = 7 - RTA_METRICS = 8 - RTA_MULTIPATH = 9 - # RTA_PROTOINFO = 10 - RTA_KNH_ID = 10 - RTA_FLOW = 11 - RTA_CACHEINFO = 12 - RTA_SESSION = 13 - # RTA_MP_ALGO = 14 - RTA_RTFLAGS = 14 - RTA_TABLE = 15 - RTA_MARK = 16 - RTA_MFC_STATS = 17 - RTA_VIA = 18 - RTA_NEWDST = 19 - RTA_PREF = 20 - RTA_ENCAP_TYPE = 21 - RTA_ENCAP = 22 - RTA_EXPIRES = 23 - RTA_PAD = 24 - RTA_UID = 25 - RTA_TTL_PROPAGATE = 26 - RTA_IP_PROTO = 27 - RTA_SPORT = 28 - RTA_DPORT = 29 - RTA_NH_ID = 30 - - -class NlMsgType(Enum): - NLMSG_NOOP = 1 - NLMSG_ERROR = 2 - NLMSG_DONE = 3 - NLMSG_OVERRUN = 4 - - -class NlRtMsgType(Enum): - RTM_NEWLINK = 16 - RTM_DELLINK = 17 - RTM_GETLINK = 18 - RTM_SETLINK = 19 - RTM_NEWADDR = 20 - RTM_DELADDR = 21 - RTM_GETADDR = 22 - RTM_NEWROUTE = 24 - RTM_DELROUTE = 25 - RTM_GETROUTE = 26 - RTM_NEWNEIGH = 28 - RTM_DELNEIGH = 29 - RTM_GETNEIGH = 30 - RTM_NEWRULE = 32 - RTM_DELRULE = 33 - RTM_GETRULE = 34 - RTM_NEWQDISC = 36 - RTM_DELQDISC = 37 - RTM_GETQDISC = 38 - RTM_NEWTCLASS = 40 - RTM_DELTCLASS = 41 - RTM_GETTCLASS = 42 - RTM_NEWTFILTER = 44 - RTM_DELTFILTER = 45 - RTM_GETTFILTER = 46 - RTM_NEWACTION = 48 - RTM_DELACTION = 49 - RTM_GETACTION = 50 - RTM_NEWPREFIX = 52 - RTM_GETMULTICAST = 58 - RTM_GETANYCAST = 62 - RTM_NEWNEIGHTBL = 64 - RTM_GETNEIGHTBL = 66 - RTM_SETNEIGHTBL = 67 - RTM_NEWNDUSEROPT = 68 - RTM_NEWADDRLABEL = 72 - RTM_DELADDRLABEL = 73 - RTM_GETADDRLABEL = 74 - RTM_GETDCB = 78 - RTM_SETDCB = 79 - RTM_NEWNETCONF = 80 - RTM_GETNETCONF = 82 - RTM_NEWMDB = 84 - RTM_DELMDB = 85 - RTM_GETMDB = 86 - RTM_NEWNSID = 88 - RTM_DELNSID = 89 - RTM_GETNSID = 90 - RTM_NEWSTATS = 92 - RTM_GETSTATS = 94 - - -class RtAttr(Structure): - _fields_ = [ - ("rta_len", c_ushort), - ("rta_type", c_ushort), - ] - - -class RtMsgHdr(Structure): - _fields_ = [ - ("rtm_family", c_ubyte), - ("rtm_dst_len", c_ubyte), - ("rtm_src_len", c_ubyte), - ("rtm_tos", c_ubyte), - ("rtm_table", c_ubyte), - ("rtm_protocol", c_ubyte), - ("rtm_scope", c_ubyte), - ("rtm_type", c_ubyte), - ("rtm_flags", c_uint), - ] - - -class RtMsgFlags(Enum): - RTM_F_NOTIFY = 0x100 - RTM_F_CLONED = 0x200 - RTM_F_EQUALIZE = 0x400 - RTM_F_PREFIX = 0x800 - RTM_F_LOOKUP_TABLE = 0x1000 - RTM_F_FIB_MATCH = 0x2000 - RTM_F_OFFLOAD = 0x4000 - RTM_F_TRAP = 0x8000 - RTM_F_OFFLOAD_FAILED = 0x20000000 - - -class AddressFamilyLinux(Enum): - AF_INET = socket.AF_INET - AF_INET6 = socket.AF_INET6 - AF_NETLINK = 16 - - -class AddressFamilyBsd(Enum): - AF_INET = socket.AF_INET - AF_INET6 = socket.AF_INET6 - AF_NETLINK = 38 - - -class NlmBaseFlags(Enum): - NLM_F_REQUEST = 0x01 - NLM_F_MULTI = 0x02 - NLM_F_ACK = 0x04 - NLM_F_ECHO = 0x08 - NLM_F_DUMP_INTR = 0x10 - NLM_F_DUMP_FILTERED = 0x20 - - -# XXX: in python3.8 it is possible to -# class NlmGetFlags(Enum, NlmBaseFlags): - - -class NlmGetFlags(Enum): - NLM_F_ROOT = 0x100 - NLM_F_MATCH = 0x200 - NLM_F_ATOMIC = 0x400 - - -class NlmNewFlags(Enum): - NLM_F_REPLACE = 0x100 - NLM_F_EXCL = 0x200 - NLM_F_CREATE = 0x400 - NLM_F_APPEND = 0x800 - - -class NlmDeleteFlags(Enum): - NLM_F_NONREC = 0x100 - - -class NlmAckFlags(Enum): - NLM_F_CAPPED = 0x100 - NLM_F_ACK_TLVS = 0x200 - - -class RtScope(Enum): - RT_SCOPE_UNIVERSE = 0 - RT_SCOPE_SITE = 200 - RT_SCOPE_LINK = 253 - RT_SCOPE_HOST = 254 - RT_SCOPE_NOWHERE = 255 - - -class RtType(Enum): - RTN_UNSPEC = 0 - RTN_UNICAST = auto() - RTN_LOCAL = auto() - RTN_BROADCAST = auto() - RTN_ANYCAST = auto() - RTN_MULTICAST = auto() - RTN_BLACKHOLE = auto() - RTN_UNREACHABLE = auto() - RTN_PROHIBIT = auto() - RTN_THROW = auto() - RTN_NAT = auto() - RTN_XRESOLVE = auto() - - -class RtProto(Enum): - RTPROT_UNSPEC = 0 - RTPROT_REDIRECT = 1 - RTPROT_KERNEL = 2 - RTPROT_BOOT = 3 - RTPROT_STATIC = 4 - RTPROT_GATED = 8 - RTPROT_RA = 9 - RTPROT_MRT = 10 - RTPROT_ZEBRA = 11 - RTPROT_BIRD = 12 - RTPROT_DNROUTED = 13 - RTPROT_XORP = 14 - RTPROT_NTK = 15 - RTPROT_DHCP = 16 - RTPROT_MROUTED = 17 - RTPROT_KEEPALIVED = 18 - RTPROT_BABEL = 42 - RTPROT_OPENR = 99 - RTPROT_BGP = 186 - RTPROT_ISIS = 187 - RTPROT_OSPF = 188 - RTPROT_RIP = 189 - RTPROT_EIGRP = 192 - - -class NlRtaxType(Enum): - RTAX_UNSPEC = 0 - RTAX_LOCK = auto() - RTAX_MTU = auto() - RTAX_WINDOW = auto() - RTAX_RTT = auto() - RTAX_RTTVAR = auto() - RTAX_SSTHRESH = auto() - RTAX_CWND = auto() - RTAX_ADVMSS = auto() - RTAX_REORDERING = auto() - RTAX_HOPLIMIT = auto() - RTAX_INITCWND = auto() - RTAX_FEATURES = auto() - RTAX_RTO_MIN = auto() - RTAX_INITRWND = auto() - RTAX_QUICKACK = auto() - RTAX_CC_ALGO = auto() - RTAX_FASTOPEN_NO_COOKIE = auto() - - -class RtFlagsBSD(Enum): - RTF_UP = 0x1 - RTF_GATEWAY = 0x2 - RTF_HOST = 0x4 - RTF_REJECT = 0x8 - RTF_DYNAMIC = 0x10 - RTF_MODIFIED = 0x20 - RTF_DONE = 0x40 - RTF_XRESOLVE = 0x200 - RTF_LLINFO = 0x400 - RTF_LLDATA = 0x400 - RTF_STATIC = 0x800 - RTF_BLACKHOLE = 0x1000 - RTF_PROTO2 = 0x4000 - RTF_PROTO1 = 0x8000 - RTF_PROTO3 = 0x40000 - RTF_FIXEDMTU = 0x80000 - RTF_PINNED = 0x100000 - RTF_LOCAL = 0x200000 - RTF_BROADCAST = 0x400000 - RTF_MULTICAST = 0x800000 - RTF_STICKY = 0x10000000 - RTF_RNH_LOCKED = 0x40000000 - RTF_GWFLAG_COMPAT = 0x80000000 - - -class NlRtGroup(Enum): - RTNLGRP_NONE = 0 - RTNLGRP_LINK = auto() - RTNLGRP_NOTIFY = auto() - RTNLGRP_NEIGH = auto() - RTNLGRP_TC = auto() - RTNLGRP_IPV4_IFADDR = auto() - RTNLGRP_IPV4_MROUTE = auto() - RTNLGRP_IPV4_ROUTE = auto() - RTNLGRP_IPV4_RULE = auto() - RTNLGRP_IPV6_IFADDR = auto() - RTNLGRP_IPV6_MROUTE = auto() - RTNLGRP_IPV6_ROUTE = auto() - RTNLGRP_IPV6_IFINFO = auto() - RTNLGRP_DECnet_IFADDR = auto() - RTNLGRP_NOP2 = auto() - RTNLGRP_DECnet_ROUTE = auto() - RTNLGRP_DECnet_RULE = auto() - RTNLGRP_NOP4 = auto() - RTNLGRP_IPV6_PREFIX = auto() - RTNLGRP_IPV6_RULE = auto() - RTNLGRP_ND_USEROPT = auto() - RTNLGRP_PHONET_IFADDR = auto() - RTNLGRP_PHONET_ROUTE = auto() - RTNLGRP_DCB = auto() - RTNLGRP_IPV4_NETCONF = auto() - RTNLGRP_IPV6_NETCONF = auto() - RTNLGRP_MDB = auto() - RTNLGRP_MPLS_ROUTE = auto() - RTNLGRP_NSID = auto() - RTNLGRP_MPLS_NETCONF = auto() - RTNLGRP_IPV4_MROUTE_R = auto() - RTNLGRP_IPV6_MROUTE_R = auto() - RTNLGRP_NEXTHOP = auto() - RTNLGRP_BRVLAN = auto() - - -class IfinfoMsg(Structure): - _fields_ = [ - ("ifi_family", c_ubyte), - ("__ifi_pad", c_ubyte), - ("ifi_type", c_ushort), - ("ifi_index", c_int), - ("ifi_flags", c_uint), - ("ifi_change", c_uint), - ] - - -class IflattrType(Enum): - IFLA_UNSPEC = 0 - IFLA_ADDRESS = auto() - IFLA_BROADCAST = auto() - IFLA_IFNAME = auto() - IFLA_MTU = auto() - IFLA_LINK = auto() - IFLA_QDISC = auto() - IFLA_STATS = auto() - IFLA_COST = auto() - IFLA_PRIORITY = auto() - IFLA_MASTER = auto() - IFLA_WIRELESS = auto() - IFLA_PROTINFO = auto() - IFLA_TXQLEN = auto() - IFLA_MAP = auto() - IFLA_WEIGHT = auto() - IFLA_OPERSTATE = auto() - IFLA_LINKMODE = auto() - IFLA_LINKINFO = auto() - IFLA_NET_NS_PID = auto() - IFLA_IFALIAS = auto() - IFLA_NUM_VF = auto() - IFLA_VFINFO_LIST = auto() - IFLA_STATS64 = auto() - IFLA_VF_PORTS = auto() - IFLA_PORT_SELF = auto() - IFLA_AF_SPEC = auto() - IFLA_GROUP = auto() - IFLA_NET_NS_FD = auto() - IFLA_EXT_MASK = auto() - IFLA_PROMISCUITY = auto() - IFLA_NUM_TX_QUEUES = auto() - IFLA_NUM_RX_QUEUES = auto() - IFLA_CARRIER = auto() - IFLA_PHYS_PORT_ID = auto() - IFLA_CARRIER_CHANGES = auto() - IFLA_PHYS_SWITCH_ID = auto() - IFLA_LINK_NETNSID = auto() - IFLA_PHYS_PORT_NAME = auto() - IFLA_PROTO_DOWN = auto() - IFLA_GSO_MAX_SEGS = auto() - IFLA_GSO_MAX_SIZE = auto() - IFLA_PAD = auto() - IFLA_XDP = auto() - IFLA_EVENT = auto() - IFLA_NEW_NETNSID = auto() - IFLA_IF_NETNSID = auto() - IFLA_CARRIER_UP_COUNT = auto() - IFLA_CARRIER_DOWN_COUNT = auto() - IFLA_NEW_IFINDEX = auto() - IFLA_MIN_MTU = auto() - IFLA_MAX_MTU = auto() - IFLA_PROP_LIST = auto() - IFLA_ALT_IFNAME = auto() - IFLA_PERM_ADDRESS = auto() - IFLA_PROTO_DOWN_REASON = auto() - - -class IflinkInfo(Enum): - IFLA_INFO_UNSPEC = 0 - IFLA_INFO_KIND = auto() - IFLA_INFO_DATA = auto() - IFLA_INFO_XSTATS = auto() - IFLA_INFO_SLAVE_KIND = auto() - IFLA_INFO_SLAVE_DATA = auto() - - -class IfLinkInfoDataVlan(Enum): - IFLA_VLAN_UNSPEC = 0 - IFLA_VLAN_ID = auto() - IFLA_VLAN_FLAGS = auto() - IFLA_VLAN_EGRESS_QOS = auto() - IFLA_VLAN_INGRESS_QOS = auto() - IFLA_VLAN_PROTOCOL = auto() - - -class IfaddrMsg(Structure): - _fields_ = [ - ("ifa_family", c_ubyte), - ("ifa_prefixlen", c_ubyte), - ("ifa_flags", c_ubyte), - ("ifa_scope", c_ubyte), - ("ifa_index", c_uint), - ] - - -class IfattrType(Enum): - IFA_UNSPEC = 0 - IFA_ADDRESS = auto() - IFA_LOCAL = auto() - IFA_LABEL = auto() - IFA_BROADCAST = auto() - IFA_ANYCAST = auto() - IFA_CACHEINFO = auto() - IFA_MULTICAST = auto() - IFA_FLAGS = auto() - IFA_RT_PRIORITY = auto() - IFA_TARGET_NETNSID = auto() - - -class NdMsg(Structure): - _fields_ = [ - ("ndm_family", c_ubyte), - ("ndm_pad1", c_ubyte), - ("ndm_pad2", c_ubyte), - ("ndm_ifindex", c_uint), - ("ndm_state", c_ushort), - ("ndm_flags", c_ubyte), - ("ndm_type", c_ubyte), - ] - - -class NdAttrType(Enum): - NDA_UNSPEC = 0 - NDA_DST = 1 - NDA_LLADDR = 2 - NDA_CACHEINFO = 3 - NDA_PROBES = 4 - NDA_VLAN = 5 - NDA_PORT = 6 - NDA_VNI = 7 - NDA_IFINDEX = 8 - NDA_MASTER = 9 - NDA_LINK_NETNSID = 10 - NDA_SRC_VNI = 11 - NDA_PROTOCOL = 12 - NDA_NH_ID = 13 - NDA_FDB_EXT_ATTRS = 14 - NDA_FLAGS_EXT = 15 - NDA_NDM_STATE_MASK = 16 - NDA_NDM_FLAGS_MASK = 17 - - -class GenlMsgHdr(Structure): - _fields_ = [ - ("cmd", c_ubyte), - ("version", c_ubyte), - ("reserved", c_ushort), - ] - - -class NlConst: - AF_NETLINK = 38 - NETLINK_ROUTE = 0 - NETLINK_GENERIC = 16 - - -class NlHelper: - def __init__(self): - self._pmap = {} - self._af_cls = self.get_af_cls() - self._seq_counter = 1 - self.pid = os.getpid() - - def get_seq(self): - ret = self._seq_counter - self._seq_counter += 1 - return ret - - def get_af_cls(self): - if sys.platform.startswith("freebsd"): - cls = AddressFamilyBsd - else: - cls = AddressFamilyLinux - return cls - - @staticmethod - def build_propmap(cls): - ret = {} - for prop in dir(cls): - if not prop.startswith("_"): - ret[getattr(cls, prop).value] = prop - return ret - - def get_propmap(self, cls): - if cls not in self._pmap: - self._pmap[cls] = self.build_propmap(cls) - return self._pmap[cls] - - def get_name_propmap(self, cls): - ret = {} - for prop in dir(cls): - if not prop.startswith("_"): - ret[prop] = getattr(cls, prop).value - return ret - - def get_attr_byval(self, cls, attr_val): - propmap = self.get_propmap(cls) - return propmap.get(attr_val) - - def get_nlmsg_name(self, val): - for cls in [NlRtMsgType, NlMsgType]: - v = self.get_attr_byval(cls, val) - if v is not None: - return v - return "msg#{}".format(val) - - def get_af_name(self, family): - v = self.get_attr_byval(self._af_cls, family) - if v is not None: - return v - return "af#{}".format(family) - - def get_af_value(self, family_str: str) -> int: - propmap = self.get_name_propmap(self._af_cls) - return propmap.get(family_str) - - def get_rta_name(self, val): - return self.get_attr_byval(RtattrType, val) - - @staticmethod - def get_bitmask_map(propmap, val): - v = 1 - ret = {} - while val: - if v & val: - if v in propmap: - ret[v] = propmap[v] - else: - ret[v] = hex(v) - val -= v - v *= 2 - return ret - - def get_bitmask_str(self, cls, val): - bmap = self.get_bitmask_map(self.get_propmap(cls), val) - return ",".join([v for k, v in bmap.items()]) - - @staticmethod - def get_bitmask_str_uncached(cls, val): - pmap = NlHelper.build_propmap(cls) - bmap = NlHelper.get_bitmask_map(pmap, val) - return ",".join([v for k, v in bmap.items()]) - - def get_nlm_flags_str(self, msg_str: str, reply: bool, val): - if reply: - return self.get_bitmask_str(NlmAckFlags, val) - if msg_str.startswith("RTM_GET"): - return self.get_bitmask_str(NlmGetFlags, val) - elif msg_str.startswith("RTM_DEL"): - return self.get_bitmask_str(NlmDeleteFlags, val) - elif msg_str.startswith("RTM_NEW"): - return self.get_bitmask_str(NlmNewFlags, val) - else: - return self.get_bitmask_str(NlmBaseFlags, val) - - -class NlAttr(object): - def __init__(self, nla_type, data): - if isinstance(nla_type, Enum): - self._nla_type = nla_type.value - self._enum = nla_type - else: - self._nla_type = nla_type - self._enum = None - self.nla_list = [] - self._data = data - - @property - def nla_type(self): - return self._nla_type & 0x3F - - @property - def nla_len(self): - return len(self._data) + 4 - - def add_nla(self, nla): - self.nla_list.append(nla) - - def print_attr(self, prepend=""): - if self._enum is not None: - type_str = self._enum.name - else: - type_str = "nla#{}".format(self.nla_type) - print( - "{}len={} type={}({}){}".format( - prepend, self.nla_len, type_str, self.nla_type, self._print_attr_value() - ) - ) - - @staticmethod - def _validate(data): - if len(data) < 4: - raise ValueError("attribute too short") - nla_len, nla_type = struct.unpack("@HH", data[:4]) - if nla_len > len(data): - raise ValueError("attribute length too big") - if nla_len < 4: - raise ValueError("attribute length too short") - - @classmethod - def _parse(cls, data): - nla_len, nla_type = struct.unpack("@HH", data[:4]) - return cls(nla_type, data[4:]) - - @classmethod - def from_bytes(cls, data, attr_type_enum=None): - cls._validate(data) - attr = cls._parse(data) - attr._enum = attr_type_enum - return attr - - def _to_bytes(self, data: bytes): - ret = data - if align4(len(ret)) != len(ret): - ret = data + bytes(align4(len(ret)) - len(ret)) - return struct.pack("@HH", len(data) + 4, self._nla_type) + ret - - def __bytes__(self): - return self._to_bytes(self._data) - - def _print_attr_value(self): - return " " + " ".join(["x{:02X}".format(b) for b in self._data]) - - -class NlAttrNested(NlAttr): - def __init__(self, nla_type, val): - super().__init__(nla_type, b"") - self.nla_list = val - - @property - def nla_len(self): - return align4(len(b"".join([bytes(nla) for nla in self.nla_list]))) + 4 - - def print_attr(self, prepend=""): - if self._enum is not None: - type_str = self._enum.name - else: - type_str = "nla#{}".format(self.nla_type) - print( - "{}len={} type={}({}) {{".format( - prepend, self.nla_len, type_str, self.nla_type - ) - ) - for nla in self.nla_list: - nla.print_attr(prepend + " ") - print("{}}}".format(prepend)) - - def __bytes__(self): - return self._to_bytes(b"".join([bytes(nla) for nla in self.nla_list])) - - -class NlAttrU32(NlAttr): - def __init__(self, nla_type, val): - self.u32 = enum_or_int(val) - super().__init__(nla_type, b"") - - @property - def nla_len(self): - return 8 - - def _print_attr_value(self): - return " val={}".format(self.u32) - - @staticmethod - def _validate(data): - assert len(data) == 8 - nla_len, nla_type = struct.unpack("@HH", data[:4]) - assert nla_len == 8 - - @classmethod - def _parse(cls, data): - nla_len, nla_type, val = struct.unpack("@HHI", data) - return cls(nla_type, val) - - def __bytes__(self): - return self._to_bytes(struct.pack("@I", self.u32)) - - -class NlAttrU16(NlAttr): - def __init__(self, nla_type, val): - self.u16 = enum_or_int(val) - super().__init__(nla_type, b"") - - @property - def nla_len(self): - return 6 - - def _print_attr_value(self): - return " val={}".format(self.u16) - - @staticmethod - def _validate(data): - assert len(data) == 6 - nla_len, nla_type = struct.unpack("@HH", data[:4]) - assert nla_len == 6 - - @classmethod - def _parse(cls, data): - nla_len, nla_type, val = struct.unpack("@HHH", data) - return cls(nla_type, val) - - def __bytes__(self): - return self._to_bytes(struct.pack("@H", self.u16)) - - -class NlAttrU8(NlAttr): - def __init__(self, nla_type, val): - self.u8 = enum_or_int(val) - super().__init__(nla_type, b"") - - @property - def nla_len(self): - return 5 - - def _print_attr_value(self): - return " val={}".format(self.u8) - - @staticmethod - def _validate(data): - assert len(data) == 5 - nla_len, nla_type = struct.unpack("@HH", data[:4]) - assert nla_len == 5 - - @classmethod - def _parse(cls, data): - nla_len, nla_type, val = struct.unpack("@HHB", data) - return cls(nla_type, val) - - def __bytes__(self): - return self._to_bytes(struct.pack("@B", self.u8)) - - -class NlAttrRtFlags(NlAttrU32): - def _print_attr_value(self): - s = NlHelper.get_bitmask_str_uncached(RtFlagsBSD, self.u32) - return " rtflags={}".format(s) - - -class NlAttrIp(NlAttr): - def __init__(self, nla_type, addr: str): - super().__init__(nla_type, b"") - self.addr = addr - if ":" in self.addr: - self.family = socket.AF_INET6 - else: - self.family = socket.AF_INET - - @staticmethod - def _validate(data): - nla_len, nla_type = struct.unpack("@HH", data[:4]) - data_len = nla_len - 4 - if data_len != 4 and data_len != 16: - raise ValueError( - "Error validating attr {}: nla_len is not valid".format( # noqa: E501 - nla_type - ) - ) - - @property - def nla_len(self): - if self.family == socket.AF_INET6: - return 20 - else: - return 8 - return align4(len(self._data)) + 4 - - @classmethod - def _parse(cls, data): - nla_len, nla_type = struct.unpack("@HH", data[:4]) - data_len = len(data) - 4 - if data_len == 4: - addr = socket.inet_ntop(socket.AF_INET, data[4:8]) - else: - addr = socket.inet_ntop(socket.AF_INET6, data[4:20]) - return cls(nla_type, addr) - - def __bytes__(self): - return self._to_bytes(socket.inet_pton(self.family, self.addr)) - - def _print_attr_value(self): - return " addr={}".format(self.addr) - - -class NlAttrIfindex(NlAttrU32): - def _print_attr_value(self): - try: - ifname = socket.if_indextoname(self.u32) - return " iface={}(#{})".format(ifname, self.u32) - except OSError: - pass - return " iface=if#{}".format(self.u32) - - -class NlAttrMac(NlAttr): - def _print_attr_value(self): - return ["{:02}".format(int(d)) for d in data[4:]].join(":") - - -class NlAttrTable(NlAttrU32): - def _print_attr_value(self): - return " rtable={}".format(self.u32) - - -class NlAttrNhId(NlAttrU32): - def _print_attr_value(self): - return " nh_id={}".format(self.u32) - - -class NlAttrKNhId(NlAttrU32): - def _print_attr_value(self): - return " knh_id={}".format(self.u32) - - -class NlAttrMac(NlAttr): - def _print_attr_value(self): - return ' mac="' + ":".join(["{:02X}".format(b) for b in self._data]) + '"' - - -class NlAttrIfStats(NlAttr): - def _print_attr_value(self): - return " stats={...}" - - -class NlAttrVia(NlAttr): - def __init__(self, nla_type, family, addr: str): - super().__init__(nla_type, b"") - self.addr = addr *** 2736 LINES SKIPPED *** From nobody Sat Apr 1 19:36: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 4PpnV11sLfz43FhK; Sat, 1 Apr 2023 19:36: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 4PpnV11FCGz4Jyy; Sat, 1 Apr 2023 19:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680377817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YRtadTHejkw2m5zzSLTw5rfUhBT4KVDTCFVkD8vvS28=; b=vDGYk6uLgE49L/YpEXcY10jMJEqqLletJneQHyTQR00TJZzT/XjLrEC+HCyTJX5DaiDja2 VvF487tIOSmGNpysbNfZR/nU1g1ZgzAM6WtXu0Myy1cMgZXcQBK6HEHInFGfg7+d9QdetE +bKZkA5n4h8YhcLVVzq7sBlftX9vMlks332uhoSXGm4mBpeFfq3YzBxOwbR8KpxLUUa89H R515Vvn7YX1csTZCIk6dtNUJwXRhrzYul0I4CkycZv5R6BJAHCldvVKflO8KC3uQ9axNRO pMXi6LT//Akw1pP7RR8vzCYANjUe1cbs8JNeEODWSa+rQFbZQ0WvqYS1ulCNhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680377817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YRtadTHejkw2m5zzSLTw5rfUhBT4KVDTCFVkD8vvS28=; b=t3XFgleQkYvlI3p6L4FLD0RVyrF/NKvqK+bDul11y+e5p0RWbhtY8xdAWPIjawsyKEQy92 70xKG/s0z4wEbpAxJ1QBh0HkIZgNPIa15b2mxzX+wwaqT0z4GKOxIgA8c+CLkx2jwZztGf LZyC8Mkhw+SMmw2s5P0cgVPbGqiTR0Pim8gvpix0H/phI8HAKy+ENo4/8D2/0JKSrGrU41 v2Qh03WEphzwZOgQWkw3SJAUoYuNjgGy9ZVHM5m/LebA21Fn+hw65RpKOww564YUmy4G0G jixOXErrcgEgqqY5D4I1WccgmJ2MJgAP1Y1dhNyEj0lqOeATMkwnrWaUu16+ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680377817; a=rsa-sha256; cv=none; b=qvgehY1saPbp5pR5icHXsLO0UaTn7Ee50qNJ2oXtejrbuijq4JwgMFP9AXVvuHA82ANK1u 7T85yDQ+DswWy/8YUFUNfz5twKFolkwatstFR5P3SjtQPJ5xdhQUTlXfzZE7CUzk7ckcZI BfQUT8RHQgxSKBwagyqZRV9Hdwj9XnuXN3NvgQdjVlAQUKILs6qvyv/BIlHJW1cWsS1JVj xSZ0T754JrNYzF2k/krGcaNbA/UfVF5Y26M3W4AGoHkbU9ES/OMLs7i/lc3cSVf6LasYfv lRIqhcvvGdEKglbz4XaE0el2IB6syuk67H0XdR5RghD50dunErmE5rDHDx9bXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpnV1085gznXx; Sat, 1 Apr 2023 19:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 331Jau9x013571; Sat, 1 Apr 2023 19:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 331JauGC013570; Sat, 1 Apr 2023 19:36:56 GMT (envelope-from git) Date: Sat, 1 Apr 2023 19:36:56 GMT Message-Id: <202304011936.331JauGC013570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: fc2538cb7bdb - main - tests: add support for parsing generic netlink families. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc2538cb7bdb8e22afc331c3733f2e306624be9e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=fc2538cb7bdb8e22afc331c3733f2e306624be9e commit fc2538cb7bdb8e22afc331c3733f2e306624be9e Author: Alexander V. Chernikov AuthorDate: 2023-03-31 15:37:32 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-01 19:33:47 +0000 tests: add support for parsing generic netlink families. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D39370 --- tests/atf_python/sys/netlink/Makefile | 3 +- tests/atf_python/sys/netlink/message.py | 78 ++++++++++++-- tests/atf_python/sys/netlink/netlink.py | 135 +++++++++++++++--------- tests/atf_python/sys/netlink/netlink_generic.py | 110 +++++++++++++++++++ tests/atf_python/sys/netlink/netlink_route.py | 36 ++++--- tests/atf_python/sys/netlink/utils.py | 8 +- 6 files changed, 299 insertions(+), 71 deletions(-) diff --git a/tests/atf_python/sys/netlink/Makefile b/tests/atf_python/sys/netlink/Makefile index 057415cf87f6..73ce5ac50261 100644 --- a/tests/atf_python/sys/netlink/Makefile +++ b/tests/atf_python/sys/netlink/Makefile @@ -2,7 +2,8 @@ .PATH: ${.CURDIR} -FILES= __init__.py attrs.py base_headers.py message.py netlink.py netlink_route.py utils.py +FILES= __init__.py attrs.py base_headers.py message.py netlink.py \ + netlink_generic.py netlink_route.py utils.py .include FILESDIR= ${TESTSBASE}/atf_python/sys/netlink diff --git a/tests/atf_python/sys/netlink/message.py b/tests/atf_python/sys/netlink/message.py index 6bc9f2932868..b6fb2f8e357a 100644 --- a/tests/atf_python/sys/netlink/message.py +++ b/tests/atf_python/sys/netlink/message.py @@ -1,15 +1,35 @@ #!/usr/local/bin/python3 import struct from ctypes import sizeof +from enum import Enum from typing import List +from typing import NamedTuple from atf_python.sys.netlink.attrs import NlAttr from atf_python.sys.netlink.attrs import NlAttrNested +from atf_python.sys.netlink.base_headers import NlmAckFlags +from atf_python.sys.netlink.base_headers import NlmNewFlags +from atf_python.sys.netlink.base_headers import NlmGetFlags +from atf_python.sys.netlink.base_headers import NlmDeleteFlags from atf_python.sys.netlink.base_headers import NlmBaseFlags from atf_python.sys.netlink.base_headers import Nlmsghdr from atf_python.sys.netlink.base_headers import NlMsgType from atf_python.sys.netlink.utils import align4 from atf_python.sys.netlink.utils import enum_or_int +from atf_python.sys.netlink.utils import get_bitmask_str + + +class NlMsgCategory(Enum): + UNKNOWN = 0 + GET = 1 + NEW = 2 + DELETE = 3 + ACK = 4 + + +class NlMsgProps(NamedTuple): + msg: Enum + category: NlMsgCategory class BaseNetlinkMessage(object): @@ -60,18 +80,40 @@ class BaseNetlinkMessage(object): def is_reply(self, hdr): return hdr.nlmsg_type == NlMsgType.NLMSG_ERROR.value - def print_nl_header(self, hdr, prepend=""): + @property + def msg_name(self): + return "msg#{}".format(self._get_msg_type()) + + def _get_nl_category(self): + if self.is_reply(self.nl_hdr): + return NlMsgCategory.ACK + return NlMsgCategory.UNKNOWN + + def get_nlm_flags_str(self): + category = self._get_nl_category() + flags = self.nl_hdr.nlmsg_flags + + if category == NlMsgCategory.UNKNOWN: + return self.helper.get_bitmask_str(NlmBaseFlags, flags) + elif category == NlMsgCategory.GET: + flags_enum = NlmGetFlags + elif category == NlMsgCategory.NEW: + flags_enum = NlmNewFlags + elif category == NlMsgCategory.DELETE: + flags_enum = NlmDeleteFlags + elif category == NlMsgCategory.ACK: + flags_enum = NlmAckFlags + return get_bitmask_str([NlmBaseFlags, flags_enum], flags) + + def print_nl_header(self, prepend=""): # len=44, type=RTM_DELROUTE, flags=NLM_F_REQUEST|NLM_F_ACK, seq=1641163704, pid=0 # noqa: E501 - is_reply = self.is_reply(hdr) - msg_name = self.helper.get_nlmsg_name(hdr.nlmsg_type) + hdr = self.nl_hdr print( "{}len={}, type={}, flags={}(0x{:X}), seq={}, pid={}".format( prepend, hdr.nlmsg_len, - msg_name, - self.helper.get_nlm_flags_str( - msg_name, is_reply, hdr.nlmsg_flags - ), # noqa: E501 + self.msg_name, + self.get_nlm_flags_str(), hdr.nlmsg_flags, hdr.nlmsg_seq, hdr.nlmsg_pid, @@ -92,7 +134,7 @@ class BaseNetlinkMessage(object): return self def print_message(self): - self.print_nl_header(self.nl_hdr) + self.print_nl_header() @staticmethod def print_as_bytes(data: bytes, descr: str): @@ -191,11 +233,29 @@ class StdNetlinkMessage(BaseNetlinkMessage): self.nl_hdr.nlmsg_len = len(ret) + sizeof(Nlmsghdr) return bytes(self.nl_hdr) + ret + def _get_msg_type(self): + return self.nl_hdr.nlmsg_type + + @property + def msg_props(self): + msg_type = self._get_msg_type() + for msg_props in self.messages: + if msg_props.msg.value == msg_type: + return msg_props + return None + + @property + def msg_name(self): + msg_props = self.msg_props + if msg_props is not None: + return msg_props.msg.name + return super().msg_name + def print_base_header(self, hdr, prepend=""): pass def print_message(self): - self.print_nl_header(self.nl_hdr) + self.print_nl_header() self.print_base_header(self.base_hdr, " ") for nla in self.nla_list: nla.print_attr(" ") diff --git a/tests/atf_python/sys/netlink/netlink.py b/tests/atf_python/sys/netlink/netlink.py index e10efadee656..f813727d55b4 100644 --- a/tests/atf_python/sys/netlink/netlink.py +++ b/tests/atf_python/sys/netlink/netlink.py @@ -14,23 +14,22 @@ from enum import Enum from atf_python.sys.netlink.attrs import NlAttr from atf_python.sys.netlink.attrs import NlAttrStr from atf_python.sys.netlink.attrs import NlAttrU32 -from atf_python.sys.netlink.base_headers import NlmAckFlags +from atf_python.sys.netlink.base_headers import GenlMsgHdr from atf_python.sys.netlink.base_headers import NlmBaseFlags -from atf_python.sys.netlink.base_headers import NlmDeleteFlags -from atf_python.sys.netlink.base_headers import NlmGetFlags -from atf_python.sys.netlink.base_headers import NlmNewFlags from atf_python.sys.netlink.base_headers import Nlmsghdr from atf_python.sys.netlink.base_headers import NlMsgType from atf_python.sys.netlink.message import BaseNetlinkMessage +from atf_python.sys.netlink.message import NlMsgCategory +from atf_python.sys.netlink.message import NlMsgProps from atf_python.sys.netlink.message import StdNetlinkMessage -from atf_python.sys.netlink.netlink_route import NetlinkIfaMessage -from atf_python.sys.netlink.netlink_route import NetlinkIflaMessage -from atf_python.sys.netlink.netlink_route import NetlinkNdMessage -from atf_python.sys.netlink.netlink_route import NetlinkRtMessage -from atf_python.sys.netlink.netlink_route import NlRtMsgType +from atf_python.sys.netlink.netlink_generic import GenlCtrlMsgType +from atf_python.sys.netlink.netlink_generic import GenlCtrlAttrType +from atf_python.sys.netlink.netlink_generic import handler_classes as genl_classes +from atf_python.sys.netlink.netlink_route import handler_classes as rt_classes from atf_python.sys.netlink.utils import align4 from atf_python.sys.netlink.utils import AttrDescr from atf_python.sys.netlink.utils import build_propmap +from atf_python.sys.netlink.utils import enum_or_int from atf_python.sys.netlink.utils import get_bitmask_map from atf_python.sys.netlink.utils import NlConst from atf_python.sys.netlink.utils import prepare_attrs_map @@ -114,13 +113,6 @@ class NlHelper: propmap = self.get_propmap(cls) return propmap.get(attr_val) - def get_nlmsg_name(self, val): - for cls in [NlRtMsgType, NlMsgType]: - v = self.get_attr_byval(cls, val) - if v is not None: - return v - return "msg#{}".format(val) - def get_af_name(self, family): v = self.get_attr_byval(self._af_cls, family) if v is not None: @@ -141,18 +133,6 @@ class NlHelper: bmap = NlHelper.get_bitmask_map(pmap, val) return ",".join([v for k, v in bmap.items()]) - def get_nlm_flags_str(self, msg_str: str, reply: bool, val): - if reply: - return self.get_bitmask_str(NlmAckFlags, val) - if msg_str.startswith("RTM_GET"): - return self.get_bitmask_str(NlmGetFlags, val) - elif msg_str.startswith("RTM_DEL"): - return self.get_bitmask_str(NlmDeleteFlags, val) - elif msg_str.startswith("RTM_NEW"): - return self.get_bitmask_str(NlmNewFlags, val) - else: - return self.get_bitmask_str(NlmBaseFlags, val) - nldone_attrs = prepare_attrs_map([]) @@ -166,7 +146,7 @@ nlerr_attrs = prepare_attrs_map( class NetlinkDoneMessage(StdNetlinkMessage): - messages = [NlMsgType.NLMSG_DONE.value] + messages = [NlMsgProps(NlMsgType.NLMSG_DONE, NlMsgCategory.ACK)] nl_attrs_map = nldone_attrs @property @@ -185,7 +165,7 @@ class NetlinkDoneMessage(StdNetlinkMessage): class NetlinkErrorMessage(StdNetlinkMessage): - messages = [NlMsgType.NLMSG_ERROR.value] + messages = [NlMsgProps(NlMsgType.NLMSG_ERROR, NlMsgCategory.ACK)] nl_attrs_map = nlerr_attrs @property @@ -221,30 +201,52 @@ class NetlinkErrorMessage(StdNetlinkMessage): def print_base_header(self, errhdr, prepend=""): print("{}error={}, ".format(prepend, errhdr.error), end="") - self.print_nl_header(errhdr.msg, prepend) + hdr = errhdr.msg + print( + "{}len={}, type={}, flags={}(0x{:X}), seq={}, pid={}".format( + prepend, + hdr.nlmsg_len, + "msg#{}".format(hdr.nlmsg_type), + self.helper.get_bitmask_str(NlmBaseFlags, hdr.nlmsg_flags), + hdr.nlmsg_flags, + hdr.nlmsg_seq, + hdr.nlmsg_pid, + ) + ) + + +core_classes = { + "netlink_core": [ + NetlinkDoneMessage, + NetlinkErrorMessage, + ], +} class Nlsock: + HANDLER_CLASSES = [core_classes, rt_classes, genl_classes] + def __init__(self, family, helper): self.helper = helper self.sock_fd = self._setup_netlink(family) + self._sock_family = family self._data = bytes() self.msgmap = self.build_msgmap() - # self.set_groups(NlRtGroup.RTNLGRP_IPV4_ROUTE.value | NlRtGroup.RTNLGRP_IPV6_ROUTE.value) # noqa: E501 + self._family_map = { + NlConst.GENL_ID_CTRL: "nlctrl", + } def build_msgmap(self): - classes = [ - NetlinkRtMessage, - NetlinkIflaMessage, - NetlinkIfaMessage, - NetlinkNdMessage, - NetlinkDoneMessage, - NetlinkErrorMessage, - ] + handler_classes = {} + for d in self.HANDLER_CLASSES: + handler_classes.update(d) xmap = {} - for cls in classes: - for message in cls.messages: - xmap[message] = cls + # 'family_name': [class.messages[MsgProps.msg], ] + for family_id, family_classes in handler_classes.items(): + xmap[family_id] = {} + for cls in family_classes: + for msg_props in cls.messages: + xmap[family_id][enum_or_int(msg_props.msg)] = cls return xmap def _setup_netlink(self, netlink_family) -> int: @@ -263,9 +265,10 @@ class Nlsock: # k = struct.pack("@BBHII", 12, 38, 0, self.pid, mask) # self.sock_fd.bind(k) - def write_message(self, msg): - print("vvvvvvvv OUT vvvvvvvv") - msg.print_message() + def write_message(self, msg, verbose=True): + if verbose: + print("vvvvvvvv OUT vvvvvvvv") + msg.print_message() msg_bytes = bytes(msg) try: ret = os.write(self.sock_fd.fileno(), msg_bytes) @@ -277,12 +280,48 @@ class Nlsock: if len(data) < sizeof(Nlmsghdr): raise Exception("Short read from nl: {} bytes".format(len(data))) hdr = Nlmsghdr.from_buffer_copy(data) - nlmsg_type = hdr.nlmsg_type - cls = self.msgmap.get(nlmsg_type) + if hdr.nlmsg_type < 16: + family_name = "netlink_core" + nlmsg_type = hdr.nlmsg_type + elif self._sock_family == NlConst.NETLINK_ROUTE: + family_name = "netlink_route" + nlmsg_type = hdr.nlmsg_type + else: + # Genetlink + if len(data) < sizeof(Nlmsghdr) + sizeof(GenlMsgHdr): + raise Exception("Short read from genl: {} bytes".format(len(data))) + family_name = self._family_map.get(hdr.nlmsg_type, "") + ghdr = GenlMsgHdr.from_buffer_copy(data[sizeof(Nlmsghdr):]) + nlmsg_type = ghdr.cmd + cls = self.msgmap.get(family_name, {}).get(nlmsg_type) if not cls: cls = BaseNetlinkMessage return cls.from_bytes(self.helper, data) + def get_genl_family_id(self, family_name): + hdr = Nlmsghdr( + nlmsg_type=NlConst.GENL_ID_CTRL, + nlmsg_flags=NlmBaseFlags.NLM_F_REQUEST.value, + nlmsg_seq = self.helper.get_seq(), + ) + ghdr = GenlMsgHdr(cmd=GenlCtrlMsgType.CTRL_CMD_GETFAMILY.value) + nla = NlAttrStr(GenlCtrlAttrType.CTRL_ATTR_FAMILY_NAME, family_name) + hdr.nlmsg_len = sizeof(Nlmsghdr) + sizeof(GenlMsgHdr) + len(bytes(nla)) + + msg_bytes = bytes(hdr) + bytes(ghdr) + bytes(nla) + self.write_data(msg_bytes) + while True: + rx_msg = self.read_message() + if hdr.nlmsg_seq == rx_msg.nl_hdr.nlmsg_seq: + if rx_msg.is_type(NlMsgType.NLMSG_ERROR): + if rx_msg.error_code != 0: + raise ValueError("unable to get family {}".format(family_name)) + else: + family_id = rx_msg.get_nla(GenlCtrlAttrType.CTRL_ATTR_FAMILY_ID).u16 + self._family_map[family_id] = family_name + return family_id + raise ValueError("unable to get family {}".format(family_name)) + def write_data(self, data: bytes): self.sock_fd.send(data) diff --git a/tests/atf_python/sys/netlink/netlink_generic.py b/tests/atf_python/sys/netlink/netlink_generic.py new file mode 100644 index 000000000000..ee75d5bf37f3 --- /dev/null +++ b/tests/atf_python/sys/netlink/netlink_generic.py @@ -0,0 +1,110 @@ +#!/usr/local/bin/python3 +from ctypes import sizeof +from enum import Enum + +from atf_python.sys.netlink.attrs import NlAttrStr +from atf_python.sys.netlink.attrs import NlAttrU16 +from atf_python.sys.netlink.attrs import NlAttrU32 +from atf_python.sys.netlink.base_headers import GenlMsgHdr +from atf_python.sys.netlink.message import NlMsgCategory +from atf_python.sys.netlink.message import NlMsgProps +from atf_python.sys.netlink.message import StdNetlinkMessage +from atf_python.sys.netlink.utils import AttrDescr +from atf_python.sys.netlink.utils import prepare_attrs_map +from atf_python.sys.netlink.utils import enum_or_int + + +class NetlinkGenlMessage(StdNetlinkMessage): + messages = [] + nl_attrs_map = {} + family_name = None + + def __init__(self, helper, family_id, cmd=0): + super().__init__(helper, family_id) + self.base_hdr = GenlMsgHdr(cmd=enum_or_int(cmd)) + + def parse_base_header(self, data): + if len(data) < sizeof(GenlMsgHdr): + raise ValueError("length less than GenlMsgHdr header") + ghdr = GenlMsgHdr.from_buffer_copy(data) + return (ghdr, sizeof(GenlMsgHdr)) + + def _get_msg_type(self): + return self.base_hdr.cmd + + def print_nl_header(self, prepend=""): + # len=44, type=RTM_DELROUTE, flags=NLM_F_REQUEST|NLM_F_ACK, seq=1641163704, pid=0 # noqa: E501 + hdr = self.nl_hdr + print( + "{}len={}, family={}, flags={}(0x{:X}), seq={}, pid={}".format( + prepend, + hdr.nlmsg_len, + self.family_name, + self.get_nlm_flags_str(), + hdr.nlmsg_flags, + hdr.nlmsg_seq, + hdr.nlmsg_pid, + ) + ) + + def print_base_header(self, hdr, prepend=""): + print( + "{}cmd={} version={} reserved={}".format( + prepend, self.msg_name, hdr.version, hdr.reserved + ) + ) + + +GenlCtrlFamilyName = "nlctrl" + +class GenlCtrlMsgType(Enum): + CTRL_CMD_UNSPEC = 0 + CTRL_CMD_NEWFAMILY = 1 + CTRL_CMD_DELFAMILY = 2 + CTRL_CMD_GETFAMILY = 3 + CTRL_CMD_NEWOPS = 4 + CTRL_CMD_DELOPS = 5 + CTRL_CMD_GETOPS = 6 + CTRL_CMD_NEWMCAST_GRP = 7 + CTRL_CMD_DELMCAST_GRP = 8 + CTRL_CMD_GETMCAST_GRP = 9 + CTRL_CMD_GETPOLICY = 10 + + +class GenlCtrlAttrType(Enum): + CTRL_ATTR_FAMILY_ID = 1 + CTRL_ATTR_FAMILY_NAME = 2 + CTRL_ATTR_VERSION = 3 + CTRL_ATTR_HDRSIZE = 4 + CTRL_ATTR_MAXATTR = 5 + CTRL_ATTR_OPS = 6 + CTRL_ATTR_MCAST_GROUPS = 7 + CTRL_ATTR_POLICY = 8 + CTRL_ATTR_OP_POLICY = 9 + CTRL_ATTR_OP = 10 + + +genl_ctrl_attrs = prepare_attrs_map( + [ + AttrDescr(GenlCtrlAttrType.CTRL_ATTR_FAMILY_ID, NlAttrU16), + AttrDescr(GenlCtrlAttrType.CTRL_ATTR_FAMILY_NAME, NlAttrStr), + AttrDescr(GenlCtrlAttrType.CTRL_ATTR_VERSION, NlAttrU32), + AttrDescr(GenlCtrlAttrType.CTRL_ATTR_HDRSIZE, NlAttrU32), + AttrDescr(GenlCtrlAttrType.CTRL_ATTR_MAXATTR, NlAttrU32), + ] +) + + +class NetlinkGenlCtrlMessage(NetlinkGenlMessage): + messages = [ + NlMsgProps(GenlCtrlMsgType.CTRL_CMD_NEWFAMILY, NlMsgCategory.NEW), + NlMsgProps(GenlCtrlMsgType.CTRL_CMD_GETFAMILY, NlMsgCategory.GET), + NlMsgProps(GenlCtrlMsgType.CTRL_CMD_DELFAMILY, NlMsgCategory.DELETE), + ] + nl_attrs_map = genl_ctrl_attrs + family_name = GenlCtrlFamilyName + + +handler_classes = { + GenlCtrlFamilyName: [NetlinkGenlCtrlMessage], +} diff --git a/tests/atf_python/sys/netlink/netlink_route.py b/tests/atf_python/sys/netlink/netlink_route.py index c6163a0908af..81f4e89d3e57 100644 --- a/tests/atf_python/sys/netlink/netlink_route.py +++ b/tests/atf_python/sys/netlink/netlink_route.py @@ -16,6 +16,8 @@ from atf_python.sys.netlink.attrs import NlAttrStr from atf_python.sys.netlink.attrs import NlAttrU32 from atf_python.sys.netlink.attrs import NlAttrU8 from atf_python.sys.netlink.message import StdNetlinkMessage +from atf_python.sys.netlink.message import NlMsgProps +from atf_python.sys.netlink.message import NlMsgCategory from atf_python.sys.netlink.utils import AttrDescr from atf_python.sys.netlink.utils import get_bitmask_str from atf_python.sys.netlink.utils import prepare_attrs_map @@ -594,9 +596,9 @@ class BaseNetlinkRtMessage(StdNetlinkMessage): class NetlinkRtMessage(BaseNetlinkRtMessage): messages = [ - NlRtMsgType.RTM_NEWROUTE.value, - NlRtMsgType.RTM_DELROUTE.value, - NlRtMsgType.RTM_GETROUTE.value, + NlMsgProps(NlRtMsgType.RTM_NEWROUTE, NlMsgCategory.NEW), + NlMsgProps(NlRtMsgType.RTM_DELROUTE, NlMsgCategory.DELETE), + NlMsgProps(NlRtMsgType.RTM_GETROUTE, NlMsgCategory.GET), ] nl_attrs_map = rtnl_route_attrs @@ -634,9 +636,9 @@ class NetlinkRtMessage(BaseNetlinkRtMessage): class NetlinkIflaMessage(BaseNetlinkRtMessage): messages = [ - NlRtMsgType.RTM_NEWLINK.value, - NlRtMsgType.RTM_DELLINK.value, - NlRtMsgType.RTM_GETLINK.value, + NlMsgProps(NlRtMsgType.RTM_NEWLINK, NlMsgCategory.NEW), + NlMsgProps(NlRtMsgType.RTM_DELLINK, NlMsgCategory.DELETE), + NlMsgProps(NlRtMsgType.RTM_GETLINK, NlMsgCategory.GET), ] nl_attrs_map = rtnl_ifla_attrs @@ -666,9 +668,9 @@ class NetlinkIflaMessage(BaseNetlinkRtMessage): class NetlinkIfaMessage(BaseNetlinkRtMessage): messages = [ - NlRtMsgType.RTM_NEWADDR.value, - NlRtMsgType.RTM_DELADDR.value, - NlRtMsgType.RTM_GETADDR.value, + NlMsgProps(NlRtMsgType.RTM_NEWADDR, NlMsgCategory.NEW), + NlMsgProps(NlRtMsgType.RTM_DELADDR, NlMsgCategory.DELETE), + NlMsgProps(NlRtMsgType.RTM_GETADDR, NlMsgCategory.GET), ] nl_attrs_map = rtnl_ifa_attrs @@ -698,9 +700,9 @@ class NetlinkIfaMessage(BaseNetlinkRtMessage): class NetlinkNdMessage(BaseNetlinkRtMessage): messages = [ - NlRtMsgType.RTM_NEWNEIGH.value, - NlRtMsgType.RTM_DELNEIGH.value, - NlRtMsgType.RTM_GETNEIGH.value, + NlMsgProps(NlRtMsgType.RTM_NEWNEIGH, NlMsgCategory.NEW), + NlMsgProps(NlRtMsgType.RTM_DELNEIGH, NlMsgCategory.DELETE), + NlMsgProps(NlRtMsgType.RTM_GETNEIGH, NlMsgCategory.GET), ] nl_attrs_map = rtnl_nd_attrs @@ -725,3 +727,13 @@ class NetlinkNdMessage(BaseNetlinkRtMessage): hdr.ndm_flags, ) ) + + +handler_classes = { + "netlink_route": [ + NetlinkRtMessage, + NetlinkIflaMessage, + NetlinkIfaMessage, + NetlinkNdMessage, + ], +} diff --git a/tests/atf_python/sys/netlink/utils.py b/tests/atf_python/sys/netlink/utils.py index 44758148747d..86a910ce6590 100644 --- a/tests/atf_python/sys/netlink/utils.py +++ b/tests/atf_python/sys/netlink/utils.py @@ -12,6 +12,7 @@ class NlConst: AF_NETLINK = 38 NETLINK_ROUTE = 0 NETLINK_GENERIC = 16 + GENL_ID_CTRL = 16 def roundup2(val: int, num: int) -> int: @@ -69,6 +70,11 @@ def get_bitmask_map(propmap, val): def get_bitmask_str(cls, val): - pmap = build_propmap(cls) + if isinstance(cls, type): + pmap = build_propmap(cls) + else: + pmap = {} + for _cls in cls: + pmap.update(build_propmap(_cls)) bmap = get_bitmask_map(pmap, val) return ",".join([v for k, v in bmap.items()]) From nobody Sat Apr 1 19:44: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 4PpngC1jsNz43FwB; Sat, 1 Apr 2023 19:44: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 4PpngC1CF5z4Llq; Sat, 1 Apr 2023 19:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680378295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7BIVHOiwSF4fuvZgj/FHRJkrrbRil3rGXywQsArHScQ=; b=co4QAHVG7gg6f8GYpfuUQIyMJyKiHSzNUHTqNfhzHpO1oShbw6AMQ66MkE2+y0/nv+07F7 YtBeZp8NxXz3urzQyUpBDvuC7bM55tIHMOCftqm/YvZpE3JPRXdBkWgmOhsOAbcGB5GKzT vgrzsI1unD/J/elPBrvuetk4CXviqGErTY7wc7pcTQUUAQCFXQCSG+q7YPvng2UbT24fDS 2Y07unvY0ho2IGeepiMpFGf8mSe62MT2Tjir3NLkdXw+HWTuZbwn9yLWSM/rOZrv1zMfJB owaAX+xdiK2S0TuEJKD2SoipTNg+S9Hmt3ww/NIg+LedyEswaKKoZonJD/NgRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680378295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7BIVHOiwSF4fuvZgj/FHRJkrrbRil3rGXywQsArHScQ=; b=ooUpSuItdanJIi7wUvXXcaHTd4RTNalN8KJrodDkra0Qo+SomSzmUqkZsUhobEq0yHOzt1 BLVDwC2w/Tx1bIAyxpNi1DSbp1kXbubZ1/cBrFD0BXH9GM25fMzCeLuqyRwGNFRgNLo4D6 YMePmZM4cs6BLsmvkYQ2pOq5unoT8ZSo7FDbJG/KUbWAmbpYr2p8Cj1hb0MeDCrTPz89pe q+N89d3F11grK20ecBdNFk0Rkeyk6M9AiMXp/KEHrEbpqNHgNxe1lx83FhYhSioZohZ/8y vQNJwgR1I/Hh0i9h8KhxamI19dYCDp25S6Ql49iZ3KQCBtZMc9tgV5F8JZVAMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680378295; a=rsa-sha256; cv=none; b=gH2f4TZ3Ho8NUvUxHnnjhLRyzlUlHRdcEvb+HhR1mYfTgWk2+k40KgZuw5b5P6tDjOixOf mtUHREKZSWUzh0dN3QMD9Uo+wiOEJoAjqaSbQVYfUwP/SXhxXUpWZrgKyUPrisUWiWggrh h+yHvGAXgy74rcAmbKqkg/XcI7o3CvIQvqQBebcDDKQr4+FIfhc2JzjKfg8j26Dp+6RX5T J+Sp6OzhnVFmUUDGZex9Uj7H7ntG7OfF1xOUXb3FSNhLUBzOLARzep46OfNphl+p22ikId 6cRlyJRAsmbI5BFVVmna4iHTZD50jOchtFIKLvCy5WD99ikYdHb3jFMIZmonZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpngC0Gs1zp7l; Sat, 1 Apr 2023 19:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 331JisCi029381; Sat, 1 Apr 2023 19:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 331Jis1P029380; Sat, 1 Apr 2023 19:44:54 GMT (envelope-from git) Date: Sat, 1 Apr 2023 19:44:54 GMT Message-Id: <202304011944.331Jis1P029380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: d9af4219d668 - main - tests: refactor atf_python a 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9af4219d668f4f16574f757d6fc4c7971a4ef2c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=d9af4219d668f4f16574f757d6fc4c7971a4ef2c commit d9af4219d668f4f16574f757d6fc4c7971a4ef2c Author: Alexander V. Chernikov AuthorDate: 2023-04-01 19:40:54 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-01 19:44:37 +0000 tests: refactor atf_python a bit * Move more logic from conftest.py to the actual atf_pytest handler * Move nodeid_to_method_name() to the utils.py so it can be shared MFC after: 2 weeks --- tests/atf_python/atf_pytest.py | 21 +++++++++++++++------ tests/atf_python/utils.py | 5 +++++ tests/conftest.py | 10 ++-------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/tests/atf_python/atf_pytest.py b/tests/atf_python/atf_pytest.py index db7244d3234b..0dd3a225b73d 100644 --- a/tests/atf_python/atf_pytest.py +++ b/tests/atf_python/atf_pytest.py @@ -6,15 +6,12 @@ from typing import NamedTuple from typing import Optional from typing import Tuple +from atf_python.utils import nodeid_to_method_name + import pytest import os -def nodeid_to_method_name(nodeid: str) -> str: - """file_name.py::ClassName::method_name[parametrize] -> method_name""" - return nodeid.split("::")[-1].split("[")[0] - - class ATFCleanupItem(pytest.Item): def runtest(self): """Runs cleanup procedure for the test instead of the test itself""" @@ -73,7 +70,6 @@ class ATFTestObj(object): else: ret["require.user"] = username - def _convert_marks(self, obj) -> Dict[str, Any]: wj_func = lambda x: " ".join(x) # noqa: E731 _map: Dict[str, Dict] = { @@ -158,6 +154,19 @@ class ATFHandler(object): return True return False + def _generate_test_cleanups(self, items): + new_items = [] + for obj in items: + if self.has_object_cleanup(obj): + self.override_runtest(obj) + new_items.append(obj) + items.clear() + items.extend(new_items) + + def modify_tests(self, items, config): + if config.option.atf_cleanup: + self._generate_test_cleanups(items) + def list_tests(self, tests: List[str]): print('Content-Type: application/X-atf-tp; version="1"') print() diff --git a/tests/atf_python/utils.py b/tests/atf_python/utils.py index c8146b943ce9..591a532ca476 100644 --- a/tests/atf_python/utils.py +++ b/tests/atf_python/utils.py @@ -11,6 +11,11 @@ from typing import Optional import pytest +def nodeid_to_method_name(nodeid: str) -> str: + """file_name.py::ClassName::method_name[parametrize] -> method_name""" + return nodeid.split("::")[-1].split("[")[0] + + class LibCWrapper(object): def __init__(self): path: Optional[str] = find_library("c") diff --git a/tests/conftest.py b/tests/conftest.py index 687f6bde375e..5d319863af73 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -101,15 +101,9 @@ def pytest_configure(config): def pytest_collection_modifyitems(session, config, items): """If cleanup is requested, replace collected tests with their cleanups (if any)""" - if PLUGIN_ENABLED and config.option.atf_cleanup: - new_items = [] + if PLUGIN_ENABLED: handler = get_handler() - for obj in items: - if handler.has_object_cleanup(obj): - handler.override_runtest(obj) - new_items.append(obj) - items.clear() - items.extend(new_items) + handler.modify_tests(items, config) def pytest_collection_finish(session): From nobody Sat Apr 1 21:25: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 4Ppqtm3Cg8z43NGv; Sat, 1 Apr 2023 21:25: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 4Ppqtl73kkz4TL4; Sat, 1 Apr 2023 21:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680384304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kLTSRYtAcURWms8oJ6xPpMsgQJeZ6GLuliS1EdtkHlw=; b=C65ttzyx/lhX/SzhB/wUNLPKp+NMNTPy0QWa1vwfg6QFWP0lCc8VFAj2xiyXVBcl5qJis1 3Ro+bRsvahjEvCxZXvn0UpzPChFiElmpK9TAnXIDuhNyVFFS5V4RXxwDFPkHldcR0pjeUW ROsTU21dkjhSQrmNS75N0UYqb2FJySLmR9xP0RiYqA/iG4UggvhfHZkT7l7BJjebrOFn52 bbaleLkqcrH1BqgB12KHNEi/O4c1n/Mu3Pm46cxexKvG7l2jRD2l8/URnpFnsh7eS72FIU sSt5RNe4HEEBfruJ9bh99y3lPkSuXql8EydqNu+viv6+DRJ5oh5myjWX1AnlYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680384304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kLTSRYtAcURWms8oJ6xPpMsgQJeZ6GLuliS1EdtkHlw=; b=hZxYqGvhjlvpjWwbOvh1HjmMkT57Ju5y09DIghuKmgJVZgfoiSuxYzJDvoML/Oc/iqihvn 67av384H4VbnPzgrdr0eCI/6gQL8ZM4pLVcPNGpSd3hFAl3jExneY3+38yXyMDblBQxMcm fLCFZ5olwAL4+IC5QJ9is9NPmHklXXAJSqNJ+mcTomcUoJNJko3GZh8jR9bvocXr4lVPnW IXK0wXrYN7fdepzfr7OpINo8FWHfsdyJVELM/jKMk9v8nMv+pSUorPMy2ZIHJhn+f91yvl +efHfFQgPHZcDEUzu2WIA2XALCG/Yo5u7Ww5k/R/PXkx4seX7gFi3v3Lis5ciw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680384304; a=rsa-sha256; cv=none; b=SPaL2rwqGqWx5piI7j8AQligh4/OEGxC/BUDCJiV9tri3eQ+tG5MzMX0KyxMx7SjkUJIBu YhZlwYOFOXjpSuMX5Vy4cfDOs9HG9MwsBIdTmI+9kMz6xwp4BI2jfoSKLIH3iObjy6HY9m 6w0IeOKCAkxvIVPbjyEfig1fcsXhFdSISXoIPDjDVmK7Qhg7OOMQ8FrwsxkJMSqa3P+8C3 LzDSsdN3aDwgioKlqsV6iKs01KvRttxtlkuQyesjy6TkZyWFWjtjzZAr+Cc/+XtqUHgrTU xmjmYDKCuByWZ9qf5SMI9vmjA5RSQDXDsopeVmpghBNHN8Jx1CyLVUXH+swlIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ppqtl61jRzqk4; Sat, 1 Apr 2023 21:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 331LP3ID094169; Sat, 1 Apr 2023 21:25:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 331LP3OO094168; Sat, 1 Apr 2023 21:25:03 GMT (envelope-from git) Date: Sat, 1 Apr 2023 21:25:03 GMT Message-Id: <202304012125.331LP3OO094168@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: f4179ad46fa4 - main - nfscommon: Add support for an NFSv4 operation bitmap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4179ad46fa4ff717557e5485072c004e6054416 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f4179ad46fa4ff717557e5485072c004e6054416 commit f4179ad46fa4ff717557e5485072c004e6054416 Author: Rick Macklem AuthorDate: 2023-04-01 21:22:26 +0000 Commit: Rick Macklem CommitDate: 2023-04-01 21:22:26 +0000 nfscommon: Add support for an NFSv4 operation bitmap NFSv4.1/4.2 uses operation bitmaps for various operations, such as the SP4_MACH_CRED case for ExchangeID. This patch adds support for operation bitmaps so that support for SP4_MACH_CRED can be added to the NFSv4.1/4.2 server in a future commit. This commit should not change any NFSv4.1/4.2 semantics. MFC after: 3 months --- sys/fs/nfs/nfs.h | 31 ++++++++++++ sys/fs/nfs/nfs_commonsubs.c | 62 +++++++++++++++++++++++ sys/fs/nfs/nfs_var.h | 2 + sys/fs/nfs/nfsproto.h | 120 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 215 insertions(+) diff --git a/sys/fs/nfs/nfs.h b/sys/fs/nfs/nfs.h index eac318512a35..9d0a2d8191b2 100644 --- a/sys/fs/nfs/nfs.h +++ b/sys/fs/nfs/nfs.h @@ -344,6 +344,7 @@ struct nfsreferral { #define LCL_RECLAIMONEFS 0x00080000 #define LCL_NFSV42 0x00100000 #define LCL_TLSCB 0x00200000 +#define LCL_MACHCRED 0x00400000 #define LCL_GSS LCL_KERBV /* Or of all mechs */ @@ -552,6 +553,34 @@ typedef struct { (b)->bits[2] = NFSATTRBIT_REFERRAL2; \ } while (0) +/* + * Here is the definition of the operation bits array and macros that + * manipulate it. + * THE MACROS MUST BE MANUALLY MODIFIED IF NFSOPBIT_MAXWORDS CHANGES!! + * It is (NFSV42_NOPS + 31) / 32. + */ +#define NFSOPBIT_MAXWORDS 3 + +typedef struct { + uint32_t bits[NFSOPBIT_MAXWORDS]; +} nfsopbit_t; + +#define NFSZERO_OPBIT(b) do { \ + (b)->bits[0] = 0; \ + (b)->bits[1] = 0; \ + (b)->bits[2] = 0; \ +} while (0) + +#define NFSSET_OPBIT(t, f) do { \ + (t)->bits[0] = (f)->bits[0]; \ + (t)->bits[1] = (f)->bits[1]; \ + (t)->bits[2] = (f)->bits[2]; \ +} while (0) + +#define NFSISSET_OPBIT(b, p) ((b)->bits[(p) / 32] & (1 << ((p) % 32))) +#define NFSSETBIT_OPBIT(b, p) ((b)->bits[(p) / 32] |= (1 << ((p) % 32))) +#define NFSCLRBIT_OPBIT(b, p) ((b)->bits[(p) / 32] &= ~(1 << ((p) % 32))) + /* * Store uid, gid creds that were used when the stateid was acquired. * The RPC layer allows NFS_MAXGRPS + 1 groups to go out on the wire, @@ -687,6 +716,7 @@ struct nfsrv_descript { int nd_bextpg; /* Current ext_pgs page */ int nd_bextpgsiz; /* Bytes left in page */ int nd_maxextsiz; /* Max ext_pgs mbuf size */ + nfsopbit_t nd_allowops; /* Allowed ops ND_MACHCRED */ }; #define nd_princlen nd_gssnamelen @@ -736,6 +766,7 @@ struct nfsrv_descript { #define ND_EXTLSCERT 0x10000000000 #define ND_EXTLSCERTUSER 0x20000000000 #define ND_ERELOOKUP 0x40000000000 +#define ND_MACHCRED 0x80000000000 /* * ND_GSS should be the "or" of all GSS type authentications. diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 48798087b177..81bd2beba749 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -1222,6 +1222,47 @@ nfsmout: return (error); } +/* + * Get operation bits from an mbuf list. + * Returns EBADRPC for a parsing error, 0 otherwise. + */ +int +nfsrv_getopbits(struct nfsrv_descript *nd, nfsopbit_t *opbitp, int *cntp) +{ + uint32_t *tl; + int cnt, i, outcnt; + int error = 0; + + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + cnt = fxdr_unsigned(int, *tl); + if (cnt < 0) { + error = NFSERR_BADXDR; + goto nfsmout; + } + if (cnt > NFSOPBIT_MAXWORDS) + outcnt = NFSOPBIT_MAXWORDS; + else + outcnt = cnt; + NFSZERO_OPBIT(opbitp); + if (outcnt > 0) { + NFSM_DISSECT(tl, uint32_t *, outcnt * NFSX_UNSIGNED); + for (i = 0; i < outcnt; i++) + opbitp->bits[i] = fxdr_unsigned(uint32_t, *tl++); + } + for (i = 0; i < (cnt - outcnt); i++) { + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + if (*tl != 0) { + error = NFSERR_BADXDR; + goto nfsmout; + } + } + if (cntp != NULL) + *cntp = NFSX_UNSIGNED + (cnt * NFSX_UNSIGNED); +nfsmout: + NFSEXITCODE2(error, nd); + return (error); +} + /* * Get the attributes for V4. * If the compare flag is true, test for any attribute changes, @@ -3142,6 +3183,27 @@ nfsrv_putattrbit(struct nfsrv_descript *nd, nfsattrbit_t *attrbitp) return (bytesize); } +/* + * Put the operation bits onto an mbuf list. + * Return the number of bytes of output generated. + */ +int +nfsrv_putopbit(struct nfsrv_descript *nd, nfsopbit_t *opbitp) +{ + uint32_t *tl; + int cnt, i, bytesize; + + for (cnt = NFSOPBIT_MAXWORDS; cnt > 0; cnt--) + if (opbitp->bits[cnt - 1]) + break; + bytesize = (cnt + 1) * NFSX_UNSIGNED; + NFSM_BUILD(tl, uint32_t *, bytesize); + *tl++ = txdr_unsigned(cnt); + for (i = 0; i < cnt; i++) + *tl++ = txdr_unsigned(opbitp->bits[i]); + return (bytesize); +} + /* * Convert a uid to a string. * If the lookup fails, just output the digits. diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 55396bfb0902..ad1eb73b1090 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -337,6 +337,7 @@ int nfsrv_dissectacl(struct nfsrv_descript *, NFSACL_T *, bool, int *, int *, NFSPROC_T *); int nfsrv_getattrbits(struct nfsrv_descript *, nfsattrbit_t *, int *, int *); +int nfsrv_getopbits(struct nfsrv_descript *, nfsopbit_t *, int *); int nfsv4_loadattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, struct nfsfh **, fhandle_t *, int, struct nfsv3_pathconf *, struct statfs *, struct nfsstatfs *, @@ -391,6 +392,7 @@ int nfsd_excred(struct nfsrv_descript *, struct nfsexstuff *, struct ucred *, bool); int nfsrv_mtofh(struct nfsrv_descript *, struct nfsrvfh *); int nfsrv_putattrbit(struct nfsrv_descript *, nfsattrbit_t *); +int nfsrv_putopbit(struct nfsrv_descript *, nfsopbit_t *); void nfsrv_wcc(struct nfsrv_descript *, int, struct nfsvattr *, int, struct nfsvattr *); int nfsv4_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, NFSACL_T *, diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index ceecc63a7732..0d36ee84642a 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -1427,6 +1427,126 @@ struct nfsv3_sattr { #define NFSATTRBIT_REFERRAL1 NFSATTRBM_MOUNTEDONFILEID #define NFSATTRBIT_REFERRAL2 0 +/* Bits for the operations bitmaps. */ +#define NFSV4OPBM_ACCESS 0x00000008 +#define NFSV4OPBM_CLOSE 0x00000010 +#define NFSV4OPBM_COMMIT 0x00000020 +#define NFSV4OPBM_CREATE 0x00000040 +#define NFSV4OPBM_DELEGPURGE 0x00000080 +#define NFSV4OPBM_DELEGRETURN 0x00000100 +#define NFSV4OPBM_GETATTR 0x00000200 +#define NFSV4OPBM_GETFH 0x00000400 +#define NFSV4OPBM_LINK 0x00000800 +#define NFSV4OPBM_LOCK 0x00001000 +#define NFSV4OPBM_LOCKT 0x00002000 +#define NFSV4OPBM_LOCKU 0x00004000 +#define NFSV4OPBM_LOOKUP 0x00008000 +#define NFSV4OPBM_LOOKUPP 0x00010000 +#define NFSV4OPBM_NVERIFY 0x00020000 +#define NFSV4OPBM_OPEN 0x00040000 +#define NFSV4OPBM_OPENATTR 0x00080000 +#define NFSV4OPBM_OPENCONFIRM 0x00100000 +#define NFSV4OPBM_OPENDOWNGRADE 0x00200000 +#define NFSV4OPBM_PUTFH 0x00400000 +#define NFSV4OPBM_PUTPUBFH 0x00800000 +#define NFSV4OPBM_PUTROOTFH 0x01000000 +#define NFSV4OPBM_READ 0x02000000 +#define NFSV4OPBM_READDIR 0x04000000 +#define NFSV4OPBM_READLINK 0x08000000 +#define NFSV4OPBM_REMOVE 0x10000000 +#define NFSV4OPBM_RENAME 0x20000000 +#define NFSV4OPBM_RENEW 0x40000000 +#define NFSV4OPBM_RESTOREFH 0x80000000 +#define NFSV4OPBM_SAVEFH 0x00000001 +#define NFSV4OPBM_SECINFO 0x00000002 +#define NFSV4OPBM_SETATTR 0x00000004 +#define NFSV4OPBM_SETCLIENTID 0x00000008 +#define NFSV4OPBM_SETCLIENTIDCFRM 0x00000010 +#define NFSV4OPBM_VERIFY 0x00000020 +#define NFSV4OPBM_WRITE 0x00000040 +#define NFSV4OPBM_RELEASELCKOWN 0x00000080 +#define NFSV4OPBM_BACKCHANNELCTL 0x00000100 +#define NFSV4OPBM_BINDCONNTOSESS 0x00000200 +#define NFSV4OPBM_EXCHANGEID 0x00000400 +#define NFSV4OPBM_CREATESESSION 0x00000800 +#define NFSV4OPBM_DESTROYSESSION 0x00001000 +#define NFSV4OPBM_FREESTATEID 0x00002000 +#define NFSV4OPBM_GETDIRDELEG 0x00004000 +#define NFSV4OPBM_GETDEVINFO 0x00008000 +#define NFSV4OPBM_GETDEVLIST 0x00010000 +#define NFSV4OPBM_LAYOUTCOMMIT 0x00020000 +#define NFSV4OPBM_LAYOUTGET 0x00040000 +#define NFSV4OPBM_LAYOUTRETURN 0x00080000 +#define NFSV4OPBM_SECINFONONAME 0x00100000 +#define NFSV4OPBM_SEQUENCE 0x00200000 +#define NFSV4OPBM_SETSSV 0x00400000 +#define NFSV4OPBM_TESTSTATEID 0x00800000 +#define NFSV4OPBM_WANTDELEG 0x01000000 +#define NFSV4OPBM_DESTROYCLIENTID 0x02000000 +#define NFSV4OPBM_RECLAIMCOMPL 0x04000000 +#define NFSV4OPBM_ALLOCATE 0x08000000 +#define NFSV4OPBM_COPY 0x10000000 +#define NFSV4OPBM_COPYNOTIFY 0x20000000 +#define NFSV4OPBM_DEALLOCATE 0x40000000 +#define NFSV4OPBM_IOADVISE 0x80000000 +#define NFSV4OPBM_LAYOUTERROR 0x00000001 +#define NFSV4OPBM_LAYOUTSTATS 0x00000002 +#define NFSV4OPBM_OFFLOADCANCEL 0x00000004 +#define NFSV4OPBM_OFFLOADSTATUS 0x00000008 +#define NFSV4OPBM_READPLUS 0x00000010 +#define NFSV4OPBM_SEEK 0x00000020 +#define NFSV4OPBM_WRITESAME 0x00000040 +#define NFSV4OPBM_CLONE 0x00000080 +#define NFSV4OPBM_GETXATTR 0x00000100 +#define NFSV4OPBM_SETXATTR 0x00000200 +#define NFSV4OPBM_LISTXATTRS 0x00000400 +#define NFSV4OPBM_REMOVEXATTR 0x00000800 + +/* + * The set of must and allow operations for SP4_MACH_CRED. These are + * the operations requested by the Linux NFSv4.1/4.2 client. + * The must list is also the same ones listed in the RFC. + */ +#define NFSOPBIT_MUST0 NFSV4OP_DELEGPURGE + +#define NFSOPBIT_MUST1 \ + (NFSV4OPBM_BINDCONNTOSESS | \ + NFSV4OPBM_EXCHANGEID | \ + NFSV4OPBM_CREATESESSION | \ + NFSV4OPBM_DESTROYSESSION | \ + NFSV4OPBM_DESTROYCLIENTID) + +#define NFSOPBIT_MUST2 0x0 + +#define NFSOPBIT_CLRNOTMUST(b) do { \ + (b)->bits[0] &= NFSOPBIT_MUST0; \ + (b)->bits[1] &= NFSOPBIT_MUST1; \ + (b)->bits[2] &= NFSOPBIT_MUST2; \ + } while (0) + +#define NFSOPBIT_ALLOWED0 \ + (NFSV4OPBM_CLOSE | \ + NFSV4OPBM_COMMIT | \ + NFSV4OPBM_DELEGRETURN | \ + NFSV4OPBM_LOCKU | \ + NFSV4OPBM_OPENDOWNGRADE) + +#define NFSOPBIT_ALLOWED1 \ + (NFSV4OPBM_SECINFO | \ + NFSV4OPBM_WRITE | \ + NFSV4OPBM_FREESTATEID | \ + NFSV4OPBM_LAYOUTRETURN | \ + NFSV4OPBM_SECINFONONAME | \ + NFSV4OPBM_TESTSTATEID) + +#define NFSOPBIT_ALLOWED2 0x0 + +#define NFSOPBIT_CLRNOTALLOWED(b) do { \ + (b)->bits[0] &= NFSOPBIT_ALLOWED0; \ + (b)->bits[1] &= NFSOPBIT_ALLOWED1; \ + (b)->bits[2] &= NFSOPBIT_ALLOWED2; \ + } while (0) + /* * Structure for data handled by the statfs rpc. Since some fields are * u_int64_t, this cannot be used for copying data on/off the wire, due