From nobody Sun Aug 20 00:06: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 4RSwrz0Sr8z4qPZ4; Sun, 20 Aug 2023 00:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSwry6scDz3ZVw; Sun, 20 Aug 2023 00:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692490019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ajK91ddOzzPx4IC3vqTmkKmCEY0Is7Tb45EKVx8Q0iA=; b=lQ0iuNoEFtIyr3v65cYmS1wMmT/lPx6V9At40upgoNU67ik3Oc9XYR47jWMiF3OmIqaKq8 +QblF+7nvpGeXDsvLPfsNvCkPrmpfVY2LbbojHCj+2YS/mzRCi7BqlK0X/S06iq03G5Wn6 7g50dTyuwyRmlulO+bYOcJlSoelPpm5T/pgYWgpDNvQLlceYtgdtl3f0vaD58xAJ4c2Ul1 SMRM0OtWhdvk6DzKLB2PJEbR0GmUnQYuY2umvDHrzkIyGwYZEtV809YXxmJtPy9z7gn3ZI m36Uf4YqFIGhgSiPYJ81+66oVvqV7bMMoccgFHeLoTug0p9d5TkXbIajkC2pUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692490019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ajK91ddOzzPx4IC3vqTmkKmCEY0Is7Tb45EKVx8Q0iA=; b=BdRzB8KWpCQhA9r4Tqj7ZxBdpGGxK+BhqiE4gEKs6JP39ygaxNkQREhVuVg5Z4gEMMxfkb bKpGop6Kuy3jVh5adaQPOmHxH30DSflJKjLBpWdRpZhoIXuKs87OJSGJpIJJmWx6j6+dgg L67UAa9uFmFxUko1HAsakLrPdQmlzDGRYB2PIgx87GFudwTr3kIvfkhlqsmJWnX62so59L VxGak+tioAQeeYQmS//r2av8zROW+LMreKTIjJLtHEXYEB8C4VdpdpJjboqwMqIHprK625 cp/4BWNa2NIRGLGSAmYWHkq6yRiJUCD/1TbM+/ISq076CX8tqpPCNs+Q3Fe1Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692490019; a=rsa-sha256; cv=none; b=b1f+M6fUQNhvGSDEDB3ZTntKo5IpS1WBcO+Rc9NGB752h2V0Rvivxenb1VSvFHWnPx0Uvf 6zvyTfYQX3qQzA1Q+W1HejEWiugEVC6/tZkuluHycZdnq/FWGL8kLmo1W1DRVQB5jkqus4 4dBAmU6H4q5zTv7yTnQiDWozutXedELTaXzTd7l54VKWJIPBd4t0hWDHhtNvVxTq9HWCKd yALnSSD5wFTrcaWoZV6c1TpTfFeK4RjJNrHVxnxZP5r3a9Wsx2DB2TN+W83WPIXyFr7OrQ 67xZQOOu8+JH/QmvWBcx70X2Lasgcl0FIQx84l1233QwdJotkYugNDJGX2sd8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSwry5w2kz342; Sun, 20 Aug 2023 00:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K06wsD099326; Sun, 20 Aug 2023 00:06:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K06wDK099323; Sun, 20 Aug 2023 00:06:58 GMT (envelope-from git) Date: Sun, 20 Aug 2023 00:06:58 GMT Message-Id: <202308200006.37K06wDK099323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 332af8c25dfc - main - xhci: Add support for 64-bit DMA in generic XHCI controller 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: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 332af8c25dfc9857e997817281d7b7fa406783ef Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=332af8c25dfc9857e997817281d7b7fa406783ef commit 332af8c25dfc9857e997817281d7b7fa406783ef Author: Stephen J. Kiernan AuthorDate: 2023-08-11 16:06:02 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-08-20 00:05:45 +0000 xhci: Add support for 64-bit DMA in generic XHCI controller driver The XHCI controller on 64-bit SoCs need to use 64-bit DMA. Add a quirk to tell the generic XHCI driver that 32-bit DMA needs to be used, if there are any that may need to use 32-bit DMA only. Reviewed by: andrew Obtained from: Juniper Networks, Inc. --- sys/dev/usb/controller/generic_xhci.c | 9 ++++++++- sys/dev/usb/controller/generic_xhci_fdt.c | 20 +++++++++++++++----- sys/dev/usb/controller/xhci.h | 1 + 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/sys/dev/usb/controller/generic_xhci.c b/sys/dev/usb/controller/generic_xhci.c index e0caf8f42af5..e89d1bc84497 100644 --- a/sys/dev/usb/controller/generic_xhci.c +++ b/sys/dev/usb/controller/generic_xhci.c @@ -61,7 +61,13 @@ #include "generic_xhci.h" +#if __SIZEOF_LONG__ == 8 +#define IS_DMA_32B 0 +#elif __SIZEOF_LONG__ == 4 #define IS_DMA_32B 1 +#else +#error unsupported long size +#endif int generic_xhci_attach(device_t dev) @@ -114,7 +120,8 @@ generic_xhci_attach(device_t dev) return (err); } - err = xhci_init(sc, dev, IS_DMA_32B); + err = xhci_init(sc, dev, + (sc->sc_quirks & XHCI_QUIRK_DMA_32B) == 0 ? IS_DMA_32B : 1); if (err != 0) { device_printf(dev, "Failed to init XHCI, with error %d\n", err); generic_xhci_detach(dev); diff --git a/sys/dev/usb/controller/generic_xhci_fdt.c b/sys/dev/usb/controller/generic_xhci_fdt.c index cd0d84aebe91..a5c3f190783f 100644 --- a/sys/dev/usb/controller/generic_xhci_fdt.c +++ b/sys/dev/usb/controller/generic_xhci_fdt.c @@ -55,12 +55,16 @@ #include "generic_xhci.h" +/* Flags for the OFW compat data table */ +#define XHCI_FDT_MATCH 0x01 +#define XHCI_FDT_32BIT_DMA 0x02 /* Controller needs 32-bit DMA */ + static struct ofw_compat_data compat_data[] = { - {"marvell,armada-380-xhci", true}, - {"marvell,armada3700-xhci", true}, - {"marvell,armada-8k-xhci", true}, - {"generic-xhci", true}, - {NULL, false} + {"marvell,armada-380-xhci", XHCI_FDT_MATCH}, + {"marvell,armada3700-xhci", XHCI_FDT_MATCH}, + {"marvell,armada-8k-xhci", XHCI_FDT_MATCH}, + {"generic-xhci", XHCI_FDT_MATCH}, + {NULL, 0} }; static int @@ -81,14 +85,20 @@ generic_xhci_fdt_probe(device_t dev) static int generic_xhci_fdt_attach(device_t dev) { + struct xhci_softc *sc = device_get_softc(dev); phandle_t node; phy_t phy; + int flags; node = ofw_bus_get_node(dev); if (phy_get_by_ofw_property(dev, node, "usb-phy", &phy) == 0) if (phy_enable(phy) != 0) device_printf(dev, "Cannot enable phy\n"); + flags = ofw_bus_search_compatible(dev, compat_data)->ocd_data; + if ((flags & XHCI_FDT_32BIT_DMA) != 0) + sc->sc_quirks |= XHCI_QUIRK_DMA_32B; + return (generic_xhci_attach(dev)); } diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h index 0be0d185a869..3758815238ad 100644 --- a/sys/dev/usb/controller/xhci.h +++ b/sys/dev/usb/controller/xhci.h @@ -488,6 +488,7 @@ typedef int (xhci_port_route_t)(device_t, uint32_t, uint32_t); enum xhci_quirks { XHCI_QUIRK_DISABLE_PORT_PED = 0x00000001, + XHCI_QUIRK_DMA_32B = 0x00000002, }; struct xhci_softc { From nobody Sun Aug 20 03:04: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 4RT0p75pMGz4qbS7; Sun, 20 Aug 2023 03:04:47 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RT0p75Cp3z4L2g; Sun, 20 Aug 2023 03:04:47 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692500687; 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=3gzhrN+NjjKdvL21c02r/DN8dyTi90FCmizP2p1n4ak=; b=nsoOYYECJ0yWN5UT5oS3+4sssjNuL4GDe20Xcgyw39AOUD1vax6yiVlk4MqDqE8YRSet5S 4P06RW86iDuRHlkSTIM3plXrw4LIXCPNLbSTizw3jtoiNBcSdxDfoICc0n0ZRfsMd9m3nq ayhsPg87Gj+kR6gpvD+ouKPSjmy6aLThC4GVmWuSX+q2Z1k3Y9abGtn4RH5ePlIxheFeWi oXj9HgEyHUbTah6+eDEk5rj+M79f4Y9pRqjJDLm3Sw3p2kHB4nb1g0Mq/lubNNCkqEdfXr aBfdkEWoNKxU1c9oJbsRL0uPg9i2bwoJmg4eIorvBqvctIG86rhMn85V8xUz4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692500687; 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=3gzhrN+NjjKdvL21c02r/DN8dyTi90FCmizP2p1n4ak=; b=OMvNIqfkS7B13iH5uqKGHwcjnmvDkIQWq6qdW1MJWIFHsp+VcFtkwQEYAbWsafcSbbpDNk es3bqs01yPfxpnf7AKP2sLtmFV/uBoZaM9dz9U+2imstS8BTFNGUQFs+S3CHtBbIxGGSB2 Zq76b80sv3dd+UKqr6Vp/0cEEZVcBrwfO28AhZYvLa06yAXzlzezAdfg4EmWvvXnU5BhpL HPHO1Xv3YAP3Q9RzxtKniWHDDXAx7UFdGqIfeuVxANJGns6IyF7ioLcRVsuT40PjI1NifV QS38GosJ45pS/jynaOOMgCRcO56AajuMhYStxfKUt+2Jj1fc39raqd7v1DeE/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692500687; a=rsa-sha256; cv=none; b=qADDiiUUCs6snNnGBs3+1n/bX/vB2ZeajGR4fFiwSrLlvLVNPUs9/LoOuQLZQ5irm2KzxE EiBILnPsPpXzJa5uuuut9+QZm2uEpiQupnwcs+r2n4gVY6Vcu9a9QkYGXM/vUD92kSDC1O YY+6wTBunu07EDhor2wALNf9en8+VKh4qtsmx/X6sc7fxIsBM0j+eeGZvKpl+4FzU6HYUh FyzKkMb0oYIbOdqT24xCkyviCvcYxMiN+aFWzd/9MBJd3+lTDePCgQuX2FnQNfdl8jCf/6 59qQzDDyIdNy3LPBVX9EzqoRKq658FVkC1BG9kEpD1BSCAB/WX8tXG5kdiVUHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: by freefall.freebsd.org (Postfix, from userid 1033) id 6F05314E15; Sun, 20 Aug 2023 03:04:47 +0000 (UTC) Date: Sun, 20 Aug 2023 03:04:47 +0000 From: Alexey Dokuchaev To: Graham Perrin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: edacf4b4824a - main - UPDATING: fix a typo, adjust a white space Message-ID: References: <202308181700.37IH0WZT094403@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: <202308181700.37IH0WZT094403@gitrepo.freebsd.org> On Fri, Aug 18, 2023 at 05:00:32PM +0000, Graham Perrin wrote: > commit edacf4b4824af3630a953eb1080baf9c46f176de > > UPDATING: fix a typo, adjust a white space > > diff --git a/UPDATING b/UPDATING > index 705ca6431a32..b818d4dc8d29 100644 > --- a/UPDATING > +++ b/UPDATING > @@ -34,7 +34,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: > configuration. > > Note that the early x86 BIOS bootloader (i.e., boot0sio) does not > - support rates above 9600 bps and is not chagned. boot0sio users may > + support rates above 9600 bps and is not changed. boot0sio users may There's no typo. We prefer to format texts designed to be viewed on the terminal screen using double spaces between sentenses because they look better with monospaced fonts. We're not enforcing this, but at least we should not pessimize existing formatting when it's correct. ./danfe From nobody Sun Aug 20 04:28: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 4RT2fX0C9kz4qgVs; Sun, 20 Aug 2023 04:28: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 4RT2fW61sSz4Q2T; Sun, 20 Aug 2023 04:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vnl17z2HtZlZChhqnCdyLgcJ5Jzp1oG0BIxZMm1ljiU=; b=wPjTrfjwyb8MWmwxN+esNA3fPKhAHFlAauRehB50e1jWAiFeemfDYQjWwL5dursWt0/kAm 0UdScmzz7TnEsMMBmMQzoXG5d/Yv7AQgTmSeKKTzcK66LivBvtI91HhCujlM3fws4RW9Q/ gmnVUnUz78rYRG5Luu6mUnqYc5di6Wmy+Q4OqLilmB7Po5MH7A6coXM7b7EKraVt+NgdBe 25VwLsWWFBKhrGCYtsC92wlMBRbiYylXFbdq0O1Xajd5PRkIZvjp6KPP16N+8DvWaxQo4g +KH2rdoUOwJQntCMyn0e9LvNzyOqsfQ+YP4tNhbFR9XQ1y8TsV2r95NR8jbgqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vnl17z2HtZlZChhqnCdyLgcJ5Jzp1oG0BIxZMm1ljiU=; b=r10vnZT85ksFSOdAJVLx4l6XJhFa7HNzD5doz8d7fjchuuK8mn4g/tVF75Vi7nlJC2Z0VL LFgAtpSstyvytAhDkk+vKid5/nK6yU6nH7AZw2euBCmRQtZtnh7dhhmjuWLm94IPBn6rez N0LFqgGzSxkSejAsKiCPsPj17OhhyoIvJrcgNs267NiVtVIEfrxKOm2umXxh+YxOEk9aJ/ mezGrMA9ZeGlZlzNln1Td7HyjUXVqIQOi9BkBBv+rkTSFThf0nf0HORO96gn8hJODB/j2u 1vlPxBK6y7EbHMkOtH3Spjl/9uDV6hMxUfvRejOpGVaIseItXUnPhsmdmRpdfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692505699; a=rsa-sha256; cv=none; b=AYtjOrm5EPS8FTMuhvJY0j2XXLPboavdUd33+eeLenWgsZ51vL8Bjw68zu7qkKVmxZLtdg n8oCzdRSv1hCbsF+9uC4W835OaDyLhtFAJTfilOiWxE/4ycQ66GBOTO3/w8HxY0dPiNJVx mBH6KZKaziMyXaIV6ndvzTUbdRvc+cAXJ0eizklaLkR3EhUCdP1q2zp+/bgZShATMVvNo/ pw7Dm46R5LDW9UIF/03vC0Za/ZlOZxPiw3ljPBjRoW99bgw5SYEoMT+sajLBkrM1kmrvnu 8vt3Cz7rJI1iGo8yUvri4jUb1lYUiQT6rIFnkn3Q2HeR7Z+uHyd22chWKWr6xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT2fW574Dz9KS; Sun, 20 Aug 2023 04:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K4SJAR033367; Sun, 20 Aug 2023 04:28:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K4SJmA033364; Sun, 20 Aug 2023 04:28:19 GMT (envelope-from git) Date: Sun, 20 Aug 2023 04:28:19 GMT Message-Id: <202308200428.37K4SJmA033364@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: 2e025e410760 - stable/13 - Update newfs(8) and tunefs(8) manual pages. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2e025e410760f1989ba4dd3a816e15571caa5b1d Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=2e025e410760f1989ba4dd3a816e15571caa5b1d commit 2e025e410760f1989ba4dd3a816e15571caa5b1d Author: Kirk McKusick AuthorDate: 2023-08-06 06:40:26 +0000 Commit: Kirk McKusick CommitDate: 2023-08-20 04:27:37 +0000 Update newfs(8) and tunefs(8) manual pages. Sponsored-by: The FreeBSD Foundation (cherry picked from commit 4ce2a2db41f9a18cdcec088b330899a8d830c2be) --- sbin/newfs/newfs.8 | 3 --- sbin/tunefs/tunefs.8 | 3 --- 2 files changed, 6 deletions(-) diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8 index 803b3221503d..fdbde436186e 100644 --- a/sbin/newfs/newfs.8 +++ b/sbin/newfs/newfs.8 @@ -204,9 +204,6 @@ will be about half of normal during the time that the background is running. Running a full fsck on a UFS filesystem is the equivalent of running a scrub on a ZFS filesystem. -.Pp -Presently it is not possible -to run background fsck on filesystems enabled for journaling. .It Fl k Ar held-for-metadata-blocks Set the amount of space to be held for metadata blocks in each cylinder group. When set, the file system preference routines will try to save diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8 index 0264c3e5f772..95adac48b8b2 100644 --- a/sbin/tunefs/tunefs.8 +++ b/sbin/tunefs/tunefs.8 @@ -130,9 +130,6 @@ will be about half of normal during the time that the background is running. Running a full fsck on a UFS filesystem is the equivalent of running a scrub on a ZFS filesystem. -.Pp -Presently it is not possible -to run background fsck on filesystems enabled for journaling. .It Fl J Cm enable | disable Turn on/off gjournal flag. .It Fl k Ar held-for-metadata-blocks From nobody Sun Aug 20 04:28: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 4RT2fY0Hzkz4qgkX; Sun, 20 Aug 2023 04:28: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 4RT2fX6tPFz4QGS; Sun, 20 Aug 2023 04:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jb1YCWNrgBfkepbQBlrd5WvWO5XjAAoOeumUSTOwIFs=; b=xH3N5LfRRoHu3hyRpkQWBAfK6XCNPb6m2DXIZ3OKG472ibfbz/hP4/ucYcwW/uvYlVPUH1 KByuvC8Fwwyi8cjGKbD0yQRAYchRv1Ip7tYZ+TbwN8svS0Q2AZ/cWWRvLkEiVERUi2Pggu P1C8CTtCxH4cvQjoOM0lqMfn2VHEc9tUMeauCf1R+dmx8Jsu6u+h8GyPg5YkBYvLLUuRdT z/EHlicZSqzgnnWoO3MQIq5qcQU0uefglH9Dzq9IM1dWrtcdX7v2j9oSnswikrVuP5egHT YJGB96XtTFQB9TwIAwBHrppr6/IEzjg5W52RoNLZa/m60aChpwu6OPWtnG9p4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jb1YCWNrgBfkepbQBlrd5WvWO5XjAAoOeumUSTOwIFs=; b=BDX7awdkQeoxiqyoHOCqhgqcfEPtpLUQQsYccn45BebCAM8WLxcSdf1FCoXypK/v7Rm6ab /1KZZS6l7RiGZ9RBFSdNJowQSCpsfu3dYzqP/bP0CLzXHi3eWHwyYOh6u+EM5kDn7ZIxZW s/Z3kokAjRsYmuquO4oY6clbhvm5toRl/KOQyR+pcInFkPLmfMoBEHXzNQOfnx2XcjoaYN QMxvSFVNND2Tog6Vea3vVBq3KVFmNrPz6bAx58fMe7lI7IPZMrgs/t1etMqaKPO2dJkBxK DgX5nazuAzgSHzKdvUqAwDsN6vr4eKYICMC7wtGdC/3oqFKCjm/3tF+Tp5zduA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692505701; a=rsa-sha256; cv=none; b=VoVZzMbWLZr8NAoclpi2i4I8YqSrW1lbvIIPP0UeOtM6TgyuToT9xwDrPwWOSOlGjFER2u uUD+MXKSCFA3spoAwe7DVKICovHQpe5aEugAF4VUACTHKbpvZ/7/s0jo9Uf08MuVoc+jmL WCQTAE+YcglfnAInakMayHH/3gFR1BpMuIWWeNuLuZdLspLu1SiInkBolw1X+1+wtc0Msa eJcwJUNjZaa+oyiPahbtE4vOyE4VZLymppZdFKguQWRovc9ZzKtEZsVeTcTYHaPv8lBeAG BYDIRIoOVQS4T7ObJ0H2pE8YrhDOgCwCfCkzo1ImUGtxs+1Dzkfh7K51CAlOVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT2fX5k5Wz9vl; Sun, 20 Aug 2023 04:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K4SKmi033421; Sun, 20 Aug 2023 04:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K4SKCN033418; Sun, 20 Aug 2023 04:28:20 GMT (envelope-from git) Date: Sun, 20 Aug 2023 04:28:20 GMT Message-Id: <202308200428.37K4SKCN033418@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: 6412782800fa - stable/13 - Support background fsck_ffs(8) on filesystems using journaled soft 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6412782800fa535830abf0bba7dc3f9c9b185edf Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=6412782800fa535830abf0bba7dc3f9c9b185edf commit 6412782800fa535830abf0bba7dc3f9c9b185edf Author: Kirk McKusick AuthorDate: 2023-08-01 20:16:11 +0000 Commit: Kirk McKusick CommitDate: 2023-08-20 04:27:37 +0000 Support background fsck_ffs(8) on filesystems using journaled soft updates Tested-by: Peter Holm Sponsored-by: The FreeBSD Foundation (cherry picked from commit 344b5bf82528575ada304f0df356d2f045772328) --- sbin/fsck_ffs/main.c | 19 +++++++++++-------- sbin/fsck_ffs/suj.c | 25 +++++++++++++++++++------ 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index a0746ea0f68e..b31aee18a843 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -274,9 +274,16 @@ checkfilesys(char *filesys) if (bkgrdcheck) { if (sbreadfailed) exit(3); /* Cannot read superblock */ - /* Earlier background failed or journaled */ - if (sblock.fs_flags & (FS_NEEDSFSCK | FS_SUJ)) - exit(4); + if ((sblock.fs_flags & FS_NEEDSFSCK) == FS_NEEDSFSCK) + exit(4); /* Earlier background failed */ + if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { + maxino = sblock.fs_ncg * sblock.fs_ipg; + maxfsblock = sblock.fs_size; + bufinit(); + preen = 1; + if (suj_check(filesys) == 0) + exit(4); /* Journal good, run it now */ + } if ((sblock.fs_flags & FS_DOSOFTDEP) == 0) exit(5); /* Not running soft updates */ size = MIBSIZE; @@ -350,7 +357,7 @@ checkfilesys(char *filesys) /* * Determine if we can and should do journal recovery. */ - if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { + if (bkgrdflag == 0 && (sblock.fs_flags & FS_SUJ) == FS_SUJ) { if ((sblock.fs_flags & FS_NEEDSFSCK) != FS_NEEDSFSCK && skipclean) { sujrecovery = 1; @@ -619,10 +626,6 @@ setup_bkgrdchk(struct statfs *mntp, int sbreadfailed, char **filesys) pwarn("FULL FSCK NEEDED, CANNOT RUN IN BACKGROUND\n"); return (0); } - if ((sblock.fs_flags & FS_SUJ) != 0) { - pwarn("JOURNALED FILESYSTEM, CANNOT RUN IN BACKGROUND\n"); - return (0); - } if (skipclean && ckclean && (sblock.fs_flags & (FS_UNCLEAN|FS_NEEDSFSCK)) == 0) { /* diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index 1ae9d4d4b675..dda58ce27250 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -2133,7 +2133,9 @@ suj_verifyino(union dinode *dp) } if (DIP(dp, di_modrev) != fs->fs_mtime) { - printf("Journal timestamp does not match fs mount time\n"); + if (!bkgrdcheck || debug) + printf("Journal timestamp does not match " + "fs mount time\n"); return (-1); } @@ -2434,7 +2436,9 @@ suj_check(const char *filesys) sujino = idesc.id_parent; irelse(&ip); } else { - printf("Journal inode removed. Use tunefs to re-create.\n"); + if (!bkgrdcheck || debug) + printf("Journal inode removed. " + "Use tunefs to re-create.\n"); sblock.fs_flags &= ~FS_SUJ; sblock.fs_sujfree = 0; irelse(&ip); @@ -2445,7 +2449,8 @@ suj_check(const char *filesys) */ ginode(sujino, &ip); jip = ip.i_dp; - printf("** SU+J Recovering %s\n", filesys); + if (!bkgrdcheck || debug) + printf("** SU+J Recovering %s\n", filesys); if (suj_verifyino(jip) != 0 || (!preen && !reply("USE JOURNAL"))) { irelse(&ip); return (-1); @@ -2454,15 +2459,23 @@ suj_check(const char *filesys) * Build a list of journal blocks in jblocks before parsing the * available journal blocks in with suj_read(). */ - printf("** Reading %jd byte journal from inode %ju.\n", - DIP(jip, di_size), (uintmax_t)sujino); + if (!bkgrdcheck || debug) + printf("** Reading %jd byte journal from inode %ju.\n", + DIP(jip, di_size), (uintmax_t)sujino); suj_jblocks = jblocks_create(); blocks = ino_visit(jip, sujino, suj_add_block, 0); if (blocks != numfrags(fs, DIP(jip, di_size))) { - printf("Sparse journal inode %ju.\n", (uintmax_t)sujino); + if (!bkgrdcheck || debug) + printf("Sparse journal inode %ju.\n", + (uintmax_t)sujino); irelse(&ip); return (-1); } + /* If journal is valid then do journal check rather than background */ + if (bkgrdcheck) { + irelse(&ip); + return (0); + } irelse(&ip); suj_read(); jblocks_destroy(suj_jblocks); From nobody Sun Aug 20 04:28: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 4RT2fZ1bkhz4qgXw; Sun, 20 Aug 2023 04:28: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 4RT2fZ0qWXz4Q3h; Sun, 20 Aug 2023 04:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=If/C8IhTUG2/0QZiY8APhC8t5WGLSlx9DTF0JYkzhls=; b=qPvr2KNZdWNa6gFWoP1WK+Q5W7wRutdo1DQO7xDYFxEX/4JmqLV8DrRdhEZse9eILd57bf m3AQzIErIg3d7+5o8GJU+zOkiHRsE54iSUwQQhA2uLhihAda2HqyV68PhPiYFcixRJMruU oG0gWRh51s75X+ZhujvPfzZT8CbjRuNVFRsYab3VIAstQXu35lN9US3HIEHD6EXFQ3Dz0g igTsaUEAHeWh+RxLaPK1OudTiZnni6kXA3BJlwIycEc0O3p7CgbA9N5TUWCkwfRrSE4LAy mTIH8TrEUJnZaiy+cDN1vXAjjTlhhLdAOVIjOykCE2BtClPI3C2EW9aLLD+3SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=If/C8IhTUG2/0QZiY8APhC8t5WGLSlx9DTF0JYkzhls=; b=Zm0wwNxmzJ9k9X28VVqmtVZ5tk80Fy8ENFnPnDIBWyYzFinzJ36Pvu/XkgEpLWxcUl1Tga dDTHO+uNFN8uqXM7RySDK8G43r011B0itqmqlpg8Qn78wJVDJFdP/QWXoP3DlGtoIxWk72 Gi8hrAllAK/CxEyz7ra8NvRA2HukYpwi2j8t4XyHLJLvWTqSLRQwuprtZMt9bKurGOYCTW dP/X4RtoNBLeKdvZc791URCdyaH8HBYD8MlSDeM3XL8zjy2fEr/+Nzq/Luv8hDSccbkxRp xYjSumhnR/lBfkqf9qPt9BgxhsDkrypYVUTkoz4le5w0bLdQlDOrw5OZHBGNAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692505702; a=rsa-sha256; cv=none; b=KYDLNkpEtx6N5ZUK+HGwnSIL7kAoSir5dcrzKXOsIz8H4UOHGT5TDJeQIKdkH7bmfQM23E aD7xB3EYcw2sTu9BF/BrRtNU4ZJulllXU6Yv8BCoFMrg3K3pwZR+unHNTW2toNbJkEIk/6 Zaw4ezT5+T1WdxcSRK2JhEFOGpzW39Zun4MEmN6mspXHfg8HiA5DCUjppCSEsQa0THGKn0 rRXR/Lq0gqQ/RnArehgYsF6Q3q4UEaMMUAxKG2PhesADo9ZlHLuy7r8/H2q4GWspQ7R+sh D7vVnXra+V5NUm6X7AaT94SYI8lE9ZMUm41fPkQv2NHxkM2NBt6kavn5tcQEzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT2fY6tJmz9KT; Sun, 20 Aug 2023 04:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K4SLNt033478; Sun, 20 Aug 2023 04:28:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K4SLO0033475; Sun, 20 Aug 2023 04:28:21 GMT (envelope-from git) Date: Sun, 20 Aug 2023 04:28:21 GMT Message-Id: <202308200428.37K4SLO0033475@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: 3085e04892e2 - stable/13 - Handle UFS/FFS file deletion from cylinder groups with check-hash failure. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3085e04892e23158f346bc10828d9b7a78c6490b Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=3085e04892e23158f346bc10828d9b7a78c6490b commit 3085e04892e23158f346bc10828d9b7a78c6490b Author: Kirk McKusick AuthorDate: 2023-08-07 23:27:39 +0000 Commit: Kirk McKusick CommitDate: 2023-08-20 04:27:37 +0000 Handle UFS/FFS file deletion from cylinder groups with check-hash failure. Reported-by: Peter Holm Tested-by: Peter Holm Sponsored-by: The FreeBSD Foundation (cherry picked from commit d4a8f5bf133956e71c05edff6fa20b156e5f1bbf) --- sys/ufs/ffs/ffs_alloc.c | 27 ++++++++++++++------ sys/ufs/ffs/ffs_extern.h | 4 +-- sys/ufs/ffs/ffs_softdep.c | 65 +++++++++++++++++++++++++---------------------- 3 files changed, 55 insertions(+), 41 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 36181263876c..44c07bb776b7 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -2295,9 +2295,14 @@ ffs_blkfree_cg(struct ufsmount *ump, return; } if ((error = ffs_getcg(fs, devvp, cg, GB_CVTENXIO, &bp, &cgp)) != 0) { - if (!ffs_fsfail_cleanup(ump, error) || - !MOUNTEDSOFTDEP(UFSTOVFS(ump)) || devvp->v_type != VCHR) + if (!MOUNTEDSOFTDEP(UFSTOVFS(ump)) || devvp->v_type != VCHR) return; + /* + * Would like to just downgrade to read-only. Until that + * capability is available, just toss the cylinder group + * update and mark the filesystem as needing to run fsck. + */ + fs->fs_flags |= FS_NEEDSFSCK; if (devvp->v_type == VREG) dbn = fragstoblks(fs, cgtod(fs, cg)); else @@ -2305,7 +2310,7 @@ ffs_blkfree_cg(struct ufsmount *ump, error = getblkx(devvp, dbn, dbn, fs->fs_cgsize, 0, 0, 0, &bp); KASSERT(error == 0, ("getblkx failed")); softdep_setup_blkfree(UFSTOVFS(ump), bp, bno, - numfrags(fs, size), dephd); + numfrags(fs, size), dephd, true); bp->b_flags |= B_RELBUF | B_NOCACHE; bp->b_flags &= ~B_CACHE; bawrite(bp); @@ -2380,7 +2385,7 @@ ffs_blkfree_cg(struct ufsmount *ump, mp = UFSTOVFS(ump); if (MOUNTEDSOFTDEP(mp) && devvp->v_type == VCHR) softdep_setup_blkfree(UFSTOVFS(ump), bp, bno, - numfrags(fs, size), dephd); + numfrags(fs, size), dephd, false); bdwrite(bp); } @@ -2841,16 +2846,21 @@ ffs_freefile(struct ufsmount *ump, panic("ffs_freefile: range: dev = %s, ino = %ju, fs = %s", devtoname(dev), (uintmax_t)ino, fs->fs_fsmnt); if ((error = ffs_getcg(fs, devvp, cg, GB_CVTENXIO, &bp, &cgp)) != 0) { - if (!ffs_fsfail_cleanup(ump, error) || - !MOUNTEDSOFTDEP(UFSTOVFS(ump)) || devvp->v_type != VCHR) + if (!MOUNTEDSOFTDEP(UFSTOVFS(ump)) || devvp->v_type != VCHR) return (error); + /* + * Would like to just downgrade to read-only. Until that + * capability is available, just toss the cylinder group + * update and mark the filesystem as needing to run fsck. + */ + fs->fs_flags |= FS_NEEDSFSCK; if (devvp->v_type == VREG) dbn = fragstoblks(fs, cgtod(fs, cg)); else dbn = fsbtodb(fs, cgtod(fs, cg)); error = getblkx(devvp, dbn, dbn, fs->fs_cgsize, 0, 0, 0, &bp); KASSERT(error == 0, ("getblkx failed")); - softdep_setup_inofree(UFSTOVFS(ump), bp, ino, wkhd); + softdep_setup_inofree(UFSTOVFS(ump), bp, ino, wkhd, true); bp->b_flags |= B_RELBUF | B_NOCACHE; bp->b_flags &= ~B_CACHE; bawrite(bp); @@ -2880,7 +2890,7 @@ ffs_freefile(struct ufsmount *ump, ACTIVECLEAR(fs, cg); UFS_UNLOCK(ump); if (MOUNTEDSOFTDEP(UFSTOVFS(ump)) && devvp->v_type == VCHR) - softdep_setup_inofree(UFSTOVFS(ump), bp, ino, wkhd); + softdep_setup_inofree(UFSTOVFS(ump), bp, ino, wkhd, false); bdwrite(bp); return (0); } @@ -2888,6 +2898,7 @@ ffs_freefile(struct ufsmount *ump, /* * Check to see if a file is free. * Used to check for allocated files in snapshots. + * Return 1 if file is free. */ int ffs_checkfreefile(struct fs *fs, diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index fb448abe4e5e..68253781863c 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -198,9 +198,9 @@ void softdep_setup_allocindir_meta(struct buf *, struct inode *, void softdep_setup_allocindir_page(struct inode *, ufs_lbn_t, struct buf *, int, ufs2_daddr_t, ufs2_daddr_t, struct buf *); void softdep_setup_blkfree(struct mount *, struct buf *, ufs2_daddr_t, int, - struct workhead *); + struct workhead *, bool); void softdep_setup_inofree(struct mount *, struct buf *, ino_t, - struct workhead *); + struct workhead *, bool); void softdep_setup_sbupdate(struct ufsmount *, struct fs *, struct buf *); void softdep_fsync_mountdev(struct vnode *); int softdep_sync_metadata(struct vnode *); diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 6ac3f92fb330..dba316b32655 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -300,7 +300,8 @@ softdep_setup_blkfree(struct mount *mp, struct buf *bp, ufs2_daddr_t blkno, int frags, - struct workhead *wkhd) + struct workhead *wkhd, + bool doingrecovery) { panic("%s called", __FUNCTION__); @@ -310,7 +311,8 @@ void softdep_setup_inofree(struct mount *mp, struct buf *bp, ino_t ino, - struct workhead *wkhd) + struct workhead *wkhd, + bool doingrecovery) { panic("%s called", __FUNCTION__); @@ -10926,30 +10928,26 @@ void softdep_setup_inofree(struct mount *mp, struct buf *bp, ino_t ino, - struct workhead *wkhd) + struct workhead *wkhd, + bool doingrecovery) { struct worklist *wk, *wkn; - struct inodedep *inodedep; struct ufsmount *ump; - uint8_t *inosused; - struct cg *cgp; - struct fs *fs; +#ifdef INVARIANTS + struct inodedep *inodedep; +#endif KASSERT(MOUNTEDSOFTDEP(mp) != 0, ("softdep_setup_inofree called on non-softdep filesystem")); ump = VFSTOUFS(mp); ACQUIRE_LOCK(ump); - if (!ffs_fsfail_cleanup(ump, 0)) { - fs = ump->um_fs; - cgp = (struct cg *)bp->b_data; - inosused = cg_inosused(cgp); - if (isset(inosused, ino % fs->fs_ipg)) - panic("softdep_setup_inofree: inode %ju not freed.", - (uintmax_t)ino); - } - if (inodedep_lookup(mp, ino, 0, &inodedep)) - panic("softdep_setup_inofree: ino %ju has existing inodedep %p", - (uintmax_t)ino, inodedep); + KASSERT(doingrecovery || ffs_fsfail_cleanup(ump, 0) || + isclr(cg_inosused((struct cg *)bp->b_data), + ino % ump->um_fs->fs_ipg), + ("softdep_setup_inofree: inode %ju not freed.", (uintmax_t)ino)); + KASSERT(inodedep_lookup(mp, ino, 0, &inodedep) == 0, + ("softdep_setup_inofree: ino %ju has existing inodedep %p", + (uintmax_t)ino, inodedep)); if (wkhd) { LIST_FOREACH_SAFE(wk, wkhd, wk_list, wkn) { if (wk->wk_type != D_JADDREF) @@ -10980,7 +10978,8 @@ softdep_setup_blkfree( struct buf *bp, ufs2_daddr_t blkno, int frags, - struct workhead *wkhd) + struct workhead *wkhd, + bool doingrecovery) { struct bmsafemap *bmsafemap; struct jnewblk *jnewblk; @@ -11027,18 +11026,22 @@ softdep_setup_blkfree( KASSERT(jnewblk->jn_state & GOINGAWAY, ("softdep_setup_blkfree: jnewblk not canceled.")); #ifdef INVARIANTS - /* - * Assert that this block is free in the bitmap - * before we discard the jnewblk. - */ - cgp = (struct cg *)bp->b_data; - blksfree = cg_blksfree(cgp); - bno = dtogd(fs, jnewblk->jn_blkno); - for (i = jnewblk->jn_oldfrags; - i < jnewblk->jn_frags; i++) { - if (isset(blksfree, bno + i)) - continue; - panic("softdep_setup_blkfree: not free"); + if (!doingrecovery && !ffs_fsfail_cleanup(ump, 0)) { + /* + * Assert that this block is free in the + * bitmap before we discard the jnewblk. + */ + cgp = (struct cg *)bp->b_data; + blksfree = cg_blksfree(cgp); + bno = dtogd(fs, jnewblk->jn_blkno); + for (i = jnewblk->jn_oldfrags; + i < jnewblk->jn_frags; i++) { + if (isset(blksfree, bno + i)) + continue; + panic("softdep_setup_blkfree: block " + "%ju not freed.", + (uintmax_t)jnewblk->jn_blkno); + } } #endif /* From nobody Sun Aug 20 04:28: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 4RT2fb2B55z4qgXy; Sun, 20 Aug 2023 04:28: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 4RT2fb1jNqz4QYB; Sun, 20 Aug 2023 04:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TpTkb6wnv/lUknBGp3V1DkZcCidQe2oW4xdxeJPvHQU=; b=H5zD/FmCUB0QxiCHtbRzh7UKFoQYKjveyWqjz0ThzzIZdWvceZwN/A6vfVe8RSfJRfWgUh NdBsJpHw8mB+93cOXooPU701xafoH2aa85owwuLteZDngGz74PldYNBS3sDxnTNEPTSEms V0AgsLlqiGVfKw7lhsTCtxTQFXvXaL+/vZzwhvwCRx4dIvYQV0RoCtZIQlyGGbos7tKJvr dz3OtMZl8+Ser2kM2yojt9s86g6ETuMGxYLpaknqxDtnd9KzQYg3FXgidZ9M2b1GX7PJzT BGw6IAGxICLIeONS0fztS4L/pX65omzT8/RlcmuZI7nK8OLAbn1oKkSdH/P37A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TpTkb6wnv/lUknBGp3V1DkZcCidQe2oW4xdxeJPvHQU=; b=LnaGjz0D2P80FZ/yXtlG1L1l3KnJxeUQwFgDTPJvtpWrD/OkYzjvoNN4Cq3/bdnkZsbRBG FwDApf7DkQBTKtJJI2F1gHwgIQaJH6vXvYReStq5v6pST8pW5RQFW5lg5pg4IROkDP2UDK IysvQgowY45r9gVBmPXh7U1qTPnzygXJ6luoSaQ34qChhEwsmsPifNPsFKJNvcNeokedxf Rvco1y8sSr2EPcJIH6VesBocJ9jOFAUGzveA3Gf1rbI986ut4XCkLgct/Wm7FOfJwQkGSj 5DLZiPebJQEzOLB0Lbw0HEDsR4j8tvMHnrow2TIshD+B0kClfvS/cDfR62yolQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692505703; a=rsa-sha256; cv=none; b=P9bapwJ41BGKc2wYltnb0EnoUYY2I1LZ1kTLWDGy7/95/WuRGe0MzE4Dxr7DZqFfZUjOkc CwBsb0ftCI1pUwAzvKjyE5YtZO+J4FuS/gU+7LcQ9fB42wKg/pEt/n7GZhxbVWSr8P8v0U K85YlJwJEifiCRbA2WnGKlGoQrsTQIDVRvvhbEyoMnqGoWVEK+2AGmdHnW3VzoBxONkWrS yKsS8FzBJt46LwFf9OuvH8/nFfLtlm2iS4L9sD5k/G7Iuwquz476pt214TDlSdWBoTjFWI 5YbTh6GpWlzNNu9TpS87KpH1RN4ptAI+qEv+vDPQhY+nKeR5V2ujI+84+lmZHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT2fb0nrNz9VY; Sun, 20 Aug 2023 04:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K4SNdw033532; Sun, 20 Aug 2023 04:28:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K4SNLc033529; Sun, 20 Aug 2023 04:28:23 GMT (envelope-from git) Date: Sun, 20 Aug 2023 04:28:23 GMT Message-Id: <202308200428.37K4SNLc033529@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: a11c97bb79e7 - stable/13 - Rate limit kernel UFS/FFS cylinder group check-hash 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a11c97bb79e7e0d7a175dc69f9c49fd2d52a3d11 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=a11c97bb79e7e0d7a175dc69f9c49fd2d52a3d11 commit a11c97bb79e7e0d7a175dc69f9c49fd2d52a3d11 Author: Kirk McKusick AuthorDate: 2023-08-09 00:10:07 +0000 Commit: Kirk McKusick CommitDate: 2023-08-20 04:27:38 +0000 Rate limit kernel UFS/FFS cylinder group check-hash error messages. Sponsored-by: The FreeBSD Foundation (cherry picked from commit 6dff61a1d1878ea5e9f6e5c36521b3f39cd34b33) --- sys/ufs/ffs/ffs_alloc.c | 58 +++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 44c07bb776b7..35c8662307c6 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -2991,15 +2991,6 @@ ffs_mapsearch(struct fs *fs, return (-1); } -static const struct statfs * -ffs_getmntstat(struct vnode *devvp) -{ - - if (devvp->v_type == VCHR) - return (&devvp->v_rdev->si_mountpt->mnt_stat); - return (ffs_getmntstat(VFSTOUFS(devvp->v_mount)->um_devvp)); -} - /* * Fetch and verify a cylinder group. */ @@ -3013,6 +3004,7 @@ ffs_getcg(struct fs *fs, { struct buf *bp; struct cg *cgp; + struct mount *mp; const struct statfs *sfs; daddr_t blkno; int error; @@ -3021,10 +3013,13 @@ ffs_getcg(struct fs *fs, *cgpp = NULL; if ((fs->fs_metackhash & CK_CYLGRP) != 0) flags |= GB_CKHASH; - if (devvp->v_type == VREG) - blkno = fragstoblks(fs, cgtod(fs, cg)); - else + if (devvp->v_type == VCHR) { blkno = fsbtodb(fs, cgtod(fs, cg)); + mp = devvp->v_rdev->si_mountpt; + } else { + blkno = fragstoblks(fs, cgtod(fs, cg)); + mp = devvp->v_mount; + } error = breadn_flags(devvp, blkno, blkno, (int)fs->fs_cgsize, NULL, NULL, 0, NOCRED, flags, ffs_ckhash_cg, &bp); if (error != 0) @@ -3033,28 +3028,35 @@ ffs_getcg(struct fs *fs, if ((fs->fs_metackhash & CK_CYLGRP) != 0 && (bp->b_flags & B_CKHASH) != 0 && cgp->cg_ckhash != bp->b_ckhash) { - sfs = ffs_getmntstat(devvp); - printf("UFS %s%s (%s) cylinder checksum failed: cg %ju, cgp: " - "0x%x != bp: 0x%jx\n", - devvp->v_type == VCHR ? "" : "snapshot of ", - sfs->f_mntfromname, sfs->f_mntonname, - (intmax_t)cg, cgp->cg_ckhash, (uintmax_t)bp->b_ckhash); + if (ppsratecheck(&VFSTOUFS(mp)->um_last_integritymsg, + &VFSTOUFS(mp)->um_secs_integritymsg, 1)) { + sfs = &mp->mnt_stat; + printf("UFS %s%s (%s) cylinder checkhash failed: " + "cg %ju, cgp: 0x%x != bp: 0x%jx\n", + devvp->v_type == VCHR ? "" : "snapshot of ", + sfs->f_mntfromname, sfs->f_mntonname, (intmax_t)cg, + cgp->cg_ckhash, (uintmax_t)bp->b_ckhash); + } bp->b_flags &= ~B_CKHASH; bp->b_flags |= B_INVAL | B_NOCACHE; brelse(bp); return (EIO); } if (!cg_chkmagic(cgp) || cgp->cg_cgx != cg) { - sfs = ffs_getmntstat(devvp); - printf("UFS %s%s (%s)", - devvp->v_type == VCHR ? "" : "snapshot of ", - sfs->f_mntfromname, sfs->f_mntonname); - if (!cg_chkmagic(cgp)) - printf(" cg %ju: bad magic number 0x%x should be " - "0x%x\n", (intmax_t)cg, cgp->cg_magic, CG_MAGIC); - else - printf(": wrong cylinder group cg %ju != cgx %u\n", - (intmax_t)cg, cgp->cg_cgx); + if (ppsratecheck(&VFSTOUFS(mp)->um_last_integritymsg, + &VFSTOUFS(mp)->um_secs_integritymsg, 1)) { + sfs = &mp->mnt_stat; + printf("UFS %s%s (%s)", + devvp->v_type == VCHR ? "" : "snapshot of ", + sfs->f_mntfromname, sfs->f_mntonname); + if (!cg_chkmagic(cgp)) + printf(" cg %ju: bad magic number 0x%x should " + "be 0x%x\n", (intmax_t)cg, cgp->cg_magic, + CG_MAGIC); + else + printf(": wrong cylinder group cg %ju != " + "cgx %u\n", (intmax_t)cg, cgp->cg_cgx); + } bp->b_flags &= ~B_CKHASH; bp->b_flags |= B_INVAL | B_NOCACHE; brelse(bp); From nobody Sun Aug 20 04:28: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 4RT2fc45jSz4qgnK; Sun, 20 Aug 2023 04:28: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 4RT2fc2VkTz4QR3; Sun, 20 Aug 2023 04:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=22oaC+6roPsVzgJSJ/IApTSDPj1WN7zD2nkjZektNek=; b=ea2nBLj4qE0BzM1f7zWTJ/Gd4RWBDWt8IzXDFzM1hLoQuArvnZzmneCqEIYRIKUdtXIv1m h44aBNnXIzwaxAuuRTjyQbzFv3Pnb2pmIXl0H0iZJCMdLFAsBfKLUDEqSvmpAG9cbF4KQJ iB+ShlpFurrPMkmiIX+kl7DsjQCK1ur7wRpqJCCNyfEO/KOVs+BFCXdUSbCSraF+cWdsj5 I96+5jbEdxY2fey5iy8NdhTeoU0iv92yZvxDBSWoEMh3NJ5hkzWxWAr1fyfX69+w4AkpVQ TnOOxB66DOy7d0CIEnVxYV0JBiPzGd/Tl8WHAhVwafnygZ04CgeAwB1wJgbSqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=22oaC+6roPsVzgJSJ/IApTSDPj1WN7zD2nkjZektNek=; b=GwRZsOonjTgDnjP3m10yJm0I8xoIhraJRhrEWdwlaH2c4Ih6Cd1AgScK7l+lYlzRBrGQ/i H0PmJGYmyH+fVf3pEZpy3cpfDIxQybh7aqqw+1nOjY0wqEwtiRFABzaSNJnEXJpLFfvta5 ptdTJ1IJtb7BwCy6GyCHzdAsk21f4RSYXPzZiFrUozIfsZKTokqywG3ijK4N/yb4z7K+qG v/Ne8aRGxQD9EfHK+nti8+vTNU8o8A7C1KUYblrj/5T8geKlAJPmuKNeTbZZU58AbxhBhH v1e/TRCvKRAdpVAg0kmhfgVF14KfB7fpHc7z5gxFclPU9Ag8r//J3z+upwV1Ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692505704; a=rsa-sha256; cv=none; b=M3GmbnQVYCDaVhkhvwtxZATphL22soDKOsxLT2M7yytPCygUY0+QEg+kJW3zajL81fBiAM f7bGWqBYkdpDKyhF9+Ps3MBu9o0akvNm3nouiWtDs+vX8o7PE0ACA8on6C9RWQvmtT6DsK MTYc2PtIsVeUFymSTqFcv9503OSPISXCt7Xt3A+tNNwIzZPUsq7b90NSlsQEZMWPg92Sl9 AjjUa9XOj2qggEeSbf9D/QVcmLr9pWVaZJ9uQceDv5SI4gwibbiUCpQP8zbCReLeYnPGRZ rmXwCk1YJn51qgg3Ad4UgAvkVeizuOP95bKROWeA9gWW3zIg8dtcWZFGEdpisQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT2fc1bzbz9kr; Sun, 20 Aug 2023 04:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K4SOR8033601; Sun, 20 Aug 2023 04:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K4SOqU033598; Sun, 20 Aug 2023 04:28:24 GMT (envelope-from git) Date: Sun, 20 Aug 2023 04:28:24 GMT Message-Id: <202308200428.37K4SOqU033598@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: 2d20a3178a72 - stable/13 - Remove a partial UFS/FFS snapshot if it fails to build successfully. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2d20a3178a72c84eb83816a3c6c98629bcb84c72 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=2d20a3178a72c84eb83816a3c6c98629bcb84c72 commit 2d20a3178a72c84eb83816a3c6c98629bcb84c72 Author: Kirk McKusick AuthorDate: 2023-08-09 23:43:41 +0000 Commit: Kirk McKusick CommitDate: 2023-08-20 04:27:38 +0000 Remove a partial UFS/FFS snapshot if it fails to build successfully. Reported-by: Peter Holm Tested-by: Peter Holm Sponsored-by: The FreeBSD Foundation (cherry picked from commit c52b5d16ccf29ad0e999a1f5f813ed6472aa3771) --- sys/ufs/ffs/ffs_snapshot.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index b606c64241e3..5ceca72fd44f 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -851,7 +851,6 @@ done: free(copy_fs, M_UFSMNT); copy_fs = NULL; out: - NDFREE(&nd, NDF_ONLY_PNBUF); if (saved_nice > 0) { struct proc *p; @@ -869,14 +868,30 @@ out: MNT_ILOCK(mp); mp->mnt_flag = (mp->mnt_flag & MNT_QUOTA) | (flag & ~MNT_QUOTA); MNT_IUNLOCK(mp); - if (error) - (void) ffs_truncate(vp, (off_t)0, 0, NOCRED); - (void) ffs_syncvnode(vp, MNT_WAIT, 0); - if (error) - vput(vp); - else - VOP_UNLOCK(vp); + NDFREE_PNBUF(&nd); vrele(nd.ni_dvp); + if (error == 0) { + (void) ffs_syncvnode(vp, MNT_WAIT, 0); + VOP_UNLOCK(vp); + } else if (VN_IS_DOOMED(vp)) { + vput(vp); + } else { + int rmerr; + + /* Remove snapshot as its creation has failed. */ + vput(vp); + NDINIT(&nd, DELETE, LOCKPARENT | LOCKLEAF, UIO_SYSSPACE, + snapfile, td); + if ((rmerr = namei(&nd)) != 0 || + (rmerr = VOP_REMOVE(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd)) != 0) + printf("Delete of %s failed with error %d\n", + nd.ni_dirp, rmerr); + NDFREE_PNBUF(&nd); + if (nd.ni_dvp != NULL) + vput(nd.ni_dvp); + if (nd.ni_vp != NULL) + vput(nd.ni_vp); + } vn_finished_write(wrtmp); process_deferred_inactive(mp); return (error); From nobody Sun Aug 20 04:28: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 4RT2fd5b6Vz4qgQ4; Sun, 20 Aug 2023 04:28: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 4RT2fd3PPmz4QLX; Sun, 20 Aug 2023 04:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PhncmVka/fkQSGl/VlhJ+gMkqAiuyll8QLWdiSz4rGc=; b=g0D0uG8rJh1bkKy+0COsL1hHGNWgb/oNiBWGQcTl5O20x0yHO/Q+X59FXb20daCWQU7HRJ prvKbkyEEF/ryyueUrQLYnqXyfrfxCDkAMt8PGXlxorO3mUv1L486cV1Oq4Z3JcGVGxLrb Lsq0cexNaSyQY9OMT0/EEBjXNne8YfYK/HC/3JQNYtMS9Li/p4k06J51H1WWFuJU3RrkI4 ssYKWhoHQ15+VzletwVfdjp2QU3Lz10vl7bSKH4h95d2AS9kxENaRgr9QVOFsEHa2YfLLy B28thcrx/AfOPkFxByTYXdZSCqr/C+BPWhE1ZWYuPz/RkJqkyuYGE4LwYSAr+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PhncmVka/fkQSGl/VlhJ+gMkqAiuyll8QLWdiSz4rGc=; b=bhIYjCMyc7qpT23JdkyaRmIfFZ/zZoiWmBA06kbk51CqnBXl4LjVff9u6fJdgqAx7sXE5z Ix+lwOK3rL3V5GsWiL6tcAU4tlCXmu1YwHuvwYVG43+XjnUN0psbvXjXI4mnU+hsjXcaFL qaUVJPH5txCYIErEbBUN+gPF8EZewbEEovAidHOzsxrVnnIiIpXPJbV9yJbA3Se4mChoXV TE/CGATBcxzEpYXnROGUCiJ4zNQD22hCwNGXOKlZhrk5F2BtL2McCaITMeK3XOUFPqGPu2 ES2zU/yBGQc68jV3B3PTNuJGJzW+o6JPN1ogvF3Rn7sAKDFf1WxX8xhSyC73cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692505705; a=rsa-sha256; cv=none; b=NpO4LziWiMDIaPTkJsllFlfsGVNE3KiOph48OdT9zt0vVuuGY51izTPNwc2WTIhqV9iLeD PBcBvkNnRwaJWzwuxEbcLRG2lFaE+yQtLaq5d4JOEu3VhgaqO8ksiQMcvvWGZzDcObbToJ PYS/ulf9X3MLQVZRc0tWa7HitHM1waXzk14z+g5Ms6aMLypIPwJ7BG0gO1dX7WFPrKzO0Y bgwNMQAyPmEa/k1WEeFj6myZRhBKCqaUAy7Olm6z6PJq6RVOFS10YY0ty6GXMmZiXtXaRI NUXgSmg+1Ziy8zEvvaWmJIElRWRzNzA2JQAKF2jXo3XdnFUIFn5vgP5PDrnT4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT2fd2W7Nz9vm; Sun, 20 Aug 2023 04:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K4SPS9033654; Sun, 20 Aug 2023 04:28:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K4SPr7033651; Sun, 20 Aug 2023 04:28:25 GMT (envelope-from git) Date: Sun, 20 Aug 2023 04:28:25 GMT Message-Id: <202308200428.37K4SPr7033651@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: c1854e43b352 - stable/13 - Clean up and document UFS/FFS error returns. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c1854e43b352d7b3fe3a861302d18d729cf8dced Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=c1854e43b352d7b3fe3a861302d18d729cf8dced commit c1854e43b352d7b3fe3a861302d18d729cf8dced Author: Kirk McKusick AuthorDate: 2023-08-11 00:50:23 +0000 Commit: Kirk McKusick CommitDate: 2023-08-20 04:27:38 +0000 Clean up and document UFS/FFS error returns. Sponsored-by: The FreeBSD Foundation (cherry picked from commit 886fd36e1ac2082f1b0decb89d70e1e7a0dc3043) --- sys/ufs/ffs/ffs_vfsops.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 23d0c9bc60df..bdb3fadb84ea 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -820,7 +820,7 @@ ffs_reload(struct mount *mp, int flags) newfs->fs_bsize > MAXBSIZE || newfs->fs_bsize < sizeof(struct fs)) { brelse(bp); - return (EIO); /* XXX needs translation */ + return (EINTEGRITY); } /* * Preserve the summary information, read-only status, and @@ -2079,6 +2079,11 @@ ffs_fhtovp(struct mount *mp, struct fid *fhp, int flags, struct vnode **vpp) vpp, 0)); } +/* + * Return a vnode from a mounted filesystem for inode with specified + * generation number. Return ESTALE if the inode with given generation + * number no longer exists on that filesystem. + */ int ffs_inotovp(struct mount *mp, ino_t ino, @@ -2094,7 +2099,6 @@ ffs_inotovp(struct mount *mp, struct cg *cgp; struct buf *bp; uint64_t cg; - int error; ump = VFSTOUFS(mp); fs = ump->um_fs; @@ -2109,9 +2113,8 @@ ffs_inotovp(struct mount *mp, */ if (fs->fs_magic == FS_UFS2_MAGIC) { cg = ino_to_cg(fs, ino); - error = ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp); - if (error != 0) - return (error); + if (ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp) != 0) + return (ESTALE); if (ino >= cg * fs->fs_ipg + cgp->cg_initediblk) { brelse(bp); return (ESTALE); @@ -2119,9 +2122,8 @@ ffs_inotovp(struct mount *mp, brelse(bp); } - error = ffs_vgetf(mp, ino, lflags, &nvp, ffs_flags); - if (error != 0) - return (error); + if (ffs_vgetf(mp, ino, lflags, &nvp, ffs_flags) != 0) + return (ESTALE); ip = VTOI(nvp); if (ip->i_mode == 0 || ip->i_gen != gen || ip->i_effnlink <= 0) { From nobody Sun Aug 20 04:28: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 4RT2ff4bTLz4qgnN; Sun, 20 Aug 2023 04:28: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 4RT2ff3p5Rz4QXC; Sun, 20 Aug 2023 04:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yHtjcwVAkuCuYZmAoennhMXZsZcLnKEsoX5sY/z+Cn4=; b=w1iY+Rz2Pelg52v5IzNe8HsYLV7hDb+LiIYd1tKfQbpIspXVrPvJpr3rBCv2aEJoxrQp15 F7AuKlmcgnh6U3A0O44IJdp4WCvihvk/hnI+nJrGMMymNQIDKhVoW3zNi+X9rb2r+gP0p0 4KhIdH6AJqeKOkO+wR570Jg0wkQH1KN54gt/uQ6t+rASgPzNA/gKaSeI3U5Dh1BkMQYk2J yxabNkcnhTgYJcS1+Y7KskXvNrpVZM0HUib6sD/T04i0BIl09Dl/75hXPIJBvrZZbaOPWg IeBTz9lJLET8JMpHNlKIuBeXab+hSpv+JrO/UGRQVpffiNt6feiW/IO9N5HwRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yHtjcwVAkuCuYZmAoennhMXZsZcLnKEsoX5sY/z+Cn4=; b=kcsPzGObBG4HLUGAG9hTqZMy6olv32LC1c/3q4TLT7pAKCE2AwPa4TNEAQLdaPeD9N0IZK w+iIh3R3FRAbEO7ksKz7oNGyfU5QGDh8jm+RxNdLsbChRlyCCC5cne8AN+6suZDGq3AJ8x x6Uewp8pzj+daTVTlBaSwC3lnBgu2elS8fNLO1krtNMuwCIRSWeoytluILX5AVr9nbzb0w 9BId/6ejw3iNX4HQQY4fpDoMLcbvAGiFuSd5nWznrRsH5YkyUzxhEbkD+mubSubY24MYxo xM38t182xyZPr2JpvGHUkLRtpjbReS46HFKex1ldeAToDKe5KKSnEqvkm4/hKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692505706; a=rsa-sha256; cv=none; b=EHhyrrZ0pVIgFwd1dvUsUkFZHeZ2CJIQYfqkyzUvkrrYFXwp+sY08MSgD++HKNl8QX096e Gg5jFa0kSs0WRwNWJgIBycNeYXvFDWGSgJczXN7BHokMQq8DCEZQm0TE3gZkQbHCLt07yh 6f6Y1GosLShUvPUDbJbKcGhyUtWSjXbyK6fjXhz6iFGrPHxJj5rS4RYJE/HP8hAJ1KpitA IYvvdCZE/MPr/iDGGrwBRTQEFISimmPP/DR5zX3nDOBg8jXL/DOGUDjpIBkzbXb57r0bHU PTUy8hBsh1e/e1cYTFGT6WTt0rkAJ/ZkJQBIyZb30891GSyAxzvS9rOhRVJhNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT2ff2v0hz94g; Sun, 20 Aug 2023 04:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K4SQvP033693; Sun, 20 Aug 2023 04:28:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K4SQB1033690; Sun, 20 Aug 2023 04:28:26 GMT (envelope-from git) Date: Sun, 20 Aug 2023 04:28:26 GMT Message-Id: <202308200428.37K4SQB1033690@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: 7f65ff3d8854 - stable/13 - Cleanups to UFS/FFS ffs_checkblk(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 7f65ff3d8854026cce3428eab1ec9afedf1112a8 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=7f65ff3d8854026cce3428eab1ec9afedf1112a8 commit 7f65ff3d8854026cce3428eab1ec9afedf1112a8 Author: Kirk McKusick AuthorDate: 2023-08-11 05:38:56 +0000 Commit: Kirk McKusick CommitDate: 2023-08-20 04:27:38 +0000 Cleanups to UFS/FFS ffs_checkblk(). No functional change intended. Sponsored-by: The FreeBSD Foundation (cherry picked from commit 677023529d6a46da52ed780eb299c6754a75f6ef) --- sys/ufs/ffs/ffs_alloc.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 35c8662307c6..04dbfd90dee4 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -114,7 +114,7 @@ static void ffs_blkfree_cg(struct ufsmount *, struct fs *, struct vnode *, ufs2_daddr_t, long, ino_t, struct workhead *); #ifdef INVARIANTS -static int ffs_checkblk(struct inode *, ufs2_daddr_t, long); +static int ffs_checkfreeblk(struct inode *, ufs2_daddr_t, long); #endif static ufs2_daddr_t ffs_clusteralloc(struct inode *, uint64_t, ufs2_daddr_t, int); @@ -600,7 +600,7 @@ ffs_reallocblks_ufs1( end_lbn = start_lbn + len - 1; #ifdef INVARIANTS for (i = 0; i < len; i++) - if (!ffs_checkblk(ip, + if (!ffs_checkfreeblk(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 1"); for (i = 1; i < len; i++) @@ -721,7 +721,7 @@ ffs_reallocblks_ufs1( soff = -i; } #ifdef INVARIANTS - if (!ffs_checkblk(ip, + if (!ffs_checkfreeblk(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 2"); if (dbtofsb(fs, buflist->bs_children[i]->b_blkno) != *bap) @@ -804,7 +804,8 @@ ffs_reallocblks_ufs1( NOTRIM_KEY : SINGLETON_KEY); bp->b_blkno = fsbtodb(fs, blkno); #ifdef INVARIANTS - if (!ffs_checkblk(ip, dbtofsb(fs, bp->b_blkno), fs->fs_bsize)) + if (!ffs_checkfreeblk(ip, dbtofsb(fs, bp->b_blkno), + fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 3"); #endif #ifdef DIAGNOSTIC @@ -865,7 +866,7 @@ ffs_reallocblks_ufs2( end_lbn = start_lbn + len - 1; #ifdef INVARIANTS for (i = 0; i < len; i++) - if (!ffs_checkblk(ip, + if (!ffs_checkfreeblk(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 1"); for (i = 1; i < len; i++) @@ -985,7 +986,7 @@ ffs_reallocblks_ufs2( soff = -i; } #ifdef INVARIANTS - if (!ffs_checkblk(ip, + if (!ffs_checkfreeblk(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 2"); if (dbtofsb(fs, buflist->bs_children[i]->b_blkno) != *bap) @@ -1068,7 +1069,8 @@ ffs_reallocblks_ufs2( NOTRIM_KEY : SINGLETON_KEY); bp->b_blkno = fsbtodb(fs, blkno); #ifdef INVARIANTS - if (!ffs_checkblk(ip, dbtofsb(fs, bp->b_blkno), fs->fs_bsize)) + if (!ffs_checkfreeblk(ip, dbtofsb(fs, bp->b_blkno), + fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 3"); #endif #ifdef DIAGNOSTIC @@ -2285,7 +2287,7 @@ ffs_blkfree_cg(struct ufsmount *ump, printf("dev=%s, bno = %jd, bsize = %ld, size = %ld, fs = %s\n", devtoname(dev), (intmax_t)bno, (long)fs->fs_bsize, size, fs->fs_fsmnt); - panic("ffs_blkfree_cg: bad size"); + panic("ffs_blkfree_cg: invalid size"); } #endif if ((uint64_t)bno >= fs->fs_size) { @@ -2748,11 +2750,11 @@ ffs_blkfree(struct ufsmount *ump, #ifdef INVARIANTS /* - * Verify allocation of a block or fragment. Returns true if block or - * fragment is allocated, false if it is free. + * Verify allocation of a block or fragment. + * Return 1 if block or fragment is free. */ static int -ffs_checkblk(struct inode *ip, +ffs_checkfreeblk(struct inode *ip, ufs2_daddr_t bno, long size) { @@ -2760,34 +2762,34 @@ ffs_checkblk(struct inode *ip, struct cg *cgp; struct buf *bp; ufs1_daddr_t cgbno; - int i, error, frags, free; + int i, error, frags, blkalloced; uint8_t *blksfree; fs = ITOFS(ip); if ((uint64_t)size > fs->fs_bsize || fragoff(fs, size) != 0) { printf("bsize = %ld, size = %ld, fs = %s\n", (long)fs->fs_bsize, size, fs->fs_fsmnt); - panic("ffs_checkblk: bad size"); + panic("ffs_checkfreeblk: bad size"); } if ((uint64_t)bno >= fs->fs_size) - panic("ffs_checkblk: bad block %jd", (intmax_t)bno); + panic("ffs_checkfreeblk: too big block %jd", (intmax_t)bno); error = ffs_getcg(fs, ITODEVVP(ip), dtog(fs, bno), 0, &bp, &cgp); if (error) - panic("ffs_checkblk: cylinder group read failed"); + panic("ffs_checkfreeblk: cylinder group read failed"); blksfree = cg_blksfree(cgp); cgbno = dtogd(fs, bno); if (size == fs->fs_bsize) { - free = ffs_isblock(fs, blksfree, fragstoblks(fs, cgbno)); + blkalloced = ffs_isblock(fs, blksfree, fragstoblks(fs, cgbno)); } else { frags = numfrags(fs, size); - for (free = 0, i = 0; i < frags; i++) + for (blkalloced = 0, i = 0; i < frags; i++) if (isset(blksfree, cgbno + i)) - free++; - if (free != 0 && free != frags) - panic("ffs_checkblk: partially free fragment"); + blkalloced++; + if (blkalloced != 0 && blkalloced != frags) + panic("ffs_checkfreeblk: partially free fragment"); } brelse(bp); - return (!free); + return (blkalloced == 0); } #endif /* INVARIANTS */ From nobody Sun Aug 20 04:28: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 4RT2fg6Dbbz4qgsW; Sun, 20 Aug 2023 04:28: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 4RT2fg57Hdz4QlC; Sun, 20 Aug 2023 04:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XI7AmTnWidvSpT3qL5NUhUdqAJuP5UUDx7Bi/YCIwDQ=; b=AXo6sQlEF3H9HT38BhL2kH6cXcM/mYOvZvXVCFVZhCKF2Sh3MSQsTzA0ETsyfRO/j/fwda bz2ZW7nGbY042tnRrJF7zRU9yur+AeuqBxmP8pH0FiIrhl/CrxWfFrzig1WT7rdspsUDNR ZV6Hrk/9CVO6NOl6WxKJp6xnV0aEWSxriZQL9yRMA/Ztj0o6lbVhbMfoVCqmb75Br2o9Fu AO9+jKsy7XIJ+ARjigFRa8sa/r4W6KcUGRhj+4TP05xAr/rmQNi1HMfS76xMY7UdPSROEq WPlTvn2zWk7y/spo4mlFNQ86fIQC49c7OYfimayBTd9tWNyp0F85FPTnt6F+Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XI7AmTnWidvSpT3qL5NUhUdqAJuP5UUDx7Bi/YCIwDQ=; b=s/GZwZLjxfhg2pnlkV1DnrIJuY4CRWU5GxAJ1zZ+po78Dv0zL2udk/J4fcFMziDp38xdzc 5QR8ofAzqmD19i2OZ9ZBsYJgbo2sUjwDHsQO26q6DC/VUqhqCPcnaWFKa4nj7o36+BJgfZ Qs3ALeVxBFV6IglnKb0WONMdkBd0OYQ58Bsh6XjEDqqlk5gD35V7l4wVF89Z/vscUyhZwA LcVeHqGKdFCPBkmwGGaz6uXXD63QcyPRHj17Xp48qaUK1r4s++RwPXA4p1VpG5GRmZ/cQ+ 8Ibc6tgSIZjdym9VAr1eZJCjTuUrlXVOzTiZ/0/DANSiZaDuCaap0qPahC78Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692505707; a=rsa-sha256; cv=none; b=HZYZItjtMSlYLpkoWFq8sji3qEctpqxzOWRtIYZRvASV6l9b6zkCTsn6NQCVPlSisPllWp UQAmDaMfkZNP9FujJ5grLKRYChURj9/+Vy9RVpvnNKX3nvUZofjYYX2jgXhXv6CCMTZC5e gvRGEBrAwl35YXTYJmlVN3RQ5kPXLjgHWks5aju5Qfnt0g4jwL8k8HUPQ1qspNGRxO/nGS i0Rs8lI3mb0PWUm9+nYNV1RzoKPuWFEFS/tLo3ytPcfWn1aG0PiT4i7GM/DwGum2vZ0cDP K/Ztw553jawxdveh9/Ti1w54XrL+aOCZcspp/jQI9v2ov8z1mGXkrT4yqxu18w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT2fg4F5xz9Gl; Sun, 20 Aug 2023 04:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K4SRJI033747; Sun, 20 Aug 2023 04:28:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K4SR8Y033744; Sun, 20 Aug 2023 04:28:27 GMT (envelope-from git) Date: Sun, 20 Aug 2023 04:28:27 GMT Message-Id: <202308200428.37K4SR8Y033744@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: 817bac9a6327 - stable/13 - Optimize operations on UFS/FFS filesystems with bad cylinder group(s). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 817bac9a632745535febf2dc3489e038c540fc55 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=817bac9a632745535febf2dc3489e038c540fc55 commit 817bac9a632745535febf2dc3489e038c540fc55 Author: Kirk McKusick AuthorDate: 2023-08-11 06:02:47 +0000 Commit: Kirk McKusick CommitDate: 2023-08-20 04:27:38 +0000 Optimize operations on UFS/FFS filesystems with bad cylinder group(s). Reported-by: Peter Holm Tested-by: Peter Holm Sponsored-by: The FreeBSD Foundation (cherry picked from commit c3046779b241768394a336de115e88cc7c10d922) --- sys/ufs/ffs/ffs_alloc.c | 53 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 04dbfd90dee4..a84202eccc05 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -116,6 +116,7 @@ static void ffs_blkfree_cg(struct ufsmount *, struct fs *, #ifdef INVARIANTS static int ffs_checkfreeblk(struct inode *, ufs2_daddr_t, long); #endif +static void ffs_checkcgintegrity(struct fs *, uint64_t, int); static ufs2_daddr_t ffs_clusteralloc(struct inode *, uint64_t, ufs2_daddr_t, int); static ino_t ffs_dirpref(struct inode *); @@ -1722,8 +1723,10 @@ ffs_fragextend(struct inode *ip, return (0); } UFS_UNLOCK(ump); - if ((error = ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp)) != 0) + if ((error = ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp)) != 0) { + ffs_checkcgintegrity(fs, cg, error); goto fail; + } bno = dtogd(fs, bprev); blksfree = cg_blksfree(cgp); for (i = numfrags(fs, osize); i < frags; i++) @@ -1793,8 +1796,10 @@ ffs_alloccg(struct inode *ip, return (0); UFS_UNLOCK(ump); if ((error = ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp)) != 0 || - (cgp->cg_cs.cs_nbfree == 0 && size == fs->fs_bsize)) + (cgp->cg_cs.cs_nbfree == 0 && size == fs->fs_bsize)) { + ffs_checkcgintegrity(fs, cg, error); goto fail; + } if (size == fs->fs_bsize) { UFS_LOCK(ump); blkno = ffs_alloccgblk(ip, bp, bpref, rsize); @@ -1971,6 +1976,7 @@ ffs_clusteralloc(struct inode *ip, return (0); UFS_UNLOCK(ump); if ((error = ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp)) != 0) { + ffs_checkcgintegrity(fs, cg, error); UFS_LOCK(ump); return (0); } @@ -2115,6 +2121,7 @@ check_nifree: return (0); UFS_UNLOCK(ump); if ((error = ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp)) != 0) { + ffs_checkcgintegrity(fs, cg, error); UFS_LOCK(ump); return (0); } @@ -2762,7 +2769,7 @@ ffs_checkfreeblk(struct inode *ip, struct cg *cgp; struct buf *bp; ufs1_daddr_t cgbno; - int i, error, frags, blkalloced; + int i, frags, blkalloced; uint8_t *blksfree; fs = ITOFS(ip); @@ -2773,9 +2780,8 @@ ffs_checkfreeblk(struct inode *ip, } if ((uint64_t)bno >= fs->fs_size) panic("ffs_checkfreeblk: too big block %jd", (intmax_t)bno); - error = ffs_getcg(fs, ITODEVVP(ip), dtog(fs, bno), 0, &bp, &cgp); - if (error) - panic("ffs_checkfreeblk: cylinder group read failed"); + if (ffs_getcg(fs, ITODEVVP(ip), dtog(fs, bno), 0, &bp, &cgp) != 0) + return (0); blksfree = cg_blksfree(cgp); cgbno = dtogd(fs, bno); if (size == fs->fs_bsize) { @@ -3042,7 +3048,7 @@ ffs_getcg(struct fs *fs, bp->b_flags &= ~B_CKHASH; bp->b_flags |= B_INVAL | B_NOCACHE; brelse(bp); - return (EIO); + return (EINTEGRITY); } if (!cg_chkmagic(cgp) || cgp->cg_cgx != cg) { if (ppsratecheck(&VFSTOUFS(mp)->um_last_integritymsg, @@ -3062,7 +3068,7 @@ ffs_getcg(struct fs *fs, bp->b_flags &= ~B_CKHASH; bp->b_flags |= B_INVAL | B_NOCACHE; brelse(bp); - return (EIO); + return (EINTEGRITY); } bp->b_flags &= ~B_CKHASH; bp->b_xflags |= BX_BKGRDWRITE; @@ -3096,6 +3102,37 @@ ffs_ckhash_cg(struct buf *bp) cgp->cg_ckhash = ckhash; } +/* + * Called when a cylinder group read has failed. If an integrity check + * is the cause of failure then the cylinder group will not be usable + * until the filesystem has been unmounted and fsck has been run to + * repair it. To avoid future attempts to allocate resources from the + * cylinder group, its available resources are set to zero in the + * superblock summary information. Since it will appear to have no + * resources available, no further calls will be made to allocate + * resources from it. When resources are freed to the cylinder group + * the resource free routines will find the cylinder group unusable so + * the resource will simply be discarded and thus will not show up in + * the superblock summary information until they are recovered by fsck. + */ +static void +ffs_checkcgintegrity(struct fs *fs, + uint64_t cg, + int error) +{ + + if (error != EINTEGRITY) + return; + fs->fs_cstotal.cs_nffree -= fs->fs_cs(fs, cg).cs_nffree; + fs->fs_cs(fs, cg).cs_nffree = 0; + fs->fs_cstotal.cs_nbfree -= fs->fs_cs(fs, cg).cs_nbfree; + fs->fs_cs(fs, cg).cs_nbfree = 0; + fs->fs_cstotal.cs_nifree -= fs->fs_cs(fs, cg).cs_nifree; + fs->fs_cs(fs, cg).cs_nifree = 0; + fs->fs_maxcluster[cg] = 0; + fs->fs_fmod = 1; +} + /* * Fserr prints the name of a filesystem with an error diagnostic. * From nobody Sun Aug 20 04:28: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 4RT2fj0Nnqz4qgvL; Sun, 20 Aug 2023 04:28: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 4RT2fh6RJYz4Qbc; Sun, 20 Aug 2023 04:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HRt0JbaHYx7zaQYoS3Fq7ZhlonnYgwzUgiZqCDZBE1A=; b=CB7F2CTNwfRuP6k8iAZL/iJn4ncT37KExxJFNKSVZIS3VRjkiAqfGitRPBg2kGRM2HphGc 4X+AMjJd+zV5jCGtZU7mE9fxgUaDoKbIyeIVmeeuAtF43QhjaDb+eN3YCYmkVJ8cIXn06a V+gWOq0I/3Txrsne6SFi6to3v5MxuYdMD9vYd8/ajNQvJJlkA3ilWnz0cw87gdi28T+JGS xHjcY9Im2ie29nwDq0Ytbn97AtXbrquv9jwC+rOcWS6we8QBcnAxBc32NUIuCQIecNn+FN tzycZHSFlEZ1/SVWN9XFHZEfEj63AOtDOp4H6IB7sGTNrnVSVtEp9EygBXNO8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HRt0JbaHYx7zaQYoS3Fq7ZhlonnYgwzUgiZqCDZBE1A=; b=msQLHl7shNl+HpYIAqeHhk//Sldc2j+ldXa+SnEATelIv687Pw7AwyLFHwcukRbSiLpKvh X0pC5bEy6IO2mnBQc2/cuF4vf+OxrVrf9SNwQ4mXxV3lvjr98f3C18M6ffQERyZbYhASa1 pLjE4tL32OIcvOF0duMgY3UZphiEBlVYYF94yTgIMVLo5pK7u68cSnlbQ7P7aK+TbXFbd0 /PfbempaqWBKeEi5fqVqcSFFZ/oxhQHGy8i58oITGVQgORj4N5C7MfCIqo7XllIcaVeJqQ y+kOED7ly7f5dQckCkA6Qda2l7ZpIGkBCj21cyC5JpMLEinPxVKOe0SW/0oElA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692505708; a=rsa-sha256; cv=none; b=Jj1VSMw1MDic0HCujvBaAXw95NtCwX9MZnowVfk3dchuJaYYCtsnxmLdjhWYFYCrMa22YK /tcJw/sR/Zr4bfioCAgPIk6NxYiTrtIGV2ATJHxUdyAwWBNjAZae7eoQEiG6QQZvtjU+ax G68LAMw9w9MZqa0HgK/XjY8ea4/h4kmLGb+VUTv5pb1HksiJMUcreAFTEhvK5sKycPUkmD OJ5KBVgrlExP0OVSrGxD6r+jetedbZvzrQBphTtnIp3SYh1QLVhtL4fxvhlW6KvABSLcUz kbAH3v2OwptSceUWKnaTTii3SIeVcBRa4vGx/7MWbao/TEVo0ohGXK0QGYO3oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT2fh5Rhnz9Gm; Sun, 20 Aug 2023 04:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K4SS1k033807; Sun, 20 Aug 2023 04:28:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K4SSRW033804; Sun, 20 Aug 2023 04:28:28 GMT (envelope-from git) Date: Sun, 20 Aug 2023 04:28:28 GMT Message-Id: <202308200428.37K4SSRW033804@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: 47048a611dd2 - stable/13 - Set UFS/FFS file type to snapshot before changing its block pointers. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 47048a611dd2606fe93dd59ca9e3f7ec5d756390 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=47048a611dd2606fe93dd59ca9e3f7ec5d756390 commit 47048a611dd2606fe93dd59ca9e3f7ec5d756390 Author: Kirk McKusick AuthorDate: 2023-08-12 18:20:08 +0000 Commit: Kirk McKusick CommitDate: 2023-08-20 04:27:38 +0000 Set UFS/FFS file type to snapshot before changing its block pointers. Reported-by: Peter Holm Tested-by: Peter Holm Sponsored-by: The FreeBSD Foundation (cherry picked from commit 220427da0e9b2c1d8e964120becc17eb7524e46f) --- sys/ufs/ffs/ffs_alloc.c | 1 + sys/ufs/ffs/ffs_snapshot.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index a84202eccc05..933745885755 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -3130,6 +3130,7 @@ ffs_checkcgintegrity(struct fs *fs, fs->fs_cstotal.cs_nifree -= fs->fs_cs(fs, cg).cs_nifree; fs->fs_cs(fs, cg).cs_nifree = 0; fs->fs_maxcluster[cg] = 0; + fs->fs_flags |= FS_NEEDSFSCK; fs->fs_fmod = 1; } diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index 5ceca72fd44f..b7844e0564d0 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -368,6 +368,15 @@ restart: goto out; } } + /* + * Change inode to snapshot type file. Before setting its block + * pointers to BLK_SNAP and BLK_NOCOPY in cgaccount, we have to + * set its type to SF_SNAPSHOT so that VOP_REMOVE will know that + * they need to be rolled back before attempting deletion. + */ + ip->i_flags |= SF_SNAPSHOT; + DIP_SET(ip, i_flags, ip->i_flags); + UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); /* * Copy all the cylinder group maps. Although the * filesystem is still active, we hope that only a few @@ -393,12 +402,6 @@ restart: if (error) goto out; } - /* - * Change inode to snapshot type file. - */ - ip->i_flags |= SF_SNAPSHOT; - DIP_SET(ip, i_flags, ip->i_flags); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); /* * Ensure that the snapshot is completely on disk. * Since we have marked it as a snapshot it is safe to From nobody Sun Aug 20 04:47: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 4RT34P6Vg1z4qhTV; Sun, 20 Aug 2023 04:47:17 +0000 (UTC) (envelope-from rpokala@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 4RT34P5wLbz4T64; Sun, 20 Aug 2023 04:47:17 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692506837; 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=p4HAFOgEtyROgAVG6sACaCmMc2ugjiz0Ub2J1inmuHA=; b=Z+baEjndAAExMb8RlRzeGFq3Y4wUuvQiWSmjj02PAsc7JtXgr8+EuZ55SUPtRyuLYS9yfc /uF5NB4cjPmGbmiRdOTI1xEtlUJfRATQUDJ5ZzvRW4xNaO3++itSJgkYCmkLTI6mgGdjKE X3e75pKlvodq9QemmHtcfgjyNCAyhw6X8bBTEY4gDvnXOW7Hh9eC01NrliXcs4ab8RGgAr AyNt2sImVGUg/Xj5amELIoJOGnxaghDnHDVUf5RrdfnjH5ZEl34ybKvwklAAnxXO1Xvhtz n0XrcG9BgempfYaxVp4nCgIyAvKPOMD5M/gcSHaA/tFTauiQ6SvXTO1iOPEc9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692506837; 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=p4HAFOgEtyROgAVG6sACaCmMc2ugjiz0Ub2J1inmuHA=; b=ZZE4lw5vsCJnL8F0Fc+PlejXah+XjJNCs7zHziV8ZCqpdwOYF37DnCXz4ZfJ6CP3LIPyjj 716Bd/nCCCXibT5FiVwbx6m9d2iQqm6BiNS11Y4Cz3AoEbYS9znFlhOilctBpmTZQpIx3P 3BOn1ElLCSUSB23oeLgvOeejlCoEk6Ld8diWQ5Lss6flqDCCfTZ6xi8SNa9b+hfEDWbomg NozQLWiroH+ckI/1D6TzGD66hDrupiz/P81F1wz4o0nDBE54DO9pg87/Zp2KCgy2URQp+F XW91DqL0DYcT7XMe8ynagYyC1g9JXxMfiDiNtsEW2uGTCt5qbpZ6463BePnydg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692506837; a=rsa-sha256; cv=none; b=lTcfHCNlDjnPqvnXQPXKGQqi+iRROOLnmaRRDvGIFEVVf5cxM1jRYcKzHdioBePep7fHGu zDAwb9uhgb2rNHh0yzMXfN2ZLlXeaYDtr/WH8h8iypyxRc77TF9++bL9JSHiiLH378is2A ObKjuALnRzlNoso1x7jReRyNyvp0Lsufse+I4Byx7Q5q+iPJLsTkchNyPJD7Z3XpB5YAUA npExCGTDIehENcD6KfT0A7nyTm+LEygULPdxHrBx7G1r1hCthBusGFLszPBVVrXszWxRyH GH5GsmwcDoWAYDuO6sdg/p8cVgGqpcxN9TJMdhC07v9MHgpNNEfnsciFUyVovQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.1.12] (unknown [IPv6:2601:646:a280:c250:b974:32b9:54:b933]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RT34P0lB8z10HH; Sun, 20 Aug 2023 04:47:17 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.75.23072301 Date: Sat, 19 Aug 2023 21:47:10 -0700 Subject: Re: edacf4b4824a - main - UPDATING: fix a typo, adjust a white space From: Ravi Pokala To: Alexey Dokuchaev , Graham Perrin CC: , , Message-ID: <892EAD83-FCB9-4885-A5AC-00057E0C8577@panasas.com> Thread-Topic: edacf4b4824a - main - UPDATING: fix a typo, adjust a white space References: <202308181700.37IH0WZT094403@gitrepo.freebsd.org> In-Reply-To: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@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 No, there was definitely a typo: "chagned" is not a word in English. As for the white space, that's a different issue, and I'm staying away from= that bikeshed. -Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: > on behalf of Alexey Dokuchaev > Date: Saturday, August 19, 2023 at 20:04 To: Graham Perrin > Cc: >, >, > Subject: Re: git: edacf4b4824a - main - UPDATING: fix a typo, adjust a whit= e space On Fri, Aug 18, 2023 at 05:00:32PM +0000, Graham Perrin wrote: > commit edacf4b4824af3630a953eb1080baf9c46f176de >=20 > UPDATING: fix a typo, adjust a white space >=20 > diff --git a/UPDATING b/UPDATING > index 705ca6431a32..b818d4dc8d29 100644 > --- a/UPDATING > +++ b/UPDATING > @@ -34,7 +34,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: > configuration. >=20 > Note that the early x86 BIOS bootloader (i.e., boot0sio) does not > - support rates above 9600 bps and is not chagned. boot0sio users may > + support rates above 9600 bps and is not changed. boot0sio users may There's no typo. We prefer to format texts designed to be viewed on the terminal screen using double spaces between sentenses because they look better with monospaced fonts. We're not enforcing this, but at least we should not pessimize existing formatting when it's correct. ./danfe From nobody Sun Aug 20 05:03: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 4RT3Qz2njwz4qjWJ for ; Sun, 20 Aug 2023 05:03:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RT3Qz2LYKz4VPT for ; Sun, 20 Aug 2023 05:03:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-523bf06f7f8so2653404a12.1 for ; Sat, 19 Aug 2023 22:03:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692507802; x=1693112602; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=kxsDEiHrrmfUhBLmXzucgwtc1KYo8Tes2CqBdwf49/E=; b=jd5KvDc37xxsceW5/+N/IWPZV7Yh9YxsLZmlABqIdV6arTgGELbl9q8YKH5TzLP3xw BtqujoBllNbsHrHMFgQHOG3DOVmOzCfFWWJ9GV1LNPgunRU8scK00N4g3+GWwnRjqXxJ NoE32+Rl6gzfPKrKBspIhT0YF9uZvoxzB7Siggl8HWGmG55gwHMIfH0Hyw/+u2poxDlX dbEzYLogccDXcHd3rqWVA/l7F7ZfE/fEFRpreVy0YIrItgeLo+L9h4tpIZamNgnihBVo diQ82zq+FxhMnR4BMJQ497zUQRYmvXH1sWZsGTFAtR6pma25CN5MCjN32kQJZu/dh0yq adPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692507802; x=1693112602; 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=kxsDEiHrrmfUhBLmXzucgwtc1KYo8Tes2CqBdwf49/E=; b=LsmnMrhVX/XK6sw/bf8meNUZrPswdAodv/tcV3H05O/xhOdd77itkHCLqTCDs6oMVK DbYaQ9gcths0RZpp8MFSRf38ta+Gf1hHe0UDmHFlqm+bPQIJUs2WhtYoX6+P09qy0vGR 2nWsYtCLe+U8XFdJI9J1FLVeeZdR1JKd7NNgTqv+F7Is7YUq5N/PBiJLLtUtz+o9tuWo 9ek/yAKwLcWZyeVRQkdFWjoW4Ki9kDbE44UkJGAE325GQt6oXeKYFyHxwJyerfbzaG9Z O1147Z39HkK5KdteMEJk9UYhjxQ/4YTCuQucioLInRX+dz0WC6mzvVeGbcowP1qVTp04 HUOw== X-Gm-Message-State: AOJu0YxMKb/QIelxjiAbEHruS+La++7gvcn6tyEF2SRkdbe90oJRL+8S F31YbLxwsUuh4Yg/C0+0eDPBjRbgh4d2zmMHNoE+aA== X-Google-Smtp-Source: AGHT+IGxeliKwCcWjxd/yeS/P1/PR8ECCUBpTk1+3+x31Bp2WJZAy4Ja1oRJvDwHO6isJENLM6t2SkrCd81T6NA1l8c= X-Received: by 2002:aa7:d9d8:0:b0:525:734a:bf30 with SMTP id v24-20020aa7d9d8000000b00525734abf30mr2843279eds.36.1692507802325; Sat, 19 Aug 2023 22:03:22 -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: <202308181700.37IH0WZT094403@gitrepo.freebsd.org> <892EAD83-FCB9-4885-A5AC-00057E0C8577@panasas.com> In-Reply-To: <892EAD83-FCB9-4885-A5AC-00057E0C8577@panasas.com> From: Warner Losh Date: Sat, 19 Aug 2023 23:03:15 -0600 Message-ID: Subject: Re: edacf4b4824a - main - UPDATING: fix a typo, adjust a white space To: Ravi Pokala Cc: Alexey Dokuchaev , Graham Perrin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000566108060353aeab" X-Rspamd-Queue-Id: 4RT3Qz2LYKz4VPT X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --000000000000566108060353aeab Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Aug 19, 2023 at 10:47=E2=80=AFPM Ravi Pokala = wrote: > No, there was definitely a typo: "chagned" is not a word in English. > > As for the white space, that's a different issue, and I'm staying away > from that bikeshed. > UPDATING strongly prefers two spaces for hysterical raisins... I mean historical reasons. When it started in 1998 it was very far from a settled issue, and a bit of a fringe position in unix community... Wraner > -Ravi (rpokala@) > > =EF=BB=BF-----Original Message----- > From: owner-src-committers@freebsd.org>> on behalf of Alexey Dokuchaev < > danfe@freebsd.org > > Date: Saturday, August 19, 2023 at 20:04 > To: Graham Perrin grahamperrin@freebsd.org>> > Cc: >, < > dev-commits-src-all@freebsd.org >= , > >> > Subject: Re: git: edacf4b4824a - main - UPDATING: fix a typo, adjust a > white space > > > On Fri, Aug 18, 2023 at 05:00:32PM +0000, Graham Perrin wrote: > > commit edacf4b4824af3630a953eb1080baf9c46f176de > > > > UPDATING: fix a typo, adjust a white space > > > > diff --git a/UPDATING b/UPDATING > > index 705ca6431a32..b818d4dc8d29 100644 > > --- a/UPDATING > > +++ b/UPDATING > > @@ -34,7 +34,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: > > configuration. > > > > Note that the early x86 BIOS bootloader (i.e., boot0sio) does not > > - support rates above 9600 bps and is not chagned. boot0sio users may > > + support rates above 9600 bps and is not changed. boot0sio users may > > > There's no typo. We prefer to format texts designed to be viewed on the > terminal screen using double spaces between sentenses because they look > better with monospaced fonts. We're not enforcing this, but at least we > should not pessimize existing formatting when it's correct. > > > ./danfe > > > > > --000000000000566108060353aeab Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Aug 19, 2023 at 10:47=E2=80= =AFPM Ravi Pokala <rpokala@freebs= d.org> wrote:
No, there was definitely a typo: "chagned" is not a word in = English.

As for the white space, that's a different issue, and I'm staying a= way from that bikeshed.

UPDATING strong= ly prefers two spaces for hysterical raisins... I mean historical reasons.<= /div>
When it started in 1998 it was very far from a settled issue, and= a bit of a fringe position
in unix community...
Wraner
=C2=A0
-Ravi (rpokala@)

=EF=BB=BF-----Original Message-----
From: <owner-src-committers@freebsd.org <mailto:owner-src-committers@freebs= d.org>> on behalf of Alexey Dokuchaev <danfe@freebsd.org <mailto:danfe@freebsd.org>><= br> Date: Saturday, August 19, 2023 at 20:04
To: Graham Perrin <grahamperrin@freebsd.org <mailto:grahamperrin@freebsd.org>> Cc: <src= -committers@freebsd.org <mailto:src-committers@freebsd.org>>, <dev-commi= ts-src-all@freebsd.org <mailto:dev-commits-src-all@freebsd.org>>= , <dev-commits-src-main@freebsd.org <mailto:dev-commits-src-main@freebsd.or= g>>
Subject: Re: git: edacf4b4824a - main - UPDATING: fix a typo, adjust a whit= e space


On Fri, Aug 18, 2023 at 05:00:32PM +0000, Graham Perrin wrote:
> commit edacf4b4824af3630a953eb1080baf9c46f176de
>
> UPDATING: fix a typo, adjust a white space
>
> diff --git a/UPDATING b/UPDATING
> index 705ca6431a32..b818d4dc8d29 100644
> --- a/UPDATING
> +++ b/UPDATING
> @@ -34,7 +34,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:<= br> > configuration.
>
> Note that the early x86 BIOS bootloader (i.e., boot0sio) does not
> - support rates above 9600 bps and is not chagned. boot0sio users may<= br> > + support rates above 9600 bps and is not changed. boot0sio users may<= br>

There's no typo. We prefer to format texts designed to be viewed on the=
terminal screen using double spaces between sentenses because they look
better with monospaced fonts. We're not enforcing this, but at least we=
should not pessimize existing formatting when it's correct.


./danfe




--000000000000566108060353aeab-- From nobody Sun Aug 20 05:05: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 4RT3Tc5NSPz4qjt9; Sun, 20 Aug 2023 05:05: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 4RT3Tc4m5Lz4VnN; Sun, 20 Aug 2023 05:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692507940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7rl5piNeSckKpkiNmFLR+ZrZq7xJKY/02zrVicsE7mY=; b=N3YxT7QOZphjPA9znNoBjJXrgiIrBUhAMPR++oCL/70YaSGBSHFRBM0i9VqRlSHkhwk0Gl Sj0bTI4Xjf7tcAQUplG9PGbwGPPp3z6P41MO1ANyG4wsewOD74bkMcvzLKHWRvjpfO1lEd n3os1Ss+BOe6xVkBmhCxWeqOTaknG9YCi1CBRv9Rak2XAxN0AA0vfwrPpxsGFDqjIBiCa8 +pNyWQnXNao9i2Hww3ODy5oh+ldRec8JU4vZ2u4ZR18IpuLuNuQNx4eDBIUc9OxSkXZoGB 6ABw49XELGp15qqSQObayOoIojYyfEzqjv6JUkF4TemOE0vUO55OhiSR7eBAJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692507940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7rl5piNeSckKpkiNmFLR+ZrZq7xJKY/02zrVicsE7mY=; b=e1RNN//6Td5aAnZ51Lvvffc1JSg0C7cy2rdhwxnJFpUM6aBHI+L0lxmBMm288Owt5Z7rXm YkWxvPfvbtCyw0Ejv53UsD6iNeez98UV2Aht4iq7/0qjTXt3eDYjCiANrSExFfIdjK2eVj FbIMwPn0UA5qXlO40DpUx+aiR+x6aCcK78W1flYjmYdpsbr4hYAJzXl0AO6qcljflFnjXF ajo+ne4WPk6I7KMp3lJ3mxQLbwwMAIXXPYLWFjmqlwXn2y6svKNMrxLwjBpbVK7W6+fBhv bSKLIwt1xANSGFSToEfx/CWQrAnE+4azWOsI14asJmypFy7k/RRZBglP36m11Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692507940; a=rsa-sha256; cv=none; b=Arbvqe79mZ+aNC0P9FiXX3oqeylgpz19FTwhSlKiTxqbm1eMUooCCZ4MpUeLIv3zftYQ+b 54k7WOCwmIU2+1I0oykmjt+7RHlQYlD1phnrGJ+FnVT8nanTpuvvFTiUh/oU19cNA/iuJd kZTZL1RmayKCgrcPqZwWZQwY6A5PKrL74CBf8ODiINvuA5nI2Pn7837UGqVk7U5y/pUgid 2C8sSl1WhD4P3YfxVjT3dDebfc/i8HpI23KBId6Xyjq3BOe4CdKNNDyvOGWBMca8hHw44u K9nfbP7joB8cULpYoNbckmzX17JkW42aZcodyDsvCZpWb5U4hWFcy3CJ8GPftw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT3Tc3qGLzBJ8; Sun, 20 Aug 2023 05:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K55eHd000264; Sun, 20 Aug 2023 05:05:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K55e2d000261; Sun, 20 Aug 2023 05:05:40 GMT (envelope-from git) Date: Sun, 20 Aug 2023 05:05:40 GMT Message-Id: <202308200505.37K55e2d000261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 79fafc09740a - main - queue.h: Define {LIST,TAILQ}_REMOVE_HEAD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79fafc09740ad508b40e909dc898cbac2d4f67c4 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=79fafc09740ad508b40e909dc898cbac2d4f67c4 commit 79fafc09740ad508b40e909dc898cbac2d4f67c4 Author: Colin Percival AuthorDate: 2023-07-17 23:42:50 +0000 Commit: Colin Percival CommitDate: 2023-08-20 05:04:55 +0000 queue.h: Define {LIST,TAILQ}_REMOVE_HEAD The LIST and TAILQ structures have fast _REMOVE macros (since each element has a pointer to the previous element); we implement the _REMOVE_HEAD macros for them by simply finding the first element and then removing it. Reviewed by: jhb, emaste Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41072 --- sys/sys/queue.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/sys/queue.h b/sys/sys/queue.h index 8e91ebf7949d..47d85121e317 100644 --- a/sys/sys/queue.h +++ b/sys/sys/queue.h @@ -110,7 +110,7 @@ * _INSERT_TAIL - - + + * _CONCAT s s + + * _REMOVE_AFTER + - + - - * _REMOVE_HEAD + - + - + * _REMOVE_HEAD + + + + * _REMOVE s + s + * _SWAP + + + + * @@ -595,6 +595,9 @@ struct { \ __containerof((elm)->field.le_prev, \ QUEUE_TYPEOF(type), field.le_next)) +#define LIST_REMOVE_HEAD(head, field) \ + LIST_REMOVE(LIST_FIRST(head), field) + #define LIST_REMOVE(elm, field) do { \ QMD_SAVELINK(oldnext, (elm)->field.le_next); \ QMD_SAVELINK(oldprev, (elm)->field.le_prev); \ @@ -841,6 +844,9 @@ struct { \ ((elm)->field.tqe_prev == &(head)->tqh_first ? NULL : \ __containerof((elm)->field.tqe_prev, QUEUE_TYPEOF(type), field.tqe_next)) +#define TAILQ_REMOVE_HEAD(head, field) \ + TAILQ_REMOVE(head, TAILQ_FIRST(head), field) + #define TAILQ_REMOVE(head, elm, field) do { \ QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \ QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \ From nobody Sun Aug 20 05:05:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RT3Td6SDPz4qjWr; Sun, 20 Aug 2023 05:05: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 4RT3Td5zQTz4Vny; Sun, 20 Aug 2023 05:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692507941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PYZlk/jghwd1mWN8JNwzLvPZTR8dcpzE48d1wrEzBSE=; b=GOU8DitKcAXe6jh7ruculQId6tpAoGVAQDu4slpe4ZYsyjAwX0//nIxsYVjU8m2cBesGUl cgFyvK7E+rdOjXKHzTF1WuHMFk61ZesCNyIK3vvKWVGqpzi37rsXupt6kv4fA+IbrMbxNb +nj+a6iawO2dPt/RvLDM9S9El/AFmhPNWl5xSs++IycPcPPuo3vIaJr6NUqW+QqRGGlUh0 0b2YLoDaCKndcCToX880XpquRYXsBJIzK2sDe+oe+lgTsHJRMgejlBE8b66DTRVqu8V/nX sdoPcQ2GSGuoKaJh18T7BVFof22c9ZprBJ30Ek8M7hv7LLKxRAnuHTjAGJKOnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692507941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PYZlk/jghwd1mWN8JNwzLvPZTR8dcpzE48d1wrEzBSE=; b=APEUFghB2EwjJAF9w64OdAkc+KgM1nGTS9TuKp4+Wg9tok3/4VkwG36RGM2GF5TKjfXIzS np46HD5UHdoWYigv7yH5KKf1S2rJOkzItOt/gADE7s8+aqIKkiQzocfmKA+yybQN9QFtaC P94R1hLIFm0vq5JXnHcSWabVuUlYVQMjW8sKmRlIhw35o4b0sCC2GCGBwlS9ya9Nys0vUM lPbFb8W6xGlckkuOK89GC1jGRTaMQD60ZK1rHCmIsU6nBpu0p6pXvKE/XiUz42jaRz/OUD c3Gbd4bHbv47rU2FXcR0kHVCJaSsmJvKF4XXWhCLNx1m1VZ/7DN8cX8/AQojtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692507941; a=rsa-sha256; cv=none; b=UK5DyfGnyRw0j5tulMdkuJ+2ejsuTP8seCfzMHIv2dqw/e/uvUTl0SUjgHWkZ+cCfzv1Qw dxc8Ughs4uIkrRg3lWpI3staVeAYAoC86D4be/3EYJOAsYJnVRLd5aKKjn6nvNsuGO/DrF cx4fB4qPnKyktl0UMikEaz6GIT/IITgzdlwlb8WCDjVKJqr4yHvAPFuzqQdFGR2GBl6Ffh Xw0SWPTIm3vytCZcol6+0LLiDC0iSQHIK/ZfC3xpeer4EMh20CNcFPZ/niKUmZuTJ9RsCw 1gW3e43osDFyrbbYGYvLtZGogs8dJ7zg2njki1melRsoipsM5l4Rp6jQBUgoOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT3Td50gbzBh3; Sun, 20 Aug 2023 05:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K55fju000299; Sun, 20 Aug 2023 05:05:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K55fnk000296; Sun, 20 Aug 2023 05:05:41 GMT (envelope-from git) Date: Sun, 20 Aug 2023 05:05:41 GMT Message-Id: <202308200505.37K55fnk000296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 5f3587169a6d - main - Add List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 5f3587169a6d17ad1df8c99aea32e8fc27e3195b Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5f3587169a6d17ad1df8c99aea32e8fc27e3195b commit 5f3587169a6d17ad1df8c99aea32e8fc27e3195b Author: Colin Percival AuthorDate: 2023-07-18 00:07:44 +0000 Commit: Colin Percival CommitDate: 2023-08-20 05:04:55 +0000 Add Thie file provides macros for performing mergesorts and merging two sorted lists implemented by . The mergesort operates in guaranteed O(n log n) time and uses constant additional space: 3 or 4 pointers (depending on list type) and 4 size_t values. The merge operates in guaranteed O(n + m) time and uses constant additional space: 3 pointers. In memoriam: hselasky Reviewed by: jhb (previous version) Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41073 --- sys/sys/queue_mergesort.h | 217 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 217 insertions(+) diff --git a/sys/sys/queue_mergesort.h b/sys/sys/queue_mergesort.h new file mode 100644 index 000000000000..ea26b9aead46 --- /dev/null +++ b/sys/sys/queue_mergesort.h @@ -0,0 +1,217 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Colin Percival + * + * 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 _SYS_QUEUE_MERGESORT_H_ +#define _SYS_QUEUE_MERGESORT_H_ + +/* + * This file defines macros for performing mergesorts on singly-linked lists, + * single-linked tail queues, lists, and tail queues as implemented in + * . + */ + +/* + * Shims to work around _CONCAT and _INSERT_AFTER taking different numbers of + * arguments for different types of linked lists. + */ +#define STAILQ_CONCAT_4(head1, head2, type, field) \ + STAILQ_CONCAT(head1, head2) +#define TAILQ_CONCAT_4(head1, head2, type, field) \ + TAILQ_CONCAT(head1, head2, field) +#define SLIST_INSERT_AFTER_4(head, slistelm, elm, field) \ + SLIST_INSERT_AFTER(slistelm, elm, field) +#define LIST_INSERT_AFTER_4(head, slistelm, elm, field) \ + LIST_INSERT_AFTER(slistelm, elm, field) + +/* + * Generic macros which apply to all types of lists. + */ +#define SYSQUEUE_MERGE(sqms_list1, sqms_list2, thunk, sqms_cmp, TYPE, NAME, \ + M_FIRST, M_INSERT_AFTER, M_INSERT_HEAD, M_NEXT, M_REMOVE_HEAD) \ +do { \ + struct TYPE *sqms_elm1; \ + struct TYPE *sqms_elm1_prev; \ + struct TYPE *sqms_elm2; \ + \ + /* Start at the beginning of list1; _prev is the previous node. */ \ + sqms_elm1_prev = NULL; \ + sqms_elm1 = M_FIRST(sqms_list1); \ + \ + /* Pull entries from list2 and insert them into list1. */ \ + while ((sqms_elm2 = M_FIRST(sqms_list2)) != NULL) { \ + /* Remove from list2. */ \ + M_REMOVE_HEAD(sqms_list2, NAME); \ + \ + /* Advance until we find the right place to insert it. */ \ + while ((sqms_elm1 != NULL) && \ + (sqms_cmp)(sqms_elm2, sqms_elm1, thunk) >= 0) { \ + sqms_elm1_prev = sqms_elm1; \ + sqms_elm1 = M_NEXT(sqms_elm1, NAME); \ + } \ + \ + /* Insert into list1. */ \ + if (sqms_elm1_prev == NULL) \ + M_INSERT_HEAD(sqms_list1, sqms_elm2, NAME); \ + else \ + M_INSERT_AFTER(sqms_list1, sqms_elm1_prev, \ + sqms_elm2, NAME); \ + sqms_elm1_prev = sqms_elm2; \ + } \ +} while (0) + +#define SYSQUEUE_MERGE_SUBL(sqms_sorted, sqms_len1, sqms_len2, sqms_melm, \ + sqms_mpos, thunk, sqms_cmp, TYPE, NAME, \ + M_FIRST, M_NEXT, M_REMOVE_HEAD, M_INSERT_AFTER) \ +do { \ + struct TYPE *sqms_curelm; \ + size_t sqms_i; \ + \ + /* Find the element before the start of the second sorted region. */ \ + while ((sqms_mpos) < (sqms_len1)) { \ + (sqms_melm) = M_NEXT((sqms_melm), NAME); \ + (sqms_mpos)++; \ + } \ + \ + /* Pull len1 entries off the list and insert in the right place. */ \ + for (sqms_i = 0; sqms_i < (sqms_len1); sqms_i++) { \ + /* Grab the first element. */ \ + sqms_curelm = M_FIRST(&(sqms_sorted)); \ + \ + /* Advance until we find the right place to insert it. */ \ + while (((sqms_mpos) < (sqms_len1) + (sqms_len2)) && \ + ((sqms_cmp)(sqms_curelm, M_NEXT((sqms_melm), NAME), \ + thunk) >= 0)) { \ + (sqms_melm) = M_NEXT((sqms_melm), NAME); \ + (sqms_mpos)++; \ + } \ + \ + /* Move the element in the right place if not already there. */ \ + if (sqms_curelm != (sqms_melm)) { \ + M_REMOVE_HEAD(&(sqms_sorted), NAME); \ + M_INSERT_AFTER(&(sqms_sorted), (sqms_melm), \ + sqms_curelm, NAME); \ + (sqms_melm) = sqms_curelm; \ + } \ + } \ +} while (0) + +#define SYSQUEUE_MERGESORT(sqms_head, thunk, sqms_cmp, TYPE, NAME, M_HEAD, \ + M_HEAD_INITIALIZER, M_EMPTY, M_FIRST, M_NEXT, M_INSERT_HEAD, \ + M_INSERT_AFTER, M_CONCAT, M_REMOVE_HEAD) \ +do { \ + /* \ + * Invariant: If sqms_slen = 2^a + 2^b + ... + 2^z with a < b < ... < z \ + * then sqms_sorted is a sequence of 2^a sorted entries followed by a \ + * list of 2^b sorted entries ... followed by a list of 2^z sorted \ + * entries. \ + */ \ + M_HEAD(, TYPE) sqms_sorted = M_HEAD_INITIALIZER(sqms_sorted); \ + struct TYPE *sqms_elm; \ + size_t sqms_slen = 0; \ + size_t sqms_sortmask; \ + size_t sqms_mpos; \ + \ + /* Move everything from the input list to sqms_sorted. */ \ + while (!M_EMPTY(sqms_head)) { \ + /* Pull the head off the input list. */ \ + sqms_elm = M_FIRST(sqms_head); \ + M_REMOVE_HEAD(sqms_head, NAME); \ + \ + /* Push it onto sqms_sorted. */ \ + M_INSERT_HEAD(&sqms_sorted, sqms_elm, NAME); \ + sqms_slen++; \ + \ + /* Restore sorting invariant. */ \ + sqms_mpos = 1; \ + for (sqms_sortmask = 1; \ + sqms_sortmask & ~sqms_slen; \ + sqms_sortmask <<= 1) \ + SYSQUEUE_MERGE_SUBL(sqms_sorted, sqms_sortmask, \ + sqms_sortmask, sqms_elm, sqms_mpos, thunk, sqms_cmp,\ + TYPE, NAME, M_FIRST, M_NEXT, M_REMOVE_HEAD, \ + M_INSERT_AFTER); \ + } \ + \ + /* Merge the remaining sublists. */ \ + sqms_elm = M_FIRST(&sqms_sorted); \ + sqms_mpos = 1; \ + for (sqms_sortmask = 2; \ + sqms_sortmask < sqms_slen; \ + sqms_sortmask <<= 1) \ + if (sqms_slen & sqms_sortmask) \ + SYSQUEUE_MERGE_SUBL(sqms_sorted, \ + sqms_slen & (sqms_sortmask - 1), sqms_sortmask, \ + sqms_elm, sqms_mpos, thunk, sqms_cmp, \ + TYPE, NAME, M_FIRST, M_NEXT, M_REMOVE_HEAD, \ + M_INSERT_AFTER); \ + \ + /* Move the sorted list back to the input list. */ \ + M_CONCAT(sqms_head, &sqms_sorted, TYPE, NAME); \ +} while (0) + +/** + * Macros for each of the individual data types. They are all invoked as + * FOO_MERGESORT(head, thunk, compar, TYPE, NAME) + * and + * FOO_MERGE(list1, list2, thunk, compar, TYPE, NAME) + * where the compar function operates as in qsort_r, i.e. compar(a, b, thunk) + * returns an integer less than, equal to, or greater than zero if a is + * considered to be respectively less than, equal to, or greater than b. + */ +#define SLIST_MERGESORT(head, thunk, cmp, TYPE, NAME) \ + SYSQUEUE_MERGESORT((head), (thunk), (cmp), TYPE, NAME, SLIST_HEAD, \ + SLIST_HEAD_INITIALIZER, SLIST_EMPTY, SLIST_FIRST, SLIST_NEXT, \ + SLIST_INSERT_HEAD, SLIST_INSERT_AFTER_4, SLIST_CONCAT, SLIST_REMOVE_HEAD) +#define SLIST_MERGE(list1, list2, thunk, cmp, TYPE, NAME) \ + SYSQUEUE_MERGE((list1), (list2), (thunk), (cmp), TYPE, NAME, SLIST_FIRST, \ + SLIST_INSERT_AFTER_4, SLIST_INSERT_HEAD, SLIST_NEXT, SLIST_REMOVE_HEAD) + +#define LIST_MERGESORT(head, thunk, cmp, TYPE, NAME) \ + SYSQUEUE_MERGESORT((head), (thunk), (cmp), TYPE, NAME, LIST_HEAD, \ + LIST_HEAD_INITIALIZER, LIST_EMPTY, LIST_FIRST, LIST_NEXT, \ + LIST_INSERT_HEAD, LIST_INSERT_AFTER_4, LIST_CONCAT, LIST_REMOVE_HEAD) +#define LIST_MERGE(list1, list2, thunk, cmp, TYPE, NAME) \ + SYSQUEUE_MERGE((list1), (list2), (thunk), (cmp), TYPE, NAME, LIST_FIRST, \ + LIST_INSERT_AFTER_4, LIST_INSERT_HEAD, LIST_NEXT, LIST_REMOVE_HEAD) + +#define STAILQ_MERGESORT(head, thunk, cmp, TYPE, NAME) \ + SYSQUEUE_MERGESORT((head), (thunk), (cmp), TYPE, NAME, STAILQ_HEAD, \ + STAILQ_HEAD_INITIALIZER, STAILQ_EMPTY, STAILQ_FIRST, STAILQ_NEXT, \ + STAILQ_INSERT_HEAD, STAILQ_INSERT_AFTER, STAILQ_CONCAT_4, STAILQ_REMOVE_HEAD) +#define STAILQ_MERGE(list1, list2, thunk, cmp, TYPE, NAME) \ + SYSQUEUE_MERGE((list1), (list2), (thunk), (cmp), TYPE, NAME, STAILQ_FIRST, \ + STAILQ_INSERT_AFTER, STAILQ_INSERT_HEAD, STAILQ_NEXT, STAILQ_REMOVE_HEAD) + +#define TAILQ_MERGESORT(head, thunk, cmp, TYPE, NAME) \ + SYSQUEUE_MERGESORT((head), (thunk), (cmp), TYPE, NAME, TAILQ_HEAD, \ + TAILQ_HEAD_INITIALIZER, TAILQ_EMPTY, TAILQ_FIRST, TAILQ_NEXT, \ + TAILQ_INSERT_HEAD, TAILQ_INSERT_AFTER, TAILQ_CONCAT_4, TAILQ_REMOVE_HEAD) +#define TAILQ_MERGE(list1, list2, thunk, cmp, TYPE, NAME) \ + SYSQUEUE_MERGE((list1), (list2), (thunk), (cmp), TYPE, NAME, TAILQ_FIRST, \ + TAILQ_INSERT_AFTER, TAILQ_INSERT_HEAD, TAILQ_NEXT, TAILQ_REMOVE_HEAD) + +#endif /* !_SYS_QUEUE_MERGESORT_H_ */ From nobody Sun Aug 20 05:05: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 4RT3Tg0cVzz4qjtB; Sun, 20 Aug 2023 05:05: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 4RT3Tf6wKqz4Vtf; Sun, 20 Aug 2023 05:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692507943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mhSQaN7hd/2xU+WV7PVN5FTkW4qZlRq60FMqugEBYSg=; b=Bhc7jykvJgDvlcH0CnH2Q0K3daX/4y163/Ap+SRlocu4Urt8738uYCrhavMHXRGmrZiiZH M2c+RgsLLb234zVilicjVPjNhhhilWiOwfNZw8M1Dm3JnKA+e/Xva4TYa37MV7P8sf9DvP ILw2GHNMrYnQ8zl0o/OOG+FtGP8ovRavx35GvgAZoJwnR6Wu3HAjw4ydoIVfhRkkLVRNjx SHf+df34ByqkC9bYyJzfPtmr9NQS5sPrvdwFMMvT6mdRFQkmkTzLIJhVg3G8bfRZcOyNcQ 0n9u6n9GZgFsmx+rsTHWu4FBUsI38MlkKg2Iq8lfMELvge0IV1kOOgM9MnBxMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692507943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mhSQaN7hd/2xU+WV7PVN5FTkW4qZlRq60FMqugEBYSg=; b=jUPmw3Q6nU99+XqfMkUMZ09i67LYDCFje7Cm4pyS2ecZfmHdZq7FhJiWPP/3Vp9kp0CT0B VfuJSqF/1TsdZdY147bgxAOgc+UQGP+G2sD24obXQ5l/+JT4il6TVhABXCKI8l5vy2EnQc tRnWOAhrGgZmd/YI8jy877NfH95B/n1YYz7WWAdVtMWA4NQayOuLJdJ28d/UwnKhWzT0xo QWdkqPIBwWBF3VAdIbx009lyAFiJMTu0JS1KA6XzByvxihDoUvJ7q2mAva+8zOz/1yuuEZ v4iHz39VH7HbLKR96Yh7TI31pOQNWEeO/dgY3/7hxQNsv4DlorBGjlSvVdntXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692507943; a=rsa-sha256; cv=none; b=VRGqQFuHbT2EviTYWv4mpAtnZfH2J0+mimqnau9zhWI4ilYoQhv4av2ZCCDGMor+nq7jb4 PXMoxRGbDkc29pQ2shs+1/o2rAfzEcJcJjza0Ba08yEYbFzwT1Vvg6j2WB0ePxVOk5CPCm qkjyVF1qDVx6/dtUSnJhTHIhfDGHDXiTQJ9Dv+idNt5T7CxKnbzZf6f8Hsk17La9iQy+W3 1iQbZzeWKOB1m/YyJ8NRLlq+uodVCs/2WOxG+kdbKY1LJ8FYeI6FJscYAXEmT7zuwbvXB7 CqcuTjKjYQSqRCdLkf35j5QZs+x/Ga+x1HlrJwC719g/AIQD1WKWwaXKJOIFRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT3Tf611NzBSL; Sun, 20 Aug 2023 05:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K55gwI000341; Sun, 20 Aug 2023 05:05:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K55gqN000338; Sun, 20 Aug 2023 05:05:42 GMT (envelope-from git) Date: Sun, 20 Aug 2023 05:05:42 GMT Message-Id: <202308200505.37K55gqN000338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: cedc82c0466a - main - struct sysinit: Add SLIST_ENTRY(sysinit) next List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: cedc82c0466a5116d5a89ecd1f10a69be1a31ca0 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cedc82c0466a5116d5a89ecd1f10a69be1a31ca0 commit cedc82c0466a5116d5a89ecd1f10a69be1a31ca0 Author: Colin Percival AuthorDate: 2023-07-18 02:20:05 +0000 Commit: Colin Percival CommitDate: 2023-08-20 05:04:55 +0000 struct sysinit: Add SLIST_ENTRY(sysinit) next This will be used to put SYSINITs onto a linked list. Reviewed by: jhb, emaste Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41074 --- share/man/man9/SYSINIT.9 | 1 + sys/sys/kernel.h | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man9/SYSINIT.9 b/share/man/man9/SYSINIT.9 index cf5dbe2e797f..ae360a95c44f 100644 --- a/share/man/man9/SYSINIT.9 +++ b/share/man/man9/SYSINIT.9 @@ -60,6 +60,7 @@ are defined in struct sysinit { enum sysinit_sub_id subsystem; /* subsystem identifier*/ enum sysinit_elem_order order; /* init order within subsystem*/ + SLIST_ENTRY(sysinit) next; /* singly-linked list */ sysinit_cfunc_t func; /* function */ const void *udata; /* multiplexer/argument */ }; diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index b6059858394b..12e346514d1a 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -50,7 +50,7 @@ #ifdef _KERNEL -/* for intrhook below */ +/* for intrhook and sysinit linked list below */ #include /* for timestamping SYSINITs; other files may assume this is included here */ @@ -220,6 +220,7 @@ typedef void (*sysinit_cfunc_t)(const void *); struct sysinit { enum sysinit_sub_id subsystem; /* subsystem identifier*/ enum sysinit_elem_order order; /* init order within subsystem*/ + SLIST_ENTRY(sysinit) next; /* singly-linked list */ sysinit_cfunc_t func; /* function */ const void *udata; /* multiplexer/argument */ }; @@ -260,6 +261,7 @@ sysinit_tslog_shim(const void * data) static struct sysinit uniquifier ## _sys_init = { \ subsystem, \ order, \ + { NULL }, \ sysinit_tslog_shim, \ &uniquifier ## _sys_init_tslog \ }; \ @@ -269,6 +271,7 @@ sysinit_tslog_shim(const void * data) static struct sysinit uniquifier ## _sys_init = { \ subsystem, \ order, \ + { NULL }, \ func, \ (ident) \ }; \ @@ -286,6 +289,7 @@ sysinit_tslog_shim(const void * data) static struct sysinit uniquifier ## _sys_uninit = { \ subsystem, \ order, \ + { NULL }, \ func, \ (ident) \ }; \ From nobody Sun Aug 20 05:05: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 4RT3Th1lKgz4qk07; Sun, 20 Aug 2023 05:05: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 4RT3Th0rF9z4VxT; Sun, 20 Aug 2023 05:05:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692507944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XmM0brXUQLf58KdbMuRNFAWH9dSgHIL4INI1NaJqcw8=; b=g7wcolE20zEQQBkMNGJzlisk67kTFM9+cTU6WHpS/w/MH//c3o1xAcxCcMyWyWd5zFpbqb RlC04QDr7SSu1QEDFs8R6yOy0FTun2HINXbrJiw48rpGhfHk/3wTRZBH9xxmTNtXb2TZrV jjuQa7nFOQvzyZiKrqQn3EbH5iRLt9iIRYmuNOuWZ+OpSbmHpB8NbBDhpArg/BvD0j0YIx h/yaPFpDtYIqrwzoV7Jmua39RzPDBtq4qZ94Qe8vUkLNPOpoKLY9tHK927wBZOwPD9F1iz z1HVcp22NqeSuZ9UGRY2sUYHC5bG+Ps7Vf4FFDj9wkeGjb5oeRB2wRZTJpP8XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692507944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XmM0brXUQLf58KdbMuRNFAWH9dSgHIL4INI1NaJqcw8=; b=jY4+Vzd6fGh1vC/HsZQCFrbvNZNmvrN5PphrKmK9KLdmzxhz4BhD7byw2RcytGzo0lgBrd E9KtXLu8lpSJC3hBMuEyhcnDM21PQZGP19SX8DPIZL8BKOJvoIg73WdLYM5z2LbgcZjmSf T40Nz5PjYnSsGc87sBGQE23ZS0zL2a0Ljcs48bWQj0sdDGCf6S6kv5XWmKXX9pgrCSNWZb se1JNs25X1UXhLmmAcYPi7GnHLBeQVw3nCW8jM+4hmCMgeh9GPfPQUmGrOX5skkTJPNau+ T1hGcYV4o7trcnGaZROJZnEz1MS6hyFJbMarGXBsNNlN0UU/6d1qXV07zCKbuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692507944; a=rsa-sha256; cv=none; b=QgeZH5Uj7KIs2uTbMBW8/T3TDYN9flyEyTDUItd6nwlf8H8DPctVHl9qCLeor6209OOf5s UHuvV+QEmwZHZwBoBIa48iemZeW98FQ8fBnWQOmQ/K7ihiVM4Qou+LoU3FlulnSSl60Htb QGoQgRJcHSzEW3kEMGlhE6+Cy0EDVMXBA/ugdHUY+IjIuOibj6q7kCRJPoWHgJfXZSX4Zt bZZM1OP/N01UzyzIozYQv373gT+TOF7pspsRZqf16JIEQZeYtPKYNvDXUdAFqklLQLSWZm wyAVmYSomcBYo7rjm+FW/6FjFEnE/nvKOcq0zDWkJXQyWp0YgjhlsTx7AlP3xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT3Tg71WWzBSM; Sun, 20 Aug 2023 05:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K55h4i000396; Sun, 20 Aug 2023 05:05:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K55hMo000393; Sun, 20 Aug 2023 05:05:43 GMT (envelope-from git) Date: Sun, 20 Aug 2023 05:05:43 GMT Message-Id: <202308200505.37K55hMo000393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 9a7add6d01f3 - main - init_main: Switch from sysinit array to SLIST List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 9a7add6d01f3c5f7eba811e794cf860d2bce131d Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9a7add6d01f3c5f7eba811e794cf860d2bce131d commit 9a7add6d01f3c5f7eba811e794cf860d2bce131d Author: Colin Percival AuthorDate: 2023-07-18 02:29:20 +0000 Commit: Colin Percival CommitDate: 2023-08-20 05:04:56 +0000 init_main: Switch from sysinit array to SLIST This has two effects: 1. We can mergesort the sysinits instead of bubblesorting them, which shaves about 2 ms off the boot time in Firecracker. 2. Adding more sysinits (e.g. from a KLD) can be performed by sorting them and then merging the sorted lists, which is both faster than the previous "append and sort" approach and avoids needing malloc. Reviewed by: jhb (previous version) Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41075 --- sys/kern/init_main.c | 177 +++++++++++++++++++++++++-------------------------- 1 file changed, 86 insertions(+), 91 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index d675e3538f67..aa82eafff9b0 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -73,6 +73,8 @@ #include #include #include +#include +#include #include #include #include @@ -154,46 +156,73 @@ FEATURE(invariants, "Kernel compiled with INVARIANTS, may affect performance"); SYSINIT(placeholder, SI_SUB_DUMMY, SI_ORDER_ANY, NULL, NULL); /* - * The sysinit table itself. Items are checked off as the are run. - * If we want to register new sysinit types, add them to newsysinit. + * The sysinit linker set compiled into the kernel. These are placed onto the + * sysinit list by mi_startup; sysinit_add can add (e.g., from klds) additional + * sysinits to the linked list but the linker set here does not change. */ SET_DECLARE(sysinit_set, struct sysinit); -struct sysinit **sysinit, **sysinit_end; -struct sysinit **newsysinit, **newsysinit_end; /* - * Merge a new sysinit set into the current set, reallocating it if - * necessary. This can only be called after malloc is running. + * The sysinit list itself. Items are removed as they are run. */ -void -sysinit_add(struct sysinit **set, struct sysinit **set_end) +static SLIST_HEAD(sysinitlist, sysinit) sysinit_list; + +/* + * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time + * as, or after b. + */ +static int +sysinit_compar(struct sysinit *a, struct sysinit *b, void *thunk __unused) +{ + + if (a->subsystem < b->subsystem) + return (-1); + if (a->subsystem > b->subsystem) + return (1); + if (a->order < b->order) + return (-1); + if (a->order > b->order) + return (1); + return (0); +} + +static void +sysinit_mklist(struct sysinitlist *list, struct sysinit **set, + struct sysinit **set_end) { - struct sysinit **newset; struct sysinit **sipp; - struct sysinit **xipp; - int count; - - count = set_end - set; - if (newsysinit) - count += newsysinit_end - newsysinit; - else - count += sysinit_end - sysinit; - newset = malloc(count * sizeof(*sipp), M_TEMP, M_NOWAIT); - if (newset == NULL) - panic("cannot malloc for sysinit"); - xipp = newset; - if (newsysinit) - for (sipp = newsysinit; sipp < newsysinit_end; sipp++) - *xipp++ = *sipp; - else - for (sipp = sysinit; sipp < sysinit_end; sipp++) - *xipp++ = *sipp; + + TSENTER(); + TSENTER2("listify"); + SLIST_INIT(list); for (sipp = set; sipp < set_end; sipp++) - *xipp++ = *sipp; - if (newsysinit) - free(newsysinit, M_TEMP); - newsysinit = newset; - newsysinit_end = newset + count; + SLIST_INSERT_HEAD(list, *sipp, next); + TSEXIT2("listify"); + TSENTER2("mergesort"); + SLIST_MERGESORT(list, NULL, sysinit_compar, sysinit, next); + TSEXIT2("mergesort"); + TSEXIT(); +} + +/* + * Merge a new sysinit set into the sysinit list. + */ +void +sysinit_add(struct sysinit **set, struct sysinit **set_end) +{ + struct sysinitlist new_list; + + TSENTER(); + + /* Construct a sorted list from the new sysinits. */ + sysinit_mklist(&new_list, set, set_end); + + /* Merge the new list into the existing one. */ + TSENTER2("SLIST_MERGE"); + SLIST_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); + TSEXIT2("SLIST_MERGE"); + + TSEXIT(); } #if defined (DDB) && defined(VERBOSE_SYSINIT) @@ -229,10 +258,7 @@ void mi_startup(void) { - struct sysinit **sipp; /* system initialization*/ - struct sysinit **xipp; /* interior loop of sort*/ - struct sysinit *save; /* bubble*/ - + struct sysinit *sip; int last; #if defined(VERBOSE_SYSINIT) int verbose; @@ -243,29 +269,8 @@ mi_startup(void) if (boothowto & RB_VERBOSE) bootverbose++; - if (sysinit == NULL) { - sysinit = SET_BEGIN(sysinit_set); - sysinit_end = SET_LIMIT(sysinit_set); - } - -restart: - /* - * Perform a bubble sort of the system initialization objects by - * their subsystem (primary key) and order (secondary key). - */ - TSENTER2("bubblesort"); - for (sipp = sysinit; sipp < sysinit_end; sipp++) { - for (xipp = sipp + 1; xipp < sysinit_end; xipp++) { - if ((*sipp)->subsystem < (*xipp)->subsystem || - ((*sipp)->subsystem == (*xipp)->subsystem && - (*sipp)->order <= (*xipp)->order)) - continue; /* skip*/ - save = *sipp; - *sipp = *xipp; - *xipp = save; - } - } - TSEXIT2("bubblesort"); + /* Construct and sort sysinit list. */ + sysinit_mklist(&sysinit_list, SET_BEGIN(sysinit_set), SET_LIMIT(sysinit_set)); last = SI_SUB_COPYRIGHT; #if defined(VERBOSE_SYSINIT) @@ -276,21 +281,23 @@ restart: #endif /* - * Traverse the (now) ordered list of system initialization tasks. - * Perform each task, and continue on to the next task. + * Perform each system initialization task from the ordered list. Note + * that if sysinit_list is modified (e.g. by a KLD) we will nonetheless + * always perform the earlist-sorted sysinit at each step; using the + * SLIST_FOREACH macro would result in items being skipped if inserted + * earlier than the "current item". */ - for (sipp = sysinit; sipp < sysinit_end; sipp++) { - if ((*sipp)->subsystem == SI_SUB_DUMMY) - continue; /* skip dummy task(s)*/ + while ((sip = SLIST_FIRST(&sysinit_list)) != NULL) { + SLIST_REMOVE_HEAD(&sysinit_list, next); - if ((*sipp)->subsystem == SI_SUB_DONE) - continue; + if (sip->subsystem == SI_SUB_DUMMY) + continue; /* skip dummy task(s)*/ - if ((*sipp)->subsystem > last) - BOOTTRACE_INIT("sysinit 0x%7x", (*sipp)->subsystem); + if (sip->subsystem > last) + BOOTTRACE_INIT("sysinit 0x%7x", sip->subsystem); #if defined(VERBOSE_SYSINIT) - if ((*sipp)->subsystem > last && verbose_sysinit != 0) { + if (sip->subsystem > last && verbose_sysinit != 0) { verbose = 1; printf("subsystem %x\n", last); } @@ -298,23 +305,23 @@ restart: #if defined(DDB) const char *func, *data; - func = symbol_name((vm_offset_t)(*sipp)->func, + func = symbol_name((vm_offset_t)sip->func, DB_STGY_PROC); - data = symbol_name((vm_offset_t)(*sipp)->udata, + data = symbol_name((vm_offset_t)sip->udata, DB_STGY_ANY); if (func != NULL && data != NULL) printf(" %s(&%s)... ", func, data); else if (func != NULL) - printf(" %s(%p)... ", func, (*sipp)->udata); + printf(" %s(%p)... ", func, sip->udata); else #endif - printf(" %p(%p)... ", (*sipp)->func, - (*sipp)->udata); + printf(" %p(%p)... ", sip->func, + sip->udata); } #endif /* Call function */ - (*((*sipp)->func))((*sipp)->udata); + (*(sip->func))(sip->udata); #if defined(VERBOSE_SYSINIT) if (verbose) @@ -322,19 +329,7 @@ restart: #endif /* Check off the one we're just done */ - last = (*sipp)->subsystem; - (*sipp)->subsystem = SI_SUB_DONE; - - /* Check if we've installed more sysinit items via KLD */ - if (newsysinit != NULL) { - if (sysinit != SET_BEGIN(sysinit_set)) - free(sysinit, M_TEMP); - sysinit = newsysinit; - sysinit_end = newsysinit_end; - newsysinit = NULL; - newsysinit_end = NULL; - goto restart; - } + last = sip->subsystem; } TSEXIT(); /* Here so we don't overlap with start_init. */ @@ -904,13 +899,13 @@ db_show_print_syinit(struct sysinit *sip, bool ddb) DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, DB_CMD_MEMSAFE) { - struct sysinit **sipp; + struct sysinit *sip; db_printf("SYSINIT vs Name(Ptr)\n"); db_printf(" Subsystem Order\n"); db_printf(" Function(Name)(Arg)\n"); - for (sipp = sysinit; sipp < sysinit_end; sipp++) { - db_show_print_syinit(*sipp, true); + SLIST_FOREACH(sip, &sysinit_list, next) { + db_show_print_syinit(sip, true); if (db_pager_quit) break; } From nobody Sun Aug 20 05:36: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 4RT49k6BdRz4qlPy; Sun, 20 Aug 2023 05:36: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 4RT49k5TBZz4YPb; Sun, 20 Aug 2023 05:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692509818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YtaR+JRYKW1YV8zTlvQRJncVYExp16HOG8LZbvxNxZ4=; b=SM+4OkF9T/1wAH8p9tNrq6NQS9iCIWoMtkIAjy1UUDU47sAVF+SUkOM4njwVd7N1wMkksM OQxR/YWiLGERuK7yshxoxpEZ7+yEA+vwJ4R22Kr5HI/9A5bk2Jxvcb1OwXSVlJXaygqFe2 jJCIqze7fnzRsOHUZW+VKeZ/9hEvPftgm5iFewwgN3hkbbGmY/CTIEYVJtkX1ESyDgfk7M ADsuinWOfQ3972TKS2ggZtYH9zby1kcmEO+6j+SsV4kg55u+3aCyjsZ31/kUY7k58sRG+Q N6ZPjIbWdI+mmlcaf6Jd+fCkOGpRfLIbx+Wicr3+6i2cdc/tqQqe09sTsG4p8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692509818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YtaR+JRYKW1YV8zTlvQRJncVYExp16HOG8LZbvxNxZ4=; b=ogAU5053Y010M3LToR8EVQMopTL3wWeRwjJ0B3Gx2SILYTjrUyNxagA9zpK27069c5wYMn 0Qwe64FkOhr/8Wnhac73diCBOPNCBO8+qiE/rqU9b7HgNjZUuZnXwuT3j1o9xJnGdY3gey 4BkXhej7dpGWt+u8GJXkAbjQqgcr5ULgV9mF3cmFwZBi8m7FxlTxCmZaFZun4Vi3jN14aI Kjf8WGavUiMkCMkmV0JpFAS0ueiZa06wONYcknnTRVUEdRBgLPz6I4l/7x4tbzn33RUTOB 4N2rXzdN7mlbv+b3DMiil25VGvW1gQHlOkUJenILQPsmp9/1feTXcbukAotYvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692509818; a=rsa-sha256; cv=none; b=k8D1I5fVz35uyHDsHYwoEyjrey9/EcJ8NUqXDX56TJws3UVIlFQBI/7iTPMx0T3hFHtIDr 4Wsnxd4NLlLdlTwAlYuYInbuRczpUd6REQJCW1EcJT1ZuE37WlIjsaaoqOoYQUoa3JOLSf nDilZ76JF3oCOH0ji8qxETiM/MHMTBHF0zLIOOvHBjiWoJu6L0VvNa+VJgfj1eRYnYVOks 9pONGF8hltI/yBVGfrqQ/O/FRGNTeubHDCr6itDTen+xiHhsPj52QZ2gb/8VMfXc9stb9Q y54dll//xg2K/yERA+sQNs2vo+t55go5Ig4i+MRIdhCYgE3sxvoLbf8UenNyPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT49k4H0rzCdr; Sun, 20 Aug 2023 05:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K5awsi050025; Sun, 20 Aug 2023 05:36:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K5awCa050022; Sun, 20 Aug 2023 05:36:58 GMT (envelope-from git) Date: Sun, 20 Aug 2023 05:36:58 GMT Message-Id: <202308200536.37K5awCa050022@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: 79e6ffb6951b - main - netbsd-tests: libc: fix strvis(3) overflow 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79e6ffb6951bd75a92326fabadd48e87ee0aed96 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=79e6ffb6951bd75a92326fabadd48e87ee0aed96 commit 79e6ffb6951bd75a92326fabadd48e87ee0aed96 Author: Kyle Evans AuthorDate: 2023-08-20 05:28:08 +0000 Commit: Kyle Evans CommitDate: 2023-08-20 05:36:23 +0000 netbsd-tests: libc: fix strvis(3) overflow tests These tests weren't run on x86 until CI grabbed them. It turns out, there's a sign extension bug that surfaces on x86 with char being a signed type. NetBSD unearthed this when they took and improved the patch, so just grab their solution until we get to merging in the latest version of the test. Reported by: CI (via ngie) Fixes: 2f489a509e61 ("libc: fix some overflow scenarios in vis(3)") --- contrib/netbsd-tests/lib/libc/gen/t_vis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/netbsd-tests/lib/libc/gen/t_vis.c b/contrib/netbsd-tests/lib/libc/gen/t_vis.c index 80800bf8b31f..8d0e7a50b329 100644 --- a/contrib/netbsd-tests/lib/libc/gen/t_vis.c +++ b/contrib/netbsd-tests/lib/libc/gen/t_vis.c @@ -176,7 +176,7 @@ ATF_TC_BODY(strvis_locale, tc) #endif /* VIS_NOLOCALE */ #ifdef __FreeBSD__ -#define STRVIS_OVERFLOW_MARKER 0xff /* Arbitrary */ +#define STRVIS_OVERFLOW_MARKER ((char)0xff) /* Arbitrary */ ATF_TC(strvis_overflow_mb); ATF_TC_HEAD(strvis_overflow_mb, tc) From nobody Sun Aug 20 05:47: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 4RT4Q14TlSz4qlhQ; Sun, 20 Aug 2023 05:47:37 +0000 (UTC) (envelope-from grahamperrin@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 4RT4Q13nV1z4Ym9; Sun, 20 Aug 2023 05:47:37 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692510457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=85ILKQk14wXE01gR5rGTh+av85KotSKWdi94AGZndVc=; b=bXBdEnIEZaBde+T+i5J/X2JFHbIhiVfICjFqXbQ63+CZaUIZj7VNYkkjgxZGW0PE0tWIYo K99SrGW4PjkHtSRhhmCwtQi63DP3U8EbPxEWKpROYY2H1xcEOKDhDzVpSvTzwohwjzh77k p14RLcX6WocKtxuF7TbHxOOuoOqFIuPG2Wdp71Rh0Fm/wRk8XbtzeHbQACfTgzmeKEE8Qv WdWS/H6Tfmtsuw3Ib0a4g41KuM7GiG9pDhBT+lN5m/VVvp3nppNCnxR6h4EGSq2Esc9ZTj Q2MJ0y0d2zlV26GrTMbAnBslSeE7spTY3bMt2W3H9TJvPe9IdItTe22C+jurdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692510457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=85ILKQk14wXE01gR5rGTh+av85KotSKWdi94AGZndVc=; b=u+X6Im/Zm69OiqV1ux5pWgWxMf3/0Ty10dkmsy20AQw/EPqYz5rAbyyF91dcbDbfeFPYye VMJv2BhKOpbuOG7jYrOD/JpjAnXBZZxJ60m4317hPWGV2LOCJnYpZyi6dKToIEaX+UzAkl vzcQ8IGbaiUTEP5XooIjqjhT3PpAaPBLlt6EjZ61TpRq02qerPR/GXtacvZE6TSF+3woi/ i3E6Yc00SSW6gBLL+Z5nr7ilMUlPiiarp0/uVCoaxfQ04FyS3cnIi2zmLTFqWb7QbZ/viE +ILeSb3EgSPBmFEiguPCyKjvMY4jyBSapX9YWgwYPTaRKHOjASD/2hClSrndyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692510457; a=rsa-sha256; cv=none; b=ar9ub7JhzF48CxAb3DR1frbQbO4zfj2YzWRYvIdzpmbP2wzkwA2Y9LqGVOs89ayTVVGjG3 aWd2uaJzoxRE1nL0G+AhIFb0JSrHo4bFHgn6zjmEUnN3chLZcjU0ImvAoH0rwIAGuvmlFb m6U90T8US95eHac1srSWihWuamkE2GXi+oUBRk0pC82+6YH60oDCYVCILU+RW0ubcrCZto M0Ig7cVF4+0CvoJIWi51Xe0UEdZ3vnVVjyIWRn117U4FpHMjLoWAxXAIHzTa8WDagEsb+e sNNTEUntLO7k0JF0RMVwjJmlhaGeoJeodIcb5fen7DOT2E9SZe0HGPqgJS43gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.1.10] (80-42-66-93.dynamic.dsl.as9105.com [80.42.66.93]) (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: grahamperrin) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RT4Q073ZBz10ZH; Sun, 20 Aug 2023 05:47:36 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) Message-ID: <2d41ce7b-78ad-1549-bee9-c63674dc7247@freebsd.org> Date: Sun, 20 Aug 2023 06:47:34 +0100 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: 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.14.0 Subject: Re: edacf4b4824a - main - UPDATING: fix a typo, adjust a white space Content-Language: en-US Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202308181700.37IH0WZT094403@gitrepo.freebsd.org> <892EAD83-FCB9-4885-A5AC-00057E0C8577@panasas.com> From: Graham Perrin Organization: FreeBSD In-Reply-To: <892EAD83-FCB9-4885-A5AC-00057E0C8577@panasas.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------6gvMrBhT0zlwqWNeOXu5Oodt" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------6gvMrBhT0zlwqWNeOXu5Oodt Content-Type: multipart/mixed; boundary="------------oDqYkEeLtyEZnp3Tnpe7PhPX"; protected-headers="v1" From: Graham Perrin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <2d41ce7b-78ad-1549-bee9-c63674dc7247@freebsd.org> Subject: Re: edacf4b4824a - main - UPDATING: fix a typo, adjust a white space References: <202308181700.37IH0WZT094403@gitrepo.freebsd.org> <892EAD83-FCB9-4885-A5AC-00057E0C8577@panasas.com> In-Reply-To: <892EAD83-FCB9-4885-A5AC-00057E0C8577@panasas.com> --------------oDqYkEeLtyEZnp3Tnpe7PhPX Content-Type: multipart/alternative; boundary="------------p3v46eISG1sf5yNk60zV58UV" --------------p3v46eISG1sf5yNk60zV58UV Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 T24gMjAvMDgvMjAyMyAwNTo0NywgUmF2aSBQb2thbGEgd3JvdGU6DQo+IEknbSBzdGF5aW5n IGF3YXkgZnJvbSB0aGF0IGJpa2VzaGVkLg0KSSBwcmVmZXIgdGhlIHdvcmQgYmljeWNsZS4N Cg== --------------p3v46eISG1sf5yNk60zV58UV Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
On 20/08/2023 05:47, Ravi Pokala wrote= :
I'm staying away from that b=
ikeshed.
I prefer the word bicycle.
--------------p3v46eISG1sf5yNk60zV58UV-- --------------oDqYkEeLtyEZnp3Tnpe7PhPX-- --------------6gvMrBhT0zlwqWNeOXu5Oodt Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEWT/lssMHB+28ly8Kt2dIb0oY1AsFAmThqPYFAwAAAAAACgkQt2dIb0oY1AvQ Ow/9EpRn+A5FkZSKROhvZ5DVIS64r+oofkPsymGH72XTLYAWvrQfv1Hw9M6M7XjPz/da6HKX0+uZ MbAsu3u9jpXBWvvqXlIJXM0gRPltj6eVu7pG968U+jo1aIOrZ61Rz5txMLGgWqmhEzgWBtDLTQBK YRxI+1tB+aJEOfSZwFjQ++TNujqkfcVGH/vP61h5Ss7ziRAfh+C6kHLf2CYl5yyz1Emds+XYvWjg rnnrVmAoaMRPCW9OOYz8ScAvfFn22NdB0Y/qOu+XeiY+seiU24kQvSAP9orkrOrIOPJMX1yu1xJQ FxXYPie6h3GupMxIukzh9VnG05vTKhgRLMAtJuMyEUYuZBWGLVVBeYB3mdQbswviuWD65VQT69br 7FhWZLYwmBhMYfcTRatBeiIVJG4qRkqJyJ91iaY6vnqOxCk1dQobSO5RAbaUc/S27Bkr+8j9gq+a qvDMz1mrhXN48+4LjeaVxnE/NhNJdUBOVxt7fVBoo66ChwVxME7y+ihRKHWQJ89eiisnI6AyC4a4 /FzArp3ZTjc4CMPQK8sTc59WyXvnCRksm3nE5BTidjwAJOHA3kNa+4HLrd1Xdi7qVVAlXJY+rDjn h0ZDCIQW3PvF8oqeVKST/3tN6Kj2kUR0zuN4Q4y5u9FUkoyasJ7ALZ+9CH4KE4CWEYjWnTSNopPU TO4= =jRqi -----END PGP SIGNATURE----- --------------6gvMrBhT0zlwqWNeOXu5Oodt-- From nobody Sun Aug 20 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 4RT4mR1k39z4qmTM; Sun, 20 Aug 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 4RT4mQ72RRz4bp8; Sun, 20 Aug 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=1692511415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h4of+tkFJOUFq0AVTZMEFoJjeMgy6G2inLkenPtFeM4=; b=FKrh9N6BtsBM4ykOOkmw8uPXfvvzdHYjJynMiqJPDr/8aUcihMuUwPj49Ekx3i+HwMNttE no8eIyj1dJkSFIkq0j9j/CcvVw0+QB2GgTkJuLV38PtIXmf64Wbbak+GaB1/GxfC8+5CmD +vOUe+55vofyYZ6sATv81VXDNeNrnV7FDjlor9BOcbg5uSj10cm4hIObD17rXeN6QAocWh oPQWDoohJdUfD5XpNUHAyRNMhCtIWiJo661Eheq6xdxcXJfjDGtNTYD9YU4nWr5W0d8z9U ZmykrtZWKGOuXZtx1MALIHJIicdJ6C81VuYY3BVkAzcWzCktC/46uFsddVP1Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692511415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h4of+tkFJOUFq0AVTZMEFoJjeMgy6G2inLkenPtFeM4=; b=YpFuTxE8oHh7j24HFD6VSdnzmLCTYrRNRk2tyMQfDdaWBWWdmaS/kUDpbAeYVL8xTQk8vo 87qk5gb0AvdPxs1PLEteYBaS1aGncbKvKrcuYVRMpwM9Myh+C7n/4WqxmbS4n7UMmSFPVu fcRpOkYmQrPzdEP3+aeymGmqna17uWfsPw9mYZ0sJaGZ0FX1r0M2PgjovZFuJ7uevIqQnW 3ArzGLMH8V7PiyEQdq59PBdLyNd4RtU1/2xk0aaNJVZ83zX4cdVJYd99JocwQI03MO4Sne cX3bdgUuXBmkcBDeHeFXkVVQ6IUGFP7d+A/i0wKrdiB+lTu5W7KxpSu4rLwkQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692511415; a=rsa-sha256; cv=none; b=ftkZD9wTcpaMRY7m4rGa40SWc8g9Fx2QlakqeSkmt7laHyPlM5X4jJ/0SLpECoC9RcyybU kmyS/xWL1aCl0jU5U+6569viP4g9K2YymTIv263IMcdop6glJiECffjatrJlGhZS9KwHFB ulz+lRT0jOAwHZgCPlJ/459u0qqYCXg9Z2BHeU/aQVo9M+JUtdjWT0d4HwmrD9iBx6Oo2y PUHY0DLfG8UyEhdj+7r6ufOcVjVOJgGOOub5wFFlTOVC767PL9nqTpg6WlYecWexmIAFW4 TQmSsPr+g/gkr7/bcJgIFIF8W59s0yEy2B+hxWzLumyFV/syfYs0o3zLy+KONw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT4mQ66j0zCdS; Sun, 20 Aug 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.17.1/8.17.1) with ESMTP id 37K63YPq099787; Sun, 20 Aug 2023 06:03:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K63Y02099784; Sun, 20 Aug 2023 06:03:34 GMT (envelope-from git) Date: Sun, 20 Aug 2023 06:03:34 GMT Message-Id: <202308200603.37K63Y02099784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 6feeb67bf81e - main - Bump __FreeBSD_version for struct sysinit 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6feeb67bf81e4a80710fee58ab78bb9281c37659 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6feeb67bf81e4a80710fee58ab78bb9281c37659 commit 6feeb67bf81e4a80710fee58ab78bb9281c37659 Author: Colin Percival AuthorDate: 2023-08-20 06:01:27 +0000 Commit: Colin Percival CommitDate: 2023-08-20 06:03:30 +0000 Bump __FreeBSD_version for struct sysinit change The layout of struct sysinit changed in cedc82c0466a to add a "SLIST_ENTRY(sysinit) next" field so that sysinits can be placed into a linked list. Reported by: jrtc27 --- 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 49839e3a3598..1b8df48e4bd8 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400094 +#define __FreeBSD_version 1400095 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun Aug 20 06:07: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 4RT4rn2VbTz4qmcM; Sun, 20 Aug 2023 06:07: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 4RT4rn2B6wz4c4K; Sun, 20 Aug 2023 06:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692511641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iz+Nyf4wWKqABfHWekeK6MXXt7ab5DLqKfUnb9sHNn4=; b=nhGPN1XG3LwOwgCOYkeEj4NdxygjFnfLbpszkUIY7DbpzIbxwp44WXaWZx1/HsTwq/EWtn SRlu2+ll9TZYLJlH1eECP2ppYj32Ripyu6LSBIAxCVHWL3a8oWB6iY86aaxMeSc4VqjDpS 3Etc/wo0NjpL7t+Id5npeOsxISpvPUIkZBtOfw69cIT/k3o4LDTLDSEROQAdlgle0CTXz2 mzcqS/7CiYIS9QqW62tuQzlGNJLORHIVMCjt4betcS6BXgmwYPM2nCCky6S4khM4MGzYoX rpZsLX7SfLAAR7+C2V76Ev9NBhem4TRbBoBVZUiHpxYsAgBSERtKFin6bUzvcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692511641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iz+Nyf4wWKqABfHWekeK6MXXt7ab5DLqKfUnb9sHNn4=; b=n8n0hqMX/iKniXJ6EMYxnhSBvNwT3OWfyIaOhyFewTxaK9TwwOJztNQ881YlcmcDbkTos5 7CR0DXXogjeKur6Wb4nXn3tZ/w3547qr9WrtmcoWedO0TimCSvvfOj7jkW5xsEMT5miWO7 YnfCAUlsIuK4d5Szl9rohBMJ8GZFPafUOR4zFkPqU9QHtWmeTDwrlmUsSQPJkL7lqzorsL gJLoYt3MJ4DYB/dxsgaulIKmGk18hqzYk5H+tVOca2pxgHaXVMSPP7MWzk/3wowrptpRGm CMvQAbyerLPL7wiDXhOghKO1Fbme9N9UYwdJweYrKNHw/J7Re5uN5anTHhX6EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692511641; a=rsa-sha256; cv=none; b=La0efX32KTA6CnSuQaUDFUq372vAf+N0vomgZJnNrF9okW/7KXgDqyZaa/B3G4SklmriFy ushzi4ypb6Vk5vNcCoIQDZjuSgerzCnKeMoioaoYOI7cwwiAxEJTGu6Rsm5EcCpQSOxSo3 PQiVCHCGKXOMnbzXDKcw9VJXNp09I7Yrn+nblvLuFMw2vWAPjZQOWQbSt8C0oMvuFtrFqK UfLqA/iPp+5h9xmykQC0hCdZDuNn0ndvSL8tgct831xWZ6OynyUcdQBugmfUcwyYiBaEhY 6E6Dh/czUY47E92R+zU1oqwikUelgjJoMh4+ulZGQefohahJyO2rbzmvh0LQGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT4rn1DFVzDHF; Sun, 20 Aug 2023 06:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K67Ljb000453; Sun, 20 Aug 2023 06:07:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K67K9X000450; Sun, 20 Aug 2023 06:07:20 GMT (envelope-from git) Date: Sun, 20 Aug 2023 06:07:20 GMT Message-Id: <202308200607.37K67K9X000450@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: 4717628ed859 - main - MFV: zlib 1.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4717628ed859513a3262ea68259d0605f39de0b3 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=4717628ed859513a3262ea68259d0605f39de0b3 commit 4717628ed859513a3262ea68259d0605f39de0b3 Merge: 6feeb67bf81e b37eb25116f9 Author: Xin LI AuthorDate: 2023-08-20 06:06:49 +0000 Commit: Xin LI CommitDate: 2023-08-20 06:06:49 +0000 MFV: zlib 1.3 Relnotes: yes MFC after: 2 weeks sys/contrib/zlib/ChangeLog | 20 +- sys/contrib/zlib/FAQ | 2 +- sys/contrib/zlib/README | 19 +- sys/contrib/zlib/adler32.c | 32 +-- sys/contrib/zlib/compress.c | 21 +- sys/contrib/zlib/crc32.c | 254 ++++++----------- sys/contrib/zlib/deflate.c | 569 ++++++++++++++++----------------------- sys/contrib/zlib/deflate.h | 16 +- sys/contrib/zlib/gzclose.c | 4 +- sys/contrib/zlib/gzguts.h | 23 +- sys/contrib/zlib/gzlib.c | 103 ++----- sys/contrib/zlib/gzread.c | 90 ++----- sys/contrib/zlib/gzwrite.c | 86 ++---- sys/contrib/zlib/infback.c | 30 +-- sys/contrib/zlib/inffast.c | 5 +- sys/contrib/zlib/inffast.h | 2 +- sys/contrib/zlib/inflate.c | 129 +++------ sys/contrib/zlib/inftrees.c | 17 +- sys/contrib/zlib/inftrees.h | 6 +- sys/contrib/zlib/test/example.c | 103 ++----- sys/contrib/zlib/test/infcover.c | 5 +- sys/contrib/zlib/test/minigzip.c | 172 ++++-------- sys/contrib/zlib/trees.c | 526 +++++++++++++++--------------------- sys/contrib/zlib/uncompr.c | 16 +- sys/contrib/zlib/zconf.h | 10 +- sys/contrib/zlib/zconf.h.in | 8 +- sys/contrib/zlib/zlib.3 | 6 +- sys/contrib/zlib/zlib.h | 377 +++++++++++++------------- sys/contrib/zlib/zutil.c | 60 ++--- sys/contrib/zlib/zutil.h | 20 +- 30 files changed, 1024 insertions(+), 1707 deletions(-) diff --cc sys/contrib/zlib/deflate.c index cffe335093d6,000000000000..06eb2c0f6de5 mode 100644,000000..100644 --- a/sys/contrib/zlib/deflate.c +++ b/sys/contrib/zlib/deflate.c @@@ -1,2219 -1,0 +1,2116 @@@ +/* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler ++ * Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + * ALGORITHM + * + * The "deflation" process depends on being able to identify portions + * of the input text which are identical to earlier input (within a + * sliding window trailing behind the input currently being processed). + * + * The most straightforward technique turns out to be the fastest for + * most input files: try all possible matches and select the longest. + * The key feature of this algorithm is that insertions into the string + * dictionary are very simple and thus fast, and deletions are avoided + * completely. Insertions are performed at each input character, whereas + * string matches are performed only when the previous match ends. So it + * is preferable to spend more time in matches to allow very fast string + * insertions and avoid deletions. The matching algorithm for small + * strings is inspired from that of Rabin & Karp. A brute force approach + * is used to find longer strings when a small match has been found. + * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze + * (by Leonid Broukhis). + * A previous version of this file used a more sophisticated algorithm + * (by Fiala and Greene) which is guaranteed to run in linear amortized + * time, but has a larger average cost, uses more memory and is patented. + * However the F&G algorithm may be faster for some highly redundant + * files if the parameter max_chain_length (described below) is too large. + * + * ACKNOWLEDGEMENTS + * + * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and + * I found it in 'freeze' written by Leonid Broukhis. + * Thanks to many people for bug reports and testing. + * + * REFERENCES + * + * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification". + * Available in http://tools.ietf.org/html/rfc1951 + * + * A description of the Rabin and Karp algorithm is given in the book + * "Algorithms" by R. Sedgewick, Addison-Wesley, p252. + * + * Fiala,E.R., and Greene,D.H. + * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595 + * + */ + +/* @(#) $Id$ */ + +#include "deflate.h" + +const char deflate_copyright[] = - " deflate 1.2.13 Copyright 1995-2022 Jean-loup Gailly and Mark Adler "; ++ " deflate 1.3 Copyright 1995-2023 Jean-loup Gailly and Mark Adler "; +/* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot + include such an acknowledgment, I would appreciate that you keep this + copyright string in the executable of your product. + */ + - /* =========================================================================== - * Function prototypes. - */ +typedef enum { + need_more, /* block not completed, need more input or more output */ + block_done, /* block flush performed */ + finish_started, /* finish started, need only more output at next deflate */ + finish_done /* finish done, accept no more input or output */ +} block_state; + - typedef block_state (*compress_func) OF((deflate_state *s, int flush)); ++typedef block_state (*compress_func)(deflate_state *s, int flush); +/* Compression function. Returns the block state after the call. */ + - local int deflateStateCheck OF((z_streamp strm)); - local void slide_hash OF((deflate_state *s)); - local void fill_window OF((deflate_state *s)); - local block_state deflate_stored OF((deflate_state *s, int flush)); - local block_state deflate_fast OF((deflate_state *s, int flush)); ++local block_state deflate_stored(deflate_state *s, int flush); ++local block_state deflate_fast(deflate_state *s, int flush); +#ifndef FASTEST - local block_state deflate_slow OF((deflate_state *s, int flush)); - #endif - local block_state deflate_rle OF((deflate_state *s, int flush)); - local block_state deflate_huff OF((deflate_state *s, int flush)); - local void lm_init OF((deflate_state *s)); - local void putShortMSB OF((deflate_state *s, uInt b)); - local void flush_pending OF((z_streamp strm)); - local unsigned read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); - local uInt longest_match OF((deflate_state *s, IPos cur_match)); - - #ifdef ZLIB_DEBUG - local void check_match OF((deflate_state *s, IPos start, IPos match, - int length)); ++local block_state deflate_slow(deflate_state *s, int flush); +#endif ++local block_state deflate_rle(deflate_state *s, int flush); ++local block_state deflate_huff(deflate_state *s, int flush); + +/* =========================================================================== + * Local data + */ + +#define NIL 0 +/* Tail of hash chains */ + +#ifndef TOO_FAR +# define TOO_FAR 4096 +#endif +/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + +/* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to + * exclude worst case performance for pathological files. Better values may be + * found for specific files. + */ +typedef struct config_s { + ush good_length; /* reduce lazy search above this match length */ + ush max_lazy; /* do not perform lazy search above this match length */ + ush nice_length; /* quit search above this match length */ + ush max_chain; + compress_func func; +} config; + +#ifdef FASTEST +local const config configuration_table[2] = { +/* good lazy nice chain */ +/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ +/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */ +#else +local const config configuration_table[10] = { +/* good lazy nice chain */ +/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ +/* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */ +/* 2 */ {4, 5, 16, 8, deflate_fast}, +/* 3 */ {4, 6, 32, 32, deflate_fast}, + +/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */ +/* 5 */ {8, 16, 32, 32, deflate_slow}, +/* 6 */ {8, 16, 128, 128, deflate_slow}, +/* 7 */ {8, 32, 128, 256, deflate_slow}, +/* 8 */ {32, 128, 258, 1024, deflate_slow}, +/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ +#endif + +/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 + * For deflate_fast() (levels <= 3) good is ignored and lazy has a different + * meaning. + */ + +/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */ +#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0)) + +/* =========================================================================== + * Update a hash value with the given input byte + * IN assertion: all calls to UPDATE_HASH are made with consecutive input + * characters, so that a running hash key can be computed from the previous + * key instead of complete recalculation each time. + */ +#define UPDATE_HASH(s,h,c) (h = (((h) << s->hash_shift) ^ (c)) & s->hash_mask) + + +/* =========================================================================== + * Insert string str in the dictionary and set match_head to the previous head + * of the hash chain (the most recent string with same hash key). Return + * the previous length of the hash chain. + * If this file is compiled with -DFASTEST, the compression level is forced + * to 1, and no hash chains are maintained. + * IN assertion: all calls to INSERT_STRING are made with consecutive input + * characters and the first MIN_MATCH bytes of str are valid (except for + * the last MIN_MATCH-1 bytes of the input file). + */ +#ifdef FASTEST +#define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) +#else +#define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) +#endif + +/* =========================================================================== + * Initialize the hash table (avoiding 64K overflow for 16 bit systems). + * prev[] will be initialized on the fly. + */ +#define CLEAR_HASH(s) \ + do { \ + s->head[s->hash_size - 1] = NIL; \ + zmemzero((Bytef *)s->head, \ + (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \ + } while (0) + +/* =========================================================================== + * Slide the hash table when sliding the window down (could be avoided with 32 + * bit values at the expense of memory usage). We slide even when level == 0 to + * keep the hash table consistent if we switch back to level > 0 later. + */ - local void slide_hash(s) - deflate_state *s; - { ++#if defined(__has_feature) ++# if __has_feature(memory_sanitizer) ++ __attribute__((no_sanitize("memory"))) ++# endif ++#endif ++local void slide_hash(deflate_state *s) { + unsigned n, m; + Posf *p; + uInt wsize = s->w_size; + + n = s->hash_size; + p = &s->head[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m - wsize : NIL); + } while (--n); + n = wsize; +#ifndef FASTEST + p = &s->prev[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m - wsize : NIL); + /* If n is not on any hash chain, prev[n] is garbage but + * its value will never be used. + */ + } while (--n); +#endif +} + ++/* =========================================================================== ++ * Read a new buffer from the current input stream, update the adler32 ++ * and total number of bytes read. All deflate() input goes through ++ * this function so some applications may wish to modify it to avoid ++ * allocating a large strm->next_in buffer and copying from it. ++ * (See also flush_pending()). ++ */ ++local unsigned read_buf(z_streamp strm, Bytef *buf, unsigned size) { ++ unsigned len = strm->avail_in; ++ ++ if (len > size) len = size; ++ if (len == 0) return 0; ++ ++ strm->avail_in -= len; ++ ++ zmemcpy(buf, strm->next_in, len); ++ if (strm->state->wrap == 1) { ++ strm->adler = adler32(strm->adler, buf, len); ++ } ++#ifdef GZIP ++ else if (strm->state->wrap == 2) { ++ strm->adler = crc32(strm->adler, buf, len); ++ } ++#endif ++ strm->next_in += len; ++ strm->total_in += len; ++ ++ return len; ++} ++ ++/* =========================================================================== ++ * Fill the window when the lookahead becomes insufficient. ++ * Updates strstart and lookahead. ++ * ++ * IN assertion: lookahead < MIN_LOOKAHEAD ++ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD ++ * At least one byte has been read, or avail_in == 0; reads are ++ * performed for at least two bytes (required for the zip translate_eol ++ * option -- not supported here). ++ */ ++local void fill_window(deflate_state *s) { ++ unsigned n; ++ unsigned more; /* Amount of free space at the end of the window. */ ++ uInt wsize = s->w_size; ++ ++ Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead"); ++ ++ do { ++ more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); ++ ++ /* Deal with !@#$% 64K limit: */ ++ if (sizeof(int) <= 2) { ++ if (more == 0 && s->strstart == 0 && s->lookahead == 0) { ++ more = wsize; ++ ++ } else if (more == (unsigned)(-1)) { ++ /* Very unlikely, but possible on 16 bit machine if ++ * strstart == 0 && lookahead == 1 (input done a byte at time) ++ */ ++ more--; ++ } ++ } ++ ++ /* If the window is almost full and there is insufficient lookahead, ++ * move the upper half to the lower one to make room in the upper half. ++ */ ++ if (s->strstart >= wsize + MAX_DIST(s)) { ++ ++ zmemcpy(s->window, s->window + wsize, (unsigned)wsize - more); ++ s->match_start -= wsize; ++ s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ ++ s->block_start -= (long) wsize; ++ if (s->insert > s->strstart) ++ s->insert = s->strstart; ++ slide_hash(s); ++ more += wsize; ++ } ++ if (s->strm->avail_in == 0) break; ++ ++ /* If there was no sliding: ++ * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && ++ * more == window_size - lookahead - strstart ++ * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) ++ * => more >= window_size - 2*WSIZE + 2 ++ * In the BIG_MEM or MMAP case (not yet supported), ++ * window_size == input_size + MIN_LOOKAHEAD && ++ * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. ++ * Otherwise, window_size == 2*WSIZE so more >= 2. ++ * If there was sliding, more >= WSIZE. So in all cases, more >= 2. ++ */ ++ Assert(more >= 2, "more < 2"); ++ ++ n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more); ++ s->lookahead += n; ++ ++ /* Initialize the hash value now that we have some input: */ ++ if (s->lookahead + s->insert >= MIN_MATCH) { ++ uInt str = s->strstart - s->insert; ++ s->ins_h = s->window[str]; ++ UPDATE_HASH(s, s->ins_h, s->window[str + 1]); ++#if MIN_MATCH != 3 ++ Call UPDATE_HASH() MIN_MATCH-3 more times ++#endif ++ while (s->insert) { ++ UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); ++#ifndef FASTEST ++ s->prev[str & s->w_mask] = s->head[s->ins_h]; ++#endif ++ s->head[s->ins_h] = (Pos)str; ++ str++; ++ s->insert--; ++ if (s->lookahead + s->insert < MIN_MATCH) ++ break; ++ } ++ } ++ /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, ++ * but this is not important since only literal bytes will be emitted. ++ */ ++ ++ } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); ++ ++ /* If the WIN_INIT bytes after the end of the current data have never been ++ * written, then zero those bytes in order to avoid memory check reports of ++ * the use of uninitialized (or uninitialised as Julian writes) bytes by ++ * the longest match routines. Update the high water mark for the next ++ * time through here. WIN_INIT is set to MAX_MATCH since the longest match ++ * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead. ++ */ ++ if (s->high_water < s->window_size) { ++ ulg curr = s->strstart + (ulg)(s->lookahead); ++ ulg init; ++ ++ if (s->high_water < curr) { ++ /* Previous high water mark below current data -- zero WIN_INIT ++ * bytes or up to end of window, whichever is less. ++ */ ++ init = s->window_size - curr; ++ if (init > WIN_INIT) ++ init = WIN_INIT; ++ zmemzero(s->window + curr, (unsigned)init); ++ s->high_water = curr + init; ++ } ++ else if (s->high_water < (ulg)curr + WIN_INIT) { ++ /* High water mark at or above current data, but below current data ++ * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up ++ * to end of window, whichever is less. ++ */ ++ init = (ulg)curr + WIN_INIT - s->high_water; ++ if (init > s->window_size - s->high_water) ++ init = s->window_size - s->high_water; ++ zmemzero(s->window + s->high_water, (unsigned)init); ++ s->high_water += init; ++ } ++ } ++ ++ Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD, ++ "not enough room for search"); ++} ++ +/* ========================================================================= */ - int ZEXPORT deflateInit_(strm, level, version, stream_size) - z_streamp strm; - int level; - const char *version; - int stream_size; - { ++int ZEXPORT deflateInit_(z_streamp strm, int level, const char *version, ++ int stream_size) { + return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, + Z_DEFAULT_STRATEGY, version, stream_size); + /* To do: ignore strm->next_in if we use it as window */ +} + +/* ========================================================================= */ - int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - version, stream_size) - z_streamp strm; - int level; - int method; - int windowBits; - int memLevel; - int strategy; - const char *version; - int stream_size; - { ++int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, ++ int windowBits, int memLevel, int strategy, ++ const char *version, int stream_size) { + deflate_state *s; + int wrap = 1; + static const char my_version[] = ZLIB_VERSION; + + if (version == Z_NULL || version[0] != my_version[0] || + stream_size != sizeof(z_stream)) { + return Z_VERSION_ERROR; + } + if (strm == Z_NULL) return Z_STREAM_ERROR; + + strm->msg = Z_NULL; + if (strm->zalloc == (alloc_func)0) { +#if defined(Z_SOLO) && !defined(_KERNEL) + return Z_STREAM_ERROR; +#else + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; +#endif + } + if (strm->zfree == (free_func)0) +#if defined(Z_SOLO) && !defined(_KERNEL) + return Z_STREAM_ERROR; +#else + strm->zfree = zcfree; +#endif + +#ifdef FASTEST + if (level != 0) level = 1; +#else + if (level == Z_DEFAULT_COMPRESSION) level = 6; +#endif + + if (windowBits < 0) { /* suppress zlib wrapper */ + wrap = 0; + if (windowBits < -15) + return Z_STREAM_ERROR; + windowBits = -windowBits; + } +#ifdef GZIP + else if (windowBits > 15) { + wrap = 2; /* write gzip wrapper instead */ + windowBits -= 16; + } +#endif + if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || + windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || + strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) { + return Z_STREAM_ERROR; + } + if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ + s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state)); + if (s == Z_NULL) return Z_MEM_ERROR; + strm->state = (struct internal_state FAR *)s; + s->strm = strm; + s->status = INIT_STATE; /* to pass state test in deflateReset() */ + + s->wrap = wrap; + s->gzhead = Z_NULL; + s->w_bits = (uInt)windowBits; + s->w_size = 1 << s->w_bits; + s->w_mask = s->w_size - 1; + + s->hash_bits = (uInt)memLevel + 7; + s->hash_size = 1 << s->hash_bits; + s->hash_mask = s->hash_size - 1; + s->hash_shift = ((s->hash_bits + MIN_MATCH-1) / MIN_MATCH); + + s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); + s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); + s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); + + s->high_water = 0; /* nothing written to s->window yet */ + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + + /* We overlay pending_buf and sym_buf. This works since the average size + * for length/distance pairs over any compressed block is assured to be 31 + * bits or less. + * + * Analysis: The longest fixed codes are a length code of 8 bits plus 5 + * extra bits, for lengths 131 to 257. The longest fixed distance codes are + * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest + * possible fixed-codes length/distance pair is then 31 bits total. + * + * sym_buf starts one-fourth of the way into pending_buf. So there are + * three bytes in sym_buf for every four bytes in pending_buf. Each symbol + * in sym_buf is three bytes -- two for the distance and one for the + * literal/length. As each symbol is consumed, the pointer to the next + * sym_buf value to read moves forward three bytes. From that symbol, up to + * 31 bits are written to pending_buf. The closest the written pending_buf + * bits gets to the next sym_buf symbol to read is just before the last + * code is written. At that time, 31*(n - 2) bits have been written, just + * after 24*(n - 2) bits have been consumed from sym_buf. sym_buf starts at + * 8*n bits into pending_buf. (Note that the symbol buffer fills when n - 1 + * symbols are written.) The closest the writing gets to what is unread is + * then n + 14 bits. Here n is lit_bufsize, which is 16384 by default, and + * can range from 128 to 32768. + * + * Therefore, at a minimum, there are 142 bits of space between what is + * written and what is read in the overlain buffers, so the symbols cannot + * be overwritten by the compressed data. That space is actually 139 bits, + * due to the three-bit fixed-code block header. + * + * That covers the case where either Z_FIXED is specified, forcing fixed + * codes, or when the use of fixed codes is chosen, because that choice + * results in a smaller compressed block than dynamic codes. That latter + * condition then assures that the above analysis also covers all dynamic + * blocks. A dynamic-code block will only be chosen to be emitted if it has + * fewer bits than a fixed-code block would for the same set of symbols. + * Therefore its average symbol length is assured to be less than 31. So + * the compressed data for a dynamic block also cannot overwrite the + * symbols from which it is being constructed. + */ + + s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4); + s->pending_buf_size = (ulg)s->lit_bufsize * 4; + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { + s->status = FINISH_STATE; + strm->msg = ERR_MSG(Z_MEM_ERROR); + deflateEnd (strm); + return Z_MEM_ERROR; + } + s->sym_buf = s->pending_buf + s->lit_bufsize; + s->sym_end = (s->lit_bufsize - 1) * 3; + /* We avoid equality with lit_bufsize*3 because of wraparound at 64K + * on 16 bit machines and because stored blocks are restricted to + * 64K-1 bytes. + */ + + s->level = level; + s->strategy = strategy; + s->method = (Byte)method; + + return deflateReset(strm); +} + +/* ========================================================================= + * Check for a valid deflate stream state. Return 0 if ok, 1 if not. + */ - local int deflateStateCheck(strm) - z_streamp strm; - { ++local int deflateStateCheck(z_streamp strm) { + deflate_state *s; + if (strm == Z_NULL || + strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) + return 1; + s = strm->state; + if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE && +#ifdef GZIP + s->status != GZIP_STATE && +#endif + s->status != EXTRA_STATE && + s->status != NAME_STATE && + s->status != COMMENT_STATE && + s->status != HCRC_STATE && + s->status != BUSY_STATE && + s->status != FINISH_STATE)) + return 1; + return 0; +} + +/* ========================================================================= */ - int ZEXPORT deflateSetDictionary(strm, dictionary, dictLength) - z_streamp strm; - const Bytef *dictionary; - uInt dictLength; - { ++int ZEXPORT deflateSetDictionary(z_streamp strm, const Bytef *dictionary, ++ uInt dictLength) { + deflate_state *s; + uInt str, n; + int wrap; + unsigned avail; + z_const unsigned char *next; + + if (deflateStateCheck(strm) || dictionary == Z_NULL) + return Z_STREAM_ERROR; + s = strm->state; + wrap = s->wrap; + if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead) + return Z_STREAM_ERROR; + + /* when using zlib wrappers, compute Adler-32 for provided dictionary */ + if (wrap == 1) + strm->adler = adler32(strm->adler, dictionary, dictLength); + s->wrap = 0; /* avoid computing Adler-32 in read_buf */ + + /* if dictionary would fill window, just replace the history */ + if (dictLength >= s->w_size) { + if (wrap == 0) { /* already empty otherwise */ + CLEAR_HASH(s); + s->strstart = 0; + s->block_start = 0L; + s->insert = 0; + } + dictionary += dictLength - s->w_size; /* use the tail */ + dictLength = s->w_size; + } + + /* insert dictionary into window and hash */ + avail = strm->avail_in; + next = strm->next_in; + strm->avail_in = dictLength; + strm->next_in = (z_const Bytef *)dictionary; + fill_window(s); + while (s->lookahead >= MIN_MATCH) { + str = s->strstart; + n = s->lookahead - (MIN_MATCH-1); + do { + UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); +#ifndef FASTEST + s->prev[str & s->w_mask] = s->head[s->ins_h]; +#endif + s->head[s->ins_h] = (Pos)str; + str++; + } while (--n); + s->strstart = str; + s->lookahead = MIN_MATCH-1; + fill_window(s); + } + s->strstart += s->lookahead; + s->block_start = (long)s->strstart; + s->insert = s->lookahead; + s->lookahead = 0; + s->match_length = s->prev_length = MIN_MATCH-1; + s->match_available = 0; + strm->next_in = next; + strm->avail_in = avail; + s->wrap = wrap; + return Z_OK; +} + +/* ========================================================================= */ - int ZEXPORT deflateGetDictionary(strm, dictionary, dictLength) - z_streamp strm; - Bytef *dictionary; - uInt *dictLength; - { ++int ZEXPORT deflateGetDictionary(z_streamp strm, Bytef *dictionary, ++ uInt *dictLength) { + deflate_state *s; + uInt len; + + if (deflateStateCheck(strm)) + return Z_STREAM_ERROR; + s = strm->state; + len = s->strstart + s->lookahead; + if (len > s->w_size) + len = s->w_size; + if (dictionary != Z_NULL && len) + zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len); + if (dictLength != Z_NULL) + *dictLength = len; + return Z_OK; +} + +/* ========================================================================= */ - int ZEXPORT deflateResetKeep(strm) - z_streamp strm; - { ++int ZEXPORT deflateResetKeep(z_streamp strm) { + deflate_state *s; + + if (deflateStateCheck(strm)) { + return Z_STREAM_ERROR; + } + + strm->total_in = strm->total_out = 0; + strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */ + strm->data_type = Z_UNKNOWN; + + s = (deflate_state *)strm->state; + s->pending = 0; + s->pending_out = s->pending_buf; + + if (s->wrap < 0) { + s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ + } + s->status = +#ifdef GZIP + s->wrap == 2 ? GZIP_STATE : +#endif + INIT_STATE; + strm->adler = +#ifdef GZIP + s->wrap == 2 ? crc32(0L, Z_NULL, 0) : +#endif + adler32(0L, Z_NULL, 0); + s->last_flush = -2; + + _tr_init(s); + + return Z_OK; +} + ++/* =========================================================================== ++ * Initialize the "longest match" routines for a new zlib stream ++ */ ++local void lm_init(deflate_state *s) { ++ s->window_size = (ulg)2L*s->w_size; ++ ++ CLEAR_HASH(s); ++ ++ /* Set the default configuration parameters: ++ */ ++ s->max_lazy_match = configuration_table[s->level].max_lazy; ++ s->good_match = configuration_table[s->level].good_length; ++ s->nice_match = configuration_table[s->level].nice_length; ++ s->max_chain_length = configuration_table[s->level].max_chain; ++ ++ s->strstart = 0; ++ s->block_start = 0L; ++ s->lookahead = 0; ++ s->insert = 0; ++ s->match_length = s->prev_length = MIN_MATCH-1; ++ s->match_available = 0; ++ s->ins_h = 0; ++} ++ +/* ========================================================================= */ - int ZEXPORT deflateReset(strm) - z_streamp strm; - { ++int ZEXPORT deflateReset(z_streamp strm) { + int ret; + + ret = deflateResetKeep(strm); + if (ret == Z_OK) + lm_init(strm->state); + return ret; +} + +/* ========================================================================= */ - int ZEXPORT deflateSetHeader(strm, head) - z_streamp strm; - gz_headerp head; - { ++int ZEXPORT deflateSetHeader(z_streamp strm, gz_headerp head) { + if (deflateStateCheck(strm) || strm->state->wrap != 2) + return Z_STREAM_ERROR; + strm->state->gzhead = head; + return Z_OK; +} + +/* ========================================================================= */ - int ZEXPORT deflatePending(strm, pending, bits) - unsigned *pending; - int *bits; - z_streamp strm; - { ++int ZEXPORT deflatePending(z_streamp strm, unsigned *pending, int *bits) { + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + if (pending != Z_NULL) + *pending = strm->state->pending; + if (bits != Z_NULL) + *bits = strm->state->bi_valid; + return Z_OK; +} + +/* ========================================================================= */ - int ZEXPORT deflatePrime(strm, bits, value) - z_streamp strm; - int bits; - int value; - { ++int ZEXPORT deflatePrime(z_streamp strm, int bits, int value) { + deflate_state *s; + int put; + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; + if (bits < 0 || bits > 16 || + s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + return Z_BUF_ERROR; + do { + put = Buf_size - s->bi_valid; + if (put > bits) + put = bits; + s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid); + s->bi_valid += put; + _tr_flush_bits(s); + value >>= put; + bits -= put; + } while (bits); + return Z_OK; +} + +/* ========================================================================= */ - int ZEXPORT deflateParams(strm, level, strategy) - z_streamp strm; - int level; - int strategy; - { ++int ZEXPORT deflateParams(z_streamp strm, int level, int strategy) { + deflate_state *s; + compress_func func; + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; + +#ifdef FASTEST + if (level != 0) level = 1; +#else + if (level == Z_DEFAULT_COMPRESSION) level = 6; +#endif + if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) { + return Z_STREAM_ERROR; + } + func = configuration_table[s->level].func; + + if ((strategy != s->strategy || func != configuration_table[level].func) && + s->last_flush != -2) { + /* Flush the last buffer: */ + int err = deflate(strm, Z_BLOCK); + if (err == Z_STREAM_ERROR) + return err; + if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead) + return Z_BUF_ERROR; + } + if (s->level != level) { + if (s->level == 0 && s->matches != 0) { + if (s->matches == 1) + slide_hash(s); + else + CLEAR_HASH(s); + s->matches = 0; + } + s->level = level; + s->max_lazy_match = configuration_table[level].max_lazy; + s->good_match = configuration_table[level].good_length; + s->nice_match = configuration_table[level].nice_length; + s->max_chain_length = configuration_table[level].max_chain; + } + s->strategy = strategy; + return Z_OK; +} + +/* ========================================================================= */ - int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) - z_streamp strm; - int good_length; - int max_lazy; - int nice_length; - int max_chain; - { ++int ZEXPORT deflateTune(z_streamp strm, int good_length, int max_lazy, ++ int nice_length, int max_chain) { + deflate_state *s; + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; + s->good_match = (uInt)good_length; + s->max_lazy_match = (uInt)max_lazy; + s->nice_match = nice_length; + s->max_chain_length = (uInt)max_chain; + return Z_OK; +} + +/* ========================================================================= + * For the default windowBits of 15 and memLevel of 8, this function returns a + * close to exact, as well as small, upper bound on the compressed size. This + * is an expansion of ~0.03%, plus a small constant. + * + * For any setting other than those defaults for windowBits and memLevel, one + * of two worst case bounds is returned. This is at most an expansion of ~4% or + * ~13%, plus a small constant. + * + * Both the 0.03% and 4% derive from the overhead of stored blocks. The first + * one is for stored blocks of 16383 bytes (memLevel == 8), whereas the second + * is for stored blocks of 127 bytes (the worst case memLevel == 1). The + * expansion results from five bytes of header for each stored block. + * + * The larger expansion of 13% results from a window size less than or equal to + * the symbols buffer size (windowBits <= memLevel + 7). In that case some of + * the data being compressed may have slid out of the sliding window, impeding + * a stored block from being emitted. Then the only choice is a fixed or + * dynamic block, where a fixed block limits the maximum expansion to 9 bits + * per 8-bit byte, plus 10 bits for every block. The smallest block size for + * which this can occur is 255 (memLevel == 2). + * + * Shifts are used to approximate divisions, for speed. + */ - uLong ZEXPORT deflateBound(strm, sourceLen) - z_streamp strm; - uLong sourceLen; - { ++uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen) { + deflate_state *s; + uLong fixedlen, storelen, wraplen; + + /* upper bound for fixed blocks with 9-bit literals and length 255 + (memLevel == 2, which is the lowest that may not use stored blocks) -- + ~13% overhead plus a small constant */ + fixedlen = sourceLen + (sourceLen >> 3) + (sourceLen >> 8) + + (sourceLen >> 9) + 4; + + /* upper bound for stored blocks with length 127 (memLevel == 1) -- + ~4% overhead plus a small constant */ + storelen = sourceLen + (sourceLen >> 5) + (sourceLen >> 7) + + (sourceLen >> 11) + 7; + + /* if can't get parameters, return larger bound plus a zlib wrapper */ + if (deflateStateCheck(strm)) + return (fixedlen > storelen ? fixedlen : storelen) + 6; + *** 5728 LINES SKIPPED *** From nobody Sun Aug 20 07:37: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 4RT6s31RJ6z4qrxM; Sun, 20 Aug 2023 07:37: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 4RT6s30wCpz3CqQ; Sun, 20 Aug 2023 07:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VVwuPaVmZIob1zmGYoYXe1NstT2NSPioOkWSXgDFNi8=; b=hYcQvauT2v9yRB5y/0xoQoZYr3v7mc82GgTx1g9JhAIhe/jGM5tsRAfz3RRorhFLSM24Rj dARiOsdSnUzYr1yq8CECBgh87ce8SXztmO/AW1vv6csXmcXhYdtoR+NdUk8dJckW2h4/J0 b2+kYCL8DTvHf71WpN3zpVkriQoUq4kPa8jEF/b7wzmbF+5ibU8w3i8EjZ3H+RxbQHtyz1 TPRzwc8j4bmXZmeS9VTrRl0jBSmHwbkkh3m+82FJasVuH1NGUo6bHUADQ+bTmUFY8ggACF T8oy4p2DrkIL5I3eWmLAwLYuxaUJN0ag9EKpcZxgxWP1vAkECjLmMWFqg1Gmjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VVwuPaVmZIob1zmGYoYXe1NstT2NSPioOkWSXgDFNi8=; b=cFsg2QG4J5O4wL7RGQlmz19Ue9X62wlwUbF6GGJUAyxbWfVpnlrFut4EZ1/fk+31WpOqYM mhoqnw38ZoB7DbNOu2AANHqItVlm3uZsps+t+wSrnZUWAkvZC5l1RC6OZpa1hUDrIXhTVy wd9xF+RlJg5HdWSwriXYV/2wCA9cYSGZFjx9JkJP19eLpkj5oHWe+BZRsMOdzWeoQkTxV9 n3ataGt4PCJD57zISjptLqC+D22SORtfe54BiGONICnaJWW9uV1CraVYusS75JihnJB4g4 c47WiH3DBsvoEjoyjm75u908xfRfe19C608y/MXxc3yQuKIrDg2OrYkTWRAerA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517063; a=rsa-sha256; cv=none; b=JzfjzhtFYm0VLY3KL+M7LTd1XPBtM0rRW85LXdZFMhe05UZMrebPbwooZyFFmRfgQuM7+7 pX8QrJyLrhVfQMcIdFoi0QfcjCtOUbhPeh6q/JVsCDWOu3VhxwkeaORR+sRAixfLuPuqNh ufcN0YWKsOC1a2cDldyaGmvAnDqzajgb+FWXNx631QGY89s1Z268crDI1trhF4iA91Xd9p YCTS+CoVUZJJv8lkW2hmfwyGTnQZ7JmwJHuZxgm1XvbqNf6+FI42bGMwRb14k6g6J5OhbC ORZ+gy1Ggy5rTpGW0t6CbXLAFPQiqLkagA2+vP7Oxrj/1ozh0uIdkYJQAhpoeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT6s274NMzWN9; Sun, 20 Aug 2023 07:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7bgE8049517; Sun, 20 Aug 2023 07:37:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7bg1f049514; Sun, 20 Aug 2023 07:37:42 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:42 GMT Message-Id: <202308200737.37K7bg1f049514@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: 510f5c88f043 - main - linux(4): Modify write syscall to match Linux List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 510f5c88f04316dc4014485ae281d90656f53d9d Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=510f5c88f04316dc4014485ae281d90656f53d9d commit 510f5c88f04316dc4014485ae281d90656f53d9d Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:28 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:28 +0000 linux(4): Modify write syscall to match Linux Adding a write syscall wrapper is needed due to Linux family of write syscalls doesn't distinguish between in kernel blocking operations and always returns EAGAIN while FreeBSD can return ENOBUFS. MFC after: 1 month --- sys/amd64/linux/syscalls.master | 4 ++-- sys/amd64/linux32/syscalls.master | 6 +++--- sys/arm64/linux/syscalls.master | 4 ++-- sys/i386/linux/syscalls.master | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index 178ae18836e6..885192963728 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -46,8 +46,8 @@ l_size_t nbyte ); } -1 AUE_NULL NOPROTO { - int write( +1 AUE_NULL STD { + int linux_write( int fd, char *buf, l_size_t nbyte diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 9439a80b96f6..aa3e420053f4 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -55,11 +55,11 @@ u_int nbyte ); } -4 AUE_NULL NOPROTO { - int write( +4 AUE_NULL STD { + int linux_write( int fd, char *buf, - u_int nbyte + l_size_t nbyte ); } 5 AUE_OPEN_RWTC STD { diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master index 2bf8d4fad8ac..90c6fcfc4642 100644 --- a/sys/arm64/linux/syscalls.master +++ b/sys/arm64/linux/syscalls.master @@ -392,8 +392,8 @@ l_size_t nbyte ); } -64 AUE_NULL NOPROTO { - int write( +64 AUE_NULL STD { + int linux_write( int fd, char *buf, l_size_t nbyte diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index ff3a7d444600..81473ef776aa 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -55,11 +55,11 @@ u_int nbyte ); } -4 AUE_NULL NOPROTO { - int write( +4 AUE_NULL STD { + int linux_write( int fd, char *buf, - u_int nbyte + l_size_t nbyte ); } 5 AUE_OPEN_RWTC STD { From nobody Sun Aug 20 07:37: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 4RT6s42BYRz4qrxP; Sun, 20 Aug 2023 07:37: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 4RT6s41xnmz3D6H; Sun, 20 Aug 2023 07:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9rxGrHYBZ9bdulIbgFkr8IPb4UKZHL402O7FldoWaRk=; b=Cf00eVMWaDGYvFPjPd7L/Q15+soTLAFud5RKhXmwVK3ayyrefs//Qbk25HVbgpQhPG9o1n McmVJTfWbUHB/Duh+YcWheVX7WSXzJDogy5Lh6HdwKx1AW+LCP0zfNtk1GPTE5m2wGtoog 8vnuv7movhoefBT7c3ptyOYNgdDd++NzkFLQzWINVxqyEJKUT3ghvkrhUc5SiunNPcZ8Lm a/kkvfBJnF6k0yeW0fz3LwqXkkWpT+HQ7KSIqRIY+19/qgy65WnK/1UhQqrnwcCfvuTqTX NmNz/S8Tu+UDUb9wa/B9m6oithLXUCqKx7vPh7wS50CfNSnkHtS5l3YDGStfmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9rxGrHYBZ9bdulIbgFkr8IPb4UKZHL402O7FldoWaRk=; b=pUeL6x9BVEeSkWXPjAT33D9LwYyVcBvi899DbI3AynDIhNrm1FeuOkFUX2hKykHU9zK9J8 qgn0jBvXGl3s+0ijcp5URKukbLKZfuXMcWgd2HxmF7ZYHuh0sbfEaswgmFfal2makvDOzf HoDg858/NeiFlFBFHPKPQsuDLfLNC5p0IABW3QhPmeM7QOD3E23YsDfI6ngIS8xpt4xfGq 9IRKZzRcvTDxrh0sfW1yXRQdD4qrysdoO7z6ty+ba0Uar8zOvS6gOIaOPV6x22jyuBa5QZ s4M/sfYS0CxIifnjGW2l4VkwLkGpGyqVOcofGdym8he8BDHoJKUpClFl5dUVMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517064; a=rsa-sha256; cv=none; b=kaP2pxq8e9mSBXe9/prqq0ROO/gFHZM7y64EAJZet8ZO3heQZ0EovmrpqzQCu9ZphgZHcX 2r/Ciq2v21GxYNLNyeP9j1GrzW/vdYZJq4gJygy8EoeJM+ZeMXSUvr+kBrqg1Fr1OE9oeZ 8+7TxDfsTj0Yw5TBFmb38HW6vzsAHVSixTpphPKx2DoEgSkOIcTvQc4M5yvlOOjkmYn2uI AA0BG1tYu2cRJv6AweXyzpIstJPWG1pGN0pUIWoa1jClGZ4irLfA8MCd6YjICwuV04oHOl kW7qH759Mm3zia0G+Elj6BnIBR3ut0U5XvoXYCH4tMrcT37p1oInlo0adi2hWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT6s40n06zWSj; Sun, 20 Aug 2023 07:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7biqA049556; Sun, 20 Aug 2023 07:37:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7bic9049553; Sun, 20 Aug 2023 07:37:44 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:44 GMT Message-Id: <202308200737.37K7bic9049553@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: 89d270b28def - main - Regen for write syscall List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89d270b28def13957db730224435f8a6190589b9 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=89d270b28def13957db730224435f8a6190589b9 commit 89d270b28def13957db730224435f8a6190589b9 Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:29 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:29 +0000 Regen for write syscall --- sys/amd64/linux/linux_proto.h | 7 +++++++ sys/amd64/linux/linux_syscall.h | 2 +- sys/amd64/linux/linux_syscalls.c | 2 +- sys/amd64/linux/linux_sysent.c | 2 +- sys/amd64/linux/linux_systrace_args.c | 8 ++++---- sys/amd64/linux32/linux32_proto.h | 7 +++++++ sys/amd64/linux32/linux32_syscall.h | 2 +- sys/amd64/linux32/linux32_syscalls.c | 2 +- sys/amd64/linux32/linux32_sysent.c | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 12 ++++++------ sys/arm64/linux/linux_proto.h | 7 +++++++ sys/arm64/linux/linux_syscall.h | 2 +- sys/arm64/linux/linux_syscalls.c | 2 +- sys/arm64/linux/linux_sysent.c | 2 +- sys/arm64/linux/linux_systrace_args.c | 8 ++++---- sys/i386/linux/linux_proto.h | 7 +++++++ sys/i386/linux/linux_syscall.h | 2 +- sys/i386/linux/linux_syscalls.c | 2 +- sys/i386/linux/linux_sysent.c | 2 +- sys/i386/linux/linux_systrace_args.c | 12 ++++++------ 20 files changed, 60 insertions(+), 32 deletions(-) diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h index 84d3b04de1a4..80b5998e2f26 100644 --- a/sys/amd64/linux/linux_proto.h +++ b/sys/amd64/linux/linux_proto.h @@ -34,6 +34,11 @@ struct thread; #endif #define nosys linux_nosys +struct linux_write_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char nbyte_l_[PADL_(l_size_t)]; l_size_t nbyte; char nbyte_r_[PADR_(l_size_t)]; +}; struct linux_open_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; @@ -1396,6 +1401,7 @@ struct linux_mount_setattr_args { syscallarg_t dummy; }; #define nosys linux_nosys +int linux_write(struct thread *, struct linux_write_args *); int linux_open(struct thread *, struct linux_open_args *); int linux_newstat(struct thread *, struct linux_newstat_args *); int linux_newfstat(struct thread *, struct linux_newfstat_args *); @@ -1693,6 +1699,7 @@ int linux_faccessat2(struct thread *, struct linux_faccessat2_args *); int linux_process_madvise(struct thread *, struct linux_process_madvise_args *); int linux_epoll_pwait2(struct thread *, struct linux_epoll_pwait2_args *); int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); +#define LINUX_SYS_AUE_linux_write AUE_NULL #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_newstat AUE_STAT #define LINUX_SYS_AUE_linux_newfstat AUE_FSTAT diff --git a/sys/amd64/linux/linux_syscall.h b/sys/amd64/linux/linux_syscall.h index 690f402ef2d0..45ba487f3a93 100644 --- a/sys/amd64/linux/linux_syscall.h +++ b/sys/amd64/linux/linux_syscall.h @@ -5,7 +5,7 @@ */ #define LINUX_SYS_read 0 -#define LINUX_SYS_write 1 +#define LINUX_SYS_linux_write 1 #define LINUX_SYS_linux_open 2 #define LINUX_SYS_close 3 #define LINUX_SYS_linux_newstat 4 diff --git a/sys/amd64/linux/linux_syscalls.c b/sys/amd64/linux/linux_syscalls.c index 04131a05c0db..57f65a0a6cbf 100644 --- a/sys/amd64/linux/linux_syscalls.c +++ b/sys/amd64/linux/linux_syscalls.c @@ -7,7 +7,7 @@ const char *linux_syscallnames[] = { #define nosys linux_nosys "read", /* 0 = read */ - "write", /* 1 = write */ + "linux_write", /* 1 = linux_write */ "linux_open", /* 2 = linux_open */ "close", /* 3 = close */ "linux_newstat", /* 4 = linux_newstat */ diff --git a/sys/amd64/linux/linux_sysent.c b/sys/amd64/linux/linux_sysent.c index c2550aec6831..79557b3780b3 100644 --- a/sys/amd64/linux/linux_sysent.c +++ b/sys/amd64/linux/linux_sysent.c @@ -17,7 +17,7 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { .sy_narg = AS(read_args), .sy_call = (sy_call_t *)sys_read, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 0 = read */ - { .sy_narg = AS(write_args), .sy_call = (sy_call_t *)sys_write, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 1 = write */ + { .sy_narg = AS(linux_write_args), .sy_call = (sy_call_t *)linux_write, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 1 = linux_write */ { .sy_narg = AS(linux_open_args), .sy_call = (sy_call_t *)linux_open, .sy_auevent = AUE_OPEN_RWTC, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 2 = linux_open */ { .sy_narg = AS(close_args), .sy_call = (sy_call_t *)sys_close, .sy_auevent = AUE_CLOSE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 3 = close */ { .sy_narg = AS(linux_newstat_args), .sy_call = (sy_call_t *)linux_newstat, .sy_auevent = AUE_STAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 4 = linux_newstat */ diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c index 45e4cce95095..5edef91239d3 100644 --- a/sys/amd64/linux/linux_systrace_args.c +++ b/sys/amd64/linux/linux_systrace_args.c @@ -21,9 +21,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } - /* write */ + /* linux_write */ case 1: { - struct write_args *p = params; + struct linux_write_args *p = params; iarg[a++] = p->fd; /* int */ uarg[a++] = (intptr_t)p->buf; /* char * */ iarg[a++] = p->nbyte; /* l_size_t */ @@ -2778,7 +2778,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* write */ + /* linux_write */ case 1: switch (ndx) { case 0: @@ -7198,7 +7198,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* write */ + /* linux_write */ case 1: if (ndx == 0 || ndx == 1) p = "int"; diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index e0d52b2675d6..4934b22c1ca1 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -40,6 +40,11 @@ struct linux_exit_args { struct linux_fork_args { syscallarg_t dummy; }; +struct linux_write_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char nbyte_l_[PADL_(l_size_t)]; l_size_t nbyte; char nbyte_r_[PADR_(l_size_t)]; +}; struct linux_open_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; @@ -1704,6 +1709,7 @@ struct linux_mount_setattr_args { #define nosys linux_nosys int linux_exit(struct thread *, struct linux_exit_args *); int linux_fork(struct thread *, struct linux_fork_args *); +int linux_write(struct thread *, struct linux_write_args *); int linux_open(struct thread *, struct linux_open_args *); int linux_waitpid(struct thread *, struct linux_waitpid_args *); int linux_creat(struct thread *, struct linux_creat_args *); @@ -2067,6 +2073,7 @@ int linux_epoll_pwait2_64(struct thread *, struct linux_epoll_pwait2_64_args *); int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX32_SYS_AUE_linux_exit AUE_EXIT #define LINUX32_SYS_AUE_linux_fork AUE_FORK +#define LINUX32_SYS_AUE_linux_write AUE_NULL #define LINUX32_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX32_SYS_AUE_linux_waitpid AUE_WAIT4 #define LINUX32_SYS_AUE_linux_creat AUE_CREAT diff --git a/sys/amd64/linux32/linux32_syscall.h b/sys/amd64/linux32/linux32_syscall.h index 6fab4cb61bb3..e24080e3c2e7 100644 --- a/sys/amd64/linux32/linux32_syscall.h +++ b/sys/amd64/linux32/linux32_syscall.h @@ -7,7 +7,7 @@ #define LINUX32_SYS_linux_exit 1 #define LINUX32_SYS_linux_fork 2 #define LINUX32_SYS_read 3 -#define LINUX32_SYS_write 4 +#define LINUX32_SYS_linux_write 4 #define LINUX32_SYS_linux_open 5 #define LINUX32_SYS_close 6 #define LINUX32_SYS_linux_waitpid 7 diff --git a/sys/amd64/linux32/linux32_syscalls.c b/sys/amd64/linux32/linux32_syscalls.c index 6706189b7036..cdeda60a1577 100644 --- a/sys/amd64/linux32/linux32_syscalls.c +++ b/sys/amd64/linux32/linux32_syscalls.c @@ -10,7 +10,7 @@ const char *linux32_syscallnames[] = { "linux_exit", /* 1 = linux_exit */ "linux_fork", /* 2 = linux_fork */ "read", /* 3 = read */ - "write", /* 4 = write */ + "linux_write", /* 4 = linux_write */ "linux_open", /* 5 = linux_open */ "close", /* 6 = close */ "linux_waitpid", /* 7 = linux_waitpid */ diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c index f005ffb9ea54..b5513743bbee 100644 --- a/sys/amd64/linux32/linux32_sysent.c +++ b/sys/amd64/linux32/linux32_sysent.c @@ -20,7 +20,7 @@ struct sysent linux32_sysent[] = { { .sy_narg = AS(linux_exit_args), .sy_call = (sy_call_t *)linux_exit, .sy_auevent = AUE_EXIT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 1 = linux_exit */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_fork, .sy_auevent = AUE_FORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 2 = linux_fork */ { .sy_narg = AS(read_args), .sy_call = (sy_call_t *)sys_read, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 3 = read */ - { .sy_narg = AS(write_args), .sy_call = (sy_call_t *)sys_write, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 4 = write */ + { .sy_narg = AS(linux_write_args), .sy_call = (sy_call_t *)linux_write, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 4 = linux_write */ { .sy_narg = AS(linux_open_args), .sy_call = (sy_call_t *)linux_open, .sy_auevent = AUE_OPEN_RWTC, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 5 = linux_open */ { .sy_narg = AS(close_args), .sy_call = (sy_call_t *)sys_close, .sy_auevent = AUE_CLOSE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 6 = close */ { .sy_narg = AS(linux_waitpid_args), .sy_call = (sy_call_t *)linux_waitpid, .sy_auevent = AUE_WAIT4, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 7 = linux_waitpid */ diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index ba1c2c01852c..82736cb221bf 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -33,12 +33,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } - /* write */ + /* linux_write */ case 4: { - struct write_args *p = params; + struct linux_write_args *p = params; iarg[a++] = p->fd; /* int */ uarg[a++] = (intptr_t)p->buf; /* char * */ - uarg[a++] = p->nbyte; /* u_int */ + iarg[a++] = p->nbyte; /* l_size_t */ *n_args = 3; break; } @@ -3305,7 +3305,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* write */ + /* linux_write */ case 4: switch (ndx) { case 0: @@ -3315,7 +3315,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland char *"; break; case 2: - p = "u_int"; + p = "l_size_t"; break; default: break; @@ -8584,7 +8584,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* write */ + /* linux_write */ case 4: if (ndx == 0 || ndx == 1) p = "int"; diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h index 34108364f751..f239bcb1463b 100644 --- a/sys/arm64/linux/linux_proto.h +++ b/sys/arm64/linux/linux_proto.h @@ -270,6 +270,11 @@ struct linux_lseek_args { char off_l_[PADL_(l_off_t)]; l_off_t off; char off_r_[PADR_(l_off_t)]; char whence_l_[PADL_(l_int)]; l_int whence; char whence_r_[PADR_(l_int)]; }; +struct linux_write_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char nbyte_l_[PADL_(l_size_t)]; l_size_t nbyte; char nbyte_r_[PADR_(l_size_t)]; +}; struct linux_pread_args { char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; @@ -1254,6 +1259,7 @@ int linux_vhangup(struct thread *, struct linux_vhangup_args *); int linux_pipe2(struct thread *, struct linux_pipe2_args *); int linux_getdents64(struct thread *, struct linux_getdents64_args *); int linux_lseek(struct thread *, struct linux_lseek_args *); +int linux_write(struct thread *, struct linux_write_args *); int linux_pread(struct thread *, struct linux_pread_args *); int linux_pwrite(struct thread *, struct linux_pwrite_args *); int linux_preadv(struct thread *, struct linux_preadv_args *); @@ -1502,6 +1508,7 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX_SYS_AUE_linux_pipe2 AUE_NULL #define LINUX_SYS_AUE_linux_getdents64 AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_lseek AUE_LSEEK +#define LINUX_SYS_AUE_linux_write AUE_NULL #define LINUX_SYS_AUE_linux_pread AUE_PREAD #define LINUX_SYS_AUE_linux_pwrite AUE_PWRITE #define LINUX_SYS_AUE_linux_preadv AUE_NULL diff --git a/sys/arm64/linux/linux_syscall.h b/sys/arm64/linux/linux_syscall.h index fe44c5c87e81..3307005a74c0 100644 --- a/sys/arm64/linux/linux_syscall.h +++ b/sys/arm64/linux/linux_syscall.h @@ -60,7 +60,7 @@ #define LINUX_SYS_linux_getdents64 61 #define LINUX_SYS_linux_lseek 62 #define LINUX_SYS_read 63 -#define LINUX_SYS_write 64 +#define LINUX_SYS_linux_write 64 #define LINUX_SYS_readv 65 #define LINUX_SYS_writev 66 #define LINUX_SYS_linux_pread 67 diff --git a/sys/arm64/linux/linux_syscalls.c b/sys/arm64/linux/linux_syscalls.c index d1762a9166f6..86b3c012c0b2 100644 --- a/sys/arm64/linux/linux_syscalls.c +++ b/sys/arm64/linux/linux_syscalls.c @@ -70,7 +70,7 @@ const char *linux_syscallnames[] = { "linux_getdents64", /* 61 = linux_getdents64 */ "linux_lseek", /* 62 = linux_lseek */ "read", /* 63 = read */ - "write", /* 64 = write */ + "linux_write", /* 64 = linux_write */ "readv", /* 65 = readv */ "writev", /* 66 = writev */ "linux_pread", /* 67 = linux_pread */ diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c index 00f4f2f2f735..940391dd175e 100644 --- a/sys/arm64/linux/linux_sysent.c +++ b/sys/arm64/linux/linux_sysent.c @@ -80,7 +80,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_getdents64_args), .sy_call = (sy_call_t *)linux_getdents64, .sy_auevent = AUE_GETDIRENTRIES, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 61 = linux_getdents64 */ { .sy_narg = AS(linux_lseek_args), .sy_call = (sy_call_t *)linux_lseek, .sy_auevent = AUE_LSEEK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 62 = linux_lseek */ { .sy_narg = AS(read_args), .sy_call = (sy_call_t *)sys_read, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 63 = read */ - { .sy_narg = AS(write_args), .sy_call = (sy_call_t *)sys_write, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 64 = write */ + { .sy_narg = AS(linux_write_args), .sy_call = (sy_call_t *)linux_write, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 64 = linux_write */ { .sy_narg = AS(readv_args), .sy_call = (sy_call_t *)sys_readv, .sy_auevent = AUE_READV, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 65 = readv */ { .sy_narg = AS(writev_args), .sy_call = (sy_call_t *)sys_writev, .sy_auevent = AUE_WRITEV, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 66 = writev */ { .sy_narg = AS(linux_pread_args), .sy_call = (sy_call_t *)linux_pread, .sy_auevent = AUE_PREAD, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 67 = linux_pread */ diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index b45fbcf746f4..06f973cebe37 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -492,9 +492,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } - /* write */ + /* linux_write */ case 64: { - struct write_args *p = params; + struct linux_write_args *p = params; iarg[a++] = p->fd; /* int */ uarg[a++] = (intptr_t)p->buf; /* char * */ iarg[a++] = p->nbyte; /* l_size_t */ @@ -3203,7 +3203,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* write */ + /* linux_write */ case 64: switch (ndx) { case 0: @@ -6533,7 +6533,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* write */ + /* linux_write */ case 64: if (ndx == 0 || ndx == 1) p = "int"; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 5ed3630599c6..5b58629d7b92 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -40,6 +40,11 @@ struct linux_exit_args { struct linux_fork_args { syscallarg_t dummy; }; +struct linux_write_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char nbyte_l_[PADL_(l_size_t)]; l_size_t nbyte; char nbyte_r_[PADR_(l_size_t)]; +}; struct linux_open_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; @@ -1693,6 +1698,7 @@ struct linux_mount_setattr_args { #define nosys linux_nosys int linux_exit(struct thread *, struct linux_exit_args *); int linux_fork(struct thread *, struct linux_fork_args *); +int linux_write(struct thread *, struct linux_write_args *); int linux_open(struct thread *, struct linux_open_args *); int linux_waitpid(struct thread *, struct linux_waitpid_args *); int linux_creat(struct thread *, struct linux_creat_args *); @@ -2057,6 +2063,7 @@ int linux_epoll_pwait2_64(struct thread *, struct linux_epoll_pwait2_64_args *); int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX_SYS_AUE_linux_exit AUE_EXIT #define LINUX_SYS_AUE_linux_fork AUE_FORK +#define LINUX_SYS_AUE_linux_write AUE_NULL #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 #define LINUX_SYS_AUE_linux_creat AUE_CREAT diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h index 5aca8ed78c6f..aafcd849634f 100644 --- a/sys/i386/linux/linux_syscall.h +++ b/sys/i386/linux/linux_syscall.h @@ -7,7 +7,7 @@ #define LINUX_SYS_linux_exit 1 #define LINUX_SYS_linux_fork 2 #define LINUX_SYS_read 3 -#define LINUX_SYS_write 4 +#define LINUX_SYS_linux_write 4 #define LINUX_SYS_linux_open 5 #define LINUX_SYS_close 6 #define LINUX_SYS_linux_waitpid 7 diff --git a/sys/i386/linux/linux_syscalls.c b/sys/i386/linux/linux_syscalls.c index 88ebcbd36073..b6076e9115c2 100644 --- a/sys/i386/linux/linux_syscalls.c +++ b/sys/i386/linux/linux_syscalls.c @@ -10,7 +10,7 @@ const char *linux_syscallnames[] = { "linux_exit", /* 1 = linux_exit */ "linux_fork", /* 2 = linux_fork */ "read", /* 3 = read */ - "write", /* 4 = write */ + "linux_write", /* 4 = linux_write */ "linux_open", /* 5 = linux_open */ "close", /* 6 = close */ "linux_waitpid", /* 7 = linux_waitpid */ diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index d08b8458740a..be84f04ac9be 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -20,7 +20,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_exit_args), .sy_call = (sy_call_t *)linux_exit, .sy_auevent = AUE_EXIT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 1 = linux_exit */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_fork, .sy_auevent = AUE_FORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 2 = linux_fork */ { .sy_narg = AS(read_args), .sy_call = (sy_call_t *)sys_read, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 3 = read */ - { .sy_narg = AS(write_args), .sy_call = (sy_call_t *)sys_write, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 4 = write */ + { .sy_narg = AS(linux_write_args), .sy_call = (sy_call_t *)linux_write, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 4 = linux_write */ { .sy_narg = AS(linux_open_args), .sy_call = (sy_call_t *)linux_open, .sy_auevent = AUE_OPEN_RWTC, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 5 = linux_open */ { .sy_narg = AS(close_args), .sy_call = (sy_call_t *)sys_close, .sy_auevent = AUE_CLOSE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 6 = close */ { .sy_narg = AS(linux_waitpid_args), .sy_call = (sy_call_t *)linux_waitpid, .sy_auevent = AUE_WAIT4, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 7 = linux_waitpid */ diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 20098469d72e..b6470cb66583 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -33,12 +33,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } - /* write */ + /* linux_write */ case 4: { - struct write_args *p = params; + struct linux_write_args *p = params; iarg[a++] = p->fd; /* int */ uarg[a++] = (intptr_t)p->buf; /* char * */ - uarg[a++] = p->nbyte; /* u_int */ + iarg[a++] = p->nbyte; /* l_size_t */ *n_args = 3; break; } @@ -3336,7 +3336,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* write */ + /* linux_write */ case 4: switch (ndx) { case 0: @@ -3346,7 +3346,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland char *"; break; case 2: - p = "u_int"; + p = "l_size_t"; break; default: break; @@ -8640,7 +8640,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* write */ + /* linux_write */ case 4: if (ndx == 0 || ndx == 1) p = "int"; From nobody Sun Aug 20 07:37: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 4RT6s60CmCz4qsMj; Sun, 20 Aug 2023 07:37: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 4RT6s52Mffz3D9T; Sun, 20 Aug 2023 07:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Rcs39Q7jR1STjgo8DZf6/6iHocrOFQRTnHmnjLuxSs=; b=UHf8yjn5eayubHvBvFZIlo0GV3JdWSmEmZQN15hCRLUq/pXW1AEZ0Oj5J0EJ2PaoyIx4VV p0nJRrxNlXoQDEXvpC68NAK8PCwyAZRAFoN4csvlRhnQ0DtUB15pvKNQsKh+AQyL1LyRt9 HwdXUUJQUEQAusvE2Mwsfhk/0mGrOVHvXwR2wtUQqV+7bGvaadOHNnX98bxeqSArlMivhD iQBotdXY/sV0BBrZndZiPpDRHWQtgnKMu+lSF+l+1d15rk5OBi56uFzAoY3dV9z/p9MD+G snxIuyHftVwusCieyOWfX1jsc4HsCBvjOVZExBuLWrWBKrrPRW/L9asJEhxP1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Rcs39Q7jR1STjgo8DZf6/6iHocrOFQRTnHmnjLuxSs=; b=F1ANyKwzpnxpqoBOAX8JY+7R4ZXa9Lu7nKdOxZsTtuW3If//Rw/3D6LOgSNsekVakvSftR Y+OUMEPAf3I+AIzvMrVlRHaa1xkJ7j35HkX15k+/y5WZKvUHr/MQl+ECGAjZLPaLf+CT9+ Zha8ldPRaH5xwu1NRIz+ggJLkuuYtBqya/UKtyL049vHhKClqgCQynHi0j01f5bb5ljuQc pP/EUuJy9B6nvyFLKPmtAPrio7MVWmdnlz53IYS6TDjMp49n0nM0eb+QpTMjaTxEfVRYfG bLh/8EaBEadtSLaTL4Kk47+nZyiPXyOdK46yZRxR0Wz84kyjdldu8dBzQxpzlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517065; a=rsa-sha256; cv=none; b=rqLSap/FgKs0Ka9eazxyqkjNaeSySRwrDtJqaZmDnV36DkVapSc1aTHr6LeFEjW1ANI52E BsdkAW700Tm1xpaxJH6dxKscKTImVTDRzc6NNYQ1bLLckW/gCWPKfOH9+kHDeVoURIw/Jx XN6IpgpO5yOhi/9vIpP6/A1B6S2FjgpTxvlytkuTUiUPVNDlJZTdqVtmFijuaOBn+pqnm/ P39AiqdtzTTuPloMqrVXqO0qcWOmf06+XeV5B+dHbNYSoe7dvDYv8vjGwtGYeSRc4akRyi ST+GirqQ+bLRyHp9eGNU3o0oUjcHRl+UNNzruuY49nUAJ9u2miwDe6iSSY31tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT6s51S0qzWcV; Sun, 20 Aug 2023 07:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7bjx4049607; Sun, 20 Aug 2023 07:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7bjxW049604; Sun, 20 Aug 2023 07:37:45 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:45 GMT Message-Id: <202308200737.37K7bjxW049604@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: e58ff66464ac - main - linux(4): Add a write syscall wrapper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e58ff66464ac313296b683992c9131d7a85047de Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e58ff66464ac313296b683992c9131d7a85047de commit e58ff66464ac313296b683992c9131d7a85047de Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:29 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:29 +0000 linux(4): Add a write syscall wrapper Adding a write syscall wrapper is needed due to Linux family of write syscalls doesn't distinguish between in kernel blocking operations and always returns EAGAIN while FreeBSD can return ENOBUFS. MFC after: 1 month --- sys/amd64/linux/linux_vdso_gtod.c | 2 +- sys/amd64/linux32/linux32_vdso_gtod.c | 2 +- sys/arm64/linux/linux_vdso_gtod.c | 2 +- sys/compat/linux/linux_file.c | 28 ++++++++++++++++++++++++++++ sys/compat/linux/linux_file.h | 4 ++++ sys/i386/linux/linux_vdso_gtod.c | 2 +- 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/sys/amd64/linux/linux_vdso_gtod.c b/sys/amd64/linux/linux_vdso_gtod.c index e2b5ebbec5ff..519ca2f2de93 100644 --- a/sys/amd64/linux/linux_vdso_gtod.c +++ b/sys/amd64/linux/linux_vdso_gtod.c @@ -61,7 +61,7 @@ write(int fd, const void *buf, size_t size) ( "syscall" : "=a"(res) - : "a"(LINUX_SYS_write), "D"(fd), "S"(buf), "d"(size) + : "a"(LINUX_SYS_linux_write), "D"(fd), "S"(buf), "d"(size) : "cc", "rcx", "r11", "memory" ); return (res); diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c index 62e8dc3d3caf..ec5851c45c28 100644 --- a/sys/amd64/linux32/linux32_vdso_gtod.c +++ b/sys/amd64/linux32/linux32_vdso_gtod.c @@ -60,7 +60,7 @@ write(int fd, const void *buf, size_t size) ( "int $0x80" : "=a"(res) - : "a"(LINUX32_SYS_write), "b"(fd), "c"(buf), "d"(size) + : "a"(LINUX32_SYS_linux_write), "b"(fd), "c"(buf), "d"(size) : "cc", "memory" ); return (res); diff --git a/sys/arm64/linux/linux_vdso_gtod.c b/sys/arm64/linux/linux_vdso_gtod.c index 94a3c948d332..f7def68d88c4 100644 --- a/sys/arm64/linux/linux_vdso_gtod.c +++ b/sys/arm64/linux/linux_vdso_gtod.c @@ -50,7 +50,7 @@ uint32_t kern_tsc_selector = 0; static int write(int lfd, const void *lbuf, size_t lsize) { - register long svc asm("x8") = LINUX_SYS_write; + register long svc asm("x8") = LINUX_SYS_linux_write; register int fd asm("x0") = lfd; register const char *buf asm("x1") = lbuf; register long size asm("x2") = lsize; diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 62094697e107..6a1f61984b08 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1827,3 +1828,30 @@ linux_close_range(struct thread *td, struct linux_close_range_args *args) flags |= CLOSE_RANGE_CLOEXEC; return (kern_close_range(td, flags, args->first, args->last)); } + +int +linux_enobufs2eagain(struct thread *td, int fd, int error) +{ + struct file *fp; + + if (error != ENOBUFS) + return (error); + if (fget(td, fd, &cap_no_rights, &fp) != 0) + return (error); + if (fp->f_type == DTYPE_SOCKET && (fp->f_flag & FNONBLOCK) != 0) + error = EAGAIN; + fdrop(fp, td); + return (error); +} + +int +linux_write(struct thread *td, struct linux_write_args *args) +{ + struct write_args bargs = { + .fd = args->fd, + .buf = args->buf, + .nbyte = args->nbyte, + }; + + return (linux_enobufs2eagain(td, args->fd, sys_write(td, &bargs))); +} diff --git a/sys/compat/linux/linux_file.h b/sys/compat/linux/linux_file.h index 0dcd7a5fd13e..ce9feca154ed 100644 --- a/sys/compat/linux/linux_file.h +++ b/sys/compat/linux/linux_file.h @@ -189,12 +189,16 @@ #define LINUX_HUGETLB_FLAG_ENCODE_2GB (31 << LINUX_HUGETLB_FLAG_ENCODE_SHIFT) #define LINUX_HUGETLB_FLAG_ENCODE_16GB (34U << LINUX_HUGETLB_FLAG_ENCODE_SHIFT) +#if defined(_KERNEL) struct l_file_handle { l_uint handle_bytes; l_int handle_type; unsigned char f_handle[0]; }; +int linux_enobufs2eagain(struct thread *, int, int); +#endif + /* * Look at linux_close_range() for an explanation. * diff --git a/sys/i386/linux/linux_vdso_gtod.c b/sys/i386/linux/linux_vdso_gtod.c index 2147dbd3a0f8..ca200ce04da7 100644 --- a/sys/i386/linux/linux_vdso_gtod.c +++ b/sys/i386/linux/linux_vdso_gtod.c @@ -60,7 +60,7 @@ write(int fd, const void *buf, size_t size) ( "int $0x80" : "=a"(res) - : "a"(LINUX_SYS_write), "b"(fd), "c"(buf), "d"(size) + : "a"(LINUX_SYS_linux_write), "b"(fd), "c"(buf), "d"(size) : "cc", "memory" ); return (res); From nobody Sun Aug 20 07: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 4RT6s712bWz4qsHK; Sun, 20 Aug 2023 07: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 4RT6s63gjCz3DLX; Sun, 20 Aug 2023 07:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SeDUWkcxw4uiIHgdb7I7RoLF633DkLR5oUj10yMEJeA=; b=K88fRgLfWn9jvOLs+Bo0zcoKThHdWH2pteT04NvelRyT7RCdyE9SoQkV9CpHNkGNC87z7Q ud4S109nGQruSLvdu8DSq8GjpwcztcWh51n8DHLatbnJOfEjUnUtq2jspOZphu+n0bPmRO jjI0R4yZmbFyJJjCl3fxMpRJW1ilavSHc8O9RRbJJAoHzTNh05iKtd2KaBLmXsjigtVTB7 az9+T45ustVGwGc2kbihHJyi4BZ+qeFtWCy8Q7gF1qicn2HD9eUZDxkbinL3Ncb90CnaH8 GvfpkZpcb7XpNGKUhMeij3yHeCF9NEE26PmFKP88xZREbOzOEIJM6aSXj0QDzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SeDUWkcxw4uiIHgdb7I7RoLF633DkLR5oUj10yMEJeA=; b=kGDql71vwYCv2uCAFiD9pBD/qrHuADYp8o75QCozfUtUJPP64ffIy4yRXpY2N0cYfWtAvk 3HQfCOPZKSqfGVl2+n9K8v50tsU/E5U2qZ7E1Wl7+1z05FKE0kCZgNNGq1Uuy69y2SGscS XZerRa8lhV360XxBrmUxZHr5mJXXE0hUeQKRUoD3nxySNCKAs2KHwQh0TWx42aTU5et/fv I80dThHuoUdEoW+ng0sx3uFhe61olPnSa2aqnGyY4riFwXL0Yh4aRzZvJ/9f86CarkcDay 7UW5RYXwxBr5WTLituNdTnvXSWKlq43ns4OYmh0ZR6p0ALcVoQ+pJHG4BGpEVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517066; a=rsa-sha256; cv=none; b=bG92JQMzXjjVvrSVc0DCLfyuKr1HnmrJEQWynvhihAm3BDglp7pANsyXh4yFIc3x1evxP3 LAOFbY3Rp6EOSO2uAYIe3d60KaIGYVzPNLWPRiT04hW4m4EwSaWG2Tdir9/2XWCzmBJLgx 232KdhlHI8iHgsncNrMgSxpXoxm2J5Rv9j21tB5X6q7ZVQAlObszsAUtm/j8ik6ZB/1YkC mbRpLvjCSFq6mPDcTbRVGnEAnFxNNQEzCvgCUyr835L7fUceP4rl3PAcmpHfp4DXpoI/Mf 2iHgnPueDOv/1T+AcTg9xdrJWu4GuaK5JFlSWbV6hNVf1L23aUrleiiF92FTeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT6s62CWdzWSk; Sun, 20 Aug 2023 07:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7bknA049653; Sun, 20 Aug 2023 07:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7bkOX049650; Sun, 20 Aug 2023 07:37:46 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:46 GMT Message-Id: <202308200737.37K7bkOX049650@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: aad4b799f78a - main - linux(4): Add a writev syscall wrapper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: aad4b799f78a8177732b27badc133d734f9c77d8 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=aad4b799f78a8177732b27badc133d734f9c77d8 commit aad4b799f78a8177732b27badc133d734f9c77d8 Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:30 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:30 +0000 linux(4): Add a writev syscall wrapper Adding a writev syscall wrapper is needed due to Linux family of write syscalls doesn't distinguish between in kernel blocking operations and always returns EAGAIN while FreeBSD can return ENOBUFS. MFC after: 1 month --- sys/amd64/linux/syscalls.master | 4 ++-- sys/amd64/linux32/syscalls.master | 3 ++- sys/arm64/linux/syscalls.master | 4 ++-- sys/i386/linux/syscalls.master | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index 885192963728..88caaa49367b 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -176,8 +176,8 @@ u_int iovcnt ); } -20 AUE_WRITEV NOPROTO { - int writev( +20 AUE_WRITEV STD { + int linux_writev( int fd, struct iovec *iovp, u_int iovcnt diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index aa3e420053f4..5ebbe3f6e55d 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -775,7 +776,7 @@ 146 AUE_WRITEV STD { int linux_writev( l_ulong fd, - struct l_iovec32 *iovp, + struct iovec32 *iovp, l_ulong iovcnt ); } diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master index 90c6fcfc4642..daaeeef1acc2 100644 --- a/sys/arm64/linux/syscalls.master +++ b/sys/arm64/linux/syscalls.master @@ -406,8 +406,8 @@ u_int iovcnt ); } -66 AUE_WRITEV NOPROTO { - int writev( +66 AUE_WRITEV STD { + int linux_writev( int fd, struct iovec *iovp, u_int iovcnt diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index 81473ef776aa..6144deeb31ab 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -790,8 +790,8 @@ u_int iovcnt ); } -146 AUE_WRITEV NOPROTO { - int writev( +146 AUE_WRITEV STD { + int linux_writev( int fd, struct iovec *iovp, u_int iovcnt From nobody Sun Aug 20 07:37: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 4RT6s74RStz4qsKK; Sun, 20 Aug 2023 07: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 4RT6s73yLpz3DLn; Sun, 20 Aug 2023 07: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=1692517067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9m7vi+tEIT0Ex1M5p8SpRdqMFBUjlobk5NJpvXCjELU=; b=rzkDrYFh+DvwKOOb96/xtEbsRNjhkXWID7AIL736OA+MrylfWlrgLF5pA2+2hrKZKR/L7b 0MTjCtjol+KK1HMwiWQ0wyAprY0pmDXrL2EOkGe5He1RQriuyNpd+AkVuDuGPk2IMW4xXf PTqCrAjNdBjnzP/szWSt8ecXQ3u/T2WcWJwg0P4g/brozrgwOWYqzXWjRA+i5vbG5rN+Sf 5boHIVj14YBjkl1TzHHFPBGtg1Z5g/DOn1NyegSAICuwp5LKn4a5OkM0GRmoZCdMvtDI9I 1SYATeYRiRsu9je12z6O+GzN0IzqdHaFI5hj6sTZIa+4R9epxr+i2Paa3jdadw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9m7vi+tEIT0Ex1M5p8SpRdqMFBUjlobk5NJpvXCjELU=; b=Wqb5nLbGXYNSYEthgUdvHRyGBUb8vk2+dA58xXc26WJ611hHvWCYhMJkOqxbwZ9e0vEaSs cWN8ZCu3n0nKBg2b85SZCGq9UiJobDOnxG2r75XzuBemwTER2krr1fRLvQUkGMYWbfW5wE SVIBiQIJmlH3HPoE45WpLwnzan/vC69jWr4b7hJ2QoLG4A43hAS+jAX/MeOttfMtZqCq7g xiJN84+LTBYYB72Mnhw7dacf3p0ARqbxbMFnX2OqG4YCQ7mGC1wQcC05jeQEXB2WsnHj5e WYQ+uxJBUrb41T6IUEZOHSFHdtOYbSB34YlfZE21zmft0Zy77CQTBbEcW2Sy7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517067; a=rsa-sha256; cv=none; b=biHGbqWpKB/ltfKE6ZyUogmup/uLdaGYGNRMAcree3VwuzxTZMZ9p55TSAbuaAR5prj2Hu bn7jzKSsphF3eXndrcvfY3qofZg0vWPk8fz5HC36a9vPrx51GIThJWZjO8Za1H6+GqqXXV X97jf86Y6D6tN5VVVjz/aKyCqRdmvc63IbmW/szhRjnECjce/OniIPKvDldnGq/4maKQrp H/bw/vMf7IRuxsBBpoZeyTLc3A8mwBnRWVz3jhyPJo2j84FR8EyzL/0fh8OHWtk2lTNXaV HbzdVEzpp4U0pnWzrQoc75zE1k2Toj4PK8o8QiFG9n7eKbI1MgPY93nI3R2Zlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT6s731yBzWhk; Sun, 20 Aug 2023 07:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7blD1049694; Sun, 20 Aug 2023 07:37:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7blqo049691; Sun, 20 Aug 2023 07:37:47 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:47 GMT Message-Id: <202308200737.37K7blqo049691@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: 1f9d71ee32cf - main - Regen for writev syscall List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f9d71ee32cf74ece18f36b31c7e9ea1613be730 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1f9d71ee32cf74ece18f36b31c7e9ea1613be730 commit 1f9d71ee32cf74ece18f36b31c7e9ea1613be730 Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:31 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:31 +0000 Regen for writev syscall --- sys/amd64/linux/linux_proto.h | 7 +++++++ sys/amd64/linux/linux_syscall.h | 2 +- sys/amd64/linux/linux_syscalls.c | 2 +- sys/amd64/linux/linux_sysent.c | 2 +- sys/amd64/linux/linux_systrace_args.c | 8 ++++---- sys/amd64/linux32/linux32_proto.h | 2 +- sys/amd64/linux32/linux32_sysent.c | 1 + sys/amd64/linux32/linux32_systrace_args.c | 4 ++-- sys/arm64/linux/linux_proto.h | 7 +++++++ sys/arm64/linux/linux_syscall.h | 2 +- sys/arm64/linux/linux_syscalls.c | 2 +- sys/arm64/linux/linux_sysent.c | 2 +- sys/arm64/linux/linux_systrace_args.c | 8 ++++---- sys/i386/linux/linux_proto.h | 7 +++++++ sys/i386/linux/linux_syscall.h | 2 +- sys/i386/linux/linux_syscalls.c | 2 +- sys/i386/linux/linux_sysent.c | 2 +- sys/i386/linux/linux_systrace_args.c | 8 ++++---- 18 files changed, 46 insertions(+), 24 deletions(-) diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h index 80b5998e2f26..2a9dbf6fbe12 100644 --- a/sys/amd64/linux/linux_proto.h +++ b/sys/amd64/linux/linux_proto.h @@ -114,6 +114,11 @@ struct linux_pwrite_args { char nbyte_l_[PADL_(l_size_t)]; l_size_t nbyte; char nbyte_r_[PADR_(l_size_t)]; char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char offset_r_[PADR_(l_loff_t)]; }; +struct linux_writev_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)]; + char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)]; +}; struct linux_access_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char amode_l_[PADL_(l_int)]; l_int amode; char amode_r_[PADR_(l_int)]; @@ -1417,6 +1422,7 @@ int linux_rt_sigreturn(struct thread *, struct linux_rt_sigreturn_args *); int linux_ioctl(struct thread *, struct linux_ioctl_args *); int linux_pread(struct thread *, struct linux_pread_args *); int linux_pwrite(struct thread *, struct linux_pwrite_args *); +int linux_writev(struct thread *, struct linux_writev_args *); int linux_access(struct thread *, struct linux_access_args *); int linux_pipe(struct thread *, struct linux_pipe_args *); int linux_select(struct thread *, struct linux_select_args *); @@ -1715,6 +1721,7 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX_SYS_AUE_linux_ioctl AUE_IOCTL #define LINUX_SYS_AUE_linux_pread AUE_PREAD #define LINUX_SYS_AUE_linux_pwrite AUE_PWRITE +#define LINUX_SYS_AUE_linux_writev AUE_WRITEV #define LINUX_SYS_AUE_linux_access AUE_ACCESS #define LINUX_SYS_AUE_linux_pipe AUE_PIPE #define LINUX_SYS_AUE_linux_select AUE_SELECT diff --git a/sys/amd64/linux/linux_syscall.h b/sys/amd64/linux/linux_syscall.h index 45ba487f3a93..4755c673ab0f 100644 --- a/sys/amd64/linux/linux_syscall.h +++ b/sys/amd64/linux/linux_syscall.h @@ -24,7 +24,7 @@ #define LINUX_SYS_linux_pread 17 #define LINUX_SYS_linux_pwrite 18 #define LINUX_SYS_readv 19 -#define LINUX_SYS_writev 20 +#define LINUX_SYS_linux_writev 20 #define LINUX_SYS_linux_access 21 #define LINUX_SYS_linux_pipe 22 #define LINUX_SYS_linux_select 23 diff --git a/sys/amd64/linux/linux_syscalls.c b/sys/amd64/linux/linux_syscalls.c index 57f65a0a6cbf..201daec24f67 100644 --- a/sys/amd64/linux/linux_syscalls.c +++ b/sys/amd64/linux/linux_syscalls.c @@ -26,7 +26,7 @@ const char *linux_syscallnames[] = { "linux_pread", /* 17 = linux_pread */ "linux_pwrite", /* 18 = linux_pwrite */ "readv", /* 19 = readv */ - "writev", /* 20 = writev */ + "linux_writev", /* 20 = linux_writev */ "linux_access", /* 21 = linux_access */ "linux_pipe", /* 22 = linux_pipe */ "linux_select", /* 23 = linux_select */ diff --git a/sys/amd64/linux/linux_sysent.c b/sys/amd64/linux/linux_sysent.c index 79557b3780b3..694a22060125 100644 --- a/sys/amd64/linux/linux_sysent.c +++ b/sys/amd64/linux/linux_sysent.c @@ -36,7 +36,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_pread_args), .sy_call = (sy_call_t *)linux_pread, .sy_auevent = AUE_PREAD, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 17 = linux_pread */ { .sy_narg = AS(linux_pwrite_args), .sy_call = (sy_call_t *)linux_pwrite, .sy_auevent = AUE_PWRITE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 18 = linux_pwrite */ { .sy_narg = AS(readv_args), .sy_call = (sy_call_t *)sys_readv, .sy_auevent = AUE_READV, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 19 = readv */ - { .sy_narg = AS(writev_args), .sy_call = (sy_call_t *)sys_writev, .sy_auevent = AUE_WRITEV, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 20 = writev */ + { .sy_narg = AS(linux_writev_args), .sy_call = (sy_call_t *)linux_writev, .sy_auevent = AUE_WRITEV, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 20 = linux_writev */ { .sy_narg = AS(linux_access_args), .sy_call = (sy_call_t *)linux_access, .sy_auevent = AUE_ACCESS, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 21 = linux_access */ { .sy_narg = AS(linux_pipe_args), .sy_call = (sy_call_t *)linux_pipe, .sy_auevent = AUE_PIPE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 22 = linux_pipe */ { .sy_narg = AS(linux_select_args), .sy_call = (sy_call_t *)linux_select, .sy_auevent = AUE_SELECT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 23 = linux_select */ diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c index 5edef91239d3..9d53132063fa 100644 --- a/sys/amd64/linux/linux_systrace_args.c +++ b/sys/amd64/linux/linux_systrace_args.c @@ -189,9 +189,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } - /* writev */ + /* linux_writev */ case 20: { - struct writev_args *p = params; + struct linux_writev_args *p = params; iarg[a++] = p->fd; /* int */ uarg[a++] = (intptr_t)p->iovp; /* struct iovec * */ uarg[a++] = p->iovcnt; /* u_int */ @@ -3073,7 +3073,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* writev */ + /* linux_writev */ case 20: switch (ndx) { case 0: @@ -7293,7 +7293,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* writev */ + /* linux_writev */ case 20: if (ndx == 0 || ndx == 1) p = "int"; diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 4934b22c1ca1..bf599df05c22 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -464,7 +464,7 @@ struct linux_readv_args { }; struct linux_writev_args { char fd_l_[PADL_(l_ulong)]; l_ulong fd; char fd_r_[PADR_(l_ulong)]; - char iovp_l_[PADL_(struct l_iovec32 *)]; struct l_iovec32 * iovp; char iovp_r_[PADR_(struct l_iovec32 *)]; + char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; char iovcnt_l_[PADL_(l_ulong)]; l_ulong iovcnt; char iovcnt_r_[PADR_(l_ulong)]; }; struct linux_getsid_args { diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c index b5513743bbee..a3570b9bfe5b 100644 --- a/sys/amd64/linux32/linux32_sysent.c +++ b/sys/amd64/linux32/linux32_sysent.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 82736cb221bf..ef00e9121233 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -979,7 +979,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 146: { struct linux_writev_args *p = params; iarg[a++] = p->fd; /* l_ulong */ - uarg[a++] = (intptr_t)p->iovp; /* struct l_iovec32 * */ + uarg[a++] = (intptr_t)p->iovp; /* struct iovec32 * */ iarg[a++] = p->iovcnt; /* l_ulong */ *n_args = 3; break; @@ -4753,7 +4753,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_ulong"; break; case 1: - p = "userland struct l_iovec32 *"; + p = "userland struct iovec32 *"; break; case 2: p = "l_ulong"; diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h index f239bcb1463b..f24b7f25669d 100644 --- a/sys/arm64/linux/linux_proto.h +++ b/sys/arm64/linux/linux_proto.h @@ -275,6 +275,11 @@ struct linux_write_args { char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; char nbyte_l_[PADL_(l_size_t)]; l_size_t nbyte; char nbyte_r_[PADR_(l_size_t)]; }; +struct linux_writev_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)]; + char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)]; +}; struct linux_pread_args { char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)]; char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; @@ -1260,6 +1265,7 @@ int linux_pipe2(struct thread *, struct linux_pipe2_args *); int linux_getdents64(struct thread *, struct linux_getdents64_args *); int linux_lseek(struct thread *, struct linux_lseek_args *); int linux_write(struct thread *, struct linux_write_args *); +int linux_writev(struct thread *, struct linux_writev_args *); int linux_pread(struct thread *, struct linux_pread_args *); int linux_pwrite(struct thread *, struct linux_pwrite_args *); int linux_preadv(struct thread *, struct linux_preadv_args *); @@ -1509,6 +1515,7 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX_SYS_AUE_linux_getdents64 AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_lseek AUE_LSEEK #define LINUX_SYS_AUE_linux_write AUE_NULL +#define LINUX_SYS_AUE_linux_writev AUE_WRITEV #define LINUX_SYS_AUE_linux_pread AUE_PREAD #define LINUX_SYS_AUE_linux_pwrite AUE_PWRITE #define LINUX_SYS_AUE_linux_preadv AUE_NULL diff --git a/sys/arm64/linux/linux_syscall.h b/sys/arm64/linux/linux_syscall.h index 3307005a74c0..f331bec5dc4f 100644 --- a/sys/arm64/linux/linux_syscall.h +++ b/sys/arm64/linux/linux_syscall.h @@ -62,7 +62,7 @@ #define LINUX_SYS_read 63 #define LINUX_SYS_linux_write 64 #define LINUX_SYS_readv 65 -#define LINUX_SYS_writev 66 +#define LINUX_SYS_linux_writev 66 #define LINUX_SYS_linux_pread 67 #define LINUX_SYS_linux_pwrite 68 #define LINUX_SYS_linux_preadv 69 diff --git a/sys/arm64/linux/linux_syscalls.c b/sys/arm64/linux/linux_syscalls.c index 86b3c012c0b2..8bf57f971c54 100644 --- a/sys/arm64/linux/linux_syscalls.c +++ b/sys/arm64/linux/linux_syscalls.c @@ -72,7 +72,7 @@ const char *linux_syscallnames[] = { "read", /* 63 = read */ "linux_write", /* 64 = linux_write */ "readv", /* 65 = readv */ - "writev", /* 66 = writev */ + "linux_writev", /* 66 = linux_writev */ "linux_pread", /* 67 = linux_pread */ "linux_pwrite", /* 68 = linux_pwrite */ "linux_preadv", /* 69 = linux_preadv */ diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c index 940391dd175e..3bc2e2ad96d9 100644 --- a/sys/arm64/linux/linux_sysent.c +++ b/sys/arm64/linux/linux_sysent.c @@ -82,7 +82,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(read_args), .sy_call = (sy_call_t *)sys_read, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 63 = read */ { .sy_narg = AS(linux_write_args), .sy_call = (sy_call_t *)linux_write, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 64 = linux_write */ { .sy_narg = AS(readv_args), .sy_call = (sy_call_t *)sys_readv, .sy_auevent = AUE_READV, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 65 = readv */ - { .sy_narg = AS(writev_args), .sy_call = (sy_call_t *)sys_writev, .sy_auevent = AUE_WRITEV, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 66 = writev */ + { .sy_narg = AS(linux_writev_args), .sy_call = (sy_call_t *)linux_writev, .sy_auevent = AUE_WRITEV, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 66 = linux_writev */ { .sy_narg = AS(linux_pread_args), .sy_call = (sy_call_t *)linux_pread, .sy_auevent = AUE_PREAD, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 67 = linux_pread */ { .sy_narg = AS(linux_pwrite_args), .sy_call = (sy_call_t *)linux_pwrite, .sy_auevent = AUE_PWRITE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 68 = linux_pwrite */ { .sy_narg = AS(linux_preadv_args), .sy_call = (sy_call_t *)linux_preadv, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 69 = linux_preadv */ diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index 06f973cebe37..60daffbb420f 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -510,9 +510,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } - /* writev */ + /* linux_writev */ case 66: { - struct writev_args *p = params; + struct linux_writev_args *p = params; iarg[a++] = p->fd; /* int */ uarg[a++] = (intptr_t)p->iovp; /* struct iovec * */ uarg[a++] = p->iovcnt; /* u_int */ @@ -3235,7 +3235,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* writev */ + /* linux_writev */ case 66: switch (ndx) { case 0: @@ -6543,7 +6543,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* writev */ + /* linux_writev */ case 66: if (ndx == 0 || ndx == 1) p = "int"; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 5b58629d7b92..5baec9364d5b 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -461,6 +461,11 @@ struct linux_msync_args { char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; char fl_l_[PADL_(l_int)]; l_int fl; char fl_r_[PADR_(l_int)]; }; +struct linux_writev_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)]; + char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)]; +}; struct linux_getsid_args { char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; }; @@ -1803,6 +1808,7 @@ int linux_llseek(struct thread *, struct linux_llseek_args *); int linux_getdents(struct thread *, struct linux_getdents_args *); int linux_select(struct thread *, struct linux_select_args *); int linux_msync(struct thread *, struct linux_msync_args *); +int linux_writev(struct thread *, struct linux_writev_args *); int linux_getsid(struct thread *, struct linux_getsid_args *); int linux_fdatasync(struct thread *, struct linux_fdatasync_args *); int linux_sysctl(struct thread *, struct linux_sysctl_args *); @@ -2168,6 +2174,7 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *); #define LINUX_SYS_AUE_linux_getdents AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_select AUE_SELECT #define LINUX_SYS_AUE_linux_msync AUE_MSYNC +#define LINUX_SYS_AUE_linux_writev AUE_WRITEV #define LINUX_SYS_AUE_linux_getsid AUE_GETSID #define LINUX_SYS_AUE_linux_fdatasync AUE_NULL #define LINUX_SYS_AUE_linux_sysctl AUE_SYSCTL diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h index aafcd849634f..96aa0fbc1815 100644 --- a/sys/i386/linux/linux_syscall.h +++ b/sys/i386/linux/linux_syscall.h @@ -135,7 +135,7 @@ #define LINUX_SYS_flock 143 #define LINUX_SYS_linux_msync 144 #define LINUX_SYS_readv 145 -#define LINUX_SYS_writev 146 +#define LINUX_SYS_linux_writev 146 #define LINUX_SYS_linux_getsid 147 #define LINUX_SYS_linux_fdatasync 148 #define LINUX_SYS_linux_sysctl 149 diff --git a/sys/i386/linux/linux_syscalls.c b/sys/i386/linux/linux_syscalls.c index b6076e9115c2..ebb3fafca78d 100644 --- a/sys/i386/linux/linux_syscalls.c +++ b/sys/i386/linux/linux_syscalls.c @@ -152,7 +152,7 @@ const char *linux_syscallnames[] = { "flock", /* 143 = flock */ "linux_msync", /* 144 = linux_msync */ "readv", /* 145 = readv */ - "writev", /* 146 = writev */ + "linux_writev", /* 146 = linux_writev */ "linux_getsid", /* 147 = linux_getsid */ "linux_fdatasync", /* 148 = linux_fdatasync */ "linux_sysctl", /* 149 = linux_sysctl */ diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index be84f04ac9be..c293f2173e8c 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -162,7 +162,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(flock_args), .sy_call = (sy_call_t *)sys_flock, .sy_auevent = AUE_FLOCK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 143 = flock */ { .sy_narg = AS(linux_msync_args), .sy_call = (sy_call_t *)linux_msync, .sy_auevent = AUE_MSYNC, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 144 = linux_msync */ { .sy_narg = AS(readv_args), .sy_call = (sy_call_t *)sys_readv, .sy_auevent = AUE_READV, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 145 = readv */ - { .sy_narg = AS(writev_args), .sy_call = (sy_call_t *)sys_writev, .sy_auevent = AUE_WRITEV, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 146 = writev */ + { .sy_narg = AS(linux_writev_args), .sy_call = (sy_call_t *)linux_writev, .sy_auevent = AUE_WRITEV, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 146 = linux_writev */ { .sy_narg = AS(linux_getsid_args), .sy_call = (sy_call_t *)linux_getsid, .sy_auevent = AUE_GETSID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 147 = linux_getsid */ { .sy_narg = AS(linux_fdatasync_args), .sy_call = (sy_call_t *)linux_fdatasync, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 148 = linux_fdatasync */ { .sy_narg = AS(linux_sysctl_args), .sy_call = (sy_call_t *)linux_sysctl, .sy_auevent = AUE_SYSCTL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 149 = linux_sysctl */ diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index b6470cb66583..0bd681c68b6c 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1005,9 +1005,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } - /* writev */ + /* linux_writev */ case 146: { - struct writev_args *p = params; + struct linux_writev_args *p = params; iarg[a++] = p->fd; /* int */ uarg[a++] = (intptr_t)p->iovp; /* struct iovec * */ uarg[a++] = p->iovcnt; /* u_int */ @@ -4822,7 +4822,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* writev */ + /* linux_writev */ case 146: switch (ndx) { case 0: @@ -9214,7 +9214,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* writev */ + /* linux_writev */ case 146: if (ndx == 0 || ndx == 1) p = "int"; From nobody Sun Aug 20 07:37: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 4RT6s85JDPz4qs3P; Sun, 20 Aug 2023 07:37: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 4RT6s84XD7z3DMQ; Sun, 20 Aug 2023 07:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zf3NIJMzoUJmn2X0v6NGe1vm255fvsCX/s8Wt4mXVHA=; b=b9eUf9esDHU+S2AwltxI0pNjKUH91ZK647QnbieaEur2ZtUkjUO7nGWMOMtrPRqSrqurL/ pm8YwmRQJigIt7n0ADhZOC9CN+B3ISHSuWf5IoAAM7QHkUYHORA8M9Seybscv7pLAbOBdm 6ACX4Hl/J8qC7CUH9RCAbAUvxOs+womL6LiXL8wWJVBnORJchD85H6YV9+E0n1tUgxVYcN 1gac1BlVQNmcEvtNwsIocMgLwTnEtszw4OzyBJ3y7CW/LYWKn6+SUyucXsFpPdizgUa4Gr B/JHvOZJaA0bmA8Jr0MZTxxcY3usHOObI3HF8UUii1w6aOdHwUSqq68iniR3/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zf3NIJMzoUJmn2X0v6NGe1vm255fvsCX/s8Wt4mXVHA=; b=JkS2fB0RyKHT6dEFIiLfo59frb2RFYnlshe3EQtHxJyK1ALeWAptfcW7fN96xse8LMKxnk KktaFoVwRPjKfL3WsRq2yrDLAgYyirh6orPg0vHVaxwlyY12iheaIOK+ENclEVerPMBMfG 39ED3Zm8jocp+EH9f7hmwut6RvMdbNa/lKvn9PU51FQsYwwWrHpj0RlJq6xVbrHkCw8tgi fotCMsLOI5ixx4OJy9paaVyts65lOawXJD2dEPSr3PhViGE6TnEYAC/sYv9IkFO1bN/bEh SkT2PYMLjPUdH0gx0bbPCls2/sKxRxuWLA/bSZhoqA+vn85rPMJnzvbUE8QEQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517068; a=rsa-sha256; cv=none; b=BY+X5tcrEj7bcegpejBaVMT/Rzsl30DrUnVYfrrX06IB5+JJPp/kEHWhaceOT23FuwXv+i O3ZxrVl6lYOEhwiA9olKgmNXQA5bNVikw0x4NfZYXlEvVlbU9pnvsQkjvkBNEXW2TJC9P8 QTco6EZ237mQLIWcbV9zXoCSAnUkhpQSgaG1KJvCqLl+KXPv3U/cI1/Ej4yDUy3gEIsJ+F ELTexP7zKPGxYti9bNMRdOPKtKrRcLWTAzk9eIXHsBmlB7M2xWjeJZOtoKAy8uZS97pRZg ONcDU82/kxlz2s2WKDSMRe69rdBlHabWuZumI7hFbm0rsw6XM16viri46JVvDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT6s83c7TzWfZ; Sun, 20 Aug 2023 07:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7bm2J049742; Sun, 20 Aug 2023 07:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7bm2e049739; Sun, 20 Aug 2023 07:37:48 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:48 GMT Message-Id: <202308200737.37K7bm2e049739@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: 4231b825ac19 - main - linux(4): Add a dedicated writev syscall wrapper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4231b825ac19112b84b4001625e0ef7a80e82f80 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4231b825ac19112b84b4001625e0ef7a80e82f80 commit 4231b825ac19112b84b4001625e0ef7a80e82f80 Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:31 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:31 +0000 linux(4): Add a dedicated writev syscall wrapper Adding a writev syscall wrapper is needed due to Linux family of write syscalls doesn't distinguish between in kernel blocking operations and always returns EAGAIN while FreeBSD can return ENOBUFS. MFC after: 1 month --- sys/amd64/linux32/linux32_machdep.c | 14 -------------- sys/compat/linux/linux_file.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index 2598384aada5..ac8234503bdd 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -196,20 +196,6 @@ linux_readv(struct thread *td, struct linux_readv_args *uap) return (error); } -int -linux_writev(struct thread *td, struct linux_writev_args *uap) -{ - struct uio *auio; - int error; - - error = linux32_copyinuio(uap->iovp, uap->iovcnt, &auio); - if (error) - return (error); - error = kern_writev(td, uap->fd, auio); - free(auio, M_IOV); - return (error); -} - struct l_ipc_kludge { l_uintptr_t msgp; l_long msgtyp; diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 6a1f61984b08..27b6e1a5f77d 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -47,6 +47,7 @@ #ifdef COMPAT_LINUX32 #include +#include #include #include #else @@ -1855,3 +1856,21 @@ linux_write(struct thread *td, struct linux_write_args *args) return (linux_enobufs2eagain(td, args->fd, sys_write(td, &bargs))); } + +int +linux_writev(struct thread *td, struct linux_writev_args *args) +{ + struct uio *auio; + int error; + +#ifdef COMPAT_LINUX32 + error = freebsd32_copyinuio(PTRIN(args->iovp), args->iovcnt, &auio); +#else + error = copyinuio(args->iovp, args->iovcnt, &auio); +#endif + if (error != 0) + return (error); + error = kern_writev(td, args->fd, auio); + free(auio, M_IOV); + return (linux_enobufs2eagain(td, args->fd, error)); +} From nobody Sun Aug 20 07:37: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 4RT6s96RtDz4qs5x; Sun, 20 Aug 2023 07:37: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 4RT6s95ftDz3DZT; Sun, 20 Aug 2023 07:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UFc8WN9u2zIUVQlWUvoRZQCr/ReM+6ovIx3kjc3l0mU=; b=Kzw8yrVpSIuh7ThXxki6ayDF9gduCcouAiFNyHTXPvWgUBcoB+YSIcPbOmX0EH8rBCje/A vv2PdgiHrbmn8GZudwjWkDXl5jkY4TzC7NA+4ljKaI6eOnWry00ky39x3TveFO8X7WX9Wa p/TTszzyuxjLpHxLkLIxcNT3Md7QYPKa4bkLZkIVVgRMBQH2lHKpIB43o7DPIY05l324Xd ggJAlonWotS74Lb+v4Ya6RkZf9wVzAEDzzmXdgd+XAYKxJT0JccAmUSM33fesEDVAi4SDw tqRXgx8BWROupGx628fN5rU9ttVP2sJFhBU66Ou/juCalftHbC7fe925UUmf4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UFc8WN9u2zIUVQlWUvoRZQCr/ReM+6ovIx3kjc3l0mU=; b=V1mpQyWsU8y2mZjvJFrPTib8N4JrBp8vFIX05w9vrXIUKIB2zPKGXlna4V8rQ5wTrZYT/e TmiBfV3/Kx4t8c2usMCHTiJXbA+0WpwCwiiY7dXpGLe7lO/+lfae8ov3K9WLMbtYu/AN91 HPQKE1Eo+tUgGlrdKAzJPUkEdR5zJ+eGH1bGxnWm1pOc68wxt6Rvc63AR6r1Nu68LmymIg bVHTlu0Sn6aNy0NmsEDLUSkJvx6i7q/gHzpHuRneWpa8oUQM9ImAAoDueoyD8leJehKZME h0Drvf7soFdpLDPeDxy15qLafB2fGpWFPhZficRnB2toLQR4EbS2fQlrvOz77w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517069; a=rsa-sha256; cv=none; b=ITrKknzWAv982nK11fc4pl9Vb0I53/bFvhZWwgncLMBogvs7bKtTG9T8ermtOEGrlOGq5U JOu+Df8Btbz24GJUeqFRiKbHvaea9f5+C1Ig6dlYXMxiDkGr66/aKcLYnUuPYBM1ShwtHB W8NjknbKjEdNDdveuGotaeVqjVC0EEqZ0uOblaHtdYBppxywXstNYM/nySvgYyM6SnBPE/ itqIbNJV1T/5ttaHjmdeq/iIMkD2vRsE5yla1+w1HBzePHc1M+JFw7C5gMWy+VkfXx+jpp bggFkXWeBQa2fQCYEf4G0xpJaLTIcS15M8MTQVdcqJNUL/xXSyWVYOqibsq9GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT6s94QZnzWrX; Sun, 20 Aug 2023 07:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7bnqf049803; Sun, 20 Aug 2023 07:37:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7bnnJ049801; Sun, 20 Aug 2023 07:37:49 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:49 GMT Message-Id: <202308200737.37K7bnnJ049801@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: dfbb3e2aaec2 - main - linux(4): Return EAGAIN instead of ENOBUFS for non-blocking sockets in pwritev List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: dfbb3e2aaec2709f3e68a6657bf2a656a4adbe27 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=dfbb3e2aaec2709f3e68a6657bf2a656a4adbe27 commit dfbb3e2aaec2709f3e68a6657bf2a656a4adbe27 Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:31 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:31 +0000 linux(4): Return EAGAIN instead of ENOBUFS for non-blocking sockets in pwritev MFC after: 1 month --- sys/compat/linux/linux_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 27b6e1a5f77d..32aa64559414 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -1065,7 +1065,7 @@ linux_pwritev(struct thread *td, struct linux_pwritev_args *uap) return (error); error = kern_pwritev(td, uap->fd, auio, offset); free(auio, M_IOV); - return (error); + return (linux_enobufs2eagain(td, uap->fd, error)); } int From nobody Sun Aug 20 07:37: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 4RT6sC12p4z4qsMt; Sun, 20 Aug 2023 07:37: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 4RT6sB6L8Xz3DVh; Sun, 20 Aug 2023 07:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YgRswlKBTIOdmO4VT8UpEN9NLrZt+XsJ0jrT23hot4Q=; b=C1Pwcmji+YEJkg/G/q7D90fPW9ok4aZwoZWyLwi5RtrDx0s+kyeSWHcyXYiiksaxL04Ib9 /2Cy4EArm1Drj/TLRP8SB/KUAeAIs9QgWoORGFIbrwGAx7mYREXXolVIlafmANlimR7s29 kFNOhE2ALx2RtDMb3FRO1PSttsxDcQ6vlQ/EsFjuVVloZ+eCr/mhO1LU5mrmBhh5LfH/oF GlngoZY0SRdBkq66zfAlXEJ1SFjGHw861J8rRW8b9842Q6EXM90w4NPTPjSdH2b0JlK3rB W/0tARAwxD9u/3MTa+fkdUTbB2GIGS4cLiPMWXTkBwiNhubijKi2OZDgLCDDvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YgRswlKBTIOdmO4VT8UpEN9NLrZt+XsJ0jrT23hot4Q=; b=oaaYfbkpusj9L/rPh4+3v3wZ9sdD9nd5Ttj91Fo3hsAHW3uyvuWmSL5zrrq0HRrUV6UIHw Yp1hpZcXzX1a72JSBafbsv2tUk+cBKLXkb4eyxxWCiQYr/nSYOG/E07pjCn9UlFDe0ZxPz Hfb0dS67pkHNnlxZNQ0uqwlu+i3m2ObXe0kiHBuFu8AB7/HUQ49zsFFrjvuf3PTdLs/MDu n6/Vs7Ma4c8mCctBhzsOADsqg6az/pvMxN8yVwJc60Hg9Ra7Yj6D/BBkB2mdmsh6rkId87 lkFgzuAIHDuxEBWK94rOBfUUePRCIckDfqxeMRQtCWXRkMxbQq9QNyEUC+ABCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517070; a=rsa-sha256; cv=none; b=K7tVeHnabnOzbfifQCnvCq32FRJlvzzSZBwC6zC0taZ2cRczZC1lZm1iquxRA5nzW+T0QM yD3IGg0GuAIJsNx0uQ8VJ9usO9XUgNdHlACJXWISxznTs7jC80RRozrC/eI6wlSwYZIM6l b9WDvM6vESOMRMNa4l/yYC6/DRDKRUGfeWQFIGU60dv8Vf6W4KlCJdioC+FjihUsR8BZFl kSI+BQt3Xb25vyRrdgCuPlE6xxqwzWlL3+cCfJxZQFxX7t85WWVTn5rpY42IVdPEIElxT5 NLmZvt4JeV5Zq5/F/CD1qvLjXndUTUbDdIDKioYkiMVHUgWsgHqgI4AmnoL/Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT6sB5RtqzWhl; Sun, 20 Aug 2023 07:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7bowv049865; Sun, 20 Aug 2023 07:37:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7bobL049862; Sun, 20 Aug 2023 07:37:50 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:50 GMT Message-Id: <202308200737.37K7bobL049862@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: d6cb9e728b37 - main - linux(4): Return EAGAIN instead of ENOBUFS for non-blocking sockets in pwrite List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d6cb9e728b3737d19da7a5554d1c6b740a29e69d Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d6cb9e728b3737d19da7a5554d1c6b740a29e69d commit d6cb9e728b3737d19da7a5554d1c6b740a29e69d Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:31 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:31 +0000 linux(4): Return EAGAIN instead of ENOBUFS for non-blocking sockets in pwrite MFC after: 1 month --- sys/compat/linux/linux_file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 32aa64559414..c3b69e54d257 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -1002,7 +1002,8 @@ linux_pwrite(struct thread *td, struct linux_pwrite_args *uap) offset = uap->offset; #endif - return (kern_pwrite(td, uap->fd, uap->buf, uap->nbyte, offset)); + return (linux_enobufs2eagain(td, uap->fd, + kern_pwrite(td, uap->fd, uap->buf, uap->nbyte, offset))); } #define HALF_LONG_BITS ((sizeof(l_long) * NBBY / 2)) From nobody Sun Aug 20 07:37: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 4RT6sD1xRRz4qs1C; Sun, 20 Aug 2023 07:37: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 4RT6sD1Hgbz3DSY; Sun, 20 Aug 2023 07:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cXDefniNBg4lSsn0xVicWofeRph4gS1ZlQWT7gLp72g=; b=AXHXFWk7aTe6itq+VRZUUEmB9YGh42+Y0+V9FIGUgwVyeDKUn8lsSJO5B04S+iAql70LQ9 5FfZwigxvNvHkHH53oObCTcDMVk+OAz+UhOm7h5MTbhMpPzAavHuMEWWcp3JUeaxi5+HQ2 V7CtVM0nNBeRJ0dxRNLYXnTRltnE/6EhVD1u4YA5UI6WjPAPy2Tysa3qCouz+Z0kCaZq7j yKCvwAg2p6N0CUwQkNwtFvvjuoaGPI99fcTE8B49Rc528lCcrDs2JTScmMN9Nhcs2HEyBc QVdyxB38ewV2NZnQV2VXGUuy4sFkduXOQ6KcFig9HIRVvD7dutAvHQOrvuhfBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cXDefniNBg4lSsn0xVicWofeRph4gS1ZlQWT7gLp72g=; b=OXj/uafbqs0gEegEHR+PC1WA32MDsParkzE6V1DJ4BnPLq4NQeHTrxO/dQOWByabXLprJp yxlGy7p24utb+aZ9L+kut/01Hw4E8iV3hMxuQCYtVs3vTGCdr4SHi6h5xuFEvzW0RmBIJ1 qQ2twrTkSZd92pqY8Ci5Dj9PGZsYnlc9fmmHrZp3ilwmWLth6ck/nOCw1ROvcCJEVkeHBX 2ltdHtB9GpMrw0Gk8JJIKnc0xU52SJ5ZGZ3JV2pGwQ+7LTntXVgSOXuDWfQtO7Z5eQ6lNT VhsnD45asm/CvOv9l+NxvBiJMOfpnt0fzXlGpMCGjiH3XlkZDwBk2vERN++eBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517072; a=rsa-sha256; cv=none; b=krJVtcGUNPt80lHXQwMl6MX4tXX1TL0YiK7ZkUCbnLDozlAD71m02lSbRJ5cVPv9+cX3i3 OctDoNShLhiNyZJeUEONeN5hbz2LXOAEDMDjUiAt8CkG80zTgew9d4rIZ215GcPLdLVgJ0 XtaXdcGpMffGVASohLfdODZVIaKJynnkzBtehV4uEdvuFt5hpbbim9faNQg23IMpQUXx+i t/3Ljoabm0FicEwrjFTzC24EVqqNst/8XQ2Jl0wCXYxpVpVjgtDVGaomm2RnrzKUMUqfgd yK3ua2HmhxHN47KvhaMSBliuc4Fijew4IdHaWdtbKaUrLNu5XuzqcWsEYz7+aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT6sC6fl2zWhm; Sun, 20 Aug 2023 07:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7bp0b049911; Sun, 20 Aug 2023 07:37:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7bpDV049908; Sun, 20 Aug 2023 07:37:51 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:51 GMT Message-Id: <202308200737.37K7bpDV049908@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: 5585afe6428b - main - linux(4): Prepare to retire linux32_copyinuio List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5585afe6428bd04773e89b7bf20c3b211dc87f63 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=5585afe6428bd04773e89b7bf20c3b211dc87f63 commit 5585afe6428bd04773e89b7bf20c3b211dc87f63 Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:31 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:31 +0000 linux(4): Prepare to retire linux32_copyinuio MFC after: 1 month --- sys/amd64/linux32/syscalls.master | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 5ebbe3f6e55d..679eda14202a 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -769,7 +769,7 @@ 145 AUE_READV STD { int linux_readv( l_ulong fd, - struct l_iovec32 *iovp, + struct iovec32 *iovp, l_ulong iovcnt ); } From nobody Sun Aug 20 07:37: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 4RT6sF1shSz4qrxh; Sun, 20 Aug 2023 07:37: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 4RT6sF1GrFz3DWS; Sun, 20 Aug 2023 07:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fa/ZnthrGA7W+QdsCGUAXG+VC8/fXDGqYbHJBvv6Tqs=; b=PD5KylAoEghE9/7uJrLC3Fd5eTd+NJ5n2XarioyfWvyZxW1Noo8IIKl5k0waYOXDCwi9+P Hmag48GmR0G/NxQ4eNLCF4jGxZqMtqtApIghpIjk4WWVsgnSdrPVAG3pCMbzFL/G//8rET 89+AOSlbXj9mBis6FSpcYCFHYZNrUbmfMFwowbzj16GpHei+ht5ZcFZrNPgNHRkhzFJvt+ uUQ8dB1ll7BWEgn74u2qWulPkUI+sizRUXkmW7BFBrKweI4YPpk8rGGXbpi6asUuEjN1b7 plGH0GUyyBcQZmGObRMkQvZKs6W4mehR0qfnaCLIMdbv3X08l6YYTXMlHK669g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fa/ZnthrGA7W+QdsCGUAXG+VC8/fXDGqYbHJBvv6Tqs=; b=ESdmPAPIPOclUoR1KKjsZLywp+ArZz+arVOewm8x/KYYYUqs2315CRnQ6mhWA00w6vYiCY 5dFKH8WLvkzSke5swrRSdppacv1wbKekotvQtjTvs7b5OKVz66IU0JMNnSZnZG84fiUMaU A0O9jO+3Ey6x7CJYpJRZ8y7SNZckUI1OcM5TDjLL/sBcji5GVuDyzeq8uVRCOXdpFHZKD0 Iw+p0E0oswB9yLVPCZBKgJllVC/V7g7p8sFvrRu3iwWibiTYUW1Of5Savl6/fV6v4xNVYO OCW/Q7y/69fWgh34GHj6lF51Gez9oaEZgNxM5zKXnQObp2YYSLsGZBvhdbkgog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517073; a=rsa-sha256; cv=none; b=unHlFRi3a3g2QDk14oM5qc22N8HyB4/YVjpUsOwZ9cBugVkEwZlnuyg0u4HbCvxL4imv4L c2M2SnY/9wO7hlRnJPOWIS+LLwxbZ71CDOAeys//4wGI0UFvZOUfZVKnheDzsAEGba2jw2 fru67UVA+usJerdyjz0Cqu9iTCUYT4RnvDnQOoG7zc8TuKUImfh0Ds+Leb2k2hJVs/LFn6 Mb/C8Wa9dOpznRAd/IcLA9eJjIy31Vj+NimCcP8sq76u2VOFeTV/DRT2H06bbgqhGwzdTS G2A79RHaoycH65yJzSugXC6lH6+OlWwHCYEVgz2vzAH3WUPVHUeE/zPZW8+Esg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT6sF04dvzWhn; Sun, 20 Aug 2023 07:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7bqvQ049950; Sun, 20 Aug 2023 07:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7bqZq049947; Sun, 20 Aug 2023 07:37:52 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:52 GMT Message-Id: <202308200737.37K7bqZq049947@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: 4e5f2eb0b6cd - main - Regen for readv syscall List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e5f2eb0b6cdab35893f18b6132874b5b031df96 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4e5f2eb0b6cdab35893f18b6132874b5b031df96 commit 4e5f2eb0b6cdab35893f18b6132874b5b031df96 Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:32 +0000 Regen for readv syscall --- sys/amd64/linux32/linux32_proto.h | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index bf599df05c22..8767199f2342 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -459,7 +459,7 @@ struct linux_msync_args { }; struct linux_readv_args { char fd_l_[PADL_(l_ulong)]; l_ulong fd; char fd_r_[PADR_(l_ulong)]; - char iovp_l_[PADL_(struct l_iovec32 *)]; struct l_iovec32 * iovp; char iovp_r_[PADR_(struct l_iovec32 *)]; + char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; char iovcnt_l_[PADL_(l_ulong)]; l_ulong iovcnt; char iovcnt_r_[PADR_(l_ulong)]; }; struct linux_writev_args { diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index ef00e9121233..de00b970027b 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -970,7 +970,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 145: { struct linux_readv_args *p = params; iarg[a++] = p->fd; /* l_ulong */ - uarg[a++] = (intptr_t)p->iovp; /* struct l_iovec32 * */ + uarg[a++] = (intptr_t)p->iovp; /* struct iovec32 * */ iarg[a++] = p->iovcnt; /* l_ulong */ *n_args = 3; break; @@ -4737,7 +4737,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_ulong"; break; case 1: - p = "userland struct l_iovec32 *"; + p = "userland struct iovec32 *"; break; case 2: p = "l_ulong"; From nobody Sun Aug 20 07:37:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RT6sG3fMTz4qs3b; Sun, 20 Aug 2023 07:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RT6sG1zTFz3Ddn; Sun, 20 Aug 2023 07:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iq9PWJF0xju9JHej7SIWr72jyK+3fgLM7Arh4ByHAfM=; b=VWIv570wGchkKOLETcP9PZ5+ZZ08JSNCtLHHzPjnAUcGETYno/RSW1RRJqhWhVZXr03fPo HdKQ+MmB8Di38TIHRV/Yjb4iYQmZ3f04+Wm/lbg7eswPsn0XQSFK9V14COIk9qdEiYIVJx v0cf+tZZ/kt9JOo74VVWrol0P+rN7dIRa6c8Miooq8gK71R5GcZbjNdu2oNs/lIlEn4AOz GTueo7Lh8dCB4beZMU4Z9Ok+B2vyY7GP8+2K9IjeO2pLw3uVWq/9az3LPp2gUCYalPN5F8 GlMYJIQ12+Vn+zukHXDtxg37Xu0wi9cMnC37NIc3VzVV8SQSVEA+hxT08LglGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iq9PWJF0xju9JHej7SIWr72jyK+3fgLM7Arh4ByHAfM=; b=mpxLmodDe5HZZMT79SnCgy+bptbAsJhqwvHlf5K7TnaWfhb8TB1zB8ijcbq7gpOHpLoYVA LB0UjK+B3L4Pc+dw4gYp5I0P3MKRUOIM+efMb4fGOhuzgc25LcGxZGnqddtDyh2c5ODurA crKomot05J5mPhHNL4fTWlS63bvsqBV5Yyny1vD7y120vJd+ApKbRYIDDaPI3dfNSDqwZg U05exouSGqyOoy6IYKUUWX3SXNEvlK3Ry6MMvNxIvTOZCvjhxD6TbKGjViyHzMj/UB7kvw NsESqgtMfi905N2ENiwqpYNODmzMpeNFdHgvEtfIu/Vwa6oGig6clsqqzipOEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517074; a=rsa-sha256; cv=none; b=tYLdDICuOqU9nU4yy956lynS3MEX4z2xa4Hm9nw+Qt4UkohcCeUCgYdNslACMkLuurT/Ia dx3MrIIm+Ht1PgKg7QfGz37RHJ8FWbqeMEjikA6YE33Fj6ffx2sW5Nc9OMgi3eIA2rKoQ0 b2/0Sj3ywXkuUu9zscDSvah8z6fM4MO+m6i8Ta2JxIEyZxsyujgcLMwnFq5iqRpJyV7WJE P+yyoMcnUZ9eM8eQs0+QXhjUwFStcmmk14rTJ86EMM1Bi4/E/aw9jxQPnHbrBOPM0t+cCZ 6ZA1QJIWL6f8rt36qqa3PoTaAPxSPWHwrgEWfPWuGaDgrv3CYo/y9MD7Jrs5RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT6sG13jNzWhp; Sun, 20 Aug 2023 07:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7bsZ9049992; Sun, 20 Aug 2023 07:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7bsZF049989; Sun, 20 Aug 2023 07:37:54 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:54 GMT Message-Id: <202308200737.37K7bsZF049989@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: c987ff4d7bd2 - main - linux(4): Replace linux32_copyinuio by freebsd32_copyinuio List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c987ff4d7bd25e9186ffca84c7e873fd7382a1c7 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=c987ff4d7bd25e9186ffca84c7e873fd7382a1c7 commit c987ff4d7bd25e9186ffca84c7e873fd7382a1c7 Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:32 +0000 linux(4): Replace linux32_copyinuio by freebsd32_copyinuio MFC after: 1 month --- sys/amd64/linux32/linux.h | 2 -- sys/amd64/linux32/linux32_machdep.c | 43 +------------------------------------ sys/compat/linux/linux_file.c | 4 ++-- 3 files changed, 3 insertions(+), 46 deletions(-) diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index 1feac8788292..382d010f9ed8 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -398,8 +398,6 @@ struct l_iovec32 { int linux32_copyiniov(struct l_iovec32 *iovp32, l_ulong iovcnt, struct iovec **iovp, int error); -int linux32_copyinuio(struct l_iovec32 *iovp, l_ulong iovcnt, - struct uio **uiop); int linux_copyout_rusage(struct rusage *ru, void *uaddr); #endif /* _KERNEL */ diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index ac8234503bdd..e0364f1e00d1 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -113,47 +113,6 @@ linux_copyout_rusage(struct rusage *ru, void *uaddr) CTASSERT(sizeof(struct l_iovec32) == 8); -int -linux32_copyinuio(struct l_iovec32 *iovp, l_ulong iovcnt, struct uio **uiop) -{ - struct l_iovec32 iov32; - struct iovec *iov; - struct uio *uio; - uint32_t iovlen; - int error, i; - - *uiop = NULL; - if (iovcnt > UIO_MAXIOV) - return (EINVAL); - iovlen = iovcnt * sizeof(struct iovec); - uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); - iov = (struct iovec *)(uio + 1); - for (i = 0; i < iovcnt; i++) { - error = copyin(&iovp[i], &iov32, sizeof(struct l_iovec32)); - if (error) { - free(uio, M_IOV); - return (error); - } - iov[i].iov_base = PTRIN(iov32.iov_base); - iov[i].iov_len = iov32.iov_len; - } - uio->uio_iov = iov; - uio->uio_iovcnt = iovcnt; - uio->uio_segflg = UIO_USERSPACE; - uio->uio_offset = -1; - uio->uio_resid = 0; - for (i = 0; i < iovcnt; i++) { - if (iov->iov_len > INT_MAX - uio->uio_resid) { - free(uio, M_IOV); - return (EINVAL); - } - uio->uio_resid += iov->iov_len; - iov++; - } - *uiop = uio; - return (0); -} - int linux32_copyiniov(struct l_iovec32 *iovp32, l_ulong iovcnt, struct iovec **iovp, int error) @@ -188,7 +147,7 @@ linux_readv(struct thread *td, struct linux_readv_args *uap) struct uio *auio; int error; - error = linux32_copyinuio(uap->iovp, uap->iovcnt, &auio); + error = freebsd32_copyinuio(uap->iovp, uap->iovcnt, &auio); if (error) return (error); error = kern_readv(td, uap->fd, auio); diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index c3b69e54d257..6eab8980a5c5 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -1031,7 +1031,7 @@ linux_preadv(struct thread *td, struct linux_preadv_args *uap) if (offset < 0) return (EINVAL); #ifdef COMPAT_LINUX32 - error = linux32_copyinuio(PTRIN(uap->vec), uap->vlen, &auio); + error = freebsd32_copyinuio(PTRIN(uap->vec), uap->vlen, &auio); #else error = copyinuio(uap->vec, uap->vlen, &auio); #endif @@ -1058,7 +1058,7 @@ linux_pwritev(struct thread *td, struct linux_pwritev_args *uap) if (offset < 0) return (EINVAL); #ifdef COMPAT_LINUX32 - error = linux32_copyinuio(PTRIN(uap->vec), uap->vlen, &auio); + error = freebsd32_copyinuio(PTRIN(uap->vec), uap->vlen, &auio); #else error = copyinuio(uap->vec, uap->vlen, &auio); #endif From nobody Sun Aug 20 07:37:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RT6sH6XNmz4qsHb; Sun, 20 Aug 2023 07:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RT6sH3ZHxz3DhS; Sun, 20 Aug 2023 07:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GRe9HtK6HHe8u/7zf7tPuJOlYul8TAI8haE/GRD8dZA=; b=FmCXChqBnP2fMEbGFeKzdMo9WUfzIs+MkQybyvuWbChDOO9bbsEMzKCBlbzdujREGTU9Ey xm2/7PJm2knA1gnAQ7fIHDCFYaBpi0UjVz8HocXqTREEHUYmy500D6Ad3bftAQENYkH3dQ 5ih0ob+f8cV2yKvbGgr9JXguhRmuwqtxOuFgj47zOW8iYOlUFg4vfwQ2uCzBvw0Gu1FRFV OPmYEERSqJfOvkxHcCKWXJyNQvHUqv4RPdAVFiK+8Y0IccD0XeIEbx2oMcGFsRvrKc7PN5 qFwug/NQ1z4vO9X0hIFYy6IPPE82zFE4qdFUAIY1uFfntjlM3LQza6XW9UeseQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GRe9HtK6HHe8u/7zf7tPuJOlYul8TAI8haE/GRD8dZA=; b=EDo/4gnUlBdXLJX4gId+XPJuIOeP3LOuaH9QV4LHeuhdNvexT87YjHGAe2L9jqsIB25ICJ zoXygIycPrQy4PBEvxGnkxYvdcC1d3CrgJbnkbOKDZRRuXIN+R0BlpaX+KfDr6nfo29Qfz yfIskZDWXF9E8TbcA2VvLAmfkz4Z/C8Dfxo+zEqfA9HsCeutsUT07wvaWYk4o7wQpk/UTH +DbQaAUYz4DcoVtVmf/LjFbVeOChWqFYW3COIw8LC//m2ZQNlNAxtb78LhgImA7w427Vii x5KwjSyizsO94hcr8PbPYzKS0r44ltFLcdIfPflGUaHjfeG9P/QXz3cXNBQHUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517075; a=rsa-sha256; cv=none; b=lAeJEwKpARlOOBAN2SmwaGN66/QelY+4Jp5C80xy+jLzuUapLgqW74+trIfhWI7qEsICRe gQuWURIdTWn6MKFBlomnqEAzZrPaXW4rE1Nge4WLUhZPKVktgAdm+G3w7wmvaF2h5bt9Ge OrqGloYBUtPG1R6j6WDxJctjoHN7PGHVbDRkmqlMDjedJI5GlE2xKZ+8PiNMqtXPXb5izc gpr7qXZYlh0fPHeHDsRK/jfBqzKEB/nn5PJ8rj1boc/U3nIcXY55/MgugfGMg+17OXKR7w YpAPPvQXTJi0MH8f9a0Xoare/bons1rdC+a99ZvDoBDjTAgttw7k5QtDmmIYYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT6sH239VzWhq; Sun, 20 Aug 2023 07:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7btEK050034; Sun, 20 Aug 2023 07:37:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7btKK050031; Sun, 20 Aug 2023 07:37:55 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:55 GMT Message-Id: <202308200737.37K7btKK050031@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: 524c9accdcc6 - main - linux(4): Replace linux32_copyiniov by freebsd32_copyiniov List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 524c9accdcc6dddb0bac23ae6120763af3458464 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=524c9accdcc6dddb0bac23ae6120763af3458464 commit 524c9accdcc6dddb0bac23ae6120763af3458464 Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:32 +0000 linux(4): Replace linux32_copyiniov by freebsd32_copyiniov MFC after: 1 month --- sys/amd64/linux32/linux.h | 10 ---------- sys/amd64/linux32/linux32_machdep.c | 30 ------------------------------ sys/compat/linux/linux_socket.c | 5 +++-- 3 files changed, 3 insertions(+), 42 deletions(-) diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index 382d010f9ed8..395548b3c93f 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -388,16 +388,6 @@ struct l_user_desc { (((desc)->b >> LINUX_ENTRY_B_USEABLE) & 1) #ifdef _KERNEL -struct iovec; -struct uio; - -struct l_iovec32 { - uint32_t iov_base; - l_size_t iov_len; -}; - -int linux32_copyiniov(struct l_iovec32 *iovp32, l_ulong iovcnt, - struct iovec **iovp, int error); int linux_copyout_rusage(struct rusage *ru, void *uaddr); #endif /* _KERNEL */ diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index e0364f1e00d1..f6b14d8e4653 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -111,36 +111,6 @@ linux_copyout_rusage(struct rusage *ru, void *uaddr) return (copyout(&lru, uaddr, sizeof(struct l_rusage))); } -CTASSERT(sizeof(struct l_iovec32) == 8); - -int -linux32_copyiniov(struct l_iovec32 *iovp32, l_ulong iovcnt, struct iovec **iovp, - int error) -{ - struct l_iovec32 iov32; - struct iovec *iov; - uint32_t iovlen; - int i; - - *iovp = NULL; - if (iovcnt > UIO_MAXIOV) - return (error); - iovlen = iovcnt * sizeof(struct iovec); - iov = malloc(iovlen, M_IOV, M_WAITOK); - for (i = 0; i < iovcnt; i++) { - error = copyin(&iovp32[i], &iov32, sizeof(struct l_iovec32)); - if (error) { - free(iov, M_IOV); - return (error); - } - iov[i].iov_base = PTRIN(iov32.iov_base); - iov[i].iov_len = iov32.iov_len; - } - *iovp = iov; - return(0); - -} - int linux_readv(struct thread *td, struct linux_readv_args *uap) { diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 834c2c938925..a5ed5c5c62db 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -57,6 +57,7 @@ #endif #ifdef COMPAT_LINUX32 +#include #include #include #else @@ -1384,7 +1385,7 @@ linux_sendmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, return (error); #ifdef COMPAT_LINUX32 - error = linux32_copyiniov(PTRIN(msg.msg_iov), msg.msg_iovlen, + error = freebsd32_copyiniov(PTRIN(msg.msg_iov), msg.msg_iovlen, &iov, EMSGSIZE); #else error = copyiniov(msg.msg_iov, msg.msg_iovlen, &iov, EMSGSIZE); @@ -1794,7 +1795,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, return (error); #ifdef COMPAT_LINUX32 - error = linux32_copyiniov(PTRIN(msg->msg_iov), msg->msg_iovlen, + error = freebsd32_copyiniov(PTRIN(msg->msg_iov), msg->msg_iovlen, &iov, EMSGSIZE); #else error = copyiniov(msg->msg_iov, msg->msg_iovlen, &iov, EMSGSIZE); From nobody Sun Aug 20 08:13: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 4RT7fY2lVCz4qtgp; Sun, 20 Aug 2023 08:13: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 4RT7fY25QCz3Kl1; Sun, 20 Aug 2023 08:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692519221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+0f1e0l/eNnLcQkxxzKYl2ZwbVVB+2cNKPHnrTy0zaw=; b=Mv0sTplZ+s/X7VUvoLlT709AroL5Qx5bPAr/63oXa018fxjMoXmxJFqXQgpK/wfHUqTgYE 5xCMthZfd/pNFxEgHORJc7X4ZQZ+ph7+cbJ4wDu9VTETokgfuTYAgbT1O2IwVoqSm2oX01 PgNeQX5wwSIggUpbFEtsqj/EwaMUGdZnfvu9tw49dTxjvLdCYLB2FLcWw5N39HXRt/i21w 43mKRaxOiqDwLvvqdrb8J303bllu+PcLXQBX9xsHU0DAae6fUXa23n3S4rDF4EWE5rw6Fm zIKckFrb50E3u6S3ez5kfs2sblm30mQD2tVIIqSW4cpCB9XsgUerrRaGmLK6NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692519221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+0f1e0l/eNnLcQkxxzKYl2ZwbVVB+2cNKPHnrTy0zaw=; b=KrGCXQ/wBRm5ZGBtrfQmJo+Jd5hmXRotNMOh3gOJIeEXfgRbz9T4EWIieY5kXFYNXJ5dUW jbD4omdujufvuw2mqoIOAg2Gc85bkHXC41cg35V+s7is1hzpGos3eZpYzTLWngo+Q5PzHp fdj4PA9sbMhTlLWO+nq1xQcNwfA2S0jR07jXLK2BK9tC1FbkqJiktEDyiBFgpARnqKpZ5w CnW83t6Q//4+HiLqAirLVTPAGIlV71PzDgHDuAKBnEdF7gKhOC4R8XsxmGp0kVd+PwdnLH 2/OGJc7ePDS+0jupF2brJEqP/IKA/ATGG5otXJ9dXxhE8LnA9IH+WUwgJyICSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692519221; a=rsa-sha256; cv=none; b=S3YEqfW6uY78YAj6J5F+ZzcaCWTFQT74UGng5DSZrJWUv3Q3Sq5FAE7qObGFngNtV+Z8qg ptYnYtUzNLw3flEpciBcsPCJSy1bGrU/QdAYHyPDdtxk0CxSpjqPew5hkEFat7jrDyLXaJ PZ9HJjrSTOKC7nbr3v5/W32F16HsuNjgVxHEj1JN9pcYDQutzhO0/3TF6yA4XYuGg092vp DpIBsCYqrDbepR4iy+4qo8RdNudn81brvJDnVRZDmTVeVgHdboFIo5K28C7fyuxt1yNpUw mkKBrlWuVvKR4xONh3mqI64XfyzP+a9Wlur3qPgVehCKGVEnzqjfd9k/vZfMrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT7fY13bTzXPM; Sun, 20 Aug 2023 08:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K8Df3Q016589; Sun, 20 Aug 2023 08:13:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K8DfRQ016586; Sun, 20 Aug 2023 08:13:41 GMT (envelope-from git) Date: Sun, 20 Aug 2023 08:13:41 GMT Message-Id: <202308200813.37K8DfRQ016586@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: 83d941e0af37 - main - Bump __FreeBSD_version for zlib 1.3. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83d941e0af3720f45ab9f2c3d035519a11752bea Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=83d941e0af3720f45ab9f2c3d035519a11752bea commit 83d941e0af3720f45ab9f2c3d035519a11752bea Author: Xin LI AuthorDate: 2023-08-20 08:13:19 +0000 Commit: Xin LI CommitDate: 2023-08-20 08:13:19 +0000 Bump __FreeBSD_version for zlib 1.3. --- 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 1b8df48e4bd8..89f277056069 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400095 +#define __FreeBSD_version 1400096 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun Aug 20 08: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 4RT7lb6gFTz4qvPN; Sun, 20 Aug 2023 08:18: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 4RT7lb6Lwlz3KqP; Sun, 20 Aug 2023 08:18:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692519483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W4yBo3g178hFA6CizqwZUJN54jC0CgLHe025hqNoMfk=; b=E7CJvWDFwBxLX463D3GCQ9QS3XrN1HvJunekQmpRXLvrTGWL7tndSANq5X3VyW1KM6LfUc HsbVOYBN3geRbFUa+6Nm0QfxOMGnk7+ZaJDRJYEJS4mqNuFvzjZbIK2x7iNQRG7C0R3Zn3 nH910buv7KdZr3QEeIN/SQMU0HKjvlkDjZSinpsbTYdr89MZ0SCZDyrbBS/7xSndMe9IDj 7HudFtuRQ2HJvpJ3RyJiVTZodZDa9Z/5j26Q8erIJRpK3fpBoa5BZKMlr0LkX/Rmzheq8P st82zBW5ZgppsVQUN9iuB5925bNNEavPt6xox5cvWpUTYs2UiizaZf/Erk4T5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692519483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W4yBo3g178hFA6CizqwZUJN54jC0CgLHe025hqNoMfk=; b=duqyrKLsnILtpQj/MRGGlcLfAXij1A4chZXQg+IyN1wdckg8VT9GgpHE5HR//rhCf1M/QX P4toKtPiRBPTfmb8khmcK3vWNTxHs6L/PguivqK2Za/KhGsQopqp2aLFuKFpNPWFmXDHNr 6q52/H+gNE3bjWcDhY8psq7xVDS+i+eDiPMIV6fFil87IOv99lTyd338LSjxqzEBIicSVr J/f6AlSkdVncN24gplr7TMReqy2PgPIt1vlaxSqT2o/sqsl4fT5t8ljZxDi9IhLsKC0GKT yHX8ucGbxLYmoDy3iN7bymbybMhXF23stG/MHfDvNxnFqBuCkO5SBlbnmfkvEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692519483; a=rsa-sha256; cv=none; b=FiEwocQuHrcsEeAxRw9U7+Hy5g1J73Dl79v4laebND4LXXpc57/KSsem9YSthJ8+Hj631v IXbEItEaPxGLxDYKMXCFSvA7KzRBIKZieUVmQC3aqtDT5/lZMMjvnLyBPZvJUB5+oXriui b4Iywl6e+Gw5LCq2lZUAkUe1FvLJSM8H9bFFjIDGGVP8+z1kbS/OIg9ER/mDoWZwWh2Yyc D0oua9OY0Xw39YaEtwavuy2JSO0zd+v1bLCYi94mOwqeP2WQIoXNLbTwLcfuqpKWdOIbvr oNPX2fi7+BZyKbiPNVdyY4hJhzAd2DuJeMfQXenm/0Ck0ijF78C2GzbZaAl2Ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT7lb5NvkzXJj; Sun, 20 Aug 2023 08:18:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K8I3f9017280; Sun, 20 Aug 2023 08:18:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K8I3ab017277; Sun, 20 Aug 2023 08:18:03 GMT (envelope-from git) Date: Sun, 20 Aug 2023 08:18:03 GMT Message-Id: <202308200818.37K8I3ab017277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Salychev Subject: git: 58983e4b0253 - main - dpaa2: Clean up channels in separate tasks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dsl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58983e4b0253ad38a3e1ef2166fedd3133fdb552 Auto-Submitted: auto-generated The branch main has been updated by dsl: URL: https://cgit.FreeBSD.org/src/commit/?id=58983e4b0253ad38a3e1ef2166fedd3133fdb552 commit 58983e4b0253ad38a3e1ef2166fedd3133fdb552 Author: Dmitry Salychev AuthorDate: 2023-06-18 15:03:24 +0000 Commit: Dmitry Salychev CommitDate: 2023-08-20 08:17:26 +0000 dpaa2: Clean up channels in separate tasks Each channel gets its own DMA resources, cleanup and "bufferpool" tasks, and a separate cleanup taskqueue to isolate channels operation as much as possible to avoid various kernel panics under heavy network load. As a side-effect of this work, dpaa2_buf structure is simplified and all of the functions to re-seed those buffers are gathered now in dpaa2_buf.h and .c files; functions to work with channels are extracted into dpaa2_channel.h and .c files as well. Reported by: dch Reviewed by: bz Approved by: bz (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41296 --- sys/conf/files.arm64 | 3 + sys/dev/dpaa2/dpaa2_buf.c | 246 +++++++ sys/dev/dpaa2/dpaa2_buf.h | 173 +++++ sys/dev/dpaa2/dpaa2_channel.c | 557 ++++++++++++++++ sys/dev/dpaa2/dpaa2_channel.h | 95 +++ sys/dev/dpaa2/dpaa2_io.c | 23 +- sys/dev/dpaa2/dpaa2_io.h | 8 +- sys/dev/dpaa2/dpaa2_mc.c | 64 -- sys/dev/dpaa2/dpaa2_mcp.c | 1 - sys/dev/dpaa2/dpaa2_mcp.h | 1 - sys/dev/dpaa2/dpaa2_ni.c | 1483 ++++++++++++++--------------------------- sys/dev/dpaa2/dpaa2_ni.h | 160 +---- sys/dev/dpaa2/dpaa2_swp.c | 15 +- sys/dev/dpaa2/dpaa2_swp.h | 5 +- sys/dev/dpaa2/dpaa2_types.c | 114 ++++ sys/dev/dpaa2/dpaa2_types.h | 113 ++-- sys/modules/dpaa2/Makefile | 14 +- 17 files changed, 1833 insertions(+), 1242 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 61f1cbf75982..2036bbe918ba 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -202,6 +202,8 @@ dev/axgbe/xgbe-phy-v1.c optional axa fdt dev/cpufreq/cpufreq_dt.c optional cpufreq fdt dev/dpaa2/dpaa2_bp.c optional soc_nxp_ls dpaa2 +dev/dpaa2/dpaa2_buf.c optional soc_nxp_ls dpaa2 +dev/dpaa2/dpaa2_channel.c optional soc_nxp_ls dpaa2 dev/dpaa2/dpaa2_cmd_if.m optional soc_nxp_ls dpaa2 dev/dpaa2/dpaa2_con.c optional soc_nxp_ls dpaa2 dev/dpaa2/dpaa2_console.c optional soc_nxp_ls dpaa2 fdt @@ -216,6 +218,7 @@ dev/dpaa2/dpaa2_ni.c optional soc_nxp_ls dpaa2 dev/dpaa2/dpaa2_rc.c optional soc_nxp_ls dpaa2 dev/dpaa2/dpaa2_swp.c optional soc_nxp_ls dpaa2 dev/dpaa2/dpaa2_swp_if.m optional soc_nxp_ls dpaa2 +dev/dpaa2/dpaa2_types.c optional soc_nxp_ls dpaa2 dev/dpaa2/memac_mdio_acpi.c optional soc_nxp_ls dpaa2 acpi dev/dpaa2/memac_mdio_common.c optional soc_nxp_ls dpaa2 acpi | soc_nxp_ls dpaa2 fdt dev/dpaa2/memac_mdio_fdt.c optional soc_nxp_ls dpaa2 fdt diff --git a/sys/dev/dpaa2/dpaa2_buf.c b/sys/dev/dpaa2/dpaa2_buf.c new file mode 100644 index 000000000000..7739eda5d8de --- /dev/null +++ b/sys/dev/dpaa2/dpaa2_buf.c @@ -0,0 +1,246 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright © 2023 Dmitry Salychev + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "dpaa2_types.h" +#include "dpaa2_buf.h" +#include "dpaa2_bp.h" +#include "dpaa2_channel.h" +#include "dpaa2_swp.h" +#include "dpaa2_swp_if.h" +#include "dpaa2_ni.h" + +MALLOC_DEFINE(M_DPAA2_RXB, "dpaa2_rxb", "DPAA2 DMA-mapped buffer (Rx)"); + +/** + * @brief Allocate Rx buffers visible to QBMan and release them to the + * buffer pool. + */ +int +dpaa2_buf_seed_pool(device_t dev, device_t bpdev, void *arg, uint32_t count, + int size, struct mtx *dma_mtx) +{ + struct dpaa2_ni_softc *sc = device_get_softc(dev); + struct dpaa2_bp_softc *bpsc = device_get_softc(bpdev); + struct dpaa2_channel *ch = (struct dpaa2_channel *)arg; + struct dpaa2_buf *buf; + const int alloc = DPAA2_ATOMIC_READ(&sc->buf_num); + const uint16_t bpid = bpsc->attr.bpid; + bus_addr_t paddr[DPAA2_SWP_BUFS_PER_CMD]; + int error, bufn = 0; + +#if defined(INVARIANTS) + KASSERT(ch->rx_dmat != NULL, ("%s: no DMA tag?", __func__)); + if (dma_mtx != NULL) { + mtx_assert(dma_mtx, MA_OWNED); + } +#endif /* INVARIANTS */ + +#ifdef _notyet_ + /* Limit amount of buffers released to the pool */ + count = (alloc + count > DPAA2_NI_BUFS_MAX) + ? DPAA2_NI_BUFS_MAX - alloc : count; +#endif + + /* Release "count" buffers to the pool */ + for (int i = alloc; i < alloc + count; i++) { + /* Enough buffers were allocated for a single command */ + if (bufn == DPAA2_SWP_BUFS_PER_CMD) { + error = DPAA2_SWP_RELEASE_BUFS(ch->io_dev, bpid, paddr, + bufn); + if (error) { + device_printf(sc->dev, "%s: failed to release " + "buffers to the pool (1)\n", __func__); + return (error); + } + DPAA2_ATOMIC_ADD(&sc->buf_num, bufn); + bufn = 0; + } + + buf = malloc(sizeof(struct dpaa2_buf), M_DPAA2_RXB, M_NOWAIT); + if (buf == NULL) { + device_printf(dev, "%s: malloc() failed\n", __func__); + return (ENOMEM); + } + DPAA2_BUF_INIT_TAGOPT(buf, ch->rx_dmat, ch); + + error = dpaa2_buf_seed_rxb(dev, buf, size, dma_mtx); + if (error != 0) { + device_printf(dev, "%s: dpaa2_buf_seed_rxb() failed: " + "error=%d/n", __func__, error); + break; + } + paddr[bufn] = buf->paddr; + bufn++; + } + + /* Release reminder of the buffers to the pool */ + if (bufn > 0) { + error = DPAA2_SWP_RELEASE_BUFS(ch->io_dev, bpid, paddr, bufn); + if (error) { + device_printf(sc->dev, "%s: failed to release " + "buffers to the pool (2)\n", __func__); + return (error); + } + DPAA2_ATOMIC_ADD(&sc->buf_num, bufn); + } + + return (0); +} + +/** + * @brief Prepare Rx buffer to be released to the buffer pool. + */ +int +dpaa2_buf_seed_rxb(device_t dev, struct dpaa2_buf *buf, int size, + struct mtx *dma_mtx) +{ + struct dpaa2_ni_softc *sc = device_get_softc(dev); + struct dpaa2_fa *fa; + bool map_created = false; + bool mbuf_alloc = false; + int error; + +#if defined(INVARIANTS) + DPAA2_BUF_ASSERT_RXPREP(buf); + if (dma_mtx != NULL) { + mtx_assert(dma_mtx, MA_OWNED); + } +#endif /* INVARIANTS */ + + if (__predict_false(buf->dmap == NULL)) { + error = bus_dmamap_create(buf->dmat, 0, &buf->dmap); + if (error != 0) { + device_printf(dev, "%s: failed to create DMA map: " + "error=%d\n", __func__, error); + goto fail_map_create; + } + map_created = true; + } + + if (__predict_true(buf->m == NULL)) { + buf->m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, size); + if (__predict_false(buf->m == NULL)) { + device_printf(dev, "%s: m_getjcl() failed\n", __func__); + error = ENOMEM; + goto fail_mbuf_alloc; + } + buf->m->m_len = buf->m->m_ext.ext_size; + buf->m->m_pkthdr.len = buf->m->m_ext.ext_size; + mbuf_alloc = true; + } + + error = bus_dmamap_load_mbuf_sg(buf->dmat, buf->dmap, buf->m, &buf->seg, + &buf->nseg, BUS_DMA_NOWAIT); + KASSERT(buf->nseg == 1, ("%s: one segment expected: nseg=%d", __func__, + buf->nseg)); + KASSERT(error == 0, ("%s: bus_dmamap_load_mbuf_sg() failed: error=%d", + __func__, error)); + if (__predict_false(error != 0 || buf->nseg != 1)) { + device_printf(sc->dev, "%s: bus_dmamap_load_mbuf_sg() failed: " + "error=%d, nsegs=%d\n", __func__, error, buf->nseg); + goto fail_mbuf_map; + } + buf->paddr = buf->seg.ds_addr; + buf->vaddr = buf->m->m_data; + + /* Populate frame annotation for future use */ + fa = (struct dpaa2_fa *)buf->vaddr; + fa->magic = DPAA2_MAGIC; + fa->buf = buf; + + bus_dmamap_sync(buf->dmat, buf->dmap, BUS_DMASYNC_PREREAD); + + DPAA2_BUF_ASSERT_RXREADY(buf); + + return (0); + +fail_mbuf_map: + if (mbuf_alloc) { + m_freem(buf->m); + buf->m = NULL; + } +fail_mbuf_alloc: + if (map_created) { + (void)bus_dmamap_destroy(buf->dmat, buf->dmap); + } +fail_map_create: + return (error); +} + +/** + * @brief Prepare Tx buffer to be added to the Tx ring. + */ +int +dpaa2_buf_seed_txb(device_t dev, struct dpaa2_buf *buf) +{ + struct dpaa2_buf *sgt = buf->sgt; + bool map_created = false; + int error; + + DPAA2_BUF_ASSERT_TXPREP(buf); + + if (buf->dmap == NULL) { + error = bus_dmamap_create(buf->dmat, 0, &buf->dmap); + if (error != 0) { + device_printf(dev, "%s: bus_dmamap_create() failed: " + "error=%d\n", __func__, error); + goto fail_map_create; + } + map_created = true; + } + + if (sgt->vaddr == NULL) { + error = bus_dmamem_alloc(sgt->dmat, (void **)&sgt->vaddr, + BUS_DMA_ZERO | BUS_DMA_COHERENT, &sgt->dmap); + if (error != 0) { + device_printf(dev, "%s: bus_dmamem_alloc() failed: " + "error=%d\n", __func__, error); + goto fail_mem_alloc; + } + } + + DPAA2_BUF_ASSERT_TXREADY(buf); + + return (0); + +fail_mem_alloc: + if (map_created) { + (void)bus_dmamap_destroy(buf->dmat, buf->dmap); + } +fail_map_create: + return (error); +} diff --git a/sys/dev/dpaa2/dpaa2_buf.h b/sys/dev/dpaa2/dpaa2_buf.h new file mode 100644 index 000000000000..853a4fa78d3a --- /dev/null +++ b/sys/dev/dpaa2/dpaa2_buf.h @@ -0,0 +1,173 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright © 2023 Dmitry Salychev + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _DPAA2_BUF_H +#define _DPAA2_BUF_H + +#include +#include +#include +#include +#include + +#include + +#define DPAA2_RX_BUF_SIZE (MJUM9BYTES) + +struct dpaa2_buf { + bus_addr_t paddr; + caddr_t vaddr; + bus_dma_tag_t dmat; + bus_dmamap_t dmap; + bus_dma_segment_t seg; + int nseg; + struct mbuf *m; + struct dpaa2_buf *sgt; + void *opt; +}; + +#define DPAA2_BUF_INIT_TAGOPT(__buf, __tag, __opt) do { \ + KASSERT((__buf) != NULL, ("%s: buf is NULL", __func__)); \ + \ + (__buf)->paddr = 0; \ + (__buf)->vaddr = NULL; \ + (__buf)->dmat = (__tag); \ + (__buf)->dmap = NULL; \ + (__buf)->seg.ds_addr = 0; \ + (__buf)->seg.ds_len = 0; \ + (__buf)->nseg = 0; \ + (__buf)->m = NULL; \ + (__buf)->sgt = NULL; \ + (__buf)->opt = (__opt); \ +} while(0) +#define DPAA2_BUF_INIT(__buf) DPAA2_BUF_INIT_TAGOPT((__buf), NULL, NULL) + +#if defined(INVARIANTS) +/* + * TXPREP/TXREADY macros allow to verify whether Tx buffer is prepared to be + * seeded and/or ready to be used for transmission. + * + * NOTE: Any modification should be carefully analyzed and justified. + */ +#define DPAA2_BUF_ASSERT_TXPREP(__buf) do { \ + struct dpaa2_buf *__sgt = (__buf)->sgt; \ + KASSERT((__sgt) != NULL, ("%s: no S/G table?", __func__)); \ + \ + KASSERT((__buf)->paddr == 0, ("%s: paddr set?", __func__)); \ + KASSERT((__buf)->vaddr == NULL, ("%s: vaddr set?", __func__)); \ + KASSERT((__buf)->dmat != NULL, ("%s: no DMA tag?", __func__)); \ + KASSERT((__buf)->dmap == NULL, ("%s: DMA map set?", __func__)); \ + KASSERT((__buf)->seg.ds_addr == 0, ("%s: already mapped?", __func__)); \ + KASSERT((__buf)->seg.ds_len == 0, ("%s: already mapped?", __func__)); \ + KASSERT((__buf)->nseg == 0, ("%s: nseg > 0?", __func__)); \ + KASSERT((__buf)->m == NULL, ("%s: mbuf set?", __func__)); \ + KASSERT((__buf)->opt != NULL, ("%s: no Tx ring?", __func__)); \ + \ + KASSERT((__sgt)->paddr == 0, ("%s: S/G paddr set?", __func__)); \ + KASSERT((__sgt)->vaddr == NULL, ("%s: S/G vaddr set?", __func__)); \ + KASSERT((__sgt)->dmat != NULL, ("%s: no S/G DMA tag?", __func__)); \ + KASSERT((__sgt)->dmap == NULL, ("%s: S/G DMA map set?", __func__)); \ + KASSERT((__sgt)->seg.ds_addr == 0, ("%s: S/G mapped?", __func__)); \ + KASSERT((__sgt)->seg.ds_len == 0, ("%s: S/G mapped?", __func__)); \ + KASSERT((__sgt)->nseg == 0, ("%s: S/G nseg > 0?", __func__)); \ + KASSERT((__sgt)->m == NULL, ("%s: S/G mbuf set?", __func__)); \ + KASSERT((__sgt)->opt == (__buf),("%s: buf not linked?", __func__)); \ +} while(0) +#define DPAA2_BUF_ASSERT_TXREADY(__buf) do { \ + struct dpaa2_buf *__sgt = (__buf)->sgt; \ + KASSERT((__sgt) != NULL, ("%s: no S/G table?", __func__)); \ + \ + KASSERT((__buf)->paddr == 0, ("%s: paddr set?", __func__)); \ + KASSERT((__buf)->vaddr == NULL, ("%s: vaddr set?", __func__)); \ + KASSERT((__buf)->dmat != NULL, ("%s: no DMA tag?", __func__)); \ + KASSERT((__buf)->dmap != NULL, ("%s: no DMA map?", __func__)); \ + KASSERT((__buf)->seg.ds_addr == 0, ("%s: already mapped?", __func__)); \ + KASSERT((__buf)->seg.ds_len == 0, ("%s: already mapped?", __func__)); \ + KASSERT((__buf)->nseg == 0, ("%s: nseg > 0?", __func__)); \ + KASSERT((__buf)->m == NULL, ("%s: mbuf set?", __func__)); \ + KASSERT((__buf)->opt != NULL, ("%s: no Tx ring?", __func__)); \ + \ + KASSERT((__sgt)->paddr == 0, ("%s: S/G paddr set?", __func__)); \ + KASSERT((__sgt)->vaddr != NULL, ("%s: no S/G vaddr?", __func__)); \ + KASSERT((__sgt)->dmat != NULL, ("%s: no S/G DMA tag?", __func__)); \ + KASSERT((__sgt)->dmap != NULL, ("%s: no S/G DMA map?", __func__)); \ + KASSERT((__sgt)->seg.ds_addr == 0, ("%s: S/G mapped?", __func__)); \ + KASSERT((__sgt)->seg.ds_len == 0, ("%s: S/G mapped?", __func__)); \ + KASSERT((__sgt)->nseg == 0, ("%s: S/G nseg > 0?", __func__)); \ + KASSERT((__sgt)->m == NULL, ("%s: S/G mbuf set?", __func__)); \ + KASSERT((__sgt)->opt == (__buf),("%s: buf not linked?", __func__)); \ +} while(0) +#else /* !INVARIANTS */ +#define DPAA2_BUF_ASSERT_TXPREP(__buf) do { \ +} while(0) +#define DPAA2_BUF_ASSERT_TXREADY(__buf) do { \ +} while(0) +#endif /* INVARIANTS */ + +#if defined(INVARIANTS) +/* + * RXPREP/RXREADY macros allow to verify whether Rx buffer is prepared to be + * seeded and/or ready to be used for reception. + * + * NOTE: Any modification should be carefully analyzed and justified. + */ +#define DPAA2_BUF_ASSERT_RXPREP(__buf) do { \ + KASSERT((__buf)->paddr == 0, ("%s: paddr set?", __func__)); \ + KASSERT((__buf)->vaddr == NULL, ("%s: vaddr set?", __func__)); \ + KASSERT((__buf)->dmat != NULL, ("%s: no DMA tag?", __func__)); \ + /* KASSERT((__buf)->dmap == NULL, ("%s: DMA map set?", __func__)); */ \ + KASSERT((__buf)->seg.ds_addr == 0, ("%s: already mapped?", __func__)); \ + KASSERT((__buf)->seg.ds_len == 0, ("%s: already mapped?", __func__)); \ + KASSERT((__buf)->nseg == 0, ("%s: nseg > 0?", __func__)); \ + KASSERT((__buf)->m == NULL, ("%s: mbuf set?", __func__)); \ + KASSERT((__buf)->sgt == NULL, ("%s: S/G table set?", __func__)); \ + KASSERT((__buf)->opt != NULL, ("%s: no channel?", __func__)); \ +} while(0) +#define DPAA2_BUF_ASSERT_RXREADY(__buf) do { \ + KASSERT((__buf)->paddr != 0, ("%s: paddr not set?", __func__)); \ + KASSERT((__buf)->vaddr != NULL, ("%s: vaddr not set?", __func__)); \ + KASSERT((__buf)->dmat != NULL, ("%s: no DMA tag?", __func__)); \ + KASSERT((__buf)->dmap != NULL, ("%s: no DMA map?", __func__)); \ + KASSERT((__buf)->seg.ds_addr != 0, ("%s: not mapped?", __func__)); \ + KASSERT((__buf)->seg.ds_len != 0, ("%s: not mapped?", __func__)); \ + KASSERT((__buf)->nseg == 1, ("%s: nseg != 1?", __func__)); \ + KASSERT((__buf)->m != NULL, ("%s: no mbuf?", __func__)); \ + KASSERT((__buf)->sgt == NULL, ("%s: S/G table set?", __func__)); \ + KASSERT((__buf)->opt != NULL, ("%s: no channel?", __func__)); \ +} while(0) +#else /* !INVARIANTS */ +#define DPAA2_BUF_ASSERT_RXPREP(__buf) do { \ +} while(0) +#define DPAA2_BUF_ASSERT_RXREADY(__buf) do { \ +} while(0) +#endif /* INVARIANTS */ + +int dpaa2_buf_seed_pool(device_t, device_t, void *, uint32_t, int, struct mtx *); +int dpaa2_buf_seed_rxb(device_t, struct dpaa2_buf *, int, struct mtx *); +int dpaa2_buf_seed_txb(device_t, struct dpaa2_buf *); + +#endif /* _DPAA2_BUF_H */ diff --git a/sys/dev/dpaa2/dpaa2_channel.c b/sys/dev/dpaa2/dpaa2_channel.c new file mode 100644 index 000000000000..87b76923a16d --- /dev/null +++ b/sys/dev/dpaa2/dpaa2_channel.c @@ -0,0 +1,557 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright © 2023 Dmitry Salychev + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * QBMan channel to process ingress traffic (Rx, Tx confirmation, Rx error). + * + * NOTE: Several WQs are organized into a single channel. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "dpaa2_types.h" +#include "dpaa2_channel.h" +#include "dpaa2_ni.h" +#include "dpaa2_mc.h" +#include "dpaa2_mc_if.h" +#include "dpaa2_mcp.h" +#include "dpaa2_io.h" +#include "dpaa2_con.h" +#include "dpaa2_buf.h" +#include "dpaa2_swp.h" +#include "dpaa2_swp_if.h" +#include "dpaa2_bp.h" +#include "dpaa2_cmd_if.h" + +MALLOC_DEFINE(M_DPAA2_CH, "dpaa2_ch", "DPAA2 QBMan Channel"); + +#define RX_SEG_N (1u) +#define RX_SEG_SZ (((MJUM9BYTES - 1) / PAGE_SIZE + 1) * PAGE_SIZE) +#define RX_SEG_MAXSZ (((MJUM9BYTES - 1) / PAGE_SIZE + 1) * PAGE_SIZE) +CTASSERT(RX_SEG_SZ % PAGE_SIZE == 0); +CTASSERT(RX_SEG_MAXSZ % PAGE_SIZE == 0); + +#define TX_SEG_N (16u) /* XXX-DSL: does DPAA2 limit exist? */ +#define TX_SEG_SZ (PAGE_SIZE) +#define TX_SEG_MAXSZ (TX_SEG_N * TX_SEG_SZ) +CTASSERT(TX_SEG_SZ % PAGE_SIZE == 0); +CTASSERT(TX_SEG_MAXSZ % PAGE_SIZE == 0); + +#define SGT_SEG_N (1u) +#define SGT_SEG_SZ (PAGE_SIZE) +#define SGT_SEG_MAXSZ (PAGE_SIZE) +CTASSERT(SGT_SEG_SZ % PAGE_SIZE == 0); +CTASSERT(SGT_SEG_MAXSZ % PAGE_SIZE == 0); + +static int dpaa2_chan_setup_dma(device_t, struct dpaa2_channel *, bus_size_t); +static int dpaa2_chan_alloc_storage(device_t, struct dpaa2_channel *, bus_size_t, + int, bus_size_t); +static void dpaa2_chan_bp_task(void *, int); + +/** + * @brief Сonfigures QBMan channel and registers data availability notifications. + */ +int +dpaa2_chan_setup(device_t dev, device_t iodev, device_t condev, device_t bpdev, + struct dpaa2_channel **channel, uint32_t flowid, task_fn_t cleanup_task_fn) +{ + device_t pdev = device_get_parent(dev); + device_t child = dev; + struct dpaa2_ni_softc *sc = device_get_softc(dev); + struct dpaa2_io_softc *iosc = device_get_softc(iodev); + struct dpaa2_con_softc *consc = device_get_softc(condev); + struct dpaa2_devinfo *rcinfo = device_get_ivars(pdev); + struct dpaa2_devinfo *ioinfo = device_get_ivars(iodev); + struct dpaa2_devinfo *coninfo = device_get_ivars(condev); + struct dpaa2_con_notif_cfg notif_cfg; + struct dpaa2_io_notif_ctx *ctx; + struct dpaa2_channel *ch = NULL; + struct dpaa2_cmd cmd; + uint16_t rctk, contk; + int error; + + DPAA2_CMD_INIT(&cmd); + + error = DPAA2_CMD_RC_OPEN(dev, child, &cmd, rcinfo->id, &rctk); + if (error) { + device_printf(dev, "%s: failed to open DPRC: id=%d, error=%d\n", + __func__, rcinfo->id, error); + goto fail_rc_open; + } + error = DPAA2_CMD_CON_OPEN(dev, child, &cmd, coninfo->id, &contk); + if (error) { + device_printf(dev, "%s: failed to open DPCON: id=%d, error=%d\n", + __func__, coninfo->id, error); + goto fail_con_open; + } + + error = DPAA2_CMD_CON_ENABLE(dev, child, &cmd); + if (error) { + device_printf(dev, "%s: failed to enable channel: dpcon_id=%d, " + "chan_id=%d\n", __func__, coninfo->id, consc->attr.chan_id); + goto fail_con_enable; + } + + ch = malloc(sizeof(struct dpaa2_channel), M_DPAA2_CH, M_WAITOK | M_ZERO); + if (ch == NULL) { + device_printf(dev, "%s: malloc() failed\n", __func__); + error = ENOMEM; + goto fail_malloc; + } + + ch->ni_dev = dev; + ch->io_dev = iodev; + ch->con_dev = condev; + ch->id = consc->attr.chan_id; + ch->flowid = flowid; + ch->tx_frames = 0; /* for debug purposes */ + ch->tx_dropped = 0; /* for debug purposes */ + ch->store_sz = 0; + ch->store_idx = 0; + ch->recycled_n = 0; + ch->rxq_n = 0; + + NET_TASK_INIT(&ch->cleanup_task, 0, cleanup_task_fn, ch); + NET_TASK_INIT(&ch->bp_task, 0, dpaa2_chan_bp_task, ch); + + ch->cleanup_tq = taskqueue_create("dpaa2_ch cleanup", M_WAITOK, + taskqueue_thread_enqueue, &ch->cleanup_tq); + taskqueue_start_threads_cpuset(&ch->cleanup_tq, 1, PI_NET, + &iosc->cpu_mask, "dpaa2_ch%d cleanup", ch->id); + + error = dpaa2_chan_setup_dma(dev, ch, sc->buf_align); + if (error != 0) { + device_printf(dev, "%s: failed to setup DMA\n", __func__); + goto fail_dma_setup; + } + + mtx_init(&ch->xmit_mtx, "dpaa2_ch_xmit", NULL, MTX_DEF); + + ch->xmit_br = buf_ring_alloc(DPAA2_TX_BUFRING_SZ, M_DEVBUF, M_NOWAIT, + &ch->xmit_mtx); + if (ch->xmit_br == NULL) { + device_printf(dev, "%s: buf_ring_alloc() failed\n", __func__); + error = ENOMEM; + goto fail_buf_ring; + } + + DPAA2_BUF_INIT(&ch->store); + + /* Register the new notification context */ + ctx = &ch->ctx; + ctx->qman_ctx = (uint64_t)ctx; + ctx->cdan_en = true; + ctx->fq_chan_id = ch->id; + ctx->io_dev = ch->io_dev; + ctx->channel = ch; + error = DPAA2_SWP_CONF_WQ_CHANNEL(ch->io_dev, ctx); + if (error) { + device_printf(dev, "%s: failed to register CDAN context\n", + __func__); + goto fail_dpcon_notif; + } + + /* Register DPCON notification within Management Complex */ + notif_cfg.dpio_id = ioinfo->id; + notif_cfg.prior = 0; + notif_cfg.qman_ctx = ctx->qman_ctx; + error = DPAA2_CMD_CON_SET_NOTIF(dev, child, &cmd, ¬if_cfg); + if (error) { + device_printf(dev, "%s: failed to register DPCON " + "notifications: dpcon_id=%d, chan_id=%d\n", __func__, + coninfo->id, consc->attr.chan_id); + goto fail_dpcon_notif; + } + + /* Allocate initial # of Rx buffers and a channel storage */ + error = dpaa2_buf_seed_pool(dev, bpdev, ch, DPAA2_NI_BUFS_INIT, + DPAA2_RX_BUF_SIZE, NULL); + if (error) { + device_printf(dev, "%s: failed to seed buffer pool\n", + __func__); + goto fail_dpcon_notif; + } + error = dpaa2_chan_alloc_storage(dev, ch, DPAA2_ETH_STORE_SIZE, + BUS_DMA_NOWAIT, sc->buf_align); + if (error != 0) { + device_printf(dev, "%s: failed to allocate channel storage\n", + __func__); + goto fail_dpcon_notif; + } else { + ch->store_sz = DPAA2_ETH_STORE_FRAMES; + } + + /* Prepare queues for the channel */ + error = dpaa2_chan_setup_fq(dev, ch, DPAA2_NI_QUEUE_TX_CONF); + if (error) { + device_printf(dev, "%s: failed to prepare TxConf queue: " + "error=%d\n", __func__, error); + goto fail_fq_setup; + } + error = dpaa2_chan_setup_fq(dev, ch, DPAA2_NI_QUEUE_RX); + if (error) { + device_printf(dev, "%s: failed to prepare Rx queue: error=%d\n", + __func__, error); + goto fail_fq_setup; + } + + if (bootverbose) { + device_printf(dev, "channel: dpio_id=%d dpcon_id=%d chan_id=%d, " + "priorities=%d\n", ioinfo->id, coninfo->id, ch->id, + consc->attr.prior_num); + } + + *channel = ch; + + (void)DPAA2_CMD_CON_CLOSE(dev, child, &cmd); + (void)DPAA2_CMD_RC_CLOSE(dev, child, DPAA2_CMD_TK(&cmd, rctk)); + + return (0); + +fail_fq_setup: + if (ch->store.vaddr != NULL) { + bus_dmamem_free(ch->store.dmat, ch->store.vaddr, ch->store.dmap); + } + if (ch->store.dmat != NULL) { + bus_dma_tag_destroy(ch->store.dmat); + } + ch->store.dmat = NULL; + ch->store.vaddr = NULL; + ch->store.paddr = 0; + ch->store.nseg = 0; +fail_dpcon_notif: + buf_ring_free(ch->xmit_br, M_DEVBUF); +fail_buf_ring: + mtx_destroy(&ch->xmit_mtx); +fail_dma_setup: + /* while (taskqueue_cancel(ch->cleanup_tq, &ch->cleanup_task, NULL)) { */ + /* taskqueue_drain(ch->cleanup_tq, &ch->cleanup_task); */ + /* } */ + /* taskqueue_free(ch->cleanup_tq); */ +fail_malloc: + (void)DPAA2_CMD_CON_DISABLE(dev, child, DPAA2_CMD_TK(&cmd, contk)); +fail_con_enable: + (void)DPAA2_CMD_CON_CLOSE(dev, child, DPAA2_CMD_TK(&cmd, contk)); +fail_con_open: + (void)DPAA2_CMD_RC_CLOSE(dev, child, DPAA2_CMD_TK(&cmd, rctk)); +fail_rc_open: + return (error); +} + +/** + * @brief Performs an initial configuration of the frame queue. + */ +int +dpaa2_chan_setup_fq(device_t dev, struct dpaa2_channel *ch, + enum dpaa2_ni_queue_type queue_type) +{ + struct dpaa2_ni_softc *sc = device_get_softc(dev); + struct dpaa2_ni_fq *fq; + + switch (queue_type) { + case DPAA2_NI_QUEUE_TX_CONF: + /* One queue per channel */ + fq = &ch->txc_queue; + fq->chan = ch; + fq->flowid = ch->flowid; + fq->tc = 0; /* ignored */ + fq->type = queue_type; + break; + case DPAA2_NI_QUEUE_RX: + KASSERT(sc->attr.num.rx_tcs <= DPAA2_MAX_TCS, + ("too many Rx traffic classes: rx_tcs=%d\n", + sc->attr.num.rx_tcs)); + + /* One queue per Rx traffic class within a channel */ + for (int i = 0; i < sc->attr.num.rx_tcs; i++) { + fq = &ch->rx_queues[i]; + fq->chan = ch; + fq->flowid = ch->flowid; + fq->tc = (uint8_t) i; + fq->type = queue_type; + + ch->rxq_n++; + } + break; + case DPAA2_NI_QUEUE_RX_ERR: + /* One queue per network interface */ + fq = &sc->rxe_queue; + fq->chan = ch; + fq->flowid = 0; /* ignored */ + fq->tc = 0; /* ignored */ + fq->type = queue_type; + break; + default: + device_printf(dev, "%s: unexpected frame queue type: %d\n", + __func__, queue_type); + return (EINVAL); + } + + return (0); +} + +/** + * @brief Obtain the next dequeue response from the channel storage. + */ +int +dpaa2_chan_next_frame(struct dpaa2_channel *ch, struct dpaa2_dq **dq) +{ + struct dpaa2_buf *buf = &ch->store; + struct dpaa2_dq *msgs = (struct dpaa2_dq *)buf->vaddr; + struct dpaa2_dq *msg = &msgs[ch->store_idx]; + int rc = EINPROGRESS; + + ch->store_idx++; + + if (msg->fdr.desc.stat & DPAA2_DQ_STAT_EXPIRED) { + rc = EALREADY; /* VDQ command is expired */ + ch->store_idx = 0; + if (!(msg->fdr.desc.stat & DPAA2_DQ_STAT_VALIDFRAME)) { + msg = NULL; /* Null response, FD is invalid */ + } + } + if (msg != NULL && (msg->fdr.desc.stat & DPAA2_DQ_STAT_FQEMPTY)) { + rc = ENOENT; /* FQ is empty */ + ch->store_idx = 0; + } + + if (dq != NULL) { + *dq = msg; + } + + return (rc); +} + +static int +dpaa2_chan_setup_dma(device_t dev, struct dpaa2_channel *ch, + bus_size_t alignment) +{ + int error; + + mtx_init(&ch->dma_mtx, "dpaa2_ch_dma_mtx", NULL, MTX_DEF); + + error = bus_dma_tag_create( + bus_get_dma_tag(dev), /* parent */ + alignment, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* low restricted addr */ + BUS_SPACE_MAXADDR, /* high restricted addr */ + NULL, NULL, /* filter, filterarg */ + RX_SEG_MAXSZ, /* maxsize */ + RX_SEG_N, /* nsegments */ + RX_SEG_SZ, /* maxsegsize */ + 0, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ + &ch->rx_dmat); + if (error) { + device_printf(dev, "%s: failed to create rx_dmat\n", __func__); + goto fail_rx_tag; + } + + error = bus_dma_tag_create( + bus_get_dma_tag(dev), /* parent */ + alignment, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* low restricted addr */ + BUS_SPACE_MAXADDR, /* high restricted addr */ + NULL, NULL, /* filter, filterarg */ + TX_SEG_MAXSZ, /* maxsize */ + TX_SEG_N, /* nsegments */ + TX_SEG_SZ, /* maxsegsize */ + 0, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ + &ch->tx_dmat); + if (error) { + device_printf(dev, "%s: failed to create tx_dmat\n", __func__); + goto fail_tx_tag; + } + + error = bus_dma_tag_create( + bus_get_dma_tag(dev), /* parent */ + alignment, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* low restricted addr */ + BUS_SPACE_MAXADDR, /* high restricted addr */ + NULL, NULL, /* filter, filterarg */ + SGT_SEG_MAXSZ, /* maxsize */ + SGT_SEG_N, /* nsegments */ + SGT_SEG_SZ, /* maxsegsize */ + 0, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ + &ch->sgt_dmat); + if (error) { + device_printf(dev, "%s: failed to create sgt_dmat\n", __func__); + goto fail_sgt_tag; + } + + return (0); + +fail_sgt_tag: + bus_dma_tag_destroy(ch->tx_dmat); +fail_tx_tag: + bus_dma_tag_destroy(ch->rx_dmat); +fail_rx_tag: + mtx_destroy(&ch->dma_mtx); + ch->rx_dmat = NULL; + ch->tx_dmat = NULL; + ch->sgt_dmat = NULL; + + return (error); +} + +/** + * @brief Allocate a DMA-mapped storage to keep responses from VDQ command. + */ +static int +dpaa2_chan_alloc_storage(device_t dev, struct dpaa2_channel *ch, bus_size_t size, + int mapflags, bus_size_t alignment) +{ + struct dpaa2_buf *buf = &ch->store; + uint32_t maxsize = ((size - 1) / PAGE_SIZE + 1) * PAGE_SIZE; + int error; + + error = bus_dma_tag_create( + bus_get_dma_tag(dev), /* parent */ + alignment, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* low restricted addr */ + BUS_SPACE_MAXADDR, /* high restricted addr */ + NULL, NULL, /* filter, filterarg */ + maxsize, /* maxsize */ + 1, /* nsegments */ + maxsize, /* maxsegsize */ + BUS_DMA_ALLOCNOW, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ + &buf->dmat); + if (error != 0) { + device_printf(dev, "%s: failed to create DMA tag\n", __func__); + goto fail_tag; *** 3106 LINES SKIPPED *** From nobody Sun Aug 20 09:54: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 4RT9vJ0tsqz4r1nV; Sun, 20 Aug 2023 09:54: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 4RT9vJ0Ssyz3Q21; Sun, 20 Aug 2023 09:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692525292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8j2fbLk9u0LQen7jqgupY6l1Ck9NKU4oQfQVNlNd22U=; b=BBFGtK4WbTJ6T/2bQ9pefvkc+m/bgY/GARzhrKUBW6DpDSFJ0bA0K3Egce5+6QBe4bbfu0 mbMXjEoIjln9HsWbqTPJ5hiBpQ5ZdcjJycUBmvuLoQDgE40Z3A5P1xxikXRVHtY/wnegRG drgt/T2Vmt6LOzawk5l+QCjDSmwzG+oHuRItYKjg3WBVlyAioRDwoG+7k7UjupZvEOFpcY GiYQibBzWdkb12i6VB/8gjhYvDyq7JAVfuXV6LQGYcJmVMOQypKrqaypLNeRMbhZ2hpWWU /GfLe66MLWPWrU2Ge8hJGtLxkIx/y+5z42kItTzq1zVx9kEk0X9PzPw1Aa2J5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692525292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8j2fbLk9u0LQen7jqgupY6l1Ck9NKU4oQfQVNlNd22U=; b=IXHTtfr5tRDe6aqdmwUkpPkhRE+vLDljqpVYteMoiiSRZY3dnjAac1glJMyMLsvCQMSRwb 8V4ik+x6EaiesQQxcyP3RY3Ns81Qz/Ch3/+kQn+yxoSVGBejRaObcRUxLz0lydC9nOZ3u1 NKOB9+l7pYepa32vTWmqHX9+Obsf52qDRXYbeAhmtonkyzBMguJ51+CrRR9/HhScKjUxKE weoYKFchrFw3XP11B1zMBayTAwp9stYVUXAR1pvaCM29zpUhF0TWv97nBe8Sph4SsR0W+V fmfDw4eTZZrVw/ug/Bk2EzgfpnKa6xQ7pLHhEfVyDyP1YYH8O1zATrynIQeJyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692525292; a=rsa-sha256; cv=none; b=YYqOrSLbT8L+tn3A4OBhnXZARgp/vYv0U1FGAYu9H5lnqTmYkRXe1bbf9enUvizERbM4CW 90pisRlzzjJ/upWi5AJL0jKiknQwSven4ZyG2mLlY56XBCHX/lZB/4bRjD4vmXR4NfEUgb pxl5hNlO5kD3o5DAVgsW/3P0P4Qsblym2GB9jQHP7cbrqAotTS6mP+wcZHhuRpKgCX8kOM qMZtLjCVnP54kI5gJs780E0WYBluZ7u1RK9pqiilUkpVS43c41rb5kBBeOGvDq7yTRERcJ MaJhDfWOFQhZXcS7SfL4y0uqn2QbYBLHbpUlRSAkLLvDHBN95QPYIAEo4Yjzhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT9vH6YVWzZTl; Sun, 20 Aug 2023 09:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K9spAt081466; Sun, 20 Aug 2023 09:54:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K9spLY081463; Sun, 20 Aug 2023 09:54:51 GMT (envelope-from git) Date: Sun, 20 Aug 2023 09:54:51 GMT Message-Id: <202308200954.37K9spLY081463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 62aa7ab939ea - main - Add plug and play information macro for SPI bus. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62aa7ab939ea0f9187336ea5f91b954da0cbd4c7 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=62aa7ab939ea0f9187336ea5f91b954da0cbd4c7 commit 62aa7ab939ea0f9187336ea5f91b954da0cbd4c7 Author: Vladimir Kondratyev AuthorDate: 2023-08-20 09:53:32 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-20 09:53:32 +0000 Add plug and play information macro for SPI bus. Matching table format is compatible with ACPI_ID_PROBE bus method. --- sys/dev/spibus/spi.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/spibus/spi.h b/sys/dev/spibus/spi.h index 7b0d376f0bcf..bc26f5c6157a 100644 --- a/sys/dev/spibus/spi.h +++ b/sys/dev/spibus/spi.h @@ -46,3 +46,9 @@ struct spi_command { #else #define SPIBUS_FDT_PNP_INFO(t) #endif + +#ifdef DEV_ACPI +#define SPIBUS_ACPI_PNP_INFO(t) ACPICOMPAT_PNP_INFO(t, spibus) +#else +#define SPIBUS_ACPI_PNP_INFO(t) +#endif From nobody Sun Aug 20 09:54: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 4RT9vK38DHz4r1Bn; Sun, 20 Aug 2023 09:54: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 4RT9vK1NKmz3QWS; Sun, 20 Aug 2023 09:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692525293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BbwwNTTmY83QP5sHySG3J2X3C2W88XzbjX5T1ntjFDE=; b=hyDkEN6DBD/mDMprwSZKDypdwzuG6e7/xHLjDPCdkRr3vzU6OIcGH2v5TZ/afWHAidHAJK xc7gya00/cCQ0Ts17IOlMgYsQtMfXnrikahNr7AV/7QAI4ifYokT2yF2mjh1lt1YIFoFAU CTosrPoh4D/0G0h/9aJVmZucp9+cN488kQ1hndGBrfA+WK5DuqAkNQrS44bh9w1AiRaKLO 4eDYIOsqcH5sUBOnoB47vQmZqwsMT2wvbEOktNxl/Vn3FG2J4Cu4ltNjCaVwY4k6Q1jCvd K0T6H5n0wpVS/AU5mi+v6coFxrUHlZasmX9UDrWqwEpF8UGTZy4d/h3Z1rYohA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692525293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BbwwNTTmY83QP5sHySG3J2X3C2W88XzbjX5T1ntjFDE=; b=iSa9CV3prZLNsh+vYCtj7V/CR0HFhmX4bk4v3orECgY+xa4wD/noPXj3B3TfXjYfkZB44L NWqDJYSmJJGQ+Aww9dA99r06AEdTtd+DF/tt5NEhW0d160nRaTNdqaJ6wPtRH+eNaXb7x0 xRb1wIgC/FdkV9p1lkicwb838wTa0qifMjj28Txt8OhSVVu4wmyGw+lv5kHA2CcSfaP7dA bZiohz020jQIUDEdzN52o5NmyKnjBGAdnPtooNbsaP3kWoJnitNSTX5Ywk5Pm99IJPsahA I/uDcAv2pccqR9nGlo5uLxz2RHrQ22BiJUB2L7bgLpEuYAmKe9l1gaBe9QxzWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692525293; a=rsa-sha256; cv=none; b=EdSLQHB9BjMFtOtzH7COQu4Sjx1r1LJ5LSLE462AznbLCT7UMP0xmNmSRiBzBDrihiI4ad +LLOSxdJNs+274Nx1tJ+xuAVjecg/LXNHeoeUpPPnZS6oqlZpBxpEYvAMfIJ7tddToidPx bies7LeqQU7OlXF1A3kB6EEErVPyqpyb4GqIgwAeuhkPe4/9i8VeqYRqMOD8esvRU+DwKP T3HskV11cujvTobwFCQMYNnV3TLWpoVUlZij1Auk2d69bhfPJwM8dd6arxo0pnmDkDltbb Ud+c0vlfKsrVnnSay/1FY6NzSV+FfuoEDW8OOG5edB8hyZTtbNySPhwVb8Cupg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT9vK096bzb3n; Sun, 20 Aug 2023 09:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K9sq9D081521; Sun, 20 Aug 2023 09:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K9sqT1081518; Sun, 20 Aug 2023 09:54:52 GMT (envelope-from git) Date: Sun, 20 Aug 2023 09:54:52 GMT Message-Id: <202308200954.37K9sqT1081518@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 1c4edee342bb - main - bcm5974(4): add support for devices attached over SPI bus List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c4edee342bba99aff29da38b164a862492f1d78 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=1c4edee342bba99aff29da38b164a862492f1d78 commit 1c4edee342bba99aff29da38b164a862492f1d78 Author: Val Packett AuthorDate: 2023-08-20 09:53:32 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-20 09:53:32 +0000 bcm5974(4): add support for devices attached over SPI bus Reviewed by: wulf --- sys/dev/hid/bcm5974.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 92 insertions(+), 7 deletions(-) diff --git a/sys/dev/hid/bcm5974.c b/sys/dev/hid/bcm5974.c index 1d99c7edd5b1..c803412ecb76 100644 --- a/sys/dev/hid/bcm5974.c +++ b/sys/dev/hid/bcm5974.c @@ -52,7 +52,7 @@ #include "usbdevs.h" -#define BCM5974_BUFFER_MAX (248 * 4) /* 4 Type4 SPI frames */ +#define BCM5974_BUFFER_MAX (246 * 2) /* 2 Type4 SPI frames */ #define BCM5974_TLC_PAGE HUP_GENERIC_DESKTOP #define BCM5974_TLC_USAGE HUG_MOUSE @@ -208,7 +208,11 @@ enum { BCM5974_FLAG_WELLSPRING7, BCM5974_FLAG_WELLSPRING7A, BCM5974_FLAG_WELLSPRING8, - BCM5974_FLAG_WELLSPRING9, + BCM5974_FLAG_WELLSPRING9_MODEL3, + BCM5974_FLAG_WELLSPRING9_MODEL4, +#define BCM5974_FLAG_WELLSPRING9_MODEL_SPI BCM5974_FLAG_WELLSPRING9_MODEL4 + BCM5974_FLAG_WELLSPRING9_MODEL5, + BCM5974_FLAG_WELLSPRING9_MODEL6, BCM5974_FLAG_MAGIC_TRACKPAD2_USB, BCM5974_FLAG_MAX, }; @@ -352,7 +356,7 @@ static const struct bcm5974_dev_params bcm5974_dev_params[BCM5974_FLAG_MAX] = { * No scientific measurements have been done :) but a really hard press * results in a value around 3500 on model 4. */ - [BCM5974_FLAG_WELLSPRING9] = { + [BCM5974_FLAG_WELLSPRING9_MODEL3] = { .tp = tp + TYPE4, .p = { SN_PRESSURE, 0, 4096, 4096 }, .w = { SN_WIDTH, 0, 2048, 0 }, @@ -361,6 +365,33 @@ static const struct bcm5974_dev_params bcm5974_dev_params[BCM5974_FLAG_MAX] = { .o = { SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION, 0 }, }, + [BCM5974_FLAG_WELLSPRING9_MODEL4] = { + .tp = tp + TYPE4, + .p = { SN_PRESSURE, 0, 4096, 4096 }, + .w = { SN_WIDTH, 0, 2048, 0 }, + .x = { SN_COORD, -5087, 5579, 105 }, + .y = { SN_COORD, -182, 6089, 75 }, + .o = { SN_ORIENT, + -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION, 0 }, + }, + [BCM5974_FLAG_WELLSPRING9_MODEL5] = { + .tp = tp + TYPE4, + .p = { SN_PRESSURE, 0, 4096, 4096 }, + .w = { SN_WIDTH, 0, 2048, 0 }, + .x = { SN_COORD, -6243, 6749, 105 }, + .y = { SN_COORD, -170, 7685, 75 }, + .o = { SN_ORIENT, + -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION, 0 }, + }, + [BCM5974_FLAG_WELLSPRING9_MODEL6] = { + .tp = tp + TYPE4, + .p = { SN_PRESSURE, 0, 4096, 4096 }, + .w = { SN_WIDTH, 0, 2048, 0 }, + .x = { SN_COORD, -7456, 7976, 105 }, + .y = { SN_COORD, -163, 9283, 75 }, + .o = { SN_ORIENT, + -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION, 0 }, + }, [BCM5974_FLAG_MAGIC_TRACKPAD2_USB] = { .tp = tp + TYPE_MT2U, .p = { SN_PRESSURE, 0, 256, 256 }, @@ -376,6 +407,12 @@ static const struct bcm5974_dev_params bcm5974_dev_params[BCM5974_FLAG_MAX] = { HID_TLC(BCM5974_TLC_PAGE, BCM5974_TLC_USAGE), \ } +#define APPLE_HID "APP000D" +#define BCM5974_DEV_SPI(hid, i) { \ + HID_BUS(BUS_SPI), HID_PNP(hid), HID_DRIVER_INFO(i), \ + HID_TLC(BCM5974_TLC_PAGE, BCM5974_TLC_USAGE), \ +} + static const struct hid_device_id bcm5974_devs[] = { /* MacbookAir1.1 */ BCM5974_DEV(APPLE, WELLSPRING_ANSI, BCM5974_FLAG_WELLSPRING1), @@ -439,14 +476,20 @@ static const struct hid_device_id bcm5974_devs[] = { BCM5974_DEV(APPLE, WELLSPRING8_JIS, BCM5974_FLAG_WELLSPRING8), /* MacbookPro12,1 MacbookPro11,4 */ - BCM5974_DEV(APPLE, WELLSPRING9_ANSI, BCM5974_FLAG_WELLSPRING9), - BCM5974_DEV(APPLE, WELLSPRING9_ISO, BCM5974_FLAG_WELLSPRING9), - BCM5974_DEV(APPLE, WELLSPRING9_JIS, BCM5974_FLAG_WELLSPRING9), + BCM5974_DEV(APPLE, WELLSPRING9_ANSI, BCM5974_FLAG_WELLSPRING9_MODEL3), + BCM5974_DEV(APPLE, WELLSPRING9_ISO, BCM5974_FLAG_WELLSPRING9_MODEL3), + BCM5974_DEV(APPLE, WELLSPRING9_JIS, BCM5974_FLAG_WELLSPRING9_MODEL3), + + /* Generic SPI device */ + BCM5974_DEV_SPI(APPLE_HID, BCM5974_FLAG_WELLSPRING9_MODEL_SPI), /* External "Magic" devices */ BCM5974_DEV(APPLE, MAGIC_TRACKPAD2, BCM5974_FLAG_MAGIC_TRACKPAD2_USB), }; +#define BCM5974_WELLSPRING9_RDESC_SIZE 110 +#define BCM5974_WELLSPRING9_MODEL_OFFSET 106 + struct bcm5974_softc { device_t sc_dev; struct evdev_dev *sc_evdev; @@ -593,6 +636,44 @@ bcm5974_set_device_mode(struct bcm5974_softc *sc, bool on) return (err); } +static uintptr_t +bcm5974_get_wsp9_model(device_t dev) +{ + const struct hid_device_info *hw = hid_get_device_info(dev); + static uint8_t rdesc[BCM5974_WELLSPRING9_RDESC_SIZE]; + uint8_t model_byte = 0; + + bus_topo_assert(); + + if (hw->rdescsize == sizeof(rdesc) && + hid_get_rdesc(dev, rdesc, sizeof(rdesc)) == 0) { + model_byte = rdesc[BCM5974_WELLSPRING9_MODEL_OFFSET]; + switch (model_byte) { + case 3: + /* MacbookPro12,1 MacbookPro11,4 */ + return (BCM5974_FLAG_WELLSPRING9_MODEL3); + case 4: + /* Macbook8,1 Macbook9,1 Macbook10,1 */ + return (BCM5974_FLAG_WELLSPRING9_MODEL4); + case 5: + /* + * MacbookPro13,1 MacbookPro13,2 + * MacbookPro14,1 MacbookPro14,2 + */ + return (BCM5974_FLAG_WELLSPRING9_MODEL5); + case 6: + /* MacbookPro13,3 MacbookPro14,3 */ + return (BCM5974_FLAG_WELLSPRING9_MODEL6); + } + } + + device_printf(dev, "Unexpected trackpad descriptor len=%u model_byte=" + "%u, not extracting model\n", hw->rdescsize, model_byte); + + /* Fallback for unknown SPI versions */ + return (BCM5974_FLAG_WELLSPRING9_MODEL_SPI); +} + static void bcm5974_identify(driver_t *driver, device_t parent) { @@ -631,6 +712,7 @@ bcm5974_attach(device_t dev) { struct bcm5974_softc *sc = device_get_softc(dev); const struct hid_device_info *hw = hid_get_device_info(dev); + uintptr_t drv_info; int err; DPRINTFN(BCM5974_LLEVEL_INFO, "sc=%p\n", sc); @@ -638,7 +720,10 @@ bcm5974_attach(device_t dev) sc->sc_dev = dev; /* get device specific configuration */ - sc->sc_params = bcm5974_dev_params + hidbus_get_driver_info(dev); + drv_info = hidbus_get_driver_info(dev); + if (drv_info == BCM5974_FLAG_WELLSPRING9_MODEL_SPI) + drv_info = bcm5974_get_wsp9_model(dev); + sc->sc_params = bcm5974_dev_params + drv_info; sc->sc_evdev = evdev_alloc(); evdev_set_name(sc->sc_evdev, device_get_desc(dev)); From nobody Sun Aug 20 09:54: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 4RT9vL2ppcz4r1qr; Sun, 20 Aug 2023 09:54: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 4RT9vL2C5fz3QP6; Sun, 20 Aug 2023 09:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692525294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KxIGrcY8a0YHALqLVVdV4KOOlN+WaifTiLszaCrCu0U=; b=mEV6oqeNem61cuFIpIJAuH1quib5xdB53ltSZ2v8bsJzisKApBdUT4jDwa6hg6pO2Pm2wU Pwzlq9/5dLzJ8GBDULliX/i816Rfd547kbyXPQcagRISULEC6bLPEVODAddhH/xXnZO9up M9OBjLJTfNgZ0/kSKtyCKV1BudcB9pQ9sYT4C8EoXwVyQ/a6zxDdFZ5qREKNqWHNhA/U1s AtvwqYUX/EUu+bSSEZn1F6SWau75/tZoARGIZ14q8n5/oeZQ0bqCOfOlzqTZy+O+R/f0p7 OJ65nEXJBLFR7A/RC81ytE04DVcmRX0Nh3HnT37Ce4mzhVBN+yqLNX5ilrG3Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692525294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KxIGrcY8a0YHALqLVVdV4KOOlN+WaifTiLszaCrCu0U=; b=moVqKUXKUu4xhW8lMbLVKDAGwS1Gnz8UdWz6xR6TvMohHzX4xi66Ru85kbcVZQud8kT4ZV 5L+iOeiMzjMMRFgyzWhUvw07jmTeZ8xrc3cjNVPcNuuZRX8jbEOW7JZiziCbWdtzqLqtiA eqN1ohP1cC2X37pHGM4+OqV8pI4LZsJsEmRYbM5h96DQWf+yNlhnT2JdoxyKUtGVOjy/9n 9IU8inkY+euOup9H9yCjIzunAp5xHGGqmlTeal6PbGdShulAIhjTYf2srlCqGIqhcsiBRq 3Rjjs57SW+AMffuG7MQTmck5ZRi0oAYnHvTxWBCQ0i09zwy5Sz4V6KZApiQ3zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692525294; a=rsa-sha256; cv=none; b=ldsDrLOv6MgIT2R1rrE3YXjvMpWjmKRVfMl9QDyUHACGEcsFdS6ypwlN+LsNIhuKdc61Ym aF4MpJgDTlhjAshSBa+2hefwjNeJ1M/QHQkeIYGfxey7/zzCX4dgje3phWRi/cLNfbjoUd 8E25r4E2LWW4T9V3YpGrO5ff/R/6MtuxvlTf5JoTXkdp0S6JG/tCXb3ddOJBOwTxt4eR96 XONebemQ1e5vWPWWMBuUfayjxrTdeFCc34E6CoyxhPf+XQBJPOYGK53stUWUwe+oXH88DH e3nZaDN55hWSzyS32SGzt9ydRnp1AMJsDTw3JztpCOS/GY3mwEy2wyx9099pIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RT9vL11N4zZTm; Sun, 20 Aug 2023 09:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K9ssJj081582; Sun, 20 Aug 2023 09:54:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K9ss7M081579; Sun, 20 Aug 2023 09:54:54 GMT (envelope-from git) Date: Sun, 20 Aug 2023 09:54:54 GMT Message-Id: <202308200954.37K9ss7M081579@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 64fbda90da1b - main - Add atopcase, the Apple HID over SPI input 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64fbda90da1b91d2412a5b970a3996f3cf1c8522 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=64fbda90da1b91d2412a5b970a3996f3cf1c8522 commit 64fbda90da1b91d2412a5b970a3996f3cf1c8522 Author: Val Packett AuthorDate: 2023-08-20 09:53:32 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-20 09:53:32 +0000 Add atopcase, the Apple HID over SPI input driver The driver provides support for Human Interface Devices (HID) on Serial Peripheral Interface (SPI) buses on Apple Intel Macs produced in 2015-2018. The driver appears to work more stable after installation of Darwin OSI in acpi(4) driver. To install Darwin OSI insert following lines into /boot/loader.conf: hw.acpi.install_interface="Darwin" hw.acpi.remove_interface="Windows 2009, Windows 2012" Reviewed by: wulf Differential revision: https://reviews.freebsd.org/D39863 --- share/man/man4/Makefile | 2 + share/man/man4/atopcase.4 | 134 +++++++ sys/conf/files.x86 | 2 + sys/dev/atopcase/atopcase.c | 722 ++++++++++++++++++++++++++++++++++++++ sys/dev/atopcase/atopcase_acpi.c | 458 ++++++++++++++++++++++++ sys/dev/atopcase/atopcase_reg.h | 110 ++++++ sys/dev/atopcase/atopcase_var.h | 142 ++++++++ sys/dev/hid/hidbus.c | 1 + sys/modules/spi/Makefile | 5 + sys/modules/spi/atopcase/Makefile | 7 + 10 files changed, 1583 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index a5faad3e66ec..148670072757 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -57,6 +57,7 @@ MAN= aac.4 \ ath_hal.4 \ atkbd.4 \ atkbdc.4 \ + ${_atopcase.4} \ atp.4 \ ${_atf_test_case.4} \ ${_atrtc.4} \ @@ -794,6 +795,7 @@ _amdsmb.4= amdsmb.4 _amdsmn.4= amdsmn.4 _amdtemp.4= amdtemp.4 _asmc.4= asmc.4 +_atopcase.4= atopcase.4 _bxe.4= bxe.4 _bytgpio.4= bytgpio.4 _chvgpio.4= chvgpio.4 diff --git a/share/man/man4/atopcase.4 b/share/man/man4/atopcase.4 new file mode 100644 index 000000000000..fc93b7094466 --- /dev/null +++ b/share/man/man4/atopcase.4 @@ -0,0 +1,134 @@ +.\" Copyright (c) 2023 Vladimir Kondratyev +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd August 17, 2023 +.Dt ATOPCASE 4 +.Os +.Sh NAME +.Nm atopcase +.Nd Apple HID-over-SPI transport driver +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device atopcase" +.Cd "device intelspi" +.Cd "device spibus" +.Cd "device hidbus" +.Cd "device hkbd" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +atopcase_load="YES" +hkbd_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for Human Interface Devices (HID) on +Serial Peripheral Interface (SPI) buses on Apple Intel Macs. +.Sh HARDWARE +The +.Nm +driver supports the following MacBooks produced in 2015-2018 years: +.Pp +.Bl -bullet -compact +.It +Macbook8,1 +.It +Macbook9,1 +.It +Macbook10,1 +.It +MacbookPro11,4 +.It +MacbookPro12,1 +.It +MacbookPro13,1 +.It +MacbookPro13,2 +.It +MacbookPro13,3 +.It +MacbookPro14,1 +.It +MacbookPro14,2 +.It +MacbookPro14,3 +.El +.Sh SYSCTL VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width indent +.It Va hw.hid.atopcase.debug +Debug output level, where 0 is debugging disabled and larger values increase +debug message verbosity. +Default is 0. +.El +.Sh FILES +.Bl -tag -width ".Pa /dev/backlight/atopcase0" -compact +.It Pa /dev/backlight/atopcase0 +Keyboard +.Xr backlight 8 +device node. +.El +.Sh SEE ALSO +.Xr acpi 4 , +.Xr backlight 8 , +.Xr loader 8 , +.Xr loader.conf 5 . +.Sh HISTORY +The +.Nm +driver first appeared in +.Fx 14.0. +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was originally written by +.An Val Packett Aq Mt val@packett.cool +and marginally improved upon by +.An Vladimir Kondratyev Aq Mt wulf@FreeBSD.org . +.Pp +This manual page was written by +.An Vladimir Kondratyev Aq Mt wulf@FreeBSD.org . +.Sh BUGS +Device interrupts are not acknowledged on some hardware that results in +interrupt storm. +Installation of Darwin OSI in +.Xr acpi 4 +driver fixes the issue. +To install Darwin OSI add following lines to +.Xr loader.conf 5 : +.Bl -tag -width indent +.It Va hw.acpi.install_interface="Darwin" +.It Va hw.acpi.remove_interface="Windows 2009, Windows 2012" +.El diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index c3e67def1688..15781eea8fee 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -69,6 +69,8 @@ dev/atkbdc/atkbdc.c optional atkbdc dev/atkbdc/atkbdc_isa.c optional atkbdc isa dev/atkbdc/atkbdc_subr.c optional atkbdc dev/atkbdc/psm.c optional psm atkbdc +dev/atopcase/atopcase.c optional atopcase acpi hid spibus +dev/atopcase/atopcase_acpi.c optional atopcase acpi hid spibus dev/bxe/bxe.c optional bxe pci dev/bxe/bxe_stats.c optional bxe pci dev/bxe/bxe_debug.c optional bxe pci diff --git a/sys/dev/atopcase/atopcase.c b/sys/dev/atopcase/atopcase.c new file mode 100644 index 000000000000..db1258b77a69 --- /dev/null +++ b/sys/dev/atopcase/atopcase.c @@ -0,0 +1,722 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2021-2023 Val Packett + * Copyright (c) 2023 Vladimir Kondratyev + * + * 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_hid.h" +#include "opt_spi.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +#define HID_DEBUG_VAR atopcase_debug +#include +#include + +#include +#include + +#include "spibus_if.h" + +#include "atopcase_reg.h" +#include "atopcase_var.h" + +#define ATOPCASE_IN_KDB() (SCHEDULER_STOPPED() || kdb_active) +#define ATOPCASE_IN_POLLING_MODE(sc) \ + (((sc)->sc_gpe_bit == 0 && ((sc)->sc_irq_ih == NULL)) || cold ||\ + ATOPCASE_IN_KDB()) +#define ATOPCASE_WAKEUP(sc, chan) do { \ + if (!ATOPCASE_IN_POLLING_MODE(sc)) { \ + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, "wakeup: %p\n", chan); \ + wakeup(chan); \ + } \ +} while (0) +#define ATOPCASE_SPI_PAUSE() DELAY(100) +#define ATOPCASE_SPI_NO_SLEEP_FLAG(sc) \ + ((sc)->sc_irq_ih != NULL ? SPI_FLAG_NO_SLEEP : 0) + +/* Tunables */ +static SYSCTL_NODE(_hw_hid, OID_AUTO, atopcase, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "Apple MacBook Topcase HID driver"); + +#ifdef HID_DEBUG +enum atopcase_log_level atopcase_debug = ATOPCASE_LLEVEL_DISABLED; + +SYSCTL_INT(_hw_hid_atopcase, OID_AUTO, debug, CTLFLAG_RWTUN, + &atopcase_debug, ATOPCASE_LLEVEL_DISABLED, "atopcase log level"); +#endif /* !HID_DEBUG */ + +static const uint8_t booted[] = { 0xa0, 0x80, 0x00, 0x00 }; +static const uint8_t status_ok[] = { 0xac, 0x27, 0x68, 0xd5 }; + +static inline struct atopcase_child * +atopcase_get_child_by_device(struct atopcase_softc *sc, uint8_t device) +{ + switch (device) { + case ATOPCASE_DEV_KBRD: + return (&sc->sc_kb); + case ATOPCASE_DEV_TPAD: + return (&sc->sc_tp); + default: + return (NULL); + } +} + +static int +atopcase_receive_status(struct atopcase_softc *sc) +{ + struct spi_command cmd = SPI_COMMAND_INITIALIZER; + uint8_t dummy_buffer[4] = { 0 }; + uint8_t status_buffer[4] = { 0 }; + int err; + + cmd.tx_cmd = dummy_buffer; + cmd.tx_cmd_sz = sizeof(dummy_buffer); + cmd.rx_cmd = status_buffer; + cmd.rx_cmd_sz = sizeof(status_buffer); + cmd.flags = ATOPCASE_SPI_NO_SLEEP_FLAG(sc); + + err = SPIBUS_TRANSFER(device_get_parent(sc->sc_dev), sc->sc_dev, &cmd); + ATOPCASE_SPI_PAUSE(); + if (err) { + device_printf(sc->sc_dev, "SPI error: %d\n", err); + return (err); + } + + DPRINTFN(ATOPCASE_LLEVEL_TRACE, "Status: %*D\n", 4, status_buffer, " "); + + if (memcmp(status_buffer, status_ok, sizeof(status_ok)) == 0) { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, "Wrote command\n"); + ATOPCASE_WAKEUP(sc, sc->sc_dev); + } else { + device_printf(sc->sc_dev, "Failed to write command\n"); + return (EIO); + } + + return (0); +} + +static int +atopcase_process_message(struct atopcase_softc *sc, uint8_t device, void *msg, + uint16_t msg_len) +{ + struct atopcase_header *hdr = msg; + struct atopcase_child *ac; + void *payload; + uint16_t pl_len, crc; + + payload = (uint8_t *)msg + sizeof(*hdr); + pl_len = le16toh(hdr->len); + + if (pl_len + sizeof(*hdr) + sizeof(crc) != msg_len) { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, + "message with length overflow\n"); + return (EIO); + } + + crc = le16toh(*(uint16_t *)((uint8_t *)payload + pl_len)); + if (crc != crc16(0, msg, msg_len - sizeof(crc))) { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, + "message with failed checksum\n"); + return (EIO); + } + +#define CPOFF(dst, len, off) do { \ + unsigned _len = le16toh(len); \ + unsigned _off = le16toh(off); \ + if (pl_len >= _len + _off) { \ + memcpy(dst, (uint8_t*)payload + _off, MIN(_len, sizeof(dst)));\ + (dst)[MIN(_len, sizeof(dst) - 1)] = '\0'; \ + }} while (0); + + if ((ac = atopcase_get_child_by_device(sc, device)) != NULL + && hdr->type == ATOPCASE_MSG_TYPE_REPORT(device)) { + if (ac->open) + ac->intr_handler(ac->intr_ctx, payload, pl_len); + } else if (device == ATOPCASE_DEV_INFO + && hdr->type == ATOPCASE_MSG_TYPE_INFO(ATOPCASE_INFO_IFACE) + && (ac = atopcase_get_child_by_device(sc, hdr->type_arg)) != NULL) { + struct atopcase_iface_info_payload *iface = payload; + CPOFF(ac->name, iface->name_len, iface->name_off); + DPRINTF("Interface #%d name: %s\n", ac->device, ac->name); + } else if (device == ATOPCASE_DEV_INFO + && hdr->type == ATOPCASE_MSG_TYPE_INFO(ATOPCASE_INFO_DESCRIPTOR) + && (ac = atopcase_get_child_by_device(sc, hdr->type_arg)) != NULL) { + memcpy(ac->rdesc, payload, pl_len); + ac->rdesc_len = ac->hw.rdescsize = pl_len; + DPRINTF("%s HID report descriptor: %*D\n", ac->name, + (int) ac->hw.rdescsize, ac->rdesc, " "); + } else if (device == ATOPCASE_DEV_INFO + && hdr->type == ATOPCASE_MSG_TYPE_INFO(ATOPCASE_INFO_DEVICE) + && hdr->type_arg == ATOPCASE_INFO_DEVICE) { + struct atopcase_device_info_payload *dev = payload; + sc->sc_vid = le16toh(dev->vid); + sc->sc_pid = le16toh(dev->pid); + sc->sc_ver = le16toh(dev->ver); + CPOFF(sc->sc_vendor, dev->vendor_len, dev->vendor_off); + CPOFF(sc->sc_product, dev->product_len, dev->product_off); + CPOFF(sc->sc_serial, dev->serial_len, dev->serial_off); + if (bootverbose) { + device_printf(sc->sc_dev, "Device info descriptor:\n"); + printf(" Vendor: %s\n", sc->sc_vendor); + printf(" Product: %s\n", sc->sc_product); + printf(" Serial: %s\n", sc->sc_serial); + } + } + + return (0); +} + +int +atopcase_receive_packet(struct atopcase_softc *sc) +{ + struct atopcase_packet pkt = { 0 }; + struct spi_command cmd = SPI_COMMAND_INITIALIZER; + void *msg; + int err; + uint16_t length, remaining, offset, msg_len; + + bzero(&sc->sc_junk, sizeof(struct atopcase_packet)); + cmd.tx_cmd = &sc->sc_junk; + cmd.tx_cmd_sz = sizeof(struct atopcase_packet); + cmd.rx_cmd = &pkt; + cmd.rx_cmd_sz = sizeof(struct atopcase_packet); + cmd.flags = ATOPCASE_SPI_NO_SLEEP_FLAG(sc); + err = SPIBUS_TRANSFER(device_get_parent(sc->sc_dev), sc->sc_dev, &cmd); + ATOPCASE_SPI_PAUSE(); + if (err) { + device_printf(sc->sc_dev, "SPI error: %d\n", err); + return (err); + } + + DPRINTFN(ATOPCASE_LLEVEL_TRACE, "Response: %*D\n", 256, &pkt, " "); + + if (le16toh(pkt.checksum) != crc16(0, &pkt, sizeof(pkt) - 2)) { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, "packet with failed checksum\n"); + return (EIO); + } + + /* + * When we poll and nothing has arrived we get a particular packet + * starting with '80 11 00 01' + */ + if (pkt.direction == ATOPCASE_DIR_NOTHING) { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, "'Nothing' packet: %*D\n", 4, + &pkt, " "); + return (EAGAIN); + } + + if (pkt.direction != ATOPCASE_DIR_READ && + pkt.direction != ATOPCASE_DIR_WRITE) { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, + "unknown message direction 0x%x\n", pkt.direction); + return (EIO); + } + + length = le16toh(pkt.length); + remaining = le16toh(pkt.remaining); + offset = le16toh(pkt.offset); + + if (length > sizeof(pkt.data)) { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, + "packet with length overflow: %u\n", length); + return (EIO); + } + + if (pkt.direction == ATOPCASE_DIR_READ && + pkt.device == ATOPCASE_DEV_INFO && + length == sizeof(booted) && + memcmp(pkt.data, booted, length) == 0) { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, "GPE boot packet\n"); + sc->sc_booted = true; + ATOPCASE_WAKEUP(sc, sc); + return (0); + } + + /* handle multi-packet messages */ + if (remaining != 0 || offset != 0) { + if (offset != sc->sc_msg_len) { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, + "Unexpected offset (got %u, expected %u)\n", + offset, sc->sc_msg_len); + sc->sc_msg_len = 0; + return (EIO); + } + + if ((size_t)remaining + length + offset > sizeof(sc->sc_msg)) { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, + "Message with length overflow: %zu\n", + (size_t)remaining + length + offset); + sc->sc_msg_len = 0; + return (EIO); + } + + memcpy(sc->sc_msg + offset, &pkt.data, length); + sc->sc_msg_len += length; + + if (remaining != 0) + return (0); + + msg = sc->sc_msg; + msg_len = sc->sc_msg_len; + } else { + msg = pkt.data; + msg_len = length; + } + sc->sc_msg_len = 0; + + err = atopcase_process_message(sc, pkt.device, msg, msg_len); + if (err == 0 && pkt.direction == ATOPCASE_DIR_WRITE) { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, "Write ack\n"); + ATOPCASE_WAKEUP(sc, sc); + } + + return (err); +} + +static int +atopcase_send(struct atopcase_softc *sc, struct atopcase_packet *pkt) +{ + struct spi_command cmd = SPI_COMMAND_INITIALIZER; + int err, retries; + + cmd.tx_cmd = pkt; + cmd.tx_cmd_sz = sizeof(struct atopcase_packet); + cmd.rx_cmd = &sc->sc_junk; + cmd.rx_cmd_sz = sizeof(struct atopcase_packet); + cmd.flags = SPI_FLAG_KEEP_CS | ATOPCASE_SPI_NO_SLEEP_FLAG(sc); + + DPRINTFN(ATOPCASE_LLEVEL_TRACE, "Request: %*D\n", + (int)sizeof(struct atopcase_packet), cmd.tx_cmd, " "); + + if (!ATOPCASE_IN_POLLING_MODE(sc)) { + if (sc->sc_irq_ih != NULL) + mtx_lock(&sc->sc_mtx); + else + sx_xlock(&sc->sc_sx); + } + sc->sc_wait_for_status = true; + err = SPIBUS_TRANSFER(device_get_parent(sc->sc_dev), sc->sc_dev, &cmd); + ATOPCASE_SPI_PAUSE(); + if (!ATOPCASE_IN_POLLING_MODE(sc)) { + if (sc->sc_irq_ih != NULL) + mtx_unlock(&sc->sc_mtx); + else + sx_xunlock(&sc->sc_sx); + } + if (err != 0) { + device_printf(sc->sc_dev, "SPI error: %d\n", err); + goto exit; + } + + if (ATOPCASE_IN_POLLING_MODE(sc)) { + err = atopcase_receive_status(sc); + } else { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, "wait for: %p\n", sc->sc_dev); + err = tsleep(sc->sc_dev, 0, "atcstat", hz / 10); + } + sc->sc_wait_for_status = false; + if (err != 0) { + DPRINTF("Write status read failed: %d\n", err); + goto exit; + } + + if (ATOPCASE_IN_POLLING_MODE(sc)) { + /* Backlight setting may require a lot of time */ + retries = 20; + while ((err = atopcase_receive_packet(sc)) == EAGAIN && + --retries != 0) + DELAY(1000); + } else { + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, "wait for: %p\n", sc); + err = tsleep(sc, 0, "atcack", hz / 10); + } + if (err != 0) + DPRINTF("Write ack read failed: %d\n", err); + +exit: + if (err == EWOULDBLOCK) + err = EIO; + + return (err); +} + +static void +atopcase_create_message(struct atopcase_packet *pkt, uint8_t device, + uint16_t type, uint8_t type_arg, const void *payload, uint8_t len, + uint16_t resp_len) +{ + struct atopcase_header *hdr = (struct atopcase_header *)pkt->data; + uint16_t msg_checksum; + static uint8_t seq_no; + + KASSERT(len <= ATOPCASE_DATA_SIZE - sizeof(struct atopcase_header), + ("outgoing msg must be 1 packet")); + + bzero(pkt, sizeof(struct atopcase_packet)); + pkt->direction = ATOPCASE_DIR_WRITE; + pkt->device = device; + pkt->length = htole16(sizeof(*hdr) + len + 2); + + hdr->type = htole16(type); + hdr->type_arg = type_arg; + hdr->seq_no = seq_no++; + hdr->resp_len = htole16((resp_len == 0) ? len : resp_len); + hdr->len = htole16(len); + + memcpy(pkt->data + sizeof(*hdr), payload, len); + msg_checksum = htole16(crc16(0, pkt->data, pkt->length - 2)); + memcpy(pkt->data + sizeof(*hdr) + len, &msg_checksum, 2); + pkt->checksum = htole16(crc16(0, (uint8_t*)pkt, sizeof(*pkt) - 2)); + + return; +} + +static int +atopcase_request_desc(struct atopcase_softc *sc, uint16_t type, uint8_t device) +{ + atopcase_create_message( + &sc->sc_buf, ATOPCASE_DEV_INFO, type, device, NULL, 0, 0x200); + return (atopcase_send(sc, &sc->sc_buf)); +} + +int +atopcase_intr(struct atopcase_softc *sc) +{ + int err; + + DPRINTFN(ATOPCASE_LLEVEL_DEBUG, "Interrupt event\n"); + + if (sc->sc_wait_for_status) { + err = atopcase_receive_status(sc); + sc->sc_wait_for_status = false; + } else + err = atopcase_receive_packet(sc); + + return (err); +} + +static int +atopcase_add_child(struct atopcase_softc *sc, struct atopcase_child *ac, + uint8_t device) +{ + device_t hidbus; + int err = 0; + + ac->device = device; + + /* fill device info */ + strlcpy(ac->hw.name, "Apple MacBook", sizeof(ac->hw.name)); + ac->hw.idBus = BUS_SPI; + ac->hw.idVendor = sc->sc_vid; + ac->hw.idProduct = sc->sc_pid; + ac->hw.idVersion = sc->sc_ver; + strlcpy(ac->hw.idPnP, sc->sc_hid, sizeof(ac->hw.idPnP)); + strlcpy(ac->hw.serial, sc->sc_serial, sizeof(ac->hw.serial)); + /* + * HID write and set_report methods executed on Apple SPI topcase + * hardware do the same request on SPI layer. Set HQ_NOWRITE quirk to + * force hidmap to convert writes to set_reports. That makes HID bus + * write handler unnecessary and reduces code duplication. + */ + hid_add_dynamic_quirk(&ac->hw, HQ_NOWRITE); + + DPRINTF("Get the interface #%d descriptor\n", device); + err = atopcase_request_desc(sc, + ATOPCASE_MSG_TYPE_INFO(ATOPCASE_INFO_IFACE), device); + if (err) { + device_printf(sc->sc_dev, "can't receive iface descriptor\n"); + goto exit; + } + + DPRINTF("Get the \"%s\" HID report descriptor\n", ac->name); + err = atopcase_request_desc(sc, + ATOPCASE_MSG_TYPE_INFO(ATOPCASE_INFO_DESCRIPTOR), device); + if (err) { + device_printf(sc->sc_dev, "can't receive report descriptor\n"); + goto exit; + } + + hidbus = device_add_child(sc->sc_dev, "hidbus", -1); + if (hidbus == NULL) { + device_printf(sc->sc_dev, "can't add child\n"); + err = ENOMEM; + goto exit; + } + device_set_ivars(hidbus, &ac->hw); + ac->hidbus = hidbus; + +exit: + return (err); +} + +int +atopcase_init(struct atopcase_softc *sc) +{ + int err; + + /* Wait until we know we're getting reasonable responses */ + if(!sc->sc_booted && tsleep(sc, 0, "atcboot", hz / 20) != 0) { + device_printf(sc->sc_dev, "can't establish communication\n"); + err = EIO; + goto err; + } + + /* + * Management device may send a message on first boot after power off. + * Let interrupt handler to read and discard it. + */ + DELAY(2000); + + DPRINTF("Get the device descriptor\n"); + err = atopcase_request_desc(sc, + ATOPCASE_MSG_TYPE_INFO(ATOPCASE_INFO_DEVICE), + ATOPCASE_INFO_DEVICE); + if (err) { + device_printf(sc->sc_dev, "can't receive device descriptor\n"); + goto err; + } + + err = atopcase_add_child(sc, &sc->sc_kb, ATOPCASE_DEV_KBRD); + if (err != 0) + goto err; + err = atopcase_add_child(sc, &sc->sc_tp, ATOPCASE_DEV_TPAD); + if (err != 0) + goto err; + + /* TODO: skip on 2015 models where it's controlled by asmc */ + sc->sc_backlight = backlight_register("atopcase", sc->sc_dev); + if (!sc->sc_backlight) { + device_printf(sc->sc_dev, "can't register backlight\n"); + err = ENOMEM; + } + + if (sc->sc_tq != NULL) + taskqueue_enqueue_timeout(sc->sc_tq, &sc->sc_task, hz / 120); + + return (bus_generic_attach(sc->sc_dev)); + +err: + return (err); +} + +int +atopcase_destroy(struct atopcase_softc *sc) +{ + int err; + + err = device_delete_children(sc->sc_dev); + if (err) + return (err); + + if (sc->sc_backlight) + backlight_destroy(sc->sc_backlight); + + return (0); +} + +static struct atopcase_child * +atopcase_get_child_by_hidbus(device_t child) +{ + device_t parent = device_get_parent(child); + struct atopcase_softc *sc = device_get_softc(parent); + + if (child == sc->sc_kb.hidbus) + return (&sc->sc_kb); + if (child == sc->sc_tp.hidbus) + return (&sc->sc_tp); + panic("unknown child"); +} + +void +atopcase_intr_setup(device_t dev, device_t child, hid_intr_t intr, + void *context, struct hid_rdesc_info *rdesc) +{ + struct atopcase_child *ac = atopcase_get_child_by_hidbus(child); + + if (intr == NULL) + return; + + rdesc->rdsize = ATOPCASE_MSG_SIZE - sizeof(struct atopcase_header) - 2; + rdesc->grsize = 0; + rdesc->srsize = ATOPCASE_DATA_SIZE - sizeof(struct atopcase_header) - 2; + rdesc->wrsize = 0; + + ac->intr_handler = intr; + ac->intr_ctx = context; +} + +void +atopcase_intr_unsetup(device_t dev, device_t child) +{ +} + +int +atopcase_intr_start(device_t dev, device_t child) +{ + struct atopcase_softc *sc = device_get_softc(dev); + struct atopcase_child *ac = atopcase_get_child_by_hidbus(child); + + if (ATOPCASE_IN_POLLING_MODE(sc)) + sx_xlock(&sc->sc_write_sx); + else if (sc->sc_irq_ih != NULL) + mtx_lock(&sc->sc_mtx); + else + sx_xlock(&sc->sc_sx); + ac->open = true; + if (ATOPCASE_IN_POLLING_MODE(sc)) + sx_xunlock(&sc->sc_write_sx); + else if (sc->sc_irq_ih != NULL) + mtx_unlock(&sc->sc_mtx); + else + sx_xunlock(&sc->sc_sx); + + return (0); +} + +int +atopcase_intr_stop(device_t dev, device_t child) +{ + struct atopcase_softc *sc = device_get_softc(dev); + struct atopcase_child *ac = atopcase_get_child_by_hidbus(child); + + if (ATOPCASE_IN_POLLING_MODE(sc)) + sx_xlock(&sc->sc_write_sx); + else if (sc->sc_irq_ih != NULL) + mtx_lock(&sc->sc_mtx); + else + sx_xlock(&sc->sc_sx); + ac->open = false; + if (ATOPCASE_IN_POLLING_MODE(sc)) + sx_xunlock(&sc->sc_write_sx); + else if (sc->sc_irq_ih != NULL) + mtx_unlock(&sc->sc_mtx); + else + sx_xunlock(&sc->sc_sx); + + return (0); +} + +void +atopcase_intr_poll(device_t dev, device_t child) +{ + struct atopcase_softc *sc = device_get_softc(dev); + + (void)atopcase_receive_packet(sc); +} + +int +atopcase_get_rdesc(device_t dev, device_t child, void *buf, hid_size_t len) +{ + struct atopcase_child *ac = atopcase_get_child_by_hidbus(child); + + if (ac->rdesc_len != len) + return (ENXIO); + memcpy(buf, ac->rdesc, len); + + return (0); +} + +int +atopcase_set_report(device_t dev, device_t child, const void *buf, + hid_size_t len, uint8_t type __unused, uint8_t id) +{ + struct atopcase_softc *sc = device_get_softc(dev); + struct atopcase_child *ac = atopcase_get_child_by_hidbus(child); + int err; + + if (len >= ATOPCASE_DATA_SIZE - sizeof(struct atopcase_header) - 2) + return (EINVAL); + + DPRINTF("%s HID command SET_REPORT %d (len %d): %*D\n", + ac->name, id, len, len, buf, " "); + + if (!ATOPCASE_IN_KDB()) + sx_xlock(&sc->sc_write_sx); + atopcase_create_message(&sc->sc_buf, ac->device, + ATOPCASE_MSG_TYPE_SET_REPORT(ac->device, id), 0, buf, len, 0); + err = atopcase_send(sc, &sc->sc_buf); + if (!ATOPCASE_IN_KDB()) + sx_xunlock(&sc->sc_write_sx); + + return (err); +} + +int +atopcase_backlight_update_status(device_t dev, struct backlight_props *props) +{ + struct atopcase_softc *sc = device_get_softc(dev); + struct atopcase_bl_payload payload = { 0 }; + + payload.report_id = ATOPCASE_BKL_REPORT_ID; + payload.device = ATOPCASE_DEV_KBRD; + /* + * Hardware range is 32-255 for visible backlight, + * convert from percentages + */ + payload.level = (props->brightness == 0) ? 0 : + (32 + (223 * props->brightness / 100)); + payload.status = (payload.level > 0) ? 0x01F4 : 0x1; + + return (atopcase_set_report(dev, sc->sc_kb.hidbus, &payload, + sizeof(payload), HID_OUTPUT_REPORT, ATOPCASE_BKL_REPORT_ID)); +} + +int +atopcase_backlight_get_status(device_t dev, struct backlight_props *props) +{ + struct atopcase_softc *sc = device_get_softc(dev); + + props->brightness = sc->sc_backlight_level; + props->nlevels = 0; + + return (0); +} + +int +atopcase_backlight_get_info(device_t dev, struct backlight_info *info) +{ + info->type = BACKLIGHT_TYPE_KEYBOARD; + strlcpy(info->name, "Apple MacBook Keyboard", BACKLIGHTMAXNAMELENGTH); + + return (0); +} diff --git a/sys/dev/atopcase/atopcase_acpi.c b/sys/dev/atopcase/atopcase_acpi.c new file mode 100644 index 000000000000..a794163f1a39 --- /dev/null +++ b/sys/dev/atopcase/atopcase_acpi.c @@ -0,0 +1,458 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2021-2023 Val Packett + * Copyright (c) 2023 Vladimir Kondratyev + * + * 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_acpi.h" +#include "opt_hid.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + *** 723 LINES SKIPPED *** From nobody Sun Aug 20 12:31: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 4RTFND2Wr8z4r8jj; Sun, 20 Aug 2023 12:31: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 4RTFND24Q8z3d96; Sun, 20 Aug 2023 12:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692534700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54nmi58d+lLvQsd2A5eOU0449q6mREqY75hl8JETOqE=; b=Qc9tLjaQVFaX9p0bw5h3Mleh6eVOFfWCWuCtzZs6UClMFybbm2V+azVC/yHhEw2OEbmPhQ 7uScgNDYMDW452ZVxDzqdLwC7KWABdPbuxETWkoqaUjVj8BrMMgN8VCE+2pucVArrhMEDz +K/2aoafwiF/Ed4Okj0RkYjfvs6KAprAqvZ2pbXBq34m+rYRajxvLlxZodph7fBksSSa63 SmxRzJZEebyQLni8Xt6zv83HNbY08QqNhAgurRnZQgET6DPtaqsiL9q9+tHqJr6JlfitCM Eeazh9imqxDCyYv1Bxcmxq3WUbOs2Tg17IYKe7ZPvv+tpXdGg9Uh4Zd554imWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692534700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54nmi58d+lLvQsd2A5eOU0449q6mREqY75hl8JETOqE=; b=q29Bxai9Y8jKWJorE7kfOLnxi6xUSMuaT3QduRAVQXxSv1nMJ3UmuPl7zLTB6RxVsZUlov Q1+VxZG1ArRLUXtBY7MN9T9gZmVdOzTrTbXQc0VvlGWKAvgWqG49n+hphQBeQ+FtPwNlYk V9u+M3c5DMdCWPF6ulDXim2NRTw+1+mNrqjlQgM2qtZXfKyv363dHubB7u8de0xq6dWZMs /yHU+7IBDshOIWAA/vvfDdEaTv66B0N5g4n4iXKZXxYmPL0noGmW3tAnoT8BWOyZs5uAel i8h58YbzarK1Do9OG0eoFJCtprN+NHrj3xyutjx2URmrMIIgaJOpy9lNQc9N8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692534700; a=rsa-sha256; cv=none; b=Zj5cXOvRlY+Xdcze1g8waP7UoqyVkZS8kceoahN8e+FrvGlQ19InV5Lpzw4ELH2OpTcxeM xI/T/xZ/jDqVRxULC0bO/6t6vuzkPew7qu9y8eiWAowa7OqfZ1U/EauzVevwAYE4gcrL3J 0KJV+kBfCyjXFFK4Am9M72K6ar67bVHSzzFTImjfbWrAylldzhYCiYjr938r2NrKI0WK7Y 0Qk1jJPETg3ERCL8lsR8WGStTzzR2bgtoAYQkShaYpy+F3j8BoRHdDwax75oFtgZ9FwY75 nncJgI9DuB2dQEH5umNb+kksBso8eV3lT12jCim0dtSxIHfCTban0fxfJHIgGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTFND17bQzfN1; Sun, 20 Aug 2023 12:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37KCVe4e044376; Sun, 20 Aug 2023 12:31:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37KCVeKW044373; Sun, 20 Aug 2023 12:31:40 GMT (envelope-from git) Date: Sun, 20 Aug 2023 12:31:40 GMT Message-Id: <202308201231.37KCVeKW044373@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: b1d3e2b77155 - main - rtld: unlock bind lock when calling into crt __pthread_distribute_static_tls method List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b1d3e2b771552af071bf0964233cc5a76ea25542 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b1d3e2b771552af071bf0964233cc5a76ea25542 commit b1d3e2b771552af071bf0964233cc5a76ea25542 Author: Konstantin Belousov AuthorDate: 2023-08-18 19:52:24 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-20 12:30:13 +0000 rtld: unlock bind lock when calling into crt __pthread_distribute_static_tls method The method might require resolving and binding symbols, which means recursing on the bind lock. It is safe to unlock the bind lock, since we operate on the private object list, and user attempting to unload an object from the list of not yet fully loaded objects caused self-inflicted race. It is similar to how we treat user' init/fini methods. Reported by: stevek Sponsored by: The FreeBSD Foundation MFC after: 1 week --- libexec/rtld-elf/rtld.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 886758a5a484..feef5dd0bb5d 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5897,8 +5897,10 @@ distribute_static_tls(Objlist *list, RtldLockState *lockstate) obj = elm->obj; if (obj->marker || !obj->tls_static || obj->static_tls_copied) continue; + lock_release(rtld_bind_lock, lockstate); distrib(obj->tlsoffset, obj->tlsinit, obj->tlsinitsize, obj->tlssize); + wlock_acquire(rtld_bind_lock, lockstate); obj->static_tls_copied = true; } } From nobody Sun Aug 20 19:22: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 4RTQV95DJvz4qbnX; Sun, 20 Aug 2023 19:22: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 4RTQV94c59z3Jf5; Sun, 20 Aug 2023 19:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692559345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8GH5YyFXBt9c9jT0tFvr4FvHoBsQBtsEVM1pdvtlRc=; b=UDdNtAo4z5P43PKGdhNHKxnk2yfhIKSw2ckTKFLMctIrQ3A83Z7RpYMsyDb3ge0ztHOrMb pR+A/eNDrs396vFPu+RY7ccNQ0uoGk6LUZK5z41OBUCaayBsRNXu+KZiL95tM1XTRMxmN1 w2i1XBZiLFTD840//P64VNeZOHhuDEm2L6ZuDmI6I+rnQy/tDpDNLEeLnUetChCuFJoJOj GyXw+MPxeK0tD7ocFiQ4A/wlDWS8el+7UF4fiPCom+SSTKxa13tcZT22QKinSw7gsavmew dXOYBlAyhMPkxRa7Wnf2KmZ0BAaMEAKEyGSrg+hux+k0DAO+sWkGjuYGhV7gEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692559345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8GH5YyFXBt9c9jT0tFvr4FvHoBsQBtsEVM1pdvtlRc=; b=YbVwjaQUPWsbNI0gYX+8pRjb0h9SfNzkYI4jVsqf7hJ3t5w7zsoNB8IR/0sx+ZxdA/3QBi QJM79oUyTPzbcL7bmjbidI8GOEWnfbNgZhA5QUNwgnALnv8dYZwFNh/l/IUYOk2inYWoI9 GcVqvHTB37fnkdCmQQGkyzAxs1lSC59DQBh2NlWV6I8FCcdJZQMsVn62HXvCWtIccl8b80 7v+FfF5NuztFVZQmeTOSn6xi/SyNqUhAE1wHNjz4gONMuRCCmnsdPna7hYk7h5zOFzCtiR Uu2GWJaNNO+BfsXtKEqEiQp6pB2iACjRTFS3YSoSdEO7CKnu6sg+HOuMh1X+8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692559345; a=rsa-sha256; cv=none; b=aBRpL1cGlrA0wpqRtDwmvKkbYYugr07Nh1AbISUxQ48fGqRPYtuVU3kJOtWbVZ+FFp0ytL qcNA0vrlboyqgXf3pBrLbY/3y8tzx7ylFIXkG7REKHzYdtLXmrXKXnczpy85fkR0OUE99Z uTkHKNXecP3aLilNTEqFmwdxa9p+JkToXO1PpV3Virx5d36/7McgWYiGN9424EzWoPuSVM ndRUrxjS87UwkNJ/nWMSoPumvte7TuS/V2iE7m7lb4CYhtT042ylOFAMAOLIgSO+o4KEWM aWzL+UuFt7uF0RsTfDBXgz+P2Qh4HizSW4+SqxBQru/8g3DOPRz6pevsFEQDZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTQV93fjWzrHr; Sun, 20 Aug 2023 19:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37KJMPpQ025554; Sun, 20 Aug 2023 19:22:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37KJMPG1025551; Sun, 20 Aug 2023 19:22:25 GMT (envelope-from git) Date: Sun, 20 Aug 2023 19:22:25 GMT Message-Id: <202308201922.37KJMPG1025551@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: 1b91d634a58c - main - ssh: fix OpenSSH 9.4 regression with multiplexed sessions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1b91d634a58c45d7b33dee044034260f747c80d9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1b91d634a58c45d7b33dee044034260f747c80d9 commit 1b91d634a58c45d7b33dee044034260f747c80d9 Author: Ed Maste AuthorDate: 2023-08-20 19:16:54 +0000 Commit: Ed Maste CommitDate: 2023-08-20 19:20:49 +0000 ssh: fix OpenSSH 9.4 regression with multiplexed sessions Upstream commit message: upstream: fix regression in OpenSSH 9.4 (mux.c r1.99) that caused multiplexed sessions to ignore SIGINT under some circumstances. Reported by / feedback naddy@, ok dtucker@ OpenBSD-Commit-ID: 4d5c6c894664f50149153fd4764f21f43e7d7e5a Fixes: 535af610a4fd ("ssh: Update to OpenSSH 9.4p1") Obtained from: OpenSSH 803e22eabd3b Sponsored by: The FreeBSD Foundation --- crypto/openssh/kex.c | 4 ++-- crypto/openssh/misc.c | 42 ++++++++++++++++++++++++++++++------------ crypto/openssh/misc.h | 5 +++-- crypto/openssh/mux.c | 6 ++++-- 4 files changed, 39 insertions(+), 18 deletions(-) diff --git a/crypto/openssh/kex.c b/crypto/openssh/kex.c index b4e2ab75f541..fd04bb0b5c10 100644 --- a/crypto/openssh/kex.c +++ b/crypto/openssh/kex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.178 2023/03/12 10:40:39 dtucker Exp $ */ +/* $OpenBSD: kex.c,v 1.179 2023/08/18 01:37:41 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -1334,7 +1334,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, for (;;) { if (timeout_ms > 0) { r = waitrfd(ssh_packet_get_connection_in(ssh), - &timeout_ms); + &timeout_ms, NULL); if (r == -1 && errno == ETIMEDOUT) { send_error(ssh, "Timed out waiting " "for SSH identification string."); diff --git a/crypto/openssh/misc.c b/crypto/openssh/misc.c index 4b87c4090804..956587035517 100644 --- a/crypto/openssh/misc.c +++ b/crypto/openssh/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.185 2023/08/04 06:32:40 dtucker Exp $ */ +/* $OpenBSD: misc.c,v 1.186 2023/08/18 01:37:41 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005-2020 Damien Miller. All rights reserved. @@ -313,20 +313,38 @@ set_sock_tos(int fd, int tos) * Returns 0 if fd ready or -1 on timeout or error (see errno). */ static int -waitfd(int fd, int *timeoutp, short events) +waitfd(int fd, int *timeoutp, short events, volatile sig_atomic_t *stop) { struct pollfd pfd; - struct timeval t_start; - int oerrno, r, have_timeout = (*timeoutp >= 0); + struct timespec timeout; + int oerrno, r; + sigset_t nsigset, osigset; + if (timeoutp && *timeoutp == -1) + timeoutp = NULL; pfd.fd = fd; pfd.events = events; - for (; !have_timeout || *timeoutp >= 0;) { - monotime_tv(&t_start); - r = poll(&pfd, 1, *timeoutp); + ptimeout_init(&timeout); + if (timeoutp != NULL) + ptimeout_deadline_ms(&timeout, *timeoutp); + if (stop != NULL) + sigfillset(&nsigset); + for (; timeoutp == NULL || *timeoutp >= 0;) { + if (stop != NULL) { + sigprocmask(SIG_BLOCK, &nsigset, &osigset); + if (*stop) { + sigprocmask(SIG_SETMASK, &osigset, NULL); + errno = EINTR; + return -1; + } + } + r = ppoll(&pfd, 1, ptimeout_get_tsp(&timeout), + stop != NULL ? &osigset : NULL); oerrno = errno; - if (have_timeout) - ms_subtract_diff(&t_start, timeoutp); + if (stop != NULL) + sigprocmask(SIG_SETMASK, &osigset, NULL); + if (timeoutp) + *timeoutp = ptimeout_get_ms(&timeout); errno = oerrno; if (r > 0) return 0; @@ -346,8 +364,8 @@ waitfd(int fd, int *timeoutp, short events) * Returns 0 if fd ready or -1 on timeout or error (see errno). */ int -waitrfd(int fd, int *timeoutp) { - return waitfd(fd, timeoutp, POLLIN); +waitrfd(int fd, int *timeoutp, volatile sig_atomic_t *stop) { + return waitfd(fd, timeoutp, POLLIN, stop); } /* @@ -381,7 +399,7 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr, break; } - if (waitfd(sockfd, timeoutp, POLLIN | POLLOUT) == -1) + if (waitfd(sockfd, timeoutp, POLLIN | POLLOUT, NULL) == -1) return -1; /* Completed or failed */ diff --git a/crypto/openssh/misc.h b/crypto/openssh/misc.h index fd77a7fd7273..f9bdc6eb51bd 100644 --- a/crypto/openssh/misc.h +++ b/crypto/openssh/misc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.103 2023/07/19 14:02:27 djm Exp $ */ +/* $OpenBSD: misc.h,v 1.104 2023/08/18 01:37:41 djm Exp $ */ /* * Author: Tatu Ylonen @@ -19,6 +19,7 @@ #include #include #include +#include /* Data structure for representing a forwarding request. */ struct Forward { @@ -57,7 +58,7 @@ char *get_rdomain(int); int set_rdomain(int, const char *); int get_sock_af(int); void set_sock_tos(int, int); -int waitrfd(int, int *); +int waitrfd(int, int *, volatile sig_atomic_t *); int timeout_connect(int, const struct sockaddr *, socklen_t, int *); int a2port(const char *); int a2tun(const char *, int *); diff --git a/crypto/openssh/mux.c b/crypto/openssh/mux.c index 3a0f87674b95..d9d5e7d994ca 100644 --- a/crypto/openssh/mux.c +++ b/crypto/openssh/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.99 2023/08/04 06:32:40 dtucker Exp $ */ +/* $OpenBSD: mux.c,v 1.100 2023/08/18 01:37:41 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller * @@ -1480,7 +1480,9 @@ mux_client_read(int fd, struct sshbuf *b, size_t need, int timeout_ms) case EWOULDBLOCK: #endif case EAGAIN: - if (waitrfd(fd, &timeout_ms) == -1) + if (waitrfd(fd, &timeout_ms, + &muxclient_terminate) == -1 && + errno != EINTR) return -1; /* timeout */ /* FALLTHROUGH */ case EINTR: From nobody Sun Aug 20 22:00: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 4RTV0k53Mbz4qmTZ; Sun, 20 Aug 2023 22:00: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 4RTV0k4MxCz4Prq; Sun, 20 Aug 2023 22:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692568838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ey1DmQa1DpPjkvziCplXlW2rj3Yugbmvr9PdagBu500=; b=nEjXUul8TqdRKUFBQak/YHDGBFB5rNDpUOyZ6qMOaAP7sBwg1WhZR3QQhaqT5JmX2YRMYN VCE4f0B4Xund17jgVNYZwttFgqqH9VAmUx/hj6k86MAjW/SiXANB9/GV91OPVVPhD9xEAz JX3LVgiADG0WXkgIGrvz4QMukSs9PE8HI6EWDWcyb3ACm4T2iOYXdHFf2HKe+nBCXPnDUV qt5oxnvifJeZ4rxnoES8MfHVnkbnuyQsRYykYa1oeSTlUjVBSXzD+a+2ahiiq9jqJ3Syiy Wir/GZ5tyQFv2dwPXa5mq7go9P691S4hDt/uDy0wS6uqH+yBaVfsMhRNKPlkQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692568838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ey1DmQa1DpPjkvziCplXlW2rj3Yugbmvr9PdagBu500=; b=i93sAm6POs1AYyDQtFXc7CgukGrL1TKshIEuxfDwluuoruLRBvGGsHn6X5eQS7fDuUapm6 lJiTMXfwL1EZA2UbOCj/o+9F+BT5VWjNPT1eZaQD1E80Yycm+Hc3aot57ArcSHGSM0fPH6 NIWv6FxzOMpYkWaqECeGYSB+DMNfuHXt5ocRZgByx4dz/gHAPi35L9lGKi6wJL5ekymTKS q+/G2NKYwHfg7rWFhOXpenurafgyT20CGj+HLo95vSzmzIx8o1sXaH6zJH81YbIQBAS/sE CAsHCQXOTBmDnyt21zIF36jl+ecmKBMlQwo3vYmRerJ88+LdA+70oFERN2O1CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692568838; a=rsa-sha256; cv=none; b=hK3drTdJUQhCC5qP8dRAVXCk6lFeXThh7C5+kzHzFfo1VHJ+mQ9tTFtitEsItDWF2cDKHD 1e9xH5fi+1BZmXuvNJKkIkZ4eMfZib1zabW7xX2frF1c084omX/96psdN53FLZvEk0ew3M hjlxDcrnCgpvMgpoZAtBQ/k8ldmXfrQbv+ZAARQHiUyBno3BBBbFgPqfXQm1St0dXmvePk ZUbw/rVrVovCglT//b6sq4wvtn2sQ2uN5QZ3+/YOok0FMUgvUtcbJKWU/u8HPoVYHw11yW zbzL8Es7ht2rEq23ZqwmizyIdVGD35M54Z+W/GGdgDoq87dQD2HH3XBcH1s+XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTV0k3QZFzvlJ; Sun, 20 Aug 2023 22:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37KM0cii085108; Sun, 20 Aug 2023 22:00:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37KM0cCp085105; Sun, 20 Aug 2023 22:00:38 GMT (envelope-from git) Date: Sun, 20 Aug 2023 22:00:38 GMT Message-Id: <202308202200.37KM0cCp085105@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Daniel Engberg Subject: git: ed3fb74e44b9 - main - share/mk/bsd.cpu.mk: Add AMD Zen 4 for x86 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed3fb74e44b9ef37837cebc5acfd7e68867206ca Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/src/commit/?id=ed3fb74e44b9ef37837cebc5acfd7e68867206ca commit ed3fb74e44b9ef37837cebc5acfd7e68867206ca Author: Daniel Engberg AuthorDate: 2023-08-20 21:54:19 +0000 Commit: Daniel Engberg CommitDate: 2023-08-20 21:54:29 +0000 share/mk/bsd.cpu.mk: Add AMD Zen 4 for x86 Main difference between older Zen variants is that this supports AVX-512 Reviewed by: imp (previous version), emaste Approved by: emaste Differential Revision: https://reviews.freebsd.org/D41331 --- share/mk/bsd.cpu.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 80fb2e1f3398..3fee105e901d 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -148,7 +148,9 @@ _CPUCFLAGS = -mcpu=${CPUTYPE} ########## i386 . if ${MACHINE_CPUARCH} == "i386" -. if ${CPUTYPE} == "znver3" || ${CPUTYPE} == "znver2" || \ +. if ${CPUTYPE} == "znver4" +MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 +. elif ${CPUTYPE} == "znver3" || ${CPUTYPE} == "znver2" || \ ${CPUTYPE} == "znver1" MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 . elif ${CPUTYPE} == "bdver4" @@ -229,7 +231,9 @@ MACHINE_CPU = mmx MACHINE_CPU += i486 ########## amd64 . elif ${MACHINE_CPUARCH} == "amd64" -. if ${CPUTYPE} == "znver3" || ${CPUTYPE} == "znver2" || \ +. if ${CPUTYPE} == "znver4" +MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse4a sse3 +. elif ${CPUTYPE} == "znver3" || ${CPUTYPE} == "znver2" || \ ${CPUTYPE} == "znver1" MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3 . elif ${CPUTYPE} == "bdver4" From nobody Sun Aug 20 22:44: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 4RTVzV54xRz4qqBd; Sun, 20 Aug 2023 22:44: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 4RTVzV48cBz4VVj; Sun, 20 Aug 2023 22:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692571478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VbXQtPwDGf5/Ma5IAD7zu++ViExNQKhyZeF/mp72+vU=; b=Q5/6uckKMV2xBCQQZRZYAQ25WIO1zIBNxpGryntFRsF8REHzw1+Woph1m4D3/mYQ1DrOh3 YO8NWgvLnbosFUbht245z7yF6yilxkeEGS1wemDXmyV9zS9O3uuKKPc3cP59DoBB5I3aH8 ykmVKdCZrQeRctLZFaNa10UbhWjiqSD3HY63sVgRfziQF/0lMoeNvw9h2tDLtr4li73Qm3 L5WKt2/WtjKgldeXSd8ZmGrF0tbRoNJ8TifS7fCIG32cIEtud/2mURrlAZkJhP1g4DD8PD JuBcvHjJHa0+X3xjm6l8ujwK3R3T5YkBZP4oyyFE1obvIitcp205N77QnaZbnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692571478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VbXQtPwDGf5/Ma5IAD7zu++ViExNQKhyZeF/mp72+vU=; b=pfO0Fbgff1HoTIeZfrAPyQr3yGTPdmlMrpxZClWiXIxCs92/eM6bT0fajzJd5R7LIzZHj0 Rzk5pzu7f/wUjc1LbN0UBKAYo3rEUkhbZA+p0J07ZZQdlmCyXr/DAlyQ0BpKf53NkI2bjM UWqJ3/z2d8Jt1oSNMQxCa5HNV+thYCbhTqzIjK8aJYWIjrZnUA1Qa+PO2/FT/IOiBNAQQ/ 6lmzIeGDXFam4VrCbInPc3NfDqYDXlt5dBGQrBE0NHxd6oZrjCSKpv1RBn+GzPl3d4gD9P EDHwBgbc6SFzX5q2CzgG8fwXx/dA3MahPiLIhHvhLDyR8gzkyrFNk3ZV9aFxYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692571478; a=rsa-sha256; cv=none; b=M+5+CCrK9ystECwUQV4XwAt9NTgKTCyL0d4BW1R/ULo4je2Ei+ch0ZOf6bFbIczejT1yso wtoxkWfIu5UK3ShYkWOQCyolZnQh5onDJB5toKi+YZYchzL1IthLDl/6nLmrI0vm7Kd8U9 wYqekXazRN7OVMBR9N01EVWO3voPd0t9tVPrj6FHSBhbbzU+qeJqmYkIaZup4V73P3CcKh kK4MzN5k04iPBNMyrH/r5YXSKWt9Ke4DK70DHCdbAZRkVeMxu6BTleW/PzuxjEc3l5JuIN qX7ICoiqTP2vRxlLS9TrzDNCv2lWvmzhSy/DH9CYRsilFlhBSysOUZkREARXtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTVzV3BD8zwgj; Sun, 20 Aug 2023 22:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37KMicxw056203; Sun, 20 Aug 2023 22:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37KMicfH056200; Sun, 20 Aug 2023 22:44:38 GMT (envelope-from git) Date: Sun, 20 Aug 2023 22:44:38 GMT Message-Id: <202308202244.37KMicfH056200@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: 0dc52b72108e - main - libc: export pthread_getname_np stub List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0dc52b72108e321a99022785713c58d278696af2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0dc52b72108e321a99022785713c58d278696af2 commit 0dc52b72108e321a99022785713c58d278696af2 Author: Minsoo Choo AuthorDate: 2023-08-14 22:21:24 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-20 22:44:17 +0000 libc: export pthread_getname_np stub pthread_getname_np needs to be provided by libc in order to import jemalloc 5.3.0. A stub implementation for libc pthread_getname_np() is added for _pthread_stubs.c, which always reports empty name for the main thread. Internal _pthread_getname_np() is not exported, but provided for libc own use. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41461 --- lib/libc/gen/Symbol.map | 1 + lib/libc/gen/_pthread_stubs.c | 13 +++++++++++++ lib/libc/include/libc_private.h | 1 + lib/libthr/thread/thr_info.c | 7 ++++--- lib/libthr/thread/thr_init.c | 1 + lib/libthr/thread/thr_private.h | 1 + 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 9dd7334728a4..bdd659197644 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -426,6 +426,7 @@ FBSD_1.6 { eventfd_write; getlogin_r; memalign; + pthread_getname_np; scandir_b; sigandset; sigisemptyset; diff --git a/lib/libc/gen/_pthread_stubs.c b/lib/libc/gen/_pthread_stubs.c index 6741c6a5ec51..25dfeb2cc270 100644 --- a/lib/libc/gen/_pthread_stubs.c +++ b/lib/libc/gen/_pthread_stubs.c @@ -58,6 +58,7 @@ static int stub_fail(void); static int stub_true(void); static void stub_exit(void); static int stub_esrch(void); +static int stub_getname_np(pthread_t, char *, size_t); #define PJT_DUAL_ENTRY(entry) \ (pthread_func_t)entry, (pthread_func_t)entry @@ -131,6 +132,7 @@ pthread_func_entry_t __thr_jtable[PJT_MAX] = { [PJT_MUTEXATTR_SETROBUST] = {PJT_DUAL_ENTRY(stub_zero)}, [PJT_GETTHREADID_NP] = {PJT_DUAL_ENTRY(stub_zero)}, [PJT_ATTR_GET_NP] = {PJT_DUAL_ENTRY(stub_esrch)}, + [PJT_GETNAME_NP] = {PJT_DUAL_ENTRY(stub_getname_np)}, }; /* @@ -289,6 +291,7 @@ STUB_FUNC3(__pthread_cleanup_push_imp, PJT_CLEANUP_PUSH_IMP, void, void *, STUB_FUNC1(_pthread_cancel_enter, PJT_CANCEL_ENTER, void, int) STUB_FUNC1(_pthread_cancel_leave, PJT_CANCEL_LEAVE, void, int) STUB_FUNC2(pthread_attr_get_np, PJT_ATTR_GET_NP, int, pthread_t, pthread_attr_t *) +STUB_FUNC3(pthread_getname_np, PJT_GETNAME_NP, int, pthread_t, char *, size_t) static int stub_zero(void) @@ -337,3 +340,13 @@ stub_esrch(void) { return (ESRCH); } + +static int +stub_getname_np(pthread_t thread, char *buf, size_t len) +{ + if (thread != &main_thread) + return (ESRCH); + if (len >= 1) + buf[0] = '\0'; + return (0); +} diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h index 5c740edf3fcc..a9ad2ef21b0b 100644 --- a/lib/libc/include/libc_private.h +++ b/lib/libc/include/libc_private.h @@ -184,6 +184,7 @@ typedef enum { PJT_MUTEXATTR_SETROBUST, PJT_GETTHREADID_NP, PJT_ATTR_GET_NP, + PJT_GETNAME_NP, PJT_MAX } pjt_index_t; diff --git a/lib/libthr/thread/thr_info.c b/lib/libthr/thread/thr_info.c index b5b84b733db6..41ab7f0bcf0c 100644 --- a/lib/libthr/thread/thr_info.c +++ b/lib/libthr/thread/thr_info.c @@ -114,9 +114,10 @@ thr_get_name_np(struct pthread *thread, char *buf, size_t len) buf[0] = '\0'; } -__weak_reference(_pthread_getname_np, pthread_getname_np); +__weak_reference(_thr_getname_np, pthread_getname_np); +__weak_reference(_thr_getname_np, _pthread_getname_np); int -_pthread_getname_np(pthread_t thread, char *buf, size_t len) +_thr_getname_np(pthread_t thread, char *buf, size_t len) { struct pthread *curthread; int res; @@ -147,5 +148,5 @@ __weak_reference(_pthread_get_name_np, pthread_get_name_np); void _pthread_get_name_np(pthread_t thread, char *buf, size_t len) { - (void)_pthread_getname_np(thread, buf, len); + (void)_thr_getname_np(thread, buf, len); } diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c index ef8c7d59d729..b59678c3f6c3 100644 --- a/lib/libthr/thread/thr_init.c +++ b/lib/libthr/thread/thr_init.c @@ -271,6 +271,7 @@ static pthread_func_t jmp_table[][2] = { [PJT_MUTEXATTR_SETROBUST] = {DUAL_ENTRY(_thr_mutexattr_setrobust)}, [PJT_GETTHREADID_NP] = {DUAL_ENTRY(_thr_getthreadid_np)}, [PJT_ATTR_GET_NP] = {DUAL_ENTRY(_thr_attr_get_np)}, + [PJT_GETNAME_NP] = {DUAL_ENTRY(_thr_getname_np)}, }; static int init_once = 0; diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index fba3b78e43c5..3475029f8996 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -1073,6 +1073,7 @@ int _thr_cond_wait(pthread_cond_t *, pthread_mutex_t *); int _thr_detach(pthread_t); int _thr_equal(pthread_t, pthread_t); void _Tthr_exit(void *); +int _thr_getname_np(pthread_t, char *, size_t); int _thr_key_create(pthread_key_t *, void (*)(void *)); int _thr_key_delete(pthread_key_t); int _thr_setspecific(pthread_key_t, const void *); From nobody Sun Aug 20 22:44: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 4RTVzW5Tlcz4qqC2; Sun, 20 Aug 2023 22:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RTVzW4tpdz4VNm; Sun, 20 Aug 2023 22:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692571479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPiAw3qeXZtwCh+NUAQrxeKVy7IEFzGumNwD6ixqCGk=; b=QM5SD/ELTZCdmC+yD30WYseHz0kOpHV+W5ZMnKikDiilxJedqS51nBMLFFECnRg0R73wj/ bGJgc/zQfI1l8RecG8VYMzb/1DX65CQxRGZVKcGlv0n7y8BTuRIueDdXppcZXIxGjTI62F YWb6PbqrWBYd9xDDv93qhfJhalf7EdqhWAn0CTIoOlxINjRSQ+B9kg+/V+CuW/Y4fKLIIR 1Bta8Jcbb3Zv4cfyhqhBTAsXItw8tjI8RFQzSgFzmo1B6UpQgvHrsbvkENr6+E29IwRK6h cNF3neJmdE+sii7pVZUp8eiQU6RChmonFopTdxtyFoZb7Zdn3FODYWwkCmxmVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692571479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPiAw3qeXZtwCh+NUAQrxeKVy7IEFzGumNwD6ixqCGk=; b=JwfPOAx4jfw6LX73sAlAh5jnBxQZFlB04dIVQ/7w5M08MkpNDxzy10mqE1MgyAkAiowDoB kr4q+TB5FJ83LkhCGOwjMDwqw1M1IhL007wVuEBGXkgI6+0q5F7b/iHfHFQU7uCmUdf9Po D3lnlRR0CCc7kw8vutVUQGcoIkq8Q2Nvr8qE7MEM7vyJUwKYOR6H03ZaAiiYdHGaeP3YSz Of/b4hinbQOx0MXEvkh4IepeYSNHm0XW7CAxyF7p7gbOIPXHerHjXEb7wrONtBdbL0BH8d 0MRFqEXStWdvjqdISzo+98ZLnpEVsTLFZ6P0QKrYRkvo0F8ynYbv4GhU+lS69w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692571479; a=rsa-sha256; cv=none; b=p03UvjW5ErTbB6vQj9YBn+hva4nNM1KmFesEKAwNcdnVi3/EYLhJufu5ZJY9ySd0TfWAny w99iAinkPRdwpcBM97ptZ6WW15JeuEPusNILxDG/PY1xrpNZnQYyLJpjR5gUcDESvAqe9I Fsi48VnxfNCTKPFamLLm/SFyfrU4LTJl/wIN+NZefN8Y/NfIRQXhlrkrJlJD19ZUqD63JO w/c+5rt1AV7ab1/AyQWyc17Unfqht1q3/jjoZxJlXqxtimHgPL/gOdu3li33RUd8X5pvpH pFzkzgsRgWA061oJJbJocAAMFEe5MYc/SJzxrCisaB8Veofulxcgme/0sfwcwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTVzW3hkRzww4; Sun, 20 Aug 2023 22:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37KMidrc056247; Sun, 20 Aug 2023 22:44:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37KMidWK056244; Sun, 20 Aug 2023 22:44:39 GMT (envelope-from git) Date: Sun, 20 Aug 2023 22:44:39 GMT Message-Id: <202308202244.37KMidWK056244@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: 89e17c6ea03f - main - libc/gen/_pthread_stubs.c: Remove stray whitespaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 89e17c6ea03f27dfe4734b024d807d12840db226 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=89e17c6ea03f27dfe4734b024d807d12840db226 commit 89e17c6ea03f27dfe4734b024d807d12840db226 Author: Konstantin Belousov AuthorDate: 2023-08-20 22:32:43 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-20 22:44:18 +0000 libc/gen/_pthread_stubs.c: Remove stray whitespaces Sponsored by: The FreeBSD Foundation MFC after: 1 week --- lib/libc/gen/_pthread_stubs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/_pthread_stubs.c b/lib/libc/gen/_pthread_stubs.c index 25dfeb2cc270..34e420ec11f5 100644 --- a/lib/libc/gen/_pthread_stubs.c +++ b/lib/libc/gen/_pthread_stubs.c @@ -51,7 +51,7 @@ struct pthread { static struct pthread main_thread; static int stub_main(void); -static void *stub_null(void); +static void *stub_null(void); static struct pthread *stub_self(void); static int stub_zero(void); static int stub_fail(void); @@ -242,7 +242,7 @@ STUB_FUNC2(pthread_mutexattr_getrobust, PJT_MUTEXATTR_GETROBUST, int, void *, int *) STUB_FUNC2(pthread_mutexattr_setrobust, PJT_MUTEXATTR_SETROBUST, int, void *, int) -STUB_FUNC2(pthread_once, PJT_ONCE, int, void *, void *) +STUB_FUNC2(pthread_once, PJT_ONCE, int, void *, void *) STUB_FUNC1(pthread_rwlock_destroy, PJT_RWLOCK_DESTROY, int, void *) STUB_FUNC2(pthread_rwlock_init, PJT_RWLOCK_INIT, int, void *, void *) STUB_FUNC1(pthread_rwlock_rdlock, PJT_RWLOCK_RDLOCK, int, void *) From nobody Mon Aug 21 00:11: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 4RTXvT5Q3zz4qvJD for ; Mon, 21 Aug 2023 00:11: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 4RTXvT4yVbz4cf5; Mon, 21 Aug 2023 00:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692576677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qNp1LeNj1+k7veqwnKOP2YJpFO7vdhF1/geAr/HdIuo=; b=YV27Io8YN9MLQV3vZNelE+2cUKK3w+r369DiBXgTOneWrHg4lg0DQsEleYs+33TmAN3ruK z9WOz3QEv1Wfn6yLNxovq+eZMKpyhFzZTHwjPRt6qT0Zes1dlacyydyGWMXFZe0TA4N9wG bKfqPMUiVRxaGL6ttW9QL+8F431T86A8EKpWjYFOV8V91DdE3cTTQzJz5uCq9p1YY1qOoY elUXB9Mn17fQQCyZ23ikKAfgawt9zB/1PH3ufliUiPVhFHsfB4li8ZdJM5PaYuMU65nw2d xViqUhpXQ7ikXI1OLNF5mh8LDeXbi9sCinsBpICMuN32+6QlhZvi1QyRpgiLvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692576677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qNp1LeNj1+k7veqwnKOP2YJpFO7vdhF1/geAr/HdIuo=; b=lm5XOTEdo9EXiL7J8M1Z99iP2Z3Klj35m7SBOJx0OoO4GxLsLzwcn69CQeXq+4stdgbybF p+WSfAKTYNbk4McN+UB95ityEwBomXsnS2XECBZKj3pJ6X3iX6m6yovjRZUUcTw89bzEqk srulFhcehgi1QAOAF3Ukc6jzdQpW4qHIrm3e4U6Q9yY2MqYLqIKnw3w/1PRWfGNE17wwEu U46QsJ4kXCUitwHXK8TSK9uHmjMd2cMTkgZ7GZww+N89jX4lH1r5EfCemmbqfsP4bAfV2h uOpTaD1bzndvHvCKy2fgeOaPQ1EdGdhiiorW1P3zN7g+v7wMZoEbdR9WUnhQEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692576677; a=rsa-sha256; cv=none; b=dHwwwwDSvequcQtPS0NTua2dN7kD7sqErfqnhx1+coQ433yZAz6MQLUDqdsnVn9TgOF9Wp NwEV8CnswMXk6uy0kvgkOnZU0DrZ1DmYm+nbJJVMplmN7RzguDRdlC9krtwAPDhhjtrHwV 0Aci6ZBI7OsmnKAK4VvJT3jxLlJZWhRmirHFrTL7CEZzRBGBsK1Jy99Yp5U/GQJEmpeayM 8CYcNSdt3anLC/XtPsu1k3ExH+yMkwCs2L0Qd7s9PNM6D140zrf3VWguSqJx/h1eUIaoyu MUwiy/vIMDgSkuMggI1u0fUtl9oHBbX0Hs89YEzykq8+Mv44TdMstG2kpnGopw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTXvT3l5yzyrL; Mon, 21 Aug 2023 00:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37L0BH5E000422; Mon, 21 Aug 2023 00:11:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37L0BHCc000421; Mon, 21 Aug 2023 00:11:17 GMT (envelope-from git) Date: Mon, 21 Aug 2023 00:11:17 GMT Message-Id: <202308210011.37L0BHCc000421@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Enji Cooper Subject: git: 08334c51dbb9..d0738729dab0 - vendor/kyua - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/vendor/kyua X-Git-Reftype: branch X-Git-Commit: d0738729dab0c60d6c695966157b3e9551be0861 X-Git-Oldrev: 08334c51dbb99d9ecd2bb86a2d94ed06da9e167a X-Git-Newrev: d0738729dab0c60d6c695966157b3e9551be0861 Auto-Submitted: auto-generated The branch vendor/kyua has been updated by ngie: URL: https://cgit.FreeBSD.org/src/log/?id=08334c51dbb9..d0738729dab0 d0738729dab0 Vendor import of freebsd/kyua@a0d44bb356e0c816 From nobody Mon Aug 21 00:36: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 4RTYSH1s3sz4qwjR; Mon, 21 Aug 2023 00:36: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 4RTYSH1Dr2z4f1T; Mon, 21 Aug 2023 00:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692578175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0QWCKH8SPoljj+96EuSKl7R/SZNfCKlBf7DSnUJ3sA=; b=sAgIE90jjDccP/BgEWndW7TfNXa5Ew47I1lSYcaXsL8JFceh1N10nhZaRWjdUZxo8Fcipi YhZdzYafVGHEc+S7ajGsiM48iva8yAGCrhXKZj5WayLlFRudc1bd+OQ0LsRQW6nKYjPiZM ARneWvtxfffEBGEhHgj4ltwBoKz76YyazJLk18Of2woPjWnGicol6aEPn3uAWsHj3+yksS /iFsL8tw3MNVFjcrFCDZiiB7Resp3BJaRJv/qv/vzl3DUj6XpWF6RG+wga5mde3uJzLhkN 9qoHZ3w8foNGWN9LAvdEExiCv9SriX61yYIp+Q4api5ErnHrC/iDBliuMOfaqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692578175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0QWCKH8SPoljj+96EuSKl7R/SZNfCKlBf7DSnUJ3sA=; b=uABsn5uPX8P6n+LAxDB6PAoX/FEOo6E68WqMxYnqXca1FF2ungx9i2kZiE2swGBgdqjWG1 JNopVv4Lva/biam6KaVebTmUyAxxYzh4+qPoGy7WbQWdTnmEnB4gIdPbARSohalBo5trvK HFQt5gbhtcsJubUzNJXLDKTkUdES4LNU2w2W3XG5TriR7qCUKveUrAPoLx7taUOoXArwKv Wagg4v6wcZRybMukKvaGFmtWJSgcqlAsgj1UsY0zzFCZ7R7fIBklWc86CA9tvnl46gIPtl jSJ6MGEG5D8ypltX85Li7f4J/BMJiUOc7u25gPFtLCxFtqQzdPe2MFdMCO6gEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692578175; a=rsa-sha256; cv=none; b=Njs+MqAIuEQXzeCiGsAKgF1yZbnanpgtGoiovH5aS2/bftOFBVyCsf1xcmwAxTBgXYMkQd AIG+s9qvIe/I3SwBWpcZAJML2Pj/EfftxmKdxJlerHBVaSyd69Lk3erOCc31BiEjwqtnAE xrpf4MotjXOoJuyKShNRF8cHcf1KHnjHrOjED5PnNpdnpEIjT/BEVGmAmx/ixLtWHwKH4j MQVWX1T0PkWX5lQ16L5NWwIP+ZcNisMBNK401S61j96ze64wNTMEQmiqFXbsHWvO5L9FFY n2HsLknxGjSld3iDEFTKmt8dPwUPDt9nvSYpFyEwv4PYSIbP13j+ueG31SoQ8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTYSH0JCRz10x5; Mon, 21 Aug 2023 00:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37L0aEg7038833; Mon, 21 Aug 2023 00:36:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37L0aEss038830; Mon, 21 Aug 2023 00:36:14 GMT (envelope-from git) Date: Mon, 21 Aug 2023 00:36:14 GMT Message-Id: <202308210036.37L0aEss038830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 9a92ce22df7c - stable/13 - pci: return 0 for pci_remap_intr_method MSI-X non-error case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9a92ce22df7c746331da63b169db14a817d9abad Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9a92ce22df7c746331da63b169db14a817d9abad commit 9a92ce22df7c746331da63b169db14a817d9abad Author: Ed Maste AuthorDate: 2023-08-14 20:35:34 +0000 Commit: Ed Maste CommitDate: 2023-08-21 00:35:45 +0000 pci: return 0 for pci_remap_intr_method MSI-X non-error case When remapping a MSI-X vector, we would always return ENOENT, even if successful. This didn't really matter, as the sole caller of BUS_REMAP_INTR also didn't check for errors. Return 0 if there's no error, so that we can start handling (or at least warning about) actual failures. Reviewed by: jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41449 (cherry picked from commit 43e545e8e016d22346a4fe278ea2570328b20cc1) --- sys/dev/pci/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 065b7080f206..15bb76377f40 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -2466,6 +2466,8 @@ pci_remap_intr_method(device_t bus, device_t dev, u_int irq) * through all the slots that use this IRQ and update them. */ if (cfg->msix.msix_alloc > 0) { + bool found = false; + for (i = 0; i < cfg->msix.msix_alloc; i++) { mv = &cfg->msix.msix_vectors[i]; if (mv->mv_irq == irq) { @@ -2485,9 +2487,10 @@ pci_remap_intr_method(device_t bus, device_t dev, u_int irq) pci_enable_msix(dev, j, addr, data); pci_unmask_msix(dev, j); } + found = true; } } - return (ENOENT); + return (found ? 0 : ENOENT); } return (ENOENT); From nobody Mon Aug 21 00:41: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 4RTYZ42qfBz4qwf0; Mon, 21 Aug 2023 00:41: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 4RTYZ42ZDXz4fyK; Mon, 21 Aug 2023 00:41:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692578476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cH7K9tS2XGOuB/3OdNaBgH98+Twlgp+v6XnbMHAlPb4=; b=OBRg1f9C52FOaeK+gE8j5nJFpfhbhM/MkWdJ3y9KKqccXRW1VWAzW6m3l4cDIyHkjVb4re bcvq0wcuJg2ZxYwSY0DXbLKG8QVfQmgI7G1NEQfUid4eabn3BRLrfvDt9SvREdwfT5hCaZ BOleSO/TszsSBPfPVYeCnestTMarMkesmmcub/OQFp1Qhji/YEyhtr1eOuQ3vj4c2X4Uta wn6OECPR9Z3HIE0b5u/10sCR2ZAJSAqwCdwKVfFJG+xfgeZtxQ+UIP5ocS3nqYtzmeDzh1 TRa1173pD7PX7gEfnX9vZgDpmlxGuytu5jpH9NFId50tfSUa/u6Q/slpolYNSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692578476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cH7K9tS2XGOuB/3OdNaBgH98+Twlgp+v6XnbMHAlPb4=; b=NY2Kav9UvH3MAlZ9/CXLfSdF+SNW2QjHLMxuCwI/1oupxbtCwYtvGo4N6XLpnjlpRIuk79 hCM0yqsS2d/2SZg6+Jjr+umjl4V6mlOTAQKgiI65uBZCpX9dGY4pkrxqgvBqFcFlka8riM T2hXAReD+rHvr0etOQXK2G0ptRkRtQhh/bcDO5VBs30DuL6HTu8Sm8iojVnJRgLIHK+5fo UNSOF+wNAoVX+/YcJQvxR4xRviW/vJL7g/kMwEWKgyuGHHgInLUKz/HK1FWczJWUVeufCn xmdSwatRs1/b47BJAiKV8SjhbNxJt62XbKGwist6/pxxeqcJBUBjZ3hRMBx0pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692578476; a=rsa-sha256; cv=none; b=i26gg+hvxYhr7SITr/hhfDi0inGnCT/COXuvP6siImAhsr1xuSfgeiwA99JHg/XzH8JBcw rRAnrl0bQb/kvCWdkp62bLopayVlOw+G9amEowHhdeUDBD+r0mClE9et2UXTPnK9Zm2nCY a+e1kMMl726UEZzU4z+IqTS1aMRs5DgFMKbgkBQ5tJEGKjOyTfbAhRrTNHKIM1OUg4JDiK DTAK9vyAj301lyy6WCj2W4EzswQuYlb/rEGnMDbKMZbeEH5HUbI4ygz0uCTQFc2btNhq+M McBMlZhu2KNcfkVGob5goSMXCqcdRJ7NwljtN4363mRkADrfsl2+Vsbp25gywA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTYZ41d9zz10Ww; Mon, 21 Aug 2023 00:41:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37L0fGUt048172; Mon, 21 Aug 2023 00:41:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37L0fGK5048169; Mon, 21 Aug 2023 00:41:16 GMT (envelope-from git) Date: Mon, 21 Aug 2023 00:41:16 GMT Message-Id: <202308210041.37L0fGK5048169@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: adff403fe7a8 - main - LinuxKPI: 802.11: update compat code for updated drivers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: adff403fe7a870c5b7a2d7e003d445c3b409bc0c Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=adff403fe7a870c5b7a2d7e003d445c3b409bc0c commit adff403fe7a870c5b7a2d7e003d445c3b409bc0c Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 22:07:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-21 00:39:57 +0000 LinuxKPI: 802.11: update compat code for updated drivers Adjust and add structs, fields, functions to make more modern versions of LinuxKPI based wireless drivers (based on wireless-testing ( wt-2023-06-09, wt-2023-07-24, and later)) compile. Some of these changes can only be applied once all drivers get updated to not break the old versions currently in the tree. Mark those changes with __FOR_LATER_DRV_UPDATE for now and flip the switch at a later point. Sponsored by: The FreeBSD Foundation MFC after: 20 days --- .../linuxkpi/common/include/linux/ieee80211.h | 60 ++++- sys/compat/linuxkpi/common/include/linux/nl80211.h | 38 ++- sys/compat/linuxkpi/common/include/net/cfg80211.h | 161 +++++++++++- sys/compat/linuxkpi/common/include/net/mac80211.h | 280 +++++++++++++++++++-- sys/compat/linuxkpi/common/src/linux_80211.c | 15 +- sys/compat/linuxkpi/dummy/include/net/gso.h | 0 6 files changed, 509 insertions(+), 45 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 4e37ee612921..4648a12ec889 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2021 The FreeBSD Foundation + * Copyright (c) 2020-2023 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -60,9 +60,10 @@ struct ieee80211_mmie_16 { #define IEEE80211_INVAL_HW_QUEUE ((uint8_t)-1) -#define IEEE80211_MAX_AMPDU_BUF_HT 0x40 #define IEEE80211_MAX_AMPDU_BUF 256 /* for HE? */ +#define IEEE80211_MAX_AMPDU_BUF_HT 64 #define IEEE80211_MAX_AMPDU_BUF_HE 256 +#define IEEE80211_MAX_AMPDU_BUF_EHT 1024 #define IEEE80211_MAX_FRAME_LEN 2352 #define IEEE80211_MAX_DATA_LEN (2300 + IEEE80211_CRC_LEN) @@ -140,8 +141,8 @@ enum ieee80211_min_mpdu_start_spacing { IEEE80211_HT_MPDU_DENSITY_NONE = 0, #if 0 IEEE80211_HT_MPDU_DENSITY_XXX = 1, /* 1/4 us */ - IEEE80211_HT_MPDU_DENSITY_YYY = 2, /* 1/2 us */ #endif + IEEE80211_HT_MPDU_DENSITY_0_5 = 2, /* 1/2 us */ IEEE80211_HT_MPDU_DENSITY_1 = 3, /* 1 us */ IEEE80211_HT_MPDU_DENSITY_2 = 4, /* 2 us */ IEEE80211_HT_MPDU_DENSITY_4 = 5, /* 4us */ @@ -159,6 +160,7 @@ enum ieee80211_min_mpdu_start_spacing { #define IEEE80211_FCTL_FROMDS (IEEE80211_FC1_DIR_FROMDS << 8) #define IEEE80211_FCTL_TODS (IEEE80211_FC1_DIR_TODS << 8) #define IEEE80211_FCTL_MOREFRAGS (IEEE80211_FC1_MORE_FRAG << 8) +#define IEEE80211_FCTL_PM (IEEE80211_FC1_PWR_MGT << 8) #define IEEE80211_FTYPE_MGMT IEEE80211_FC0_TYPE_MGT #define IEEE80211_FTYPE_CTL IEEE80211_FC0_TYPE_CTL @@ -170,8 +172,12 @@ enum ieee80211_min_mpdu_start_spacing { #define IEEE80211_STYPE_DISASSOC IEEE80211_FC0_SUBTYPE_DISASSOC #define IEEE80211_STYPE_AUTH IEEE80211_FC0_SUBTYPE_AUTH #define IEEE80211_STYPE_DEAUTH IEEE80211_FC0_SUBTYPE_DEAUTH +#define IEEE80211_STYPE_CTS IEEE80211_FC0_SUBTYPE_CTS +#define IEEE80211_STYPE_RTS IEEE80211_FC0_SUBTYPE_RTS #define IEEE80211_STYPE_ACTION IEEE80211_FC0_SUBTYPE_ACTION #define IEEE80211_STYPE_QOS_DATA IEEE80211_FC0_SUBTYPE_QOS_DATA +#define IEEE80211_STYPE_QOS_NULLFUNC IEEE80211_FC0_SUBTYPE_QOS_NULL +#define IEEE80211_STYPE_QOS_CFACK 0xd0 /* XXX-BZ reserved? */ #define IEEE80211_NUM_ACS 4 /* net8021::WME_NUM_AC */ @@ -211,15 +217,19 @@ enum ieee80211_tdls_action_code { /* 11-255 reserved */ }; -/* 9.4.2.27, Table 9-135. Extended Capabilities field. */ +/* 802.11-2020 9.4.2.26, Table 9-153. Extended Capabilities field. */ /* This is split up into octets CAPA1 = octet 1, ... */ #define WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING BIT(2 % 8) #define WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT BIT(22 % 8) +#define WLAN_EXT_CAPA3_TIMING_MEASUREMENT_SUPPORT BIT(23 % 8) #define WLAN_EXT_CAPA8_OPMODE_NOTIF BIT(62 % 8) +#define WLAN_EXT_CAPA8_MAX_MSDU_IN_AMSDU_LSB BIT(63 % 8) +#define WLAN_EXT_CAPA9_MAX_MSDU_IN_AMSDU_MSB BIT(64 % 8) +#define WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT BIT(77 % 8) +#define WLAN_EXT_CAPA10_TWT_RESPONDER_SUPPORT BIT(78 % 8) +#define WLAN_EXT_CAPA10_OBSS_NARROW_BW_RU_TOLERANCE_SUPPORT BIT(79 % 8) -#define WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT BIT(5) /* XXX */ -#define WLAN_EXT_CAPA10_OBSS_NARROW_BW_RU_TOLERANCE_SUPPORT BIT(7) /* XXX */ -#define WLAN_EXT_CAPA10_TWT_RESPONDER_SUPPORT BIT(6) /* XXX */ +#define WLAN_EXT_CAPA11_EMA_SUPPORT 0x00 /* XXX TODO FIXME */ /* iwlwifi/mvm/utils:: for (ac = IEEE80211_AC_VO; ac <= IEEE80211_AC_VI; ac++) */ @@ -262,6 +272,8 @@ enum ieee80211_ac_numbers { #define IEEE80211_HT_MCS_RX_HIGHEST_MASK 0x3ff #define IEEE80211_HT_MCS_MASK_LEN 10 +#define IEEE80211_MLD_MAX_NUM_LINKS 15 + struct ieee80211_mcs_info { uint8_t rx_mask[IEEE80211_HT_MCS_MASK_LEN]; uint16_t rx_highest; @@ -384,12 +396,20 @@ enum ieee80211_tx_info_flags { IEEE80211_TX_CTL_HW_80211_ENCAP = BIT(16), IEEE80211_TX_CTL_USE_MINRATE = BIT(17), IEEE80211_TX_CTL_RATE_CTRL_PROBE = BIT(18), + IEEE80211_TX_CTL_LDPC = BIT(19), + IEEE80211_TX_CTL_STBC = BIT(20), +}; + +enum ieee80211_tx_status_flags { + IEEE80211_TX_STATUS_ACK_SIGNAL_VALID = BIT(0), }; enum ieee80211_tx_control_flags { /* XXX TODO .. right shift numbers */ IEEE80211_TX_CTRL_PORT_CTRL_PROTO = BIT(0), IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1), + IEEE80211_TX_CTRL_RATE_INJECT = BIT(2), + IEEE80211_TX_CTRL_MLO_LINK = 0xF0000000, /* This is IEEE80211_LINK_UNSPECIFIED on the high bits. */ }; enum ieee80211_tx_rate_flags { @@ -404,6 +424,8 @@ enum ieee80211_tx_rate_flags { IEEE80211_TX_RC_USE_SHORT_PREAMBLE = BIT(7), }; +#define IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED -128 + #define IEEE80211_HT_CTL_LEN 4 struct ieee80211_hdr { /* net80211::ieee80211_frame_addr4 */ @@ -511,11 +533,28 @@ struct ieee80211_mgmt { /* Optional follows... */ uint8_t variable[0]; } addba_req; + /* XXX */ + struct { + uint8_t dialog_token; + } wnm_timing_msr; } u; } action; } u; }; +struct ieee80211_cts { /* net80211::ieee80211_frame_cts */ + __le16 frame_control; + __le16 duration; + uint8_t ra[ETH_ALEN]; +} __packed; + +struct ieee80211_rts { /* net80211::ieee80211_frame_rts */ + __le16 frame_control; + __le16 duration; + uint8_t ra[ETH_ALEN]; + uint8_t ta[ETH_ALEN]; +} __packed; + #define MHZ_TO_KHZ(_f) ((_f) * 1000) #define DBI_TO_MBI(_g) ((_g) * 100) #define MBI_TO_DBI(_x) ((_x) / 100) @@ -546,6 +585,7 @@ enum ieee80211_eid { WLAN_EID_HT_CAPABILITY = 45, /* IEEE80211_ELEMID_HTCAP */ WLAN_EID_RSN = 48, /* IEEE80211_ELEMID_RSN */ WLAN_EID_EXT_SUPP_RATES = 50, + WLAN_EID_EXT_NON_INHERITANCE = 56, WLAN_EID_EXT_CHANSWITCH_ANN = 60, WLAN_EID_MULTIPLE_BSSID = 71, /* IEEE80211_ELEMID_MULTIBSSID */ WLAN_EID_MULTI_BSSID_IDX = 85, @@ -650,6 +690,12 @@ struct ieee80211_bssid_index { int bssid_index; }; +enum ieee80211_reg_ap_power { + IEEE80211_REG_LPI_AP, + IEEE80211_REG_SP_AP, + IEEE80211_REG_VLP_AP, +}; + /* net80211: IEEE80211_IS_CTL() */ static __inline bool ieee80211_is_ctl(__le16 fc) diff --git a/sys/compat/linuxkpi/common/include/linux/nl80211.h b/sys/compat/linuxkpi/common/include/linux/nl80211.h index 93b40361202d..5b43ff675e19 100644 --- a/sys/compat/linuxkpi/common/include/linux/nl80211.h +++ b/sys/compat/linuxkpi/common/include/linux/nl80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2021 The FreeBSD Foundation + * Copyright (c) 2020-2023 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -78,6 +78,8 @@ enum nl80211_reg_rule_flags { NL80211_RRF_NO_160MHZ = BIT(8), NL80211_RRF_NO_HE = BIT(9), NL80211_RRF_NO_OFDM = BIT(10), + NL80211_RRF_NO_320MHZ = BIT(11), + NL80211_RRF_NO_EHT = BIT(12), }; #define NL80211_RRF_NO_HT40 (NL80211_RRF_NO_HT40MINUS|NL80211_RRF_NO_HT40PLUS) @@ -143,6 +145,7 @@ enum nl80211_chan_width { NL80211_CHAN_WIDTH_160, NL80211_CHAN_WIDTH_5, NL80211_CHAN_WIDTH_10, + NL80211_CHAN_WIDTH_320, }; enum nl80211_iftype { @@ -159,6 +162,7 @@ enum nl80211_iftype { NL80211_IFTYPE_MESH_POINT, NL80211_IFTYPE_WDS, NL80211_IFTYPE_OCB, + NL80211_IFTYPE_NAN, /* Keep this last. */ NUM_NL80211_IFTYPES @@ -223,6 +227,9 @@ enum nl80211_ext_feature { NL80211_EXT_FEATURE_FILS_DISCOVERY, NL80211_EXT_FEATURE_RADAR_BACKGROUND, NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP, + NL80211_EXT_FEATURE_BEACON_PROTECTION, + NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT, + NL80211_EXT_FEATURE_PUNCT, /* Keep this last. */ NUM_NL80211_EXT_FEATURES @@ -247,10 +254,13 @@ enum nl80211_sta_info { NL80211_STA_INFO_TX_PACKETS, NL80211_STA_INFO_TX_BYTES, NL80211_STA_INFO_TX_BYTES64, + NL80211_STA_INFO_RX_BYTES64, NL80211_STA_INFO_TX_FAILED, NL80211_STA_INFO_TX_RETRIES, NL80211_STA_INFO_RX_DURATION, NL80211_STA_INFO_TX_DURATION, + NL80211_STA_INFO_ACK_SIGNAL, + NL80211_STA_INFO_ACK_SIGNAL_AVG, }; enum nl80211_ftm_stats { @@ -326,6 +336,31 @@ enum nl80211_he_ltf { NL80211_RATE_INFO_HE_4XLTF, }; +enum nl80211_eht_gi { + NL80211_RATE_INFO_EHT_GI_0_8, + NL80211_RATE_INFO_EHT_GI_1_6, + NL80211_RATE_INFO_EHT_GI_3_2, +}; + +enum nl80211_eht_ru_alloc { + NL80211_RATE_INFO_EHT_RU_ALLOC_26, + NL80211_RATE_INFO_EHT_RU_ALLOC_52, + NL80211_RATE_INFO_EHT_RU_ALLOC_52P26, + NL80211_RATE_INFO_EHT_RU_ALLOC_106, + NL80211_RATE_INFO_EHT_RU_ALLOC_106P26, + NL80211_RATE_INFO_EHT_RU_ALLOC_242, + NL80211_RATE_INFO_EHT_RU_ALLOC_484, + NL80211_RATE_INFO_EHT_RU_ALLOC_484P242, + NL80211_RATE_INFO_EHT_RU_ALLOC_996, + NL80211_RATE_INFO_EHT_RU_ALLOC_996P484, + NL80211_RATE_INFO_EHT_RU_ALLOC_996P484P242, + NL80211_RATE_INFO_EHT_RU_ALLOC_2x996, + NL80211_RATE_INFO_EHT_RU_ALLOC_2x996P484, + NL80211_RATE_INFO_EHT_RU_ALLOC_3x996, + NL80211_RATE_INFO_EHT_RU_ALLOC_3x996P484, + NL80211_RATE_INFO_EHT_RU_ALLOC_4x996, +}; + enum nl80211_dfs_regions { NL80211_DFS_UNSET, NL80211_DFS_FCC, @@ -352,6 +387,7 @@ enum nl80211_tid_cfg_attr { NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL, NL80211_TID_CONFIG_ATTR_RETRY_LONG, NL80211_TID_CONFIG_ATTR_AMPDU_CTRL, + NL80211_TID_CONFIG_ATTR_AMSDU_CTRL, }; enum nl80211_tid_config { diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 43d4cd662c97..56ca9a231d2d 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -70,10 +70,11 @@ enum rfkill_hard_block_reasons { #define IEEE80211_MAX_CHAINS 4 /* net80211: IEEE80211_MAX_CHAINS copied */ enum cfg80211_rate_info_flags { - RATE_INFO_FLAGS_SHORT_GI = BIT(0), - RATE_INFO_FLAGS_MCS = BIT(1), - RATE_INFO_FLAGS_VHT_MCS = BIT(2), - RATE_INFO_FLAGS_HE_MCS = BIT(3), + RATE_INFO_FLAGS_MCS = BIT(0), + RATE_INFO_FLAGS_VHT_MCS = BIT(1), + RATE_INFO_FLAGS_SHORT_GI = BIT(2), + RATE_INFO_FLAGS_HE_MCS = BIT(4), + RATE_INFO_FLAGS_EHT_MCS = BIT(7), /* Max 8 bits as used in struct rate_info. */ }; @@ -149,6 +150,8 @@ enum rate_info_bw { RATE_INFO_BW_80, RATE_INFO_BW_160, RATE_INFO_BW_HE_RU, + RATE_INFO_BW_320, + RATE_INFO_BW_EHT_RU, }; struct rate_info { @@ -160,6 +163,7 @@ struct rate_info { uint8_t he_dcm; uint8_t he_gi; uint8_t he_ru_alloc; + uint8_t eht_gi; }; struct ieee80211_rate { @@ -224,6 +228,7 @@ struct ieee80211_sta_ht_cap { #define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK \ (7 << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT) /* IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK */ +#define IEEE80211_VHT_CAP_EXT_NSS_BW_MASK 0xc0000000 struct ieee80211_sta_vht_cap { /* TODO FIXME */ @@ -362,7 +367,7 @@ struct cfg80211_ssid { struct cfg80211_scan_6ghz_params { /* XXX TODO */ uint8_t *bssid; - int channel_idx, psc_no_listen, short_ssid, short_ssid_valid, unsolicited_probe; + int channel_idx, psc_no_listen, short_ssid, short_ssid_valid, unsolicited_probe, psd_20; }; struct cfg80211_match_set { @@ -529,6 +534,7 @@ struct station_info { int generation, inactive_time, rx_bytes, rx_dropped_misc, rx_packets, signal, tx_bytes, tx_packets; int filled, rx_beacon, rx_beacon_signal_avg, signal_avg; int rx_duration, tx_duration, tx_failed, tx_retries; + int ack_signal, avg_ack_signal; int chains; uint8_t chain_signal[IEEE80211_MAX_CHAINS]; @@ -656,6 +662,7 @@ struct linuxkpi_ieee80211_regdomain { #define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_2G 0x10 #define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G 0x20 #define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK 0x40 +#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL 0xff #define IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A 0x1 #define IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD 0x2 @@ -753,12 +760,95 @@ struct linuxkpi_ieee80211_regdomain { #define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED 0x1 #define IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET 0x2 +#define IEEE80211_HE_OPERATION_ER_SU_DISABLE 0x4 #define IEEE80211_HE_SPR_HESIGA_SR_VAL15_ALLOWED 0x01 #define IEEE80211_HE_SPR_NON_SRG_OBSS_PD_SR_DISALLOWED 0x02 #define IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT 0x04 #define IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT 0x08 +#define IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS 0x01 +#define IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_11454 0x02 +#define IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK 0x03 +#define IEEE80211_EHT_MAC_CAP0_OM_CONTROL 0x04 +#define IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE1 0x05 +#define IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE2 0x06 +#define IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_7991 0x07 + +#define IEEE80211_EHT_MAC_CAP1_MAX_AMPDU_LEN_MASK 0x01 + +#define IEEE80211_EHT_MCS_NSS_RX 0x01 +#define IEEE80211_EHT_MCS_NSS_TX 0x02 + +#define IEEE80211_EHT_PHY_CAP0_242_TONE_RU_GT20MHZ 0x01 +#define IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ 0x02 +#define IEEE80211_EHT_PHY_CAP0_BEAMFORMEE_SS_80MHZ_MASK 0x03 +#define IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI 0x04 +#define IEEE80211_EHT_PHY_CAP0_PARTIAL_BW_UL_MU_MIMO 0x05 +#define IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE 0x06 +#define IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER 0x07 + +#define IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_160MHZ_MASK 0x01 +#define IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_320MHZ_MASK 0x02 +#define IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_80MHZ_MASK 0x03 + +#define IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_80MHZ_MASK 0x01 +#define IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_160MHZ_MASK 0x02 +#define IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK 0x03 + +#define IEEE80211_EHT_PHY_CAP3_CODEBOOK_4_2_SU_FDBK 0x01 +#define IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK 0x02 +#define IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK 0x03 +#define IEEE80211_EHT_PHY_CAP3_NG_16_SU_FEEDBACK 0x04 +#define IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK 0x05 +#define IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK 0x06 +#define IEEE80211_EHT_PHY_CAP3_TRIG_SU_BF_FDBK 0x07 +#define IEEE80211_EHT_PHY_CAP3_SOUNDING_DIM_320MHZ_MASK 0x08 + +#define IEEE80211_EHT_PHY_CAP4_EHT_MU_PPDU_4_EHT_LTF_08_GI 0x01 +#define IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO 0x02 +#define IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP 0x03 +#define IEEE80211_EHT_PHY_CAP4_MAX_NC_MASK 0x04 + +#define IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_0US 0x01 +#define IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US 0x02 +#define IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_20US 0x03 +#define IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_8US 0x04 +#define IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK 0x05 +#define IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK 0x06 +#define IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT 0x07 +#define IEEE80211_EHT_PHY_CAP5_RX_LESS_242_TONE_RU_SUPP 0x08 +#define IEEE80211_EHT_PHY_CAP5_TX_LESS_242_TONE_RU_SUPP 0x09 +#define IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK 0x0a +#define IEEE80211_EHT_PHY_CAP5_SUPP_EXTRA_EHT_LTF 0x0b + +#define IEEE80211_EHT_PHY_CAP6_EHT_DUP_6GHZ_SUPP 0x01 +#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK 0x02 +#define IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK 0x03 + +#define IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ 0x01 +#define IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ 0x02 +#define IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ 0x03 +#define IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ 0x04 +#define IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ 0x05 +#define IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ 0x06 + +#define IEEE80211_EHT_PHY_CAP8_RX_1024QAM_WIDER_BW_DL_OFDMA 0x01 +#define IEEE80211_EHT_PHY_CAP8_RX_4096QAM_WIDER_BW_DL_OFDMA 0x02 + +#define IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE 0x01 +#define IEEE80211_EHT_PPE_THRES_NSS_MASK 0x02 +#define IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK 0x03 +#define IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE 0x04 + +#define IEEE80211_EML_CAP_EMLSR_SUPP 0x01 +#define IEEE80211_EML_CAP_TRANSITION_TIMEOUT 0x02 +#define IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128TU 0x04 +#define IEEE80211_EML_CAP_EMLSR_PADDING_DELAY 0x08 +#define IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_32US 0x10 +#define IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY 0x20 +#define IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_64US 0x40 + #define VENDOR_CMD_RAW_DATA (void *)(uintptr_t)(-ENOENT) struct ieee80211_he_cap_elem { @@ -804,11 +894,51 @@ struct ieee80211_sta_he_6ghz_capa { int capa; }; +struct ieee80211_eht_mcs_nss_supp_20mhz_only { + uint8_t rx_tx_mcs7_max_nss; + uint8_t rx_tx_mcs9_max_nss; + uint8_t rx_tx_mcs11_max_nss; + uint8_t rx_tx_mcs13_max_nss; +}; + +struct ieee80211_eht_mcs_nss_supp_bw { + uint8_t rx_tx_mcs9_max_nss; + uint8_t rx_tx_mcs11_max_nss; + uint8_t rx_tx_mcs13_max_nss; +}; + +struct ieee80211_eht_cap_elem_fixed { + uint8_t mac_cap_info[2]; + uint8_t phy_cap_info[9]; +}; + +struct ieee80211_eht_mcs_nss_supp { + /* TODO FIXME */ + /* Can only have either or... */ + union { + struct ieee80211_eht_mcs_nss_supp_20mhz_only only_20mhz; + struct { + struct ieee80211_eht_mcs_nss_supp_bw _80; + struct ieee80211_eht_mcs_nss_supp_bw _160; + struct ieee80211_eht_mcs_nss_supp_bw _320; + } bw; + }; +}; + +#define IEEE80211_STA_EHT_PPE_THRES_MAX 32 +struct ieee80211_sta_eht_cap { + bool has_eht; + struct ieee80211_eht_cap_elem_fixed eht_cap_elem; + struct ieee80211_eht_mcs_nss_supp eht_mcs_nss_supp; + uint8_t eht_ppe_thres[IEEE80211_STA_EHT_PPE_THRES_MAX]; +}; + struct ieee80211_sband_iftype_data { /* TODO FIXME */ enum nl80211_iftype types_mask; struct ieee80211_sta_he_cap he_cap; struct ieee80211_sta_he_6ghz_capa he_6ghz_capa; + struct ieee80211_sta_eht_cap eht_cap; struct { const uint8_t *data; size_t len; @@ -900,7 +1030,7 @@ struct cfg80211_gtk_rekey_data { struct cfg80211_tid_cfg { /* XXX TODO */ - int mask, noack, retry_long, rtscts, tids; + int mask, noack, retry_long, rtscts, tids, amsdu, ampdu; enum nl80211_tx_rate_setting txrate_type; struct cfg80211_bitrate_mask txrate_mask; }; @@ -938,6 +1068,11 @@ struct regulatory_request { int user_reg_hint_type; }; +struct cfg80211_set_hw_timestamp { + const uint8_t *macaddr; + bool enable; +}; + enum wiphy_vendor_cmd_need_flags { WIPHY_VENDOR_CMD_NEED_NETDEV = 0x01, WIPHY_VENDOR_CMD_NEED_RUNNING = 0x02, @@ -960,6 +1095,7 @@ struct wiphy_iftype_ext_capab { const uint8_t *extended_capabilities; const uint8_t *extended_capabilities_mask; uint8_t extended_capabilities_len; + uint16_t eml_capabilities; }; @@ -996,6 +1132,7 @@ enum wiphy_flags { WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD = BIT(13), WIPHY_FLAG_4ADDR_AP = BIT(14), WIPHY_FLAG_4ADDR_STATION = BIT(15), + WIPHY_FLAG_SUPPORTS_MLO = BIT(16), }; struct wiphy { @@ -1037,6 +1174,8 @@ struct wiphy { int max_data_retry_count; int tx_queue_len, rfkill; int mbssid_max_interfaces; + int hw_timestamp_max_peers; + int ema_max_profile_periodicity; unsigned long ext_features[BITS_TO_LONGS(NUM_NL80211_EXT_FEATURES)]; struct dentry *debugfsdir; @@ -1816,7 +1955,7 @@ cfg80211_background_radar_event(struct wiphy *wiphy, } static __inline const u8 * -cfg80211_find_ext_ie(uint8_t eid, uint8_t *p, size_t len) +cfg80211_find_ext_ie(uint8_t eid, const uint8_t *p, size_t len) { TODO(); return (NULL); @@ -1829,6 +1968,14 @@ cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) return (false); } +static __inline const struct ieee80211_sta_eht_cap * +ieee80211_get_eht_iftype_cap(const struct ieee80211_supported_band *band, + enum nl80211_iftype iftype) +{ + TODO(); + return (NULL); +} + #define wiphy_info(wiphy, fmt, ...) \ printf("%s:%d XXX TODO " fmt, __func__, __LINE__, __VA_ARGS__) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 5597300e18c9..cacf9d652fd0 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -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 @@ -50,6 +50,8 @@ #define WLAN_OUI_TYPE_WFA_P2P (9) #define WLAN_OUI_WFA (0x506F9A) +#define IEEE80211_LINK_UNSPECIFIED 0x0f + /* hw->conf.flags */ enum ieee80211_hw_conf_flags { IEEE80211_CONF_IDLE = BIT(0), @@ -114,6 +116,7 @@ enum ieee80211_bss_changed { BSS_CHANGED_HE_OBSS_PD = BIT(27), BSS_CHANGED_TWT = BIT(28), BSS_CHANGED_UNSOL_BCAST_PROBE_RESP = BIT(30), + BSS_CHANGED_EHT_PUNCTURING = BIT(31), }; /* 802.11 Figure 9-256 Suite selector format. [OUI(3), SUITE TYPE(1)] */ @@ -224,6 +227,15 @@ struct ieee80211_chanctx_conf { struct ieee80211_rate_status { struct rate_info rate_idx; + uint8_t try_count; +}; + +struct ieee80211_ema_beacons { + uint8_t cnt; + struct { + struct sk_buff *skb; + struct ieee80211_mutable_offsets offs; + } bcn[0]; }; #define WLAN_MEMBERSHIP_LEN (8) @@ -231,7 +243,11 @@ struct ieee80211_rate_status { struct ieee80211_bss_conf { /* TODO FIXME */ + struct ieee80211_vif *vif; const uint8_t *bssid; + uint8_t addr[ETH_ALEN]; + uint8_t link_id; + uint8_t _pad0; uint8_t transmitter_bssid[ETH_ALEN]; struct ieee80211_ftm_responder_params *ftmr_params; struct ieee80211_p2p_noa_attr p2p_noa_attr; @@ -248,11 +264,28 @@ struct ieee80211_bss_conf { } he_oper; struct cfg80211_he_bss_color he_bss_color; struct ieee80211_he_obss_pd he_obss_pd; + + bool ht_ldpc; + bool vht_ldpc; + bool he_ldpc; + bool vht_mu_beamformee; + bool vht_mu_beamformer; + bool vht_su_beamformee; + bool vht_su_beamformer; + bool he_mu_beamformer; + bool he_su_beamformee; + bool he_su_beamformer; + bool he_full_ul_mumimo; + bool eht_su_beamformee; + bool eht_su_beamformer; + bool eht_mu_beamformer; + size_t ssid_len; uint8_t ssid[IEEE80211_NWID_LEN]; uint16_t aid; uint16_t ht_operation_mode; int arp_addr_cnt; + uint16_t eht_puncturing; uint8_t dtim_period; uint8_t sync_dtim_count; @@ -265,16 +298,20 @@ struct ieee80211_bss_conf { bool use_short_preamble; bool use_short_slot; bool he_support; + bool eht_support; bool csa_active; + bool mu_mimo_owner; uint32_t sync_device_ts; uint64_t sync_tsf; uint16_t beacon_int; int16_t txpower; uint32_t basic_rates; int mcast_rate[NUM_NL80211_BANDS]; + enum ieee80211_reg_ap_power power_type; struct cfg80211_bitrate_mask beacon_tx_rate; struct mac80211_fils_discovery fils_discovery; struct ieee80211_chanctx_conf *chanctx_conf; + struct ieee80211_vif *mbssid_tx_vif; int ack_enabled, bssid_index, bssid_indicator, cqm_rssi_hyst, cqm_rssi_thold, ema_ap, frame_time_rts_th, ftm_responder; int htc_trig_based_pkt_ext; @@ -410,6 +447,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_SUPPORTS_RX_DECAP_OFFLOAD, IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD, IEEE80211_HW_SUPPORTS_RC_TABLE, + IEEE80211_HW_DETECTS_COLOR_COLLISION, /* Keep last. */ NUM_IEEE80211_HW_FLAGS @@ -477,6 +515,7 @@ struct ieee80211_key_conf { uint16_t flags; uint8_t keylen; uint8_t key[0]; + int8_t link_id; /* signed! */ }; struct ieee80211_key_seq { @@ -529,31 +568,47 @@ enum ieee80211_rx_status_flags { RX_FLAG_ONLY_MONITOR = BIT(25), RX_FLAG_SKIP_MONITOR = BIT(26), RX_FLAG_8023 = BIT(27), + RX_FLAG_RADIOTAP_TLV_AT_END = BIT(28), }; enum mac80211_rx_encoding { RX_ENC_LEGACY = 0, RX_ENC_HT, RX_ENC_VHT, - RX_ENC_HE + RX_ENC_HE, + RX_ENC_EHT, }; struct ieee80211_rx_status { /* TODO FIXME, this is too large. Over-reduce types to u8 where possible. */ - uint64_t boottime_ns; + union { + uint64_t boottime_ns; + int64_t ack_tx_hwtstamp; + }; uint64_t mactime; uint32_t device_timestamp; enum ieee80211_rx_status_flags flag; uint16_t freq; - uint8_t encoding:2, bw:3, he_ru:3; /* enum mac80211_rx_encoding, rate_info_bw */ /* See mt76.h */ + uint8_t encoding:3, bw:4; /* enum mac80211_rx_encoding, rate_info_bw */ /* See mt76.h */ uint8_t ampdu_reference; uint8_t band; uint8_t chains; int8_t chain_signal[IEEE80211_MAX_CHAINS]; int8_t signal; uint8_t enc_flags; - uint8_t he_dcm; - uint8_t he_gi; + union { + struct { + uint8_t he_ru:3; /* nl80211::enum nl80211_he_ru_alloc */ + uint8_t he_gi:2; /* nl80211::enum nl80211_he_gi */ + uint8_t he_dcm:1; + }; + struct { + uint8_t ru:4; /* nl80211::enum nl80211_eht_ru_alloc */ + uint8_t gi:2; /* nl80211::enum nl80211_eht_gi */ + } eht; + }; + bool link_valid; + uint8_t link_id; /* very incosistent sizes? */ uint8_t zero_length_psdu_type; uint8_t nss; uint8_t rate_idx; @@ -562,6 +617,7 @@ struct ieee80211_rx_status { struct ieee80211_tx_status { struct ieee80211_sta *sta; struct ieee80211_tx_info *info; + int64_t ack_hwtstamp; u8 n_rates; struct ieee80211_rate_status *rates; @@ -608,17 +664,22 @@ struct ieee80211_sta_txpwr { short power; }; +#define IEEE80211_NUM_TIDS 16 /* net80211::WME_NUM_TID */ struct ieee80211_sta_agg { - /* XXX TODO */ - int max_amsdu_len; + uint16_t max_amsdu_len; + uint16_t max_rc_amsdu_len; + uint16_t max_tid_amsdu_len[IEEE80211_NUM_TIDS]; }; struct ieee80211_link_sta { + uint8_t addr[ETH_ALEN]; + uint8_t link_id; uint32_t supp_rates[NUM_NL80211_BANDS]; struct ieee80211_sta_ht_cap ht_cap; struct ieee80211_sta_vht_cap vht_cap; struct ieee80211_sta_he_cap he_cap; struct ieee80211_sta_he_6ghz_capa he_6ghz_capa; + struct ieee80211_sta_eht_cap eht_cap; uint8_t rx_nss; enum ieee80211_sta_rx_bw bandwidth; enum ieee80211_smps_mode smps_mode; @@ -626,21 +687,27 @@ struct ieee80211_link_sta { struct ieee80211_sta_txpwr txpwr; }; -#define IEEE80211_NUM_TIDS 16 /* net80211::WME_NUM_TID */ struct ieee80211_sta { /* TODO FIXME */ - int max_amsdu_len, max_amsdu_subframes, max_rc_amsdu_len; + int max_amsdu_subframes; int mfp, smps_mode, tdls, tdls_initiator; struct ieee80211_txq *txq[IEEE80211_NUM_TIDS + 1]; /* iwlwifi: 8 and adds +1 to tid_data, net80211::IEEE80211_TID_SIZE */ struct ieee80211_sta_rates *rates; /* some rcu thing? */ - uint32_t max_tid_amsdu_len[IEEE80211_NUM_TIDS]; uint8_t addr[ETH_ALEN]; uint16_t aid; bool wme; uint8_t max_sp; uint8_t uapsd_queues; + uint16_t valid_links; struct ieee80211_link_sta deflink; + struct ieee80211_link_sta *link[IEEE80211_MLD_MAX_NUM_LINKS]; /* rcu? */ + +#ifndef __FOR_LATER_DRV_UPDATE + uint16_t max_rc_amsdu_len; + uint16_t max_amsdu_len; + uint16_t max_tid_amsdu_len[IEEE80211_NUM_TIDS]; +#endif /* Must stay last. */ uint8_t drv_priv[0] __aligned(CACHE_LINE_SIZE); @@ -681,16 +748,24 @@ enum ieee80211_vif_driver_flags { IEEE80211_VIF_BEACON_FILTER = BIT(0), IEEE80211_VIF_SUPPORTS_CQM_RSSI = BIT(1), IEEE80211_VIF_SUPPORTS_UAPSD = BIT(2), + IEEE80211_VIF_DISABLE_SMPS_OVERRIDE = BIT(3), }; #define IEEE80211_BSS_ARP_ADDR_LIST_LEN 4 struct ieee80211_vif_cfg { uint16_t aid; + uint16_t eml_cap; + uint16_t eml_med_sync_delay; bool assoc; bool ps; + bool idle; + bool ibss_joined; int arp_addr_cnt; + size_t ssid_len; uint32_t arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN]; /* big endian */ + uint8_t ssid[IEEE80211_NWID_LEN]; + uint8_t ap_addr[ETH_ALEN]; }; struct ieee80211_vif { @@ -707,7 +782,11 @@ struct ieee80211_vif { struct ieee80211_chanctx_conf *chanctx_conf; struct ieee80211_txq *txq; struct ieee80211_bss_conf bss_conf; + struct ieee80211_bss_conf *link_conf[IEEE80211_MLD_MAX_NUM_LINKS]; /* rcu? */ uint8_t hw_queue[IEEE80211_NUM_ACS]; + uint16_t active_links; + uint16_t valid_links; + struct ieee80211_vif *mbssid_tx_vif; /* #ifdef CONFIG_MAC80211_DEBUGFS */ /* Do not change structure depending on compile-time option. */ struct dentry *debugfs_dir; @@ -720,6 +799,7 @@ struct ieee80211_vif { struct ieee80211_vif_chanctx_switch { struct ieee80211_chanctx_conf *old_ctx, *new_ctx; struct ieee80211_vif *vif; + struct ieee80211_bss_conf *link_conf; }; struct ieee80211_prep_tx_info { @@ -750,7 +830,7 @@ struct ieee80211_tx_info { uint8_t ampdu_len; uint8_t antenna; uint16_t tx_time; - bool is_valid_ack_signal; + uint8_t flags; void *status_driver_data[16 / sizeof(void *)]; /* XXX TODO */ } status; #define IEEE80211_TX_INFO_DRIVER_DATA_SIZE 40 @@ -792,11 +872,10 @@ enum ieee80211_iface_iter { IEEE80211_IFACE_ITER_NORMAL = BIT(0), IEEE80211_IFACE_ITER_RESUME_ALL = BIT(1), IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER = BIT(2), /* seems to be an iter flag */ + IEEE80211_IFACE_ITER_ACTIVE = BIT(3), /* Internal flags only. */ - /* ieee80211_iterate_active_interfaces*(). */ IEEE80211_IFACE_ITER__ATOMIC = BIT(6), - IEEE80211_IFACE_ITER__ACTIVE = BIT(7), IEEE80211_IFACE_ITER__MTX = BIT(8), }; @@ -864,6 +943,7 @@ struct ieee80211_ops { void (*mgd_protect_tdls_discover)(struct ieee80211_hw *, struct ieee80211_vif *); void (*flush)(struct ieee80211_hw *, struct ieee80211_vif *, u32, bool); + void (*flush_sta)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *); int (*set_frag_threshold)(struct ieee80211_hw *, u32); @@ -933,6 +1013,7 @@ struct ieee80211_ops { int (*set_key)(struct ieee80211_hw *, enum set_key_cmd, struct ieee80211_vif *, struct ieee80211_sta *, struct ieee80211_key_conf *); void (*set_default_unicast_key)(struct ieee80211_hw *, struct ieee80211_vif *, int); void (*update_tkip_key)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_key_conf *, struct ieee80211_sta *, u32, u16 *); + void (*set_rekey_data)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_gtk_rekey_data *); int (*start_pmsr)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_pmsr_request *); void (*abort_pmsr)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_pmsr_request *); @@ -961,6 +1042,14 @@ struct ieee80211_ops { void (*add_twt_setup)(struct ieee80211_hw *, struct ieee80211_sta *, struct ieee80211_twt_setup *); void (*twt_teardown_request)(struct ieee80211_hw *, struct ieee80211_sta *, u8); + int (*set_hw_timestamp)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_set_hw_timestamp *); + + void (*link_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u64); + void (*vif_cfg_changed)(struct ieee80211_hw *, struct ieee80211_vif *, u64); + + int (*change_vif_links)(struct ieee80211_hw *, struct ieee80211_vif *, u16, u16, struct ieee80211_bss_conf *[IEEE80211_MLD_MAX_NUM_LINKS]); + int (*change_sta_links)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, u16, u16); + /* #ifdef CONFIG_MAC80211_DEBUGFS */ /* Do not change depending on compile-time option. */ void (*sta_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, struct dentry *); /* #endif */ @@ -1017,7 +1106,7 @@ void linuxkpi_ieee80211_queue_work(struct ieee80211_hw *, struct work_struct *); struct sk_buff *linuxkpi_ieee80211_pspoll_get(struct ieee80211_hw *, struct ieee80211_vif *); struct sk_buff *linuxkpi_ieee80211_nullfunc_get(struct ieee80211_hw *, - struct ieee80211_vif *, bool); + struct ieee80211_vif *, int, bool); void linuxkpi_ieee80211_txq_get_depth(struct ieee80211_txq *, unsigned long *, unsigned long *); struct wireless_dev *linuxkpi_ieee80211_vif_to_wdev(struct ieee80211_vif *); @@ -1140,6 +1229,37 @@ ieee80211_restart_hw(struct ieee80211_hw *hw) linuxkpi_ieee80211_restart_hw(hw); } +static inline void +ieee80211_hw_restart_disconnect(struct ieee80211_vif *vif) +{ + TODO(); +} + +/* -------------------------------------------------------------------------- */ + +#define link_conf_dereference_check(_vif, _linkid) \ + rcu_dereference_check((_vif)->link_conf[_linkid], true) + +#define link_conf_dereference_protected(_vif, _linkid) \ + rcu_dereference_protected((_vif)->link_conf[_linkid], true) + +#define link_sta_dereference_check(_sta, _linkid) \ + rcu_dereference_check((_sta)->link[_linkid], true) + +#define link_sta_dereference_protected(_sta, _linkid) \ + rcu_dereference_protected((_sta)->link[_linkid], true) + +#define for_each_vif_active_link(_vif, _link, _linkid) \ + for (_linkid = 0; _linkid < nitems((_vif)->link_conf); _linkid++) \ + if ( ((_vif)->active_links == 0 /* no MLO */ || \ + ((_vif)->active_links & BIT(_linkid)) != 0) && \ + (_link = rcu_dereference((_vif)->link_conf[_linkid])) ) + +#define for_each_sta_active_link(_vif, _sta, _linksta, _linkid) \ + for (_linkid = 0; _linkid < nitems((_vif)->link_conf); _linkid++) \ + if ( ((_vif)->active_links == 0 /* no MLO */ || \ + ((_vif)->active_links & BIT(_linkid)) != 0) && \ + (_linksta = link_sta_dereference_protected((_sta), (_linkid))) ) /* -------------------------------------------------------------------------- */ @@ -1301,8 +1421,18 @@ ieee80211_is_back_req(__le16 fc) } static __inline bool +#ifdef __FOR_LATER_DRV_UPDATE +ieee80211_is_bufferable_mmpdu(struct sk_buff *skb) +{ + struct ieee80211_mgmt *mgmt; + __le16 fc; + + mgmt = (struct ieee80211_mgmt *)skb->data; + fc = mgmt->frame_control; +#else ieee80211_is_bufferable_mmpdu(__le16 fc) { *** 298 LINES SKIPPED *** From nobody Mon Aug 21 01:36: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 4RTZp63dhdz4r1KM; Mon, 21 Aug 2023 01:36: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 4RTZp6329Hz4kly; Mon, 21 Aug 2023 01:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1gSQCPcoN2gRNDctbsLBLAo7DtxftH54z7ySRcxbqeA=; b=b6JsdD0DVIiY5AEFwhcX/05DwmN9jn00TffQ5XfHqwKYIrqhy62lYH5rwnEpeKTK3wz/pu Sjjof/zyPf1H99Dcxan9u66sjyICLZxpQWRdslGvQXXCME3Z+2kgkPUI6iVR+RhtuAtzOU Yq/zUA3l2AZXyFfeGxtsqmRxEbvSKTXYuQKLGE4UsWZzJI3n5rAo1dUL/AiL4xYX+CbFcn oLF9Tg7L47XBuwRJD4qtJstkauynCVp/hlvZil3WthyzvCf8kFAlA7kUJhhRRqGgAXfwQh 8IjDWg76Pl41larpRNg+k9IdIURmURJX+ZlCr2ANoQf50ujGk9cawF0kct2pAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1gSQCPcoN2gRNDctbsLBLAo7DtxftH54z7ySRcxbqeA=; b=UqzbtKE8xNNl+JF534dV1w0DqrGvTe3CJPNxROL76uEy2dGdPonlj+ZdaE55c8H/5Mm9J6 3gx+gXyMpXpXWu+9j0fYoIHerm/bw0TEuBzvvoNUXlBRPTdVxetnqp3Wu74cKqIH8zeqxX X1lLKHoB8+WGGY2/BiJnKeh4flDWwFMyvqqkJnl8Vd5uhnEKgXYwe6n4L9Vfi522Yig2iD oaWV9Gju35QFg1shYTEJuiO1KFK8kWPsgQNQjsR+7VoyDLfhxT/oi/TaLr9yPSsMaEUy/E BcCQLOQemW8Hlgdrh6fAAF9wPRsTLDZFhQ1QaJihNTN/ee9nUmGgHMsUghytng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692581806; a=rsa-sha256; cv=none; b=bJYeIo7zxjEZqzC2GK8u8jXmTYxGNiaDrT7oP0MLqw84M69jsL/U655O13MForIZ/Kpkoh TOF87Jq5QSgPDMxhkOoOHY6uSPQrLLBdl+/pEPf+uZ/crOGLKr7uPTFH1E4ogwtUzxvX0P FMTZ6+VRzV48ftzwkrooIvTXXfppbyCzJJpG/YXxoBDZ4h156k9JQ4u1VRmzDIxuC1129Y S/RqcSBu/iHFHw/hNkBRtj2CiHFFW6Df3/N0R87/4spEIQNd9/dxBKPT/aWoBVQ7u8HEHm Q4Bdt8VD/MBwoSvWvD9yyfZLTKllPV/GGplt/9qffH07vy+J3ko2CWw6Vl+VjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTZp625xZz11xm; Mon, 21 Aug 2023 01:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37L1akSB038178; Mon, 21 Aug 2023 01:36:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37L1akH5038175; Mon, 21 Aug 2023 01:36:46 GMT (envelope-from git) Date: Mon, 21 Aug 2023 01:36:46 GMT Message-Id: <202308210136.37L1akH5038175@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: 734e82fe33aa - main - ath10k: specifically mark a debug workaround for an early firmware crash List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 734e82fe33aa764367791a7d603b383996c6b40b Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=734e82fe33aa764367791a7d603b383996c6b40b commit 734e82fe33aa764367791a7d603b383996c6b40b Author: Bjoern A. Zeeb AuthorDate: 2023-05-17 20:21:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-21 01:30:50 +0000 ath10k: specifically mark a debug workaround for an early firmware crash During the last import a (debug) workaround to avoid an early firmware crash was imported. In order to remember and to separate it from upstream sources put it under #ifdef MFC after: 20 days --- sys/contrib/dev/athk/ath10k/pci.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/contrib/dev/athk/ath10k/pci.c b/sys/contrib/dev/athk/ath10k/pci.c index 6a9b0367b2bd..b9fa4792d816 100644 --- a/sys/contrib/dev/athk/ath10k/pci.c +++ b/sys/contrib/dev/athk/ath10k/pci.c @@ -1450,14 +1450,23 @@ int ath10k_pci_hif_tx_sg(struct ath10k *ar, u8 pipe_id, /* `i` is equal to `n_items -1` after for() */ ath10k_dbg(ar, ATH10K_DBG_PCI, +#if defined(__linux__) + "pci tx item %d paddr %pad len %d n_items %d\n", + i, &items[i].paddr, items[i].len, n_items); +#elif defined(__FreeBSD__) "pci tx item %d paddr %pad len %d n_items %d pipe_id %u\n", i, &items[i].paddr, items[i].len, n_items, pipe_id); + /* + * XXX-BZ specific debug; the DELAY makes things work for one chipset. + * There's likely a race somewhere (here or LinuxKPI). + */ if (n_items == 1 && items[i].len == 140) { ath10k_dbg_dump(ar, ATH10K_DBG_PCI, NULL, "pci tx data: ", items[i].vaddr, items[i].len); dump_stack(); DELAY(500); } +#endif ath10k_dbg_dump(ar, ATH10K_DBG_PCI_DUMP, NULL, "pci tx data: ", items[i].vaddr, items[i].len); From nobody Mon Aug 21 01:36: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 4RTZp74vBtz4r1MK; Mon, 21 Aug 2023 01:36: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 4RTZp74MV7z4kmR; Mon, 21 Aug 2023 01:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jKp/FsH2Iw3E5sttPCWskNzwoLGiDWNCQno3PiubMjo=; b=n81V9KWdqlfgdiFxSMstvWLk+kTXYzQt/I8j/ZMNoewjqLZgGLmr+e9JuMKC5YN9QCHums M9BQc2rKNFYPGv51RU0DkB6CDXpB7O9t3QoibYH5DKJxcAfpytfGr0EISX1/LxT19phaeV r6PayJMPwGohW5+G8fdrVAmjzfoYoGH8u638xpvWPcKeVhEzRSwL4xYaYvYdMrSXBoL8U7 qarKF8wLwYUe029iIiXMrz6+njKrTAZ7ml0bqLbuiznfc9la2uk2KwsJMmjLoKMr8bxQvv wnfbwoM5zK1LqcLJxZnvNCGdCwvMq8a1YRwdh7epDiLOg5pDCh0SR1JuysxhmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jKp/FsH2Iw3E5sttPCWskNzwoLGiDWNCQno3PiubMjo=; b=v0h0Sl14DC3B877Qj1uEdL1xQ5Bendv/obalBjHrq+UsYgL0AK7GqkQEsGzJ7VuMFd2OXa OnvoI6JJNHjF0Yx0/WfldRYQKEEmS3TzjdiQ/liO+6WDAktjkBdPVKOf3jEuX3vGnU2DBY +QE9ueb3ksQKysocZ2v681YQy8hIfd2eESO8eQok9Wu5LqIM5sjsAGKGHB6eWxcqFJq2xa 02MZRHX3z5ySAAaXgPzN1t/s3317/YnfjtSj65w9GUCaKKBhThmvdJT4i98oIuPTvHlKKa 8fwEMgRrEAeNErat3S7ZZGry6X8T6q99MAW/7oQB8DRcsC2TxCtOvlmHpzAwSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692581807; a=rsa-sha256; cv=none; b=ppRRWdwe7n9r5m7oc96zqw36ZnUjWE4nh5W2lEcSEarv53dV8Aps9WHRWQdXZ7F6sD/wiQ vjNooJzwL2MmZQOTW40t78oFzKvoeSjbED5LjItkS3WTGsL8ef4n7k+OSYoO9nYJsu7mpT Xc2cR4mHXTWTuc+X/hqFXtQ6Gyqm/1DMS6jtnz428D/haWC5BAixZQujhAif5ttv2ji2s1 YCTyvpSGKu3jA7jluhGLoJ1Nu+14fMpUf5S232NIeb2nM8O9OvvELEo3K5JiM9s3n5vlaF 3baDgeg3O8/aJRef6YoyP12DDrhUwesueXEDqnPxzcE8ywAM9QLFA6EWRLvr2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTZp72v9Lz128L; Mon, 21 Aug 2023 01:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37L1alCk038229; Mon, 21 Aug 2023 01:36:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37L1alhk038226; Mon, 21 Aug 2023 01:36:47 GMT (envelope-from git) Date: Mon, 21 Aug 2023 01:36:47 GMT Message-Id: <202308210136.37L1alhk038226@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: eb50aa680f58 - main - ath1xk_common: update common athk files from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb50aa680f5864c5ae0f0137819bbe61b42a550e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=eb50aa680f5864c5ae0f0137819bbe61b42a550e commit eb50aa680f5864c5ae0f0137819bbe61b42a550e Author: Bjoern A. Zeeb AuthorDate: 2023-05-20 00:38:12 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-21 01:31:57 +0000 ath1xk_common: update common athk files from upstream Update ath1xk_common based on wireless-testing (wt-2023-05-11) 711dca0ca3d77414f8f346e564e9c8640147f40d (right after v6.4-rc1). MFC after: 20 days --- sys/contrib/dev/athk/ath.h | 15 ++++++++++----- sys/contrib/dev/athk/hw.c | 2 +- sys/contrib/dev/athk/key.c | 2 +- sys/contrib/dev/athk/regd.c | 10 +++++----- sys/contrib/dev/athk/spectral_common.h | 4 ++-- sys/contrib/dev/athk/trace.h | 7 ++----- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/sys/contrib/dev/athk/ath.h b/sys/contrib/dev/athk/ath.h index f083fb9038c3..90869e6d28da 100644 --- a/sys/contrib/dev/athk/ath.h +++ b/sys/contrib/dev/athk/ath.h @@ -22,6 +22,9 @@ #include #include #include +#if defined(__FreeBSD__) +#include +#endif /* * The key cache is used for h/w cipher state and also for @@ -96,11 +99,13 @@ struct ath_keyval { u8 kv_type; u8 kv_pad; u16 kv_len; - u8 kv_val[16]; /* TK */ - u8 kv_mic[8]; /* Michael MIC key */ - u8 kv_txmic[8]; /* Michael MIC TX key (used only if the hardware - * supports both MIC keys in the same key cache entry; - * in that case, kv_mic is the RX key) */ + struct_group(kv_values, + u8 kv_val[16]; /* TK */ + u8 kv_mic[8]; /* Michael MIC key */ + u8 kv_txmic[8]; /* Michael MIC TX key (used only if the hardware + * supports both MIC keys in the same key cache entry; + * in that case, kv_mic is the RX key) */ + ); }; enum ath_cipher { diff --git a/sys/contrib/dev/athk/hw.c b/sys/contrib/dev/athk/hw.c index b53ebb3ac9a2..85955572a705 100644 --- a/sys/contrib/dev/athk/hw.c +++ b/sys/contrib/dev/athk/hw.c @@ -48,7 +48,7 @@ * the MAC address to obtain the relevant bits and compare the result with * (frame's BSSID & mask) to see if they match. * - * Simple example: on your card you have have two BSSes you have created with + * Simple example: on your card you have two BSSes you have created with * BSSID-01 and BSSID-02. Lets assume BSSID-01 will not use the MAC address. * There is another BSSID-03 but you are not part of it. For simplicity's sake, * assuming only 4 bits for a mac address and for BSSIDs you can then have: diff --git a/sys/contrib/dev/athk/key.c b/sys/contrib/dev/athk/key.c index 61b59a804e30..b7b61d4f02ba 100644 --- a/sys/contrib/dev/athk/key.c +++ b/sys/contrib/dev/athk/key.c @@ -503,7 +503,7 @@ int ath_key_config(struct ath_common *common, hk.kv_len = key->keylen; if (key->keylen) - memcpy(hk.kv_val, key->key, key->keylen); + memcpy(&hk.kv_values, key->key, key->keylen); if (!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) { switch (vif->type) { diff --git a/sys/contrib/dev/athk/regd.c b/sys/contrib/dev/athk/regd.c index b2400e2417a5..f15e7bd690b5 100644 --- a/sys/contrib/dev/athk/regd.c +++ b/sys/contrib/dev/athk/regd.c @@ -667,14 +667,14 @@ ath_regd_init_wiphy(struct ath_regulatory *reg, /* * Some users have reported their EEPROM programmed with - * 0x8000 or 0x0 set, this is not a supported regulatory - * domain but since we have more than one user with it we - * need a solution for them. We default to 0x64, which is - * the default Atheros world regulatory domain. + * 0x8000 set, this is not a supported regulatory domain + * but since we have more than one user with it we need + * a solution for them. We default to 0x64, which is the + * default Atheros world regulatory domain. */ static void ath_regd_sanitize(struct ath_regulatory *reg) { - if (reg->current_rd != COUNTRY_ERD_FLAG && reg->current_rd != 0) + if (reg->current_rd != COUNTRY_ERD_FLAG) return; printk(KERN_DEBUG "ath: EEPROM regdomain sanitized\n"); reg->current_rd = 0x64; diff --git a/sys/contrib/dev/athk/spectral_common.h b/sys/contrib/dev/athk/spectral_common.h index e14f374f97d4..fe187c1fbeb0 100644 --- a/sys/contrib/dev/athk/spectral_common.h +++ b/sys/contrib/dev/athk/spectral_common.h @@ -108,7 +108,7 @@ struct fft_sample_ath10k { u8 avgpwr_db; u8 max_exp; - u8 data[0]; + u8 data[]; } __packed; struct fft_sample_ath11k { @@ -123,7 +123,7 @@ struct fft_sample_ath11k { __be32 tsf; __be32 noise; - u8 data[0]; + u8 data[]; } __packed; #endif /* SPECTRAL_COMMON_H */ diff --git a/sys/contrib/dev/athk/trace.h b/sys/contrib/dev/athk/trace.h index ba711644d27e..9935cf475b6d 100644 --- a/sys/contrib/dev/athk/trace.h +++ b/sys/contrib/dev/athk/trace.h @@ -40,16 +40,13 @@ TRACE_EVENT(ath_log, TP_STRUCT__entry( __string(device, wiphy_name(wiphy)) __string(driver, KBUILD_MODNAME) - __dynamic_array(char, msg, ATH_DBG_MAX_LEN) + __vstring(msg, vaf->fmt, vaf->va) ), TP_fast_assign( __assign_str(device, wiphy_name(wiphy)); __assign_str(driver, KBUILD_MODNAME); - WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg), - ATH_DBG_MAX_LEN, - vaf->fmt, - *vaf->va) >= ATH_DBG_MAX_LEN); + __assign_vstr(msg, vaf->fmt, vaf->va); ), TP_printk( From nobody Mon Aug 21 01:36: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 4RTZp856Q8z4r1MN; Mon, 21 Aug 2023 01:36: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 4RTZp84vt2z4kxd; Mon, 21 Aug 2023 01:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eJMRN704dqun758SCxB4GuAQkHV+Gjgzig0RWMiQE/8=; b=RyJNMhvcsQ6ROD05SyXUMsvnYu5kT0DKTexOTR8+6Y9Br3yNo9BVfvWZk6EI1bQgl9RSOQ 71DcR+x96qt8MgtaOcxKya3PjSxdF3bTVz6AqS8BcAA6nl1JK086KdSYbnMhIWYx2eiUoW 2UV4z06zk9no4iGbh/y4vElY6LK+s+D4Xwf53Y71O3nzcUjcVqie0InvArmdxmWc5XffdB vfmVfarDbCz7BYjwH7ex5AbsyLyCocJXUcdTDhBoZUVoSJj8Pjai6zxxH+IbCb547U/7vU QIu5s2LwN2mH3LYpc/IC8ikCrsTrTLDTDMQhOnHDzMWuDxKnM2QbtKsEuOgCZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eJMRN704dqun758SCxB4GuAQkHV+Gjgzig0RWMiQE/8=; b=LOOX429IFvJSUWHA9TTsZTGvokgbHvVXdEdtNgNGQUPWOVGe+9ks6z6KTG3RQ7tR1okylC 8XQAMDptjr9hX7lpPfGWsDDIZoJzFelnVYAUmJsva7O/2zMompd8h+jzRr7aLbIvAVZZGw 6tuwzqqQUqjgpPZko+EdqbbYh641VFDaR7U6xiBHasKyoC7JwsA4BKfQOoKgy6jEX+0Mwp yjpzk/Lt2Cy95Q4dgCXafOAiK7wWvzwDtA/fy8lWY5rCU2mlrAs7FZiXwHgqIt1X2TfUp8 Lhc7MaIRhR/xBS2GXgWQe7C/Io0qjx/ZgbykyMo00h5v4r8c0Ei7Yvd5aEdmRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692581808; a=rsa-sha256; cv=none; b=bn9ex/8x1m1G5DpbY3zprT5ko540wmPd/ZXVW+hXFpdO8ZJV6pWhQuy3avcabGOwa0I3mI k2gs16uTzK4H7iqY+lFjq/NX6DjJf2rIw7ZoHmOSw6RzQWkbnebwga5t8V+4hl6XKqfTdj LJ/2MumaN/z/rzjsevOwCuC4Cpr2hIsO0BRTwmdfT8NPOM0r4l623Z11WAXxhlDzSKIKoG A9+ow+bwb+oDiKjL/DtUxBA+4q9ZY+SPIMvyMwZzuAA5sg5GW8bdtOGLfHyt3iMGPwiTUp KqmJ7lTQJI5N5ysizn/shJ4Rhyq1A9C331H8Ork9dwm5y8WrVbTWg5LZrgFN/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTZp840f0z11xn; Mon, 21 Aug 2023 01:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37L1amw9038275; Mon, 21 Aug 2023 01:36:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37L1amUR038272; Mon, 21 Aug 2023 01:36:48 GMT (envelope-from git) Date: Mon, 21 Aug 2023 01:36:48 GMT Message-Id: <202308210136.37L1amUR038272@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: 07724ba62b4c - main - ath10k: update driver from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07724ba62b4c432ea04dce9465a5ab6e2c3f5a0d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=07724ba62b4c432ea04dce9465a5ab6e2c3f5a0d commit 07724ba62b4c432ea04dce9465a5ab6e2c3f5a0d Author: Bjoern A. Zeeb AuthorDate: 2023-05-20 00:37:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-21 01:32:10 +0000 ath10k: update driver from upstream This is a set of updates of the ath10k driver based on wireless-testing (wt-2023-05-11) 711dca0ca3d77414f8f346e564e9c8640147f40d (after v6.4-rc1), (wt-2023-06-09) 7bd20e011626ccc3ad53e57873452b1716fcfaaa (after v6.4-rc5), (wt-2023-07-24) 62e409149b62a285e89018e49b2e115757fb9022 (after v6.5-rc3), (wt-2023-08-06) 2a220a15be657a24868368892e3e2caba2115283 (after v6.5-rc4). MFC after: 20 days --- sys/contrib/dev/athk/ath10k/Kconfig | 1 + sys/contrib/dev/athk/ath10k/ahb.c | 31 +--- sys/contrib/dev/athk/ath10k/bmi.c | 4 +- sys/contrib/dev/athk/ath10k/ce.c | 77 +--------- sys/contrib/dev/athk/ath10k/core.c | 77 +++++++++- sys/contrib/dev/athk/ath10k/core.h | 11 +- sys/contrib/dev/athk/ath10k/coredump.c | 2 +- sys/contrib/dev/athk/ath10k/coredump.h | 2 +- sys/contrib/dev/athk/ath10k/debug.c | 11 +- sys/contrib/dev/athk/ath10k/debugfs_sta.c | 2 +- sys/contrib/dev/athk/ath10k/htc.c | 23 ++- sys/contrib/dev/athk/ath10k/htt.h | 12 +- sys/contrib/dev/athk/ath10k/htt_rx.c | 47 +++--- sys/contrib/dev/athk/ath10k/htt_tx.c | 63 ++++---- sys/contrib/dev/athk/ath10k/hw.c | 6 +- sys/contrib/dev/athk/ath10k/hw.h | 6 + sys/contrib/dev/athk/ath10k/mac.c | 227 +++++++++++++++++++---------- sys/contrib/dev/athk/ath10k/pci.c | 32 ++-- sys/contrib/dev/athk/ath10k/pci.h | 2 +- sys/contrib/dev/athk/ath10k/qmi.c | 52 +++++-- sys/contrib/dev/athk/ath10k/qmi_wlfw_v01.c | 126 ++++++++-------- sys/contrib/dev/athk/ath10k/qmi_wlfw_v01.h | 102 ++++++------- sys/contrib/dev/athk/ath10k/rx_desc.h | 2 +- sys/contrib/dev/athk/ath10k/sdio.c | 4 +- sys/contrib/dev/athk/ath10k/snoc.c | 18 +-- sys/contrib/dev/athk/ath10k/swap.h | 2 +- sys/contrib/dev/athk/ath10k/thermal.c | 2 +- sys/contrib/dev/athk/ath10k/thermal.h | 2 +- sys/contrib/dev/athk/ath10k/trace.h | 14 +- sys/contrib/dev/athk/ath10k/txrx.c | 17 ++- sys/contrib/dev/athk/ath10k/usb.c | 26 ++++ sys/contrib/dev/athk/ath10k/usb.h | 2 +- sys/contrib/dev/athk/ath10k/wmi-tlv.c | 9 +- sys/contrib/dev/athk/ath10k/wmi-tlv.h | 4 +- sys/contrib/dev/athk/ath10k/wmi.c | 73 ++-------- sys/contrib/dev/athk/ath10k/wmi.h | 16 +- 36 files changed, 609 insertions(+), 498 deletions(-) diff --git a/sys/contrib/dev/athk/ath10k/Kconfig b/sys/contrib/dev/athk/ath10k/Kconfig index ca007b800f75..e6ea884cafc1 100644 --- a/sys/contrib/dev/athk/ath10k/Kconfig +++ b/sys/contrib/dev/athk/ath10k/Kconfig @@ -44,6 +44,7 @@ config ATH10K_SNOC tristate "Qualcomm ath10k SNOC support" depends on ATH10K depends on ARCH_QCOM || COMPILE_TEST + depends on QCOM_SMEM select QCOM_SCM select QCOM_QMI_HELPERS help diff --git a/sys/contrib/dev/athk/ath10k/ahb.c b/sys/contrib/dev/athk/ath10k/ahb.c index ab8f77ae5e66..76efea2f1138 100644 --- a/sys/contrib/dev/athk/ath10k/ahb.c +++ b/sys/contrib/dev/athk/ath10k/ahb.c @@ -5,7 +5,7 @@ */ #include #include -#include +#include #include #include #include "core.h" @@ -27,7 +27,7 @@ MODULE_DEVICE_TABLE(of, ath10k_ahb_of_match); static inline struct ath10k_ahb *ath10k_ahb_priv(struct ath10k *ar) { - return &((struct ath10k_pci *)ar->drv_priv)->ahb[0]; + return &ath10k_pci_priv(ar)->ahb[0]; } static void ath10k_ahb_write32(struct ath10k *ar, u32 offset, u32 value) @@ -728,20 +728,17 @@ static int ath10k_ahb_probe(struct platform_device *pdev) struct ath10k *ar; struct ath10k_ahb *ar_ahb; struct ath10k_pci *ar_pci; - const struct of_device_id *of_id; enum ath10k_hw_rev hw_rev; size_t size; int ret; struct ath10k_bus_params bus_params = {}; - of_id = of_match_device(ath10k_ahb_of_match, &pdev->dev); - if (!of_id) { - dev_err(&pdev->dev, "failed to find matching device tree id\n"); + hw_rev = (enum ath10k_hw_rev)of_device_get_match_data(&pdev->dev); + if (!hw_rev) { + dev_err(&pdev->dev, "OF data missing\n"); return -EINVAL; } - hw_rev = (enum ath10k_hw_rev)of_id->data; - size = sizeof(*ar_pci) + sizeof(*ar_ahb); ar = ath10k_core_create(size, &pdev->dev, ATH10K_BUS_AHB, hw_rev, &ath10k_ahb_hif_ops); @@ -819,23 +816,13 @@ err_resource_deinit: err_core_destroy: ath10k_core_destroy(ar); - platform_set_drvdata(pdev, NULL); return ret; } -static int ath10k_ahb_remove(struct platform_device *pdev) +static void ath10k_ahb_remove(struct platform_device *pdev) { struct ath10k *ar = platform_get_drvdata(pdev); - struct ath10k_ahb *ar_ahb; - - if (!ar) - return -EINVAL; - - ar_ahb = ath10k_ahb_priv(ar); - - if (!ar_ahb) - return -EINVAL; ath10k_dbg(ar, ATH10K_DBG_AHB, "ahb remove\n"); @@ -847,10 +834,6 @@ static int ath10k_ahb_remove(struct platform_device *pdev) ath10k_ahb_clock_disable(ar); ath10k_ahb_resource_deinit(ar); ath10k_core_destroy(ar); - - platform_set_drvdata(pdev, NULL); - - return 0; } static struct platform_driver ath10k_ahb_driver = { @@ -859,7 +842,7 @@ static struct platform_driver ath10k_ahb_driver = { .of_match_table = ath10k_ahb_of_match, }, .probe = ath10k_ahb_probe, - .remove = ath10k_ahb_remove, + .remove_new = ath10k_ahb_remove, }; int ath10k_ahb_init(void) diff --git a/sys/contrib/dev/athk/ath10k/bmi.c b/sys/contrib/dev/athk/ath10k/bmi.c index 2ac2bbe8c663..12c1983b4dd6 100644 --- a/sys/contrib/dev/athk/ath10k/bmi.c +++ b/sys/contrib/dev/athk/ath10k/bmi.c @@ -101,7 +101,7 @@ int ath10k_bmi_get_target_info_sdio(struct ath10k *ar, cmd.id = __cpu_to_le32(BMI_GET_TARGET_INFO); /* Step 1: Read 4 bytes of the target info and check if it is - * the special sentinal version word or the first word in the + * the special sentinel version word or the first word in the * version response. */ resplen = sizeof(u32); @@ -111,7 +111,7 @@ int ath10k_bmi_get_target_info_sdio(struct ath10k *ar, return ret; } - /* Some SDIO boards have a special sentinal byte before the real + /* Some SDIO boards have a special sentinel byte before the real * version response. */ if (__le32_to_cpu(tmp) == TARGET_VERSION_SENTINAL) { diff --git a/sys/contrib/dev/athk/ath10k/ce.c b/sys/contrib/dev/athk/ath10k/ce.c index 720d1c48111f..8168e20bb09a 100644 --- a/sys/contrib/dev/athk/ath10k/ce.c +++ b/sys/contrib/dev/athk/ath10k/ce.c @@ -77,47 +77,6 @@ static inline u32 shadow_sr_wr_ind_addr(struct ath10k *ar, return addr; } -#if defined(__linux__) -static inline u32 shadow_dst_wr_ind_addr(struct ath10k *ar, - struct ath10k_ce_pipe *ce_state) -{ - u32 ce_id = ce_state->id; - u32 addr = 0; - - switch (ce_id) { - case 1: - addr = 0x00032034; - break; - case 2: - addr = 0x00032038; - break; - case 5: - addr = 0x00032044; - break; - case 7: - addr = 0x0003204C; - break; - case 8: - addr = 0x00032050; - break; - case 9: - addr = 0x00032054; - break; - case 10: - addr = 0x00032058; - break; - case 11: - addr = 0x0003205C; - break; - default: - ath10k_warn(ar, "invalid CE id: %d", ce_id); - break; - } - - return addr; -} -#endif - static inline unsigned int ath10k_set_ring_byte(unsigned int offset, struct ath10k_hw_ce_regs_addr_map *addr_map) @@ -125,15 +84,6 @@ ath10k_set_ring_byte(unsigned int offset, return ((offset << addr_map->lsb) & addr_map->mask); } -#if defined(__linux__) -static inline unsigned int -ath10k_get_ring_byte(unsigned int offset, - struct ath10k_hw_ce_regs_addr_map *addr_map) -{ - return ((offset & addr_map->mask) >> (addr_map->lsb)); -} -#endif - static inline u32 ath10k_ce_read32(struct ath10k *ar, u32 offset) { struct ath10k_ce *ce = ath10k_ce_priv(ar); @@ -212,16 +162,6 @@ ath10k_ce_shadow_src_ring_write_index_set(struct ath10k *ar, ath10k_ce_write32(ar, shadow_sr_wr_ind_addr(ar, ce_state), value); } -#if defined(__linux__) -static inline void -ath10k_ce_shadow_dest_ring_write_index_set(struct ath10k *ar, - struct ath10k_ce_pipe *ce_state, - unsigned int value) -{ - ath10k_ce_write32(ar, shadow_dst_wr_ind_addr(ar, ce_state), value); -} -#endif - static inline void ath10k_ce_src_ring_base_addr_set(struct ath10k *ar, u32 ce_id, u64 addr) @@ -452,21 +392,6 @@ static inline void ath10k_ce_watermark_intr_disable(struct ath10k *ar, host_ie_addr & ~(wm_regs->wm_mask)); } -#if defined(__linux__) -static inline void ath10k_ce_error_intr_enable(struct ath10k *ar, - u32 ce_ctrl_addr) -{ - struct ath10k_hw_ce_misc_regs *misc_regs = ar->hw_ce_regs->misc_regs; - - u32 misc_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr + - ar->hw_ce_regs->misc_ie_addr); - - ath10k_ce_write32(ar, - ce_ctrl_addr + ar->hw_ce_regs->misc_ie_addr, - misc_ie_addr | misc_regs->err_mask); -} -#endif - static inline void ath10k_ce_error_intr_disable(struct ath10k *ar, u32 ce_ctrl_addr) { @@ -1331,7 +1256,7 @@ EXPORT_SYMBOL(ath10k_ce_per_engine_service); /* * Handler for per-engine interrupts on ALL active CEs. * This is used in cases where the system is sharing a - * single interrput for all CEs + * single interrupt for all CEs */ void ath10k_ce_per_engine_service_any(struct ath10k *ar) diff --git a/sys/contrib/dev/athk/ath10k/core.c b/sys/contrib/dev/athk/ath10k/core.c index 8784344badf5..0a65d12d202c 100644 --- a/sys/contrib/dev/athk/ath10k/core.c +++ b/sys/contrib/dev/athk/ath10k/core.c @@ -42,9 +42,11 @@ EXPORT_SYMBOL(ath10k_debug_mask); static unsigned int ath10k_cryptmode_param; static bool uart_print; static bool skip_otp; -static bool rawmode; static bool fw_diag_log; +/* frame mode values are mapped as per enum ath10k_hw_txrx_mode */ +unsigned int ath10k_frame_mode = ATH10K_HW_TXRX_NATIVE_WIFI; + unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) | BIT(ATH10K_FW_CRASH_DUMP_CE_DATA); @@ -53,15 +55,16 @@ module_param_named(debug_mask, ath10k_debug_mask, uint, 0644); module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644); module_param(uart_print, bool, 0644); module_param(skip_otp, bool, 0644); -module_param(rawmode, bool, 0644); module_param(fw_diag_log, bool, 0644); +module_param_named(frame_mode, ath10k_frame_mode, uint, 0644); module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444); MODULE_PARM_DESC(debug_mask, "Debugging mask"); MODULE_PARM_DESC(uart_print, "Uart target debugging"); MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode"); MODULE_PARM_DESC(cryptmode, "Crypto mode: 0-hardware, 1-software"); -MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath"); +MODULE_PARM_DESC(frame_mode, + "Datapath frame mode (0: raw, 1: native wifi (default), 2: ethernet)"); MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file"); MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging"); @@ -103,6 +106,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = true, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA988X_HW_2_0_VERSION, @@ -140,6 +146,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = true, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA9887_HW_1_0_VERSION, @@ -178,6 +187,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA6174_HW_3_2_VERSION, @@ -211,6 +223,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .bmi_large_size_download = true, .supports_peer_stats_info = true, .dynamic_sar_support = true, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA6174_HW_2_1_VERSION, @@ -248,6 +263,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA6174_HW_2_1_VERSION, @@ -285,6 +303,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA6174_HW_3_0_VERSION, @@ -322,6 +343,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA6174_HW_3_2_VERSION, @@ -363,6 +387,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .tx_stats_over_pktlog = false, .supports_peer_stats_info = true, .dynamic_sar_support = true, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA99X0_HW_2_0_DEV_VERSION, @@ -406,6 +433,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA9984_HW_1_0_DEV_VERSION, @@ -456,6 +486,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA9888_HW_2_0_DEV_VERSION, @@ -503,6 +536,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA9377_HW_1_0_DEV_VERSION, @@ -540,6 +576,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA9377_HW_1_1_DEV_VERSION, @@ -579,6 +618,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA9377_HW_1_1_DEV_VERSION, @@ -609,6 +651,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .uart_pin_workaround = true, .credit_size_workaround = true, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = QCA4019_HW_1_0_DEV_VERSION, @@ -653,6 +698,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, + .hw_restart_disconnect = false, + .use_fw_tx_credits = true, + .delay_unmap_buffer = false, }, { .id = WCN3990_HW_1_0_DEV_VERSION, @@ -683,6 +731,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = true, + .hw_restart_disconnect = true, + .use_fw_tx_credits = false, + .delay_unmap_buffer = true, }, }; @@ -1242,6 +1293,7 @@ success: static int ath10k_core_fetch_board_data_api_1(struct ath10k *ar, int bd_ie_type) { const struct firmware *fw; + char boardname[100]; if (bd_ie_type == ATH10K_BD_IE_BOARD) { if (!ar->hw_params.fw.board) { @@ -1249,9 +1301,19 @@ static int ath10k_core_fetch_board_data_api_1(struct ath10k *ar, int bd_ie_type) return -EINVAL; } + scnprintf(boardname, sizeof(boardname), "board-%s-%s.bin", + ath10k_bus_str(ar->hif.bus), dev_name(ar->dev)); + ar->normal_mode_fw.board = ath10k_fetch_fw_file(ar, ar->hw_params.fw.dir, - ar->hw_params.fw.board); + boardname); + if (IS_ERR(ar->normal_mode_fw.board)) { + fw = ath10k_fetch_fw_file(ar, + ar->hw_params.fw.dir, + ar->hw_params.fw.board); + ar->normal_mode_fw.board = fw; + } + if (IS_ERR(ar->normal_mode_fw.board)) return PTR_ERR(ar->normal_mode_fw.board); @@ -2640,7 +2702,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) ar->htt.max_num_amsdu = ATH10K_HTT_MAX_NUM_AMSDU_DEFAULT; ar->htt.max_num_ampdu = ATH10K_HTT_MAX_NUM_AMPDU_DEFAULT; - if (rawmode) { + if (ath10k_frame_mode == ATH10K_HW_TXRX_RAW) { if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT, fw_file->fw_features)) { ath10k_err(ar, "rawmode = 1 requires support from firmware"); @@ -3125,7 +3187,7 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, * enabled always. * * We can still enable BTCOEX if firmware has the support - * eventhough btceox_support value is + * even though btceox_support value is * ATH10K_DT_BTCOEX_NOT_FOUND */ @@ -3662,6 +3724,9 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, mutex_init(&ar->dump_mutex); spin_lock_init(&ar->data_lock); + for (int ac = 0; ac < IEEE80211_NUM_ACS; ac++) + spin_lock_init(&ar->queue_lock[ac]); + INIT_LIST_HEAD(&ar->peers); init_waitqueue_head(&ar->peer_mapping_wq); init_waitqueue_head(&ar->htt.empty_tx_wq); diff --git a/sys/contrib/dev/athk/ath10k/core.h b/sys/contrib/dev/athk/ath10k/core.h index 1e4ea8f2dfc2..5cecb305a62c 100644 --- a/sys/contrib/dev/athk/ath10k/core.h +++ b/sys/contrib/dev/athk/ath10k/core.h @@ -64,9 +64,6 @@ #define ATH10K_KEEPALIVE_MAX_IDLE 3895 #define ATH10K_KEEPALIVE_MAX_UNRESPONSIVE 3900 -/* NAPI poll budget */ -#define ATH10K_NAPI_BUDGET 64 - /* SMBIOS type containing Board Data File Name Extension */ #define ATH10K_SMBIOS_BDF_EXT_TYPE 0xF8 @@ -84,7 +81,7 @@ /* The magic used by QCA spec */ #define ATH10K_SMBIOS_BDF_EXT_MAGIC "BDF_" -/* Default Airtime weight multipler (Tuned for multiclient performance) */ +/* Default Airtime weight multiplier (Tuned for multiclient performance) */ #define ATH10K_AIRTIME_WEIGHT_MULTIPLIER 4 #define ATH10K_MAX_RETRY_COUNT 30 @@ -865,7 +862,7 @@ enum ath10k_dev_flags { /* Disable HW crypto engine */ ATH10K_FLAG_HW_CRYPTO_DISABLED, - /* Bluetooth coexistance enabled */ + /* Bluetooth coexistence enabled */ ATH10K_FLAG_BTCOEX, /* Per Station statistics service */ @@ -1181,6 +1178,9 @@ struct ath10k { /* protects shared structure data */ spinlock_t data_lock; + /* serialize wake_tx_queue calls per ac */ + spinlock_t queue_lock[IEEE80211_NUM_ACS]; + struct list_head arvifs; struct list_head peers; struct ath10k_peer *peer_map[ATH10K_MAX_NUM_PEER_IDS]; @@ -1330,6 +1330,7 @@ static inline bool ath10k_peer_stats_enabled(struct ath10k *ar) return false; } +extern unsigned int ath10k_frame_mode; extern unsigned long ath10k_coredump_mask; void ath10k_core_napi_sync_disable(struct ath10k *ar); diff --git a/sys/contrib/dev/athk/ath10k/coredump.c b/sys/contrib/dev/athk/ath10k/coredump.c index fe6b6f97a916..2d1634a890dd 100644 --- a/sys/contrib/dev/athk/ath10k/coredump.c +++ b/sys/contrib/dev/athk/ath10k/coredump.c @@ -531,7 +531,7 @@ static const struct ath10k_mem_section qca6174_hw30_sdio_register_sections[] = { {0x40000, 0x400A4}, - /* SI register is skiped here. + /* SI register is skipped here. * Because it will cause bus hang * * {0x50000, 0x50018}, diff --git a/sys/contrib/dev/athk/ath10k/coredump.h b/sys/contrib/dev/athk/ath10k/coredump.h index 240d70515088..437b9759f05d 100644 --- a/sys/contrib/dev/athk/ath10k/coredump.h +++ b/sys/contrib/dev/athk/ath10k/coredump.h @@ -125,7 +125,7 @@ enum ath10k_mem_region_type { * To minimize the size of the array, the list must obey the format: * '{start0,stop0},{start1,stop1},{start2,stop2}....' The values below must * also obey to 'start0 < stop0 < start1 < stop1 < start2 < ...', otherwise - * we may encouter error in the dump processing. + * we may encounter error in the dump processing. */ struct ath10k_mem_section { u32 start; diff --git a/sys/contrib/dev/athk/ath10k/debug.c b/sys/contrib/dev/athk/ath10k/debug.c index a35a6a4839c2..d0ad271088c8 100644 --- a/sys/contrib/dev/athk/ath10k/debug.c +++ b/sys/contrib/dev/athk/ath10k/debug.c @@ -10,6 +10,7 @@ #include #include #include +#include #if defined(__FreeBSD__) #ifdef CONFIG_ATH10K_DEBUG @@ -333,8 +334,8 @@ void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb) goto free; } - num_peers = ath10k_wmi_fw_stats_num_peers(&ar->debug.fw_stats.peers); - num_vdevs = ath10k_wmi_fw_stats_num_vdevs(&ar->debug.fw_stats.vdevs); + num_peers = list_count_nodes(&ar->debug.fw_stats.peers); + num_vdevs = list_count_nodes(&ar->debug.fw_stats.vdevs); is_start = (list_empty(&ar->debug.fw_stats.pdevs) && !list_empty(&stats.pdevs)); is_end = (!list_empty(&ar->debug.fw_stats.pdevs) && @@ -1122,7 +1123,7 @@ exit: * struct available.. */ -/* This generally cooresponds to the debugfs fw_stats file */ +/* This generally corresponds to the debugfs fw_stats file */ static const char ath10k_gstrings_stats[][ETH_GSTRING_LEN] = { "tx_pkts_nic", "tx_bytes_nic", @@ -2016,7 +2017,7 @@ static ssize_t ath10k_write_btcoex(struct file *file, buf[buf_size] = '\0'; - if (strtobool(buf, &val) != 0) + if (kstrtobool(buf, &val) != 0) return -EINVAL; if (!ar->coex_support) @@ -2154,7 +2155,7 @@ static ssize_t ath10k_write_peer_stats(struct file *file, buf[buf_size] = '\0'; - if (strtobool(buf, &val) != 0) + if (kstrtobool(buf, &val) != 0) return -EINVAL; mutex_lock(&ar->conf_mutex); diff --git a/sys/contrib/dev/athk/ath10k/debugfs_sta.c b/sys/contrib/dev/athk/ath10k/debugfs_sta.c index 367539f2c370..87a3365330ff 100644 --- a/sys/contrib/dev/athk/ath10k/debugfs_sta.c +++ b/sys/contrib/dev/athk/ath10k/debugfs_sta.c @@ -498,7 +498,7 @@ static char *get_num_ampdu_subfrm_str(enum ath10k_ampdu_subfrm_num i) { switch (i) { case ATH10K_AMPDU_SUBFRM_NUM_10: - return "upto 10"; + return "up to 10"; case ATH10K_AMPDU_SUBFRM_NUM_20: return "11-20"; case ATH10K_AMPDU_SUBFRM_NUM_30: diff --git a/sys/contrib/dev/athk/ath10k/htc.c b/sys/contrib/dev/athk/ath10k/htc.c index fab398046a3f..ea8d3296c499 100644 --- a/sys/contrib/dev/athk/ath10k/htc.c +++ b/sys/contrib/dev/athk/ath10k/htc.c @@ -7,6 +7,9 @@ #include "core.h" #include "hif.h" #include "debug.h" +#if defined(__FreeBSD__) +#include +#endif /********/ /* Send */ @@ -56,6 +59,15 @@ void ath10k_htc_notify_tx_completion(struct ath10k_htc_ep *ep, ath10k_dbg(ar, ATH10K_DBG_HTC, "%s: ep %d skb %pK\n", __func__, ep->eid, skb); + /* A corner case where the copy completion is reaching to host but still + * copy engine is processing it due to which host unmaps corresponding + * memory and causes SMMU fault, hence as workaround adding delay + * the unmapping memory to avoid SMMU faults. + */ + if (ar->hw_params.delay_unmap_buffer && + ep->ul_pipe_id == 3) + mdelay(2); + hdr = (struct ath10k_htc_hdr *)skb->data; ath10k_htc_restore_tx_skb(ep->htc, skb); @@ -947,13 +959,18 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc) return -ECOMM; } - htc->total_transmit_credits = __le16_to_cpu(msg->ready.credit_count); + if (ar->hw_params.use_fw_tx_credits) + htc->total_transmit_credits = __le16_to_cpu(msg->ready.credit_count); + else + htc->total_transmit_credits = 1; + htc->target_credit_size = __le16_to_cpu(msg->ready.credit_size); ath10k_dbg(ar, ATH10K_DBG_HTC, - "Target ready! transmit resources: %d size:%d\n", + "Target ready! transmit resources: %d size:%d actual credits:%d\n", htc->total_transmit_credits, - htc->target_credit_size); + htc->target_credit_size, + msg->ready.credit_count); if ((htc->total_transmit_credits == 0) || (htc->target_credit_size == 0)) { diff --git a/sys/contrib/dev/athk/ath10k/htt.h b/sys/contrib/dev/athk/ath10k/htt.h index 79d0837fc5a7..48e9b816abaf 100644 --- a/sys/contrib/dev/athk/ath10k/htt.h +++ b/sys/contrib/dev/athk/ath10k/htt.h @@ -710,7 +710,7 @@ struct htt_rx_indication_prefix { __le16 fw_rx_desc_bytes; u8 pad0; u8 pad1; -}; +} __packed; struct htt_rx_indication { struct htt_rx_indication_hdr hdr; @@ -1127,8 +1127,10 @@ struct htt_rx_in_ord_ind { u8 reserved; __le16 msdu_count; union { - struct htt_rx_in_ord_msdu_desc msdu_descs32[0]; - struct htt_rx_in_ord_msdu_desc_ext msdu_descs64[0]; + DECLARE_FLEX_ARRAY(struct htt_rx_in_ord_msdu_desc, + msdu_descs32); + DECLARE_FLEX_ARRAY(struct htt_rx_in_ord_msdu_desc_ext, + msdu_descs64); } __packed; } __packed; @@ -1582,7 +1584,7 @@ struct htt_tx_fetch_ind { /* ath10k_htt_get_tx_fetch_ind_resp_ids() */ DECLARE_FLEX_ARRAY(__le32, resp_ids); DECLARE_FLEX_ARRAY(struct htt_tx_fetch_record, records); - }; + } __packed; } __packed; static inline void * @@ -1740,7 +1742,7 @@ struct htt_resp { struct htt_tx_mode_switch_ind tx_mode_switch_ind; struct htt_channel_change chan_change; struct htt_peer_tx_stats peer_tx_stats; - }; + } __packed; } __packed; /*** host side structures follow ***/ diff --git a/sys/contrib/dev/athk/ath10k/htt_rx.c b/sys/contrib/dev/athk/ath10k/htt_rx.c index f3c5ad8fde92..e1bbbaf70e94 100644 --- a/sys/contrib/dev/athk/ath10k/htt_rx.c +++ b/sys/contrib/dev/athk/ath10k/htt_rx.c @@ -301,12 +301,16 @@ void ath10k_htt_rx_free(struct ath10k_htt *htt) ath10k_htt_get_vaddr_ring(htt), htt->rx_ring.base_paddr); + ath10k_htt_config_paddrs_ring(htt, NULL); + dma_free_coherent(htt->ar->dev, sizeof(*htt->rx_ring.alloc_idx.vaddr), htt->rx_ring.alloc_idx.vaddr, htt->rx_ring.alloc_idx.paddr); + htt->rx_ring.alloc_idx.vaddr = NULL; kfree(htt->rx_ring.netbufs_ring); + htt->rx_ring.netbufs_ring = NULL; } static inline struct sk_buff *ath10k_htt_rx_netbuf_pop(struct ath10k_htt *htt) @@ -429,7 +433,11 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt, RX_MSDU_END_INFO0_LAST_MSDU; /* FIXME: why are we skipping the first part of the rx_desc? */ - trace_ath10k_htt_rx_desc(ar, rx_desc + sizeof(u32), +#if defined(__linux__) + trace_ath10k_htt_rx_desc(ar, (void *)rx_desc + sizeof(u32), +#elif defined(__FreeBSD__) + trace_ath10k_htt_rx_desc(ar, (u8 *)rx_desc + sizeof(u32), +#endif hw->rx_desc_ops->rx_desc_size - sizeof(u32)); if (last_msdu) @@ -858,8 +866,10 @@ err_dma_idx: ath10k_htt_get_rx_ring_size(htt), vaddr_ring, htt->rx_ring.base_paddr); + ath10k_htt_config_paddrs_ring(htt, NULL); err_dma_ring: kfree(htt->rx_ring.netbufs_ring); + htt->rx_ring.netbufs_ring = NULL; err_netbuf: return -ENOMEM; } @@ -1389,7 +1399,7 @@ static void ath10k_process_rx(struct ath10k *ar, struct sk_buff *skb) ath10k_get_tid(hdr, tid, sizeof(tid)), is_multicast_ether_addr(ieee80211_get_DA(hdr)) ? "mcast" : "ucast", - (__le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4, + IEEE80211_SEQ_TO_SN(__le16_to_cpu(hdr->seq_ctrl)), (status->encoding == RX_ENC_LEGACY) ? "legacy" : "", (status->encoding == RX_ENC_HT) ? "ht" : "", (status->encoding == RX_ENC_VHT) ? "vht" : "", @@ -1960,15 +1970,14 @@ static void ath10k_htt_rx_h_csum_offload(struct ath10k_hw_params *hw, } static u64 ath10k_htt_rx_h_get_pn(struct ath10k *ar, struct sk_buff *skb, - u16 offset, enum htt_rx_mpdu_encrypt_type enctype) { struct ieee80211_hdr *hdr; u64 pn = 0; u8 *ehdr; - hdr = (struct ieee80211_hdr *)(skb->data + offset); - ehdr = skb->data + offset + ieee80211_hdrlen(hdr->frame_control); + hdr = (struct ieee80211_hdr *)skb->data; + ehdr = skb->data + ieee80211_hdrlen(hdr->frame_control); if (enctype == HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2) { pn = ehdr[0]; @@ -1982,19 +1991,17 @@ static u64 ath10k_htt_rx_h_get_pn(struct ath10k *ar, struct sk_buff *skb, } static bool ath10k_htt_rx_h_frag_multicast_check(struct ath10k *ar, - struct sk_buff *skb, - u16 offset) + struct sk_buff *skb) { struct ieee80211_hdr *hdr; - hdr = (struct ieee80211_hdr *)(skb->data + offset); + hdr = (struct ieee80211_hdr *)skb->data; return !is_multicast_ether_addr(hdr->addr1); } static bool ath10k_htt_rx_h_frag_pn_check(struct ath10k *ar, struct sk_buff *skb, u16 peer_id, - u16 offset, enum htt_rx_mpdu_encrypt_type enctype) { struct ath10k_peer *peer; @@ -2009,16 +2016,16 @@ static bool ath10k_htt_rx_h_frag_pn_check(struct ath10k *ar, return false; } - hdr = (struct ieee80211_hdr *)(skb->data + offset); + hdr = (struct ieee80211_hdr *)skb->data; if (ieee80211_is_data_qos(hdr->frame_control)) tid = ieee80211_get_tid(hdr); else tid = ATH10K_TXRX_NON_QOS_TID; last_pn = &peer->frag_tids_last_pn[tid]; - new_pn.pn48 = ath10k_htt_rx_h_get_pn(ar, skb, offset, enctype); + new_pn.pn48 = ath10k_htt_rx_h_get_pn(ar, skb, enctype); frag_number = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG; - seq = (__le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4; + seq = IEEE80211_SEQ_TO_SN(__le16_to_cpu(hdr->seq_ctrl)); if (frag_number == 0) { last_pn->pn48 = new_pn.pn48; @@ -2183,13 +2190,11 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar, frag_pn_check = ath10k_htt_rx_h_frag_pn_check(ar, msdu, peer_id, - 0, enctype); if (frag) multicast_check = ath10k_htt_rx_h_frag_multicast_check(ar, - msdu, - 0); + msdu); if (!frag_pn_check || !multicast_check) { /* Discard the fragment with invalid PN or multicast DA @@ -2634,7 +2639,7 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt, /* I have not yet seen any case where num_mpdu_ranges > 1. * qcacld does not seem handle that case either, so we introduce the - * same limitiation here as well. + * same limitation here as well. */ if (num_mpdu_ranges > 1) ath10k_warn(ar, @@ -2956,7 +2961,7 @@ static bool ath10k_htt_rx_proc_rx_frag_ind_hl(struct ath10k_htt *htt, hdr_space = ieee80211_hdrlen(hdr->frame_control); sc = __le16_to_cpu(hdr->seq_ctrl); - seq = (sc & IEEE80211_SCTL_SEQ) >> 4; + seq = IEEE80211_SEQ_TO_SN(sc); frag = sc & IEEE80211_SCTL_FRAG; sec_index = MS(rx_desc_info, HTT_RX_DESC_HL_INFO_MCAST_BCAST) ? @@ -3709,7 +3714,7 @@ static void ath10k_htt_rx_tx_mode_switch_ind(struct ath10k *ar, threshold = MS(info1, HTT_TX_MODE_SWITCH_IND_INFO1_THRESHOLD); ath10k_dbg(ar, ATH10K_DBG_HTT, - "htt rx tx mode switch ind info0 0x%04hx info1 0x%04x enable %d num records %zd mode %d threshold %u\n", + "htt rx tx mode switch ind info0 0x%04x info1 0x%04x enable %d num records %zd mode %d threshold %u\n", info0, info1, enable, num_records, mode, threshold); len += sizeof(resp->tx_mode_switch_ind.records[0]) * num_records; @@ -3986,7 +3991,7 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar, switch (txrate.flags) { case WMI_RATE_PREAMBLE_OFDM: if (arsta->arvif && arsta->arvif->vif) - conf = rcu_dereference(arsta->arvif->vif->chanctx_conf); + conf = rcu_dereference(arsta->arvif->vif->bss_conf.chanctx_conf); if (conf && conf->def.chan->band == NL80211_BAND_5GHZ) arsta->tx_info.status.rates[0].idx = rate_idx - 4; break; @@ -4030,6 +4035,10 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar, arsta->tx_info.status.rates[0].flags |= IEEE80211_TX_RC_80_MHZ_WIDTH; break; + case RATE_INFO_BW_160: + arsta->tx_info.status.rates[0].flags |= + IEEE80211_TX_RC_160_MHZ_WIDTH; + break; } if (peer_stats->succ_pkts) { diff --git a/sys/contrib/dev/athk/ath10k/htt_tx.c b/sys/contrib/dev/athk/ath10k/htt_tx.c index 9842a4b2f78f..bd603feb7953 100644 --- a/sys/contrib/dev/athk/ath10k/htt_tx.c +++ b/sys/contrib/dev/athk/ath10k/htt_tx.c @@ -1112,7 +1112,7 @@ int ath10k_htt_tx_fetch_resp(struct ath10k *ar, int len = 0; int ret; - /* Response IDs are echo-ed back only for host driver convienence + /* Response IDs are echo-ed back only for host driver convenience * purposes. They aren't used for anything in the driver yet so use 0. */ @@ -1275,7 +1275,6 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm struct ath10k *ar = htt->ar; int res, data_len; struct htt_cmd_hdr *cmd_hdr; - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data; struct htt_data_tx_desc *tx_desc; struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu); struct sk_buff *tmp_skb; @@ -1286,11 +1285,15 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm u16 flags1 = 0; *** 2501 LINES SKIPPED *** From nobody Mon Aug 21 01:36: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 4RTZpB35LKz4r14X; Mon, 21 Aug 2023 01: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 4RTZp971BXz4kwH; Mon, 21 Aug 2023 01:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BCxohiBHFkOAqVqOebNljtkhgM88O4a/vTFJJRv0buc=; b=Y2BZcLT9XsLrOopjkjjXhPgbpYqxN1xQ2YiF+BTj8dG+EvkHPh+nKZy21muFBzCJ9AoorU wXy+3nALs/MCyo2VBov4/8rUFs8H21w3gfr+nxDQzCy41l2/0NvN5cdz2cVXCnLi3x/ZLe PanTJ0e3o0ZIiAu3QZ80t7GZifrlYFbPLGN09W4gmiL/gRZ0OEsu/W5l/arNNp8o4a6Poy Trg5io0oIE9myy3ZUEsajmgUUIg7bHZwjbKZZSD37vJoX2dop/SA5WuOxYjH9p86NkWVeU UJT0CpqBpiIuPDbaH7lfiFhRXBbWZj5y05FGFwm44l8ZhBUY/AyYHrKw7wKmGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BCxohiBHFkOAqVqOebNljtkhgM88O4a/vTFJJRv0buc=; b=yS0DQpFboTdd0DuWdZfTsj4BCMbt2zqs+6KgtFTrQaT2xC7hjBKTM5UPyIlKsiBsGR/Lxk vYSsNJ+74A4/51Oyj5l9eifi0sMRtL/YuQ25o9HWmc+/EPkaC321gVcORXJ1cExUKPhpsl bo6VMuu4GP1qQTIdESvaGuaW5UGuJhcLcXZclPR2v3tcjctQn4mlV76YXVdJoR9p3twhc0 FDyR3KCzTft+dqAUj+dgC1N2F9ZdCSSChmRAyVJ9lNyrYv6xGj1BMrGG8YQ8qg9m5rm6di wiXHSWbyzOjXPD0WG0Ky2kxXdrBBnx/rOheM3RcROlXrcYf/WHIqy34IDqR8DQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692581809; a=rsa-sha256; cv=none; b=F03diWTP/x08/+eCELroKQZOC+yduaqwthIByDh3VUJaoW35cXNT0U2JaSXkIPW1tEMc5O fyDYw2N9mYEz/r0norbQ7rkf3bvrFfCICYKzXPR+pQ3+soz9DigeCtpgP78pARCkiAYIs3 ncdi48OD/a/sc81oi5Ao0BaKxy1QcG22iPI7JISxVlz1DudMYjFe4wbmslAJLIS4V01v// fHmXdDu/zTZ9WQ1LwW941NARcSUeieCffjIgaSpmv6gImvxoQZiarxkKsk7a3oAPu2SHDv zrmDVvBvaIiVhX31gxRU58k9IENMZ9FSVHLhkOHlprPCY59r0ZPYzJM5xlE4XQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTZp964B6z11jd; Mon, 21 Aug 2023 01:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37L1anE1038327; Mon, 21 Aug 2023 01:36:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37L1anMP038324; Mon, 21 Aug 2023 01:36:49 GMT (envelope-from git) Date: Mon, 21 Aug 2023 01:36:49 GMT Message-Id: <202308210136.37L1anMP038324@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: 28348caeee6e - main - ath11k: update driver from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28348caeee6ee98251b0aaa026e8d52b5032e92c Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=28348caeee6ee98251b0aaa026e8d52b5032e92c commit 28348caeee6ee98251b0aaa026e8d52b5032e92c Author: Bjoern A. Zeeb AuthorDate: 2023-05-20 00:36:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-21 01:32:46 +0000 ath11k: update driver from upstream This is a set of updates of the ath11k driver based on wireless-testing (wt-2023-05-11) 711dca0ca3d77414f8f346e564e9c8640147f40d (after v6.4-rc1), (wt-2023-06-09) 7bd20e011626ccc3ad53e57873452b1716fcfaaa (after v6.4-rc5), (wt-2023-07-24) 62e409149b62a285e89018e49b2e115757fb9022 (after v6.5-rc3), (wt-2023-08-06) 2a220a15be657a24868368892e3e2caba2115283 (after v6.5-rc4). MFC after: 20 days --- sys/contrib/dev/athk/ath11k/Makefile | 3 +- sys/contrib/dev/athk/ath11k/ahb.c | 650 +++++- sys/contrib/dev/athk/ath11k/ahb.h | 25 + sys/contrib/dev/athk/ath11k/ce.c | 12 +- sys/contrib/dev/athk/ath11k/ce.h | 18 +- sys/contrib/dev/athk/ath11k/core.c | 963 ++++++-- sys/contrib/dev/athk/ath11k/core.h | 250 +- sys/contrib/dev/athk/ath11k/dbring.c | 31 +- sys/contrib/dev/athk/ath11k/debug.c | 4 +- sys/contrib/dev/athk/ath11k/debug.h | 53 +- sys/contrib/dev/athk/ath11k/debugfs.c | 979 +++++++- sys/contrib/dev/athk/ath11k/debugfs.h | 185 +- sys/contrib/dev/athk/ath11k/debugfs_htt_stats.c | 202 +- sys/contrib/dev/athk/ath11k/debugfs_htt_stats.h | 159 +- sys/contrib/dev/athk/ath11k/debugfs_sta.c | 107 + sys/contrib/dev/athk/ath11k/dp.c | 32 +- sys/contrib/dev/athk/ath11k/dp.h | 41 +- sys/contrib/dev/athk/ath11k/dp_rx.c | 349 ++- sys/contrib/dev/athk/ath11k/dp_tx.c | 111 +- sys/contrib/dev/athk/ath11k/dp_tx.h | 1 + sys/contrib/dev/athk/ath11k/hal.c | 48 +- sys/contrib/dev/athk/ath11k/hal.h | 45 +- sys/contrib/dev/athk/ath11k/hal_desc.h | 9 +- sys/contrib/dev/athk/ath11k/hal_rx.c | 507 +++- sys/contrib/dev/athk/ath11k/hal_rx.h | 155 +- sys/contrib/dev/athk/ath11k/hal_tx.c | 4 +- sys/contrib/dev/athk/ath11k/hal_tx.h | 2 + sys/contrib/dev/athk/ath11k/hif.h | 11 + sys/contrib/dev/athk/ath11k/htc.c | 50 +- sys/contrib/dev/athk/ath11k/hw.c | 737 +++++- sys/contrib/dev/athk/ath11k/hw.h | 93 +- sys/contrib/dev/athk/ath11k/mac.c | 2159 +++++++++++++---- sys/contrib/dev/athk/ath11k/mac.h | 11 +- sys/contrib/dev/athk/ath11k/mhi.c | 310 +-- sys/contrib/dev/athk/ath11k/mhi.h | 17 +- sys/contrib/dev/athk/ath11k/pci.c | 1128 +++------ sys/contrib/dev/athk/ath11k/pci.h | 28 +- sys/contrib/dev/athk/ath11k/pcic.c | 827 +++++++ sys/contrib/dev/athk/ath11k/pcic.h | 54 + sys/contrib/dev/athk/ath11k/peer.c | 404 +++- sys/contrib/dev/athk/ath11k/peer.h | 11 +- sys/contrib/dev/athk/ath11k/qmi.c | 545 ++++- sys/contrib/dev/athk/ath11k/qmi.h | 44 +- sys/contrib/dev/athk/ath11k/reg.c | 137 +- sys/contrib/dev/athk/ath11k/reg.h | 2 +- sys/contrib/dev/athk/ath11k/rx_desc.h | 8 +- sys/contrib/dev/athk/ath11k/spectral.c | 41 +- sys/contrib/dev/athk/ath11k/spectral.h | 1 + sys/contrib/dev/athk/ath11k/testmode.c | 387 ++- sys/contrib/dev/athk/ath11k/testmode.h | 6 +- sys/contrib/dev/athk/ath11k/testmode_i.h | 18 +- sys/contrib/dev/athk/ath11k/thermal.c | 2 +- sys/contrib/dev/athk/ath11k/thermal.h | 2 +- sys/contrib/dev/athk/ath11k/trace.h | 35 +- sys/contrib/dev/athk/ath11k/wmi.c | 2854 +++++++++++++++++++---- sys/contrib/dev/athk/ath11k/wmi.h | 1114 ++++++++- sys/contrib/dev/athk/ath11k/wow.c | 805 +++++++ sys/contrib/dev/athk/ath11k/wow.h | 45 + sys/modules/ath11k/Makefile | 10 +- 59 files changed, 13609 insertions(+), 3232 deletions(-) diff --git a/sys/contrib/dev/athk/ath11k/Makefile b/sys/contrib/dev/athk/ath11k/Makefile index c1fce4159f1f..cc47e0114595 100644 --- a/sys/contrib/dev/athk/ath11k/Makefile +++ b/sys/contrib/dev/athk/ath11k/Makefile @@ -17,13 +17,14 @@ ath11k-y += core.o \ peer.o \ dbring.o \ hw.o \ - wow.o + pcic.o ath11k-$(CONFIG_ATH11K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o ath11k-$(CONFIG_NL80211_TESTMODE) += testmode.o ath11k-$(CONFIG_ATH11K_TRACING) += trace.o ath11k-$(CONFIG_THERMAL) += thermal.o ath11k-$(CONFIG_ATH11K_SPECTRAL) += spectral.o +ath11k-$(CONFIG_PM) += wow.o obj-$(CONFIG_ATH11K_AHB) += ath11k_ahb.o ath11k_ahb-y += ahb.o diff --git a/sys/contrib/dev/athk/ath11k/ahb.c b/sys/contrib/dev/athk/ath11k/ahb.c index f93686d0d25d..ceb3ccbb1827 100644 --- a/sys/contrib/dev/athk/ath11k/ahb.c +++ b/sys/contrib/dev/athk/ath11k/ahb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -8,10 +9,16 @@ #include #include #include +#include +#include #include "ahb.h" #include "debug.h" #include "hif.h" +#include "qmi.h" #include +#include "pcic.h" +#include +#include static const struct of_device_id ath11k_ahb_of_match[] = { /* TODO: Should we change the compatible string to something similar @@ -23,18 +30,17 @@ static const struct of_device_id ath11k_ahb_of_match[] = { { .compatible = "qcom,ipq6018-wifi", .data = (void *)ATH11K_HW_IPQ6018_HW10, }, + { .compatible = "qcom,wcn6750-wifi", + .data = (void *)ATH11K_HW_WCN6750_HW10, + }, + { .compatible = "qcom,ipq5018-wifi", + .data = (void *)ATH11K_HW_IPQ5018_HW10, + }, { } }; MODULE_DEVICE_TABLE(of, ath11k_ahb_of_match); -static const struct ath11k_bus_params ath11k_ahb_bus_params = { - .mhi_support = false, - .m3_fw_support = false, - .fixed_bdf_addr = true, - .fixed_mem_region = true, -}; - #define ATH11K_IRQ_CE0_OFFSET 4 static const char *irq_name[ATH11K_IRQ_NUM_MAX] = { @@ -134,6 +140,61 @@ enum ext_irq_num { tcl2host_status_ring, }; +static int +ath11k_ahb_get_msi_irq_wcn6750(struct ath11k_base *ab, unsigned int vector) +{ + return ab->pci.msi.irqs[vector]; +} + +static inline u32 +ath11k_ahb_get_window_start_wcn6750(struct ath11k_base *ab, u32 offset) +{ + u32 window_start = 0; + + /* If offset lies within DP register range, use 1st window */ + if ((offset ^ HAL_SEQ_WCSS_UMAC_OFFSET) < ATH11K_PCI_WINDOW_RANGE_MASK) + window_start = ATH11K_PCI_WINDOW_START; + /* If offset lies within CE register range, use 2nd window */ + else if ((offset ^ HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab)) < + ATH11K_PCI_WINDOW_RANGE_MASK) + window_start = 2 * ATH11K_PCI_WINDOW_START; + + return window_start; +} + +static void +ath11k_ahb_window_write32_wcn6750(struct ath11k_base *ab, u32 offset, u32 value) +{ + u32 window_start; + + /* WCN6750 uses static window based register access*/ + window_start = ath11k_ahb_get_window_start_wcn6750(ab, offset); + + iowrite32(value, ab->mem + window_start + + (offset & ATH11K_PCI_WINDOW_RANGE_MASK)); +} + +static u32 ath11k_ahb_window_read32_wcn6750(struct ath11k_base *ab, u32 offset) +{ + u32 window_start; + u32 val; + + /* WCN6750 uses static window based register access */ + window_start = ath11k_ahb_get_window_start_wcn6750(ab, offset); + + val = ioread32(ab->mem + window_start + + (offset & ATH11K_PCI_WINDOW_RANGE_MASK)); + return val; +} + +static const struct ath11k_pci_ops ath11k_ahb_pci_ops_wcn6750 = { + .wakeup = NULL, + .release = NULL, + .get_msi_irq = ath11k_ahb_get_msi_irq_wcn6750, + .window_write32 = ath11k_ahb_window_write32_wcn6750, + .window_read32 = ath11k_ahb_window_read32_wcn6750, +}; + static inline u32 ath11k_ahb_read32(struct ath11k_base *ab, u32 offset) { return ioread32(ab->mem + offset); @@ -210,30 +271,42 @@ static void ath11k_ahb_clearbit32(struct ath11k_base *ab, u8 bit, u32 offset) static void ath11k_ahb_ce_irq_enable(struct ath11k_base *ab, u16 ce_id) { const struct ce_attr *ce_attr; + const struct ce_ie_addr *ce_ie_addr = ab->hw_params.ce_ie_addr; + u32 ie1_reg_addr, ie2_reg_addr, ie3_reg_addr; + + ie1_reg_addr = ce_ie_addr->ie1_reg_addr + ATH11K_CE_OFFSET(ab); + ie2_reg_addr = ce_ie_addr->ie2_reg_addr + ATH11K_CE_OFFSET(ab); + ie3_reg_addr = ce_ie_addr->ie3_reg_addr + ATH11K_CE_OFFSET(ab); ce_attr = &ab->hw_params.host_ce_config[ce_id]; if (ce_attr->src_nentries) - ath11k_ahb_setbit32(ab, ce_id, CE_HOST_IE_ADDRESS); + ath11k_ahb_setbit32(ab, ce_id, ie1_reg_addr); if (ce_attr->dest_nentries) { - ath11k_ahb_setbit32(ab, ce_id, CE_HOST_IE_2_ADDRESS); + ath11k_ahb_setbit32(ab, ce_id, ie2_reg_addr); ath11k_ahb_setbit32(ab, ce_id + CE_HOST_IE_3_SHIFT, - CE_HOST_IE_3_ADDRESS); + ie3_reg_addr); } } static void ath11k_ahb_ce_irq_disable(struct ath11k_base *ab, u16 ce_id) { const struct ce_attr *ce_attr; + const struct ce_ie_addr *ce_ie_addr = ab->hw_params.ce_ie_addr; + u32 ie1_reg_addr, ie2_reg_addr, ie3_reg_addr; + + ie1_reg_addr = ce_ie_addr->ie1_reg_addr + ATH11K_CE_OFFSET(ab); + ie2_reg_addr = ce_ie_addr->ie2_reg_addr + ATH11K_CE_OFFSET(ab); + ie3_reg_addr = ce_ie_addr->ie3_reg_addr + ATH11K_CE_OFFSET(ab); ce_attr = &ab->hw_params.host_ce_config[ce_id]; if (ce_attr->src_nentries) - ath11k_ahb_clearbit32(ab, ce_id, CE_HOST_IE_ADDRESS); + ath11k_ahb_clearbit32(ab, ce_id, ie1_reg_addr); if (ce_attr->dest_nentries) { - ath11k_ahb_clearbit32(ab, ce_id, CE_HOST_IE_2_ADDRESS); + ath11k_ahb_clearbit32(ab, ce_id, ie2_reg_addr); ath11k_ahb_clearbit32(ab, ce_id + CE_HOST_IE_3_SHIFT, - CE_HOST_IE_3_ADDRESS); + ie3_reg_addr); } } @@ -346,31 +419,6 @@ static void ath11k_ahb_power_down(struct ath11k_base *ab) rproc_shutdown(ab_ahb->tgt_rproc); } -static int ath11k_ahb_fwreset_from_cold_boot(struct ath11k_base *ab) -{ - int timeout; - - if (ath11k_cold_boot_cal == 0 || ab->qmi.cal_done || - ab->hw_params.cold_boot_calib == 0) - return 0; - - ath11k_dbg(ab, ATH11K_DBG_AHB, "wait for cold boot done\n"); - timeout = wait_event_timeout(ab->qmi.cold_boot_waitq, - (ab->qmi.cal_done == 1), - ATH11K_COLD_BOOT_FW_RESET_DELAY); - if (timeout <= 0) { - ath11k_cold_boot_cal = 0; - ath11k_warn(ab, "Coldboot Calibration failed timed out\n"); - } - - /* reset the firmware */ - ath11k_ahb_power_down(ab); - ath11k_ahb_power_up(ab); - - ath11k_dbg(ab, ATH11K_DBG_AHB, "exited from cold boot mode\n"); - return 0; -} - static void ath11k_ahb_init_qmi_ce_config(struct ath11k_base *ab) { struct ath11k_qmi_ce_cfg *cfg = &ab->qmi.ce_cfg; @@ -391,6 +439,8 @@ static void ath11k_ahb_free_ext_irq(struct ath11k_base *ab) for (j = 0; j < irq_grp->num_irq; j++) free_irq(ab->irq_num[irq_grp->irqs[j]], irq_grp); + + netif_napi_del(&irq_grp->napi); } } @@ -399,6 +449,9 @@ static void ath11k_ahb_free_irq(struct ath11k_base *ab) int irq_idx; int i; + if (ab->hw_params.hybrid_bus_type) + return ath11k_pcic_free_irq(ab); + for (i = 0; i < ab->hw_params.ce_count; i++) { if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) continue; @@ -466,7 +519,7 @@ static irqreturn_t ath11k_ahb_ext_interrupt_handler(int irq, void *arg) return IRQ_HANDLED; } -static int ath11k_ahb_ext_irq_config(struct ath11k_base *ab) +static int ath11k_ahb_config_ext_irq(struct ath11k_base *ab) { struct ath11k_hw_params *hw = &ab->hw_params; int i, j; @@ -553,6 +606,9 @@ static int ath11k_ahb_config_irq(struct ath11k_base *ab) int irq, irq_idx, i; int ret; + if (ab->hw_params.hybrid_bus_type) + return ath11k_pcic_config_irq(ab); + /* Configure CE irqs */ for (i = 0; i < ab->hw_params.ce_count; i++) { struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i]; @@ -574,7 +630,7 @@ static int ath11k_ahb_config_irq(struct ath11k_base *ab) } /* Configure external interrupts */ - ret = ath11k_ahb_ext_irq_config(ab); + ret = ath11k_ahb_config_ext_irq(ab); return ret; } @@ -622,11 +678,90 @@ static int ath11k_ahb_map_service_to_pipe(struct ath11k_base *ab, u16 service_id return 0; } -static const struct ath11k_hif_ops ath11k_ahb_hif_ops = { +static int ath11k_ahb_hif_suspend(struct ath11k_base *ab) +{ + struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab); + u32 wake_irq; + u32 value = 0; + int ret; + + if (!device_may_wakeup(ab->dev)) + return -EPERM; + + wake_irq = ab->irq_num[ATH11K_PCI_IRQ_CE0_OFFSET + ATH11K_PCI_CE_WAKE_IRQ]; + + ret = enable_irq_wake(wake_irq); + if (ret) { + ath11k_err(ab, "failed to enable wakeup irq :%d\n", ret); + return ret; + } + + value = u32_encode_bits(ab_ahb->smp2p_info.seq_no++, + ATH11K_AHB_SMP2P_SMEM_SEQ_NO); + value |= u32_encode_bits(ATH11K_AHB_POWER_SAVE_ENTER, + ATH11K_AHB_SMP2P_SMEM_MSG); + + ret = qcom_smem_state_update_bits(ab_ahb->smp2p_info.smem_state, + ATH11K_AHB_SMP2P_SMEM_VALUE_MASK, value); + if (ret) { + ath11k_err(ab, "failed to send smp2p power save enter cmd :%d\n", ret); + return ret; + } + + ath11k_dbg(ab, ATH11K_DBG_AHB, "device suspended\n"); + + return ret; +} + +static int ath11k_ahb_hif_resume(struct ath11k_base *ab) +{ + struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab); + u32 wake_irq; + u32 value = 0; + int ret; + + if (!device_may_wakeup(ab->dev)) + return -EPERM; + + wake_irq = ab->irq_num[ATH11K_PCI_IRQ_CE0_OFFSET + ATH11K_PCI_CE_WAKE_IRQ]; + + ret = disable_irq_wake(wake_irq); + if (ret) { + ath11k_err(ab, "failed to disable wakeup irq: %d\n", ret); + return ret; + } + + reinit_completion(&ab->wow.wakeup_completed); + + value = u32_encode_bits(ab_ahb->smp2p_info.seq_no++, + ATH11K_AHB_SMP2P_SMEM_SEQ_NO); + value |= u32_encode_bits(ATH11K_AHB_POWER_SAVE_EXIT, + ATH11K_AHB_SMP2P_SMEM_MSG); + + ret = qcom_smem_state_update_bits(ab_ahb->smp2p_info.smem_state, + ATH11K_AHB_SMP2P_SMEM_VALUE_MASK, value); + if (ret) { + ath11k_err(ab, "failed to send smp2p power save enter cmd :%d\n", ret); + return ret; + } + + ret = wait_for_completion_timeout(&ab->wow.wakeup_completed, 3 * HZ); + if (ret == 0) { + ath11k_warn(ab, "timed out while waiting for wow wakeup completion\n"); + return -ETIMEDOUT; + } + + ath11k_dbg(ab, ATH11K_DBG_AHB, "device resumed\n"); + + return 0; +} + +static const struct ath11k_hif_ops ath11k_ahb_hif_ops_ipq8074 = { .start = ath11k_ahb_start, .stop = ath11k_ahb_stop, .read32 = ath11k_ahb_read32, .write32 = ath11k_ahb_write32, + .read = NULL, .irq_enable = ath11k_ahb_ext_irq_enable, .irq_disable = ath11k_ahb_ext_irq_disable, .map_service_to_pipe = ath11k_ahb_map_service_to_pipe, @@ -634,6 +769,25 @@ static const struct ath11k_hif_ops ath11k_ahb_hif_ops = { .power_up = ath11k_ahb_power_up, }; +static const struct ath11k_hif_ops ath11k_ahb_hif_ops_wcn6750 = { + .start = ath11k_pcic_start, + .stop = ath11k_pcic_stop, + .read32 = ath11k_pcic_read32, + .write32 = ath11k_pcic_write32, + .read = NULL, + .irq_enable = ath11k_pcic_ext_irq_enable, + .irq_disable = ath11k_pcic_ext_irq_disable, + .get_msi_address = ath11k_pcic_get_msi_address, + .get_user_msi_vector = ath11k_pcic_get_user_msi_assignment, + .map_service_to_pipe = ath11k_pcic_map_service_to_pipe, + .power_down = ath11k_ahb_power_down, + .power_up = ath11k_ahb_power_up, + .suspend = ath11k_ahb_hif_suspend, + .resume = ath11k_ahb_hif_resume, + .ce_irq_enable = ath11k_pci_enable_ce_irqs_except_wake_irq, + .ce_irq_disable = ath11k_pci_disable_ce_irqs_except_wake_irq, +}; + static int ath11k_core_get_rproc(struct ath11k_base *ab) { struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab); @@ -656,12 +810,284 @@ static int ath11k_core_get_rproc(struct ath11k_base *ab) return 0; } +static int ath11k_ahb_setup_msi_resources(struct ath11k_base *ab) +{ + struct platform_device *pdev = ab->pdev; + phys_addr_t msi_addr_pa; + dma_addr_t msi_addr_iova; + struct resource *res; + int int_prop; + int ret; + int i; + + ret = ath11k_pcic_init_msi_config(ab); + if (ret) { + ath11k_err(ab, "failed to init msi config: %d\n", ret); + return ret; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + ath11k_err(ab, "failed to fetch msi_addr\n"); + return -ENOENT; + } + + msi_addr_pa = res->start; + msi_addr_iova = dma_map_resource(ab->dev, msi_addr_pa, PAGE_SIZE, + DMA_FROM_DEVICE, 0); + if (dma_mapping_error(ab->dev, msi_addr_iova)) + return -ENOMEM; + + ab->pci.msi.addr_lo = lower_32_bits(msi_addr_iova); + ab->pci.msi.addr_hi = upper_32_bits(msi_addr_iova); + + ret = of_property_read_u32_index(ab->dev->of_node, "interrupts", 1, &int_prop); + if (ret) + return ret; + + ab->pci.msi.ep_base_data = int_prop + 32; + + for (i = 0; i < ab->pci.msi.config->total_vectors; i++) { + ret = platform_get_irq(pdev, i); + if (ret < 0) + return ret; + + ab->pci.msi.irqs[i] = ret; + } + + set_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &ab->dev_flags); + + return 0; +} + +static int ath11k_ahb_setup_smp2p_handle(struct ath11k_base *ab) +{ + struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab); + + if (!ab->hw_params.smp2p_wow_exit) + return 0; + + ab_ahb->smp2p_info.smem_state = qcom_smem_state_get(ab->dev, "wlan-smp2p-out", + &ab_ahb->smp2p_info.smem_bit); + if (IS_ERR(ab_ahb->smp2p_info.smem_state)) { + ath11k_err(ab, "failed to fetch smem state: %ld\n", + PTR_ERR(ab_ahb->smp2p_info.smem_state)); + return PTR_ERR(ab_ahb->smp2p_info.smem_state); + } + + return 0; +} + +static void ath11k_ahb_release_smp2p_handle(struct ath11k_base *ab) +{ + struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab); + + if (!ab->hw_params.smp2p_wow_exit) + return; + + qcom_smem_state_put(ab_ahb->smp2p_info.smem_state); +} + +static int ath11k_ahb_setup_resources(struct ath11k_base *ab) +{ + struct platform_device *pdev = ab->pdev; + struct resource *mem_res; + void __iomem *mem; + + if (ab->hw_params.hybrid_bus_type) + return ath11k_ahb_setup_msi_resources(ab); + + mem = devm_platform_get_and_ioremap_resource(pdev, 0, &mem_res); + if (IS_ERR(mem)) { + dev_err(&pdev->dev, "ioremap error\n"); + return PTR_ERR(mem); + } + + ab->mem = mem; + ab->mem_len = resource_size(mem_res); + + return 0; +} + +static int ath11k_ahb_setup_msa_resources(struct ath11k_base *ab) +{ + struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab); + struct device *dev = ab->dev; + struct device_node *node; + struct resource r; + int ret; + + node = of_parse_phandle(dev->of_node, "memory-region", 0); + if (!node) + return -ENOENT; + + ret = of_address_to_resource(node, 0, &r); + of_node_put(node); + if (ret) { + dev_err(dev, "failed to resolve msa fixed region\n"); + return ret; + } + + ab_ahb->fw.msa_paddr = r.start; + ab_ahb->fw.msa_size = resource_size(&r); + + node = of_parse_phandle(dev->of_node, "memory-region", 1); + if (!node) + return -ENOENT; + + ret = of_address_to_resource(node, 0, &r); + of_node_put(node); + if (ret) { + dev_err(dev, "failed to resolve ce fixed region\n"); + return ret; + } + + ab_ahb->fw.ce_paddr = r.start; + ab_ahb->fw.ce_size = resource_size(&r); + + return 0; +} + +static int ath11k_ahb_fw_resources_init(struct ath11k_base *ab) +{ + struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab); + struct device *host_dev = ab->dev; + struct platform_device_info info = {0}; + struct iommu_domain *iommu_dom; + struct platform_device *pdev; + struct device_node *node; + int ret; + + /* Chipsets not requiring MSA need not initialize + * MSA resources, return success in such cases. + */ + if (!ab->hw_params.fixed_fw_mem) + return 0; + + ret = ath11k_ahb_setup_msa_resources(ab); + if (ret) { + ath11k_err(ab, "failed to setup msa resources\n"); + return ret; + } + + node = of_get_child_by_name(host_dev->of_node, "wifi-firmware"); + if (!node) { + ab_ahb->fw.use_tz = true; + return 0; + } + + info.fwnode = &node->fwnode; + info.parent = host_dev; + info.name = node->name; + info.dma_mask = DMA_BIT_MASK(32); + + pdev = platform_device_register_full(&info); + if (IS_ERR(pdev)) { + of_node_put(node); + return PTR_ERR(pdev); + } + + ret = of_dma_configure(&pdev->dev, node, true); + if (ret) { + ath11k_err(ab, "dma configure fail: %d\n", ret); + goto err_unregister; + } + + ab_ahb->fw.dev = &pdev->dev; + + iommu_dom = iommu_domain_alloc(&platform_bus_type); + if (!iommu_dom) { + ath11k_err(ab, "failed to allocate iommu domain\n"); + ret = -ENOMEM; + goto err_unregister; + } + + ret = iommu_attach_device(iommu_dom, ab_ahb->fw.dev); + if (ret) { + ath11k_err(ab, "could not attach device: %d\n", ret); + goto err_iommu_free; + } + + ret = iommu_map(iommu_dom, ab_ahb->fw.msa_paddr, + ab_ahb->fw.msa_paddr, ab_ahb->fw.msa_size, + IOMMU_READ | IOMMU_WRITE, GFP_KERNEL); + if (ret) { + ath11k_err(ab, "failed to map firmware region: %d\n", ret); + goto err_iommu_detach; + } + + ret = iommu_map(iommu_dom, ab_ahb->fw.ce_paddr, + ab_ahb->fw.ce_paddr, ab_ahb->fw.ce_size, + IOMMU_READ | IOMMU_WRITE, GFP_KERNEL); + if (ret) { + ath11k_err(ab, "failed to map firmware CE region: %d\n", ret); + goto err_iommu_unmap; + } + + ab_ahb->fw.use_tz = false; + ab_ahb->fw.iommu_domain = iommu_dom; + of_node_put(node); + + return 0; + +err_iommu_unmap: + iommu_unmap(iommu_dom, ab_ahb->fw.msa_paddr, ab_ahb->fw.msa_size); + +err_iommu_detach: + iommu_detach_device(iommu_dom, ab_ahb->fw.dev); + +err_iommu_free: + iommu_domain_free(iommu_dom); + +err_unregister: + platform_device_unregister(pdev); + of_node_put(node); + + return ret; +} + +static int ath11k_ahb_fw_resource_deinit(struct ath11k_base *ab) +{ + struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab); + struct iommu_domain *iommu; + size_t unmapped_size; + + /* Chipsets not requiring MSA would have not initialized + * MSA resources, return success in such cases. + */ + if (!ab->hw_params.fixed_fw_mem) + return 0; + + if (ab_ahb->fw.use_tz) + return 0; + + iommu = ab_ahb->fw.iommu_domain; + + unmapped_size = iommu_unmap(iommu, ab_ahb->fw.msa_paddr, ab_ahb->fw.msa_size); + if (unmapped_size != ab_ahb->fw.msa_size) + ath11k_err(ab, "failed to unmap firmware: %zu\n", + unmapped_size); + + unmapped_size = iommu_unmap(iommu, ab_ahb->fw.ce_paddr, ab_ahb->fw.ce_size); + if (unmapped_size != ab_ahb->fw.ce_size) + ath11k_err(ab, "failed to unmap firmware CE memory: %zu\n", + unmapped_size); + + iommu_detach_device(iommu, ab_ahb->fw.dev); + iommu_domain_free(iommu); + + platform_device_unregister(to_platform_device(ab_ahb->fw.dev)); + + return 0; +} + static int ath11k_ahb_probe(struct platform_device *pdev) { struct ath11k_base *ab; const struct of_device_id *of_id; - struct resource *mem_res; - void __iomem *mem; + const struct ath11k_hif_ops *hif_ops; + const struct ath11k_pci_ops *pci_ops; + enum ath11k_hw_rev hw_rev; int ret; of_id = of_match_device(ath11k_ahb_of_match, &pdev->dev); @@ -670,10 +1096,22 @@ static int ath11k_ahb_probe(struct platform_device *pdev) return -EINVAL; } - mem = devm_platform_get_and_ioremap_resource(pdev, 0, &mem_res); - if (IS_ERR(mem)) { - dev_err(&pdev->dev, "ioremap error\n"); - return PTR_ERR(mem); + hw_rev = (enum ath11k_hw_rev)of_id->data; + + switch (hw_rev) { + case ATH11K_HW_IPQ8074: + case ATH11K_HW_IPQ6018_HW10: + case ATH11K_HW_IPQ5018_HW10: + hif_ops = &ath11k_ahb_hif_ops_ipq8074; + pci_ops = NULL; + break; + case ATH11K_HW_WCN6750_HW10: + hif_ops = &ath11k_ahb_hif_ops_wcn6750; + pci_ops = &ath11k_ahb_pci_ops_wcn6750; + break; + default: + dev_err(&pdev->dev, "unsupported device type %d\n", hw_rev); + return -EOPNOTSUPP; } ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); @@ -683,28 +1121,60 @@ static int ath11k_ahb_probe(struct platform_device *pdev) } ab = ath11k_core_alloc(&pdev->dev, sizeof(struct ath11k_ahb), - ATH11K_BUS_AHB, - &ath11k_ahb_bus_params); + ATH11K_BUS_AHB); if (!ab) { dev_err(&pdev->dev, "failed to allocate ath11k base\n"); return -ENOMEM; } - ab->hif.ops = &ath11k_ahb_hif_ops; + ab->hif.ops = hif_ops; ab->pdev = pdev; - ab->hw_rev = (enum ath11k_hw_rev)of_id->data; - ab->mem = mem; - ab->mem_len = resource_size(mem_res); + ab->hw_rev = hw_rev; + ab->fw_mode = ATH11K_FIRMWARE_MODE_NORMAL; platform_set_drvdata(pdev, ab); + ret = ath11k_pcic_register_pci_ops(ab, pci_ops); + if (ret) { + ath11k_err(ab, "failed to register PCI ops: %d\n", ret); + goto err_core_free; + } + ret = ath11k_core_pre_init(ab); if (ret) goto err_core_free; - ret = ath11k_hal_srng_init(ab); + ret = ath11k_ahb_setup_resources(ab); if (ret) goto err_core_free; + ab->mem_ce = ab->mem; + + if (ab->hw_params.ce_remap) { + const struct ce_remap *ce_remap = ab->hw_params.ce_remap; + /* ce register space is moved out of wcss unlike ipq8074 or ipq6018 + * and the space is not contiguous, hence remapping the CE registers + * to a new space for accessing them. + */ + ab->mem_ce = ioremap(ce_remap->base, ce_remap->size); + if (!ab->mem_ce) { + dev_err(&pdev->dev, "ce ioremap error\n"); + ret = -ENOMEM; + goto err_core_free; + } + } + + ret = ath11k_ahb_fw_resources_init(ab); + if (ret) + goto err_core_free; + + ret = ath11k_ahb_setup_smp2p_handle(ab); + if (ret) + goto err_fw_deinit; + + ret = ath11k_hal_srng_init(ab); + if (ret) + goto err_release_smp2p_handle; + ret = ath11k_ce_alloc_pipes(ab); if (ret) { ath11k_err(ab, "failed to allocate ce pipes: %d\n", ret); @@ -731,7 +1201,7 @@ static int ath11k_ahb_probe(struct platform_device *pdev) goto err_ce_free; } - ath11k_ahb_fwreset_from_cold_boot(ab); + ath11k_qmi_fwreset_from_cold_boot(ab); return 0; @@ -741,6 +1211,12 @@ err_ce_free: err_hal_srng_deinit: ath11k_hal_srng_deinit(ab); +err_release_smp2p_handle: + ath11k_ahb_release_smp2p_handle(ab); + +err_fw_deinit: + ath11k_ahb_fw_resource_deinit(ab); + err_core_free: ath11k_core_free(ab); platform_set_drvdata(pdev, NULL); @@ -748,20 +1224,10 @@ err_core_free: return ret; } -static int ath11k_ahb_remove(struct platform_device *pdev) +static void ath11k_ahb_remove_prepare(struct ath11k_base *ab) { - struct ath11k_base *ab = platform_get_drvdata(pdev); unsigned long left; - if (test_bit(ATH11K_FLAG_QMI_FAIL, &ab->dev_flags)) { - ath11k_ahb_power_down(ab); - ath11k_debugfs_soc_destroy(ab); - ath11k_qmi_deinit_service(ab); - goto qmi_fail; - } - - reinit_completion(&ab->driver_recovery); - if (test_bit(ATH11K_FLAG_RECOVERY, &ab->dev_flags)) { left = wait_for_completion_timeout(&ab->driver_recovery, ATH11K_AHB_RECOVERY_TIMEOUT); @@ -771,18 +1237,65 @@ static int ath11k_ahb_remove(struct platform_device *pdev) set_bit(ATH11K_FLAG_UNREGISTERING, &ab->dev_flags); cancel_work_sync(&ab->restart_work); + cancel_work_sync(&ab->qmi.event_work); +} + +static void ath11k_ahb_free_resources(struct ath11k_base *ab) +{ + struct platform_device *pdev = ab->pdev; - ath11k_core_deinit(ab); -qmi_fail: ath11k_ahb_free_irq(ab); ath11k_hal_srng_deinit(ab); + ath11k_ahb_release_smp2p_handle(ab); + ath11k_ahb_fw_resource_deinit(ab); ath11k_ce_free_pipes(ab); + + if (ab->hw_params.ce_remap) + iounmap(ab->mem_ce); + ath11k_core_free(ab); platform_set_drvdata(pdev, NULL); +} + +static int ath11k_ahb_remove(struct platform_device *pdev) +{ + struct ath11k_base *ab = platform_get_drvdata(pdev); + + if (test_bit(ATH11K_FLAG_QMI_FAIL, &ab->dev_flags)) { + ath11k_ahb_power_down(ab); + ath11k_debugfs_soc_destroy(ab); + ath11k_qmi_deinit_service(ab); + goto qmi_fail; + } + + ath11k_ahb_remove_prepare(ab); + ath11k_core_deinit(ab); + +qmi_fail: + ath11k_ahb_free_resources(ab); return 0; } +static void ath11k_ahb_shutdown(struct platform_device *pdev) +{ + struct ath11k_base *ab = platform_get_drvdata(pdev); + + /* platform shutdown() & remove() are mutually exclusive. + * remove() is invoked during rmmod & shutdown() during + * system reboot/shutdown. + */ + ath11k_ahb_remove_prepare(ab); + + if (!(test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags))) + goto free_resources; + + ath11k_core_deinit(ab); + +free_resources: + ath11k_ahb_free_resources(ab); +} + static struct platform_driver ath11k_ahb_driver = { .driver = { .name = "ath11k", @@ -790,6 +1303,7 @@ static struct platform_driver ath11k_ahb_driver = { }, .probe = ath11k_ahb_probe, .remove = ath11k_ahb_remove, + .shutdown = ath11k_ahb_shutdown, }; static int ath11k_ahb_init(void) diff --git a/sys/contrib/dev/athk/ath11k/ahb.h b/sys/contrib/dev/athk/ath11k/ahb.h index 51e6e4a5f686..415ddfd26654 100644 --- a/sys/contrib/dev/athk/ath11k/ahb.h +++ b/sys/contrib/dev/athk/ath11k/ahb.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_AHB_H #define ATH11K_AHB_H @@ -8,10 +9,34 @@ #include "core.h" #define ATH11K_AHB_RECOVERY_TIMEOUT (3 * HZ) + +#define ATH11K_AHB_SMP2P_SMEM_MSG GENMASK(15, 0) +#define ATH11K_AHB_SMP2P_SMEM_SEQ_NO GENMASK(31, 16) +#define ATH11K_AHB_SMP2P_SMEM_VALUE_MASK 0xFFFFFFFF + *** 25161 LINES SKIPPED *** From nobody Mon Aug 21 01: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 4RTZpC5jCLz4r17T; Mon, 21 Aug 2023 01: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 4RTZpC4TSLz4kwf; Mon, 21 Aug 2023 01:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k9R1c39HKrmnqGlflSUas1US0FJcR4UR3zn3WR3vZTQ=; b=KgHXH4nDEv3TSND5YvcRNyErDjncArGhL0H+jSOQIiGpKxkTEQ6bf6Kn+7yFFpsFsWA4No i+TsZDQ6HnE1HvWNmllh75Op8lXwcbzcKwkJ+xAYM4I9PL0w95HvfaBRP/7Ja9avyKnghu b2D9qBqVg8WnARpWFDTB9nREmQS0N3vjGiDtLUNuapuEdoTT7ei9zIZOpegAXkO+ehJDr/ wXWMfGTYRqf17olJcK/mGBb4TsOfPplycgEdXUF8U07dwLq1WF3gwL69KkmDzDpiw/f75P D8j0BlRHsp7stbe3UDcHXpj8xaNnnxVHhd9gDt59W/dkvhh1q9shthlOlFB2Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k9R1c39HKrmnqGlflSUas1US0FJcR4UR3zn3WR3vZTQ=; b=AgYEPkcopQS1MLkyvTsoG6YCVIktXa9mnu6DZOTKfG6J561+b0lehadc4q3jsTIXbEuS3M nL4pyOhWrpMPy2+NwLIuXVEBQvSTB9XOQ5R29lXTJIzAXBFe7Xg5QKcZVAY+HfETwJlQWp tYoF2i1OkRogj0F9wReQSR8oV64XXoh5vEPxJTcdpNGsNekU0Q/sKIOTTrOfHHWN9fRTXZ JnY8m8BoHfYIFCG6KJHPeMoR/RD3C32TRhjKFdh23bEEbgjtbfiVHDDMmWolDg41ijEC07 Ps3if4/Z1JF0fU4aLy3ICCrIIImRY7hBEZ7QKpwFdJwDflLWWrLQnq1SanOV3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692581811; a=rsa-sha256; cv=none; b=M+2dkAfsRmOtAio9xFLrEadT53QAujz/MvH3MPMHs6TVBMdctBAwSeG2J5yuFnH5HmhwQh UB8LEmMiW+3k7m0VqfSY9Vg8Xcg61raQmf9uBvzslbcuGB69ipONv1NixN7D65KpCC5ebj 4lyjphNo66yB2H8X0VDItdCBDAdzjZHluZ1Ih5T9UkxJHaopAS5ljdngA9plt18nvHdzNG ycMWsIgfmmBzK7R0DdIU/ITEKz7a+C2Z/LZhMlA4M4MMifcPNdFY7EViV85Gt+igDCPvUB mt1pBCNJBmQo9+xgYAEAqgXvs826nU7/t/uu/WlLUputZNPQ4MGlGildXwQZxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTZpC2Wl7z11xp; Mon, 21 Aug 2023 01:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37L1ap6O038372; Mon, 21 Aug 2023 01:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37L1aojM038369; Mon, 21 Aug 2023 01:36:50 GMT (envelope-from git) Date: Mon, 21 Aug 2023 01:36:50 GMT Message-Id: <202308210136.37L1aojM038369@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: 5c1def83a4cc - main - ath12k: import driver from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c1def83a4cc2eb3f828600dfd786f8c5788fb7d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5c1def83a4cc2eb3f828600dfd786f8c5788fb7d commit 5c1def83a4cc2eb3f828600dfd786f8c5788fb7d Author: Bjoern A. Zeeb AuthorDate: 2023-06-11 00:23:44 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-21 01:33:04 +0000 ath12k: import driver from upstream Import BSD-3-Clause-Clear ath12k driver based on wireless-testing (wt-2023-05-11) 711dca0ca3d77414f8f346e564e9c8640147f40d (after v6.4-rc1) with further updates based on (wt-2023-06-09) 7bd20e011626ccc3ad53e57873452b1716fcfaaa (after v6.4-rc5), (wt-2023-07-24) 62e409149b62a285e89018e49b2e115757fb9022 (after v6.5-rc3), (wt-2023-08-06) 2a220a15be657a24868368892e3e2caba2115283 (after v6.5-rc4), (wt-2023-08-13) 81e147b1317ee7cde8b624ee8c0501b470d7e91c (after v6.5-rc5). Complement the driver to make compile on FreeBSD using LinuxKPI with changes covered by #ifdef (__FreeBSD__). Add the module build framework but keep disconnected from the build for now. The current driver (or rather LinuxKPI) lacks support for some "qcom" bits needed in order to get things working (as does ath11k). There was interest by various people to enhance support further for ath11k which will equally benefit ath12k. Given the lack of full license texts on the files this is imported under the draft policy for handling SPDX files (D29226) and with approval for BSD-3-Clause-Clear. [1] Approved by: core (jhb, 2023-05-11) [1] MFC after: 20 days --- sys/contrib/dev/athk/ath12k/Kconfig | 34 + sys/contrib/dev/athk/ath12k/Makefile | 27 + sys/contrib/dev/athk/ath12k/ce.c | 964 ++++ sys/contrib/dev/athk/ath12k/ce.h | 184 + sys/contrib/dev/athk/ath12k/core.c | 968 +++++ sys/contrib/dev/athk/ath12k/core.h | 879 ++++ sys/contrib/dev/athk/ath12k/dbring.c | 357 ++ sys/contrib/dev/athk/ath12k/dbring.h | 80 + sys/contrib/dev/athk/ath12k/debug.c | 161 + sys/contrib/dev/athk/ath12k/debug.h | 67 + sys/contrib/dev/athk/ath12k/dp.c | 1587 +++++++ sys/contrib/dev/athk/ath12k/dp.h | 1820 ++++++++ sys/contrib/dev/athk/ath12k/dp_mon.c | 2597 +++++++++++ sys/contrib/dev/athk/ath12k/dp_mon.h | 106 + sys/contrib/dev/athk/ath12k/dp_rx.c | 4274 ++++++++++++++++++ sys/contrib/dev/athk/ath12k/dp_rx.h | 145 + sys/contrib/dev/athk/ath12k/dp_tx.c | 1225 ++++++ sys/contrib/dev/athk/ath12k/dp_tx.h | 41 + sys/contrib/dev/athk/ath12k/hal.c | 2235 ++++++++++ sys/contrib/dev/athk/ath12k/hal.h | 1142 +++++ sys/contrib/dev/athk/ath12k/hal_desc.h | 2961 +++++++++++++ sys/contrib/dev/athk/ath12k/hal_rx.c | 850 ++++ sys/contrib/dev/athk/ath12k/hal_rx.h | 704 +++ sys/contrib/dev/athk/ath12k/hal_tx.c | 145 + sys/contrib/dev/athk/ath12k/hal_tx.h | 194 + sys/contrib/dev/athk/ath12k/hif.h | 144 + sys/contrib/dev/athk/ath12k/htc.c | 789 ++++ sys/contrib/dev/athk/ath12k/htc.h | 316 ++ sys/contrib/dev/athk/ath12k/hw.c | 1047 +++++ sys/contrib/dev/athk/ath12k/hw.h | 314 ++ sys/contrib/dev/athk/ath12k/mac.c | 7489 ++++++++++++++++++++++++++++++++ sys/contrib/dev/athk/ath12k/mac.h | 76 + sys/contrib/dev/athk/ath12k/mhi.c | 619 +++ sys/contrib/dev/athk/ath12k/mhi.h | 46 + sys/contrib/dev/athk/ath12k/pci.c | 1449 ++++++ sys/contrib/dev/athk/ath12k/pci.h | 141 + sys/contrib/dev/athk/ath12k/peer.c | 342 ++ sys/contrib/dev/athk/ath12k/peer.h | 67 + sys/contrib/dev/athk/ath12k/qmi.c | 3114 +++++++++++++ sys/contrib/dev/athk/ath12k/qmi.h | 570 +++ sys/contrib/dev/athk/ath12k/reg.c | 745 ++++ sys/contrib/dev/athk/ath12k/reg.h | 95 + sys/contrib/dev/athk/ath12k/rx_desc.h | 1441 ++++++ sys/contrib/dev/athk/ath12k/trace.c | 10 + sys/contrib/dev/athk/ath12k/trace.h | 152 + sys/contrib/dev/athk/ath12k/wmi.c | 7147 ++++++++++++++++++++++++++++++ sys/contrib/dev/athk/ath12k/wmi.h | 4918 +++++++++++++++++++++ sys/modules/ath12k/Makefile | 37 + 48 files changed, 54815 insertions(+) diff --git a/sys/contrib/dev/athk/ath12k/Kconfig b/sys/contrib/dev/athk/ath12k/Kconfig new file mode 100644 index 000000000000..4f9c514c13e7 --- /dev/null +++ b/sys/contrib/dev/athk/ath12k/Kconfig @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: BSD-3-Clause-Clear +config ATH12K + tristate "Qualcomm Technologies Wi-Fi 7 support (ath12k)" + depends on MAC80211 && HAS_DMA && PCI + depends on CRYPTO_MICHAEL_MIC + select QCOM_QMI_HELPERS + select MHI_BUS + select QRTR + select QRTR_MHI + help + Enable support for Qualcomm Technologies Wi-Fi 7 (IEEE + 802.11be) family of chipsets, for example WCN7850 and + QCN9274. + + If you choose to build a module, it'll be called ath12k. + +config ATH12K_DEBUG + bool "ath12k debugging" + depends on ATH12K + help + Enable debug support, for example debug messages which must + be enabled separately using the debug_mask module parameter. + + If unsure, say Y to make it easier to debug problems. But if + you want optimal performance choose N. + +config ATH12K_TRACING + bool "ath12k tracing support" + depends on ATH12K && EVENT_TRACING + help + Enable ath12k tracing infrastructure. + + If unsure, say Y to make it easier to debug problems. But if + you want optimal performance choose N. diff --git a/sys/contrib/dev/athk/ath12k/Makefile b/sys/contrib/dev/athk/ath12k/Makefile new file mode 100644 index 000000000000..62c52e733b5e --- /dev/null +++ b/sys/contrib/dev/athk/ath12k/Makefile @@ -0,0 +1,27 @@ +# SPDX-License-Identifier: BSD-3-Clause-Clear +obj-$(CONFIG_ATH12K) += ath12k.o +ath12k-y += core.o \ + hal.o \ + hal_tx.o \ + hal_rx.o \ + wmi.o \ + mac.o \ + reg.o \ + htc.o \ + qmi.o \ + dp.o \ + dp_tx.o \ + dp_rx.o \ + debug.o \ + ce.o \ + peer.o \ + dbring.o \ + hw.o \ + mhi.o \ + pci.o \ + dp_mon.o + +ath12k-$(CONFIG_ATH12K_TRACING) += trace.o + +# for tracing framework to find trace.h +CFLAGS_trace.o := -I$(src) diff --git a/sys/contrib/dev/athk/ath12k/ce.c b/sys/contrib/dev/athk/ath12k/ce.c new file mode 100644 index 000000000000..be0d669d31fc --- /dev/null +++ b/sys/contrib/dev/athk/ath12k/ce.c @@ -0,0 +1,964 @@ +// SPDX-License-Identifier: BSD-3-Clause-Clear +/* + * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "dp_rx.h" +#include "debug.h" +#include "hif.h" + +const struct ce_attr ath12k_host_ce_config_qcn9274[] = { + /* CE0: host->target HTC control and raw streams */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 16, + .src_sz_max = 2048, + .dest_nentries = 0, + }, + + /* CE1: target->host HTT + HTC control */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath12k_htc_rx_completion_handler, + }, + + /* CE2: target->host WMI */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 128, + .recv_cb = ath12k_htc_rx_completion_handler, + }, + + /* CE3: host->target WMI (mac0) */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 32, + .src_sz_max = 2048, + .dest_nentries = 0, + }, + + /* CE4: host->target HTT */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 2048, + .src_sz_max = 256, + .dest_nentries = 0, + }, + + /* CE5: target->host pktlog */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath12k_dp_htt_htc_t2h_msg_handler, + }, + + /* CE6: target autonomous hif_memcpy */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + + /* CE7: host->target WMI (mac1) */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 32, + .src_sz_max = 2048, + .dest_nentries = 0, + }, + + /* CE8: target autonomous hif_memcpy */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + + /* CE9: MHI */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + + /* CE10: MHI */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + + /* CE11: MHI */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + + /* CE12: CV Prefetch */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + + /* CE13: CV Prefetch */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + + /* CE14: target->host dbg log */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath12k_htc_rx_completion_handler, + }, + + /* CE15: reserved for future use */ + { + .flags = (CE_ATTR_FLAGS | CE_ATTR_DIS_INTR), + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, +}; + +const struct ce_attr ath12k_host_ce_config_wcn7850[] = { + /* CE0: host->target HTC control and raw streams */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 16, + .src_sz_max = 2048, + .dest_nentries = 0, + }, + + /* CE1: target->host HTT + HTC control */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath12k_htc_rx_completion_handler, + }, + + /* CE2: target->host WMI */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 64, + .recv_cb = ath12k_htc_rx_completion_handler, + }, + + /* CE3: host->target WMI (mac0) */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 32, + .src_sz_max = 2048, + .dest_nentries = 0, + }, + + /* CE4: host->target HTT */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 2048, + .src_sz_max = 256, + .dest_nentries = 0, + }, + + /* CE5: target->host pktlog */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + + /* CE6: target autonomous hif_memcpy */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + + /* CE7: host->target WMI (mac1) */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 0, + }, + + /* CE8: target autonomous hif_memcpy */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + +}; + +static int ath12k_ce_rx_buf_enqueue_pipe(struct ath12k_ce_pipe *pipe, + struct sk_buff *skb, dma_addr_t paddr) +{ + struct ath12k_base *ab = pipe->ab; + struct ath12k_ce_ring *ring = pipe->dest_ring; + struct hal_srng *srng; + unsigned int write_index; + unsigned int nentries_mask = ring->nentries_mask; + struct hal_ce_srng_dest_desc *desc; + int ret; + + lockdep_assert_held(&ab->ce.ce_lock); + + write_index = ring->write_index; + + srng = &ab->hal.srng_list[ring->hal_ring_id]; + + spin_lock_bh(&srng->lock); + + ath12k_hal_srng_access_begin(ab, srng); + + if (unlikely(ath12k_hal_srng_src_num_free(ab, srng, false) < 1)) { + ret = -ENOSPC; + goto exit; + } + + desc = ath12k_hal_srng_src_get_next_entry(ab, srng); + if (!desc) { + ret = -ENOSPC; + goto exit; + } + + ath12k_hal_ce_dst_set_desc(desc, paddr); + + ring->skb[write_index] = skb; + write_index = CE_RING_IDX_INCR(nentries_mask, write_index); + ring->write_index = write_index; + + pipe->rx_buf_needed--; + + ret = 0; +exit: + ath12k_hal_srng_access_end(ab, srng); + + spin_unlock_bh(&srng->lock); + + return ret; +} + +static int ath12k_ce_rx_post_pipe(struct ath12k_ce_pipe *pipe) +{ + struct ath12k_base *ab = pipe->ab; + struct sk_buff *skb; + dma_addr_t paddr; + int ret = 0; + + if (!(pipe->dest_ring || pipe->status_ring)) + return 0; + + spin_lock_bh(&ab->ce.ce_lock); + while (pipe->rx_buf_needed) { + skb = dev_alloc_skb(pipe->buf_sz); + if (!skb) { + ret = -ENOMEM; + goto exit; + } + + WARN_ON_ONCE(!IS_ALIGNED((unsigned long)skb->data, 4)); + + paddr = dma_map_single(ab->dev, skb->data, + skb->len + skb_tailroom(skb), + DMA_FROM_DEVICE); + if (unlikely(dma_mapping_error(ab->dev, paddr))) { + ath12k_warn(ab, "failed to dma map ce rx buf\n"); + dev_kfree_skb_any(skb); + ret = -EIO; + goto exit; + } + + ATH12K_SKB_RXCB(skb)->paddr = paddr; + + ret = ath12k_ce_rx_buf_enqueue_pipe(pipe, skb, paddr); + if (ret) { + ath12k_warn(ab, "failed to enqueue rx buf: %d\n", ret); + dma_unmap_single(ab->dev, paddr, + skb->len + skb_tailroom(skb), + DMA_FROM_DEVICE); + dev_kfree_skb_any(skb); + goto exit; + } + } + +exit: + spin_unlock_bh(&ab->ce.ce_lock); + return ret; +} + +static int ath12k_ce_completed_recv_next(struct ath12k_ce_pipe *pipe, + struct sk_buff **skb, int *nbytes) +{ + struct ath12k_base *ab = pipe->ab; + struct hal_ce_srng_dst_status_desc *desc; + struct hal_srng *srng; + unsigned int sw_index; + unsigned int nentries_mask; + int ret = 0; + + spin_lock_bh(&ab->ce.ce_lock); + + sw_index = pipe->dest_ring->sw_index; + nentries_mask = pipe->dest_ring->nentries_mask; + + srng = &ab->hal.srng_list[pipe->status_ring->hal_ring_id]; + + spin_lock_bh(&srng->lock); + + ath12k_hal_srng_access_begin(ab, srng); + + desc = ath12k_hal_srng_dst_get_next_entry(ab, srng); + if (!desc) { + ret = -EIO; + goto err; + } + + *nbytes = ath12k_hal_ce_dst_status_get_length(desc); + if (*nbytes == 0) { + ret = -EIO; + goto err; + } + + *skb = pipe->dest_ring->skb[sw_index]; + pipe->dest_ring->skb[sw_index] = NULL; + + sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index); + pipe->dest_ring->sw_index = sw_index; + + pipe->rx_buf_needed++; +err: + ath12k_hal_srng_access_end(ab, srng); + + spin_unlock_bh(&srng->lock); + + spin_unlock_bh(&ab->ce.ce_lock); + + return ret; +} + +static void ath12k_ce_recv_process_cb(struct ath12k_ce_pipe *pipe) +{ + struct ath12k_base *ab = pipe->ab; + struct sk_buff *skb; + struct sk_buff_head list; + unsigned int nbytes, max_nbytes; + int ret; + + __skb_queue_head_init(&list); + while (ath12k_ce_completed_recv_next(pipe, &skb, &nbytes) == 0) { + max_nbytes = skb->len + skb_tailroom(skb); + dma_unmap_single(ab->dev, ATH12K_SKB_RXCB(skb)->paddr, + max_nbytes, DMA_FROM_DEVICE); + + if (unlikely(max_nbytes < nbytes)) { + ath12k_warn(ab, "rxed more than expected (nbytes %d, max %d)", + nbytes, max_nbytes); + dev_kfree_skb_any(skb); + continue; + } + + skb_put(skb, nbytes); + __skb_queue_tail(&list, skb); + } + + while ((skb = __skb_dequeue(&list))) { + ath12k_dbg(ab, ATH12K_DBG_AHB, "rx ce pipe %d len %d\n", + pipe->pipe_num, skb->len); + pipe->recv_cb(ab, skb); + } + + ret = ath12k_ce_rx_post_pipe(pipe); + if (ret && ret != -ENOSPC) { + ath12k_warn(ab, "failed to post rx buf to pipe: %d err: %d\n", + pipe->pipe_num, ret); + mod_timer(&ab->rx_replenish_retry, + jiffies + ATH12K_CE_RX_POST_RETRY_JIFFIES); + } +} + +static struct sk_buff *ath12k_ce_completed_send_next(struct ath12k_ce_pipe *pipe) +{ + struct ath12k_base *ab = pipe->ab; + struct hal_ce_srng_src_desc *desc; + struct hal_srng *srng; + unsigned int sw_index; + unsigned int nentries_mask; + struct sk_buff *skb; + + spin_lock_bh(&ab->ce.ce_lock); + + sw_index = pipe->src_ring->sw_index; + nentries_mask = pipe->src_ring->nentries_mask; + + srng = &ab->hal.srng_list[pipe->src_ring->hal_ring_id]; + + spin_lock_bh(&srng->lock); + + ath12k_hal_srng_access_begin(ab, srng); + + desc = ath12k_hal_srng_src_reap_next(ab, srng); + if (!desc) { + skb = ERR_PTR(-EIO); + goto err_unlock; + } + + skb = pipe->src_ring->skb[sw_index]; + + pipe->src_ring->skb[sw_index] = NULL; + + sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index); + pipe->src_ring->sw_index = sw_index; + +err_unlock: + spin_unlock_bh(&srng->lock); + + spin_unlock_bh(&ab->ce.ce_lock); + + return skb; +} + +static void ath12k_ce_send_done_cb(struct ath12k_ce_pipe *pipe) +{ + struct ath12k_base *ab = pipe->ab; + struct sk_buff *skb; + + while (!IS_ERR(skb = ath12k_ce_completed_send_next(pipe))) { + if (!skb) + continue; + + dma_unmap_single(ab->dev, ATH12K_SKB_CB(skb)->paddr, skb->len, + DMA_TO_DEVICE); + dev_kfree_skb_any(skb); + } +} + +static void ath12k_ce_srng_msi_ring_params_setup(struct ath12k_base *ab, u32 ce_id, + struct hal_srng_params *ring_params) +{ + u32 msi_data_start; + u32 msi_data_count, msi_data_idx; + u32 msi_irq_start; + u32 addr_lo; + u32 addr_hi; + int ret; + + ret = ath12k_hif_get_user_msi_vector(ab, "CE", + &msi_data_count, &msi_data_start, + &msi_irq_start); + + if (ret) + return; + + ath12k_hif_get_msi_address(ab, &addr_lo, &addr_hi); + ath12k_hif_get_ce_msi_idx(ab, ce_id, &msi_data_idx); + + ring_params->msi_addr = addr_lo; + ring_params->msi_addr |= (dma_addr_t)(((uint64_t)addr_hi) << 32); + ring_params->msi_data = (msi_data_idx % msi_data_count) + msi_data_start; + ring_params->flags |= HAL_SRNG_FLAGS_MSI_INTR; +} + +static int ath12k_ce_init_ring(struct ath12k_base *ab, + struct ath12k_ce_ring *ce_ring, + int ce_id, enum hal_ring_type type) +{ + struct hal_srng_params params = { 0 }; + int ret; + + params.ring_base_paddr = ce_ring->base_addr_ce_space; + params.ring_base_vaddr = ce_ring->base_addr_owner_space; + params.num_entries = ce_ring->nentries; + + if (!(CE_ATTR_DIS_INTR & ab->hw_params->host_ce_config[ce_id].flags)) + ath12k_ce_srng_msi_ring_params_setup(ab, ce_id, ¶ms); + + switch (type) { + case HAL_CE_SRC: + if (!(CE_ATTR_DIS_INTR & ab->hw_params->host_ce_config[ce_id].flags)) + params.intr_batch_cntr_thres_entries = 1; + break; + case HAL_CE_DST: + params.max_buffer_len = ab->hw_params->host_ce_config[ce_id].src_sz_max; + if (!(ab->hw_params->host_ce_config[ce_id].flags & CE_ATTR_DIS_INTR)) { + params.intr_timer_thres_us = 1024; + params.flags |= HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN; + params.low_threshold = ce_ring->nentries - 3; + } + break; + case HAL_CE_DST_STATUS: + if (!(ab->hw_params->host_ce_config[ce_id].flags & CE_ATTR_DIS_INTR)) { + params.intr_batch_cntr_thres_entries = 1; + params.intr_timer_thres_us = 0x1000; + } + break; + default: + ath12k_warn(ab, "Invalid CE ring type %d\n", type); + return -EINVAL; + } + + /* TODO: Init other params needed by HAL to init the ring */ + + ret = ath12k_hal_srng_setup(ab, type, ce_id, 0, ¶ms); + if (ret < 0) { + ath12k_warn(ab, "failed to setup srng: %d ring_id %d\n", + ret, ce_id); + return ret; + } + + ce_ring->hal_ring_id = ret; + + return 0; +} + +static struct ath12k_ce_ring * +ath12k_ce_alloc_ring(struct ath12k_base *ab, int nentries, int desc_sz) +{ + struct ath12k_ce_ring *ce_ring; + dma_addr_t base_addr; + + ce_ring = kzalloc(struct_size(ce_ring, skb, nentries), GFP_KERNEL); + if (!ce_ring) + return ERR_PTR(-ENOMEM); + + ce_ring->nentries = nentries; + ce_ring->nentries_mask = nentries - 1; + + /* Legacy platforms that do not support cache + * coherent DMA are unsupported + */ + ce_ring->base_addr_owner_space_unaligned = + dma_alloc_coherent(ab->dev, + nentries * desc_sz + CE_DESC_RING_ALIGN, + &base_addr, GFP_KERNEL); + if (!ce_ring->base_addr_owner_space_unaligned) { + kfree(ce_ring); + return ERR_PTR(-ENOMEM); + } + + ce_ring->base_addr_ce_space_unaligned = base_addr; + + ce_ring->base_addr_owner_space = + PTR_ALIGN(ce_ring->base_addr_owner_space_unaligned, + CE_DESC_RING_ALIGN); + + ce_ring->base_addr_ce_space = ALIGN(ce_ring->base_addr_ce_space_unaligned, + CE_DESC_RING_ALIGN); + + return ce_ring; +} + +static int ath12k_ce_alloc_pipe(struct ath12k_base *ab, int ce_id) +{ + struct ath12k_ce_pipe *pipe = &ab->ce.ce_pipe[ce_id]; + const struct ce_attr *attr = &ab->hw_params->host_ce_config[ce_id]; + struct ath12k_ce_ring *ring; + int nentries; + int desc_sz; + + pipe->attr_flags = attr->flags; + + if (attr->src_nentries) { + pipe->send_cb = ath12k_ce_send_done_cb; + nentries = roundup_pow_of_two(attr->src_nentries); + desc_sz = ath12k_hal_ce_get_desc_size(HAL_CE_DESC_SRC); + ring = ath12k_ce_alloc_ring(ab, nentries, desc_sz); + if (IS_ERR(ring)) + return PTR_ERR(ring); + pipe->src_ring = ring; + } + + if (attr->dest_nentries) { + pipe->recv_cb = attr->recv_cb; + nentries = roundup_pow_of_two(attr->dest_nentries); + desc_sz = ath12k_hal_ce_get_desc_size(HAL_CE_DESC_DST); + ring = ath12k_ce_alloc_ring(ab, nentries, desc_sz); + if (IS_ERR(ring)) + return PTR_ERR(ring); + pipe->dest_ring = ring; + + desc_sz = ath12k_hal_ce_get_desc_size(HAL_CE_DESC_DST_STATUS); + ring = ath12k_ce_alloc_ring(ab, nentries, desc_sz); + if (IS_ERR(ring)) + return PTR_ERR(ring); + pipe->status_ring = ring; + } + + return 0; +} + +void ath12k_ce_per_engine_service(struct ath12k_base *ab, u16 ce_id) +{ + struct ath12k_ce_pipe *pipe = &ab->ce.ce_pipe[ce_id]; + + if (pipe->send_cb) + pipe->send_cb(pipe); + + if (pipe->recv_cb) + ath12k_ce_recv_process_cb(pipe); +} + +void ath12k_ce_poll_send_completed(struct ath12k_base *ab, u8 pipe_id) +{ + struct ath12k_ce_pipe *pipe = &ab->ce.ce_pipe[pipe_id]; + + if ((pipe->attr_flags & CE_ATTR_DIS_INTR) && pipe->send_cb) + pipe->send_cb(pipe); +} + +int ath12k_ce_send(struct ath12k_base *ab, struct sk_buff *skb, u8 pipe_id, + u16 transfer_id) +{ + struct ath12k_ce_pipe *pipe = &ab->ce.ce_pipe[pipe_id]; + struct hal_ce_srng_src_desc *desc; + struct hal_srng *srng; + unsigned int write_index, sw_index; + unsigned int nentries_mask; + int ret = 0; + u8 byte_swap_data = 0; + int num_used; + + /* Check if some entries could be regained by handling tx completion if + * the CE has interrupts disabled and the used entries is more than the + * defined usage threshold. + */ + if (pipe->attr_flags & CE_ATTR_DIS_INTR) { + spin_lock_bh(&ab->ce.ce_lock); + write_index = pipe->src_ring->write_index; + + sw_index = pipe->src_ring->sw_index; + + if (write_index >= sw_index) + num_used = write_index - sw_index; + else + num_used = pipe->src_ring->nentries - sw_index + + write_index; + + spin_unlock_bh(&ab->ce.ce_lock); + + if (num_used > ATH12K_CE_USAGE_THRESHOLD) + ath12k_ce_poll_send_completed(ab, pipe->pipe_num); + } + + if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags)) + return -ESHUTDOWN; + + spin_lock_bh(&ab->ce.ce_lock); + + write_index = pipe->src_ring->write_index; + nentries_mask = pipe->src_ring->nentries_mask; + + srng = &ab->hal.srng_list[pipe->src_ring->hal_ring_id]; + + spin_lock_bh(&srng->lock); + + ath12k_hal_srng_access_begin(ab, srng); + + if (unlikely(ath12k_hal_srng_src_num_free(ab, srng, false) < 1)) { + ath12k_hal_srng_access_end(ab, srng); + ret = -ENOBUFS; + goto unlock; + } + + desc = ath12k_hal_srng_src_get_next_reaped(ab, srng); + if (!desc) { + ath12k_hal_srng_access_end(ab, srng); + ret = -ENOBUFS; + goto unlock; + } + + if (pipe->attr_flags & CE_ATTR_BYTE_SWAP_DATA) + byte_swap_data = 1; + + ath12k_hal_ce_src_set_desc(desc, ATH12K_SKB_CB(skb)->paddr, + skb->len, transfer_id, byte_swap_data); + + pipe->src_ring->skb[write_index] = skb; + pipe->src_ring->write_index = CE_RING_IDX_INCR(nentries_mask, + write_index); + + ath12k_hal_srng_access_end(ab, srng); + +unlock: + spin_unlock_bh(&srng->lock); + + spin_unlock_bh(&ab->ce.ce_lock); + + return ret; +} + +static void ath12k_ce_rx_pipe_cleanup(struct ath12k_ce_pipe *pipe) +{ + struct ath12k_base *ab = pipe->ab; + struct ath12k_ce_ring *ring = pipe->dest_ring; + struct sk_buff *skb; + int i; + + if (!(ring && pipe->buf_sz)) + return; + + for (i = 0; i < ring->nentries; i++) { + skb = ring->skb[i]; + if (!skb) + continue; + + ring->skb[i] = NULL; + dma_unmap_single(ab->dev, ATH12K_SKB_RXCB(skb)->paddr, + skb->len + skb_tailroom(skb), DMA_FROM_DEVICE); + dev_kfree_skb_any(skb); + } +} + +void ath12k_ce_cleanup_pipes(struct ath12k_base *ab) +{ + struct ath12k_ce_pipe *pipe; + int pipe_num; + + for (pipe_num = 0; pipe_num < ab->hw_params->ce_count; pipe_num++) { + pipe = &ab->ce.ce_pipe[pipe_num]; + ath12k_ce_rx_pipe_cleanup(pipe); + + /* Cleanup any src CE's which have interrupts disabled */ + ath12k_ce_poll_send_completed(ab, pipe_num); + + /* NOTE: Should we also clean up tx buffer in all pipes? */ + } +} + +void ath12k_ce_rx_post_buf(struct ath12k_base *ab) +{ + struct ath12k_ce_pipe *pipe; + int i; + int ret; + + for (i = 0; i < ab->hw_params->ce_count; i++) { + pipe = &ab->ce.ce_pipe[i]; + ret = ath12k_ce_rx_post_pipe(pipe); + if (ret) { + if (ret == -ENOSPC) + continue; + + ath12k_warn(ab, "failed to post rx buf to pipe: %d err: %d\n", + i, ret); + mod_timer(&ab->rx_replenish_retry, + jiffies + ATH12K_CE_RX_POST_RETRY_JIFFIES); + + return; + } + } +} + +void ath12k_ce_rx_replenish_retry(struct timer_list *t) +{ + struct ath12k_base *ab = from_timer(ab, t, rx_replenish_retry); + + ath12k_ce_rx_post_buf(ab); +} + +static void ath12k_ce_shadow_config(struct ath12k_base *ab) +{ + int i; + + for (i = 0; i < ab->hw_params->ce_count; i++) { + if (ab->hw_params->host_ce_config[i].src_nentries) + ath12k_hal_srng_update_shadow_config(ab, HAL_CE_SRC, i); + + if (ab->hw_params->host_ce_config[i].dest_nentries) { + ath12k_hal_srng_update_shadow_config(ab, HAL_CE_DST, i); + ath12k_hal_srng_update_shadow_config(ab, HAL_CE_DST_STATUS, i); + } + } +} + +void ath12k_ce_get_shadow_config(struct ath12k_base *ab, + u32 **shadow_cfg, u32 *shadow_cfg_len) +{ + if (!ab->hw_params->supports_shadow_regs) + return; + + ath12k_hal_srng_get_shadow_config(ab, shadow_cfg, shadow_cfg_len); + + /* shadow is already configured */ + if (*shadow_cfg_len) + return; + + /* shadow isn't configured yet, configure now. + * non-CE srngs are configured firstly, then + * all CE srngs. + */ + ath12k_hal_srng_shadow_config(ab); + ath12k_ce_shadow_config(ab); + *** 54204 LINES SKIPPED *** From nobody Mon Aug 21 01: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 4RTZpD6XX0z4r1Kf; Mon, 21 Aug 2023 01: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 4RTZpD6LqRz4lCJ; Mon, 21 Aug 2023 01: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=1692581812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Iksmvi+bHle1i5m77pEifB4KDGC6JVv4mseSQforiI=; b=IkLpm25Pys/ZyxHcyFwwBDX0A8XnWLSqYgUSVOEtMuqayy1Zr6PzoDmJr00FtXimUEzVZb T1qomCWGmreh5BHK8KlcG+EGakPVTFNP6InM+YRvTSa7koQWOjdzTS4h7c4kKf62lBkL44 HfmIX8GMSoanaHREUnLu/Oxx51GpzdzgnxHbAP80TE4a8fmjHyLSNz8QNwLzTAzz5vW8+S GwhbB3clDPRAMX6IHsnDNlK2Lf+tRI0uEoP522w5GGk82gWWxHYiyCMv89NNsMWbzgDjMH XVtibtSmN3LjeuTwCxmvXAT4JxN/tKIKlFzTJli8fNHq0hc+d1EGAlszWMj3OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Iksmvi+bHle1i5m77pEifB4KDGC6JVv4mseSQforiI=; b=yMSrsJ0l/IILkynAc33J8dqZQ6P2JD8DEdU6KOpIlYASL38D0wi9EHP84dIp45PGNq0PPy hD9IhinC+flfWJD9xUp1GGwzWnzOTIl7fjwp8pRXg83c+rA10NgItYT2lEPkjF4o4q1JsU /g7h8IkoGAR1m7tSSJfatT9glKrzMlOoWSs1JhEMdsIf1zOrCBuULJyxt1W7Q3oGJXEP+3 BOO1O7BISsPu+7jZLZ5yGTvvtMt0hIbIZP8SdSWGGR/fNgvPc0zENhp+PMq1JfcVjysUI2 Ax7vED0kz3+jHINYM00aUGgsXwbzNhugSBER5RfbPZR8I2NZ/YLnNlpJywfAew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692581812; a=rsa-sha256; cv=none; b=xGSbJpOxmNA/R1cl5Xl5YzrwKbXgWl49XiodKaegU7soxp/TtegPFUSKE9bS6vafjkGys9 tWo0ezMLsHk5+7wcUY4Pyt6NxYJ3Xyp5zfkeRM2bnOokD4U9iX42mvpM0dI9io+23aZAPf Mt1HbiLYlFE58aIMIMMgfjZnPYog7gEwh6XlsnWpuFvRxaULnITfuzs2l/6/Re3F1aic6a 5GA/7sz1p7FNT5ee7IpSatDBF4idVw5RXzspVHYq6s+hAIgn7zdeJAdKrjMlM5ZGp2lWTN tkvb6YUakC18ZXr0WX7ocmA6WZ4D8BgqPYmk5Wh500L+3s1oey/KxZbOI27Dow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTZpD5RYPz11jf; Mon, 21 Aug 2023 01:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37L1aqvw038417; Mon, 21 Aug 2023 01:36:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37L1aqXB038414; Mon, 21 Aug 2023 01:36:52 GMT (envelope-from git) Date: Mon, 21 Aug 2023 01:36:52 GMT Message-Id: <202308210136.37L1aqXB038414@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: cbb3ec25236b - main - mt76: update driver from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbb3ec25236ba72f91cbdf23f8b78b9d1af0cedf Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cbb3ec25236ba72f91cbdf23f8b78b9d1af0cedf commit cbb3ec25236ba72f91cbdf23f8b78b9d1af0cedf Author: Bjoern A. Zeeb AuthorDate: 2023-05-23 23:03:09 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-21 01:34:03 +0000 mt76: update driver from upstream This is a set of updates of the mt76 driver based on wireless-testing (wt-2023-05-11) 711dca0ca3d77414f8f346e564e9c8640147f40d (after v6.4-rc1), This adds support for mt7996 as well. (wt-2023-06-09) 7bd20e011626ccc3ad53e57873452b1716fcfaaa (after v6.4-rc5), (wt-2023-07-24) 62e409149b62a285e89018e49b2e115757fb9022 (after v6.5-rc3), (wt-2023-08-06) 2a220a15be657a24868368892e3e2caba2115283 (after v6.5-rc4). The current version of LinuxKPI lacks support for "page pool" which needs enhancing and updating a decade or so old shortcut mapping struct page directly to struct vm_page. MFC after: 20 days --- .../common/include/linux/soc/mediatek/mtk_wed.h | 16 +- sys/contrib/dev/mediatek/mt76/debugfs.c | 21 +- sys/contrib/dev/mediatek/mt76/dma.c | 300 +- sys/contrib/dev/mediatek/mt76/dma.h | 10 + sys/contrib/dev/mediatek/mt76/eeprom.c | 95 +- sys/contrib/dev/mediatek/mt76/mac80211.c | 197 +- sys/contrib/dev/mediatek/mt76/mt76.h | 248 +- sys/contrib/dev/mediatek/mt76/mt7603/beacon.c | 3 +- sys/contrib/dev/mediatek/mt76/mt7603/debugfs.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/dma.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/init.c | 36 +- sys/contrib/dev/mediatek/mt76/mt7603/mac.c | 54 +- sys/contrib/dev/mediatek/mt76/mt7603/main.c | 35 +- sys/contrib/dev/mediatek/mt76/mt7603/mcu.c | 3 +- sys/contrib/dev/mediatek/mt76/mt7603/mt7603.h | 8 +- sys/contrib/dev/mediatek/mt76/mt7603/regs.h | 7 + sys/contrib/dev/mediatek/mt76/mt7615/debugfs.c | 6 +- sys/contrib/dev/mediatek/mt76/mt7615/dma.c | 5 +- sys/contrib/dev/mediatek/mt76/mt7615/eeprom.c | 13 +- sys/contrib/dev/mediatek/mt76/mt7615/eeprom.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/init.c | 90 +- sys/contrib/dev/mediatek/mt76/mt7615/mac.c | 152 +- sys/contrib/dev/mediatek/mt76/mt7615/mac.h | 12 - sys/contrib/dev/mediatek/mt76/mt7615/main.c | 71 +- sys/contrib/dev/mediatek/mt76/mt7615/mcu.c | 16 +- sys/contrib/dev/mediatek/mt76/mt7615/mcu.h | 11 - sys/contrib/dev/mediatek/mt76/mt7615/mmio.c | 27 +- sys/contrib/dev/mediatek/mt76/mt7615/mt7615.h | 33 +- .../dev/mediatek/mt76/mt7615/mt7615_trace.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/pci_init.c | 64 +- sys/contrib/dev/mediatek/mt76/mt7615/regs.h | 12 + sys/contrib/dev/mediatek/mt76/mt7615/sdio.c | 1 - sys/contrib/dev/mediatek/mt76/mt7615/usb.c | 1 - sys/contrib/dev/mediatek/mt76/mt76_connac.h | 62 +- sys/contrib/dev/mediatek/mt76/mt76_connac2_mac.h | 24 +- sys/contrib/dev/mediatek/mt76/mt76_connac3_mac.c | 182 + sys/contrib/dev/mediatek/mt76/mt76_connac3_mac.h | 339 ++ sys/contrib/dev/mediatek/mt76/mt76_connac_mac.c | 213 +- sys/contrib/dev/mediatek/mt76/mt76_connac_mcu.c | 284 +- sys/contrib/dev/mediatek/mt76/mt76_connac_mcu.h | 134 +- sys/contrib/dev/mediatek/mt76/mt76x0/usb_mcu.c | 1 + sys/contrib/dev/mediatek/mt76/mt76x02.h | 16 +- sys/contrib/dev/mediatek/mt76/mt76x02_debugfs.c | 19 +- sys/contrib/dev/mediatek/mt76/mt76x02_eeprom.h | 2 - sys/contrib/dev/mediatek/mt76/mt76x02_mac.c | 14 +- sys/contrib/dev/mediatek/mt76/mt76x02_phy.c | 22 +- sys/contrib/dev/mediatek/mt76/mt76x02_phy.h | 6 +- sys/contrib/dev/mediatek/mt76/mt76x02_trace.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_txrx.c | 14 +- sys/contrib/dev/mediatek/mt76/mt76x02_util.c | 53 +- sys/contrib/dev/mediatek/mt76/mt76x2/eeprom.c | 16 +- sys/contrib/dev/mediatek/mt76/mt76x2/eeprom.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/init.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/phy.c | 6 +- sys/contrib/dev/mediatek/mt76/mt7915/Kconfig | 7 +- sys/contrib/dev/mediatek/mt76/mt7915/Makefile | 3 +- sys/contrib/dev/mediatek/mt76/mt7915/coredump.c | 411 +++ sys/contrib/dev/mediatek/mt76/mt7915/coredump.h | 139 + sys/contrib/dev/mediatek/mt76/mt7915/debugfs.c | 439 ++- sys/contrib/dev/mediatek/mt76/mt7915/dma.c | 370 +- sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c | 95 +- sys/contrib/dev/mediatek/mt76/mt7915/eeprom.h | 5 - sys/contrib/dev/mediatek/mt76/mt7915/init.c | 374 +- sys/contrib/dev/mediatek/mt76/mt7915/mac.c | 803 +++-- sys/contrib/dev/mediatek/mt76/mt7915/mac.h | 40 +- sys/contrib/dev/mediatek/mt76/mt7915/main.c | 418 ++- sys/contrib/dev/mediatek/mt76/mt7915/mcu.c | 866 +++-- sys/contrib/dev/mediatek/mt76/mt7915/mcu.h | 61 +- sys/contrib/dev/mediatek/mt76/mt7915/mmio.c | 464 ++- sys/contrib/dev/mediatek/mt76/mt7915/mt7915.h | 161 +- sys/contrib/dev/mediatek/mt76/mt7915/pci.c | 116 +- sys/contrib/dev/mediatek/mt76/mt7915/regs.h | 117 +- sys/contrib/dev/mediatek/mt76/mt7915/soc.c | 185 +- sys/contrib/dev/mediatek/mt76/mt7915/testmode.c | 71 +- sys/contrib/dev/mediatek/mt76/mt7921/Kconfig | 4 +- sys/contrib/dev/mediatek/mt76/mt7921/Makefile | 9 +- sys/contrib/dev/mediatek/mt76/mt7921/debugfs.c | 229 +- sys/contrib/dev/mediatek/mt76/mt7921/eeprom.h | 30 - sys/contrib/dev/mediatek/mt76/mt7921/init.c | 238 +- sys/contrib/dev/mediatek/mt76/mt7921/mac.c | 611 +--- sys/contrib/dev/mediatek/mt76/mt7921/mac.h | 53 - sys/contrib/dev/mediatek/mt76/mt7921/main.c | 950 ++--- sys/contrib/dev/mediatek/mt76/mt7921/mcu.c | 524 +-- sys/contrib/dev/mediatek/mt76/mt7921/mcu.h | 11 - sys/contrib/dev/mediatek/mt76/mt7921/mt7921.h | 402 +-- sys/contrib/dev/mediatek/mt76/mt7921/pci.c | 278 +- sys/contrib/dev/mediatek/mt76/mt7921/pci_mac.c | 36 +- sys/contrib/dev/mediatek/mt76/mt7921/pci_mcu.c | 72 +- sys/contrib/dev/mediatek/mt76/mt7921/regs.h | 457 +-- sys/contrib/dev/mediatek/mt76/mt7921/sdio.c | 48 +- sys/contrib/dev/mediatek/mt76/mt7921/sdio_mac.c | 8 +- sys/contrib/dev/mediatek/mt76/mt7921/sdio_mcu.c | 16 +- sys/contrib/dev/mediatek/mt76/mt7921/testmode.c | 11 +- sys/contrib/dev/mediatek/mt76/mt7921/trace.c | 12 - sys/contrib/dev/mediatek/mt76/mt7921/usb.c | 226 +- sys/contrib/dev/mediatek/mt76/mt7921/usb_mac.c | 255 -- sys/contrib/dev/mediatek/mt76/mt792x.h | 367 ++ sys/contrib/dev/mediatek/mt76/mt792x_acpi_sar.c | 350 ++ sys/contrib/dev/mediatek/mt76/mt792x_acpi_sar.h | 105 + sys/contrib/dev/mediatek/mt76/mt792x_core.c | 862 +++++ sys/contrib/dev/mediatek/mt76/mt792x_debugfs.c | 168 + .../mediatek/mt76/{mt7921/dma.c => mt792x_dma.c} | 348 +- sys/contrib/dev/mediatek/mt76/mt792x_mac.c | 388 ++ sys/contrib/dev/mediatek/mt76/mt792x_regs.h | 479 +++ sys/contrib/dev/mediatek/mt76/mt792x_trace.c | 14 + .../mt76/{mt7921/mt7921_trace.h => mt792x_trace.h} | 16 +- sys/contrib/dev/mediatek/mt76/mt792x_usb.c | 309 ++ sys/contrib/dev/mediatek/mt76/mt7996/Kconfig | 14 + sys/contrib/dev/mediatek/mt76/mt7996/Makefile | 8 + sys/contrib/dev/mediatek/mt76/mt7996/coredump.c | 268 ++ sys/contrib/dev/mediatek/mt76/mt7996/coredump.h | 97 + sys/contrib/dev/mediatek/mt76/mt7996/debugfs.c | 971 +++++ sys/contrib/dev/mediatek/mt76/mt7996/dma.c | 442 +++ sys/contrib/dev/mediatek/mt76/mt7996/eeprom.c | 262 ++ sys/contrib/dev/mediatek/mt76/mt7996/eeprom.h | 74 + sys/contrib/dev/mediatek/mt76/mt7996/init.c | 930 +++++ sys/contrib/dev/mediatek/mt76/mt7996/mac.c | 2546 +++++++++++++ sys/contrib/dev/mediatek/mt76/mt7996/mac.h | 45 + sys/contrib/dev/mediatek/mt76/mt7996/main.c | 1418 ++++++++ sys/contrib/dev/mediatek/mt76/mt7996/mcu.c | 3809 ++++++++++++++++++++ sys/contrib/dev/mediatek/mt76/mt7996/mcu.h | 700 ++++ sys/contrib/dev/mediatek/mt76/mt7996/mmio.c | 398 ++ sys/contrib/dev/mediatek/mt76/mt7996/mt7996.h | 502 +++ sys/contrib/dev/mediatek/mt76/mt7996/pci.c | 245 ++ sys/contrib/dev/mediatek/mt76/mt7996/regs.h | 596 +++ sys/contrib/dev/mediatek/mt76/sdio.c | 6 +- sys/contrib/dev/mediatek/mt76/sdio_txrx.c | 4 + sys/contrib/dev/mediatek/mt76/testmode.c | 1 + sys/contrib/dev/mediatek/mt76/trace.h | 2 +- sys/contrib/dev/mediatek/mt76/tx.c | 53 +- sys/contrib/dev/mediatek/mt76/usb.c | 56 +- sys/contrib/dev/mediatek/mt76/usb_trace.h | 2 +- sys/contrib/dev/mediatek/mt76/util.c | 10 +- sys/contrib/dev/mediatek/mt76/util.h | 9 +- sys/modules/mt76/Makefile | 1 + sys/modules/mt76/core/Makefile | 20 +- sys/modules/mt76/mt7915/Makefile | 8 + sys/modules/mt76/mt7921/Makefile | 5 +- sys/modules/mt76/mt7996/Makefile | 29 + 140 files changed, 24081 insertions(+), 5451 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h b/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h index 2ff4f30aab5d..b0aec2d4afbd 100644 --- a/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h +++ b/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2022 Bjoern A. Zeeb + * Copyright (c) 2022-2023 Bjoern A. Zeeb * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -31,10 +31,17 @@ struct mtk_wed_device { }; +#define WED_WO_STA_REC 0x6 + #define mtk_wed_device_start(_dev, _mask) do { } while(0) #define mtk_wed_device_detach(_dev) do { } while(0) #define mtk_wed_device_irq_get(_dev, _mask) 0 #define mtk_wed_device_irq_set_mask(_dev, _mask) do { } while(0) +#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) (-ENODEV) +#define mtk_wed_device_dma_reset(_dev) do {} while (0) +#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _entry) \ + do {} while (0) +#define mtk_wed_device_stop(_dev) do { } while(0) static inline bool mtk_wed_device_active(struct mtk_wed_device *dev __unused) @@ -43,4 +50,11 @@ mtk_wed_device_active(struct mtk_wed_device *dev __unused) return (false); } +static inline bool +mtk_wed_get_rx_capa(struct mtk_wed_device *dev __unused) +{ + + return (false); +} + #endif /* _LINUXKPI_LINUX_SOC_MEDIATEK_MTK_WED_H */ diff --git a/sys/contrib/dev/mediatek/mt76/debugfs.c b/sys/contrib/dev/mediatek/mt76/debugfs.c index 47e9911ee9fe..57fbcc83e074 100644 --- a/sys/contrib/dev/mediatek/mt76/debugfs.c +++ b/sys/contrib/dev/mediatek/mt76/debugfs.c @@ -100,23 +100,6 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str, } EXPORT_SYMBOL_GPL(mt76_seq_puts_array); -static int mt76_read_rate_txpower(struct seq_file *s, void *data) -{ - struct mt76_dev *dev = dev_get_drvdata(s->private); - - mt76_seq_puts_array(s, "CCK", dev->rate_power.cck, - ARRAY_SIZE(dev->rate_power.cck)); - mt76_seq_puts_array(s, "OFDM", dev->rate_power.ofdm, - ARRAY_SIZE(dev->rate_power.ofdm)); - mt76_seq_puts_array(s, "STBC", dev->rate_power.stbc, - ARRAY_SIZE(dev->rate_power.stbc)); - mt76_seq_puts_array(s, "HT", dev->rate_power.ht, - ARRAY_SIZE(dev->rate_power.ht)); - mt76_seq_puts_array(s, "VHT", dev->rate_power.vht, - ARRAY_SIZE(dev->rate_power.vht)); - return 0; -} - struct dentry * mt76_register_debugfs_fops(struct mt76_phy *phy, const struct file_operations *ops) @@ -129,7 +112,7 @@ mt76_register_debugfs_fops(struct mt76_phy *phy, if (!dir) return NULL; - debugfs_create_u8("led_pin", 0600, dir, &dev->led_pin); + debugfs_create_u8("led_pin", 0600, dir, &phy->leds.pin); debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg); debugfs_create_file_unsafe("regval", 0600, dir, dev, fops); debugfs_create_file_unsafe("napi_threaded", 0600, dir, dev, @@ -137,8 +120,6 @@ mt76_register_debugfs_fops(struct mt76_phy *phy, debugfs_create_blob("eeprom", 0400, dir, &dev->eeprom); if (dev->otp.data) debugfs_create_blob("otp", 0400, dir, &dev->otp); - debugfs_create_devm_seqfile(dev->dev, "rate_txpower", dir, - mt76_read_rate_txpower); debugfs_create_devm_seqfile(dev->dev, "rx-queues", dir, mt76_rx_queues_read); diff --git a/sys/contrib/dev/mediatek/mt76/dma.c b/sys/contrib/dev/mediatek/mt76/dma.c index dba7c323d205..eaa793e4b18e 100644 --- a/sys/contrib/dev/mediatek/mt76/dma.c +++ b/sys/contrib/dev/mediatek/mt76/dma.c @@ -6,6 +6,7 @@ #include #if defined(__FreeBSD__) #include +#include #endif #include "mt76.h" #include "dma.h" @@ -62,6 +63,19 @@ mt76_alloc_txwi(struct mt76_dev *dev) return t; } +static struct mt76_txwi_cache * +mt76_alloc_rxwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t; + + t = kzalloc(L1_CACHE_ALIGN(sizeof(*t)), GFP_ATOMIC); + if (!t) + return NULL; + + t->ptr = NULL; + return t; +} + static struct mt76_txwi_cache * __mt76_get_txwi(struct mt76_dev *dev) { @@ -78,6 +92,22 @@ __mt76_get_txwi(struct mt76_dev *dev) return t; } +static struct mt76_txwi_cache * +__mt76_get_rxwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t = NULL; + + spin_lock(&dev->wed_lock); + if (!list_empty(&dev->rxwi_cache)) { + t = list_first_entry(&dev->rxwi_cache, struct mt76_txwi_cache, + list); + list_del(&t->list); + } + spin_unlock(&dev->wed_lock); + + return t; +} + static struct mt76_txwi_cache * mt76_get_txwi(struct mt76_dev *dev) { @@ -89,6 +119,18 @@ mt76_get_txwi(struct mt76_dev *dev) return mt76_alloc_txwi(dev); } +struct mt76_txwi_cache * +mt76_get_rxwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t = __mt76_get_rxwi(dev); + + if (t) + return t; + + return mt76_alloc_rxwi(dev); +} +EXPORT_SYMBOL_GPL(mt76_get_rxwi); + void mt76_put_txwi(struct mt76_dev *dev, struct mt76_txwi_cache *t) { @@ -101,6 +143,18 @@ mt76_put_txwi(struct mt76_dev *dev, struct mt76_txwi_cache *t) } EXPORT_SYMBOL_GPL(mt76_put_txwi); +void +mt76_put_rxwi(struct mt76_dev *dev, struct mt76_txwi_cache *t) +{ + if (!t) + return; + + spin_lock(&dev->wed_lock); + list_add(&t->list, &dev->rxwi_cache); + spin_unlock(&dev->wed_lock); +} +EXPORT_SYMBOL_GPL(mt76_put_rxwi); + static void mt76_free_pending_txwi(struct mt76_dev *dev) { @@ -115,6 +169,21 @@ mt76_free_pending_txwi(struct mt76_dev *dev) local_bh_enable(); } +void +mt76_free_pending_rxwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t; + + local_bh_disable(); + while ((t = __mt76_get_rxwi(dev)) != NULL) { + if (t->ptr) + mt76_put_page_pool_buf(t->ptr, false); + kfree(t); + } + local_bh_enable(); +} +EXPORT_SYMBOL_GPL(mt76_free_pending_rxwi); + static void mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q) { @@ -141,6 +210,51 @@ mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q) mt76_dma_sync_idx(dev, q); } +static int +mt76_dma_add_rx_buf(struct mt76_dev *dev, struct mt76_queue *q, + struct mt76_queue_buf *buf, void *data) +{ + struct mt76_desc *desc = &q->desc[q->head]; + struct mt76_queue_entry *entry = &q->entry[q->head]; + struct mt76_txwi_cache *txwi = NULL; + u32 buf1 = 0, ctrl; + int idx = q->head; + int rx_token; + + ctrl = FIELD_PREP(MT_DMA_CTL_SD_LEN0, buf[0].len); + + if (mt76_queue_is_wed_rx(q)) { + txwi = mt76_get_rxwi(dev); + if (!txwi) + return -ENOMEM; + + rx_token = mt76_rx_token_consume(dev, data, txwi, buf->addr); + if (rx_token < 0) { + mt76_put_rxwi(dev, txwi); + return -ENOMEM; + } + + buf1 |= FIELD_PREP(MT_DMA_CTL_TOKEN, rx_token); + ctrl |= MT_DMA_CTL_TO_HOST; + } + + WRITE_ONCE(desc->buf0, cpu_to_le32(buf->addr)); + WRITE_ONCE(desc->buf1, cpu_to_le32(buf1)); + WRITE_ONCE(desc->ctrl, cpu_to_le32(ctrl)); + WRITE_ONCE(desc->info, 0); + + entry->dma_addr[0] = buf->addr; + entry->dma_len[0] = buf->len; + entry->txwi = txwi; + entry->buf = data; + entry->wcid = 0xffff; + entry->skip_buf1 = true; + q->head = (q->head + 1) % q->ndesc; + q->queued++; + + return idx; +} + static int mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q, struct mt76_queue_buf *buf, int nbufs, u32 info, @@ -148,8 +262,8 @@ mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q, { struct mt76_queue_entry *entry; struct mt76_desc *desc; - u32 ctrl; int i, idx = -1; + u32 ctrl, next; if (txwi) { q->entry[q->head].txwi = DMA_DUMMY_DATA; @@ -160,7 +274,7 @@ mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q, u32 buf0 = buf[0].addr, buf1 = 0; idx = q->head; - q->head = (q->head + 1) % q->ndesc; + next = (q->head + 1) % q->ndesc; desc = &q->desc[idx]; entry = &q->entry[idx]; @@ -192,6 +306,7 @@ mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q, WRITE_ONCE(desc->info, cpu_to_le32(info)); WRITE_ONCE(desc->ctrl, cpu_to_le32(ctrl)); + q->head = next; q->queued++; } @@ -275,33 +390,61 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush) static void * mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx, - int *len, u32 *info, bool *more) + int *len, u32 *info, bool *more, bool *drop) { struct mt76_queue_entry *e = &q->entry[idx]; struct mt76_desc *desc = &q->desc[idx]; - dma_addr_t buf_addr; - void *buf = e->buf; - int buf_len = SKB_WITH_OVERHEAD(q->buf_size); + void *buf; - buf_addr = e->dma_addr[0]; if (len) { - u32 ctl = le32_to_cpu(READ_ONCE(desc->ctrl)); - *len = FIELD_GET(MT_DMA_CTL_SD_LEN0, ctl); - *more = !(ctl & MT_DMA_CTL_LAST_SEC0); + u32 ctrl = le32_to_cpu(READ_ONCE(desc->ctrl)); + *len = FIELD_GET(MT_DMA_CTL_SD_LEN0, ctrl); + *more = !(ctrl & MT_DMA_CTL_LAST_SEC0); } if (info) *info = le32_to_cpu(desc->info); - dma_unmap_single(dev->dma_dev, buf_addr, buf_len, DMA_FROM_DEVICE); - e->buf = NULL; + if (mt76_queue_is_wed_rx(q)) { + u32 buf1 = le32_to_cpu(desc->buf1); + u32 token = FIELD_GET(MT_DMA_CTL_TOKEN, buf1); + struct mt76_txwi_cache *t = mt76_rx_token_release(dev, token); + + if (!t) + return NULL; + + dma_sync_single_for_cpu(dev->dma_dev, t->dma_addr, + SKB_WITH_OVERHEAD(q->buf_size), + page_pool_get_dma_dir(q->page_pool)); + + buf = t->ptr; + t->dma_addr = 0; + t->ptr = NULL; + + mt76_put_rxwi(dev, t); + + if (drop) { + u32 ctrl = le32_to_cpu(READ_ONCE(desc->ctrl)); + + *drop = !!(ctrl & (MT_DMA_CTL_TO_HOST_A | + MT_DMA_CTL_DROP)); + + *drop |= !!(buf1 & MT_DMA_CTL_WO_DROP); + } + } else { + buf = e->buf; + e->buf = NULL; + dma_sync_single_for_cpu(dev->dma_dev, e->dma_addr[0], + SKB_WITH_OVERHEAD(q->buf_size), + page_pool_get_dma_dir(q->page_pool)); + } return buf; } static void * mt76_dma_dequeue(struct mt76_dev *dev, struct mt76_queue *q, bool flush, - int *len, u32 *info, bool *more) + int *len, u32 *info, bool *more, bool *drop) { int idx = q->tail; @@ -317,7 +460,7 @@ mt76_dma_dequeue(struct mt76_dev *dev, struct mt76_queue *q, bool flush, q->tail = (q->tail + 1) % q->ndesc; q->queued--; - return mt76_dma_get_buf(dev, q, idx, len, info, more); + return mt76_dma_get_buf(dev, q, idx, len, info, more, drop); } static int @@ -327,6 +470,9 @@ mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, struct mt76_queue *q, struct mt76_queue_buf buf = {}; dma_addr_t addr; + if (test_bit(MT76_MCU_RESET, &dev->phy.state)) + goto error; + if (q->queued + 1 >= q->ndesc - 1) goto error; @@ -368,6 +514,9 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, dma_addr_t addr; u8 *txwi; + if (test_bit(MT76_RESET, &dev->phy.state)) + goto free_skb; + t = mt76_get_txwi(dev); if (!t) goto free_skb; @@ -439,19 +588,19 @@ free: free_skb: status.skb = tx_info.skb; hw = mt76_tx_status_get_hw(dev, tx_info.skb); + spin_lock_bh(&dev->rx_lock); ieee80211_tx_status_ext(hw, &status); + spin_unlock_bh(&dev->rx_lock); return ret; } static int -mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q) +mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q, + bool allow_direct) { - dma_addr_t addr; - void *buf; - int frames = 0; int len = SKB_WITH_OVERHEAD(q->buf_size); - int offset = q->buf_offset; + int frames = 0; if (!q->ndesc) return 0; @@ -459,22 +608,27 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q) spin_lock_bh(&q->lock); while (q->queued < q->ndesc - 1) { + enum dma_data_direction dir; struct mt76_queue_buf qbuf; + dma_addr_t addr; + int offset; + void *buf; - buf = page_frag_alloc(&q->rx_page, q->buf_size, GFP_ATOMIC); + buf = mt76_get_page_pool_buf(q, &offset, q->buf_size); if (!buf) break; - addr = dma_map_single(dev->dma_dev, buf, len, DMA_FROM_DEVICE); - if (unlikely(dma_mapping_error(dev->dma_dev, addr))) { - skb_free_frag(buf); - break; - } + addr = page_pool_get_dma_addr(virt_to_head_page(buf)) + offset; + dir = page_pool_get_dma_dir(q->page_pool); + dma_sync_single_for_device(dev->dma_dev, addr, len, dir); - qbuf.addr = addr + offset; - qbuf.len = len - offset; + qbuf.addr = addr + q->buf_offset; + qbuf.len = len - q->buf_offset; qbuf.skip_unmap = false; - mt76_dma_add_buf(dev, q, &qbuf, 1, 0, buf, NULL); + if (mt76_dma_add_rx_buf(dev, q, &qbuf, buf) < 0) { + mt76_put_page_pool_buf(buf, allow_direct); + break; + } frames++; } @@ -486,14 +640,17 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q) return frames; } -static int -mt76_dma_wed_setup(struct mt76_dev *dev, struct mt76_queue *q) +int mt76_dma_wed_setup(struct mt76_dev *dev, struct mt76_queue *q, bool reset) { #ifdef CONFIG_NET_MEDIATEK_SOC_WED struct mtk_wed_device *wed = &dev->mmio.wed; int ret, type, ring; - u8 flags = q->flags; + u8 flags; + if (!q || !q->ndesc) + return -EINVAL; + + flags = q->flags; if (!mtk_wed_device_active(wed)) q->flags &= ~MT_QFLAG_WED; @@ -505,7 +662,7 @@ mt76_dma_wed_setup(struct mt76_dev *dev, struct mt76_queue *q) switch (type) { case MT76_WED_Q_TX: - ret = mtk_wed_device_tx_ring_setup(wed, ring, q->regs); + ret = mtk_wed_device_tx_ring_setup(wed, ring, q->regs, reset); if (!ret) q->wed_regs = wed->tx_ring[ring].reg_base; break; @@ -513,13 +670,18 @@ mt76_dma_wed_setup(struct mt76_dev *dev, struct mt76_queue *q) /* WED txfree queue needs ring to be initialized before setup */ q->flags = 0; mt76_dma_queue_reset(dev, q); - mt76_dma_rx_fill(dev, q); + mt76_dma_rx_fill(dev, q, false); q->flags = flags; ret = mtk_wed_device_txfree_ring_setup(wed, q->regs); if (!ret) q->wed_regs = wed->txfree_ring.reg_base; break; + case MT76_WED_Q_RX: + ret = mtk_wed_device_rx_ring_setup(wed, ring, q->regs, reset); + if (!ret) + q->wed_regs = wed->rx_ring[ring].reg_base; + break; default: ret = -EINVAL; } @@ -529,6 +691,7 @@ mt76_dma_wed_setup(struct mt76_dev *dev, struct mt76_queue *q) return 0; #endif } +EXPORT_SYMBOL_GPL(mt76_dma_wed_setup); static int mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q, @@ -559,7 +722,11 @@ mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q, if (!q->entry) return -ENOMEM; - ret = mt76_dma_wed_setup(dev, q); + ret = mt76_create_page_pool(dev, q); + if (ret) + return ret; + + ret = mt76_dma_wed_setup(dev, q, false); if (ret) return ret; @@ -572,7 +739,6 @@ mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q, static void mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q) { - struct page *page; void *buf; bool more; @@ -580,21 +746,21 @@ mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q) return; spin_lock_bh(&q->lock); + do { - buf = mt76_dma_dequeue(dev, q, true, NULL, NULL, &more); + buf = mt76_dma_dequeue(dev, q, true, NULL, NULL, &more, NULL); if (!buf) break; - skb_free_frag(buf); + mt76_put_page_pool_buf(buf, false); } while (1); - spin_unlock_bh(&q->lock); - if (!q->rx_page.va) - return; + if (q->rx_head) { + dev_kfree_skb(q->rx_head); + q->rx_head = NULL; + } - page = virt_to_page(q->rx_page.va); - __page_frag_cache_drain(page, q->rx_page.pagecnt_bias); - memset(&q->rx_page, 0, sizeof(q->rx_page)); + spin_unlock_bh(&q->lock); } static void @@ -610,19 +776,18 @@ mt76_dma_rx_reset(struct mt76_dev *dev, enum mt76_rxq_id qid) q->desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE); mt76_dma_rx_cleanup(dev, q); - mt76_dma_sync_idx(dev, q); - mt76_dma_rx_fill(dev, q); - if (!q->rx_head) - return; - - dev_kfree_skb(q->rx_head); - q->rx_head = NULL; + /* reset WED rx queues */ + mt76_dma_wed_setup(dev, q, true); + if (q->flags != MT_WED_Q_TXFREE) { + mt76_dma_sync_idx(dev, q); + mt76_dma_rx_fill(dev, q, false); + } } static void mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data, - int len, bool more) + int len, bool more, u32 info) { struct sk_buff *skb = q->rx_head; struct skb_shared_info *shinfo = skb_shinfo(skb); @@ -638,7 +803,7 @@ mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data, skb_add_rx_frag(skb, nr_frags, page, offset, len, q->buf_size); } else { - skb_free_frag(data); + mt76_put_page_pool_buf(data, true); } if (more) @@ -646,7 +811,7 @@ mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data, q->rx_head = NULL; if (nr_frags < ARRAY_SIZE(shinfo->frags)) - dev->drv->rx_skb(dev, q - dev->q_rx, skb); + dev->drv->rx_skb(dev, q - dev->q_rx, skb, &info); else dev_kfree_skb(skb); } @@ -667,6 +832,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) } while (done < budget) { + bool drop = false; u32 info; if (check_ddone) { @@ -677,10 +843,14 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) break; } - data = mt76_dma_dequeue(dev, q, false, &len, &info, &more); + data = mt76_dma_dequeue(dev, q, false, &len, &info, &more, + &drop); if (!data) break; + if (drop) + goto free_frag; + if (q->rx_head) data_len = q->buf_size; else @@ -693,7 +863,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) } if (q->rx_head) { - mt76_add_fragment(dev, q, data, len, more); + mt76_add_fragment(dev, q, data, len, more, info); continue; } @@ -701,11 +871,12 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) !(dev->drv->rx_check(dev, data, len))) goto free_frag; - skb = build_skb(data, q->buf_size); + skb = napi_build_skb(data, q->buf_size); if (!skb) goto free_frag; skb_reserve(skb, q->buf_offset); + skb_mark_for_recycle(skb); *(u32 *)skb->cb = info; @@ -717,14 +888,14 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) continue; } - dev->drv->rx_skb(dev, q - dev->q_rx, skb); + dev->drv->rx_skb(dev, q - dev->q_rx, skb, &info); continue; free_frag: - skb_free_frag(data); + mt76_put_page_pool_buf(data, true); } - mt76_dma_rx_fill(dev, q); + mt76_dma_rx_fill(dev, q, true); return done; } @@ -764,10 +935,12 @@ mt76_dma_init(struct mt76_dev *dev, snprintf(dev->napi_dev.name, sizeof(dev->napi_dev.name), "%s", wiphy_name(dev->hw->wiphy)); dev->napi_dev.threaded = 1; + init_completion(&dev->mmio.wed_reset); + init_completion(&dev->mmio.wed_reset_complete); mt76_for_each_q_rx(dev, i) { netif_napi_add(&dev->napi_dev, &dev->napi[i], poll); - mt76_dma_rx_fill(dev, &dev->q_rx[i]); + mt76_dma_rx_fill(dev, &dev->q_rx[i], false); napi_enable(&dev->napi[i]); } @@ -814,11 +987,16 @@ void mt76_dma_cleanup(struct mt76_dev *dev) mt76_dma_tx_cleanup(dev, dev->q_mcu[i], true); mt76_for_each_q_rx(dev, i) { + struct mt76_queue *q = &dev->q_rx[i]; + netif_napi_del(&dev->napi[i]); - mt76_dma_rx_cleanup(dev, &dev->q_rx[i]); + mt76_dma_rx_cleanup(dev, q); + + page_pool_destroy(q->page_pool); } mt76_free_pending_txwi(dev); + mt76_free_pending_rxwi(dev); if (mtk_wed_device_active(&dev->mmio.wed)) mtk_wed_device_detach(&dev->mmio.wed); diff --git a/sys/contrib/dev/mediatek/mt76/dma.h b/sys/contrib/dev/mediatek/mt76/dma.h index fdf786f975ea..1b090d78cd05 100644 --- a/sys/contrib/dev/mediatek/mt76/dma.h +++ b/sys/contrib/dev/mediatek/mt76/dma.h @@ -15,6 +15,15 @@ #define MT_DMA_CTL_SD_LEN0 GENMASK(29, 16) #define MT_DMA_CTL_LAST_SEC0 BIT(30) #define MT_DMA_CTL_DMA_DONE BIT(31) +#define MT_DMA_CTL_TO_HOST BIT(8) +#define MT_DMA_CTL_TO_HOST_A BIT(12) +#define MT_DMA_CTL_DROP BIT(14) +#define MT_DMA_CTL_TOKEN GENMASK(31, 16) +#define MT_DMA_CTL_WO_DROP BIT(8) + +#define MT_DMA_PPE_CPU_REASON GENMASK(15, 11) +#define MT_DMA_PPE_ENTRY GENMASK(30, 16) +#define MT_DMA_INFO_PPE_VLD BIT(31) #define MT_DMA_HDR_LEN 4 #define MT_RX_INFO_LEN 4 @@ -48,5 +57,6 @@ enum mt76_mcu_evt_type { int mt76_dma_rx_poll(struct napi_struct *napi, int budget); void mt76_dma_attach(struct mt76_dev *dev); void mt76_dma_cleanup(struct mt76_dev *dev); +int mt76_dma_wed_setup(struct mt76_dev *dev, struct mt76_queue *q, bool reset); #endif diff --git a/sys/contrib/dev/mediatek/mt76/eeprom.c b/sys/contrib/dev/mediatek/mt76/eeprom.c index 77918f7f10b0..91483ad5fe79 100644 --- a/sys/contrib/dev/mediatek/mt76/eeprom.c +++ b/sys/contrib/dev/mediatek/mt76/eeprom.c @@ -7,35 +7,42 @@ #include #include #include +#include #endif #include #include "mt76.h" -int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len) +#if defined(CONFIG_OF) +static int mt76_get_of_eeprom_data(struct mt76_dev *dev, void *eep, int len) { -#if defined(CONFIG_OF) && defined(CONFIG_MTD) struct device_node *np = dev->dev->of_node; - struct mtd_info *mtd; - const __be32 *list; const void *data; - const char *part; - phandle phandle; int size; - size_t retlen; - int ret; - if (!np) + data = of_get_property(np, "mediatek,eeprom-data", &size); + if (!data) return -ENOENT; - data = of_get_property(np, "mediatek,eeprom-data", &size); - if (data) { - if (size > len) - return -EINVAL; + if (size > len) + return -EINVAL; - memcpy(eep, data, size); + memcpy(eep, data, size); - return 0; - } + return 0; +} +#endif + +#if defined(CONFIG_MTD) && defined(CONFIG_OF) +static int mt76_get_of_epprom_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len) +{ + struct device_node *np = dev->dev->of_node; + struct mtd_info *mtd; + const __be32 *list; + const char *part; + phandle phandle; + size_t retlen; + int size; + int ret; list = of_get_property(np, "mediatek,mtd-eeprom", &size); if (!list) @@ -98,6 +105,60 @@ int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len) out_put_node: of_node_put(np); return ret; +} +#endif + +#if defined(CONFIG_OF) +static int mt76_get_of_epprom_from_nvmem(struct mt76_dev *dev, void *eep, int len) +{ + struct device_node *np = dev->dev->of_node; + struct nvmem_cell *cell; + const void *data; + size_t retlen; + int ret = 0; + + cell = of_nvmem_cell_get(np, "eeprom"); + if (IS_ERR(cell)) + return PTR_ERR(cell); + + data = nvmem_cell_read(cell, &retlen); + nvmem_cell_put(cell); + + if (IS_ERR(data)) + return PTR_ERR(data); + + if (retlen < len) { + ret = -EINVAL; + goto exit; + } + + memcpy(eep, data, len); *** 37779 LINES SKIPPED *** From nobody Mon Aug 21 01:36: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 4RTZpH24dtz4r17Y; Mon, 21 Aug 2023 01: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 4RTZpH0slWz4lGY; Mon, 21 Aug 2023 01: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=1692581815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=keaS6jJrAcSI4yYb/BEFqc3tABZtNyHiYPhNGn96IXY=; b=UvZ11y/CUDHyDYX98+L0cL7bmjErA12Md4j3wlQCKHqsmktqE9oHyRTyIjpHpKjULwyIen XIb/K5NPTmvVLEgww+ISGuAVUt2aQit3PQhHcTDUfN1PJKe/PIaGBvPXxa/aE/lRBGQ6+2 QVZ35MX1Efqwk2FrWTXLsZDssMPV3rlCXEGfkwB+lXrMriYhQmy91++/dy33jcv82AKrRd 0uoll8Gc/GKfYCBQMYldOJHGMZD9Jys5ycJPnjyHw8Zs9rSJq9wkjKR4SkhWUpkjq52Yiq GZfb+QSu3o4gUtm2cC+zNHrMETwQuEXrSmuMq59CXlK2I+JItiWMkGa3TL5Hyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=keaS6jJrAcSI4yYb/BEFqc3tABZtNyHiYPhNGn96IXY=; b=RZmyuESjacZVtSPylyChq5RedYF15Tj+vuvBsILaoA2udcOUMOTfQjWy6bOdlZHY2d2HnZ /Vsq9bX5xwYawpozZUXf9X+8s1S+eCObpjolgtdS/yJuNKEYh739uBaanpou+KvDvAleD0 uaMqF3QIBm/JQA5vOlY2Q/e0G2m76lareUzeEcpJUYW/e23XVfp16UvYHcbUZPDVEAeEGJ pHOS2G3brIngz/pStC8zqBlgtTxFvxowCsanJqb7J6yiZfcaTw78xYXEE9HwxxYoLBEGdy SFcYFNQutq4rSKp6ww+Vq71EXvWU/yX1Ao4KQqftHRs2/ypxQdeZ7o1Dl/6lGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692581815; a=rsa-sha256; cv=none; b=WYVmpkLLKICrt8rdOlzE7L+S0iAY4tul0TN1pjw88cknfdQCgAp0MxUtGDONhuIOXznkEw ON0WI82vsUv4ikqDJb9LU5qNRaGw3d4ts8EBNyI/ba1B4GicB9MZBROTrWATh9BKYkgUTh cyT3L68tsnYGDgaZO2R/rbdWEL9iwjJK223AoiyO9J+IsypIGcmbTvYp03j69dLtfzN5xz BOwt8DqBQEytLujLuYhC6Zbh7rgoAjUI2rd3P/Sm2ceRUcr4G8R2YMDG1ACtKcpIOEdQXJ 90ZvDmEKcEIgfv5LC2TEUdyFtUCDMH/mqSwHf/C38pT9rQg3KPtSB8fR0JSZjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTZpG74tTz11cZ; Mon, 21 Aug 2023 01:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37L1asUe038465; Mon, 21 Aug 2023 01:36:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37L1arB2038459; Mon, 21 Aug 2023 01:36:53 GMT (envelope-from git) Date: Mon, 21 Aug 2023 01:36:53 GMT Message-Id: <202308210136.37L1arB2038459@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: e2340276fc73 - main - rtw89: update driver from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2340276fc734a1f0bd0d2cf16fcfba7936c9462 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e2340276fc734a1f0bd0d2cf16fcfba7936c9462 commit e2340276fc734a1f0bd0d2cf16fcfba7936c9462 Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 23:44:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-21 01:35:29 +0000 rtw89: update driver from upstream This is a set of updates of the rtw89 driver based on wireless-testing (wt-2023-05-11) 711dca0ca3d77414f8f346e564e9c8640147f40d (after v6.4-rc1). (wt-2023-06-09) 7bd20e011626ccc3ad53e57873452b1716fcfaaa (after v6.4-rc5). (wt-2023-07-24) 62e409149b62a285e89018e49b2e115757fb9022 (after v6.5-rc3). (wt-2023-08-06) 2a220a15be657a24868368892e3e2caba2115283 (after v6.5-rc4). (wt-2023-08-13) 81e147b1317ee7cde8b624ee8c0501b470d7e91c (after v6.5-rc5). MFC after: 20 days --- sys/contrib/dev/rtw89/Kconfig | 28 + sys/contrib/dev/rtw89/Makefile | 23 +- sys/contrib/dev/rtw89/acpi.c | 60 + sys/contrib/dev/rtw89/acpi.h | 21 + sys/contrib/dev/rtw89/chan.c | 75 +- sys/contrib/dev/rtw89/chan.h | 3 + sys/contrib/dev/rtw89/coex.c | 3543 +++- sys/contrib/dev/rtw89/coex.h | 7 + sys/contrib/dev/rtw89/core.c | 1060 +- sys/contrib/dev/rtw89/core.h | 1506 +- sys/contrib/dev/rtw89/debug.c | 1282 +- sys/contrib/dev/rtw89/debug.h | 4 + sys/contrib/dev/rtw89/efuse.c | 21 + sys/contrib/dev/rtw89/efuse.h | 1 + sys/contrib/dev/rtw89/fw.c | 2911 ++- sys/contrib/dev/rtw89/fw.h | 1968 +- sys/contrib/dev/rtw89/mac.c | 1437 +- sys/contrib/dev/rtw89/mac.h | 209 +- sys/contrib/dev/rtw89/mac80211.c | 274 +- sys/contrib/dev/rtw89/pci.c | 323 +- sys/contrib/dev/rtw89/pci.h | 64 +- sys/contrib/dev/rtw89/phy.c | 1139 +- sys/contrib/dev/rtw89/phy.h | 104 +- sys/contrib/dev/rtw89/ps.c | 109 +- sys/contrib/dev/rtw89/ps.h | 22 +- sys/contrib/dev/rtw89/reg.h | 749 +- sys/contrib/dev/rtw89/regd.c | 326 +- sys/contrib/dev/rtw89/rtw8851b.c | 2450 +++ sys/contrib/dev/rtw89/rtw8851b.h | 76 + sys/contrib/dev/rtw89/rtw8851b_rfk.c | 3621 ++++ sys/contrib/dev/rtw89/rtw8851b_rfk.h | 28 + sys/contrib/dev/rtw89/rtw8851b_rfk_table.c | 534 + sys/contrib/dev/rtw89/rtw8851b_rfk_table.h | 38 + sys/contrib/dev/rtw89/rtw8851b_table.c | 14840 +++++++++++++ sys/contrib/dev/rtw89/rtw8851b_table.h | 21 + sys/contrib/dev/rtw89/rtw8851be.c | 86 + sys/contrib/dev/rtw89/rtw8852a.c | 344 +- sys/contrib/dev/rtw89/rtw8852a.h | 1 - sys/contrib/dev/rtw89/rtw8852a_rfk.c | 38 +- sys/contrib/dev/rtw89/rtw8852a_rfk.h | 1 - sys/contrib/dev/rtw89/rtw8852a_table.c | 15 + sys/contrib/dev/rtw89/rtw8852a_table.h | 11 +- sys/contrib/dev/rtw89/rtw8852ae.c | 8 +- sys/contrib/dev/rtw89/rtw8852b.c | 2621 +++ sys/contrib/dev/rtw89/rtw8852b.h | 137 + sys/contrib/dev/rtw89/rtw8852b_rfk.c | 4168 ++++ sys/contrib/dev/rtw89/rtw8852b_rfk.h | 25 + sys/contrib/dev/rtw89/rtw8852b_rfk_table.c | 794 + sys/contrib/dev/rtw89/rtw8852b_rfk_table.h | 62 + sys/contrib/dev/rtw89/rtw8852b_table.c | 22892 ++++++++++++++++++++ sys/contrib/dev/rtw89/rtw8852b_table.h | 21 + sys/contrib/dev/rtw89/rtw8852be.c | 90 + sys/contrib/dev/rtw89/rtw8852c.c | 508 +- sys/contrib/dev/rtw89/rtw8852c.h | 1 - sys/contrib/dev/rtw89/rtw8852c_rfk.c | 396 +- sys/contrib/dev/rtw89/rtw8852c_table.c | 29891 ++++++++++++++++++++++----- sys/contrib/dev/rtw89/rtw8852c_table.h | 18 +- sys/contrib/dev/rtw89/rtw8852ce.c | 8 +- sys/contrib/dev/rtw89/ser.c | 58 +- sys/contrib/dev/rtw89/txrx.h | 223 +- sys/contrib/dev/rtw89/util.h | 11 + sys/contrib/dev/rtw89/wow.c | 842 + sys/contrib/dev/rtw89/wow.h | 21 + sys/modules/rtw89/Makefile | 17 +- 64 files changed, 93533 insertions(+), 8652 deletions(-) diff --git a/sys/contrib/dev/rtw89/Kconfig b/sys/contrib/dev/rtw89/Kconfig index 93e09400aac4..90ffbab7cc4c 100644 --- a/sys/contrib/dev/rtw89/Kconfig +++ b/sys/contrib/dev/rtw89/Kconfig @@ -16,12 +16,29 @@ config RTW89_CORE config RTW89_PCI tristate +config RTW89_8851B + tristate + config RTW89_8852A tristate +config RTW89_8852B + tristate + config RTW89_8852C tristate +config RTW89_8851BE + tristate "Realtek 8851BE PCI wireless network (Wi-Fi 6) adapter" + depends on PCI + select RTW89_CORE + select RTW89_PCI + select RTW89_8851B + help + Select this option will enable support for 8851BE chipset + + 802.11ax PCIe wireless network (Wi-Fi 6) adapter + config RTW89_8852AE tristate "Realtek 8852AE PCI wireless network (Wi-Fi 6) adapter" depends on PCI @@ -33,6 +50,17 @@ config RTW89_8852AE 802.11ax PCIe wireless network (Wi-Fi 6) adapter +config RTW89_8852BE + tristate "Realtek 8852BE PCI wireless network (Wi-Fi 6) adapter" + depends on PCI + select RTW89_CORE + select RTW89_PCI + select RTW89_8852B + help + Select this option will enable support for 8852BE chipset + + 802.11ax PCIe wireless network (Wi-Fi 6) adapter + config RTW89_8852CE tristate "Realtek 8852CE PCI wireless network (Wi-Fi 6E) adapter" depends on PCI diff --git a/sys/contrib/dev/rtw89/Makefile b/sys/contrib/dev/rtw89/Makefile index a87f2aff4def..41940099af1b 100644 --- a/sys/contrib/dev/rtw89/Makefile +++ b/sys/contrib/dev/rtw89/Makefile @@ -13,7 +13,19 @@ rtw89_core-y += core.o \ coex.o \ ps.o \ chan.o \ - ser.o + ser.o \ + acpi.o + +rtw89_core-$(CONFIG_PM) += wow.o + +obj-$(CONFIG_RTW89_8851B) += rtw89_8851b.o +rtw89_8851b-objs := rtw8851b.o \ + rtw8851b_table.o \ + rtw8851b_rfk.o \ + rtw8851b_rfk_table.o + +obj-$(CONFIG_RTW89_8851BE) += rtw89_8851be.o +rtw89_8851be-objs := rtw8851be.o obj-$(CONFIG_RTW89_8852A) += rtw89_8852a.o rtw89_8852a-objs := rtw8852a.o \ @@ -24,6 +36,15 @@ rtw89_8852a-objs := rtw8852a.o \ obj-$(CONFIG_RTW89_8852AE) += rtw89_8852ae.o rtw89_8852ae-objs := rtw8852ae.o +obj-$(CONFIG_RTW89_8852B) += rtw89_8852b.o +rtw89_8852b-objs := rtw8852b.o \ + rtw8852b_table.o \ + rtw8852b_rfk.o \ + rtw8852b_rfk_table.o + +obj-$(CONFIG_RTW89_8852BE) += rtw89_8852be.o +rtw89_8852be-objs := rtw8852be.o + obj-$(CONFIG_RTW89_8852C) += rtw89_8852c.o rtw89_8852c-objs := rtw8852c.o \ rtw8852c_table.o \ diff --git a/sys/contrib/dev/rtw89/acpi.c b/sys/contrib/dev/rtw89/acpi.c new file mode 100644 index 000000000000..83252c861c82 --- /dev/null +++ b/sys/contrib/dev/rtw89/acpi.c @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright(c) 2021-2023 Realtek Corporation + */ + +#include +#include + +#include "acpi.h" +#include "debug.h" + +#if defined(__linux__) +static const guid_t rtw89_guid = GUID_INIT(0xD2A8C3E8, 0x4B69, 0x4F00, + 0x82, 0xBD, 0xFE, 0x86, + 0x07, 0x80, 0x3A, 0xA7); + +static int rtw89_acpi_dsm_get(struct rtw89_dev *rtwdev, union acpi_object *obj, + u8 *value) +{ + switch (obj->type) { + case ACPI_TYPE_INTEGER: + *value = (u8)obj->integer.value; + break; + case ACPI_TYPE_BUFFER: + *value = obj->buffer.pointer[0]; + break; + default: + rtw89_debug(rtwdev, RTW89_DBG_UNEXP, + "acpi dsm return unhandled type: %d\n", obj->type); + return -EINVAL; + } + + return 0; +} + +int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, + enum rtw89_acpi_dsm_func func, u8 *value) +{ + union acpi_object *obj; + int ret; + + obj = acpi_evaluate_dsm(ACPI_HANDLE(rtwdev->dev), &rtw89_guid, + 0, func, NULL); + if (!obj) { + rtw89_debug(rtwdev, RTW89_DBG_UNEXP, + "acpi dsm fail to evaluate func: %d\n", func); + return -ENOENT; + } + + ret = rtw89_acpi_dsm_get(rtwdev, obj, value); + + ACPI_FREE(obj); + return ret; +} +#elif defined(__FreeBSD__) +int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, + enum rtw89_acpi_dsm_func func, u8 *value) +{ + return -ENOENT; +} +#endif diff --git a/sys/contrib/dev/rtw89/acpi.h b/sys/contrib/dev/rtw89/acpi.h new file mode 100644 index 000000000000..ed74d8ceb733 --- /dev/null +++ b/sys/contrib/dev/rtw89/acpi.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* Copyright(c) 2021-2023 Realtek Corporation + */ + +#ifndef __RTW89_ACPI_H__ +#define __RTW89_ACPI_H__ + +#include "core.h" + +enum rtw89_acpi_dsm_func { + RTW89_ACPI_DSM_FUNC_IDN_BAND_SUP = 2, + RTW89_ACPI_DSM_FUNC_6G_DIS = 3, + RTW89_ACPI_DSM_FUNC_6G_BP = 4, + RTW89_ACPI_DSM_FUNC_TAS_EN = 5, + RTW89_ACPI_DSM_FUNC_59G_EN = 6, +}; + +int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, + enum rtw89_acpi_dsm_func func, u8 *value); + +#endif diff --git a/sys/contrib/dev/rtw89/chan.c b/sys/contrib/dev/rtw89/chan.c index a4f61c2f6512..4663db4ce2f6 100644 --- a/sys/contrib/dev/rtw89/chan.c +++ b/sys/contrib/dev/rtw89/chan.c @@ -4,6 +4,7 @@ #include "chan.h" #include "debug.h" +#include "util.h" static enum rtw89_subband rtw89_get_subband_type(enum rtw89_band band, u8 center_chan) @@ -108,8 +109,8 @@ bool rtw89_assign_entity_chan(struct rtw89_dev *rtwdev, const struct rtw89_chan *new) { struct rtw89_hal *hal = &rtwdev->hal; - struct rtw89_chan *chan = &hal->chan[idx]; - struct rtw89_chan_rcd *rcd = &hal->chan_rcd[idx]; + struct rtw89_chan *chan = &hal->sub[idx].chan; + struct rtw89_chan_rcd *rcd = &hal->sub[idx].rcd; bool band_changed; rcd->prev_primary_channel = chan->primary_channel; @@ -127,7 +128,7 @@ static void __rtw89_config_entity_chandef(struct rtw89_dev *rtwdev, { struct rtw89_hal *hal = &rtwdev->hal; - hal->chandef[idx] = *chandef; + hal->sub[idx].chandef = *chandef; if (from_stack) set_bit(idx, hal->entity_map); @@ -140,6 +141,38 @@ void rtw89_config_entity_chandef(struct rtw89_dev *rtwdev, __rtw89_config_entity_chandef(rtwdev, idx, chandef, true); } +void rtw89_config_roc_chandef(struct rtw89_dev *rtwdev, + enum rtw89_sub_entity_idx idx, + const struct cfg80211_chan_def *chandef) +{ + struct rtw89_hal *hal = &rtwdev->hal; + enum rtw89_sub_entity_idx cur; + + if (chandef) { + cur = atomic_cmpxchg(&hal->roc_entity_idx, + RTW89_SUB_ENTITY_IDLE, idx); + if (cur != RTW89_SUB_ENTITY_IDLE) { + rtw89_debug(rtwdev, RTW89_DBG_TXRX, + "ROC still processing on entity %d\n", idx); + return; + } + + hal->roc_chandef = *chandef; + } else { + cur = atomic_cmpxchg(&hal->roc_entity_idx, idx, + RTW89_SUB_ENTITY_IDLE); + if (cur == idx) + return; + + if (cur == RTW89_SUB_ENTITY_IDLE) + rtw89_debug(rtwdev, RTW89_DBG_TXRX, + "ROC already finished on entity %d\n", idx); + else + rtw89_debug(rtwdev, RTW89_DBG_TXRX, + "ROC is processing on entity %d\n", cur); + } +} + static void rtw89_config_default_chandef(struct rtw89_dev *rtwdev) { struct cfg80211_chan_def chandef = {0}; @@ -153,6 +186,7 @@ void rtw89_entity_init(struct rtw89_dev *rtwdev) struct rtw89_hal *hal = &rtwdev->hal; bitmap_zero(hal->entity_map, NUM_OF_RTW89_SUB_ENTITY); + atomic_set(&hal->roc_entity_idx, RTW89_SUB_ENTITY_IDLE); rtw89_config_default_chandef(rtwdev); } @@ -195,6 +229,7 @@ int rtw89_chanctx_ops_add(struct rtw89_dev *rtwdev, rtw89_config_entity_chandef(rtwdev, idx, &ctx->def); rtw89_set_channel(rtwdev); cfg->idx = idx; + hal->sub[idx].cfg = cfg; return 0; } @@ -203,8 +238,36 @@ void rtw89_chanctx_ops_remove(struct rtw89_dev *rtwdev, { struct rtw89_hal *hal = &rtwdev->hal; struct rtw89_chanctx_cfg *cfg = (struct rtw89_chanctx_cfg *)ctx->drv_priv; + struct rtw89_vif *rtwvif; + u8 drop, roll; - clear_bit(cfg->idx, hal->entity_map); + drop = cfg->idx; + if (drop != RTW89_SUB_ENTITY_0) + goto out; + + roll = find_next_bit(hal->entity_map, NUM_OF_RTW89_SUB_ENTITY, drop + 1); + + /* Follow rtw89_config_default_chandef() when rtw89_entity_recalc(). */ + if (roll == NUM_OF_RTW89_SUB_ENTITY) + goto out; + + /* RTW89_SUB_ENTITY_0 is going to release, and another exists. + * Make another roll down to RTW89_SUB_ENTITY_0 to replace. + */ + hal->sub[roll].cfg->idx = RTW89_SUB_ENTITY_0; + hal->sub[RTW89_SUB_ENTITY_0] = hal->sub[roll]; + + rtw89_for_each_rtwvif(rtwdev, rtwvif) { + if (rtwvif->sub_entity_idx == roll) + rtwvif->sub_entity_idx = RTW89_SUB_ENTITY_0; + } + + atomic_cmpxchg(&hal->roc_entity_idx, roll, RTW89_SUB_ENTITY_0); + + drop = roll; + +out: + clear_bit(drop, hal->entity_map); rtw89_set_channel(rtwdev); } @@ -225,6 +288,9 @@ int rtw89_chanctx_ops_assign_vif(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, struct ieee80211_chanctx_conf *ctx) { + struct rtw89_chanctx_cfg *cfg = (struct rtw89_chanctx_cfg *)ctx->drv_priv; + + rtwvif->sub_entity_idx = cfg->idx; return 0; } @@ -232,4 +298,5 @@ void rtw89_chanctx_ops_unassign_vif(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, struct ieee80211_chanctx_conf *ctx) { + rtwvif->sub_entity_idx = RTW89_SUB_ENTITY_0; } diff --git a/sys/contrib/dev/rtw89/chan.h b/sys/contrib/dev/rtw89/chan.h index ecbd4503bead..bdf369db5041 100644 --- a/sys/contrib/dev/rtw89/chan.h +++ b/sys/contrib/dev/rtw89/chan.h @@ -45,6 +45,9 @@ bool rtw89_assign_entity_chan(struct rtw89_dev *rtwdev, void rtw89_config_entity_chandef(struct rtw89_dev *rtwdev, enum rtw89_sub_entity_idx idx, const struct cfg80211_chan_def *chandef); +void rtw89_config_roc_chandef(struct rtw89_dev *rtwdev, + enum rtw89_sub_entity_idx idx, + const struct cfg80211_chan_def *chandef); void rtw89_entity_init(struct rtw89_dev *rtwdev); enum rtw89_entity_mode rtw89_entity_recalc(struct rtw89_dev *rtwdev); int rtw89_chanctx_ops_add(struct rtw89_dev *rtwdev, diff --git a/sys/contrib/dev/rtw89/coex.c b/sys/contrib/dev/rtw89/coex.c index aa90bf616b41..bda0e1e99a8c 100644 --- a/sys/contrib/dev/rtw89/coex.c +++ b/sys/contrib/dev/rtw89/coex.c @@ -9,6 +9,7 @@ #include "ps.h" #include "reg.h" +#define RTW89_COEX_VERSION 0x07000113 #define FCXDEF_STEP 50 /* MUST <= FCXMAX_STEP and match with wl fw*/ enum btc_fbtc_tdma_template { @@ -62,7 +63,7 @@ struct btc_fbtc_1slot { static const struct rtw89_btc_fbtc_tdma t_def[] = { [CXTD_OFF] = { CXTDMA_OFF, CXFLC_OFF, CXTPS_OFF, 0, 0, 0, 0, 0}, [CXTD_OFF_B2] = { CXTDMA_OFF, CXFLC_OFF, CXTPS_OFF, 0, 0, 1, 0, 0}, - [CXTD_OFF_EXT] = { CXTDMA_OFF, CXFLC_OFF, CXTPS_OFF, 0, 0, 3, 0, 0}, + [CXTD_OFF_EXT] = { CXTDMA_OFF, CXFLC_OFF, CXTPS_OFF, 0, 0, 2, 0, 0}, [CXTD_FIX] = { CXTDMA_FIX, CXFLC_OFF, CXTPS_OFF, 0, 0, 0, 0, 0}, [CXTD_PFIX] = { CXTDMA_FIX, CXFLC_NULLP, CXTPS_ON, 0, 5, 0, 0, 0}, [CXTD_AUTO] = { CXTDMA_AUTO, CXFLC_OFF, CXTPS_OFF, 0, 0, 0, 0, 0}, @@ -77,35 +78,35 @@ static const struct rtw89_btc_fbtc_tdma t_def[] = { static const struct rtw89_btc_fbtc_slot s_def[] = { [CXST_OFF] = __DEF_FBTC_SLOT(100, 0x55555555, SLOT_MIX), - [CXST_B2W] = __DEF_FBTC_SLOT(5, 0x5a5a5a5a, SLOT_ISO), - [CXST_W1] = __DEF_FBTC_SLOT(70, 0x5a5a5a5a, SLOT_ISO), - [CXST_W2] = __DEF_FBTC_SLOT(70, 0x5a5a5aaa, SLOT_ISO), - [CXST_W2B] = __DEF_FBTC_SLOT(15, 0x5a5a5a5a, SLOT_ISO), - [CXST_B1] = __DEF_FBTC_SLOT(100, 0x55555555, SLOT_MIX), - [CXST_B2] = __DEF_FBTC_SLOT(7, 0x6a5a5a5a, SLOT_MIX), - [CXST_B3] = __DEF_FBTC_SLOT(5, 0x55555555, SLOT_MIX), - [CXST_B4] = __DEF_FBTC_SLOT(50, 0x55555555, SLOT_MIX), - [CXST_LK] = __DEF_FBTC_SLOT(20, 0x5a5a5a5a, SLOT_ISO), - [CXST_BLK] = __DEF_FBTC_SLOT(250, 0x55555555, SLOT_MIX), - [CXST_E2G] = __DEF_FBTC_SLOT(20, 0x6a5a5a5a, SLOT_MIX), - [CXST_E5G] = __DEF_FBTC_SLOT(20, 0xffffffff, SLOT_MIX), - [CXST_EBT] = __DEF_FBTC_SLOT(20, 0x55555555, SLOT_MIX), - [CXST_ENULL] = __DEF_FBTC_SLOT(7, 0xaaaaaaaa, SLOT_ISO), - [CXST_WLK] = __DEF_FBTC_SLOT(250, 0x6a5a6a5a, SLOT_MIX), - [CXST_W1FDD] = __DEF_FBTC_SLOT(35, 0xfafafafa, SLOT_ISO), - [CXST_B1FDD] = __DEF_FBTC_SLOT(100, 0xffffffff, SLOT_MIX), + [CXST_B2W] = __DEF_FBTC_SLOT(5, 0xea5a5a5a, SLOT_ISO), + [CXST_W1] = __DEF_FBTC_SLOT(70, 0xea5a5a5a, SLOT_ISO), + [CXST_W2] = __DEF_FBTC_SLOT(15, 0xea5a5a5a, SLOT_ISO), + [CXST_W2B] = __DEF_FBTC_SLOT(15, 0xea5a5a5a, SLOT_ISO), + [CXST_B1] = __DEF_FBTC_SLOT(250, 0xe5555555, SLOT_MIX), + [CXST_B2] = __DEF_FBTC_SLOT(7, 0xea5a5a5a, SLOT_MIX), + [CXST_B3] = __DEF_FBTC_SLOT(5, 0xe5555555, SLOT_MIX), + [CXST_B4] = __DEF_FBTC_SLOT(50, 0xe5555555, SLOT_MIX), + [CXST_LK] = __DEF_FBTC_SLOT(20, 0xea5a5a5a, SLOT_ISO), + [CXST_BLK] = __DEF_FBTC_SLOT(500, 0x55555555, SLOT_MIX), + [CXST_E2G] = __DEF_FBTC_SLOT(0, 0xea5a5a5a, SLOT_MIX), + [CXST_E5G] = __DEF_FBTC_SLOT(0, 0xffffffff, SLOT_ISO), + [CXST_EBT] = __DEF_FBTC_SLOT(0, 0xe5555555, SLOT_MIX), + [CXST_ENULL] = __DEF_FBTC_SLOT(0, 0xaaaaaaaa, SLOT_ISO), + [CXST_WLK] = __DEF_FBTC_SLOT(250, 0xea5a5a5a, SLOT_MIX), + [CXST_W1FDD] = __DEF_FBTC_SLOT(50, 0xffffffff, SLOT_ISO), + [CXST_B1FDD] = __DEF_FBTC_SLOT(50, 0xffffdfff, SLOT_ISO), }; static const u32 cxtbl[] = { 0xffffffff, /* 0 */ 0xaaaaaaaa, /* 1 */ - 0x55555555, /* 2 */ - 0x66555555, /* 3 */ - 0x66556655, /* 4 */ + 0xe5555555, /* 2 */ + 0xee555555, /* 3 */ + 0xd5555555, /* 4 */ 0x5a5a5a5a, /* 5 */ - 0x5a5a5aaa, /* 6 */ - 0xaa5a5a5a, /* 7 */ - 0x6a5a5a5a, /* 8 */ + 0xfa5a5a5a, /* 6 */ + 0xda5a5a5a, /* 7 */ + 0xea5a5a5a, /* 8 */ 0x6a5a5aaa, /* 9 */ 0x6a5a6a5a, /* 10 */ 0x6a5a6aaa, /* 11 */ @@ -116,26 +117,113 @@ static const u32 cxtbl[] = { 0xfafafafa, /* 16 */ 0xffffddff, /* 17 */ 0xdaffdaff, /* 18 */ - 0xfafadafa /* 19 */ + 0xfafadafa, /* 19 */ + 0xea6a6a6a, /* 20 */ + 0xea55556a, /* 21 */ + 0xaafafafa, /* 22 */ + 0xfafaaafa, /* 23 */ + 0xfafffaff /* 24 */ }; +static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { + /* firmware version must be in decreasing order for each chip */ + {RTL8851B, RTW89_FW_VER_CODE(0, 29, 29, 0), + .fcxbtcrpt = 105, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 5, + .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 2, .fcxgpiodbg = 1, + .fcxbtver = 1, .fcxbtscan = 2, .fcxbtafh = 2, .fcxbtdevinfo = 1, + .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, + .info_buf = 1800, .max_role_num = 6, + }, + {RTL8852C, RTW89_FW_VER_CODE(0, 27, 57, 0), + .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3, + .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 1, .fcxgpiodbg = 1, + .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 2, .fcxbtdevinfo = 1, + .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, + .info_buf = 1280, .max_role_num = 5, + }, + {RTL8852C, RTW89_FW_VER_CODE(0, 27, 42, 0), + .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3, + .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 1, .fcxgpiodbg = 1, + .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 2, .fcxbtdevinfo = 1, + .fwlrole = 1, .frptmap = 2, .fcxctrl = 1, + .info_buf = 1280, .max_role_num = 5, + }, + {RTL8852C, RTW89_FW_VER_CODE(0, 27, 0, 0), + .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3, + .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 1, .fcxgpiodbg = 1, + .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 1, .fcxbtdevinfo = 1, + .fwlrole = 1, .frptmap = 2, .fcxctrl = 1, + .info_buf = 1280, .max_role_num = 5, + }, + {RTL8852B, RTW89_FW_VER_CODE(0, 29, 29, 0), + .fcxbtcrpt = 105, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 5, + .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 2, .fcxgpiodbg = 1, + .fcxbtver = 1, .fcxbtscan = 2, .fcxbtafh = 2, .fcxbtdevinfo = 1, + .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, + .info_buf = 1800, .max_role_num = 6, + }, + {RTL8852B, RTW89_FW_VER_CODE(0, 29, 14, 0), + .fcxbtcrpt = 5, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 4, + .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 1, .fcxgpiodbg = 1, + .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 2, .fcxbtdevinfo = 1, + .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, + .info_buf = 1800, .max_role_num = 6, + }, + {RTL8852B, RTW89_FW_VER_CODE(0, 27, 0, 0), + .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3, + .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 1, .fcxgpiodbg = 1, + .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 1, .fcxbtdevinfo = 1, + .fwlrole = 1, .frptmap = 1, .fcxctrl = 1, + .info_buf = 1280, .max_role_num = 5, + }, + {RTL8852A, RTW89_FW_VER_CODE(0, 13, 37, 0), + .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3, + .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 1, .fcxgpiodbg = 1, + .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 2, .fcxbtdevinfo = 1, + .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, + .info_buf = 1280, .max_role_num = 5, + }, + {RTL8852A, RTW89_FW_VER_CODE(0, 13, 0, 0), + .fcxbtcrpt = 1, .fcxtdma = 1, .fcxslots = 1, .fcxcysta = 2, + .fcxstep = 2, .fcxnullsta = 1, .fcxmreg = 1, .fcxgpiodbg = 1, + .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 1, .fcxbtdevinfo = 1, + .fwlrole = 0, .frptmap = 0, .fcxctrl = 0, + .info_buf = 1024, .max_role_num = 5, + }, + + /* keep it to be the last as default entry */ + {0, RTW89_FW_VER_CODE(0, 0, 0, 0), + .fcxbtcrpt = 1, .fcxtdma = 1, .fcxslots = 1, .fcxcysta = 2, + .fcxstep = 2, .fcxnullsta = 1, .fcxmreg = 1, .fcxgpiodbg = 1, + .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 1, .fcxbtdevinfo = 1, + .fwlrole = 0, .frptmap = 0, .fcxctrl = 0, + .info_buf = 1024, .max_role_num = 5, + }, +}; + +#define RTW89_DEFAULT_BTC_VER_IDX (ARRAY_SIZE(rtw89_btc_ver_defs) - 1) + struct rtw89_btc_btf_tlv { u8 type; u8 len; - u8 val[1]; + u8 val[]; } __packed; enum btc_btf_set_report_en { - RPT_EN_TDMA = BIT(0), - RPT_EN_CYCLE = BIT(1), - RPT_EN_MREG = BIT(2), - RPT_EN_BT_VER_INFO = BIT(3), - RPT_EN_BT_SCAN_INFO = BIT(4), - RPT_EN_BT_AFH_MAP = BIT(5), - RPT_EN_BT_DEVICE_INFO = BIT(6), - RPT_EN_WL_ALL = GENMASK(2, 0), - RPT_EN_BT_ALL = GENMASK(6, 3), - RPT_EN_ALL = GENMASK(6, 0), + RPT_EN_TDMA, + RPT_EN_CYCLE, + RPT_EN_MREG, + RPT_EN_BT_VER_INFO, + RPT_EN_BT_SCAN_INFO, + RPT_EN_BT_DEVICE_INFO, + RPT_EN_BT_AFH_MAP, + RPT_EN_BT_AFH_MAP_LE, + RPT_EN_FW_STEP_INFO, + RPT_EN_TEST, + RPT_EN_WL_ALL, + RPT_EN_BT_ALL, + RPT_EN_ALL, + RPT_EN_MONITER, }; #define BTF_SET_REPORT_VER 1 @@ -152,7 +240,6 @@ struct rtw89_btc_btf_set_slot_table { u8 buf[]; } __packed; -#define BTF_SET_MON_REG_VER 1 struct rtw89_btc_btf_set_mon_reg { u8 fver; u8 reg_num; @@ -264,6 +351,9 @@ enum btc_cx_poicy_type { /* TDMA off + pri: WL_Hi-Tx > BT, BT_Hi > other-WL > BT_Lo */ BTC_CXP_OFF_BWB2 = (BTC_CXP_OFF << 8) | 8, + /* TDMA off + pri: WL_Hi-Tx = BT */ + BTC_CXP_OFF_BWB3 = (BTC_CXP_OFF << 8) | 9, + /* TDMA off+Bcn-Protect + pri: WL_Hi-Tx > BT_Hi_Rx, BT_Hi > WL > BT_Lo*/ BTC_CXP_OFFB_BWB0 = (BTC_CXP_OFFB << 8) | 0, @@ -433,7 +523,7 @@ enum btc_w2b_scoreboard { BTC_WSCB_TDMA = BIT(9), BTC_WSCB_FIX2M = BIT(10), BTC_WSCB_WLRFK = BIT(11), - BTC_WSCB_BTRFK_GNT = BIT(12), /* not used, use mailbox to inform BT */ + BTC_WSCB_RXSCAN_PRI = BIT(12), BTC_WSCB_BT_HILNA = BIT(13), BTC_WSCB_BTLOG = BIT(14), BTC_WSCB_ALL = GENMASK(23, 0), @@ -491,6 +581,11 @@ enum btc_gnt_state { BTC_GNT_MAX }; +enum btc_ctr_path { + BTC_CTRL_BY_BT = 0, + BTC_CTRL_BY_WL +}; + enum btc_wl_max_tx_time { BTC_MAX_TX_TIME_L1 = 500, BTC_MAX_TX_TIME_L2 = 1000, @@ -650,10 +745,9 @@ static void _reset_btc_var(struct rtw89_dev *rtwdev, u8 type) memset(&btc->mdinfo, 0, sizeof(btc->mdinfo)); } -#define BTC_FWINFO_BUF 1024 - #define BTC_RPT_HDR_SIZE 3 #define BTC_CHK_WLSLOT_DRIFT_MAX 15 +#define BTC_CHK_BTSLOT_DRIFT_MAX 15 #define BTC_CHK_HANG_MAX 3 static void _chk_btc_err(struct rtw89_dev *rtwdev, u8 type, u32 cnt) @@ -668,62 +762,76 @@ static void _chk_btc_err(struct rtw89_dev *rtwdev, u8 type, u32 cnt) __func__, type, cnt); switch (type) { - case BTC_DCNT_RPT_FREEZE: + case BTC_DCNT_RPT_HANG: if (dm->cnt_dm[BTC_DCNT_RPT] == cnt && btc->fwinfo.rpt_en_map) - dm->cnt_dm[BTC_DCNT_RPT_FREEZE]++; + dm->cnt_dm[BTC_DCNT_RPT_HANG]++; else - dm->cnt_dm[BTC_DCNT_RPT_FREEZE] = 0; + dm->cnt_dm[BTC_DCNT_RPT_HANG] = 0; - if (dm->cnt_dm[BTC_DCNT_RPT_FREEZE] >= BTC_CHK_HANG_MAX) + if (dm->cnt_dm[BTC_DCNT_RPT_HANG] >= BTC_CHK_HANG_MAX) dm->error.map.wl_fw_hang = true; else dm->error.map.wl_fw_hang = false; dm->cnt_dm[BTC_DCNT_RPT] = cnt; break; - case BTC_DCNT_CYCLE_FREEZE: + case BTC_DCNT_CYCLE_HANG: if (dm->cnt_dm[BTC_DCNT_CYCLE] == cnt && (dm->tdma_now.type != CXTDMA_OFF || dm->tdma_now.ext_ctrl == CXECTL_EXT)) - dm->cnt_dm[BTC_DCNT_CYCLE_FREEZE]++; + dm->cnt_dm[BTC_DCNT_CYCLE_HANG]++; else - dm->cnt_dm[BTC_DCNT_CYCLE_FREEZE] = 0; + dm->cnt_dm[BTC_DCNT_CYCLE_HANG] = 0; - if (dm->cnt_dm[BTC_DCNT_CYCLE_FREEZE] >= BTC_CHK_HANG_MAX) + if (dm->cnt_dm[BTC_DCNT_CYCLE_HANG] >= BTC_CHK_HANG_MAX) dm->error.map.cycle_hang = true; else dm->error.map.cycle_hang = false; dm->cnt_dm[BTC_DCNT_CYCLE] = cnt; break; - case BTC_DCNT_W1_FREEZE: + case BTC_DCNT_W1_HANG: if (dm->cnt_dm[BTC_DCNT_W1] == cnt && dm->tdma_now.type != CXTDMA_OFF) - dm->cnt_dm[BTC_DCNT_W1_FREEZE]++; + dm->cnt_dm[BTC_DCNT_W1_HANG]++; else - dm->cnt_dm[BTC_DCNT_W1_FREEZE] = 0; + dm->cnt_dm[BTC_DCNT_W1_HANG] = 0; - if (dm->cnt_dm[BTC_DCNT_W1_FREEZE] >= BTC_CHK_HANG_MAX) + if (dm->cnt_dm[BTC_DCNT_W1_HANG] >= BTC_CHK_HANG_MAX) dm->error.map.w1_hang = true; else dm->error.map.w1_hang = false; dm->cnt_dm[BTC_DCNT_W1] = cnt; break; - case BTC_DCNT_B1_FREEZE: + case BTC_DCNT_B1_HANG: if (dm->cnt_dm[BTC_DCNT_B1] == cnt && dm->tdma_now.type != CXTDMA_OFF) - dm->cnt_dm[BTC_DCNT_B1_FREEZE]++; + dm->cnt_dm[BTC_DCNT_B1_HANG]++; else - dm->cnt_dm[BTC_DCNT_B1_FREEZE] = 0; + dm->cnt_dm[BTC_DCNT_B1_HANG] = 0; - if (dm->cnt_dm[BTC_DCNT_B1_FREEZE] >= BTC_CHK_HANG_MAX) + if (dm->cnt_dm[BTC_DCNT_B1_HANG] >= BTC_CHK_HANG_MAX) dm->error.map.b1_hang = true; else dm->error.map.b1_hang = false; dm->cnt_dm[BTC_DCNT_B1] = cnt; break; + case BTC_DCNT_E2G_HANG: + if (dm->cnt_dm[BTC_DCNT_E2G] == cnt && + dm->tdma_now.ext_ctrl == CXECTL_EXT) + dm->cnt_dm[BTC_DCNT_E2G_HANG]++; + else + dm->cnt_dm[BTC_DCNT_E2G_HANG] = 0; + + if (dm->cnt_dm[BTC_DCNT_E2G_HANG] >= BTC_CHK_HANG_MAX) + dm->error.map.wl_e2g_hang = true; + else + dm->error.map.wl_e2g_hang = false; + + dm->cnt_dm[BTC_DCNT_E2G] = cnt; + break; case BTC_DCNT_TDMA_NONSYNC: if (cnt != 0) /* if tdma not sync between drv/fw */ dm->cnt_dm[BTC_DCNT_TDMA_NONSYNC]++; @@ -742,23 +850,23 @@ static void _chk_btc_err(struct rtw89_dev *rtwdev, u8 type, u32 cnt) dm->cnt_dm[BTC_DCNT_SLOT_NONSYNC] = 0; if (dm->cnt_dm[BTC_DCNT_SLOT_NONSYNC] >= BTC_CHK_HANG_MAX) - dm->error.map.tdma_no_sync = true; + dm->error.map.slot_no_sync = true; else - dm->error.map.tdma_no_sync = false; + dm->error.map.slot_no_sync = false; break; - case BTC_DCNT_BTCNT_FREEZE: + case BTC_DCNT_BTCNT_HANG: cnt = cx->cnt_bt[BTC_BCNT_HIPRI_RX] + cx->cnt_bt[BTC_BCNT_HIPRI_TX] + cx->cnt_bt[BTC_BCNT_LOPRI_RX] + cx->cnt_bt[BTC_BCNT_LOPRI_TX]; if (cnt == 0) - dm->cnt_dm[BTC_DCNT_BTCNT_FREEZE]++; + dm->cnt_dm[BTC_DCNT_BTCNT_HANG]++; else - dm->cnt_dm[BTC_DCNT_BTCNT_FREEZE] = 0; + dm->cnt_dm[BTC_DCNT_BTCNT_HANG] = 0; - if ((dm->cnt_dm[BTC_DCNT_BTCNT_FREEZE] >= BTC_CHK_HANG_MAX && - bt->enable.now) || (!dm->cnt_dm[BTC_DCNT_BTCNT_FREEZE] && + if ((dm->cnt_dm[BTC_DCNT_BTCNT_HANG] >= BTC_CHK_HANG_MAX && + bt->enable.now) || (!dm->cnt_dm[BTC_DCNT_BTCNT_HANG] && !bt->enable.now)) _update_bt_scbd(rtwdev, false); break; @@ -773,23 +881,38 @@ static void _chk_btc_err(struct rtw89_dev *rtwdev, u8 type, u32 cnt) else dm->error.map.wl_slot_drift = false; break; + case BTC_DCNT_BT_SLOT_DRIFT: + if (cnt >= BTC_CHK_BTSLOT_DRIFT_MAX) + dm->cnt_dm[BTC_DCNT_BT_SLOT_DRIFT]++; + else + dm->cnt_dm[BTC_DCNT_BT_SLOT_DRIFT] = 0; + + if (dm->cnt_dm[BTC_DCNT_BT_SLOT_DRIFT] >= BTC_CHK_HANG_MAX) + dm->error.map.bt_slot_drift = true; + else + dm->error.map.bt_slot_drift = false; + + break; } } static void _update_bt_report(struct rtw89_dev *rtwdev, u8 rpt_type, u8 *pfinfo) { struct rtw89_btc *btc = &rtwdev->btc; + const struct rtw89_btc_ver *ver = btc->ver; struct rtw89_btc_bt_info *bt = &btc->cx.bt; struct rtw89_btc_bt_link_info *bt_linfo = &bt->link_info; struct rtw89_btc_bt_a2dp_desc *a2dp = &bt_linfo->a2dp_desc; struct rtw89_btc_fbtc_btver *pver = NULL; - struct rtw89_btc_fbtc_btscan *pscan = NULL; - struct rtw89_btc_fbtc_btafh *pafh = NULL; + struct rtw89_btc_fbtc_btscan_v1 *pscan_v1; + struct rtw89_btc_fbtc_btscan_v2 *pscan_v2; + struct rtw89_btc_fbtc_btafh *pafh_v1 = NULL; + struct rtw89_btc_fbtc_btafh_v2 *pafh_v2 = NULL; struct rtw89_btc_fbtc_btdevinfo *pdev = NULL; + bool scan_update = true; + int i; pver = (struct rtw89_btc_fbtc_btver *)pfinfo; - pscan = (struct rtw89_btc_fbtc_btscan *)pfinfo; - pafh = (struct rtw89_btc_fbtc_btafh *)pfinfo; pdev = (struct rtw89_btc_fbtc_btdevinfo *)pfinfo; rtw89_debug(rtwdev, RTW89_DBG_BTC, @@ -803,12 +926,45 @@ static void _update_bt_report(struct rtw89_dev *rtwdev, u8 rpt_type, u8 *pfinfo) bt->feature = le32_to_cpu(pver->feature); break; case BTC_RPT_TYPE_BT_SCAN: - memcpy(bt->scan_info, pscan->scan, BTC_SCAN_MAX1); + if (ver->fcxbtscan == 1) { + pscan_v1 = (struct rtw89_btc_fbtc_btscan_v1 *)pfinfo; + for (i = 0; i < BTC_SCAN_MAX1; i++) { + bt->scan_info_v1[i] = pscan_v1->scan[i]; + if (bt->scan_info_v1[i].win == 0 && + bt->scan_info_v1[i].intvl == 0) + scan_update = false; + } + } else if (ver->fcxbtscan == 2) { + pscan_v2 = (struct rtw89_btc_fbtc_btscan_v2 *)pfinfo; + for (i = 0; i < CXSCAN_MAX; i++) { + bt->scan_info_v2[i] = pscan_v2->para[i]; + if ((pscan_v2->type & BIT(i)) && + pscan_v2->para[i].win == 0 && + pscan_v2->para[i].intvl == 0) + scan_update = false; + } + } + if (scan_update) + bt->scan_info_update = 1; break; case BTC_RPT_TYPE_BT_AFH: - memcpy(&bt_linfo->afh_map[0], pafh->afh_l, 4); - memcpy(&bt_linfo->afh_map[4], pafh->afh_m, 4); - memcpy(&bt_linfo->afh_map[8], pafh->afh_h, 2); + if (ver->fcxbtafh == 2) { + pafh_v2 = (struct rtw89_btc_fbtc_btafh_v2 *)pfinfo; + if (pafh_v2->map_type & RPT_BT_AFH_SEQ_LEGACY) { + memcpy(&bt_linfo->afh_map[0], pafh_v2->afh_l, 4); + memcpy(&bt_linfo->afh_map[4], pafh_v2->afh_m, 4); + memcpy(&bt_linfo->afh_map[8], pafh_v2->afh_h, 2); + } + if (pafh_v2->map_type & RPT_BT_AFH_SEQ_LE) { + memcpy(&bt_linfo->afh_map_le[0], pafh_v2->afh_le_a, 4); + memcpy(&bt_linfo->afh_map_le[4], pafh_v2->afh_le_b, 1); + } + } else if (ver->fcxbtafh == 1) { + pafh_v1 = (struct rtw89_btc_fbtc_btafh *)pfinfo; + memcpy(&bt_linfo->afh_map[0], pafh_v1->afh_l, 4); + memcpy(&bt_linfo->afh_map[4], pafh_v1->afh_m, 4); + memcpy(&bt_linfo->afh_map[8], pafh_v1->afh_h, 2); + } break; case BTC_RPT_TYPE_BT_DEVICE: a2dp->device_name = le32_to_cpu(pdev->dev_name); @@ -820,80 +976,6 @@ static void _update_bt_report(struct rtw89_dev *rtwdev, u8 rpt_type, u8 *pfinfo) } } -struct rtw89_btc_fbtc_cysta_cpu { - u8 fver; - u8 rsvd; - u16 cycles; - u16 cycles_a2dp[CXT_FLCTRL_MAX]; - u16 a2dpept; - u16 a2dpeptto; - u16 tavg_cycle[CXT_MAX]; - u16 tmax_cycle[CXT_MAX]; - u16 tmaxdiff_cycle[CXT_MAX]; - u16 tavg_a2dp[CXT_FLCTRL_MAX]; - u16 tmax_a2dp[CXT_FLCTRL_MAX]; - u16 tavg_a2dpept; - u16 tmax_a2dpept; - u16 tavg_lk; - u16 tmax_lk; - u32 slot_cnt[CXST_MAX]; - u32 bcn_cnt[CXBCN_MAX]; - u32 leakrx_cnt; - u32 collision_cnt; - u32 skip_cnt; - u32 exception; - u32 except_cnt; - u16 tslot_cycle[BTC_CYCLE_SLOT_MAX]; -}; - -static void rtw89_btc_fbtc_cysta_to_cpu(const struct rtw89_btc_fbtc_cysta *src, - struct rtw89_btc_fbtc_cysta_cpu *dst) -{ -#if defined(__linux__) - static_assert(sizeof(*src) == sizeof(*dst)); -#elif defined(__FreeBSD__) - rtw89_static_assert(sizeof(*src) == sizeof(*dst)); -#endif - -#define __CPY_U8(_x) ({dst->_x = src->_x; }) -#define __CPY_LE16(_x) ({dst->_x = le16_to_cpu(src->_x); }) -#define __CPY_LE16S(_x) ({int _i; for (_i = 0; _i < ARRAY_SIZE(dst->_x); _i++) \ - dst->_x[_i] = le16_to_cpu(src->_x[_i]); }) -#define __CPY_LE32(_x) ({dst->_x = le32_to_cpu(src->_x); }) -#define __CPY_LE32S(_x) ({int _i; for (_i = 0; _i < ARRAY_SIZE(dst->_x); _i++) \ - dst->_x[_i] = le32_to_cpu(src->_x[_i]); }) - - __CPY_U8(fver); - __CPY_U8(rsvd); - __CPY_LE16(cycles); - __CPY_LE16S(cycles_a2dp); - __CPY_LE16(a2dpept); - __CPY_LE16(a2dpeptto); - __CPY_LE16S(tavg_cycle); - __CPY_LE16S(tmax_cycle); - __CPY_LE16S(tmaxdiff_cycle); - __CPY_LE16S(tavg_a2dp); - __CPY_LE16S(tmax_a2dp); - __CPY_LE16(tavg_a2dpept); - __CPY_LE16(tmax_a2dpept); - __CPY_LE16(tavg_lk); - __CPY_LE16(tmax_lk); - __CPY_LE32S(slot_cnt); - __CPY_LE32S(bcn_cnt); - __CPY_LE32(leakrx_cnt); - __CPY_LE32(collision_cnt); - __CPY_LE32(skip_cnt); - __CPY_LE32(exception); - __CPY_LE32(except_cnt); - __CPY_LE16S(tslot_cycle); - -#undef __CPY_U8 -#undef __CPY_LE16 -#undef __CPY_LE16S -#undef __CPY_LE32 -#undef __CPY_LE32S -} - #define BTC_LEAK_AP_TH 10 #define BTC_CYSTA_CHK_PERIOD 100 @@ -907,23 +989,20 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, struct rtw89_btc_btf_fwinfo *pfwinfo, u8 *prptbuf, u32 index) *** 119065 LINES SKIPPED *** From nobody Mon Aug 21 10:32: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 4RTpgq6Qt8z4qZv8; Mon, 21 Aug 2023 10:32: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 4RTpgq5xjZz4PQG; Mon, 21 Aug 2023 10:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692613927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDm1Mv2PG4fR0eVknCNjaX0IssPw1fBf49JiJou7ztM=; b=nfavmoGbdDe9awhzAxjJloD9EFjjkVGJM16TBFwJdBQDp9TLgeXS25UgXzaWk5sBMX+EPi RnLi8r7TFgbvrpaHKY5Py99MC/r6WqOjYp0OtVyzTJ/Ye1OaxxRwD0RyCNpkBhtf1v6ewv yXTNUm6gDmv44fnrbuE3gJkGv8XU4ToHDRhZM1RGrbQD8nsDDZKcEAicd76UF+15hsrNK1 3Lri68QAEzJEF76buicffi621x3rG67a6dq5VFNN+I6dQRc0DauVX7wKYYOXGH3GIhIVgr Nsw7//04KPtwccuDs7fzW+56G6oVLKCHPUKy3GoytfUnIhXc0PkE8+ry6K9vWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692613927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDm1Mv2PG4fR0eVknCNjaX0IssPw1fBf49JiJou7ztM=; b=xFk0bX26yfESueJXaN8sp+zRpwHnuVoirHPmShoHGJRNkYJZ/wZ4qvQLYcsiarGKyBGAyk bgVU1S2HABAfyNNne6XOwhPvvyyXEWxWklM9eu0+81XkVZN8fPf7koTRTx4mR2h0HOYexx 8MPdpFoTPaM3kz9Kz7zlva3Q2wvQW+R+zXJMf91XnQ5Tc4lQaW+wQRy4rMjx1xNsEBR52P fXheJ7M/S27RytwiNi7zCipRY2m+Rj9/w6u9QIr44wLGmxtRO8kxbW0H1MhJKm+iZ+c9df iH9KG2NcDjEv32F+/2HhYoP+nVrY2nlJORAZLAqoPQXYwdWIs9Fqz5RIFQL89w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692613927; a=rsa-sha256; cv=none; b=F33ACZYxDY/9/zmCy6u01pm8hfgpjwvu7eA21L19tWonD4ZM3ghPVhcgGU4/FSvd4GKduZ lkzLCQTHPigyhnvjXwyzZ9Reb02j/E44GaYNWtuTODba4jCk/4BYK14RGR62vhVOsBHpmI MD+IN/MVGBavMbdd/cyAV/dDU96JJBKs8yMCLryYJBcPjmqZGxzkYugxDObe9vRDEftuF4 UIJXhJwHEg5pdc6wBMW4kPJ5uCOf5VjA28q6AndbuqyqmiDlI/Nqm7NrAkAhdpGaztiVdR MEcNC/T3heMkwzyInTFOcnnLufJgtcMATpnJouXSnd4rHW08FL+X1+DxVRQ1+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTpgq51CFz35V; Mon, 21 Aug 2023 10:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LAW71X031689; Mon, 21 Aug 2023 10:32:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LAW7KP031686; Mon, 21 Aug 2023 10:32:07 GMT (envelope-from git) Date: Mon, 21 Aug 2023 10:32:07 GMT Message-Id: <202308211032.37LAW7KP031686@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: 42e70f4283e2 - main - PMC_OP_CONFIGURELOG: cleanup logging process if aborting due to pm_flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 42e70f4283e2f8f003e2cd9dd0774c35ab5c09b4 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=42e70f4283e2f8f003e2cd9dd0774c35ab5c09b4 commit 42e70f4283e2f8f003e2cd9dd0774c35ab5c09b4 Author: Konstantin Belousov AuthorDate: 2023-08-20 20:16:58 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-21 10:31:06 +0000 PMC_OP_CONFIGURELOG: cleanup logging process if aborting due to pm_flags Reported by: pho Fixes: 8e63e787abbd69d29e55e2e0b2aa0aa624339f3b Sponsored by: The FreeBSD Foundation --- sys/dev/hwpmc/hwpmc_mod.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 1d85c76b3f9b..b429f713b09c 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -3821,6 +3821,7 @@ pmc_syscall_handler(struct thread *td, void *syscall_args) /* No flags currently implemented */ if (cl.pm_flags != 0) { + pmclog_proc_ignite(pmclog_proc_handle, NULL); error = EINVAL; break; } From nobody Mon Aug 21 11: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 4RTrCZ3jSjz4qflF; Mon, 21 Aug 2023 11: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 4RTrCZ2vN2z4V83; Mon, 21 Aug 2023 11: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=1692618074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h0Oq2uKNi7kPEBXMfI0V9NKutKWoAnlhbQGMG3elvsY=; b=C95Cc//wSA2uDkZ+S+WWNHJ0bDdBaCRaA32I4reDh5y63N/XA288XrTV/ZuDDesv4+v0ef tsY2XswkyIECRwyny2HdeBUplBT4VJab22VBhLkinB+c0Rr/Rqdyxf9wa4NTB6ohwOFXRR dHqpQYRFzVJurACyiRG6jBRrIwOSew9fOtyWQDK+nn15xtaf5UoWAm272rE8uki4VqJPzn pSrr01i0+D3DHTAKSPZCC/Q15xHv5KBJGov3PdOynO5RQHgs+mix+GVZYFx5gSMGnzlywd 2G1OAxYx8cWiIpOkzPmSu8ZL0w3HE0vi3/+ba1ndapzZVwdlLqcx72k7Qh16Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h0Oq2uKNi7kPEBXMfI0V9NKutKWoAnlhbQGMG3elvsY=; b=feL9tZvER5CVpHZclk3eYJZiwFve0Bd7BeVn5cXevunsoN9DwYDusWxjTnIh2wLYc1U0FK +YrM4yMiH5Kzt2CRvzO+Y/RuYLjQAnXPfu0kKgkXR54Kzia9Sgqa2AKF//mtioanLy4+VK q67895rP/64IMhlr4nf+F9nM9eQ/+vP1D20Wq3LBr6RNc661ZgiVeVmbm7UxsdsO5OJx8F xB9k1TKqDfrLgXJh+RorS2UeGy1s0MmCmoKzV+dzKKqVLWS4876jjkj8vS83AuBkIO+3n7 X/wGxOY4LjOQ9LYG4dR8zpZ09GY4qv+z7VzRyQYK6t+vN9uBRAas9v9G1Wapdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692618074; a=rsa-sha256; cv=none; b=xHk42hyR0kH4E+xDu00IRxYzmO8hV2Sp6EnQr78H2d4ig7qhweMcVGf5ihzdGq/3KdO35M PQHkHV9EzQH7OrzS43Oq2u+PTau0e79GtgO4/1Jx+SwBIARCGyq+xm6EHhwKxKJa2l3K4k mLI5YkM0P3a8e/TFk4n3k4VhEPEQH6Ssq9iUNVzqJShR6zeIokP0O7KSeY/sWVK+BOtQFb lxbgKxYZLmgBqtVJ83nKnJtSKPSYu7K5HS6RW2n2u0wM7YVsSjWDJ22jKyVjwzl+azy3rR ux0SUteQNuQc6JfDygZZjZ4Wq5/c5ecLRQ0RD0qz3+Wq64nJCEVrp8TkfWZD9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTrCZ1xjqz4c1; Mon, 21 Aug 2023 11:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LBfErp045446; Mon, 21 Aug 2023 11:41:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LBfEg3045443; Mon, 21 Aug 2023 11:41:14 GMT (envelope-from git) Date: Mon, 21 Aug 2023 11:41:14 GMT Message-Id: <202308211141.37LBfEg3045443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 1cb6dc1627c4 - stable/13 - linux(4): Fix control message size calculation again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1cb6dc1627c46a0d4b461a4c76f9ac681a5dff27 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1cb6dc1627c46a0d4b461a4c76f9ac681a5dff27 commit 1cb6dc1627c46a0d4b461a4c76f9ac681a5dff27 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:11 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-21 10:39:04 +0000 linux(4): Fix control message size calculation again It looks Linux recvmsg allows msg_controllen size less then CMSG_SPACE buffer, at least for case with one cmsghdr. Glibc misc/tst-scm_rights test succed on Ubuntu 23.04 Fixes: 67116c69 "linux(4): Fix control message size calculation" MFC after: 1 week (cherry picked from commit 7d561928e65af6fe90ff9e316b2d50668c53b464) --- sys/compat/linux/linux_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 393faa5429ce..b30ec4e270f4 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1847,7 +1847,7 @@ cont: if (error != 0) goto bad; - if (outlen + LINUX_CMSG_SPACE(datalen) > maxlen) { + if (outlen + LINUX_CMSG_LEN(datalen) > maxlen) { if (outlen == 0) { error = EMSGSIZE; goto err; From nobody Mon Aug 21 11:41: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 4RTrCb4L6cz4qffk; Mon, 21 Aug 2023 11:41: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 4RTrCb3tgrz4VBj; Mon, 21 Aug 2023 11:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dUpjzSQjWXQQlr1MVlujzOZfvFrA84ixEg8FdjD1LT4=; b=els7F6MU/QipYMNZ/Yzlnm4BsfBgZ+eEDb/fwzGybW/6dOfE3uiNBnTlggymyoaIcVUukv wAGewm5fY0FHf9NxlK8rCV+rXQTe9DjbYYc8RE+UN009cDh9tS0mu7YMGkh5LzcObmWIsI ontuNdQNup1u+hXZ+s/vcRhVNSdSCTk+SQfXRE6TzO1Y6Fo0eGYNQzagp2PjImVEDcgPwf vhwK5FIfMq5wJQ9oZbV/yoj8vTj7iI3JQ6T/UoK05eJKdkWGJoYs5GDwSJJTTYvY2Q0uZs xZpQeSUfYmYP1lyUoRTYEwYDh/rpXoYx/be6aXYF9elqJTIrH/utnnVEgn0Y1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dUpjzSQjWXQQlr1MVlujzOZfvFrA84ixEg8FdjD1LT4=; b=yaPGJ5/S22wCyNJsE4cMufSbXMxK1hdjAZID2fvl0Kp/bUzZu3bzUFeEjdEZknOHhVeNiJ 8mj9NU7TST22FfuZwBWIFdU/f5EBGFIn1x+lcSfFrOhiTR3NsA4dxNA8YlcxHipNxj08ao 7Q5L4VAhLf8/6eD9dOQgJv3lVDOaLhjTePYcRpyWZdIqxk/RzNLYF8lTZf8B407YJ0G+Sv Em+zJTDrA1aLyTGRDB1qAhmlUPP+wYcl/LdNGLO0G30Q0ig0WCuK1CmhgekZ4BPvMKkxhh Q+x0kxmbyJyzn+3t6XPF3z7OhCIhOzfpijLB78B7Bo5uKqsx0rVk3oqnmx+90g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692618075; a=rsa-sha256; cv=none; b=DX2p7PoHTFuibw53yW11bQkQhoisfxaY5Cwy6zkXmEILJSO4O3gV22Qf8Zl+ERmQAJb6x+ 1qaK3nrPNj6Kddo8LLL98IyiiS2ZPFlx8RQWA7HHhCJrwqeSImSwjofzRsNxGlwN1sFwar GGZYB7LsytjA8jlvGhK3Av4JnlSblEwVTIlDRoND521UVA7KV4ZHqRB1V8Q8vzLNl1Yvvv HRZNYjWRBGoOyWZCZn4erf+1bEfYFOyktN8xBL1yG8S2/gVq3tUEefFfJXT721qFkFEJxa 94IijXCbK3NJsGagIntZskxiCKSERFoChFvq8L5i/9F55cGW83My1B3XS68HbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTrCb2ybNz4W6; Mon, 21 Aug 2023 11:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LBfFmB045675; Mon, 21 Aug 2023 11:41:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LBfFT3045672; Mon, 21 Aug 2023 11:41:15 GMT (envelope-from git) Date: Mon, 21 Aug 2023 11:41:15 GMT Message-Id: <202308211141.37LBfFT3045672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 57b34aaee29a - stable/13 - linux(4): Drop bogus empty line in linux_socket.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 57b34aaee29a7b6c228e78ca75e0d117726a7266 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=57b34aaee29a7b6c228e78ca75e0d117726a7266 commit 57b34aaee29a7b6c228e78ca75e0d117726a7266 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-21 10:39:04 +0000 linux(4): Drop bogus empty line in linux_socket.c MFC after: 1 week (cherry picked from commit 43c3beb7414e1cf031fe8e32e7ec1876a5b20610) --- sys/compat/linux/linux_socket.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index b30ec4e270f4..076be5aef2c0 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1817,7 +1817,6 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, goto bad; } - switch (cm->cmsg_type) { case SCM_RIGHTS: error = recvmsg_scm_rights(td, flags, From nobody Mon Aug 21 11:41: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 4RTrCc5R6sz4qffn; Mon, 21 Aug 2023 11:41: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 4RTrCc4ZXtz4VVY; Mon, 21 Aug 2023 11:41:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/uOGRUCaDlU7CRHKpgtDWHAP0sDCxcP9nTAQFDwpSVM=; b=jzKlQbcsto1PcKLNtVbf70w24AqKU1JBd7botwWgEntKn5UUBsyFiTT9zcAFVbu55dHvab elzfBVnVJg5NxPKr85YgWUCviic8uJhvWIzr+xWkQ4l+w0Udq0eDt8w6BoOLqZ2xNMv2bv ySZWfcYqO8SOJX8GWF6T1uvTYFWARlFHlvPEQFIXFEnhmDAtBpHNIAiYAW5u8bcm1f5qMT 7K4zgAa9o+naZasobK7ToM0iVkl1JcrkqeNQhNypHkPTJ76gH+iLEqdk+3RyP5QnYs0h2l vCnmISHeMurtgc2QZiShTokVzd23qqU9qTuiW39lEovRNktCiHtDKNAz9fAEEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/uOGRUCaDlU7CRHKpgtDWHAP0sDCxcP9nTAQFDwpSVM=; b=AGP7sq8p0BbjcsN1YaiuWlty/E3Cel1sCi1fmtiT5TRWbzZyRmDzFYulXCk99Bp4X+D9E8 Yu4aRd6XWbt2LSg8PcHcovzBIGR/wOTe+VbPf7A6Nj1rY+7LLPgp+8Sl8tUoMakkUbXrB6 RGlOZx/QJzRPN56FespXiLNFCUZRYqPxXId3G5NzGgNfm4Ta5QBGj+FCQ2xSZwN7iH6AOK NzWeUH+lfxPpNRibnpxDgoaaK+eFnJNmriV7EmlcC3s0dU2ZfxmEnD3CB8vV0XA6CCw+yf //YhL8ghFmPsxpaBOX+agHi1g7DIm0z3vG+AT9ibOpjLn14OM4YLesSvEeUevw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692618076; a=rsa-sha256; cv=none; b=d6j2wTDrPYUZ82LcOmQvZBl54aUcX6gJIx1aEeOTlRBIzTfO1LzNZETD/i6OHOiVxX/C0e uYJUBcbfdT6Dd2o00bGAZP9LfV4Ax4z58Bqhw1LCtr/lvzrURgXvgIgOP/2fbHS8+aNmpl pmAvpZwXuK+DhHThyZv6Nh7ZDlL3YLRuDDLoXwL4ALXg6nzy2q5QOlPcSioXtAClyfVzKr WmOyeynOUzv4uH9I287n+STWzuDEzUwx6x///q5ijgqV0IEyCFzXN8wU4CXLoxCA7IU1Th mN2XdXl2uuh99uFWDL0+hbeWl6CcG4498KAKTK8iB4vXa8GXHvhSwViVDldwOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTrCc3ftfz4Yw; Mon, 21 Aug 2023 11:41:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LBfG4K045729; Mon, 21 Aug 2023 11:41:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LBfGh4045726; Mon, 21 Aug 2023 11:41:16 GMT (envelope-from git) Date: Mon, 21 Aug 2023 11:41:16 GMT Message-Id: <202308211141.37LBfGh4045726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 2b5f7b77a871 - stable/13 - linux(4): Improve readability of recvmsg control buffer copyout code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2b5f7b77a87100fcd19fb2bfab55cea2cbe920e3 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2b5f7b77a87100fcd19fb2bfab55cea2cbe920e3 commit 2b5f7b77a87100fcd19fb2bfab55cea2cbe920e3 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-21 10:39:04 +0000 linux(4): Improve readability of recvmsg control buffer copyout code MFC after: 1 week (cherry picked from commit a21238d843ebe02e696cdc30b008382dfca5612e) --- sys/compat/linux/linux_socket.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 076be5aef2c0..063e542f9d83 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1861,10 +1861,9 @@ cont: lcm->cmsg_len = LINUX_CMSG_LEN(datalen); error = copyout(lcm, outbuf, L_CMSG_HDRSZ); if (error == 0) { - outbuf += L_CMSG_HDRSZ; - error = copyout(data, outbuf, datalen); + error = copyout(data, LINUX_CMSG_DATA(outbuf), datalen); if (error == 0) { - outbuf += LINUX_CMSG_ALIGN(datalen); + outbuf += LINUX_CMSG_SPACE(datalen); outlen += LINUX_CMSG_SPACE(datalen); } } From nobody Mon Aug 21 11:41:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RTrCf0hgZz4qfsf; Mon, 21 Aug 2023 11:41: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 4RTrCd5WKWz4VYr; Mon, 21 Aug 2023 11:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8Fyji6FRUSqHghvNK28ZBP0x8x3itrKPOuqdyDkNrU=; b=ajfPAwjceQSr9njTJraVmZJMgb9LoJlYG6bULdjv0GhVAEJ/JO39GYB3vRAbxnjx/kZXf7 h1CxrKY9wqgptr6rXLqYWcdL60GyGYLVbqg1gOUziJEHdGulZwgEqJ33dsOYO6JAhIjXJc /bmxjyqqFGMgeZu1E1Hwyy9f6CPHdOecCtr7+5CGANJy4nVP1tdf/c5M65TYvWpUMTx514 cqEAHand1J0dIpy95DaAdCLtbJhlfZuQG42Q6ii4xG6Ha5AT8lqfeYF8roXwFZjkEBYqeN ipMkuKKM9FLxOVTYnLyA2Ovx8MtfORZSfo/BLTBu6DouasQ9hBRKCMkbkm1auw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8Fyji6FRUSqHghvNK28ZBP0x8x3itrKPOuqdyDkNrU=; b=MiVXRzusfVmcwt7c6p/qYr1RYMWBWhaEAiEfQPWq5JbEeE2Svq3TcyblsxYIxHVHFbMMBQ VSs3TTSvu4AWiRSkgTE7FKiILk6D9hEQytZ3/e/aDn+F4/FwvQI7kZWuwoZ5mZL7PMjPL8 3+8PRPjfhgGLOgoQ/qG7vQjAJek/Rh7eMDqXfs443mUqIVvVo/0QZFO0Z2LF1t8F9JhOB0 Z6p3sV87lQSihPiDrODzEQpMFNS7XQNYpAFzzrZAmeC/qyei95Bc9mKpJA+jmZ/sf5FJP+ caTDUSkIw9uW0WFhJBgAs48WxGAzy70/q/zR37x5Lqvx6xxDU5tQZqMgHg0FHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692618077; a=rsa-sha256; cv=none; b=Ne7Rc3mXjwYTFeap9933B6IJr4nf/rhseIemOHR+rzMBKThrL9s+/JZvJemDmxelnzxt6D qW/qXp/OumR00xEIRpmQEdtO2SS44P0tz+4YHQ0hWyTlmoPjORtA5lTTvR4IL9bShYpNlv aSN/p3j+hgPREQktllbxYSDpG9f6TJVKdDqt5G0zOchdmclZuUUYImvuMDxpeSLhZEIzP1 Z+TIuT19oryTthK0XdS13cLVhScE/LI2Fl66VxGaS1yF9Qv/zEKtcbrfrGeVnmp59vp6G0 zvoMC5LjrnUlLFM3e62ofMVNMN1SnjHqKvZ6oIZB0QG0n2qhBBhY/olf4wyj8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTrCd4cp9z4c4; Mon, 21 Aug 2023 11:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LBfHAA045778; Mon, 21 Aug 2023 11:41:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LBfHeL045775; Mon, 21 Aug 2023 11:41:17 GMT (envelope-from git) Date: Mon, 21 Aug 2023 11:41:17 GMT Message-Id: <202308211141.37LBfHeL045775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: d238be002e42 - stable/13 - linux(4): Skip unsupported anxiliary message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d238be002e4250de80d197895ea409ef85572c95 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d238be002e4250de80d197895ea409ef85572c95 commit d238be002e4250de80d197895ea409ef85572c95 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-21 10:39:04 +0000 linux(4): Skip unsupported anxiliary message Instead of returning error, skip unsupported anxiliary messages and fail if no one handled. MFC after: 1 week (cherry picked from commit bbaa5523c01a11e1e322928639522b9ccfd19978) --- sys/compat/linux/linux_socket.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 063e542f9d83..7bcefcd2d81b 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1723,7 +1723,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, struct sockaddr *sa; caddr_t outbuf; void *data, *udata; - int error; + int error, skiped; error = copyin(msghdr, &l_msghdr, sizeof(l_msghdr)); if (error != 0) @@ -1789,7 +1789,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, msg->msg_control = mtod(control, struct cmsghdr *); msg->msg_controllen = control->m_len; outbuf = PTRIN(l_msghdr.msg_control); - outlen = 0; + skiped = outlen = 0; for (m = control; m != NULL; m = m->m_next) { cm = mtod(m, struct cmsghdr *); lcm->cmsg_type = bsd_to_linux_cmsg_type(p, cm->cmsg_type, @@ -1809,12 +1809,13 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, } if (lcm->cmsg_type == -1 || - cm->cmsg_level != SOL_SOCKET) { + cm->cmsg_level == -1) { LINUX_RATELIMIT_MSG_OPT2( "unsupported recvmsg cmsg level %d type %d", cm->cmsg_level, cm->cmsg_type); - error = EINVAL; - goto bad; + /* Skip unsupported messages */ + skiped++; + continue; } switch (cm->cmsg_type) { @@ -1872,6 +1873,10 @@ err: if (error != 0) goto bad; } + if (outlen == 0 && skiped > 0) { + error = EINVAL; + goto bad; + } l_msghdr.msg_controllen = outlen; out: From nobody Mon Aug 21 11:41: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 4RTrCg0Lh3z4qfj5; Mon, 21 Aug 2023 11:41: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 4RTrCf6TjXz4VtV; Mon, 21 Aug 2023 11:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V9UcwggBAicFRTqTSholvwz9W8IfzJD2MIhPD8+D5wM=; b=W6WR5yl7HLs7/ZaaM0XZn0Yhien3gR1cq3F0XnNGIxfDkUQiNYTKlzt1NEXVKjcyhQLgzA DwgzYu8hfJJvpTVNd7LIIlhE8vGE96upHQgaMMCb6MuXdgeEwb8dxZxi9DEk7acUVSSLed PmtOavBAWxS8D8sScFKzmxg3kDg1XU5El+0bfvuRGXfVjcBMMlmQdKlR0qfDBmfgI6P67w o8futDBvaRYL7MeJMAk2ZPjxlkNX/aTexncdCB1h8BNAP62CEm+M7wphAtRMzqiJzagtU/ MWal+/tTs1YPkkkOzGBcbWHVpbcLSby83Kgng0fTikXU4CKL2hdO2P+RNtE3aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V9UcwggBAicFRTqTSholvwz9W8IfzJD2MIhPD8+D5wM=; b=cYSy2pWMdBlbjbEpB5wBpF6pP1Plj7r8w4xzkNUFy7PAgmecq6hKnVkfYQk8YjprVVo0ta j7EXw6bSKDTi0pvaZt5pUnpdMi+D3XfqHXY77bfYJmzTHAdjsWcSxJ1vaaQaYly+hd8Ij6 fNWh0ahM3iU7ss1p1J28B8NnG03hmoFqN7cQMiekVBs3rgGAz4O5PJmOeQDROKH5urA9eN vHbiBrZoi6o2qr+rg/vZIfq7CemNknGwZF6gQuhubShr5dA41PRDfDkybzU0KCy8uqVEav BSzEFlmpsKOHN8YWvObhIiH8gf0Fb5lzRx6BB6mMgpajDJij0GYiTSJKGvz+0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692618078; a=rsa-sha256; cv=none; b=AAn4uiEBGKCNFWQKT080B+ZFwcp4wPPB83wzg/nAG3WGHiWkCuDnrsdO7l3zngUEaSRma3 F2s7BqunnBEIbclgmv9VRsIzxVx+9yv6l5tA19GQPprDWZrbfQWwQR+k0YvzE0XlmIg0kU KA5fp6xavVtaF2wymyGH1Wn9FG/JzbF13pXwvg9DJt95xzuR8diVjDBcg6ao/aQTp7Ejf1 PJUIPM7yGfspX0HC4pngAe9F2gTi5rHh/p9QLPQ8d0qlFLLob0ffQ1gBqwiRGjBCK08VPF rU7KtqYdnzQUBTWOqbRQVQD5dDkbK5SzKKLZcyQrt051maT9HFSWXNv7nRzzOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTrCf5bB1z3rp; Mon, 21 Aug 2023 11:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LBfIAG045815; Mon, 21 Aug 2023 11:41:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LBfI6S045813; Mon, 21 Aug 2023 11:41:18 GMT (envelope-from git) Date: Mon, 21 Aug 2023 11:41:18 GMT Message-Id: <202308211141.37LBfI6S045813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: b67a012e7ca3 - stable/13 - linux(4): Refactor recvmsg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b67a012e7ca3a88716cac0182bfe2ab556835773 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=b67a012e7ca3a88716cac0182bfe2ab556835773 commit b67a012e7ca3a88716cac0182bfe2ab556835773 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-21 10:39:04 +0000 linux(4): Refactor recvmsg As the amount of handled anxiliary messages grows move they handlers into a separate functions. MFC after: 1 week (cherry picked from commit de20eb26d014f7d9ba81fd1f84636609c8efa8e1) --- sys/compat/linux/linux_socket.c | 101 +++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 37 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 7bcefcd2d81b..5db366b58401 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1694,6 +1694,39 @@ _Static_assert(sizeof(struct bintime) >= sizeof(struct timespec), "scm_timestampns sizeof timespec"); #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ +static int +recvmsg_scm_sol_socket(struct thread *td, l_int msg_type, l_int lmsg_type, + l_uint flags, socklen_t *datalen, void **data, void **udata) +{ + int error; + + error = 0; + switch (msg_type) { + case SCM_RIGHTS: + error = recvmsg_scm_rights(td, flags, datalen, + data, udata); + break; + case SCM_CREDS: + error = recvmsg_scm_creds(datalen, data, udata); + break; + case SCM_CREDS2: + error = recvmsg_scm_creds2(datalen, data, udata); + break; + case SCM_TIMESTAMP: +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) + error = recvmsg_scm_timestamp(lmsg_type, datalen, + data, udata); +#endif + break; + case SCM_BINTIME: + error = recvmsg_scm_timestampns(lmsg_type, datalen, + data, udata); + break; + } + + return (error); +} + static int recvmsg_scm_ip_origdstaddr(socklen_t *datalen, void **data, void **udata) { @@ -1708,6 +1741,23 @@ recvmsg_scm_ip_origdstaddr(socklen_t *datalen, void **data, void **udata) return (error); } +static int +recvmsg_scm_ipproto_ip(l_int msg_type, l_int lmsg_type, socklen_t *datalen, + void **data, void **udata) +{ + int error; + + error = 0; + switch (msg_type) { + case IP_ORIGDSTADDR: + error = recvmsg_scm_ip_origdstaddr(datalen, data, + udata); + break; + } + + return (error); +} + static int linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, l_uint flags, struct msghdr *msg) @@ -1796,18 +1846,6 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, cm->cmsg_level); lcm->cmsg_level = bsd_to_linux_sockopt_level(cm->cmsg_level); - data = CMSG_DATA(cm); - datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data; - udata = NULL; - error = 0; - - /* Process non SOL_SOCKET types. */ - if (cm->cmsg_level == IPPROTO_IP && - lcm->cmsg_type == LINUX_IP_ORIGDSTADDR) { - error = recvmsg_scm_ip_origdstaddr(&datalen, &data, &udata); - goto cont; - } - if (lcm->cmsg_type == -1 || cm->cmsg_level == -1) { LINUX_RATELIMIT_MSG_OPT2( @@ -1817,33 +1855,22 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, skiped++; continue; } + data = CMSG_DATA(cm); + datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data; + udata = NULL; + error = 0; - switch (cm->cmsg_type) { - case SCM_RIGHTS: - error = recvmsg_scm_rights(td, flags, - &datalen, &data, &udata); - break; - case SCM_CREDS: - error = recvmsg_scm_creds(&datalen, - &data, &udata); - break; - case SCM_CREDS2: - error = recvmsg_scm_creds2(&datalen, - &data, &udata); - break; - case SCM_TIMESTAMP: -#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) - error = recvmsg_scm_timestamp(lcm->cmsg_type, - &datalen, &data, &udata); -#endif - break; - case SCM_BINTIME: - error = recvmsg_scm_timestampns(lcm->cmsg_type, - &datalen, &data, &udata); - break; - } + switch (cm->cmsg_level) { + case IPPROTO_IP: + error = recvmsg_scm_ipproto_ip(cm->cmsg_type, + lcm->cmsg_type, &datalen, &data, &udata); + break; + case SOL_SOCKET: + error = recvmsg_scm_sol_socket(td, cm->cmsg_type, + lcm->cmsg_type, flags, &datalen, &data, &udata); + break; + } -cont: if (error != 0) goto bad; From nobody Mon Aug 21 11:41: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 4RTrCh1FDrz4qfqX; Mon, 21 Aug 2023 11:41: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 4RTrCh0Qwmz4Vk1; Mon, 21 Aug 2023 11:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+tSbWgFcaIakB1SsxvQrp7OWtQLCTPRCy4Q6PkOKwrQ=; b=OQ5ZkA5XPCf5KU2zTAhtTLue8Xa5LqFiVj9ub40fwbuo19xTpfTM3Qs1545yTeXed9KkRK KspvPcz6o6Gj/W7hwKBg9o0aIyoC4kr/1Qgesmsjb093KrTUeoYq1Ybgyl+Pwr7Szg1tDU PYYZ7FpSnf94W/+L4xWy+jBjycb5D/xm8+M4cHark40AoJqFwHHSlqmh8FZKjInIMQDbwn xkNqG13L9ULklQCKKOycFEuvjc9AWRIBFhq2PnF1ozQOY9J2bzCfj12ut6J14qKdpTIKN/ xotyp9EFCheupMK4lh/4skdGerWbqC2zQAPIOXHggPtllk8Eae1LjrBn5OLFgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+tSbWgFcaIakB1SsxvQrp7OWtQLCTPRCy4Q6PkOKwrQ=; b=iVHKLf23WlWEfH6+BNJ56uFXcJv5MeHf1/xkDqjhD8kG2E+0fENBLio9GOKOjKL3uXFqXx WUhFroJHHHtAbFI9mQ4JMoatPyChTZu1jpaoCjxxldKX9uB/NXF2AFeMf+eZfXydiaCtAk VLRTDnJtzjCYVFAzId80Udjo6VrhU6md1FJo2qBh2O3KwHzYjuKoE5SPNJE7RksyB4exQ+ EiFTSM5VcHZTzUhm+JNJLIX/y4ZuEfNuGC/u1hef/SEy+Vc/vRC+aHEY9G97gX8kWNlnFA hfinsXzqRykvWyKpUFHmh8RH/UJKnYT31ynrpnqdpHYvhlYBusOaTSkudP6vxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692618080; a=rsa-sha256; cv=none; b=uPanGfVHeVqex/un4aVrFtD49o8fWSDrdQ+TvL3KtjdXhGgQHJhELQSJJ8eEFSHDUqYKQ3 i88ZW+nr6DTLNwuQEwIhgLoDGuaIExTeKL8THMBJKdddZXBsYcAV8/tzBBh8jiK1i7M0xj orUbu1PtB+6vTx6Kxe5pP1eNM4kuqYqk1eVSqXKhVfqJE7yCE7cHsfp7t6R+EqYGntOwLB SIhtVganwVzGR9gtI2fqf90wHdmAJd59uW597zaSzL7jDlQIm5xMAe/Ktj/Jp2cWBte9Ur qRu0DB/dUKyS49vaSRNxTucyc97R+GGKGoveJKotl5PIgDUjv6Swm4mvYPpa/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTrCg6dtYz48r; Mon, 21 Aug 2023 11:41:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LBfJHS045869; Mon, 21 Aug 2023 11:41:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LBfJOC045867; Mon, 21 Aug 2023 11:41:19 GMT (envelope-from git) Date: Mon, 21 Aug 2023 11:41:19 GMT Message-Id: <202308211141.37LBfJOC045867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 1b1cf17660de - stable/13 - linux(4): Add a comment explaining udata freeing on error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b1cf17660ded2e13731190ea1e0b9e039fa4ed6 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1b1cf17660ded2e13731190ea1e0b9e039fa4ed6 commit 1b1cf17660ded2e13731190ea1e0b9e039fa4ed6 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-21 10:39:05 +0000 linux(4): Add a comment explaining udata freeing on error MFC after: 1 week (cherry picked from commit 9d0c9b6d6a6a90f626088308dfb895221bf6d36f) --- sys/compat/linux/linux_socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 5db366b58401..ba17e38c1c64 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1871,6 +1871,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, break; } + /* The recvmsg_scm_ is responsible to free udata on error. */ if (error != 0) goto bad; From nobody Mon Aug 21 11:41: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 4RTrCj1rZWz4qfqc; Mon, 21 Aug 2023 11:41: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 4RTrCj1FPnz4W0c; Mon, 21 Aug 2023 11:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HXqH9HdnTOuixqJMqBuh4tnX5F5xxhi6KoePEgBk/dw=; b=NkFxR9zn+belUtAx9xEBZ8aXQeHxrpR6B5npoT+8yBVqVlVKEyD53ZjauIVBI7VAprZY8X qkZmil7d5Awcs8xPoNPvZlQaFRHkSy0BTVALDDFx9ftoDCmE2md5bHQQlJtiYJ95FOq/So 2wMApf4Yoh+LARFHrdstwTI1CUby1wn96IijTUotrLJnPTqrG5/NrZM7MI+uYaqrzuq+yk outILA7Wo4scJymbrTVXO1U5xw4UPaboCOXNl5sIdkP9LFNpbCJIT1+RbWmYAxdO3yn41h MNbfzuWZzexXZaWCUsbzBJAZkKw7/FuCY/pIjCohQT6L6tQTJ65mPhvSoWkdyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HXqH9HdnTOuixqJMqBuh4tnX5F5xxhi6KoePEgBk/dw=; b=sOHHPL/O75GsgzAVk6LakumQP5pSxp4DC7VQMAMD0m7yfhg/ZTUEcXuGyPgUX9JMxtzRb7 T+REov9ULKEkDkcuugJkZln7e1qT1EWASVnK24FwqDkzC+DTafszkBPPsKREXv4+vrCSrj hM57/iYNsndFkBHiMHlKXkzqaGufiFCd1rS1TUhAzITkfOCyXLqMZS/HVsWCi0ClB7x+kK qGHsRZxU8sEvsWokZ5ypQg11dHNp30qF8QeceqRfkindYbGdsl0MwSTuvxPf5vCN38fk4X 38c+JBr/Ahe1AXYh3v75S904t/VsFRBfHe5a4TFGMufLu00C2ZoHxRkoIjexxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692618081; a=rsa-sha256; cv=none; b=yasZEY5sl7IWxGwyomHVcSqXjmSfG3Qk2IK7QnAmkfx/0atnYfq2Vx7216ocBElui6fAx2 BaCJMEXzYutW/zWdqJEvz4lyzkknnX391fJG6rb4vYPEQgNg8F/9LBGf4IwIKDF6bwB7R6 Sr6W5yVEK0SALaB1i8wKg3gCmuIuOkQRdMHNSGOGpEKs3HWfiPs1cuxusH5zoUpT22dBrM 93ldXHi3ewrYiDaL7bJVamTR2MH8vaGLN6pQIOZJ1WevZjHuyuCWtKHelM8Mdf9RrkrtKB pwQja2o3MWk2XaGa4BiaOSVCQ8pCE3iIWaGVkIGpibDjijgOv29t9aT2AL3xvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTrCj0JFHz4c6; Mon, 21 Aug 2023 11:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LBfKMB045916; Mon, 21 Aug 2023 11:41:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LBfKdo045913; Mon, 21 Aug 2023 11:41:20 GMT (envelope-from git) Date: Mon, 21 Aug 2023 11:41:20 GMT Message-Id: <202308211141.37LBfKdo045913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 74614fa93a62 - stable/13 - linux(4): Fix MSG_CTRUNC handling in recvmsg() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 74614fa93a62385b899b34e9f44a098a6ddc3cb4 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=74614fa93a62385b899b34e9f44a098a6ddc3cb4 commit 74614fa93a62385b899b34e9f44a098a6ddc3cb4 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-21 10:39:05 +0000 linux(4): Fix MSG_CTRUNC handling in recvmsg() The MSG_CTRUNC flag of the msg_flags member of the message header is set uppon successful completition if the control data was truncated. Upon return from a successful call msg_controllen should contain the length of the control message sequence. Fixes: 0eda2cea MFC after: 1 week (cherry picked from commit 2467ccddc0e0f5c719eddaece69a7aa0589b6449) --- sys/compat/linux/linux_socket.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index ba17e38c1c64..421247570701 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1830,8 +1830,8 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, if (error != 0) goto bad; + skiped = outlen = 0; maxlen = l_msghdr.msg_controllen; - l_msghdr.msg_controllen = 0; if (control == NULL) goto out; @@ -1839,7 +1839,6 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, msg->msg_control = mtod(control, struct cmsghdr *); msg->msg_controllen = control->m_len; outbuf = PTRIN(l_msghdr.msg_control); - skiped = outlen = 0; for (m = control; m != NULL; m = m->m_next) { cm = mtod(m, struct cmsghdr *); lcm->cmsg_type = bsd_to_linux_cmsg_type(p, cm->cmsg_type, @@ -1905,9 +1904,9 @@ err: error = EINVAL; goto bad; } - l_msghdr.msg_controllen = outlen; out: + l_msghdr.msg_controllen = outlen; error = copyout(&l_msghdr, msghdr, sizeof(l_msghdr)); bad: From nobody Mon Aug 21 13:24: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 4RTtWJ036tz4qmtk; Mon, 21 Aug 2023 13:25: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 4RTtWH6cJbz3MgM; Mon, 21 Aug 2023 13:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692624299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M7duUgs3uTHs/bvMF9W0YOAcLqqNFziLfy+lYaUBgi8=; b=BloBnuHZGX7jxPy4B5ZxS7exsSQPPrpNKy5SAuNjpi6SwLbd7tbChnnfZ6JUUrv3QW93v2 UwJVkwc1+Uk0LOJP5EsrS7CZcNKizQK6hPNuwoz+Owmf7WRTuPeTLg7c9o2hwgU3b0OCOx A69JyKDXaNhuGit0DRp1CSFiTpbbaOTIcudwPwkT0er1GjUlk/QAQzJteKHcqLLWF/oIWF bkcx+pwCqstgUWJjNUNowoxpxyFBppx30gaUlw9wzrMZ2gyOc1mRzbVy2wxJJwb/hBAUJw Mri/InPOb4xf7NorVvnX3YhDrqXGZD+9hwReFI1UJn+rAa/chqvbw8hj0rKzFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692624299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M7duUgs3uTHs/bvMF9W0YOAcLqqNFziLfy+lYaUBgi8=; b=To9nQ6/POwQ5fSiV8UDpuZThr29rb+nt9u2dOYFFTi8YT4MmNPIasCl/cuWWjpVvgBjBb4 w2c41Ve6W3g0qhmUtkfpYbjiIc/HQxUvNTT3wLPbTJb/O+Xww3YfzCZ6VSdx7+ByGdwlTc secwDXKAmYVlClC5kS2IZuNnOJZjt3aPGo35iDlzERbXzC6nsuT0vtLEvvZ0gNmVZKgVUc x+qVU9W+Wg0wjkMBlpDO3iG7seFgKjagzPKBp3DSNq7d3SEwK3k5oLvoNIAyhcATZ78qfA nwINMkbWiwu8MTrXJAzYfcULkrWMNTAY6JMm4xyk0oEGzzfmZEBmXcGJt3UlWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692624299; a=rsa-sha256; cv=none; b=DFmQAnI+bVsJNQ980Lc3Si4iED0dF+exrN9yynwhx29Xkrh/xp+QWv5jhAvNqfzw9FjvFq 2qr4xfhWSq7glX0TrzUoxPICMotWKlvoJUV0zHECDIqw7HdVDCOGVcKp1s3YAaBp66ESWv 57quwTkmC87R2RV2cVq9k1CTrmeugp/jneU13lzxLl0xAvbvm7QRqmTS2CGUO4lWWsuts+ YqxKEcy0qNYZFNuaEkGIsBlM4D4T1AGTr6qHNlrz4AuD0CKag6qMjFJ9W2N0ks9BNp8lyD YolYaPlKQZ7vcCk0gjV7HTRTT6SftLFZW+n07VX1qkNWZ1R+9wyavcnZ1EGVsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTtWH5fZSz75f; Mon, 21 Aug 2023 13:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LDOxff014212; Mon, 21 Aug 2023 13:24:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LDOxlK014209; Mon, 21 Aug 2023 13:24:59 GMT (envelope-from git) Date: Mon, 21 Aug 2023 13:24:59 GMT Message-Id: <202308211324.37LDOxlK014209@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: 9642d948c08d - main - pf: reduce indentation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9642d948c08d80a41679f2eaab26e85a8b9e3080 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9642d948c08d80a41679f2eaab26e85a8b9e3080 commit 9642d948c08d80a41679f2eaab26e85a8b9e3080 Author: Kajetan Staszkiewicz AuthorDate: 2023-08-21 05:59:49 +0000 Commit: Kristof Provost CommitDate: 2023-08-21 11:18:52 +0000 pf: reduce indentation Early-return to reduce syncookie-related indentation. No functional change. MFC after: 1 week Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D41502 --- sys/netpfil/pf/pf.c | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 7fb47a297f9e..c2b9ee21d04c 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7542,40 +7542,34 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, pd.dir == PF_IN) { struct mbuf *msyn; - msyn = pf_syncookie_recreate_syn(h->ip_ttl, - off,&pd); + msyn = pf_syncookie_recreate_syn(h->ip_ttl, off, + &pd); if (msyn == NULL) { action = PF_DROP; break; } - action = pf_test(dir, pflags, ifp, &msyn, inp, &pd.act); + action = pf_test(dir, pflags, ifp, &msyn, inp, + &pd.act); m_freem(msyn); + if (action != PF_PASS) + break; - if (action == PF_PASS) { - action = pf_test_state_tcp(&s, kif, m, - off, h, &pd, &reason); - if (action != PF_PASS || s == NULL) { - action = PF_DROP; - break; - } - - s->src.seqhi = ntohl(pd.hdr.tcp.th_ack) - - 1; - s->src.seqlo = ntohl(pd.hdr.tcp.th_seq) - - 1; - pf_set_protostate(s, PF_PEER_SRC, - PF_TCPS_PROXY_DST); - - action = pf_synproxy(&pd, &s, &reason); - if (action != PF_PASS) - break; + action = pf_test_state_tcp(&s, kif, m, off, h, + &pd, &reason); + if (action != PF_PASS || s == NULL) { + action = PF_DROP; + break; } + + s->src.seqhi = ntohl(pd.hdr.tcp.th_ack) - 1; + s->src.seqlo = ntohl(pd.hdr.tcp.th_seq) - 1; + pf_set_protostate(s, PF_PEER_SRC, PF_TCPS_PROXY_DST); + action = pf_synproxy(&pd, &s, &reason); break; - } - else { - action = pf_test_rule(&r, &s, kif, m, off, - &pd, &a, &ruleset, inp); + } else { + action = pf_test_rule(&r, &s, kif, m, off, &pd, + &a, &ruleset, inp); } } break; From nobody Mon Aug 21 13:25: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 4RTtWK1ZB8z4qmWt; Mon, 21 Aug 2023 13:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RTtWK0h20z3MVV; Mon, 21 Aug 2023 13:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692624301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YqgiaSbDLbP1lbdcO6WgB/1ZOPbkWYDtPg1/Hz8eT/Q=; b=CMMbgiO/YzIjb74X+2uDZTJfpQYLU3tqbp23igrArMir1+2MhCsFwC8gVzkSXEjrHX56zM 0H20FmKuMFZ4gph5wM5I29ZRevLHhXUiFp/OfpbXh9QhWZo6+X8NT1lpB/l8EuNiEHFPUg hRubpcqFwiUOKCSVBElwBgB+ppqptutnF1aCKy9Er8vrLdDcL6URqHM/G0x+kc/uVaMVft 5ghZBk6GVhivd7KCzfPl61x5YxDXm12k252kLu5lU7Jkc2WKAI9FkKLGXVsSR9qUuPbRYn b+cRTs9NdlTiLgfAhBL/xJpmxLxmvGNf8nRg07eR4hIir5AWJ060KTcgNnyqEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692624301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YqgiaSbDLbP1lbdcO6WgB/1ZOPbkWYDtPg1/Hz8eT/Q=; b=lr3UjAY2DLD8uv0Cil+spscogWmT2Y7M9qcfF5Lyn9v+i84SJ0oNJUzQnSEpNnJ1raHWlF 2EvxL6MpIHMWEktGU9o7WwFED/VJGzz/EoXxZLpXduSCl68t/Q2fIJZZ5ddC1DN2MR0JcN euFamBf0yhwQovaeF2rGpLpXougTemInC7yL8LqGwlwS6tI4HVNINvq86/5hxakqZneCbA rzQUfz/VTQz+bKLsApnRFDGeNjcVlesO/nsmkedbTD52/vQQnXbVGo1unU9UkJeCnI0irT PFK9BwfwZQMZWzTUontwEhxtMGQKWPna4Bxiatg2ZqiXr9HPJKuDZQ0ZZJZgAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692624301; a=rsa-sha256; cv=none; b=AEg21bMrc7oLaOFWqP/DqHHE1p29rL3TLJ9KlflMrWsHbBt+/tGHOz/BM3bx6giLoug7eB tbsw5cGrRdlN9fZqaeOYesGTLnBYzbocGtHSH8bQh2klQelPV3zSVfoKwmD9TZ39hFBud/ gDYfs8yE/t5CYfdN9QCUkqBj9zoyx3AqRLC58gSM3jg6POh5OO5oujVn9MF75+1uvBaBWs AcQxt0ChR/fComBfUVqfjd+IiiSlWjsO9fMtN2IkdhlZ1YMF1pex3FaqOhpskAt5HyfxZH JaUeANDqNjQ7x8+iMUGMX7ZRTX6zSOPI1U9Zvl7lhCM2EQZN97e8BK64UYsaYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTtWJ6d0Qz6xP; Mon, 21 Aug 2023 13:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LDP0cu014285; Mon, 21 Aug 2023 13:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LDP0Dv014282; Mon, 21 Aug 2023 13:25:00 GMT (envelope-from git) Date: Mon, 21 Aug 2023 13:25:00 GMT Message-Id: <202308211325.37LDP0Dv014282@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: 92d4152295bc - main - pf: enable the syncookie feature for IPv6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 92d4152295bc670b80352b5fbe102565de99a4eb Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=92d4152295bc670b80352b5fbe102565de99a4eb commit 92d4152295bc670b80352b5fbe102565de99a4eb Author: Kajetan Staszkiewicz AuthorDate: 2023-08-21 06:01:29 +0000 Commit: Kristof Provost CommitDate: 2023-08-21 11:19:06 +0000 pf: enable the syncookie feature for IPv6 When syncookie support was added to pf the relevant work was only done in pf_test(), not pf_test6(). Do this now. MFC after: 1 week Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D41502 --- sys/netpfil/pf/pf.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index c2b9ee21d04c..c80553ba017d 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8108,6 +8108,15 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb pd.p_len = pd.tot_len - off - (pd.hdr.tcp.th_off << 2); pd.sport = &pd.hdr.tcp.th_sport; pd.dport = &pd.hdr.tcp.th_dport; + + /* Respond to SYN with a syncookie. */ + if ((pd.hdr.tcp.th_flags & (TH_SYN|TH_ACK|TH_RST)) == TH_SYN && + pd.dir == PF_IN && pf_synflood_check(&pd)) { + pf_syncookie_send(m, off, &pd); + action = PF_DROP; + break; + } + action = pf_normalize_tcp(kif, m, 0, off, h, &pd); if (action == PF_DROP) goto done; @@ -8117,9 +8126,45 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb V_pfsync_update_state_ptr(s); r = s->rule.ptr; a = s->anchor.ptr; - } else if (s == NULL) - action = pf_test_rule(&r, &s, kif, m, off, &pd, - &a, &ruleset, inp); + } else if (s == NULL) { + /* Validate remote SYN|ACK, re-create original SYN if + * valid. */ + if ((pd.hdr.tcp.th_flags & (TH_SYN|TH_ACK|TH_RST)) == + TH_ACK && pf_syncookie_validate(&pd) && + pd.dir == PF_IN) { + struct mbuf *msyn; + + msyn = pf_syncookie_recreate_syn(h->ip6_hlim, + off, &pd); + if (msyn == NULL) { + action = PF_DROP; + break; + } + + action = pf_test6(dir, pflags, ifp, &msyn, inp, + &pd.act); + m_freem(msyn); + if (action != PF_PASS) + break; + + action = pf_test_state_tcp(&s, kif, m, off, h, + &pd, &reason); + if (action != PF_PASS || s == NULL) { + action = PF_DROP; + break; + } + + s->src.seqhi = ntohl(pd.hdr.tcp.th_ack) - 1; + s->src.seqlo = ntohl(pd.hdr.tcp.th_seq) - 1; + pf_set_protostate(s, PF_PEER_SRC, PF_TCPS_PROXY_DST); + + action = pf_synproxy(&pd, &s, &reason); + break; + } else { + action = pf_test_rule(&r, &s, kif, m, off, &pd, + &a, &ruleset, inp); + } + } break; } From nobody Mon Aug 21 13:25: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 4RTtWL3BsSz4qmtm; Mon, 21 Aug 2023 13:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RTtWL1Bhpz3MkT; Mon, 21 Aug 2023 13:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692624302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HtrzlvbHNBlgOfAwKVu3nwb3OG/yX9sEgb4FPsZIN9I=; b=VFKvTU7Upa6yeSk5tbsFu+SmE4qcLyFufKclR880pbkiNzYyz55jc5FjEr7K3dJUPvF41d SIzyjXBv8xDRx4HF3okGh17HND9lR1Pk3O4snfvwlg1/7FIuxodT4pIkw99mTar+g/nqmj weDLACUHuCU5ClAzVpaO+uuuaJQqFDldNtLVDW3iP2uEeCoyH7FKZ+smj+I9e+kfpRu3aY z4DBmCuXmvvscYnpz4XEh3Q/TrRC1/Ijx2oTxNxnwBBdonPUOLXR7q+NKcFSi6i6Vx+V5j XSmxN+YsWLXMT+N+XlWAwymPvFST814s0dncDqUtsw/s1pMZvT06bXPZUEGYlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692624302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HtrzlvbHNBlgOfAwKVu3nwb3OG/yX9sEgb4FPsZIN9I=; b=YS7DLU71xY1rpDLESfNrkLmLBiYvTBn/SRF0iA8s8M3ShmYq/++uGIf3+nxtMCiC3kRwJ6 ZnVgqambsLY82WaoKGFlnkuc/RtKOVEPmry/PUlDuAfrt/yAii+Lo1I+maabIziOK1MzJW lAMJ5i8/UUQBH4yE3On3QisutqZf+g0e+si3FPDIrkkeA/QG/TqFfrEi0dFmpgjm/jXIA8 1AWxamcq1hKyI2URtj9xAey8qeHd0aEswGAB1MD7To/jYo5iwoxb3hZ0awsbkgXP7vZy/8 IUJ6Pba2t0XYGKcXxVf2RHzoSTr9Su5oY1JJxBtR8S5bkcvA99rkGvRvunZd1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692624302; a=rsa-sha256; cv=none; b=gYYLVqfMaMxv9Ex/z8hd0KUpSC68UjA96VjulpuHJxYpZI0XsgiE+T+VsxIfNo8rKQmcDi Vcrk0q519eSRBKcMsJeds89ns3smAGrlYC6Yu7tstmQqTbeLOowY8apsALZ88fL5aIyXfe HOUz4UaLzkWTdEkwxkFBeGZ2RcnC33wgBD5WtllnH8FYAWwBa84cMEvuIiGHPbOyybobP1 DrGGRA0ZIPEDvaKwFVumVnE1+THEYelSV/uosCyYIMCSD5TmhP6bX8t2M+x7eWfUINv7KJ PNu424ii4WCFED80OuDCOIMrfEsR7lZbdIReru8mTI6DYPvTOem7t3QOkWzXGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTtWL0Hj8z6NC; Mon, 21 Aug 2023 13:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LDP1nm014330; Mon, 21 Aug 2023 13:25:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LDP1uO014327; Mon, 21 Aug 2023 13:25:01 GMT (envelope-from git) Date: Mon, 21 Aug 2023 13:25:01 GMT Message-Id: <202308211325.37LDP1uO014327@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: 1fd8c845b8b7 - main - pf tests: test syncookies on IPv6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1fd8c845b8b77f208f481901823fb87df04f8add Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1fd8c845b8b77f208f481901823fb87df04f8add commit 1fd8c845b8b77f208f481901823fb87df04f8add Author: Kristof Provost AuthorDate: 2023-08-21 06:06:50 +0000 Commit: Kristof Provost CommitDate: 2023-08-21 11:19:41 +0000 pf tests: test syncookies on IPv6 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/common/pft_synflood.py | 8 +- tests/sys/netpfil/pf/syncookie.sh | 151 ++++++++++++++++++++++++++++++- 2 files changed, 157 insertions(+), 2 deletions(-) diff --git a/tests/sys/netpfil/common/pft_synflood.py b/tests/sys/netpfil/common/pft_synflood.py index 67a5bba0def7..f73caa1b6aa6 100644 --- a/tests/sys/netpfil/common/pft_synflood.py +++ b/tests/sys/netpfil/common/pft_synflood.py @@ -35,7 +35,10 @@ def syn_flood(args): # Set a src mac, to avoid doing lookups which really slow us down. ether = sp.Ether(src='01:02:03:04:05') - ip = sp.IP(dst=args.to[0]) + if args.ip6: + ip = sp.IPv6(dst=args.to[0]) + else: + ip = sp.IP(dst=args.to[0]) for i in range(int(args.count[0])): tcp = sp.TCP(flags='S', sport=1+i, dport=22, seq=500+i) pkt = ether / ip / tcp @@ -44,6 +47,9 @@ def syn_flood(args): def main(): parser = argparse.ArgumentParser("pft_synflood.py", description="SYN flooding tool") + parser.add_argument('--ip6', + action='store_true', + help='Use IPv6 rather than IPv4') parser.add_argument('--sendif', nargs=1, required=True, help='The interface through which the packet(s) will be sent') diff --git a/tests/sys/netpfil/pf/syncookie.sh b/tests/sys/netpfil/pf/syncookie.sh index 131a4eac5eb3..8feb2816f589 100644 --- a/tests/sys/netpfil/pf/syncookie.sh +++ b/tests/sys/netpfil/pf/syncookie.sh @@ -71,7 +71,6 @@ basic_body() atf_fail "Failed to connect to syncookie protected echo daemon" fi - # Check that status shows syncookies as being active active=$(syncookie_state alcatraz) if [ "$active" != "active" ]; @@ -86,6 +85,55 @@ basic_cleanup() pft_cleanup } +atf_test_case "basic_v6" "cleanup" +basic_v6_head() +{ + atf_set descr 'Basic syncookie IPv6 test' + atf_set require.user root +} + +basic_v6_body() +{ + pft_init + + epair=$(vnet_mkepair) + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b inet6 2001:db8::1/64 up no_dad + jexec alcatraz /usr/sbin/inetd -p inetd-alcatraz.pid \ + $(atf_get_srcdir)/echo_inetd.conf + + ifconfig ${epair}a inet6 2001:db8::2/64 up no_dad + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "set syncookies always" \ + "pass in" \ + "pass out" + + # Sanity check + atf_check -s exit:0 -o ignore ping6 -c 1 2001:db8::1 + + reply=$(echo foo | nc -N -w 5 2001:db8::1 7) + if [ "${reply}" != "foo" ]; + then + atf_fail "Failed to connect to syncookie protected echo daemon" + fi + + # Check that status shows syncookies as being active + active=$(syncookie_state alcatraz) + if [ "$active" != "active" ]; + then + atf_fail "syncookies not active" + fi +} + +basic_v6_cleanup() +{ + rm -f inetd-alcatraz.pid + pft_cleanup +} + atf_test_case "forward" "cleanup" forward_head() { @@ -137,6 +185,57 @@ forward_cleanup() pft_cleanup } +atf_test_case "forward_v6" "cleanup" +forward_v6_head() +{ + atf_set descr 'Syncookies for forwarded hosts' + atf_set require.user root +} + +forward_v6_body() +{ + pft_init + + epair_in=$(vnet_mkepair) + epair_out=$(vnet_mkepair) + + vnet_mkjail fwd ${epair_in}b ${epair_out}a + vnet_mkjail srv ${epair_out}b + + jexec fwd ifconfig ${epair_in}b inet6 2001:db8::1/64 up no_dad + jexec fwd ifconfig ${epair_out}a inet6 2001:db8:1::1/64 up no_dad + jexec fwd sysctl net.inet6.ip6.forwarding=1 + + jexec srv ifconfig ${epair_out}b inet6 2001:db8:1::2/64 up no_dad + jexec srv route -6 add default 2001:db8:1::1 + jexec srv /usr/sbin/inetd -p inetd-alcatraz.pid \ + $(atf_get_srcdir)/echo_inetd.conf + + ifconfig ${epair_in}a inet6 2001:db8::2/64 up no_dad + route -6 add -net 2001:db8:1::/64 2001:db8::1 + + jexec fwd pfctl -e + pft_set_rules fwd \ + "set syncookies always" \ + "pass in" \ + "pass out" + + # Sanity check + atf_check -s exit:0 -o ignore ping6 -c 1 2001:db8:1::2 + + reply=$(echo foo | nc -N -w 5 2001:db8:1::2 7) + if [ "${reply}" != "foo" ]; + then + atf_fail "Failed to connect to syncookie protected echo daemon" + fi +} + +forward_v6_cleanup() +{ + rm -f inetd-alcatraz.pid + pft_cleanup +} + atf_test_case "nostate" "cleanup" nostate_head() { @@ -183,6 +282,53 @@ nostate_cleanup() pft_cleanup } +atf_test_case "nostate_v6" "cleanup" +nostate_v6_head() +{ + atf_set descr 'Ensure that we do not create until SYN|ACK' + atf_set require.user root + atf_set require.progs scapy +} + +nostate_v6_body() +{ + pft_init + + epair=$(vnet_mkepair) + ifconfig ${epair}a inet6 2001:db8::2/64 up no_dad + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b inet6 2001:db8::1/64 up no_dad + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "set syncookies always" \ + "pass in" \ + "pass out" + + # Sanity check + atf_check -s exit:0 -o ignore ping6 -c 1 2001:db8::1 + + # Now syn flood to create many states + ${common_dir}/pft_synflood.py \ + --ip6 \ + --sendif ${epair}a \ + --to 2001:db8::2 \ + --count 20 + + states=$(jexec alcatraz pfctl -ss | grep tcp) + if [ -n "$states" ]; + then + echo "$states" + atf_fail "Found unexpected state" + fi +} + +nostate_v6_cleanup() +{ + pft_cleanup +} + atf_test_case "adaptive" "cleanup" adaptive_head() { @@ -337,8 +483,11 @@ port_reuse_cleanup() atf_init_test_cases() { atf_add_test_case "basic" + atf_add_test_case "basic_v6" atf_add_test_case "forward" + atf_add_test_case "forward_v6" atf_add_test_case "nostate" + atf_add_test_case "nostate_v6" atf_add_test_case "adaptive" atf_add_test_case "limits" atf_add_test_case "port_reuse" From nobody Mon Aug 21 13:33:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RTthw4DQxz4qnF7; Mon, 21 Aug 2023 13:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RTthw3gMvz3NyM; Mon, 21 Aug 2023 13:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692624800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4t5+YmLRm5RABpZCthbE9Eqy6hy++P/mZQDVudUYQ98=; b=dBxCSoIDPdf8e+jN6JipjDsSONzHUIQByNGziCi5HIKYpIeaUhQHfQGgm0WeuR++W5hca6 M+0DGdNEzqxLMi6cubVNws5iMmt/e4K5Cf+DnWK8q3ceUJNsqNjpPQSQILmeBt1VgSmQhf 0UuunaYjyTSIjMaw6lf+5Ux+1AMa8rWI26uKFarzO0YUtTx9ktGHf2R+OcYaUw5BOXQya6 omEhxVuRm8Hy97GcEXSGqggdALFXXpSMJJLhqL0jLROmivurQzFgmy6FaYqUMQ0Zsp5b0F FH+ted+ig65DI18oxscNM/po14PUsdIEh6fpsgcqy0ZFIzVCsx4kLRBzWIUS6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692624800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4t5+YmLRm5RABpZCthbE9Eqy6hy++P/mZQDVudUYQ98=; b=uubofH6IcnNDohppRVpvXaE6l8s1JZ3IsXFxSCbh8l2Q41yM2ddgqb3Uh92bYN1+pZMLkI WrrcEgy2udBQhyeouGffpE46Q0lRL7Z1gYSrTSA+1iS7+/rfZYP4b+Xkhu+MZZdwSndgoq 36pasz6UDwXjho8EzyxXPMsipialShCmceK1+EEVFNZHPsgyoy3JIXIMpaICnNdFfNxm9e Ukh2QrQb5NCJ2axq1sh0wgG3uZDGL8qLfX0UFEsFrKjGQAhqHslKz5Wv9YtKVr99Bl7gju W1SE1gxNSlHfFnn2PVue1Yk1bHrWuGXXX36QpKPM2MD4tEeiU5NRRFU6PtlKNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692624800; a=rsa-sha256; cv=none; b=VQTk1nMQ9VJrC2hIzDdTUIrDsqKwtIzut4VL7MwZKeE719OEbsGHfVntk/cEyVd5hiSB0m kWHfDFN/WR8QtflVxFI1LBo3SOr4GDjd3KfJ9Lnm3EXDeGF08sae13F+AwSvgL3Y9YjICD 6Quryp9E7hos4Y+5foQIgD1WUTfqETxy9qBBiJ+3DsNmsM+k/X2ajSJN/bPI+PPquq/0D0 zgfDRJHW86VdJ2usCJbhC5V1C0pF/SKtqZPg1yuKGGyhGyBBqW36O8+LrYy3Ns3VE7iHmm xFWk6K2KoHc2pHkxnBILUiquBpZuMoouVyc9OWxtTW0PrYar4s9+IGBkgX0+fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTthw2mMrz6yK; Mon, 21 Aug 2023 13:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LDXKor030289; Mon, 21 Aug 2023 13:33:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LDXKqw030286; Mon, 21 Aug 2023 13:33:20 GMT (envelope-from git) Date: Mon, 21 Aug 2023 13:33:20 GMT Message-Id: <202308211333.37LDXKqw030286@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: 3c872a70b883 - main - hwpmc: on process exit, ensure that the owned log is closed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3c872a70b883e4e2b38135bd6bd114ac9d2ea579 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3c872a70b883e4e2b38135bd6bd114ac9d2ea579 commit 3c872a70b883e4e2b38135bd6bd114ac9d2ea579 Author: Konstantin Belousov AuthorDate: 2023-08-13 13:42:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-21 13:33:13 +0000 hwpmc: on process exit, ensure that the owned log is closed Tested by: pho (previous version) Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41521 --- sys/dev/hwpmc/hwpmc_mod.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index b429f713b09c..de012b74d558 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -4989,13 +4989,13 @@ pmc_process_exit(void *arg __unused, struct proc *p) } PMC_EPOCH_EXIT(); - if (!is_using_hwpmcs) - return; - PMC_GET_SX_XLOCK(); PMCDBG3(PRC,EXT,1,"process-exit proc=%p (%d, %s)", p, p->p_pid, p->p_comm); + if (!is_using_hwpmcs) + goto out; + /* * Since this code is invoked by the last thread in an exiting process, * we would have context switched IN at some prior point. However, with @@ -5116,6 +5116,8 @@ out: * If the process owned PMCs, free them up and free up memory. */ if ((po = pmc_find_owner_descriptor(p)) != NULL) { + if ((po->po_flags & PMC_PO_OWNS_LOGFILE) != 0) + pmclog_close(po); pmc_remove_owner(po); pmc_destroy_owner_descriptor(po); } From nobody Mon Aug 21 14:17: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 4RTvgc0Hypz4qqlT; Mon, 21 Aug 2023 14:17: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 4RTvgb4wWSz3br4; Mon, 21 Aug 2023 14:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692627435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBd2c/I3GapPQMO14vW5Up8KwnoXkb9aI+M6k85GLuk=; b=PMwReXcv+lzx+PfiJjdZ1GL3Ml9XYmADr3gsFSKnG4+IKHwFqDXcHGvxSRiXpGFIfxiVc+ qAbVLYsvPna8b7Tugs/I9TzQ3TPdwOrEPQ/DPoa1hsdDRpkb/T/00hdgDHTx2jQUIIDYV3 w1uK5KRqMXD2EhEnhPPDjjelVBJDWEpgrzDK+bLWAsR/TvYIqoPLXxvaUDsdM2LrF4+YoY +wyeyh+zvIO9fHVdVd99pseMX4nMMZBNSufa8Ew6JB+rlQ8pRJtEsLrvG0G0Gr3P65a8Vz 5A+77k9IaWGswJRVlissHxOaR3UZG32XL3J+AXIW+O6EGx3WnUoQGnGskfKDhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692627435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBd2c/I3GapPQMO14vW5Up8KwnoXkb9aI+M6k85GLuk=; b=SLQ68K/ool1pmSJdDLWNF67oA2hTIh8NpEWwGytuuTRWuO4WFw5ayuqVZGQZVUu62d8wWM PxSquXDoQzdVvpxXLFQG/9bdxl0NUDstZg3fJOye05CYK6yHC3DHD1NvoPiIbeueSF8vhG ZNT8HCEJqrd0Ahag/V8nKfAXi9dK/Qwc75dZf94ypRvig4HWaylx86fZ4osijxbekHdp55 rs8qBZgV/HQshCOpakQbfgoFe51dTiof8y3aKd8rKoo6DXD9/whAO2qQsv5wm+3eQj3e5V jxTeb3I9F61X0kkR4c+D375AXeKrcXelV6ze5WCfr3bFF5AhuyVc6Ve7D5y1Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692627435; a=rsa-sha256; cv=none; b=uSvOT+DjXSx+VYIWj6hDuL+cjz+avFHWfVynph3rh2i7X9xpHb2VqlzEMH9XxfCUftUVbg hdvAlTX+nnNthMVR7aZLGG7yU0+ukYNGpW+mO1zCwiwdgiC+/73Na/t9RmFodULT2SVuZ/ pXazmCGOumVS8JQHVUrFd8xfYcTQxRYPthIgJ56cjP+2bY9F/GY8QYm0FYT9Pem6mszjIf 4SbV0Ro0cPpzddrYtLu/gsmYgYMPUcJyYogAYnfL1ybT6/Eh+e8bQHpj10MQJ7Ap5UfRa6 Crp4fB52VOl/YgjCHXEMPt3zArIV7NeYgeSZHN6v5pRba8WOw4gKy7zgcJOOnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTvgb40Dkz8Pp; Mon, 21 Aug 2023 14:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LEHFMN097357; Mon, 21 Aug 2023 14:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LEHF7x097354; Mon, 21 Aug 2023 14:17:15 GMT (envelope-from git) Date: Mon, 21 Aug 2023 14:17:15 GMT Message-Id: <202308211417.37LEHF7x097354@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: 6bb7f05850ef - main - rtld_malloc.c: change return type of cp2op() to void List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6bb7f05850efceb01a7050e3c0fd86f9539c0071 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6bb7f05850efceb01a7050e3c0fd86f9539c0071 commit 6bb7f05850efceb01a7050e3c0fd86f9539c0071 Author: Konstantin Belousov AuthorDate: 2023-07-30 01:58:01 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-21 14:16:42 +0000 rtld_malloc.c: change return type of cp2op() to void for it to be useful to return unaligned pointer. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41150 --- libexec/rtld-elf/rtld_malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 3437f638d339..1246238b3941 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -106,10 +106,10 @@ static int pagesz; /* page size */ * increasing order. */ -static union overhead * +static void * cp2op(void *cp) { - return ((union overhead *)((caddr_t)cp - sizeof(union overhead))); + return (((caddr_t)cp - sizeof(union overhead))); } void * From nobody Mon Aug 21 14:17: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 4RTvgc6Nwhz4qqX8; Mon, 21 Aug 2023 14:17: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 4RTvgc5qvlz3c1y; Mon, 21 Aug 2023 14:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692627436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lnjy9krDG9y70jlCX0pm68NhWHaWHI/m3r7TUj0F/lk=; b=hwSjKAeCtweZ1hhJPnQ3BvY/1D2i7PW175zANbpA6Kfv8Rnt2oaGZyWTD7KHhLCfYjlh6d cVdgn/sQmYw/WlgqpAqBAzhgbNal7xijvfUytmVOcpOHru1LK0/vKX4dqg2RcDmKtggd9l AiBIbpy7ohB9DsN9mq/vv+y4MEqQouoaLXjSb6OkfDaSPpS4+yKuD9ZYOwXbOu9FvTfPYh lOrL6LJuUUbdZNt84aGu3HN4WXDkrIYBf0LzKbvDmBRho4L+eoZldaVvdxUC7iASwhA/3l vRYWSDwnco5JDk7AddXSo0ZidwrLufAuAysP440kMXR4xqsRmI+evw+IH7ca5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692627436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lnjy9krDG9y70jlCX0pm68NhWHaWHI/m3r7TUj0F/lk=; b=BHyMBbxZ5VtPArXSjNUrkb+RnxeTftXnRwURNvHhW40cqXpt9vr7YX2qSLHkh6zXsGxtO/ Qx3lvNNIpdp/4ZMfxXlMn6DsjbOCIDTVVrv4gr4nbH7umKIizxhtxr4weKmtCYOrBAsPJl AYijEY5GPD6iS0HQYodSGh/MRCxazwEh//SJ2bkfX4746LkB+QOHt6qWRntceD4XNotgkF I8GO+NY89iQiwYu6BD3iOIWLKtjZKBsL5oQxwV3lU444qEHkk4ILAe/mMK4srSRpJEs/dU ua5Mwg9mqx731eKc5JIYyfaTGaJeZuEs6erBMzljaMJghpdTrHnCCw6TQJ5E3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692627436; a=rsa-sha256; cv=none; b=gRoUTiwConggdm0NS71BITZ46T4SwuBjI1YUaGVLUgz06deW7eJ0C+BsIXU3WmkC33jkwn /6d1kqaTVjKV2MGipN2ZUWQLuno1hmMpWKkRhHJ/AEZ9rvfLpOHVX+AaiP5OcpwMaJFg6j BUSgHkGwDMnRodaqPNpLRdSsflFbPtR5KUGSI6JU6u1x9vO7C39vG6DpzwAI7BXLJ3DeYa Vy9NTEr9Cg0UD5I+T7QxEbOEgDM+orzBmEudEzVWDbXOgump9HsKVbpIyoUrXs2avXHIii MFsiLwwP2mfCOhcXQjBriwrOvW08voTTv/ege2V60C/jzX/N/9lwobSJ/sd20w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTvgc4snjz8dl; Mon, 21 Aug 2023 14:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LEHG8M097402; Mon, 21 Aug 2023 14:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LEHGXj097399; Mon, 21 Aug 2023 14:17:16 GMT (envelope-from git) Date: Mon, 21 Aug 2023 14:17:16 GMT Message-Id: <202308211417.37LEHGXj097399@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: d60130bf32a3 - main - rtld_malloc: increase overhead index to uint16 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d60130bf32a3c35417f276507dcdfa569397dae3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d60130bf32a3c35417f276507dcdfa569397dae3 commit d60130bf32a3c35417f276507dcdfa569397dae3 Author: Konstantin Belousov AuthorDate: 2023-07-25 12:54:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-21 14:16:42 +0000 rtld_malloc: increase overhead index to uint16 Reorder it with magic, to keep alignment. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41150 --- libexec/rtld-elf/rtld_malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 1246238b3941..ac8af4d6b6e1 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -75,8 +75,8 @@ static caddr_t pagepool_start, pagepool_end; union overhead { union overhead *ov_next; /* when free */ struct { - u_char ovu_magic; /* magic number */ - u_char ovu_index; /* bucket # */ + uint16_t ovu_index; /* bucket # */ + uint8_t ovu_magic; /* magic number */ } ovu; #define ov_magic ovu.ovu_magic #define ov_index ovu.ovu_index From nobody Mon Aug 21 14:17: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 4RTvgf0JdNz4qqd6; Mon, 21 Aug 2023 14:17: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 4RTvgd6XHkz3c2Z; Mon, 21 Aug 2023 14:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692627437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UfoxVzPaaq5K3Cm+MPf6fu4ZDmKRnuTvkQdtzWvFjWA=; b=LXL2c3/jHlAm8RvZUG8qX2ju8rirWbqrJjtxkC/VT79tI2avoq114HLHsfiq3XnAVPD1kf 2uGDBGstoDbuYVR0mKiOi/6mDCyaXV8eDUdoHRgaG55WPUmz+//ZH1alLWecIgTtEhhhSy 6Ib+4XzlDiG8LEsz8cGmKBRO7v9mT1w3KjwwamhCxuQOQ8ZYGSeFKFYs1y2aULlLOEf1ww Dyc+5TBdaSDyV1KBAds9IBZMR8vtBa1XNU0YcJbEKqDmFNxG+pQDrkBgotf8v36hlDrd0A Xh6UBN3y6sT06RKbpwKBlEtm58R8nMt+KR95Zx7aUG/DbMsZSxsCsMqdokx0yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692627437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UfoxVzPaaq5K3Cm+MPf6fu4ZDmKRnuTvkQdtzWvFjWA=; b=h0qoycY47VxwiRmT/mktXij2g3XQxmP5P3c6fgh/4dABKDlltyOYenawBR9wtnhsQu3cxx HkXWRro6mCpUhBnpjSUA+W/1u7mujagK/zuER12NH4rhSzCrxeLMZDG9MJL2qlRAXd+X3R KnmYB/UaAjzfALvgcBNMqE5OhYXgUSSe0jsGiz8b2TYtNcaazdKqTm0tctkp4M/SO+z/wr 9KHbxc7amO6h+HIjSOwjkblivB7R/Zki+dDfFAmQN9N7AvYzSPlRmJqUVCnPsJvq0WYqRK GokdP0SQ13LljCvliwYLgTYIufHHROEqATD1C0Vheb9N8RqVE0Ny1N7en/l3/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692627437; a=rsa-sha256; cv=none; b=E2uDERlqBGwCJ1z7dlCZIHjsj6cPvPhjPBm+upRvx+KpWj5eM9Rgvw31OpsD6/2OOY8uL9 omM2pplrnERo/SFI5RUwYhWjvrJjqs8NT7dq/tHp11KbLwAszrWvRCtTdPtZmb7y08l4Fz NH2PNxaNFv5qtYLT6pf4CGVrh7ej636QRwN1S/3SPf9481mCxyOIrfnM4zO53Rps99qBK4 kbI/EOu4HA5jKcVpKyjJwXrNcs2+t/zx3P5lHdx2l6p8/+Mp++S4CFMEwwQGjVaEW2CxPX dSupOveDDLQoYXGZoV4q9eBZo90EcPBH56tUeYKXPHTQ65iwtG9IxrzQmmTOwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTvgd5d6Xz80Q; Mon, 21 Aug 2023 14:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LEHHRx097440; Mon, 21 Aug 2023 14:17:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LEHHOj097437; Mon, 21 Aug 2023 14:17:17 GMT (envelope-from git) Date: Mon, 21 Aug 2023 14:17:17 GMT Message-Id: <202308211417.37LEHHOj097437@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: c29ee08204ce - main - rtld_malloc: add __crt_aligned_alloc_offset() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c29ee08204ce4106d4992474005c5f2fb7d5fbf1 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c29ee08204ce4106d4992474005c5f2fb7d5fbf1 commit c29ee08204ce4106d4992474005c5f2fb7d5fbf1 Author: Konstantin Belousov AuthorDate: 2023-07-22 04:21:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-21 14:16:42 +0000 rtld_malloc: add __crt_aligned_alloc_offset() It is modelled after aligned_alloc(3). Most importantly, to free the allocation, __crt_free() can be used. Additionally, caller may specify offset into the aligned allocation, so that we return offset-ed from alignment pointer. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41150 --- libexec/rtld-elf/rtld_malloc.c | 34 +++++++++++++++++++++++++++++++--- libexec/rtld-elf/rtld_malloc.h | 1 + 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index ac8af4d6b6e1..6e011e88ba5a 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -86,13 +86,15 @@ static void morecore(int bucket); static int morepages(int n); #define MAGIC 0xef /* magic # on accounting info */ +#define AMAGIC 0xdf /* magic # for aligned alloc */ /* * nextf[i] is the pointer to the next free block of size * (FIRST_BUCKET_SIZE << i). The overhead information precedes the data * area returned to the user. */ -#define FIRST_BUCKET_SIZE 8 +#define LOW_BITS 3 +#define FIRST_BUCKET_SIZE (1U << LOW_BITS) #define NBUCKETS 30 static union overhead *nextf[NBUCKETS]; @@ -169,6 +171,28 @@ __crt_calloc(size_t num, size_t size) return (ret); } +void * +__crt_aligned_alloc_offset(size_t align, size_t size, size_t offset) +{ + void *mem, *ov; + union overhead ov1; + uintptr_t x; + + if (align < FIRST_BUCKET_SIZE) + align = FIRST_BUCKET_SIZE; + offset &= align - 1; + mem = __crt_malloc(size + align + offset + sizeof(union overhead)); + if (mem == NULL) + return (NULL); + x = roundup2((uintptr_t)mem + sizeof(union overhead), align); + x += offset; + ov = cp2op((void *)x); + ov1.ov_magic = AMAGIC; + ov1.ov_index = x - (uintptr_t)mem - sizeof(union overhead); + memcpy(ov, &ov1, sizeof(ov1)); + return ((void *)x); +} + /* * Allocate more memory to the indicated bucket. */ @@ -210,12 +234,16 @@ morecore(int bucket) void __crt_free(void *cp) { + union overhead *op, op1; + void *opx; int size; - union overhead *op; if (cp == NULL) return; - op = cp2op(cp); + opx = cp2op(cp); + memcpy(&op1, opx, sizeof(op1)); + op = op1.ov_magic == AMAGIC ? (void *)((caddr_t)cp - op1.ov_index) : + opx; if (op->ov_magic != MAGIC) return; /* sanity */ size = op->ov_index; diff --git a/libexec/rtld-elf/rtld_malloc.h b/libexec/rtld-elf/rtld_malloc.h index f9780c552821..247726b9f470 100644 --- a/libexec/rtld-elf/rtld_malloc.h +++ b/libexec/rtld-elf/rtld_malloc.h @@ -32,6 +32,7 @@ #ifndef RTLD_MALLOC_H #define RTLD_MALLOC_H +void *__crt_aligned_alloc_offset(size_t align, size_t size, size_t offset); void *__crt_calloc(size_t num, size_t size); void __crt_free(void *cp); void *__crt_malloc(size_t nbytes); From nobody Mon Aug 21 14: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 4RTvgg1JF6z4qqqR; Mon, 21 Aug 2023 14:17: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 4RTvgg0hNdz3c5T; Mon, 21 Aug 2023 14:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692627439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d0Fa3yP7Oo/HI7RvhTdix7rRQIBEWiGYbkfZRdGtp8A=; b=c/fxe9dcqA6pEEb3hc3gesZBd6tiL7lSg7WVGH1hJ1E23zev7lEM9MZVOWny7CwEPnUTun D5UrDonrQl2jddq3DBpqmjjTfsHnGcsIQK+hXvzDc62rfAVaShKO0wvvwlnZKEyCP7oezy e4D5Fx1nReih+km2Y8KH5WJR6q1PFyOvmS+dzi5+ppEV+O/rvxwJPwX8neynKI6os7M5Yi wsXyzysE4bmxgIq7uz6nW2MY7APoYx0cSixMg7K/dyIItMliZH8VSIRukZHD7rhe2UScrp /CvJnYpAvav1FlPPoOIUrxH/GYV3VndLpMqU6Le+olo7TdNcHDocHd8T4F5RKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692627439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d0Fa3yP7Oo/HI7RvhTdix7rRQIBEWiGYbkfZRdGtp8A=; b=MfZyv+vSTT2/gQBbq82f1bwt1n5fB/WK8tOb5hQryIsEK1FvP7lz4xnmPj9TATkm3ReK+H cqFzOoGOWTlXD6NaKXLLcUGyKt8sEtg+Fe3qMxeSlMKGyMXRYtnA/Ty8urWIeELyyV5iKN nRQUiBjPk2nopB/rV4j6gBrjXH682d7o3tOumb8MBTWU8KuyJL7bns2iCmPbDu8SoU4JQJ MVy8alVp2vEQYMC51lryXVss88UG4tk13phKAViNFHE5kVUE57DMEglIkoS3dDNhotwour 7aqP5M0OCnCH+n9xNbGUQb4vc9NAKFM74Mh5Nnneba0ClYSHKQqDO595BGiBdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692627439; a=rsa-sha256; cv=none; b=ftHa+8TSem998Di2PTD/E4scaiRGiBZr4ZWX7vOnub/5HXINtqtjOYxDJVHXQvNI0vP7rE aJEWQRHQLOJjGcv1QtyiZgI49LnaxDR4FCjujXX+1aBOmk53ELtH5knZvicHJucCwavK72 +CWVIk6rKRw0QeMRMz2Vmn9FGFNGMygrEdbJVjtlYwO7zjLV4bz6Tltxufl9ARhRBtnil1 dtIKSWa6o+H9Guc10BZReI5MIO1IqpYhEL8t4lUZkD9rixd2fqIUiHUlmkmiTDIT/UzMI3 EF4pWFvjQTERf4lnpVRQ1aI8C8VppgW+IbO+8tfrlDID1sxrdPqMAUK27tjI5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTvgf6ts7z8cq; Mon, 21 Aug 2023 14:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LEHIuR097488; Mon, 21 Aug 2023 14:17:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LEHIOC097484; Mon, 21 Aug 2023 14:17:18 GMT (envelope-from git) Date: Mon, 21 Aug 2023 14:17:18 GMT Message-Id: <202308211417.37LEHIOC097484@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: feaae6ba1ace - main - rtld: switch from malloc_aligned() to __crt_aligned_alloc() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: feaae6ba1ace0091384ac371423976cd15e59e5a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=feaae6ba1ace0091384ac371423976cd15e59e5a commit feaae6ba1ace0091384ac371423976cd15e59e5a Author: Konstantin Belousov AuthorDate: 2023-07-30 01:51:52 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-21 14:16:42 +0000 rtld: switch from malloc_aligned() to __crt_aligned_alloc() Use regular free(), since it works now. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41150 --- libexec/rtld-elf/rtld.c | 14 +++++++------- libexec/rtld-elf/rtld.h | 3 +-- libexec/rtld-elf/xmalloc.c | 30 +++++++----------------------- 3 files changed, 15 insertions(+), 32 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index feef5dd0bb5d..aa7e6020a085 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5254,13 +5254,13 @@ allocate_tls(Obj_Entry *objs, void *oldtcb, size_t tcbsize, size_t tcbalign) tls_block_size += pre_size + tls_static_space - TLS_TCB_SIZE - post_size; /* Allocate whole TLS block */ - tls_block = malloc_aligned(tls_block_size, maxalign, 0); + tls_block = xmalloc_aligned(tls_block_size, maxalign, 0); tcb = (Elf_Addr **)(tls_block + pre_size + extra_size); if (oldtcb != NULL) { memcpy(tls_block, get_tls_block_ptr(oldtcb, tcbsize), tls_static_space); - free_aligned(get_tls_block_ptr(oldtcb, tcbsize)); + free(get_tls_block_ptr(oldtcb, tcbsize)); /* Adjust the DTV. */ dtv = tcb[0]; @@ -5324,7 +5324,7 @@ free_tls(void *tcb, size_t tcbsize, size_t tcbalign __unused) } } free(dtv); - free_aligned(get_tls_block_ptr(tcb, tcbsize)); + free(get_tls_block_ptr(tcb, tcbsize)); } #endif /* TLS_VARIANT_I */ @@ -5350,7 +5350,7 @@ allocate_tls(Obj_Entry *objs, void *oldtls, size_t tcbsize, size_t tcbalign) size = roundup(tls_static_space, ralign) + roundup(tcbsize, ralign); assert(tcbsize >= 2*sizeof(Elf_Addr)); - tls = malloc_aligned(size, ralign, 0 /* XXX */); + tls = xmalloc_aligned(size, ralign, 0 /* XXX */); dtv = xcalloc(tls_max_index + 2, sizeof(Elf_Addr)); segbase = (Elf_Addr)(tls + roundup(tls_static_space, ralign)); @@ -5429,11 +5429,11 @@ free_tls(void *tls, size_t tcbsize __unused, size_t tcbalign) for (i = 0; i < dtvsize; i++) { if (dtv[i + 2] != 0 && (dtv[i + 2] < tlsstart || dtv[i + 2] > tlsend)) { - free_aligned((void *)dtv[i + 2]); + free((void *)dtv[i + 2]); } } - free_aligned((void *)tlsstart); + free((void *)tlsstart); free((void *)dtv); } @@ -5470,7 +5470,7 @@ allocate_module_tls(int index) obj->tls_dynamic = true; - p = malloc_aligned(obj->tlssize, obj->tlsalign, obj->tlspoffset); + p = xmalloc_aligned(obj->tlssize, obj->tlsalign, obj->tlspoffset); memcpy(p, obj->tlsinit, obj->tlsinitsize); memset(p + obj->tlsinitsize, 0, obj->tlssize - obj->tlsinitsize); return (p); diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 45cb722097b2..7fe9d837d6f1 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -361,8 +361,7 @@ Obj_Entry *map_object(int, const char *, const struct stat *); void *xcalloc(size_t, size_t); void *xmalloc(size_t); char *xstrdup(const char *); -void *malloc_aligned(size_t size, size_t align, size_t offset); -void free_aligned(void *ptr); +void *xmalloc_aligned(size_t size, size_t align, size_t offset); extern Elf_Addr _GLOBAL_OFFSET_TABLE_[]; extern Elf_Sym sym_zero; /* For resolving undefined weak refs. */ extern bool ld_bind_not; diff --git a/libexec/rtld-elf/xmalloc.c b/libexec/rtld-elf/xmalloc.c index 80246f36dd26..5f7c1b5ba10a 100644 --- a/libexec/rtld-elf/xmalloc.c +++ b/libexec/rtld-elf/xmalloc.c @@ -75,34 +75,18 @@ xstrdup(const char *str) } void * -malloc_aligned(size_t size, size_t align, size_t offset) +xmalloc_aligned(size_t size, size_t align, size_t offset) { - char *mem, *res; - uintptr_t x; + void *res; offset &= align - 1; if (align < sizeof(void *)) align = sizeof(void *); - mem = xmalloc(size + 3 * align + offset); - x = roundup((uintptr_t)mem + sizeof(void *), align); - x += offset; - res = (void *)x; - x -= sizeof(void *); - memcpy((void *)x, &mem, sizeof(mem)); + res = __crt_aligned_alloc_offset(align, size, offset); + if (res == NULL) { + rtld_fdputstr(STDERR_FILENO, "Out of memory\n"); + _exit(1); + } return (res); } - -void -free_aligned(void *ptr) -{ - void *mem; - uintptr_t x; - - if (ptr == NULL) - return; - x = (uintptr_t)ptr; - x -= sizeof(void *); - memcpy(&mem, (void *)x, sizeof(mem)); - free(mem); -} From nobody Mon Aug 21 15:27: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 4RTxDd3NkLz4qvMw; Mon, 21 Aug 2023 15:27: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 4RTxDd2ZgVz4Hjp; Mon, 21 Aug 2023 15:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692631649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kSAPgRFVND+SUqL6SV2pi3KuKaqxSsEjywwa4vBGGTw=; b=aiUOVYAwrkpxqtgCfM/1FyEWjo9FWPBlOcGsrLfQNMregXRhskr49OABGVG91Ov9Nq+qMZ g5gXgZIWh5AhmE336JBrjXHeJWMNyiTHbw/K39WMqy2AoHAx3vGg/Sxae5o70uquATQaCj wgSfFt1x4g79lFDb4MQBYob7nPLzkJdwRE28zZ56tpAN0OXu76t6H74z1pagSE0QDZiGTi DAYt7VFbe0j6fhr26+c9Hxxz/8twDhCfuFVYHPp7wP0eoeIN5HiKA3i3O6/S2jUyH6ZEpn dMKlJH0ntAVVpZIRqAMWY2QDDlVLIJQXvndhhhE9Toovb4ekpLTkpyK4aqH2BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692631649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kSAPgRFVND+SUqL6SV2pi3KuKaqxSsEjywwa4vBGGTw=; b=RBl53Yx+kX8W9I9MjcGQ0sC17ArXZ9hnV5vgcJY9w7540uEgnj4rqfehG0exV3E9JSkY7J Xcba3n4L/WsJzmDB+2D0AIRUc1xEZXSCZRA4QjvrDngC5CTYrvwGJ1C0ob7K0Ko8s2FPa5 JqRMojdm+Vt0EEms2ANNY6ps0R3GCrJWtgeBIcjQGbDHSPZYK9ua+wpavNvLEPGLqdy0YM U6nvJcDDCD2rX1G+8xzb4fCrhiO3/1+Omf0DVXF3qoGIBJ8IJtIXqBrY8PoQnaW7m2EkK6 064n0oHzG9koBG6LwDNhxlqvf4GjHQpNMAtnV11ksH7PSnc4WfGD0fk6g36DpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692631649; a=rsa-sha256; cv=none; b=P4KYmwGG0hTxv/G3POKKnKtDS27WFWShAVWHUQzZ+ttvXirMYFvPf1acSZSfgU84bpxHkT xEKc1kUR5IbeJhrlrYYevi1zfCxHckNsxFq/1Uei1fvl1rmzoDAw1h9lfGLna8SJfCrioe RCPY1SJdk+UyQJCubsELfp2E1J1LcSNXMaPIKHIgp1snwTKShSvRbi5snEOokgSX++VHG8 zgV7Uq+n52+Xl8G6j6S98CQmTgL9NyslHtOOc3xecatIH2f9wg4C2UhO9Er7ac/h958YBG TvA72Xplei1P9QuoX0ARh5yG1aguAY7b1ltpsFakRYH4PO3AA88Y2u1J2xSKHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTxDd1VqPz9DW; Mon, 21 Aug 2023 15:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LFRT6S013936; Mon, 21 Aug 2023 15:27:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LFRTvS013933; Mon, 21 Aug 2023 15:27:29 GMT (envelope-from git) Date: Mon, 21 Aug 2023 15:27:29 GMT Message-Id: <202308211527.37LFRTvS013933@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: 2c135a2aecdb - main - e6000sw: support building without FDT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2c135a2aecdb979e34d651f33b2440372d7529d7 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2c135a2aecdb979e34d651f33b2440372d7529d7 commit 2c135a2aecdb979e34d651f33b2440372d7529d7 Author: Luiz Otavio O Souza AuthorDate: 2023-08-21 09:59:25 +0000 Commit: Kristof Provost CommitDate: 2023-08-21 15:26:17 +0000 e6000sw: support building without FDT This enables the use of this driver on platorms without device tree, such as Netgate's XG-7100. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/dev/etherswitch/e6000sw/e6000sw.c | 103 +++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 2 deletions(-) diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c b/sys/dev/etherswitch/e6000sw/e6000sw.c index a7deaf1baf0b..768d1b927e3e 100644 --- a/sys/dev/etherswitch/e6000sw/e6000sw.c +++ b/sys/dev/etherswitch/e6000sw/e6000sw.c @@ -27,6 +27,8 @@ */ #include +#include "opt_platform.h" + #include #include #include @@ -45,8 +47,12 @@ #include #include +#ifdef FDT #include #include +#else +#include +#endif #include "e6000swreg.h" #include "etherswitch_if.h" @@ -72,7 +78,9 @@ MALLOC_DEFINE(M_E6000SW, "e6000sw", "e6000sw switch"); typedef struct e6000sw_softc { device_t dev; +#ifdef FDT phandle_t node; +#endif struct sx sx; if_t ifp[E6000SW_MAX_PORTS]; @@ -102,8 +110,10 @@ static etherswitch_info_t etherswitch_info = { static void e6000sw_identify(driver_t *, device_t); static int e6000sw_probe(device_t); +#ifdef FDT static int e6000sw_parse_fixed_link(e6000sw_softc_t *, phandle_t, uint32_t); static int e6000sw_parse_ethernet(e6000sw_softc_t *, phandle_t, uint32_t); +#endif static int e6000sw_attach(device_t); static int e6000sw_detach(device_t); static int e6000sw_read_xmdio(device_t, int, int, int); @@ -202,9 +212,16 @@ e6000sw_probe(device_t dev) { e6000sw_softc_t *sc; const char *description; +#ifdef FDT phandle_t switch_node; +#else + int is_6190; +#endif sc = device_get_softc(dev); + sc->dev = dev; + +#ifdef FDT switch_node = ofw_bus_find_compatible(OF_finddevice("/"), "marvell,mv88e6085"); if (switch_node == 0) { @@ -224,12 +241,26 @@ e6000sw_probe(device_t dev) if (bootverbose) device_printf(dev, "Found switch_node: 0x%x\n", switch_node); - sc->dev = dev; sc->node = switch_node; if (OF_getencprop(sc->node, "reg", &sc->sw_addr, sizeof(sc->sw_addr)) < 0) return (ENXIO); +#else + if (resource_int_value(device_get_name(sc->dev), + device_get_unit(sc->dev), "addr", &sc->sw_addr) != 0) + return (ENXIO); + if (resource_int_value(device_get_name(sc->dev), + device_get_unit(sc->dev), "is6190", &is_6190) != 0) + /* + * Check "is8190" to keep backward compatibility with + * older setups. + */ + resource_int_value(device_get_name(sc->dev), + device_get_unit(sc->dev), "is8190", &is_6190); + if (is_6190 != 0) + sc->swid = MV88E6190; +#endif if (sc->sw_addr < 0 || sc->sw_addr > 32) return (ENXIO); @@ -280,6 +311,7 @@ e6000sw_probe(device_t dev) return (BUS_PROBE_DEFAULT); } +#ifdef FDT static int e6000sw_parse_fixed_link(e6000sw_softc_t *sc, phandle_t node, uint32_t port) { @@ -355,6 +387,63 @@ e6000sw_parse_child_fdt(e6000sw_softc_t *sc, phandle_t child, int *pport) return (0); } +#else + +static int +e6000sw_check_hint_val(device_t dev, int *val, char *fmt, ...) +{ + char *resname; + int err, len; + va_list ap; + + len = min(strlen(fmt) * 2, 128); + if (len == 0) + return (-1); + resname = malloc(len, M_E6000SW, M_WAITOK); + memset(resname, 0, len); + va_start(ap, fmt); + vsnprintf(resname, len - 1, fmt, ap); + va_end(ap); + err = resource_int_value(device_get_name(dev), device_get_unit(dev), + resname, val); + free(resname, M_E6000SW); + + return (err); +} + +static int +e6000sw_parse_hinted_port(e6000sw_softc_t *sc, int port) +{ + int err, val; + + err = e6000sw_check_hint_val(sc->dev, &val, "port%ddisabled", port); + if (err == 0 && val != 0) + return (1); + + err = e6000sw_check_hint_val(sc->dev, &val, "port%dcpu", port); + if (err == 0 && val != 0) { + sc->cpuports_mask |= (1 << port); + sc->fixed_mask |= (1 << port); + if (bootverbose) + device_printf(sc->dev, "CPU port at %d\n", port); + } + err = e6000sw_check_hint_val(sc->dev, &val, "port%dspeed", port); + if (err == 0 && val != 0) { + sc->fixed_mask |= (1 << port); + if (val == 2500) + sc->fixed25_mask |= (1 << port); + } + + if (bootverbose) { + if ((sc->fixed_mask & (1 << port)) != 0) + device_printf(sc->dev, "fixed port at %d\n", port); + else + device_printf(sc->dev, "PHY at port %d\n", port); + } + + return (0); +} +#endif static int e6000sw_init_interface(e6000sw_softc_t *sc, int port) @@ -425,7 +514,9 @@ e6000sw_attach(device_t dev) { bool sgmii; e6000sw_softc_t *sc; +#ifdef FDT phandle_t child, ports; +#endif int err, port; uint32_t reg; @@ -447,7 +538,7 @@ e6000sw_attach(device_t dev) E6000SW_LOCK(sc); e6000sw_setup(dev, sc); - ports = ofw_bus_find_child(sc->node, "ports"); + sc->sc_tq = taskqueue_create("e6000sw_taskq", M_NOWAIT, taskqueue_thread_enqueue, &sc->sc_tq); @@ -455,6 +546,8 @@ e6000sw_attach(device_t dev) taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq", device_get_nameunit(dev)); +#ifdef FDT + ports = ofw_bus_find_child(sc->node, "ports"); if (ports == 0) { device_printf(dev, "failed to parse DTS: no ports found for " "switch\n"); @@ -468,6 +561,12 @@ e6000sw_attach(device_t dev) device_printf(sc->dev, "failed to parse DTS\n"); goto out_fail; } +#else + for (port = 0; port < sc->num_ports; port++) { + err = e6000sw_parse_hinted_port(sc, port); + if (err != 0) + continue; +#endif /* Port is in use. */ sc->ports_mask |= (1 << port); From nobody Mon Aug 21 17:34: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 4RV02t4BMwz4r5ZW; Mon, 21 Aug 2023 17:34: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 4RV02t3pFLz3WTh; Mon, 21 Aug 2023 17:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5clFJlDhnuuFGeTTs3AN0BYTPeqR71sWNNLWWy4kKHU=; b=dPypv/s1s1tCEhnpJ7uyWybFIFSzcJDalwVq0/2AaoYMFNzrlPF6zZMRp7kfQdQ9/e2D/Y Pkrmpf8lQLiwUo91XZExEqyjzSHmg8oD8m1OGSVl2azimX8iLtZ10RhgUfM/6ZkoAp3A14 weCyCYqV1dSS+5NUow5pqpnEWhwtIGam2ietV/1ugxxhYolzotjOOVyCWuQw7w+BCkWWRV xtYsr86qtULXRkvvEeHdn6uKTv1tpqNbdocLo8NZPLm8qM1fPt5pKYFKpsVzPuL34SNKZD ZPRpfAWO42Xcs9xs2nSNrKkSGLVNIEpLDqyqvi/zQnVQlv9Z5S9mSqJmGUDlZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5clFJlDhnuuFGeTTs3AN0BYTPeqR71sWNNLWWy4kKHU=; b=HxRBPSDuqkr7jNiDvGvDU3naKewhuk7cVETbiLj+lINxFO0IzE8ohe2k/Zm/FMDt5PqNus ugs2IgeoEZdLNLF93KM1Y0fYCT5N0YfQ720GY5ZPaSsWmv7/B6zQiQ6eY4vN8u1MX8MQGT 48uWrZmfSmetojuFIG/sO1n9/fd9XIuTFt7xcdMOBQ+f1px6/xJT/qxbNoomeC2FLbWGiI H4uudUkn7Bs9EPT5+vm6T3b5TQ72k99z99kN+CK/e+/GtMI7sx206C/OeJEluF1BlD7Us8 O6lYM4W4h69PlZ1tQtiV/6pd007YbK3aNTy8xEW1QSTdDHhGCl7KFUe3zTiyHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692639254; a=rsa-sha256; cv=none; b=mrgvgUaxQyCNS4t3+CdO8hGQAm9imgqjU2k3wKW1e+DO1MufKIc017st3hqtClgZaz3Xpt vgyP+Xd5QW257glJR8W1hDVK2P1BZMlcD7oP9cp6ZcbjIdrr7FNGghFkWN5mo2o8SH7RuM 571d/egw83SbL3LmBV1hWTm3ktGakQGrEkXBCHDwzVpca34/41egVEcMiqQPzfK3Sf72iH ObiD85FU5rYN3GhctIA3lBYBBzXLncc8p9BRTjU47UW9B7lAw5ERdkU+FPy56bdWb5oR4S NxYbVebzjGceNP1StdHyFvp80BNP3344o6uZG2HfqTnxCsg2SgOtKGvGExItaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV02t2rv0zVrX; Mon, 21 Aug 2023 17:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHYE4q044429; Mon, 21 Aug 2023 17:34:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHYEpI044426; Mon, 21 Aug 2023 17:34:14 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:34:14 GMT Message-Id: <202308211734.37LHYEpI044426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 3b7ffacdee49 - main - pctrie: change for vm_radix compatibility List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b7ffacdee49f90716cba2bcf8af3fc1971ae031 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=3b7ffacdee49f90716cba2bcf8af3fc1971ae031 commit 3b7ffacdee49f90716cba2bcf8af3fc1971ae031 Author: Doug Moore AuthorDate: 2023-08-21 17:28:51 +0000 Commit: Doug Moore CommitDate: 2023-08-21 17:28:51 +0000 pctrie: change for vm_radix compatibility Restructure parts of pctrie code to make it more compatible with the needs of vm_radix code. 1. End passing function pointers for memory management. By breaking insertion into two functions, the call for allocating memory can happen at the top level and be inlined, rather than happening via an function pointer to a memory allocator. By changing the remove function slightly, freeing of memory, when necessary, can happen at the top level and be inlined. By turning the reclamation code into two functions, one for starting iteration over to-be-freed nodes and the other continuing it, all the freeing can happen at the top level and be inlined. 2. Offer a version of remove that does not panic and returns the freed value (or NULL). 3. Offer a 'replace' operation, to replace one leaf with another that has the same key. These are three of the roadblocks that prevent code sharing between pctrie and vm_radix code. Reviewed by: kib (previous version) Differential Revision: https://reviews.freebsd.org/D41396 --- sys/kern/subr_pctrie.c | 302 +++++++++++++++++++++++++++++-------------------- sys/sys/pctrie.h | 78 ++++++++++--- 2 files changed, 239 insertions(+), 141 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index 708e6dfe94cc..85df0a9bf9e4 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -77,10 +77,6 @@ typedef uint32_t pn_popmap_t; _Static_assert(sizeof(pn_popmap_t) <= sizeof(int), "pn_popmap_t too wide"); -/* Set of all flag bits stored in node pointers. */ -#define PCTRIE_FLAGS (PCTRIE_ISLEAF) -#define PCTRIE_PAD PCTRIE_FLAGS - struct pctrie_node; typedef SMR_POINTER(struct pctrie_node *) smr_pctnode_t; @@ -120,53 +116,10 @@ pctrie_keybarr(struct pctrie_node *node, uint64_t index, int *slot) } /* - * Allocate a node. Pre-allocation should ensure that the request - * will always be satisfied. - */ -static struct pctrie_node * -pctrie_node_get(struct pctrie *ptree, pctrie_alloc_t allocfn, uint64_t index, - uint64_t newind) -{ - struct pctrie_node *node; - - node = allocfn(ptree); - if (node == NULL) - return (NULL); - - /* - * We want to clear the last child pointer after the final section - * has exited so lookup can not return false negatives. It is done - * here because it will be cache-cold in the dtor callback. - */ - if (node->pn_popmap != 0) { - pctrie_node_store(&node->pn_child[ffs(node->pn_popmap) - 1], - PCTRIE_NULL, PCTRIE_UNSERIALIZED); - node->pn_popmap = 0; - } - - /* - * From the highest-order bit where the indexes differ, - * compute the highest level in the trie where they differ. Then, - * compute the least index of this subtrie. - */ - KASSERT(index != newind, ("%s: passing the same key value %jx", - __func__, (uintmax_t)index)); - _Static_assert(sizeof(long long) >= sizeof(uint64_t), - "uint64 too wide"); - _Static_assert(sizeof(uint64_t) * NBBY <= - (1 << (sizeof(node->pn_clev) * NBBY)), "pn_clev too narrow"); - node->pn_clev = rounddown(flsll(index ^ newind) - 1, PCTRIE_WIDTH); - node->pn_owner = PCTRIE_COUNT; - node->pn_owner = index & -(node->pn_owner << node->pn_clev); - return (node); -} - -/* - * Free radix node. + * Check radix node. */ static __inline void -pctrie_node_put(struct pctrie *ptree, struct pctrie_node *node, - pctrie_free_t freefn) +pctrie_node_put(struct pctrie_node *node) { #ifdef INVARIANTS int slot; @@ -182,7 +135,6 @@ pctrie_node_put(struct pctrie *ptree, struct pctrie_node *node, ("pctrie_node_put: node %p has a child", node)); } #endif - freefn(ptree, node); } /* @@ -285,33 +237,6 @@ pctrie_addnode(struct pctrie_node *node, uint64_t index, ("%s: bad popmap slot %d in node %p", __func__, slot, node)); } -/* - * Internal helper for pctrie_reclaim_allnodes(). - * This function is recursive. - */ -static void -pctrie_reclaim_allnodes_int(struct pctrie *ptree, struct pctrie_node *node, - pctrie_free_t freefn) -{ - struct pctrie_node *child; - int slot; - - while (node->pn_popmap != 0) { - slot = ffs(node->pn_popmap) - 1; - child = pctrie_node_load(&node->pn_child[slot], NULL, - PCTRIE_UNSERIALIZED); - KASSERT(child != PCTRIE_NULL, - ("%s: bad popmap slot %d in node %p", - __func__, slot, node)); - if (!pctrie_isleaf(child)) - pctrie_reclaim_allnodes_int(ptree, child, freefn); - node->pn_popmap ^= 1 << slot; - pctrie_node_store(&node->pn_child[slot], PCTRIE_NULL, - PCTRIE_UNSERIALIZED); - } - pctrie_node_put(ptree, node, freefn); -} - /* * pctrie node zone initializer. */ @@ -336,19 +261,18 @@ pctrie_node_size(void) } /* - * Inserts the key-value pair into the trie. - * Panics if the key already exists. + * Looks for where to insert the key-value pair into the trie. Completes the + * insertion if it replaces a null leaf; otherwise, returns insertion location + * to caller. Panics if the key already exists. */ -int -pctrie_insert(struct pctrie *ptree, uint64_t *val, pctrie_alloc_t allocfn) +void * +pctrie_insert_lookup(struct pctrie *ptree, uint64_t *val) { - uint64_t index, newind; - struct pctrie_node *leaf, *node, *parent; - smr_pctnode_t *parentp; + uint64_t index; + struct pctrie_node *node, *parent; int slot; index = *val; - leaf = pctrie_toleaf(val); /* * The owner of record for root is not really important because it @@ -360,43 +284,82 @@ pctrie_insert(struct pctrie *ptree, uint64_t *val, pctrie_alloc_t allocfn) if (pctrie_isleaf(node)) { if (node == PCTRIE_NULL) { if (parent == NULL) - ptree->pt_root = leaf; + ptree->pt_root = pctrie_toleaf(val); else - pctrie_addnode(parent, index, leaf, - PCTRIE_LOCKED); - return (0); + pctrie_addnode(parent, index, + pctrie_toleaf(val), PCTRIE_LOCKED); + return (NULL); } - newind = *pctrie_toval(node); - if (newind == index) + if (*pctrie_toval(node) == index) panic("%s: key %jx is already present", __func__, (uintmax_t)index); break; } - if (pctrie_keybarr(node, index, &slot)) { - newind = node->pn_owner; + if (pctrie_keybarr(node, index, &slot)) break; - } parent = node; node = pctrie_node_load(&node->pn_child[slot], NULL, PCTRIE_LOCKED); } /* - * A new node is needed because the right insertion level is reached. - * Setup the new intermediate node and add the 2 children: the - * new object and the older edge or object. + * 'node' must be replaced in the tree with a new branch node, with + * children 'node' and 'val'. Return the place that points to 'node' + * now, and will point to to the new branching node later. */ - parentp = (parent != NULL) ? &parent->pn_child[slot]: - (smr_pctnode_t *)&ptree->pt_root; - parent = pctrie_node_get(ptree, allocfn, index, newind); - if (parent == NULL) - return (ENOMEM); + return ((parent != NULL) ? &parent->pn_child[slot]: + (smr_pctnode_t *)&ptree->pt_root); +} + +/* + * Uses new node to insert key-value pair into the trie at given location. + */ +void +pctrie_insert_node(void *parentp, struct pctrie_node *parent, uint64_t *val) +{ + struct pctrie_node *node; + uint64_t index, newind; + + /* + * Clear the last child pointer of the newly allocated parent. We want + * to clear it after the final section has exited so lookup can not + * return false negatives. It is done here because it will be + * cache-cold in the dtor callback. + */ + if (parent->pn_popmap != 0) { + pctrie_node_store(&parent->pn_child[ffs(parent->pn_popmap) - 1], + PCTRIE_NULL, PCTRIE_UNSERIALIZED); + parent->pn_popmap = 0; + } + + /* + * Recover the values of the two children of the new parent node. If + * 'node' is not a leaf, this stores into 'newind' the 'owner' field, + * which must be first in the node. + */ + index = *val; + node = pctrie_node_load(parentp, NULL, PCTRIE_UNSERIALIZED); + newind = *pctrie_toval(node); + + /* + * From the highest-order bit where the indexes differ, + * compute the highest level in the trie where they differ. Then, + * compute the least index of this subtrie. + */ + _Static_assert(sizeof(long long) >= sizeof(uint64_t), + "uint64 too wide"); + _Static_assert(sizeof(uint64_t) * NBBY <= + (1 << (sizeof(parent->pn_clev) * NBBY)), "pn_clev too narrow"); + parent->pn_clev = rounddown(flsll(index ^ newind) - 1, PCTRIE_WIDTH); + parent->pn_owner = PCTRIE_COUNT; + parent->pn_owner = index & -(parent->pn_owner << parent->pn_clev); + + /* These writes are not yet visible due to ordering. */ - pctrie_addnode(parent, index, leaf, PCTRIE_UNSERIALIZED); + pctrie_addnode(parent, index, pctrie_toleaf(val), PCTRIE_UNSERIALIZED); pctrie_addnode(parent, newind, node, PCTRIE_UNSERIALIZED); /* Synchronize to make the above visible. */ pctrie_node_store(parentp, parent, PCTRIE_LOCKED); - return (0); } /* @@ -598,17 +561,18 @@ pctrie_lookup_le(struct pctrie *ptree, uint64_t index) } /* - * Remove the specified index from the tree. - * Panics if the key is not present. + * Remove the specified index from the tree, and return the value stored at + * that index. If the index is not present, return NULL. */ -void -pctrie_remove(struct pctrie *ptree, uint64_t index, pctrie_free_t freefn) +uint64_t * +pctrie_remove_lookup(struct pctrie *ptree, uint64_t index, + struct pctrie_node **freenode) { struct pctrie_node *child, *node, *parent; uint64_t *m; int slot; - node = NULL; + *freenode = node = NULL; child = pctrie_root_load(ptree, NULL, PCTRIE_LOCKED); for (;;) { if (pctrie_isleaf(child)) @@ -620,10 +584,10 @@ pctrie_remove(struct pctrie *ptree, uint64_t index, pctrie_free_t freefn) PCTRIE_LOCKED); } if ((m = pctrie_toval(child)) == NULL || *m != index) - panic("%s: key not found", __func__); + return (NULL); if (node == NULL) { pctrie_root_store(ptree, PCTRIE_NULL, PCTRIE_LOCKED); - return; + return (m); } KASSERT((node->pn_popmap & (1 << slot)) != 0, ("%s: bad popmap slot %d in node %p", @@ -631,7 +595,7 @@ pctrie_remove(struct pctrie *ptree, uint64_t index, pctrie_free_t freefn) node->pn_popmap ^= 1 << slot; pctrie_node_store(&node->pn_child[slot], PCTRIE_NULL, PCTRIE_LOCKED); if (!powerof2(node->pn_popmap)) - return; + return (m); KASSERT(node->pn_popmap != 0, ("%s: bad popmap all zeroes", __func__)); slot = ffs(node->pn_popmap) - 1; child = pctrie_node_load(&node->pn_child[slot], NULL, PCTRIE_LOCKED); @@ -651,25 +615,115 @@ pctrie_remove(struct pctrie *ptree, uint64_t index, pctrie_free_t freefn) * The child is still valid and we can not zero the * pointer until all SMR references are gone. */ - pctrie_node_put(ptree, node, freefn); + pctrie_node_put(node); + *freenode = node; + return (m); } /* - * Remove and free all the nodes from the tree. - * This function is recursive but there is a tight control on it as the - * maximum depth of the tree is fixed. + * Prune all the leaves of 'node' before its first non-leaf child, make child + * zero of 'node' point up to 'parent', make 'node' into 'parent' and that + * non-leaf child into 'node'. Repeat until a node has been stripped of all + * children, and mark it for freeing, returning its parent. */ -void -pctrie_reclaim_allnodes(struct pctrie *ptree, pctrie_free_t freefn) +static struct pctrie_node * +pctrie_reclaim_prune(struct pctrie_node **pnode, + struct pctrie_node *parent) +{ + struct pctrie_node *child, *node; + int slot; + + node = *pnode; + while (node->pn_popmap != 0) { + slot = ffs(node->pn_popmap) - 1; + node->pn_popmap ^= 1 << slot; + child = pctrie_node_load(&node->pn_child[slot], NULL, + PCTRIE_UNSERIALIZED); + pctrie_node_store(&node->pn_child[slot], PCTRIE_NULL, + PCTRIE_UNSERIALIZED); + if (pctrie_isleaf(child)) + continue; + /* Climb one level down the trie. */ + pctrie_node_store(&node->pn_child[0], parent, + PCTRIE_UNSERIALIZED); + parent = node; + node = child; + } + *pnode = parent; + return (node); +} + +/* + * Recover the node parent from its first child and continue pruning. + */ +struct pctrie_node * +pctrie_reclaim_resume(struct pctrie_node **pnode) +{ + struct pctrie_node *parent, *node; + + node = *pnode; + if (node == NULL) + return (NULL); + /* Climb one level up the trie. */ + parent = pctrie_node_load(&node->pn_child[0], NULL, + PCTRIE_UNSERIALIZED); + pctrie_node_store(&node->pn_child[0], PCTRIE_NULL, PCTRIE_UNSERIALIZED); + return (pctrie_reclaim_prune(pnode, parent)); +} + +/* + * Find the trie root, and start pruning with a NULL parent. + */ +struct pctrie_node * +pctrie_reclaim_begin(struct pctrie_node **pnode, + struct pctrie *ptree) { - struct pctrie_node *root; + struct pctrie_node *node; - root = pctrie_root_load(ptree, NULL, PCTRIE_LOCKED); - if (root == PCTRIE_NULL) - return; + node = pctrie_root_load(ptree, NULL, PCTRIE_UNSERIALIZED); pctrie_root_store(ptree, PCTRIE_NULL, PCTRIE_UNSERIALIZED); - if (!pctrie_isleaf(root)) - pctrie_reclaim_allnodes_int(ptree, root, freefn); + if (pctrie_isleaf(node)) + return (NULL); + *pnode = node; + return (pctrie_reclaim_prune(pnode, NULL)); +} + +/* + * Replace an existing value in the trie with another one. + * Panics if there is not an old value in the trie at the new value's index. + */ +uint64_t * +pctrie_replace(struct pctrie *ptree, uint64_t *newval) +{ + struct pctrie_node *leaf, *parent, *node; + uint64_t *m; + uint64_t index; + int slot; + + leaf = pctrie_toleaf(newval); + index = *newval; + node = pctrie_root_load(ptree, NULL, PCTRIE_LOCKED); + parent = NULL; + for (;;) { + if (pctrie_isleaf(node)) { + if ((m = pctrie_toval(node)) != NULL && *m == index) { + if (parent == NULL) + ptree->pt_root = leaf; + else + pctrie_node_store( + &parent->pn_child[slot], leaf, + PCTRIE_LOCKED); + return (m); + } + break; + } + if (pctrie_keybarr(node, index, &slot)) + break; + parent = node; + node = pctrie_node_load(&node->pn_child[slot], NULL, + PCTRIE_LOCKED); + } + panic("%s: original replacing value not found", __func__); } #ifdef DDB diff --git a/sys/sys/pctrie.h b/sys/sys/pctrie.h index 158600e9a34e..eec74610587a 100644 --- a/sys/sys/pctrie.h +++ b/sys/sys/pctrie.h @@ -76,19 +76,28 @@ name##_PCTRIE_PTR2VAL(struct type *ptr) \ static __inline int \ name##_PCTRIE_INSERT(struct pctrie *ptree, struct type *ptr) \ { \ - \ - return pctrie_insert(ptree, name##_PCTRIE_PTR2VAL(ptr), \ - allocfn); \ + struct pctrie_node *parent; \ + void *parentp; \ + uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \ + \ + parentp = pctrie_insert_lookup(ptree, val); \ + if (parentp == NULL) \ + return (0); \ + parent = allocfn(ptree); \ + if (parent == NULL) \ + return (ENOMEM); \ + pctrie_insert_node(parentp, parent, val); \ + return (0); \ } \ \ -static __inline __unused struct type * \ +static __inline __unused struct type * \ name##_PCTRIE_LOOKUP(struct pctrie *ptree, uint64_t key) \ { \ \ return name##_PCTRIE_VAL2PTR(pctrie_lookup(ptree, key)); \ } \ \ -static __inline __unused struct type * \ +static __inline __unused struct type * \ name##_PCTRIE_LOOKUP_LE(struct pctrie *ptree, uint64_t key) \ { \ \ @@ -105,31 +114,61 @@ name##_PCTRIE_LOOKUP_GE(struct pctrie *ptree, uint64_t key) \ static __inline __unused void \ name##_PCTRIE_RECLAIM(struct pctrie *ptree) \ { \ + struct pctrie_node *freenode, *node; \ \ - pctrie_reclaim_allnodes(ptree, freefn); \ + for (freenode = pctrie_reclaim_begin(&node, ptree); \ + freenode != NULL; \ + freenode = pctrie_reclaim_resume(&node)) \ + freefn(ptree, freenode); \ } \ \ -static __inline void \ +static __inline __unused struct type * \ +name##_PCTRIE_REPLACE(struct pctrie *ptree, struct type *ptr) \ +{ \ + \ + return name##_PCTRIE_VAL2PTR( \ + pctrie_replace(ptree, name##_PCTRIE_PTR2VAL(ptr))); \ +} \ + \ +static __inline __unused void \ name##_PCTRIE_REMOVE(struct pctrie *ptree, uint64_t key) \ { \ + uint64_t *val; \ + struct pctrie_node *freenode; \ \ - pctrie_remove(ptree, key, freefn); \ + val = pctrie_remove_lookup(ptree, key, &freenode); \ + if (val == NULL) \ + panic("%s: key not found", __func__); \ + if (freenode != NULL) \ + freefn(ptree, freenode); \ +} \ + \ +static __inline __unused struct type * \ +name##_PCTRIE_REMOVE_LOOKUP(struct pctrie *ptree, uint64_t key) \ +{ \ + uint64_t *val; \ + struct pctrie_node *freenode; \ + \ + val = pctrie_remove_lookup(ptree, key, &freenode); \ + if (freenode != NULL) \ + freefn(ptree, freenode); \ + return name##_PCTRIE_VAL2PTR(val); \ } -typedef void *(*pctrie_alloc_t)(struct pctrie *ptree); -typedef void (*pctrie_free_t)(struct pctrie *ptree, void *node); - -int pctrie_insert(struct pctrie *ptree, uint64_t *val, - pctrie_alloc_t allocfn); +void *pctrie_insert_lookup(struct pctrie *ptree, uint64_t *val); +void pctrie_insert_node(void *parentp, + struct pctrie_node *parent, uint64_t *val); uint64_t *pctrie_lookup(struct pctrie *ptree, uint64_t key); uint64_t *pctrie_lookup_ge(struct pctrie *ptree, uint64_t key); uint64_t *pctrie_lookup_le(struct pctrie *ptree, uint64_t key); uint64_t *pctrie_lookup_unlocked(struct pctrie *ptree, uint64_t key, smr_t smr); -void pctrie_reclaim_allnodes(struct pctrie *ptree, - pctrie_free_t freefn); -void pctrie_remove(struct pctrie *ptree, uint64_t key, - pctrie_free_t freefn); +struct pctrie_node *pctrie_reclaim_begin(struct pctrie_node **pnode, + struct pctrie *ptree); +struct pctrie_node *pctrie_reclaim_resume(struct pctrie_node **pnode); +uint64_t *pctrie_remove_lookup(struct pctrie *ptree, uint64_t index, + struct pctrie_node **killnode); +uint64_t *pctrie_replace(struct pctrie *ptree, uint64_t *newval); size_t pctrie_node_size(void); int pctrie_zone_init(void *mem, int size, int flags); @@ -153,6 +192,11 @@ pctrie_is_empty(struct pctrie *ptree) return (ptree->pt_root == PCTRIE_NULL); } +/* Set of all flag bits stored in node pointers. */ +#define PCTRIE_FLAGS (PCTRIE_ISLEAF) +/* Minimum align parameter for uma_zcreate. */ +#define PCTRIE_PAD PCTRIE_FLAGS + /* * These widths should allow the pointers to a node's children to fit within * a single cache line. The extra levels from a narrow width should not be From nobody Mon Aug 21 17:36: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 4RV05Y45MXz4r5Zt for ; Mon, 21 Aug 2023 17:36: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 4RV05Y0NV6z3X6Y; Mon, 21 Aug 2023 17:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RdmXcuPv5QwF8/rX3XLV1F7KysBvJk5WC6GxWE/5mt8=; b=rL4895SQAfTomcFmsSYqDdQ5E9Nf5ZB29BosTDCCDf/qB1tOmHHP1DJQVjND/xCfmTRap9 tGqoYvL/uhyuwfplAtehB6fx9qAxMuRc0rQm2st+Zo3pU8AePIYBDbBRpwjLUlcrXI3n4P YTTJlVI2slwhN/eboKoBwA5iGhZdgBA/Qcve86J5Gl3O2bTCRNLE6fRRJwEn7b/vF7Dpmx TZPH37G9nfSgphfQXh8L06+BME7/NR+SiKYqMONM7Sbz3L909Zs2yhGF39Ml+AgYKJNUBZ YU9xYmu1vUaeArlQCqdGKnMBgg8PSjcoJEFBDFslJmSHZoYm3GbcJVJcX1Uywg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RdmXcuPv5QwF8/rX3XLV1F7KysBvJk5WC6GxWE/5mt8=; b=QVDmTsbTFjI294TldMJS5MFFyljZOd4vYeZwck8Jw3h5XA/XNGrvdqA4rS/oYstSB8JJRB 4roPj3k1XghuCNUSMMqasZf4Ay+tPaf3LsF0LzAQYYkAKE8JqFSNyTOr1QntAR+bWu55ym WJh9UXwAynyMf2FAFJb84cL/IXNkkZttE48brMBjRe0m9G8epEFG9/EO0PlviODV/wJgGX uNSX8x/szyaJwkaidT7gcyaIaBvAMr2prRQtW1osn+Q4RCPwdRbL7M99ZWTusCd538GDFd Gyx3uXu8iOxpUAb7AGuU/OJVL0MQJdirmRy+1Rvl63mcfSoBlc3LTnw2n5M8JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692639393; a=rsa-sha256; cv=none; b=cM6UuAhNvaPrCbItk2GDMHloQ1VApdSY7S6BkNUeQoZ+P7xaWiJf19PMq+kWzUYCSOVoGC ByOdX2kpqHstd7fzlS9LhZtIptX0nlB6hDMM7RnJ9Wez89OzAqm48SVN2PpEU465V+rlaN cJT/GJ+2zj2z/goY0XLXTw6EdF7EqQrnOTOqcLi1rdUKOQgWY4tZ9tS6pxyEuUhnZBqdQw V022ffhTGDrClsaU93nib8cuGgfOgoZF5n6LP2TUPGMrf31Z6Xd6kP7/qiqNO6GsCmJrux M7Q7uQkryeV0aAZLFtjWc2rO4Gh8hOmdm37p4RHexhV3VEW9k7emoaoWkcY6Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV05X6bM0zVcJ; Mon, 21 Aug 2023 17:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHaW5V044970; Mon, 21 Aug 2023 17:36:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHaWaR044969; Mon, 21 Aug 2023 17:36:32 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:36:32 GMT Message-Id: <202308211736.37LHaWaR044969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e78e30e713e1 - Create tag vendor/tzcode/tzcode2023b List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/tags/vendor/tzcode/tzcode2023b X-Git-Reftype: annotated tag X-Git-Commit: e78e30e713e142897d97bb546c384453324c8fee Auto-Submitted: auto-generated The annotated tag vendor/tzcode/tzcode2023b has been created by des: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/tzcode/tzcode2023b tag vendor/tzcode/tzcode2023b Tagger: Dag-Erling Smørgrav TaggerDate: 2023-04-19 10:44:12 +0000 Release 2023b - 2023-03-23 19:50:38 -0700 commit 65596a0dd002bdab97a38577fc9be147f9311e2d Author: Dag-Erling Smørgrav AuthorDate: 2023-04-19 10:44:08 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-04-19 10:44:08 +0000 Import tzcode 2023b From nobody Mon Aug 21 17:36: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 4RV05Y48G9z4r5d2 for ; Mon, 21 Aug 2023 17:36: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 4RV05Y0wNLz3XCS; Mon, 21 Aug 2023 17:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sada9fCnbsGHVkwH0He1C77LCGi497r0vLBSv5cOzqo=; b=Y9DYnZf862u+C4+vV5vMlX9LhJiibZMiRheEE+O++VfOMA07Cz4PevknQ3HxQTaCEMLt4o sPd8oAbG5cZMXcokf/Ho8BO3JCcsPKtrWkrJEPhOhzOMgAMlwehKRbmTQvVmrqMZ/PQj35 dbFNKog+u6A4JqoSl+Fsro3zejFtObikebQPKU2rwmI55KTYVLdpYV45zqYD9YhaHoQUJo yJ0ITVtJrgxQ7/HCSQc1nN/P4V561FqgFf8bGS1KZVKcpEz4E94LjoyYAUsy78HhXgUMeC HhooYPBA90mSBQo+PCbj8BDHG8rufD1lZAoV3h2ZSERNQvtiT/vv+428Y377OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sada9fCnbsGHVkwH0He1C77LCGi497r0vLBSv5cOzqo=; b=QcN/NbFug3YDJvlZHVLpom4FruYCE+eM+fHgU0WdSyxD2cgL7kptn/W/LLytRuUtoRDB1E nBNlVe37PXkl5N34/1iNXKs/ok3ElqCKhE53TPLLWPrtnI7xJ24FPrZQgUTTsmWmKK9amL 964XDgQcnl2vWmmHDoSMLo07+iFlHRZ3RAJaq8ykPpIW3CIVUiUh9hE/ho5gNpPugMtJLV DBkLEFGUPn3MtaeXn20RB0wuxk4/AIVIMWz4wm1GamjFPH7j14rS3pWwL1PvZ0DgBRlDcc GCJ9yCg3dBzmYadaxSFNx/AfpR2wOjmZIy1ERHubVdkN4oUqdyoJAQIGErNbxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692639393; a=rsa-sha256; cv=none; b=e1xo+Is3DrV1QP9wnsLiQSCD7EpA5wB8Zh4wPn9DAhUH8ShRFphfbob+RvyOAwDoJlSVP5 cWM0rLNCQH4DLqtSoJ4ZYpHzmYfbyumlPl677RoKLD7Zzu8F3C4kYqbELTjb7rlibQpalj 3NN4pEi6RQTjKOXB9bPEKazRNdlPvJQ8FIRLGKXBPVc8FaawsFwZQDp6OB3erCg5pDHHCh x2+TvysNltq4ejfDSBshdnHxSj3vEnvtVXMK4Hl1RLhav+IoJTDkviUaYlspWr//d5219u 6s/fFk896PdMeGBjOA3l6DbIkuxHoLsQ1BJKJ3HGBjMN6a74219HEX5/SR2EKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV05X74q1zVcK; Mon, 21 Aug 2023 17:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHaW1h045001; Mon, 21 Aug 2023 17:36:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHaWbI045000; Mon, 21 Aug 2023 17:36:32 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:36:32 GMT Message-Id: <202308211736.37LHaWbI045000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: ebe62adb0b23 - Create tag vendor/tzcode/tzcode2023c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/tags/vendor/tzcode/tzcode2023c X-Git-Reftype: annotated tag X-Git-Commit: ebe62adb0b23c8d5e2a4c9fc5abbe05a33b33e0d Auto-Submitted: auto-generated The annotated tag vendor/tzcode/tzcode2023c has been created by des: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/tzcode/tzcode2023c tag vendor/tzcode/tzcode2023c Tagger: Dag-Erling Smørgrav TaggerDate: 2023-04-19 10:45:14 +0000 Release 2023c - 2023-03-28 12:42:14 -0700 commit d5228e8957c2b6a9cbb2a73947640ce3c70097e8 Author: Dag-Erling Smørgrav AuthorDate: 2023-04-19 10:45:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-04-19 10:45:11 +0000 Import tzcode 2023c From nobody Mon Aug 21 17:36: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 4RV05Y45KJz4r5Vs for ; Mon, 21 Aug 2023 17:36: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 4RV05X6vJWz3XJ6; Mon, 21 Aug 2023 17:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jyV2sW4EBnRNPqDPgukGJ30zrB/JDZX+WDpIy/LqD78=; b=s4a/FrW6lJIPFTi6Sd4jp/52g+Bw+T1ws0ZtYQghEJaFiypgoajNedPFnD6FxC2jZKQN6a 33dBwTZ9ZKNPeC7r+wENidxnopGRzHq4NaI4ieKLzROsw79oYXPtyVb8KzO/wLH4MkQ/YX pmquDgQiSgKaYHhFTVS+3nAvEZpkvf+nuEdR7cuuh/0Km2sOqth9+toQ7QnNBLKhyiLgnH 8KjpcVTzPYa8rJVZD1wpI8GWTUurIjOM7ZHBiQXMklDxup2Yc8YGD9yQN/ZRvqV81zfDsN qP3fcIkrMJB14E+fmO8u7TABMnqNHACvKOApJNffPzpkgkBIBl2p1kgeK1Bh4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jyV2sW4EBnRNPqDPgukGJ30zrB/JDZX+WDpIy/LqD78=; b=m41jucjzynLTMC9mKgdZBkwLKzi+y5zBVU9PcgyJlwlhEKDNKOJb8jF1Hxk9VJNxoU7ZOC BVZYmNTyM2c7qTt45b2STtfDJmWUQQd8+DpOFl2ay0f8U3UCtSOAx2HCPGgVzGK7mtyNto RkgY6baGt+tIxNyhasxcm85gHPMIciD9s8bgjIXJHOLRrV1nqSRL5cn2ozguEGqzBL35e5 G7QZLkKHKDalJ92EPysgSqaCdsO0t5JOM594zoYfv7SLhHswkT+6T6aFZyxSGEs3QQfaDX dhPa+sCmSpAn1yEyc+faA9OxNMW7zVf/BWFtvz6096CejZRjQAxy9bIb34m75Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692639393; a=rsa-sha256; cv=none; b=EJAXElJ3sSqrw4q5ygk/kGutRUaDqwiyc/FY5SjyJpsEZfS9SqPqXO+4GvegujGxy5tum4 xhyKbU2+z3q+5EbDUYrPDbAsbuYU/eNN8xSWekeiktbJN/YHagpotUYp1JKACRpTZasqdr Jnw7vbmRcZH3vojWd/Th+D1Dd/diNADNhbgUoSRRKZ6hC10XchrOhHnkUyA+MaLhzMhhBI muTaKFuVkb+wJqTRwDjJQzYl3No3g1wPoJ0twbJb7iQ4bdR5vUqcTAGj0XRWFUZnT1IBc0 dfv0Wo6t/6cRR6yEpgfjHVadq+PKCTrhmQCJYDEAWoOa/iw6ZJ9/3wOZd1l5hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV05X5dVTzVpk; Mon, 21 Aug 2023 17:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHaWN9044908; Mon, 21 Aug 2023 17:36:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHaWEx044907; Mon, 21 Aug 2023 17:36:32 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:36:32 GMT Message-Id: <202308211736.37LHaWEx044907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 2b7d40ea0c8e - vendor/unifdef - vendor branch created List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/vendor/unifdef X-Git-Reftype: branch X-Git-Commit: 2b7d40ea0c8e96b1322488f9154c89a7a7dd55e7 X-Git-Oldrev: 0000000000000000000000000000000000000000 X-Git-Newrev: 2b7d40ea0c8e96b1322488f9154c89a7a7dd55e7 Auto-Submitted: auto-generated The branch vendor/unifdef has been created by des: URL: https://cgit.FreeBSD.org/src/log/?id=2b7d40ea0c8e 9b3517a49d4e Import unifdef 2.11 2b7d40ea0c8e Import unifdef 2.12 From nobody Mon Aug 21 17:36: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 4RV05Y48Gtz4r5Pp for ; Mon, 21 Aug 2023 17:36: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 4RV05Y1PTfz3XKv; Mon, 21 Aug 2023 17:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GzdEWhN2jHsnWhzQokuZ/2ntK4uaSocqPJ0z32muYNQ=; b=nX9/iag0jOAIXuEHhqaFOIhpOX6KU9yKN4w7dlkRuAVV89XrRDOGMUXvvEyloO4nUKIaod do1LIdYGz5lzwSSClQNhsj55jYL4qt2ttLLkZmTwLFanlkSyIIrzfrMm9fW2OeYBLTA/jF 5l0Nn9grvaYuxOgqS9E65elGE8SPDdYoXX+PEDOtHkKCMMefOOyxiyuua80nP21zIYj4kB m4JRbu0AA/mv/99Acok7JZppSwO0cwAM9ib8P8obhL61i5PUBBCxqjUBx+2GWpajOVk0LP q9F5Yc1beBtaOWFIkpB33tDyRpW3vGZqQ/CahsI/T/YpsONb7uGYKBuoXUg4hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GzdEWhN2jHsnWhzQokuZ/2ntK4uaSocqPJ0z32muYNQ=; b=Pk69KmFHKYra2TNHtUVv+3t8JZ7q98G+swZd8ANNNV89n/jfARIUCA5WtVfFWrLk1b+biJ NEWKM2BSq4t6x6tieOncETa1mVr1u9yt88P4sOp1ER5kUl0J2GrLUgShOJie6zit9JD0/0 7QaDltqu0tP4VdrBqtCndtWwMCRcrCUjmsABgmDNG4UVNc/wL05Z9m6iW8ZF7QxcMYUbwN unJQNakigRIwq1yTyKmx/hN2570WS5+0aSQjfZ8XY6NitEbsCwA0UEgR+PX38KjuZ4HxcN Fq0NmCVDgXcty7VgtWOdbzum14hNN4NKxxY9vU3kigjPbZfpL1d6NIgbVu4yGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692639393; a=rsa-sha256; cv=none; b=sC9B9MrK6UZNcuqtkh33Ypk0mZmSnQuyBL1maZNnQDaH+lMvZZKgP0HFeMwKz5Gg58jLLf ZktjWoI9zI0Sq0yju8qri63dYGE+KrxuVwpDT9IZ/0NWgR8WX889uHtoCx5XSu4Mg+sqEL TQPNebKwpfCezXLCxSXNgcu4qO6QKv7XGS5hJyAxRIRXYfL6kyBrTOQzjpPE3mx9f/s7h1 bmIBr6UBiTxFYUcOG6u7UvMCeydDY7w8J0qydW1bNB9WrEWt+6NDRBaMnofQdVZXb8uiAN l/9ecaL9h90Wwrn/PzwXh7mRb0tqZTxw3A03JSS00LDO4UpPmGDq6FFlKrXL+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV05Y0SBHzVYy; Mon, 21 Aug 2023 17:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHaWFk045032; Mon, 21 Aug 2023 17:36:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHaWJU045031; Mon, 21 Aug 2023 17:36:32 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:36:32 GMT Message-Id: <202308211736.37LHaWJU045031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 2edc85fc9f6e - Create tag vendor/unifdef/2.11 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/tags/vendor/unifdef/2.11 X-Git-Reftype: annotated tag X-Git-Commit: 2edc85fc9f6e80bf8508f6f378b642e0a5e318e3 Auto-Submitted: auto-generated The annotated tag vendor/unifdef/2.11 has been created by des: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/unifdef/2.11 tag vendor/unifdef/2.11 Tagger: Dag-Erling Smørgrav TaggerDate: 2023-08-21 17:35:18 +0000 unifdef 2.11 commit 9b3517a49d4e15b97a68bf9e9d68ddda104bf79d Author: Dag-Erling Smørgrav AuthorDate: 2023-08-21 17:33:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-21 17:33:26 +0000 Import unifdef 2.11 From nobody Mon Aug 21 17:36: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 4RV05Y4Xlzz4r5Vv for ; Mon, 21 Aug 2023 17:36: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 4RV05X72lwz3XKt; Mon, 21 Aug 2023 17:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VH+9+1VQJ97fkRReuasBjj1ynwy6V3d7Ht69JPInTgg=; b=mTCL8Zpa7ZJ8i3a+ztvb/uZ3sigxdQeqC47dHmUvaN/8HoANtFrDsF2BS8j7frRCZoZG3g AEVyQeKvhGe5zzwUwzJOys9H8xIzShHrzojP/azdwnodsUHvPSUCfp/G8eO9oCGKDanP4f WKOlZxPUdCiLPWVlaG+UE9v4vrstfI9Cv6SaG2uQ3VlAroM7CKQH66HXkLxzSicJ35QgS9 Ig2ejFFq4dBosHfewlZEVPtwctNuK3l/hGzAwvwBB3zM1aPjWjgvFZw+gjVaREmengD2/f 4IvtkVuSdlaQ8RG3jjHQQsH4TABtzhCECdyyyKPPsucw6M23FU8cHU3lSb/gJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VH+9+1VQJ97fkRReuasBjj1ynwy6V3d7Ht69JPInTgg=; b=fbHr+LxBS/uqmdhiqUyT3WkI9ZkYb9SdCr5GVP0Z5NgGE3Y52c+TAGEKTrwvfgpigxTmRF QLC4Wz7CsM5qfRzDIZ6jEvZ4mHPdiRSgaexoG1r3/TI2/wl4KisvzTwEbsE+kVUvb2mSrY iCYpDY9y5DcIUSo3TdNUdhzz4lgzWaZD2apgXHrE7KHviBjkBx7n5boRu7IxNU2uCLGka8 gDgyoQTUwyxM1EKWs59Bx2MPbsrSHx5Vg/AFLU9uOUoOC+hZFIJvdwx/u7EWODtcj+dEE5 zAyeKEv5/6wj+Sgx6awK0Itu7UsG2pZ/9/1cS+TxQegi/L75JxVglntt55zV0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692639393; a=rsa-sha256; cv=none; b=DrXAithQjvDfYyyVClvVqpITy3TJzWkUcCe4mhedmMFR2WcoERzKyH3EqAOa6/1vYVFtLn q/8vfJVGJyeF71+SFRJLgSaLCNn42n4w/v5RS3+lKGTp39skpENl5ivT9tVQpS33bfWTot CYFKI0doT2U+PSBRO/khG4i8zZcGhKRQLn61oXZcEU54VHPQjQQSzAG46UaoNJkCz3dFEs ffMlFzPB+Y8I/gB4OlFQoZ1gRec618oFfGMPQatUOUFQiQmwR3lGGdOsTnJ1YLM+5nWQqi CD9w8GE2KfxbXxaoICnOaz9JLsQfc6GUMZ7Rdms4ZKznLc6xxlnoMcD/7AtZDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV05X66CyzVXG; Mon, 21 Aug 2023 17:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHaWbC044939; Mon, 21 Aug 2023 17:36:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHaWBI044938; Mon, 21 Aug 2023 17:36:32 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:36:32 GMT Message-Id: <202308211736.37LHaWBI044938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 058d432207c4 - Create tag vendor/tzcode/tzcode2023a List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/tags/vendor/tzcode/tzcode2023a X-Git-Reftype: annotated tag X-Git-Commit: 058d432207c470c0576d00aae06c1de4b3fecb52 Auto-Submitted: auto-generated The annotated tag vendor/tzcode/tzcode2023a has been created by des: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/tzcode/tzcode2023a tag vendor/tzcode/tzcode2023a Tagger: Dag-Erling Smørgrav TaggerDate: 2023-04-19 10:43:25 +0000 Release 2023a - 2023-03-22 12:39:33 -0700 Briefly: Egypt now uses DST again, from April through October. This year Morocco springs forward April 23, not April 30. Palestine delays the start of DST this year. Much of Greenland still uses DST from 2024 on. America/Yellowknife now links to America/Edmonton. tzselect can now use current time to help infer timezone. The code now defaults to C99 or later. Fix use of C23 attributes. commit 48847a88f61e41f0d77755dd58f2df9f04642e1d Author: Dag-Erling Smørgrav AuthorDate: 2023-04-19 10:41:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-04-19 10:41:22 +0000 Import tzcode 2023a From nobody Mon Aug 21 17:36: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 4RV05Y4YpNz4r5Ps for ; Mon, 21 Aug 2023 17:36: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 4RV05Y3Pg3z3X6Z; Mon, 21 Aug 2023 17:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b3X+exFcYdl2u9wQctvhozCy3huE0tzhFbF5h0aqaHk=; b=PLKNz4HCCt5hMnmtKLp8wfvRBH6FGFJk6ePoCN2Y3tqF2XJLgRHXAaaLJ/dyn/RppDSWKz Ty/c7jHfskYmSRNIpzw7phYnQaCnOpIZKEaCThu05Y3HfxH0/JvP16QGVkQ9UeA3rJC5Bz waTl+PT0qAewD/J6U/i4dZG/3WBkiGS5h/igRHlMGPU3qtxphwb+ohxTWBmI6LZm7wO5YP hclbGqzW+EL3wK+v4tlbdeNJWQR+BUZZip3/9B5P/iWEWRMA4BxMW3PMPzWBFUV2fOLPr3 RR4RDsDWMmfOENkdlSgR+B4RUh9nBgDvCw44WPkPmUUa7TfpCGv0OrgwRU7mlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692639393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b3X+exFcYdl2u9wQctvhozCy3huE0tzhFbF5h0aqaHk=; b=svX5IL/hrGBd+3Z8g46ATphFSnE240Jqk275uXOnsqIBqR9dtb1u6ewKdvcSFQT6tfwG/W l0EWzigsMqGGxRYTZJmw9jwUW9bZODLyZsxax7QK7oQqdLPPrkfivPEzEluaDA52WBj/RS vIoUL6dBhz1dSw0sKyZxYyCdNfm1pySjDIwtgpy48H5vnO+0ILbAo1HIFm5G9NROKwaQTw APA5hlv/m2bLk0Qr/ZQ+OL7Hydr6bJx1oQCZYp8ouMLFOTujygLp2W5UOkmZtDZDUCdrCB wsxgsm/8zPe0Cz8u49uzrG53FTGOznAd400fVkGBR8lF7927ADv8c4cp8B0Q6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692639393; a=rsa-sha256; cv=none; b=Cgdbb7WYyRB39BGjo9vM/sbNJFzIZcIFuZX9DsWv2aPaM7DgxoxGSk2AnI2PGhrYPxKuQS X2MIQEHcAr8J43KMcN8N/+6lmVMATlS6hwz89YkxirKbbu/T16uhhKJP4roeTN9M+QBtpO XIQaHZxbcqla5ns2GG0Pqv4EC79YFlpmxgLqLxgdwi7DLG94xfPK5udckqq5LeuRa1gTYX potsyOksOlBmhLIiVtrprH/M2sWFEgmv6D0c1rml4l0v97QDlYKYxXaQprGhPLdbSF4vbO wIUh1zU2WNLD2FNVb8gZtgnoCQZYBmpdzZv1x7e/5RuqEcUcOU8sDG3wMW/ADA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV05Y0kKQzVcL; Mon, 21 Aug 2023 17:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHaXMB045063; Mon, 21 Aug 2023 17:36:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHaXOT045062; Mon, 21 Aug 2023 17:36:33 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:36:33 GMT Message-Id: <202308211736.37LHaXOT045062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: fd5f6422ee06 - Create tag vendor/unifdef/2.12 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/tags/vendor/unifdef/2.12 X-Git-Reftype: annotated tag X-Git-Commit: fd5f6422ee06a42f0bd10684579a748cefc0cadc Auto-Submitted: auto-generated The annotated tag vendor/unifdef/2.12 has been created by des: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/unifdef/2.12 tag vendor/unifdef/2.12 Tagger: Dag-Erling Smørgrav TaggerDate: 2023-08-21 17:35:26 +0000 unifdef 2.12 commit 2b7d40ea0c8e96b1322488f9154c89a7a7dd55e7 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-21 17:33:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-21 17:33:42 +0000 Import unifdef 2.12 From nobody Mon Aug 21 17:53: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 4RV0SZ6CKzz4r6P5 for ; Mon, 21 Aug 2023 17:53: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 4RV0SZ5fbcz3df2; Mon, 21 Aug 2023 17:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692640382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tLRCAEATEboUlYGFu6sX/9Hq2zFjg+SXHt/EPS4MZ4k=; b=ApkeY1anxlMBpwMDzuvkn7FWP04M+/c764O49k4JOhboSsPsaFq1LPcxuGNihx/L4Jz1LB j6nShwYTXxH1VRBAsfwQ0lhfT9OlAKQnYvGumpuEJLPK+CIcNf0yTOBzR2yYRwV3pZ/iBg nfG5AhFfGFfBzidqY5RvYJPPHIYBYbsnnP5DUBc5e9nYRBxvpTzQlXien57lJxE0vD58Ze 1VNCSLLVu2BPqVqAIj0XJnz81hZ1UIA/4vZktf9NiMVhLMffJ/51YldYYc90TRpz7ddQ0u a8gGG9LHefN9jtMfwJrvMsst5/yzfGjvWgERHC+zMCu+fjq7KkNngsIV8WaKvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692640382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tLRCAEATEboUlYGFu6sX/9Hq2zFjg+SXHt/EPS4MZ4k=; b=jkWepYO0hL95X39f9095FDYicvj0DZ5NvAhqW33nnalfGaZx5j2WLmjbOZCayElDwLspC7 /EkFKrIFg9g6+y5n+wHd28gPOGSE3rzhGzf6nAqZcODksS3no3E4IUwV+tUOlTd3yjoTC3 Wl2x9tfS0T1mM4E6inRMBeqZ10fPJmkD0RilvGPyxmuO88d+6w6GH2oO3jMEmmpIAXHSfy rhWeIldLrYuB0IhUAQoQc//+L8JZ+mhiIgCSYOr16fwj7bMId8AF8l5qjlA3aGuwMbsIpa 8TrkjhyVCgSOt/uXuAbcxoHo/YtQbczSS17CmNGbZM5ZWihgMwNFzh7RmKkB/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692640382; a=rsa-sha256; cv=none; b=j5I6lR//9Gzn/2nczB3oSbUNvf4DBfJMeYXOit1N/x3OsY6Yt46QAr8C5sIyXpCDy8z212 ZMHgw7+lg9iM+HukJMk1/ia/ZMEMTg9SZA4mziE0gV1cNXMhHiGTUPCC0CuVO9YPEJfpet B5E/n9UojMtegbQMk+heZRclg1tK373+4Jzsyj+TwpvhR9idLo6KVL2WwD+j3W85iuAMiN ibxqgGLPDQlhHGbFq5kwThNyddBzWzoMpEM16dZUxdr7Ki/hoBhIZCecrKh3n7fOj7kGcf Vd+kVg2k7Za0oJhVfVo59DF4KJDKtU+hdL9B5I0dETB2HBi8wZ886Rlrahuy+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV0SZ4PQLzWSb; Mon, 21 Aug 2023 17:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHr2X4078482; Mon, 21 Aug 2023 17:53:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHr20V078481; Mon, 21 Aug 2023 17:53:02 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:53:02 GMT Message-Id: <202308211753.37LHr20V078481@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 2b7d40ea0c8e..0da44885831d - vendor/unifdef - 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: des X-Git-Repository: src X-Git-Refname: refs/heads/vendor/unifdef X-Git-Reftype: branch X-Git-Commit: 0da44885831dc0a43c4ca6ff04a2430993cc0a80 X-Git-Oldrev: 2b7d40ea0c8e96b1322488f9154c89a7a7dd55e7 X-Git-Newrev: 0da44885831dc0a43c4ca6ff04a2430993cc0a80 Auto-Submitted: auto-generated The branch vendor/unifdef has been updated by des: URL: https://cgit.FreeBSD.org/src/log/?id=2b7d40ea0c8e..0da44885831d 0da44885831d Add missing version.h. From nobody Mon Aug 21 17:53: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 4RV0Sw0sfxz4r6GB; Mon, 21 Aug 2023 17:53: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 4RV0Sv5bwZz3drS; Mon, 21 Aug 2023 17:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692640399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JoVAi9vQBvaZcCwieGLmy/3297sSUP1Njvr/hwx/4Cw=; b=YCbUNZCzXAW0voJlA6eyhVyqTHjMY9mT4luwCDaDBp3YjtmLE1TBnJdG1+hKwc2IpTHaM7 s004YLllq+ej+lzaNQ3vmr2QzNkxxnGY5h0UtG/8QACm9xkVjsquNEodRsxmOF3UrKCR3b WV9es5ny+RCsfCgmoe+h88vLlJw911PGj6bHStLvTsQQhvJfWj+YIVa7OAK2S2abTxUv8B 6uYbfBaKiD8X8aEyoCZe3ZhNc1QvQalRwe5MfFZCHRgDzGRRLZCf06f0+FhIlUQPPOlXYk jSZsMkBU239uHjkTvRcKibmO6b06Dt67BecIdX/xDuB+zq2SEnltGpimm6Os/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692640399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JoVAi9vQBvaZcCwieGLmy/3297sSUP1Njvr/hwx/4Cw=; b=G0o2cPbHv1HLTeERbc+yzZFrg0n1GKVI1EGOAolnwSTwwGImfNRTc0WTI5M/AU6GvUrsMy s+P2D1C9E+XnNcDy3RpGduLBDgd2eJaBcrQr05T29fToqWDCbLryZHJO3zltbhG5Bq4MTo DotpQ5J7zi/zeZo0mEX14zmFvEN+3FZVQ2nhR7APnvOheSwU4Ha9Pdzks7laNr/rORL8KZ 2AOhcQM4J/gYM0m70ZHjvnU54eKFw+mO+mn5JCvGLZvn4U/arbOi3ow1O/5u1wwSXxDoJK 3ZurZ09HDZWSULNNOwg/R6P2JRwvM6YRVtPuoBBn0+miKdHlcpJf7H7I4+Eqdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692640399; a=rsa-sha256; cv=none; b=whVq91i9+v6TiJn50X/ESmtKw0D9Xs4vyuc4kzlLv9Yno2AqN/3pvQdfzaF4DJxbCo2qDa 1C8FZ3oTL4XH0HFAqXAcIFRPw/aeQnnJueGaulmHHrAKo/t2k7o0EjPF4/68af7wOJwYU9 oQLAEwpP2gitsVfF28aJPCH/shTvqKE7qOA02TFrp9lgMFCCL0qQrhy7GYfm4nhax8USOY eJGToJ5JlGr1TX+SHXx2T2MobzeoBQDsB8nci/hDlqFL2JVDmZYjHuIRj5bqAnDnBpfZzo A0qbFCz9Gmd+V+BLPQ32KlmxyVYbrmxgOFHdbLpaCaMhurdykavnuaMyrflG1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV0Sv4gklzWQ6; Mon, 21 Aug 2023 17:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHrJ76078656; Mon, 21 Aug 2023 17:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHrJQa078653; Mon, 21 Aug 2023 17:53:19 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:53:19 GMT Message-Id: <202308211753.37LHrJQa078653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: fb3ef04d2028 - main - Add 'contrib/unifdef/' from commit '0da44885831dc0a43c4ca6ff04a2430993cc0a80' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb3ef04d2028110f06d68b09009f1f2ca0f4128e Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fb3ef04d2028110f06d68b09009f1f2ca0f4128e commit fb3ef04d2028110f06d68b09009f1f2ca0f4128e Merge: 3b7ffacdee49 0da44885831d Author: Dag-Erling Smørgrav AuthorDate: 2023-08-21 17:51:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-21 17:51:03 +0000 Add 'contrib/unifdef/' from commit '0da44885831dc0a43c4ca6ff04a2430993cc0a80' git-subtree-dir: contrib/unifdef git-subtree-mainline: 3b7ffacdee49f90716cba2bcf8af3fc1971ae031 git-subtree-split: 0da44885831dc0a43c4ca6ff04a2430993cc0a80 contrib/unifdef/.gitignore | 7 + contrib/unifdef/.travis.yml | 59 + contrib/unifdef/COPYING | 85 ++ contrib/unifdef/FreeBSD/err.c | 138 ++ contrib/unifdef/FreeBSD/getopt.c | 118 ++ contrib/unifdef/INSTALL | 36 + contrib/unifdef/Makefile | 58 + contrib/unifdef/README | 53 + contrib/unifdef/ifdef-how.pl | 42 + contrib/unifdef/scripts/authors.svn | 15 + contrib/unifdef/scripts/copycheck.sh | 21 + contrib/unifdef/scripts/fixtests.sh | 9 + contrib/unifdef/scripts/git.config | 10 + contrib/unifdef/scripts/gitlog2changelog.sh | 9 + contrib/unifdef/scripts/release.sh | 18 + contrib/unifdef/scripts/reversion.sh | 41 + contrib/unifdef/scripts/runtests.sh | 38 + contrib/unifdef/scripts/svnup.sh | 12 + contrib/unifdef/scripts/upload.sh | 19 + contrib/unifdef/tests/000-init.experr | 0 contrib/unifdef/tests/000-init.expout | 0 contrib/unifdef/tests/000-init.exprc | 1 + contrib/unifdef/tests/000-init.sh | 1 + contrib/unifdef/tests/NetBSD-42628.c | 25 + contrib/unifdef/tests/NetBSD-42628.experr | 0 contrib/unifdef/tests/NetBSD-42628.expout | 6 + contrib/unifdef/tests/NetBSD-42628.exprc | 1 + contrib/unifdef/tests/NetBSD-42628.sh | 1 + contrib/unifdef/tests/NetBSD-47068.c | 2 + contrib/unifdef/tests/NetBSD-47068.experr | 0 contrib/unifdef/tests/NetBSD-47068.expout | 2 + contrib/unifdef/tests/NetBSD-47068.exprc | 1 + contrib/unifdef/tests/NetBSD-47068.sh | 1 + contrib/unifdef/tests/args1.c | 3 + contrib/unifdef/tests/args1.experr | 0 contrib/unifdef/tests/args1.expout | 1 + contrib/unifdef/tests/args1.exprc | 1 + contrib/unifdef/tests/args1.sh | 1 + contrib/unifdef/tests/args2.c | 3 + contrib/unifdef/tests/args2.experr | 0 contrib/unifdef/tests/args2.expout | 3 + contrib/unifdef/tests/args2.exprc | 1 + contrib/unifdef/tests/args2.sh | 1 + contrib/unifdef/tests/blank0d.c | 25 + contrib/unifdef/tests/blank0d.experr | 0 contrib/unifdef/tests/blank0d.expout | 23 + contrib/unifdef/tests/blank0d.exprc | 1 + contrib/unifdef/tests/blank0d.sh | 1 + contrib/unifdef/tests/blank0u.c | 25 + contrib/unifdef/tests/blank0u.experr | 0 contrib/unifdef/tests/blank0u.expout | 22 + contrib/unifdef/tests/blank0u.exprc | 1 + contrib/unifdef/tests/blank0u.sh | 1 + contrib/unifdef/tests/blank1d.c | 25 + contrib/unifdef/tests/blank1d.experr | 0 contrib/unifdef/tests/blank1d.expout | 23 + contrib/unifdef/tests/blank1d.exprc | 1 + contrib/unifdef/tests/blank1d.sh | 1 + contrib/unifdef/tests/blank1u.c | 25 + contrib/unifdef/tests/blank1u.experr | 0 contrib/unifdef/tests/blank1u.expout | 21 + contrib/unifdef/tests/blank1u.exprc | 1 + contrib/unifdef/tests/blank1u.sh | 1 + contrib/unifdef/tests/blank2d.c | 25 + contrib/unifdef/tests/blank2d.experr | 0 contrib/unifdef/tests/blank2d.expout | 23 + contrib/unifdef/tests/blank2d.exprc | 1 + contrib/unifdef/tests/blank2d.sh | 1 + contrib/unifdef/tests/blank2u.c | 25 + contrib/unifdef/tests/blank2u.experr | 0 contrib/unifdef/tests/blank2u.expout | 20 + contrib/unifdef/tests/blank2u.exprc | 1 + contrib/unifdef/tests/blank2u.sh | 1 + contrib/unifdef/tests/blank3d.c | 25 + contrib/unifdef/tests/blank3d.experr | 0 contrib/unifdef/tests/blank3d.expout | 23 + contrib/unifdef/tests/blank3d.exprc | 1 + contrib/unifdef/tests/blank3d.sh | 1 + contrib/unifdef/tests/blank3u.c | 25 + contrib/unifdef/tests/blank3u.experr | 0 contrib/unifdef/tests/blank3u.expout | 19 + contrib/unifdef/tests/blank3u.exprc | 1 + contrib/unifdef/tests/blank3u.sh | 1 + contrib/unifdef/tests/blank4d.c | 25 + contrib/unifdef/tests/blank4d.experr | 0 contrib/unifdef/tests/blank4d.expout | 23 + contrib/unifdef/tests/blank4d.exprc | 1 + contrib/unifdef/tests/blank4d.sh | 1 + contrib/unifdef/tests/blank4u.c | 25 + contrib/unifdef/tests/blank4u.experr | 0 contrib/unifdef/tests/blank4u.expout | 18 + contrib/unifdef/tests/blank4u.exprc | 1 + contrib/unifdef/tests/blank4u.sh | 1 + contrib/unifdef/tests/broken2.h | 1 + contrib/unifdef/tests/broken3.h | 1 + contrib/unifdef/tests/broken4.h | 2 + contrib/unifdef/tests/crlf-a.experr | 0 contrib/unifdef/tests/crlf-a.expout | 10 + contrib/unifdef/tests/crlf-a.exprc | 1 + contrib/unifdef/tests/crlf-a.sh | 1 + contrib/unifdef/tests/crlf-b.experr | 0 contrib/unifdef/tests/crlf-b.expout | 14 + contrib/unifdef/tests/crlf-b.exprc | 1 + contrib/unifdef/tests/crlf-b.sh | 1 + contrib/unifdef/tests/crlf-c.experr | 0 contrib/unifdef/tests/crlf-c.expout | 16 + contrib/unifdef/tests/crlf-c.exprc | 1 + contrib/unifdef/tests/crlf-c.sh | 1 + contrib/unifdef/tests/crlf-d.experr | 0 contrib/unifdef/tests/crlf-d.expout | 18 + contrib/unifdef/tests/crlf-d.exprc | 1 + contrib/unifdef/tests/crlf-d.sh | 1 + contrib/unifdef/tests/crlf.c | 20 + contrib/unifdef/tests/dangle.c | 6 + contrib/unifdef/tests/dangle.experr | 0 contrib/unifdef/tests/dangle.expout | 6 + contrib/unifdef/tests/dangle.exprc | 1 + contrib/unifdef/tests/dangle.sh | 1 + contrib/unifdef/tests/debian-603860.c | 8 + contrib/unifdef/tests/debian-603860.experr | 0 contrib/unifdef/tests/debian-603860.expout | 2 + contrib/unifdef/tests/debian-603860.exprc | 1 + contrib/unifdef/tests/debian-603860.sh | 1 + contrib/unifdef/tests/defundef-broken2.experr | 2 + contrib/unifdef/tests/defundef-broken2.expout | 0 contrib/unifdef/tests/defundef-broken2.exprc | 1 + contrib/unifdef/tests/defundef-broken2.sh | 1 + contrib/unifdef/tests/defundef-broken3.experr | 2 + contrib/unifdef/tests/defundef-broken3.expout | 0 contrib/unifdef/tests/defundef-broken3.exprc | 1 + contrib/unifdef/tests/defundef-broken3.sh | 1 + contrib/unifdef/tests/defundef-broken4.experr | 2 + contrib/unifdef/tests/defundef-broken4.expout | 0 contrib/unifdef/tests/defundef-broken4.exprc | 1 + contrib/unifdef/tests/defundef-broken4.sh | 1 + contrib/unifdef/tests/defundef-funlike.experr | 0 contrib/unifdef/tests/defundef-funlike.expout | 13 + contrib/unifdef/tests/defundef-funlike.exprc | 1 + contrib/unifdef/tests/defundef-funlike.sh | 1 + contrib/unifdef/tests/defundef-undefdef.experr | 0 contrib/unifdef/tests/defundef-undefdef.expout | 1 + contrib/unifdef/tests/defundef-undefdef.exprc | 1 + contrib/unifdef/tests/defundef-undefdef.sh | 1 + contrib/unifdef/tests/div.c | 3 + contrib/unifdef/tests/div.experr | 0 contrib/unifdef/tests/div.expout | 10 + contrib/unifdef/tests/div.exprc | 1 + contrib/unifdef/tests/div.sh | 10 + contrib/unifdef/tests/empty.c | 0 contrib/unifdef/tests/empty.experr | 0 contrib/unifdef/tests/empty.expout | 0 contrib/unifdef/tests/empty.exprc | 1 + contrib/unifdef/tests/empty.sh | 1 + contrib/unifdef/tests/error.c | 4 + contrib/unifdef/tests/error.experr | 0 contrib/unifdef/tests/error.expout | 2 + contrib/unifdef/tests/error.exprc | 1 + contrib/unifdef/tests/error.sh | 1 + contrib/unifdef/tests/exitmode0a.experr | 0 contrib/unifdef/tests/exitmode0a.expout | 16 + contrib/unifdef/tests/exitmode0a.exprc | 1 + contrib/unifdef/tests/exitmode0a.sh | 1 + contrib/unifdef/tests/exitmode0b.experr | 0 contrib/unifdef/tests/exitmode0b.expout | 26 + contrib/unifdef/tests/exitmode0b.exprc | 1 + contrib/unifdef/tests/exitmode0b.sh | 1 + contrib/unifdef/tests/exitmode1a.experr | 0 contrib/unifdef/tests/exitmode1a.expout | 16 + contrib/unifdef/tests/exitmode1a.exprc | 1 + contrib/unifdef/tests/exitmode1a.sh | 1 + contrib/unifdef/tests/exitmode1b.experr | 0 contrib/unifdef/tests/exitmode1b.expout | 26 + contrib/unifdef/tests/exitmode1b.exprc | 1 + contrib/unifdef/tests/exitmode1b.sh | 1 + contrib/unifdef/tests/exitmode2a.experr | 0 contrib/unifdef/tests/exitmode2a.expout | 16 + contrib/unifdef/tests/exitmode2a.exprc | 1 + contrib/unifdef/tests/exitmode2a.sh | 1 + contrib/unifdef/tests/exitmode2b.experr | 0 contrib/unifdef/tests/exitmode2b.expout | 26 + contrib/unifdef/tests/exitmode2b.exprc | 1 + contrib/unifdef/tests/exitmode2b.sh | 1 + contrib/unifdef/tests/exitstat.c | 3 + contrib/unifdef/tests/exitstat.experr | 0 contrib/unifdef/tests/exitstat.expout | 3 + contrib/unifdef/tests/exitstat.exprc | 1 + contrib/unifdef/tests/exitstat.sh | 1 + contrib/unifdef/tests/funlike.h | 1 + contrib/unifdef/tests/if1-a.experr | 0 contrib/unifdef/tests/if1-a.expout | 16 + contrib/unifdef/tests/if1-a.exprc | 1 + contrib/unifdef/tests/if1-a.sh | 1 + contrib/unifdef/tests/if1-f.experr | 0 contrib/unifdef/tests/if1-f.expout | 16 + contrib/unifdef/tests/if1-f.exprc | 1 + contrib/unifdef/tests/if1-f.sh | 1 + contrib/unifdef/tests/if1-k.c | 38 + contrib/unifdef/tests/if1-k.experr | 0 contrib/unifdef/tests/if1-k.expout | 30 + contrib/unifdef/tests/if1-k.exprc | 1 + contrib/unifdef/tests/if1-k.sh | 1 + contrib/unifdef/tests/if1-kDU.c | 38 + contrib/unifdef/tests/if1-kDU.experr | 0 contrib/unifdef/tests/if1-kDU.expout | 20 + contrib/unifdef/tests/if1-kDU.exprc | 1 + contrib/unifdef/tests/if1-kDU.sh | 1 + contrib/unifdef/tests/if1.c | 26 + contrib/unifdef/tests/if1.experr | 0 contrib/unifdef/tests/if1.expout | 16 + contrib/unifdef/tests/if1.exprc | 1 + contrib/unifdef/tests/if1.h | 3 + contrib/unifdef/tests/if1.sh | 1 + contrib/unifdef/tests/if1a.experr | 0 contrib/unifdef/tests/if1a.expout | 24 + contrib/unifdef/tests/if1a.exprc | 1 + contrib/unifdef/tests/if1a.sh | 1 + contrib/unifdef/tests/if2-a.experr | 0 contrib/unifdef/tests/if2-a.expout | 13 + contrib/unifdef/tests/if2-a.exprc | 1 + contrib/unifdef/tests/if2-a.sh | 1 + contrib/unifdef/tests/if2-k.c | 29 + contrib/unifdef/tests/if2-k.experr | 0 contrib/unifdef/tests/if2-k.expout | 21 + contrib/unifdef/tests/if2-k.exprc | 1 + contrib/unifdef/tests/if2-k.sh | 1 + contrib/unifdef/tests/if2-kDU.c | 29 + contrib/unifdef/tests/if2-kDU.experr | 0 contrib/unifdef/tests/if2-kDU.expout | 17 + contrib/unifdef/tests/if2-kDU.exprc | 1 + contrib/unifdef/tests/if2-kDU.sh | 1 + contrib/unifdef/tests/if2.c | 17 + contrib/unifdef/tests/if2.experr | 0 contrib/unifdef/tests/if2.expout | 13 + contrib/unifdef/tests/if2.exprc | 1 + contrib/unifdef/tests/if2.sh | 1 + contrib/unifdef/tests/if3-a.experr | 0 contrib/unifdef/tests/if3-a.expout | 13 + contrib/unifdef/tests/if3-a.exprc | 1 + contrib/unifdef/tests/if3-a.sh | 1 + contrib/unifdef/tests/if3-k.c | 29 + contrib/unifdef/tests/if3-k.experr | 0 contrib/unifdef/tests/if3-k.expout | 21 + contrib/unifdef/tests/if3-k.exprc | 1 + contrib/unifdef/tests/if3-k.sh | 1 + contrib/unifdef/tests/if3-kDU.c | 29 + contrib/unifdef/tests/if3-kDU.experr | 0 contrib/unifdef/tests/if3-kDU.expout | 17 + contrib/unifdef/tests/if3-kDU.exprc | 1 + contrib/unifdef/tests/if3-kDU.sh | 1 + contrib/unifdef/tests/if3.c | 17 + contrib/unifdef/tests/if3.experr | 0 contrib/unifdef/tests/if3.expout | 13 + contrib/unifdef/tests/if3.exprc | 1 + contrib/unifdef/tests/if3.sh | 1 + contrib/unifdef/tests/if4-a.experr | 0 contrib/unifdef/tests/if4-a.expout | 22 + contrib/unifdef/tests/if4-a.exprc | 1 + contrib/unifdef/tests/if4-a.sh | 1 + contrib/unifdef/tests/if4-k.c | 50 + contrib/unifdef/tests/if4-k.experr | 0 contrib/unifdef/tests/if4-k.expout | 42 + contrib/unifdef/tests/if4-k.exprc | 1 + contrib/unifdef/tests/if4-k.sh | 1 + contrib/unifdef/tests/if4-kDU.c | 50 + contrib/unifdef/tests/if4-kDU.experr | 0 contrib/unifdef/tests/if4-kDU.expout | 26 + contrib/unifdef/tests/if4-kDU.exprc | 1 + contrib/unifdef/tests/if4-kDU.sh | 1 + contrib/unifdef/tests/if4.c | 38 + contrib/unifdef/tests/if4.experr | 0 contrib/unifdef/tests/if4.expout | 22 + contrib/unifdef/tests/if4.exprc | 1 + contrib/unifdef/tests/if4.sh | 1 + contrib/unifdef/tests/if5-a.experr | 0 contrib/unifdef/tests/if5-a.expout | 40 + contrib/unifdef/tests/if5-a.exprc | 1 + contrib/unifdef/tests/if5-a.sh | 1 + contrib/unifdef/tests/if5-k.c | 64 + contrib/unifdef/tests/if5-k.experr | 0 contrib/unifdef/tests/if5-k.expout | 56 + contrib/unifdef/tests/if5-k.exprc | 1 + contrib/unifdef/tests/if5-k.sh | 1 + contrib/unifdef/tests/if5-kDU.c | 64 + contrib/unifdef/tests/if5-kDU.experr | 0 contrib/unifdef/tests/if5-kDU.expout | 32 + contrib/unifdef/tests/if5-kDU.exprc | 1 + contrib/unifdef/tests/if5-kDU.sh | 1 + contrib/unifdef/tests/if5.c | 80 ++ contrib/unifdef/tests/if5.experr | 0 contrib/unifdef/tests/if5.expout | 40 + contrib/unifdef/tests/if5.exprc | 1 + contrib/unifdef/tests/if5.sh | 1 + contrib/unifdef/tests/if6.c | 11 + contrib/unifdef/tests/if6.h | 2 + contrib/unifdef/tests/if6a.experr | 0 contrib/unifdef/tests/if6a.expout | 1 + contrib/unifdef/tests/if6a.exprc | 1 + contrib/unifdef/tests/if6a.sh | 1 + contrib/unifdef/tests/if6b.experr | 0 contrib/unifdef/tests/if6b.expout | 5 + contrib/unifdef/tests/if6b.exprc | 1 + contrib/unifdef/tests/if6b.sh | 1 + contrib/unifdef/tests/if6c.experr | 0 contrib/unifdef/tests/if6c.expout | 7 + contrib/unifdef/tests/if6c.exprc | 1 + contrib/unifdef/tests/if6c.sh | 1 + contrib/unifdef/tests/if6d.experr | 0 contrib/unifdef/tests/if6d.expout | 9 + contrib/unifdef/tests/if6d.exprc | 1 + contrib/unifdef/tests/if6d.sh | 1 + contrib/unifdef/tests/if7.c | 94 ++ contrib/unifdef/tests/if7.experr | 0 contrib/unifdef/tests/if7.expout | 46 + contrib/unifdef/tests/if7.exprc | 1 + contrib/unifdef/tests/if7.sh | 1 + contrib/unifdef/tests/indirect.experr | 0 contrib/unifdef/tests/indirect.expout | 16 + contrib/unifdef/tests/indirect.exprc | 1 + contrib/unifdef/tests/indirect.sh | 1 + contrib/unifdef/tests/multi-generic-sh | 15 + contrib/unifdef/tests/multi.experr | 0 contrib/unifdef/tests/multi.expout | 36 + contrib/unifdef/tests/multi.exprc | 1 + contrib/unifdef/tests/multi.sh | 3 + contrib/unifdef/tests/multilnnum.experr | 0 contrib/unifdef/tests/multilnnum.expout | 42 + contrib/unifdef/tests/multilnnum.exprc | 1 + contrib/unifdef/tests/multilnnum.sh | 3 + contrib/unifdef/tests/multimissing.experr | 4 + contrib/unifdef/tests/multimissing.expout | 22 + contrib/unifdef/tests/multimissing.exprc | 1 + contrib/unifdef/tests/multimissing.sh | 3 + contrib/unifdef/tests/multinewline.experr | 0 contrib/unifdef/tests/multinewline.expout | 39 + contrib/unifdef/tests/multinewline.exprc | 1 + contrib/unifdef/tests/multinewline.sh | 3 + contrib/unifdef/tests/none.c | 5 + contrib/unifdef/tests/none.experr | 0 contrib/unifdef/tests/none.expout | 5 + contrib/unifdef/tests/none.exprc | 1 + contrib/unifdef/tests/none.sh | 1 + contrib/unifdef/tests/outdir.experr | 0 contrib/unifdef/tests/outdir.expout | 16 + contrib/unifdef/tests/outdir.exprc | 1 + contrib/unifdef/tests/outdir.sh | 6 + contrib/unifdef/tests/outeperm.experr | 1 + contrib/unifdef/tests/outeperm.expout | 0 contrib/unifdef/tests/outeperm.exprc | 1 + contrib/unifdef/tests/outeperm.sh | 6 + contrib/unifdef/tests/outfile.experr | 0 contrib/unifdef/tests/outfile.expout | 16 + contrib/unifdef/tests/outfile.exprc | 1 + contrib/unifdef/tests/outfile.sh | 5 + contrib/unifdef/tests/outperms.experr | 1 + contrib/unifdef/tests/outperms.expout | 16 + contrib/unifdef/tests/outperms.exprc | 1 + contrib/unifdef/tests/outperms.sh | 10 + contrib/unifdef/tests/overdir.experr | 0 contrib/unifdef/tests/overdir.expout | 16 + contrib/unifdef/tests/overdir.exprc | 1 + contrib/unifdef/tests/overdir.sh | 7 + contrib/unifdef/tests/overenoent.experr | 1 + contrib/unifdef/tests/overenoent.expout | 0 contrib/unifdef/tests/overenoent.exprc | 1 + contrib/unifdef/tests/overenoent.sh | 5 + contrib/unifdef/tests/overin.experr | 0 contrib/unifdef/tests/overin.expout | 16 + contrib/unifdef/tests/overin.exprc | 1 + contrib/unifdef/tests/overin.sh | 6 + contrib/unifdef/tests/overlnnum.experr | 0 contrib/unifdef/tests/overlnnum.expout | 20 + contrib/unifdef/tests/overlnnum.exprc | 1 + contrib/unifdef/tests/overlnnum.sh | 6 + contrib/unifdef/tests/overperms.experr | 2 + contrib/unifdef/tests/overperms.expout | 16 + contrib/unifdef/tests/overperms.exprc | 1 + contrib/unifdef/tests/overperms.sh | 12 + contrib/unifdef/tests/overunchanged.experr | 0 contrib/unifdef/tests/overunchanged.expout | 0 contrib/unifdef/tests/overunchanged.exprc | 1 + contrib/unifdef/tests/overunchanged.sh | 8 + contrib/unifdef/tests/overwrite.experr | 0 contrib/unifdef/tests/overwrite.expout | 16 + contrib/unifdef/tests/overwrite.exprc | 1 + contrib/unifdef/tests/overwrite.sh | 6 + contrib/unifdef/tests/recursive.experr | 120 ++ contrib/unifdef/tests/recursive.expout | 26 + contrib/unifdef/tests/recursive.exprc | 1 + contrib/unifdef/tests/recursive.sh | 1 + contrib/unifdef/tests/small1.c | 17 + contrib/unifdef/tests/small1.experr | 0 contrib/unifdef/tests/small1.expout | 13 + contrib/unifdef/tests/small1.exprc | 1 + contrib/unifdef/tests/small1.sh | 1 + contrib/unifdef/tests/small2.c | 17 + contrib/unifdef/tests/small2.experr | 0 contrib/unifdef/tests/small2.expout | 13 + contrib/unifdef/tests/small2.exprc | 1 + contrib/unifdef/tests/small2.sh | 1 + contrib/unifdef/tests/spaces1.c | 17 + contrib/unifdef/tests/spaces1.experr | 0 contrib/unifdef/tests/spaces1.expout | 13 + contrib/unifdef/tests/spaces1.exprc | 1 + contrib/unifdef/tests/spaces1.sh | 1 + contrib/unifdef/tests/spaces2.c | 17 + contrib/unifdef/tests/spaces2.experr | 0 contrib/unifdef/tests/spaces2.expout | 13 + contrib/unifdef/tests/spaces2.exprc | 1 + contrib/unifdef/tests/spaces2.sh | 1 + contrib/unifdef/tests/spaces3.c | 17 + contrib/unifdef/tests/spaces3.experr | 0 contrib/unifdef/tests/spaces3.expout | 13 + contrib/unifdef/tests/spaces3.exprc | 1 + contrib/unifdef/tests/spaces3.sh | 1 + contrib/unifdef/tests/spaces4.c | 17 + contrib/unifdef/tests/spaces4.experr | 0 contrib/unifdef/tests/spaces4.expout | 13 + contrib/unifdef/tests/spaces4.exprc | 1 + contrib/unifdef/tests/spaces4.sh | 1 + contrib/unifdef/tests/whitespace-1.experr | 2 + contrib/unifdef/tests/whitespace-1.expout | 1 + contrib/unifdef/tests/whitespace-1.exprc | 1 + contrib/unifdef/tests/whitespace-1.sh | 1 + contrib/unifdef/tests/whitespace-2.experr | 0 contrib/unifdef/tests/whitespace-2.expout | 5 + contrib/unifdef/tests/whitespace-2.exprc | 1 + contrib/unifdef/tests/whitespace-2.sh | 1 + contrib/unifdef/tests/whitespace.c | 7 + contrib/unifdef/tests/xterm.experr | 3 + contrib/unifdef/tests/xterm.expout | 83 ++ contrib/unifdef/tests/xterm.exprc | 1 + contrib/unifdef/tests/xterm.sh | 35 + contrib/unifdef/unifdef.1 | 530 ++++++++ contrib/unifdef/unifdef.c | 1675 ++++++++++++++++++++++++ contrib/unifdef/unifdef.h | 50 + contrib/unifdef/unifdefall.sh | 58 + contrib/unifdef/version.h | 2 + contrib/unifdef/win32/Makefile.mingw | 14 + contrib/unifdef/win32/unifdef.h | 84 ++ contrib/unifdef/win32/unifdef.sln | 20 + contrib/unifdef/win32/unifdef.vcxproj | 96 ++ contrib/unifdef/win32/win32.c | 91 ++ 442 files changed, 6545 insertions(+) diff --cc contrib/unifdef/.gitignore index 000000000000,000000000000..55ca2f341b7c new file mode 100644 --- /dev/null +++ b/contrib/unifdef/.gitignore @@@ -1,0 -1,0 +1,7 @@@ ++Changelog ++unifdef ++unifdef.exe ++unifdef.txt ++unifdef-* ++version.h ++version.sh diff --cc contrib/unifdef/.travis.yml index 000000000000,39aa4292de14..39aa4292de14 mode 000000,100644..100644 --- a/contrib/unifdef/.travis.yml +++ b/contrib/unifdef/.travis.yml diff --cc contrib/unifdef/COPYING index 000000000000,ae0ab7eeb717..ae0ab7eeb717 mode 000000,100644..100644 --- a/contrib/unifdef/COPYING +++ b/contrib/unifdef/COPYING diff --cc contrib/unifdef/FreeBSD/err.c index 000000000000,9589fced5b26..9589fced5b26 mode 000000,100644..100644 --- a/contrib/unifdef/FreeBSD/err.c +++ b/contrib/unifdef/FreeBSD/err.c diff --cc contrib/unifdef/FreeBSD/getopt.c index 000000000000,eb9b0c507875..eb9b0c507875 mode 000000,100644..100644 --- a/contrib/unifdef/FreeBSD/getopt.c +++ b/contrib/unifdef/FreeBSD/getopt.c diff --cc contrib/unifdef/INSTALL index 000000000000,03d7488588ab..03d7488588ab mode 000000,100644..100644 --- a/contrib/unifdef/INSTALL +++ b/contrib/unifdef/INSTALL diff --cc contrib/unifdef/Makefile index 000000000000,000000000000..36c70283c1b7 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/Makefile @@@ -1,0 -1,0 +1,58 @@@ ++# Makefile for unifdef ++ ++prefix = ${HOME} ++bindir = ${prefix}/bin ++mandir = ${prefix}/share/man ++man1dir= ${mandir}/man1 ++ ++bindest= ${DESTDIR}${bindir} ++man1dest= ${DESTDIR}${man1dir} ++ ++all: unifdef ++ ++unifdef: unifdef.c unifdef.h version.h ++ ${CC} ${CFLAGS} ${LDFLAGS} -o unifdef unifdef.c ++ ++version.h: version.sh ++version.sh:: ++ scripts/reversion.sh ++ ++test: unifdef ++ scripts/runtests.sh tests ++ ++install: unifdef unifdefall.sh unifdef.1 ++ : commands ++ install -m 755 -d ${bindest} ++ install -m 755 unifdef ${bindest}/ ++ install -m 755 unifdefall.sh ${bindest}/unifdefall ++ : manual ++ install -m 755 -d ${man1dest} ++ install -m 644 unifdef.1 ${man1dest}/ ++ ln -s unifdef.1 ${man1dest}/unifdefall.1 ++ ++clean: ++ rm -f unifdef version.h ++ rm -f tests/*.out tests/*.err tests/*.rc ++ ++realclean: clean ++ rm -f unifdef.txt ++ [ ! -d .git ] || rm -f Changelog version.sh ++ find . -name .git -prune -o \( \ ++ -name '*~' -o -name '.#*' -o \ ++ -name '*.orig' -o -name '*.core' -o \ ++ -name 'xterm-*' -o -name 'xterm.tar.gz' \ ++ \) -delete ++ ++DISTEXTRA= version.h version.sh unifdef.txt Changelog ++ ++release: ${DISTEXTRA} ++ scripts/copycheck.sh ++ scripts/release.sh ${DISTEXTRA} ++ ++unifdef.txt: unifdef.1 ++ nroff -Tascii -mdoc unifdef.1 | col -bx >unifdef.txt ++ ++Changelog: version.sh scripts/gitlog2changelog.sh ++ scripts/gitlog2changelog.sh >Changelog ++ ++# eof diff --cc contrib/unifdef/README index 000000000000,cdf52e1e0c62..cdf52e1e0c62 mode 000000,100644..100644 --- a/contrib/unifdef/README +++ b/contrib/unifdef/README diff --cc contrib/unifdef/ifdef-how.pl index 000000000000,f8b487512c2c..f8b487512c2c mode 000000,100755..100755 --- a/contrib/unifdef/ifdef-how.pl +++ b/contrib/unifdef/ifdef-how.pl diff --cc contrib/unifdef/scripts/authors.svn index 000000000000,7df117e2d355..7df117e2d355 mode 000000,100644..100644 --- a/contrib/unifdef/scripts/authors.svn +++ b/contrib/unifdef/scripts/authors.svn diff --cc contrib/unifdef/scripts/copycheck.sh index 000000000000,c55cd1a22548..c55cd1a22548 mode 000000,100755..100755 --- a/contrib/unifdef/scripts/copycheck.sh +++ b/contrib/unifdef/scripts/copycheck.sh diff --cc contrib/unifdef/scripts/fixtests.sh index 000000000000,a4d6a33b1cf3..a4d6a33b1cf3 mode 000000,100755..100755 --- a/contrib/unifdef/scripts/fixtests.sh +++ b/contrib/unifdef/scripts/fixtests.sh diff --cc contrib/unifdef/scripts/git.config index 000000000000,557c2200ba41..557c2200ba41 mode 000000,100644..100644 --- a/contrib/unifdef/scripts/git.config +++ b/contrib/unifdef/scripts/git.config diff --cc contrib/unifdef/scripts/gitlog2changelog.sh index 000000000000,52130237e72a..52130237e72a mode 000000,100755..100755 --- a/contrib/unifdef/scripts/gitlog2changelog.sh +++ b/contrib/unifdef/scripts/gitlog2changelog.sh diff --cc contrib/unifdef/scripts/release.sh index 000000000000,bfdd4fc3a1e7..bfdd4fc3a1e7 mode 000000,100755..100755 --- a/contrib/unifdef/scripts/release.sh +++ b/contrib/unifdef/scripts/release.sh diff --cc contrib/unifdef/scripts/reversion.sh index 000000000000,5098d8ad5c6f..5098d8ad5c6f mode 000000,100755..100755 --- a/contrib/unifdef/scripts/reversion.sh +++ b/contrib/unifdef/scripts/reversion.sh diff --cc contrib/unifdef/scripts/runtests.sh index 000000000000,452f0e9e06e1..452f0e9e06e1 mode 000000,100755..100755 --- a/contrib/unifdef/scripts/runtests.sh +++ b/contrib/unifdef/scripts/runtests.sh diff --cc contrib/unifdef/scripts/svnup.sh index 000000000000,51702df18633..51702df18633 mode 000000,100755..100755 --- a/contrib/unifdef/scripts/svnup.sh +++ b/contrib/unifdef/scripts/svnup.sh diff --cc contrib/unifdef/scripts/upload.sh index 000000000000,b55616d03f02..b55616d03f02 mode 000000,100755..100755 --- a/contrib/unifdef/scripts/upload.sh +++ b/contrib/unifdef/scripts/upload.sh diff --cc contrib/unifdef/tests/000-init.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/000-init.experr diff --cc contrib/unifdef/tests/000-init.expout index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/000-init.expout diff --cc contrib/unifdef/tests/000-init.exprc index 000000000000,573541ac9702..573541ac9702 mode 000000,100644..100644 --- a/contrib/unifdef/tests/000-init.exprc +++ b/contrib/unifdef/tests/000-init.exprc diff --cc contrib/unifdef/tests/000-init.sh index 000000000000,174f5c4a84a6..174f5c4a84a6 mode 000000,100644..100644 --- a/contrib/unifdef/tests/000-init.sh +++ b/contrib/unifdef/tests/000-init.sh diff --cc contrib/unifdef/tests/NetBSD-42628.c index 000000000000,000000000000..9de6a94a0773 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/NetBSD-42628.c @@@ -1,0 -1,0 +1,25 @@@ ++#if defined(__FreeBSD__) ++#include ++#else ++#include ++#endif ++ ++#if defined(__FreeBSD__) ++ #include ++ #include ++ #include ++ #include ++ #include ++ #include ++#else ++#include ++#endif ++ ++#if defined(__FreeBSD__) ++#endif ++ ++#ifdef __FreeBSD__ ++#include ++#else ++#include ++#endif diff --cc contrib/unifdef/tests/NetBSD-42628.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/NetBSD-42628.experr diff --cc contrib/unifdef/tests/NetBSD-42628.expout index 000000000000,000000000000..2d52e9e7ae29 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/NetBSD-42628.expout @@@ -1,0 -1,0 +1,6 @@@ ++#include ++ ++#include ++ ++ ++#include diff --cc contrib/unifdef/tests/NetBSD-42628.exprc index 000000000000,d00491fd7e5b..d00491fd7e5b mode 000000,100644..100644 --- a/contrib/unifdef/tests/NetBSD-42628.exprc +++ b/contrib/unifdef/tests/NetBSD-42628.exprc diff --cc contrib/unifdef/tests/NetBSD-42628.sh index 000000000000,87ac1aa9c4e8..87ac1aa9c4e8 mode 000000,100644..100644 --- a/contrib/unifdef/tests/NetBSD-42628.sh +++ b/contrib/unifdef/tests/NetBSD-42628.sh diff --cc contrib/unifdef/tests/NetBSD-47068.c index 000000000000,515f50b6eafd..515f50b6eafd mode 000000,100644..100644 --- a/contrib/unifdef/tests/NetBSD-47068.c +++ b/contrib/unifdef/tests/NetBSD-47068.c diff --cc contrib/unifdef/tests/NetBSD-47068.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/NetBSD-47068.experr diff --cc contrib/unifdef/tests/NetBSD-47068.expout index 000000000000,1fb9d525074e..1fb9d525074e mode 000000,100644..100644 --- a/contrib/unifdef/tests/NetBSD-47068.expout +++ b/contrib/unifdef/tests/NetBSD-47068.expout diff --cc contrib/unifdef/tests/NetBSD-47068.exprc index 000000000000,573541ac9702..573541ac9702 mode 000000,100644..100644 --- a/contrib/unifdef/tests/NetBSD-47068.exprc +++ b/contrib/unifdef/tests/NetBSD-47068.exprc diff --cc contrib/unifdef/tests/NetBSD-47068.sh index 000000000000,2ec1bbef00a1..2ec1bbef00a1 mode 000000,100644..100644 --- a/contrib/unifdef/tests/NetBSD-47068.sh +++ b/contrib/unifdef/tests/NetBSD-47068.sh diff --cc contrib/unifdef/tests/args1.c index 000000000000,1cb554688c37..1cb554688c37 mode 000000,100644..100644 --- a/contrib/unifdef/tests/args1.c +++ b/contrib/unifdef/tests/args1.c diff --cc contrib/unifdef/tests/args1.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/args1.experr diff --cc contrib/unifdef/tests/args1.expout index 000000000000,000000000000..ce013625030b new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/args1.expout @@@ -1,0 -1,0 +1,1 @@@ ++hello diff --cc contrib/unifdef/tests/args1.exprc index 000000000000,d00491fd7e5b..d00491fd7e5b mode 000000,100644..100644 --- a/contrib/unifdef/tests/args1.exprc +++ b/contrib/unifdef/tests/args1.exprc diff --cc contrib/unifdef/tests/args1.sh index 000000000000,051baf41118a..051baf41118a mode 000000,100644..100644 --- a/contrib/unifdef/tests/args1.sh +++ b/contrib/unifdef/tests/args1.sh diff --cc contrib/unifdef/tests/args2.c index 000000000000,8fe476b18ee2..8fe476b18ee2 mode 000000,100644..100644 --- a/contrib/unifdef/tests/args2.c +++ b/contrib/unifdef/tests/args2.c diff --cc contrib/unifdef/tests/args2.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/args2.experr diff --cc contrib/unifdef/tests/args2.expout index 000000000000,8fe476b18ee2..8fe476b18ee2 mode 000000,100644..100644 --- a/contrib/unifdef/tests/args2.expout +++ b/contrib/unifdef/tests/args2.expout diff --cc contrib/unifdef/tests/args2.exprc index 000000000000,573541ac9702..573541ac9702 mode 000000,100644..100644 --- a/contrib/unifdef/tests/args2.exprc +++ b/contrib/unifdef/tests/args2.exprc diff --cc contrib/unifdef/tests/args2.sh index 000000000000,19fb26136b0b..19fb26136b0b mode 000000,100644..100644 --- a/contrib/unifdef/tests/args2.sh +++ b/contrib/unifdef/tests/args2.sh diff --cc contrib/unifdef/tests/blank0d.c index 000000000000,c435ac5b6224..c435ac5b6224 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank0d.c +++ b/contrib/unifdef/tests/blank0d.c diff --cc contrib/unifdef/tests/blank0d.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/blank0d.experr diff --cc contrib/unifdef/tests/blank0d.expout index 000000000000,9c2261485ba5..9c2261485ba5 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank0d.expout +++ b/contrib/unifdef/tests/blank0d.expout diff --cc contrib/unifdef/tests/blank0d.exprc index 000000000000,d00491fd7e5b..d00491fd7e5b mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank0d.exprc +++ b/contrib/unifdef/tests/blank0d.exprc diff --cc contrib/unifdef/tests/blank0d.sh index 000000000000,f0af220989d1..f0af220989d1 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank0d.sh +++ b/contrib/unifdef/tests/blank0d.sh diff --cc contrib/unifdef/tests/blank0u.c index 000000000000,c435ac5b6224..c435ac5b6224 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank0u.c +++ b/contrib/unifdef/tests/blank0u.c diff --cc contrib/unifdef/tests/blank0u.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/blank0u.experr diff --cc contrib/unifdef/tests/blank0u.expout index 000000000000,165d0a903525..165d0a903525 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank0u.expout +++ b/contrib/unifdef/tests/blank0u.expout diff --cc contrib/unifdef/tests/blank0u.exprc index 000000000000,d00491fd7e5b..d00491fd7e5b mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank0u.exprc +++ b/contrib/unifdef/tests/blank0u.exprc diff --cc contrib/unifdef/tests/blank0u.sh index 000000000000,22a8360282c2..22a8360282c2 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank0u.sh +++ b/contrib/unifdef/tests/blank0u.sh diff --cc contrib/unifdef/tests/blank1d.c index 000000000000,c435ac5b6224..c435ac5b6224 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank1d.c +++ b/contrib/unifdef/tests/blank1d.c diff --cc contrib/unifdef/tests/blank1d.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/blank1d.experr diff --cc contrib/unifdef/tests/blank1d.expout index 000000000000,05f6bc538b88..05f6bc538b88 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank1d.expout +++ b/contrib/unifdef/tests/blank1d.expout diff --cc contrib/unifdef/tests/blank1d.exprc index 000000000000,d00491fd7e5b..d00491fd7e5b mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank1d.exprc +++ b/contrib/unifdef/tests/blank1d.exprc diff --cc contrib/unifdef/tests/blank1d.sh index 000000000000,4820efd723b9..4820efd723b9 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank1d.sh +++ b/contrib/unifdef/tests/blank1d.sh diff --cc contrib/unifdef/tests/blank1u.c index 000000000000,c435ac5b6224..c435ac5b6224 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank1u.c +++ b/contrib/unifdef/tests/blank1u.c diff --cc contrib/unifdef/tests/blank1u.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/blank1u.experr diff --cc contrib/unifdef/tests/blank1u.expout index 000000000000,f79337918e0e..f79337918e0e mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank1u.expout +++ b/contrib/unifdef/tests/blank1u.expout diff --cc contrib/unifdef/tests/blank1u.exprc index 000000000000,d00491fd7e5b..d00491fd7e5b mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank1u.exprc +++ b/contrib/unifdef/tests/blank1u.exprc diff --cc contrib/unifdef/tests/blank1u.sh index 000000000000,1dbd849b018f..1dbd849b018f mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank1u.sh +++ b/contrib/unifdef/tests/blank1u.sh diff --cc contrib/unifdef/tests/blank2d.c index 000000000000,c435ac5b6224..c435ac5b6224 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank2d.c +++ b/contrib/unifdef/tests/blank2d.c diff --cc contrib/unifdef/tests/blank2d.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/blank2d.experr diff --cc contrib/unifdef/tests/blank2d.expout index 000000000000,ba127f52e4f1..ba127f52e4f1 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank2d.expout +++ b/contrib/unifdef/tests/blank2d.expout diff --cc contrib/unifdef/tests/blank2d.exprc index 000000000000,d00491fd7e5b..d00491fd7e5b mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank2d.exprc +++ b/contrib/unifdef/tests/blank2d.exprc diff --cc contrib/unifdef/tests/blank2d.sh index 000000000000,a38cb0cee808..a38cb0cee808 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank2d.sh +++ b/contrib/unifdef/tests/blank2d.sh diff --cc contrib/unifdef/tests/blank2u.c index 000000000000,c435ac5b6224..c435ac5b6224 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank2u.c +++ b/contrib/unifdef/tests/blank2u.c diff --cc contrib/unifdef/tests/blank2u.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/blank2u.experr diff --cc contrib/unifdef/tests/blank2u.expout index 000000000000,cee6dd72eb9a..cee6dd72eb9a mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank2u.expout +++ b/contrib/unifdef/tests/blank2u.expout diff --cc contrib/unifdef/tests/blank2u.exprc index 000000000000,d00491fd7e5b..d00491fd7e5b mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank2u.exprc +++ b/contrib/unifdef/tests/blank2u.exprc diff --cc contrib/unifdef/tests/blank2u.sh index 000000000000,70b5440fe28c..70b5440fe28c mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank2u.sh +++ b/contrib/unifdef/tests/blank2u.sh diff --cc contrib/unifdef/tests/blank3d.c index 000000000000,c435ac5b6224..c435ac5b6224 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank3d.c +++ b/contrib/unifdef/tests/blank3d.c diff --cc contrib/unifdef/tests/blank3d.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/blank3d.experr diff --cc contrib/unifdef/tests/blank3d.expout index 000000000000,31a633a0ea57..31a633a0ea57 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank3d.expout +++ b/contrib/unifdef/tests/blank3d.expout diff --cc contrib/unifdef/tests/blank3d.exprc index 000000000000,d00491fd7e5b..d00491fd7e5b mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank3d.exprc +++ b/contrib/unifdef/tests/blank3d.exprc diff --cc contrib/unifdef/tests/blank3d.sh index 000000000000,8e71cbec759f..8e71cbec759f mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank3d.sh +++ b/contrib/unifdef/tests/blank3d.sh diff --cc contrib/unifdef/tests/blank3u.c index 000000000000,c435ac5b6224..c435ac5b6224 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank3u.c +++ b/contrib/unifdef/tests/blank3u.c diff --cc contrib/unifdef/tests/blank3u.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/unifdef/tests/blank3u.experr diff --cc contrib/unifdef/tests/blank3u.expout index 000000000000,d90cca9c6168..d90cca9c6168 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank3u.expout +++ b/contrib/unifdef/tests/blank3u.expout diff --cc contrib/unifdef/tests/blank3u.exprc index 000000000000,d00491fd7e5b..d00491fd7e5b mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank3u.exprc +++ b/contrib/unifdef/tests/blank3u.exprc diff --cc contrib/unifdef/tests/blank3u.sh index 000000000000,c1e8f20d2bc8..c1e8f20d2bc8 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank3u.sh +++ b/contrib/unifdef/tests/blank3u.sh diff --cc contrib/unifdef/tests/blank4d.c index 000000000000,c435ac5b6224..c435ac5b6224 mode 000000,100644..100644 --- a/contrib/unifdef/tests/blank4d.c +++ b/contrib/unifdef/tests/blank4d.c diff --cc contrib/unifdef/tests/blank4d.experr index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 *** 1813 LINES SKIPPED *** From nobody Mon Aug 21 17:53: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 4RV0Sx2Gqnz4r6Jt; Mon, 21 Aug 2023 17:53: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 4RV0Sw69chz3dtf; Mon, 21 Aug 2023 17:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692640400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4w/x4zakIfPxofAIBb6MBDh/oyLca8onyeki7Zjb5YI=; b=QHbC4gmM9eYMlP5QtESSdm55inpBcMHCM5wWAZL1pb8p3QQb/TVjQMy4tcviTC0YzURoMm zqN+5TN9rD0ivLooQmdaKKmOqkoRjv/MlB3BRdxcE7+yUDrJ9qIImyQ8HMNPgM4nmKrFPD kC2Rvrkg5rhiHApNZtvL+UJFwkCQzInYCKvVpfBGH7L4VrMCWlC1Pa0AmE7ncNdesMUOU9 fb9BGjljuL/6LAiA+re43z3IPKdRJMLa9obM0ajis2kfEjJ0kmUAnmgjmvkJ2d6SJyYc8g rjnqxArWJMekRrM9NL/rVQhitiWsL7golBJ+5E6bKwbtkGraEv5GnccYxMirAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692640400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4w/x4zakIfPxofAIBb6MBDh/oyLca8onyeki7Zjb5YI=; b=VJJ5BlrAuGFL3WcJ12ipPvobm4q5FcE5tuckNLotDcgmh6SD8XdRMWHYCwc1rhyvNbBjQx d2jyhyEKuovqmOxOVGznIkMTGCXauLbtcgqVtHTnX3TyhzHncoB2nfZ+lJGzhP01C3i7IW JXxo2KLFAi7FKLE/T/knsM7lPNiVC8jhEP8XR7yEPRO0FiBdds+RoORKbT7VCMBdoU9Oy6 3J0OjQJYL3G/JDLjEK2a3lGQiQvhBE0303L36ATvdRZv6bKrwrOUdz8Z7BYkrHRYxfGPCP S/AcoWV7NUT8DguCSDutoReL8x68NwQXXlaWah2U9DQQNRCZcfJMERPJmGM86A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692640400; a=rsa-sha256; cv=none; b=Qy8ibddT4toJKtl+pt7rIfDmgIGMEr5GZCP+wSYIRYc63ic7qBIfVtuIgjrLxYP3Ksv93t RX353SZcGK9St77S4pL3GM3M6niv7GYfC3xmiS+5oX0cJMnuoJ7bSiqbg7rLdmQ8C1hvuO MDGmE+PkPt7pETbWxxsJDzxQPAbmj8t3IruI3m3g/YdJwok2X9Goz+yg4IhtcD4Pfsi8c2 +FDTG0Bv56jhf5yOfPwamUsIKff1pn6RinYAS1RmJ+RzSwYLhuVhZkBQDNL7/RVkjz8c2n d19YvTsgQxZsPvbN8QD3NP8e1wP/lwoMGCiLEcXInM6rXoGQ2hVuhFsQZ1fcxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV0Sw5D3mzWSc; Mon, 21 Aug 2023 17:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHrKNF078698; Mon, 21 Aug 2023 17:53:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHrKBA078695; Mon, 21 Aug 2023 17:53:20 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:53:20 GMT Message-Id: <202308211753.37LHrKBA078695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 343b776fd028 - main - unifdef: Reapply our 61287be18189. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 343b776fd0280f4dc95a1a61fd9ac40c78ce684e Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=343b776fd0280f4dc95a1a61fd9ac40c78ce684e commit 343b776fd0280f4dc95a1a61fd9ac40c78ce684e Author: Dag-Erling Smørgrav AuthorDate: 2023-08-21 17:43:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-21 17:52:06 +0000 unifdef: Reapply our 61287be18189. --- contrib/unifdef/unifdef.c | 139 +++++++++++++++++++++++++++------------------- contrib/unifdef/unifdef.h | 3 + 2 files changed, 86 insertions(+), 56 deletions(-) diff --git a/contrib/unifdef/unifdef.c b/contrib/unifdef/unifdef.c index dc145a24232f..82f6acd66038 100644 --- a/contrib/unifdef/unifdef.c +++ b/contrib/unifdef/unifdef.c @@ -138,7 +138,6 @@ static char const * const linestate_name[] = { */ #define MAXDEPTH 64 /* maximum #if nesting */ #define MAXLINE 4096 /* maximum length of line */ -#define MAXSYMS 16384 /* maximum number of symbols */ /* * Sometimes when editing a keyword the replacement text is longer, so @@ -146,6 +145,26 @@ static char const * const linestate_name[] = { */ #define EDITSLOP 10 +/* + * C17/18 allow 63 characters per macro name, but up to 127 arbitrarily large + * parameters. + */ +struct macro { + RB_ENTRY(macro) entry; + const char *name; + const char *value; + bool ignore; /* -iDsym or -iUsym */ +}; + +static int +macro_cmp(struct macro *a, struct macro *b) +{ + return (strcmp(a->name, b->name)); +} + +static RB_HEAD(MACROMAP, macro) macro_tree = RB_INITIALIZER(¯o_tree); +RB_GENERATE_STATIC(MACROMAP, macro, entry, macro_cmp); + /* * Globals. */ @@ -163,11 +182,6 @@ static bool symlist; /* -s: output symbol list */ static bool symdepth; /* -S: output symbol depth */ static bool text; /* -t: this is a text file */ -static const char *symname[MAXSYMS]; /* symbol name */ -static const char *value[MAXSYMS]; /* -Dsym=value */ -static bool ignore[MAXSYMS]; /* -iDsym or -iUsym */ -static int nsyms; /* number of symbols */ - static FILE *input; /* input file pointer */ static const char *filename; /* input file name */ static int linenum; /* current line number */ @@ -216,12 +230,12 @@ static char *astrcat(const char *, const char *); static void cleantemp(void); static void closeio(void); static void debug(const char *, ...); -static void debugsym(const char *, int); +static void debugsym(const char *, const struct macro *); static bool defundef(void); static void defundefile(const char *); static void done(void); static void error(const char *); -static int findsym(const char **); +static struct macro *findsym(const char **); static void flushline(bool); static void hashline(void); static void help(void); @@ -781,7 +795,7 @@ static Linetype parseline(void) { const char *cp; - int cursym; + struct macro *cursym; Linetype retval; Comment_state wascomment; @@ -803,15 +817,15 @@ parseline(void) if ((cp = matchsym("ifdef", keyword)) != NULL || (cp = matchsym("ifndef", keyword)) != NULL) { cp = skipcomment(cp); - if ((cursym = findsym(&cp)) < 0) + if ((cursym = findsym(&cp)) == NULL) retval = LT_IF; else { retval = (keyword[2] == 'n') ? LT_FALSE : LT_TRUE; - if (value[cursym] == NULL) + if (cursym->value == NULL) retval = (retval == LT_TRUE) ? LT_FALSE : LT_TRUE; - if (ignore[cursym]) + if (cursym->ignore) retval = (retval == LT_TRUE) ? LT_TRUEI : LT_FALSEI; } @@ -1013,7 +1027,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp) { const char *cp; char *ep; - int sym; + struct macro *sym; bool defparen; Linetype lt; @@ -1078,27 +1092,27 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp) debug("eval%d defined missing ')'", prec(ops)); return (LT_ERROR); } - if (sym < 0) { + if (sym == NULL) { debug("eval%d defined unknown", prec(ops)); lt = LT_IF; } else { - debug("eval%d defined %s", prec(ops), symname[sym]); - *valp = (value[sym] != NULL); + debug("eval%d defined %s", prec(ops), sym->name); + *valp = (sym->value != NULL); lt = *valp ? LT_TRUE : LT_FALSE; } constexpr = false; } else if (!endsym(*cp)) { debug("eval%d symbol", prec(ops)); sym = findsym(&cp); - if (sym < 0) { + if (sym == NULL) { lt = LT_IF; cp = skipargs(cp); - } else if (value[sym] == NULL) { + } else if (sym->value == NULL) { *valp = 0; lt = LT_FALSE; } else { - *valp = strtol(value[sym], &ep, 0); - if (*ep != '\0' || ep == value[sym]) + *valp = strtol(sym->value, &ep, 0); + if (*ep != '\0' || ep == sym->value) return (LT_ERROR); lt = *valp ? LT_TRUE : LT_FALSE; cp = skipargs(cp); @@ -1426,17 +1440,18 @@ matchsym(const char *s, const char *t) * Look for the symbol in the symbol table. If it is found, we return * the symbol table index, else we return -1. */ -static int +static struct macro * findsym(const char **strp) { const char *str; - int symind; + char *strkey; + struct macro key, *res; str = *strp; *strp = skipsym(str); if (symlist) { if (*strp == str) - return (-1); + return (NULL); if (symdepth && firstsym) printf("%s%3d", zerosyms ? "" : "\n", depth); firstsym = zerosyms = false; @@ -1445,15 +1460,26 @@ findsym(const char **strp) (int)(*strp-str), str, symdepth ? "" : "\n"); /* we don't care about the value of the symbol */ - return (0); + return (NULL); } - for (symind = 0; symind < nsyms; ++symind) { - if (matchsym(symname[symind], str) != NULL) { - debugsym("findsym", symind); - return (symind); - } - } - return (-1); + + /* + * 'str' just points into the current mid-parse input and is not + * nul-terminated. We know the length of the symbol, *strp - str, but + * need to provide a nul-terminated lookup key for RB_FIND's comparison + * function. Create one here. + */ + strkey = malloc(*strp - str + 1); + memcpy(strkey, str, *strp - str); + strkey[*strp - str] = 0; + + key.name = strkey; + res = RB_FIND(MACROMAP, ¯o_tree, &key); + if (res != NULL) + debugsym("findsym", res); + + free(strkey); + return (res); } /* @@ -1463,22 +1489,23 @@ static void indirectsym(void) { const char *cp; - int changed, sym, ind; + int changed; + struct macro *sym, *ind; do { changed = 0; - for (sym = 0; sym < nsyms; ++sym) { - if (value[sym] == NULL) + RB_FOREACH(sym, MACROMAP, ¯o_tree) { + if (sym->value == NULL) continue; - cp = value[sym]; + cp = sym->value; ind = findsym(&cp); - if (ind == -1 || ind == sym || + if (ind == NULL || ind == sym || *cp != '\0' || - value[ind] == NULL || - value[ind] == value[sym]) + ind->value == NULL || + ind->value == sym->value) continue; debugsym("indir...", sym); - value[sym] = value[ind]; + sym->value = ind->value; debugsym("...ectsym", sym); changed++; } @@ -1510,29 +1537,29 @@ addsym1(bool ignorethis, bool definethis, char *symval) * Add a symbol to the symbol table. */ static void -addsym2(bool ignorethis, const char *sym, const char *val) +addsym2(bool ignorethis, const char *symname, const char *val) { - const char *cp = sym; - int symind; - - symind = findsym(&cp); - if (symind < 0) { - if (nsyms >= MAXSYMS) - errx(2, "too many symbols"); - symind = nsyms++; + const char *cp = symname; + struct macro *sym, *r; + + sym = findsym(&cp); + if (sym == NULL) { + sym = calloc(1, sizeof(*sym)); + sym->ignore = ignorethis; + sym->name = symname; + sym->value = val; + r = RB_INSERT(MACROMAP, ¯o_tree, sym); + assert(r == NULL); } - ignore[symind] = ignorethis; - symname[symind] = sym; - value[symind] = val; - debugsym("addsym", symind); + debugsym("addsym", sym); } static void -debugsym(const char *why, int symind) +debugsym(const char *why, const struct macro *sym) { - debug("%s %s%c%s", why, symname[symind], - value[symind] ? '=' : ' ', - value[symind] ? value[symind] : "undef"); + debug("%s %s%c%s", why, sym->name, + sym->value ? '=' : ' ', + sym->value ? sym->value : "undef"); } /* diff --git a/contrib/unifdef/unifdef.h b/contrib/unifdef/unifdef.h index 2cd706d986ab..b785129406c9 100644 --- a/contrib/unifdef/unifdef.h +++ b/contrib/unifdef/unifdef.h @@ -23,8 +23,11 @@ * SUCH DAMAGE. */ +#include #include +#include +#include #include #include #include From nobody Mon Aug 21 17:53: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 4RV0Sy3JRVz4r6R3; Mon, 21 Aug 2023 17:53: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 4RV0Sx6qy6z3dm7; Mon, 21 Aug 2023 17:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692640402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M4XpB3HwcY7/9G9rvIFRm9oA+9ZG9UTRSswvSZoxcaU=; b=upB8RPueRly35Ijk7dSqbuAdnLDUkenkH9YXxbA7BinSy99qvI8AE8zDUbS1kfj20+9hsV J2ItO8pq0OqoDWT99F160C2YGh2G/eIluZEuIyEdTkW/T6L5yBQNBh5wWMzKgpr9LvBDGJ xb+84sVH5V7Wo1OZvVTfwPwGkBn+6uE9O0BF/pHbklizBW2D9j8z/OYotK3V6VIj8i8Xbm VoxGD6aOtpZ9AgIFDkblIxE8gr5XPNfhWEYHpCk4KywZRxpIBJ6aUC4lHV3ZX2+I9UCZs9 qRVcL0YWPWocLYk4LMQNbljKQhfLnrf49Fiy1YitkaTynPmTTVzegmAfEaZu/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692640402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M4XpB3HwcY7/9G9rvIFRm9oA+9ZG9UTRSswvSZoxcaU=; b=IL0IHgwM3s9aaqhNCZJ2AGB/M61ObKoUKNbX28P72xpucxv+N54ZyG9wU/ZNpD6KucAN9y N0TVh9RCagFWMS/Y9ukvFJLt6HT3ExZ0AolCOrDl/Ri5gRKoIeyz/XWmjMekcO4EsrCUo9 EQj84d5YAihCAU8PvY2DAgSGl6+lrBWCK+WIHY49uw3VVLpcZ7ESK+id96kOlH2uDpxigy GTKpARH/HDXxtADnw6hOxJ0LvQDkSOr8PNzDsn27OO1Ke56wsn1qPvxn2RNmBKIX3FB68Z xIRbIsUKpMa+7snolX/6ZcKS2SFKDoxASxBhmoJvM3FAMCsG+j64kOU1GQKX2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692640402; a=rsa-sha256; cv=none; b=TV5LZQn05K7gtzD/rJS62kRQF9tgPOOq2FGzBLErdsqE5qJPcjOu/0wg4yxS6l/+hwKf9H NckLnj7Ogl8owetUsvpCNsrJJnNbLWyOQahqD8xBEguwMFdHf0sYjK/oFWbJ53Kh2gEg1g Xj0J5bXVPy0fobY+HxkiyfUcOuE+HghzP76/VR8g0ZBkahW0GOFAaUkh5qkYga9ikyRyrP zcYIeIim+5vjhXmL+E3bE7wk/wdM5Juga4t3Ua7UJ1IxEALBrfwR7pDpJ3TuVzGbKlw/M3 d1klbVYtUPjVM2gYmqfFbT9rVw/vyRg82zvf3gx64s6SrMpePnDCtH14QM2+Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV0Sx5lpbzWMB; Mon, 21 Aug 2023 17:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHrLGP078747; Mon, 21 Aug 2023 17:53:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHrLXM078744; Mon, 21 Aug 2023 17:53:21 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:53:21 GMT Message-Id: <202308211753.37LHrLXM078744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 049b7608f41b - main - unifdef: Reapply our 7102ec5226e5. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 049b7608f41bf4e93ac6de718c45bef261f6977d Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=049b7608f41bf4e93ac6de718c45bef261f6977d commit 049b7608f41bf4e93ac6de718c45bef261f6977d Author: Dag-Erling Smørgrav AuthorDate: 2023-08-21 17:44:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-21 17:52:25 +0000 unifdef: Reapply our 7102ec5226e5. --- contrib/unifdef/unifdef.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/unifdef/unifdef.1 b/contrib/unifdef/unifdef.1 index 6d55a0048dcf..0e349d6fd5a3 100644 --- a/contrib/unifdef/unifdef.1 +++ b/contrib/unifdef/unifdef.1 @@ -407,7 +407,7 @@ You must use the or .Fl M options if there are multiple input files. -You can specify inut from stdin or output to stdout with +You can specify input from stdin or output to stdout with .Ql - . .Pp The From nobody Mon Aug 21 17:53: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 4RV0Sz4tPmz4r6lb; Mon, 21 Aug 2023 17:53: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 4RV0Sz0jpmz3f0n; Mon, 21 Aug 2023 17:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692640403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yCs0Vml21vlfjmdhzATVozvAVcdsZeVmadsODK/lv+s=; b=T/tAuY84mGoqJyUm/INgQpH54DCMdvrLzZSnxvi+GD6Uq+3TuKC/9PvEse0nNa58/cUV3R Tics+OS7yJrl+uyXX4LwuUdt/B93PXLcu0ZsAPMEfeRxcI+iTiUFHf3/0HA6RhgL89Q4gN 90ovSJBwbU1RHrhWShkCEj1dO/tznAPIhLqbkbKYzAJGZXDC2sMtmKY2WzNcNW/qme+0qp 0dh0xGeucbMovkCPNhdeqnLbpe/1Frh+SdqZBO8spxvD1CrDjGvZhK3RmLspbZOrrSpPpj /HV/+5mUfBdenutZaaHS5nO8DV16nrhnnVhueXR3xGiUX91PcdN7Duu117sd0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692640403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yCs0Vml21vlfjmdhzATVozvAVcdsZeVmadsODK/lv+s=; b=btPuDsv9OAOLM3XsQWFIRo+JrBgepmruMLat2cLDConFbhgfUVXX29ZdsPQzuG927x5Vs4 q8dfpJUfSMlBK8ybQzIcgwORd2f+QuRT9HG9zBWLKqgp9IEDGhoQotBvMZyewnxBH4iH2h K8eKMQcAaucqSFZCJ/CtOmtCb9M2lIsYL8s5x7ecnR20vz7lnNKPcqKbFXGp1DO8/TnaSX CkKOegXUniR1UPKYiw1XGDMuyVVzw/0JhBH54PHkGoSJFVW3I9uqV6JcWeuP7WBmGHbtP0 VXCGQoNVwhSrgN/mRB0kkyMdrR+VPdhKDtLb2iV+AjPIK7NLDW7Ee8NJi/WDFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692640403; a=rsa-sha256; cv=none; b=ETeH8hiqs9StBqQ2KhTeET5DgcucAnOlANh4fujzx7/gmTDiwa4l6zzruHjdi+VROw2idn c0JCCck5nQyfuyq1IUTg3RW+KHVvaDdRBt4FrrVPDyXy4KnbC77Oi6YwnvYGiIRA4PwIHk ByFLHhIcO1PaLlwMmcqXHoViRJVi535Tx9U3GxyqxYLoZkDT96l9831ToLaNcWucGmjyx0 RuhuVjxIL9d5z6SwNcYghxh0mVVD1nzvvDu9eEvZYVSbkq2M5qiaOQ5eAgFQdZfv6FlRnK 1Fi90fgcOvEioMPuKqctRNI5g6DfmdKxw+pALfAOOaImxU50AUN2HDbmnXc3oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV0Sy6YnSzWj3; Mon, 21 Aug 2023 17:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHrMB1078787; Mon, 21 Aug 2023 17:53:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHrMFl078784; Mon, 21 Aug 2023 17:53:22 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:53:22 GMT Message-Id: <202308211753.37LHrMFl078784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 7addfafe73e0 - main - unifdef: Vendorize. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7addfafe73e077891f003b7cc7a62cfb434f92ec Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7addfafe73e077891f003b7cc7a62cfb434f92ec commit 7addfafe73e077891f003b7cc7a62cfb434f92ec Author: Dag-Erling Smørgrav AuthorDate: 2023-08-21 17:49:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-21 17:52:27 +0000 unifdef: Vendorize. --- usr.bin/unifdef/Makefile | 6 +- usr.bin/unifdef/unifdef.1 | 515 ------------ usr.bin/unifdef/unifdef.c | 1719 ----------------------------------------- usr.bin/unifdef/unifdefall.sh | 61 -- 4 files changed, 3 insertions(+), 2298 deletions(-) diff --git a/usr.bin/unifdef/Makefile b/usr.bin/unifdef/Makefile index 9c2e081b3ba9..82b0c5839f8e 100644 --- a/usr.bin/unifdef/Makefile +++ b/usr.bin/unifdef/Makefile @@ -1,11 +1,11 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 - -.include +.PATH: ${SRCTOP}/contrib/unifdef PROG= unifdef SCRIPTS=unifdefall.sh MLINKS= unifdef.1 unifdefall.1 +.include + HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1 deleted file mode 100644 index eb449525195f..000000000000 --- a/usr.bin/unifdef/unifdef.1 +++ /dev/null @@ -1,515 +0,0 @@ -.\" Copyright (c) 1985, 1991, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" Copyright (c) 2002 - 2015 Tony Finch . All rights reserved. -.\" -.\" This code is derived from software contributed to Berkeley by -.\" Dave Yost. It was rewritten to support ANSI C by Tony Finch. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd December 3, 2015 -.Dt UNIFDEF 1 PRM -.Os " " -.Sh NAME -.Nm unifdef , unifdefall -.Nd remove preprocessor conditionals from code -.Sh SYNOPSIS -.Nm -.Op Fl bBcdehKkmnsStV -.Op Fl I Ns Ar path -.Op Fl [i]D Ns Ar sym Ns Op = Ns Ar val -.Op Fl [i]U Ns Ar sym -.Ar ... -.Op Fl f Ar defile -.Op Fl x Bro Ar 012 Brc -.Op Fl M Ar backext -.Op Fl o Ar outfile -.Op Ar infile ... -.Nm unifdefall -.Op Fl I Ns Ar path -.Ar ... -.Ar file -.Sh DESCRIPTION -The -.Nm -utility selectively processes conditional -.Xr cpp 1 -directives. -It removes from a file -both the directives -and any additional text that they specify should be removed, -while otherwise leaving the file alone. -.Pp -The -.Nm -utility acts on -.Ic #if , #ifdef , #ifndef , -.Ic #elif , #else , -and -.Ic #endif -lines, -using macros specified in -.Fl D -and -.Fl U -command line options or in -.Fl f -definitions files. -A directive is processed -if the macro specifications are sufficient to provide -a definite value for its control expression. -If the result is false, -the directive and the following lines under its control are removed. -If the result is true, -only the directive is removed. -An -.Ic #ifdef -or -.Ic #ifndef -directive is passed through unchanged -if its controlling macro is not specified. -Any -.Ic #if -or -.Ic #elif -control expression that has an unknown value or that -.Nm -cannot parse is passed through unchanged. -By default, -.Nm -ignores -.Ic #if -and -.Ic #elif -lines with constant expressions; -it can be told to process them by specifying the -.Fl k -flag on the command line. -.Pp -It understands a commonly-used subset -of the expression syntax for -.Ic #if -and -.Ic #elif -lines: -integer constants, -integer values of macros defined on the command line, -the -.Fn defined -operator, -the operators -.Ic \&! , ~ , - -(unary), -.Ic * , / , % , + , - , -.Ic < , <= , > , >= , == , != , & , ^ , \&| , -.Ic && , || , -and parenthesized expressions. -Division by zero is treated as an unknown value. -A kind of -.Dq "short circuit" -evaluation is used for the -.Ic && -operator: -if either operand is definitely false then the result is false, -even if the value of the other operand is unknown. -Similarly, -if either operand of -.Ic || -is definitely true then the result is true. -.Pp -When evaluating an expression, -.Nm -does not expand macros first. -The value of a macro must be a simple number, -not an expression. -A limited form of indirection is allowed, -where one macro's value is the name of another. -.Pp -In most cases, -.Nm -does not distinguish between object-like macros -(without arguments) and function-like macros (with arguments). -A function-like macro invocation can appear in -.Ic #if -and -.Ic #elif -control expressions. -If the macro is not explicitly defined, -or is defined with the -.Fl D -flag on the command-line, -or with -.Ic #define -in a -.Fl f -definitions file, -its arguments are ignored. -If a macro is explicitly undefined on the command line with the -.Fl U -flag, -or with -.Ic #undef -in a -.Fl f -definitions file, -it may not have any arguments since this leads to a syntax error. -.Pp -The -.Nm -utility understands just enough about C -to know when one of the directives is inactive -because it is inside -a comment, -or affected by a backslash-continued line. -It spots unusually-formatted preprocessor directives -and knows when the layout is too odd for it to handle. -.Pp -A script called -.Nm unifdefall -can be used to remove all conditional -.Xr cpp 1 -directives from a file. -It uses -.Nm Fl s -and -.Nm cpp Fl dM -to get lists of all the controlling macros -and their definitions (or lack thereof), -then invokes -.Nm -with appropriate arguments to process the file. -.Sh OPTIONS -.Bl -tag -width indent -compact -.It Fl D Ns Ar sym Ns = Ns Ar val -Specify that a macro is defined to a given value. -.Pp -.It Fl D Ns Ar sym -Specify that a macro is defined to the value 1. -.Pp -.It Fl U Ns Ar sym -Specify that a macro is undefined. -.Pp -If the same macro appears in more than one argument, -the last occurrence dominates. -.Pp -.It Fl iD Ns Ar sym Ns Op = Ns Ar val -.It Fl iU Ns Ar sym -C strings, comments, -and line continuations -are ignored within -.Ic #ifdef -and -.Ic #ifndef -blocks -controlled by macros -specified with these options. -.Pp -.It Fl f Ar defile -The file -.Ar defile -contains -.Ic #define -and -.Ic #undef -preprocessor directives, -which have the same effect as the corresponding -.Fl D -and -.Fl U -command-line arguments. -You can have multiple -.Fl f -arguments and mix them with -.Fl D -and -.Fl U -arguments; -later options override earlier ones. -.Pp -Each directive must be on a single line. -Object-like macro definitions (without arguments) -are set to the given value. -Function-like macro definitions (with arguments) -are treated as if they are set to 1. -.Pp -.Em Warning: -string literals and character constants are not parsed correctly in -.Fl f -files. -.Pp -.It Fl b -Replace removed lines with blank lines -instead of deleting them. -Mutually exclusive with the -.Fl B -option. -.Pp -.It Fl B -Compress blank lines around a deleted section. -Mutually exclusive with the -.Fl b -option. -.Pp -.It Fl c -Complement, -i.e., lines that would have been removed or blanked -are retained and vice versa. -.Pp -.It Fl d -Turn on printing of debugging messages. -.Pp -.It Fl e -By default, -.Nm -will report an error if it needs to remove -a preprocessor directive that spans more than one line, -for example, if it has a multi-line -comment hanging off its right hand end. -The -.Fl e -flag makes it ignore the line instead. -.Pp -.It Fl h -Print help. -.Pp -.It Fl I Ns Ar path -Specifies to -.Nm unifdefall -an additional place to look for -.Ic #include -files. -This option is ignored by -.Nm -for compatibility with -.Xr cpp 1 -and to simplify the implementation of -.Nm unifdefall . -.Pp -.It Fl K -Always treat the result of -.Ic && -and -.Ic || -operators as unknown if either operand is unknown, -instead of short-circuiting when unknown operands can't affect the result. -This option is for compatibility with older versions of -.Nm . -.Pp -.It Fl k -Process -.Ic #if -and -.Ic #elif -lines with constant expressions. -By default, sections controlled by such lines are passed through unchanged -because they typically start -.Dq Li "#if 0" -and are used as a kind of comment to sketch out future or past development. -It would be rude to strip them out, just as it would be for normal comments. -.Pp -.It Fl m -Modify one or more input files in place. -If an input file is not modified, -the original is preserved instead of being overwritten with an identical copy. -.Pp -.It Fl M Ar backext -Modify input files in place, and keep backups of the original files by -appending the -.Ar backext -to the input filenames. -A zero length -.Ar backext -behaves the same as the -.Fl m -option. -.Pp -.It Fl n -Add -.Li #line -directives to the output following any deleted lines, -so that errors produced when compiling the output file correspond to -line numbers in the input file. -.Pp -.It Fl o Ar outfile -Write output to the file -.Ar outfile -instead of the standard output when processing a single file. -.Pp -.It Fl s -Instead of processing an input file as usual, -this option causes -.Nm -to produce a list of macros that are used in -preprocessor directive controlling expressions. -.Pp -.It Fl S -Like the -.Fl s -option, but the nesting depth of each macro is also printed. -This is useful for working out the number of possible combinations -of interdependent defined/undefined macros. -.Pp -.It Fl t -Disables parsing for C strings, comments, -and line continuations, -which is useful -for plain text. -This is a blanket version of the -.Fl iD -and -.Fl iU -flags. -.Pp -.It Fl V -Print version details. -.Pp -.It Fl x Bro Ar 012 Brc -Set exit status mode to zero, one, or two. -See the -.Sx EXIT STATUS -section below for details. -.El -.Pp -The -.Nm -utility takes its input from -.Em stdin -if there are no -.Ar file -arguments. -You must use the -.Fl m -or -.Fl M -options if there are multiple input files. -You can specify input from stdin or output to stdout with -.Ql - . -.Pp -The -.Nm -utility works nicely with the -.Fl D Ns Ar sym -option of -.Xr diff 1 . -.Sh EXIT STATUS -In normal usage the -.Nm -utility's exit status depends on the mode set using the -.Fl x -option. -.Pp -If the exit mode is zero (the default) then -.Nm -exits with status 0 if the output is an exact copy of the input, -or with status 1 if the output differs. -.Pp -If the exit mode is one, -.Nm -exits with status 1 if the output is unmodified -or 0 if it differs. -.Pp -If the exit mode is two, -.Nm -exits with status zero in both cases. -.Pp -In all exit modes, -.Nm -exits with status 2 if there is an error. -.Pp -The exit status is 0 if the -.Fl h -or -.Fl V -command line options are given. -.Sh DIAGNOSTICS -.Bl -item -.It -.Tn EOF -in comment -.It -Inappropriate -.Ic #elif , -.Ic #else -or -.Ic #endif -.It -Missing macro name in #define or #undef -.It -Obfuscated preprocessor control line -.It -Premature -.Tn EOF -(with the line number of the most recent unterminated -.Ic #if ) -.It -Too many levels of nesting -.It -Unrecognized preprocessor directive -.It -Unterminated char or string literal -.El -.Sh SEE ALSO -.Xr cpp 1 , -.Xr diff 1 -.Pp -The unifdef home page is -.Pa https://dotat.at/prog/unifdef -.Sh HISTORY -The -.Nm -command appeared in -.Bx 2.9 . -.Tn ANSI\~C -support was added in -.Fx 4.7 . -.Sh AUTHORS -.An -nosplit -The original implementation was written by -.An Dave Yost Aq Mt Dave@Yost.com . -.An Tony Finch Aq Mt dot@dotat.at -rewrote it to support -.Tn ANSI\~C . -.Sh BUGS -Expression evaluation is very limited. -.Pp -Character constants are not evaluated. -String literals and character constants in -.Fl f -definition files are ignored rather than parsed as -part of a macro's replacement tokens. -.Pp -Handling one line at a time means -preprocessor directives split across more than one physical line -(because of comments or backslash-newline) -cannot be handled in every situation. -.Pp -Trigraphs are not recognized. -.Pp -There is no support for macros with different definitions at -different points in the source file. -.Pp -The text-mode and ignore functionality does not correspond to modern -.Xr cpp 1 -behaviour. diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c deleted file mode 100644 index 598c66e3ab06..000000000000 --- a/usr.bin/unifdef/unifdef.c +++ /dev/null @@ -1,1719 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2002 - 2015 Tony Finch - * - * 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. - */ - -/* - * unifdef - remove ifdef'ed lines - * - * This code was derived from software contributed to Berkeley by Dave Yost. - * It was rewritten to support ANSI C by Tony Finch. The original version - * of unifdef carried the 4-clause BSD copyright licence. None of its code - * remains in this version (though some of the names remain) so it now - * carries a more liberal licence. - * - * Wishlist: - * provide an option which will append the name of the - * appropriate symbol after #else's and #endif's - * provide an option which will check symbols after - * #else's and #endif's to see that they match their - * corresponding #ifdef or #ifndef - * - * These require better buffer handling, which would also make - * it possible to handle all "dodgy" directives correctly. - */ - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static const char copyright[] = - "@(#) $Version: unifdef-2.11 $\n" - "@(#) $FreeBSD$\n" - "@(#) $Author: Tony Finch (dot@dotat.at) $\n" - "@(#) $URL: https://dotat.at/prog/unifdef $\n" -; - -/* types of input lines: */ -typedef enum { - LT_TRUEI, /* a true #if with ignore flag */ - LT_FALSEI, /* a false #if with ignore flag */ - LT_IF, /* an unknown #if */ - LT_TRUE, /* a true #if */ - LT_FALSE, /* a false #if */ - LT_ELIF, /* an unknown #elif */ - LT_ELTRUE, /* a true #elif */ - LT_ELFALSE, /* a false #elif */ - LT_ELSE, /* #else */ - LT_ENDIF, /* #endif */ - LT_DODGY, /* flag: directive is not on one line */ - LT_DODGY_LAST = LT_DODGY + LT_ENDIF, - LT_PLAIN, /* ordinary line */ - LT_EOF, /* end of file */ - LT_ERROR, /* unevaluable #if */ - LT_COUNT -} Linetype; - -static char const * const linetype_name[] = { - "TRUEI", "FALSEI", "IF", "TRUE", "FALSE", - "ELIF", "ELTRUE", "ELFALSE", "ELSE", "ENDIF", - "DODGY TRUEI", "DODGY FALSEI", - "DODGY IF", "DODGY TRUE", "DODGY FALSE", - "DODGY ELIF", "DODGY ELTRUE", "DODGY ELFALSE", - "DODGY ELSE", "DODGY ENDIF", - "PLAIN", "EOF", "ERROR" -}; - -#define linetype_if2elif(lt) ((Linetype)(lt - LT_IF + LT_ELIF)) -#define linetype_2dodgy(lt) ((Linetype)(lt + LT_DODGY)) - -/* state of #if processing */ -typedef enum { - IS_OUTSIDE, - IS_FALSE_PREFIX, /* false #if followed by false #elifs */ - IS_TRUE_PREFIX, /* first non-false #(el)if is true */ - IS_PASS_MIDDLE, /* first non-false #(el)if is unknown */ - IS_FALSE_MIDDLE, /* a false #elif after a pass state */ - IS_TRUE_MIDDLE, /* a true #elif after a pass state */ - IS_PASS_ELSE, /* an else after a pass state */ - IS_FALSE_ELSE, /* an else after a true state */ - IS_TRUE_ELSE, /* an else after only false states */ - IS_FALSE_TRAILER, /* #elifs after a true are false */ - IS_COUNT -} Ifstate; - -static char const * const ifstate_name[] = { - "OUTSIDE", "FALSE_PREFIX", "TRUE_PREFIX", - "PASS_MIDDLE", "FALSE_MIDDLE", "TRUE_MIDDLE", - "PASS_ELSE", "FALSE_ELSE", "TRUE_ELSE", - "FALSE_TRAILER" -}; - -/* state of comment parser */ -typedef enum { - NO_COMMENT = false, /* outside a comment */ - C_COMMENT, /* in a comment like this one */ - CXX_COMMENT, /* between // and end of line */ - STARTING_COMMENT, /* just after slash-backslash-newline */ - FINISHING_COMMENT, /* star-backslash-newline in a C comment */ - CHAR_LITERAL, /* inside '' */ - STRING_LITERAL /* inside "" */ -} Comment_state; - -static char const * const comment_name[] = { - "NO", "C", "CXX", "STARTING", "FINISHING", "CHAR", "STRING" -}; - -/* state of preprocessor line parser */ -typedef enum { - LS_START, /* only space and comments on this line */ - LS_HASH, /* only space, comments, and a hash */ - LS_DIRTY /* this line can't be a preprocessor line */ -} Line_state; - -static char const * const linestate_name[] = { - "START", "HASH", "DIRTY" -}; - -/* - * Minimum translation limits from ISO/IEC 9899:1999 5.2.4.1 - */ -#define MAXDEPTH 64 /* maximum #if nesting */ -#define MAXLINE 4096 /* maximum length of line */ - -/* - * Sometimes when editing a keyword the replacement text is longer, so - * we leave some space at the end of the tline buffer to accommodate this. - */ -#define EDITSLOP 10 - -/* - * C17/18 allow 63 characters per macro name, but up to 127 arbitrarily large - * parameters. - */ -struct macro { - RB_ENTRY(macro) entry; - const char *name; - const char *value; - bool ignore; /* -iDsym or -iUsym */ -}; - -static int -macro_cmp(struct macro *a, struct macro *b) -{ - return (strcmp(a->name, b->name)); -} - -static RB_HEAD(MACROMAP, macro) macro_tree = RB_INITIALIZER(¯o_tree); -RB_GENERATE_STATIC(MACROMAP, macro, entry, macro_cmp); - -/* - * Globals. - */ - -static bool compblank; /* -B: compress blank lines */ -static bool lnblank; /* -b: blank deleted lines */ -static bool complement; /* -c: do the complement */ -static bool debugging; /* -d: debugging reports */ -static bool inplace; /* -m: modify in place */ -static bool iocccok; /* -e: fewer IOCCC errors */ -static bool strictlogic; /* -K: keep ambiguous #ifs */ -static bool killconsts; /* -k: eval constant #ifs */ -static bool lnnum; /* -n: add #line directives */ -static bool symlist; /* -s: output symbol list */ -static bool symdepth; /* -S: output symbol depth */ -static bool text; /* -t: this is a text file */ - -static FILE *input; /* input file pointer */ -static const char *filename; /* input file name */ -static int linenum; /* current line number */ -static const char *linefile; /* file name for #line */ -static FILE *output; /* output file pointer */ -static const char *ofilename; /* output file name */ -static const char *backext; /* backup extension */ -static char *tempname; /* avoid splatting input */ - -static char tline[MAXLINE+EDITSLOP];/* input buffer plus space */ -static char *keyword; /* used for editing #elif's */ - -/* - * When processing a file, the output's newline style will match the - * input's, and unifdef correctly handles CRLF or LF endings whatever - * the platform's native style. The stdio streams are opened in binary - * mode to accommodate platforms whose native newline style is CRLF. - * When the output isn't a processed input file (when it is error / - * debug / diagnostic messages) then unifdef uses native line endings. - */ - -static const char *newline; /* input file format */ -static const char newline_unix[] = "\n"; -static const char newline_crlf[] = "\r\n"; - -static Comment_state incomment; /* comment parser state */ -static Line_state linestate; /* #if line parser state */ -static Ifstate ifstate[MAXDEPTH]; /* #if processor state */ -static bool ignoring[MAXDEPTH]; /* ignore comments state */ -static int stifline[MAXDEPTH]; /* start of current #if */ -static int depth; /* current #if nesting */ -static int delcount; /* count of deleted lines */ -static unsigned blankcount; /* count of blank lines */ -static unsigned blankmax; /* maximum recent blankcount */ -static bool constexpr; /* constant #if expression */ -static bool zerosyms; /* to format symdepth output */ -static bool firstsym; /* ditto */ - -static int exitmode; /* exit status mode */ -static int exitstat; /* program exit status */ -static bool altered; /* was this file modified? */ - -static void addsym1(bool, bool, char *); -static void addsym2(bool, const char *, const char *); -static char *astrcat(const char *, const char *); -static void cleantemp(void); -static void closeio(void); -static void debug(const char *, ...); -static void debugsym(const char *, const struct macro *); -static bool defundef(void); -static void defundefile(const char *); -static void done(void); -static void error(const char *); -static struct macro *findsym(const char **); -static void flushline(bool); -static void hashline(void); -static void help(void); -static Linetype ifeval(const char **); -static void ignoreoff(void); -static void ignoreon(void); -static void indirectsym(void); -static void keywordedit(const char *); -static const char *matchsym(const char *, const char *); -static void nest(void); -static Linetype parseline(void); -static void process(void); -static void processinout(const char *, const char *); -static const char *skipargs(const char *); -static const char *skipcomment(const char *); -static const char *skiphash(void); -static const char *skipline(const char *); -static const char *skipsym(const char *); -static void state(Ifstate); -static void unnest(void); -static void usage(void); -static void version(void); -static const char *xstrdup(const char *, const char *); - -#define endsym(c) (!isalnum((unsigned char)c) && c != '_') - -static FILE * -mktempmode(char *tmp, int mode) -{ - int rc, fd; - - mode &= (S_IRWXU|S_IRWXG|S_IRWXO); - fd = mkstemp(tmp); - if (fd < 0) - err(2, "can't create %s", tmp); - rc = fchmod(fd, mode); - if (rc < 0) - err(2, "can't fchmod %s mode=0o%o", tmp, mode); - return (fdopen(fd, "wb")); -} - -/* - * The main program. - */ -int -main(int argc, char *argv[]) -{ - int opt; - - while ((opt = getopt(argc, argv, "i:D:U:f:I:M:o:x:bBcdehKklmnsStV")) != -1) - switch (opt) { - case 'i': /* treat stuff controlled by these symbols as text */ - /* - * For strict backwards-compatibility the U or D - * should be immediately after the -i but it doesn't - * matter much if we relax that requirement. - */ - opt = *optarg++; - if (opt == 'D') - addsym1(true, true, optarg); - else if (opt == 'U') - addsym1(true, false, optarg); - else - usage(); - break; - case 'D': /* define a symbol */ - addsym1(false, true, optarg); - break; - case 'U': /* undef a symbol */ - addsym1(false, false, optarg); - break; - case 'I': /* no-op for compatibility with cpp */ - break; - case 'b': /* blank deleted lines instead of omitting them */ - case 'l': /* backwards compatibility */ - lnblank = true; - break; - case 'B': /* compress blank lines around removed section */ - compblank = true; - break; - case 'c': /* treat -D as -U and vice versa */ - complement = true; - break; - case 'd': - debugging = true; - break; - case 'e': /* fewer errors from dodgy lines */ - iocccok = true; - break; - case 'f': /* definitions file */ - defundefile(optarg); - break; - case 'h': - help(); - break; - case 'K': /* keep ambiguous #ifs */ - strictlogic = true; - break; - case 'k': /* process constant #ifs */ - killconsts = true; - break; - case 'm': /* modify in place */ - inplace = true; - break; - case 'M': /* modify in place and keep backup */ - inplace = true; - if (strlen(optarg) > 0) - backext = optarg; - break; - case 'n': /* add #line directive after deleted lines */ - lnnum = true; - break; - case 'o': /* output to a file */ - ofilename = optarg; - break; - case 's': /* only output list of symbols that control #ifs */ - symlist = true; - break; - case 'S': /* list symbols with their nesting depth */ - symlist = symdepth = true; - break; - case 't': /* don't parse C comments */ - text = true; - break; - case 'V': - version(); - break; - case 'x': - exitmode = atoi(optarg); - if(exitmode < 0 || exitmode > 2) - usage(); - break; - default: - usage(); - } - argc -= optind; - argv += optind; - if (compblank && lnblank) - errx(2, "-B and -b are mutually exclusive"); - if (symlist && (ofilename != NULL || inplace || argc > 1)) - errx(2, "-s only works with one input file"); - if (argc > 1 && ofilename != NULL) - errx(2, "-o cannot be used with multiple input files"); - if (argc > 1 && !inplace) - errx(2, "multiple input files require -m or -M"); - if (argc == 0 && inplace) - errx(2, "-m requires an input file"); - if (argc == 0) - argc = 1; - if (argc == 1 && !inplace && ofilename == NULL) - ofilename = "-"; - indirectsym(); - - atexit(cleantemp); - if (ofilename != NULL) - processinout(*argv, ofilename); - else while (argc-- > 0) { - processinout(*argv, *argv); - argv++; - } - switch(exitmode) { - case(0): exit(exitstat); - case(1): exit(!exitstat); - case(2): exit(0); - default: abort(); /* bug */ - } -} - -/* - * File logistics. - */ *** 1363 LINES SKIPPED *** From nobody Mon Aug 21 19:28: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 4RV2Zz5LZFz4rD7p; Mon, 21 Aug 2023 19:28: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 4RV2Zz4vwDz4S8K; Mon, 21 Aug 2023 19:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692646123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GoxASbix1rVdwZhMvQf43ZGkfH8YgceE9HlVfd4Ql0k=; b=I6tJASdkk+KpkV5673yn6trp9zLfuYv9loztqq8zRHbocNCaX8Um6lQXswxuycnEIWoudu xGzxxeVWZkbgGyNk7EdvD1E+QCPyDU1rFhD/fbxY/75tXXXhxPBlqrRcKpEk3sTI8kAM+e jujPkjxLDV5TR5/uzWGmP/uIOxqRLk1QKx88tAavy9dlihwz2NC+ekwq0VFJlLXKy4if89 AfcI4u/IMGkWJeIwtMrfdI9/wFKbTKuQwfM/BVTfyrIddKL5nM/Lz48ZpNnpKd3ezQsJKx +vKflu3Wswv/4VSvFd9LmeebSu/HYJD3VD1rrkF7YahhwYvrGkdrDic3rr103Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692646123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GoxASbix1rVdwZhMvQf43ZGkfH8YgceE9HlVfd4Ql0k=; b=W6jvvLXKKfDQ38P0CX4IbkqPF6Jp8e9XlFIgh+JcUAb/NzGQOvRQfbjP5hBT2mQ2bT/tcR +Z++RxgI7VfwxWRmNsRFge8ddyzG0dGQu/BxJ0Q4zJZ5w1RFOa0M3kcOaa77Enj2gbdaOF xU/AweX3WSa3HiqodB9B/pRK/ARGPzkWq7s+DxXu5Q/n+Q1pLinlw07rkJWi7ky4viyCxl +9tygzS5ybQ/9GXdsoBLuOiHd4P47O9oA/q1XSBYJFAuVLVgw32qDG/A6MMelURyU82cU7 SAD9s834bkwW6EPPkZiI2P7xyyz6f6ljeHt2mI/lsLXDTng75IibOapNvVrYdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692646123; a=rsa-sha256; cv=none; b=IdksLa/ONmUyD6EBX3Xk715l86Ja0BY8e1ZgNp3RxHbQsmxJzqZNaho9tkGlTeC26KLPSu onnKQ0ZMTlBkas4JIKFvKN/VCcsFso7pCoCqe2Zdr1USJSNQdF7ZvVnDIgZ3zX4NV7Skh9 /9PSDL8NN0dbUFsOb6po75s1iJIWTY/fD7O/yX6o2E6VzUPPHSZVZXJfGv5xEFlnTX0q/H l6luH+7L+O4x8RN8fsAIraWqMcmhssU6ggf1nU8uGSo+E68gZyfaHeuUr79T2JAbjBdvlI 8lZNmm2K7mFy93QACBLBzKh/uEutyjYEZlpHGS2Cyc9z1Bg1FaslKrZUj9KdIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV2Zz41vrzYFr; Mon, 21 Aug 2023 19:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LJShPi031035; Mon, 21 Aug 2023 19:28:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LJShUF031032; Mon, 21 Aug 2023 19:28:43 GMT (envelope-from git) Date: Mon, 21 Aug 2023 19:28:43 GMT Message-Id: <202308211928.37LJShUF031032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 9fbea870286d - main - lib/libc/amd64/string/stpcpy.S: add baseline implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fbea870286d53d906ffaf6b15ace8e40019a880 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=9fbea870286d53d906ffaf6b15ace8e40019a880 commit 9fbea870286d53d906ffaf6b15ace8e40019a880 Author: Robert Clausecker AuthorDate: 2023-07-05 21:23:33 +0000 Commit: Robert Clausecker CommitDate: 2023-08-21 18:59:38 +0000 lib/libc/amd64/string/stpcpy.S: add baseline implementation This commit adds a baseline implementation of stpcpy(3) for amd64. It performs quite well in comparison to the previous scalar implementation as well as agains bionic and glibc (though glibc is faster for very long strings). Fiddle with the Makefile to also have strcpy(3) call into the optimised stpcpy(3) code, fixing an oversight from D9841. Sponsored by: The FreeBSD Foundation Reviewed by: imp ngie emaste Approved by: mjg kib Fixes: D9841 Differential Revision: https://reviews.freebsd.org/D41349 --- lib/libc/amd64/string/Makefile.inc | 3 +- lib/libc/amd64/string/stpcpy.S | 143 ++++++++++++++++++++++++++++++++++--- 2 files changed, 135 insertions(+), 11 deletions(-) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 3bc36078768b..4df4ff8f1417 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -6,8 +6,9 @@ MDSRCS+= \ memcpy.S \ memmove.S \ memset.S \ + stpcpy.S \ strcat.S \ strchrnul.S \ strcmp.S \ strlen.S \ - stpcpy.S + strcpy.c diff --git a/lib/libc/amd64/string/stpcpy.S b/lib/libc/amd64/string/stpcpy.S index 73c765556dc1..59358e3245a8 100644 --- a/lib/libc/amd64/string/stpcpy.S +++ b/lib/libc/amd64/string/stpcpy.S @@ -1,10 +1,30 @@ -/* - * Adapted by Guillaume Morin from strcpy.S - * written by J.T. Conklin - * Public domain. +/*- + * Copyright (c) 2023, The FreeBSD Foundation + * + * SPDX-License-Expression: BSD-2-Clause + * + * Portions of this software were developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Adapted from NetBSD's common/lib/libc/arch/x86_64/string/strcpy.S + * written by J.T. Conklin and + * adapted by Guillaume Morin to implement stpcpy + * that was originally dedicated to the public domain */ #include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + + .weak stpcpy + .set stpcpy, __stpcpy +ARCHFUNCS(__stpcpy) + ARCHFUNC(__stpcpy, scalar) + ARCHFUNC(__stpcpy, baseline) +ENDARCHFUNCS(__stpcpy) + /* * This stpcpy implementation copies a byte at a time until the * source pointer is aligned to a word boundary, it then copies by @@ -18,9 +38,7 @@ * requirements. */ - .globl stpcpy,__stpcpy -ENTRY(stpcpy) -__stpcpy: +ARCHENTRY(__stpcpy, scalar) movabsq $0x0101010101010101,%r8 movabsq $0x8080808080808080,%r9 @@ -41,7 +59,7 @@ __stpcpy: dec %rax ret - .p2align 4 + ALIGN_TEXT .Lloop: movq %rdx,(%rdi) addq $8,%rdi @@ -109,6 +127,111 @@ __stpcpy: .Ldone: movq %rdi,%rax ret -END(stpcpy) - +ARCHEND(__stpcpy, scalar) + +ARCHENTRY(__stpcpy, baseline) + mov %esi, %ecx + mov %rdi, %rdx + sub %rsi, %rdi # express destination as distance to surce + and $~0xf, %rsi # align source to 16 byte + movdqa (%rsi), %xmm0 # head of string with junk before + pxor %xmm1, %xmm1 + and $0xf, %ecx # misalignment in bytes + pcmpeqb %xmm1, %xmm0 # NUL byte present? + pmovmskb %xmm0, %eax + shr %cl, %eax # clear out matches in junk bytes + bsf %eax, %eax # find match if any + jnz .Lrunt + + /* first normal iteration: write head back if it succeeds */ + movdqa 16(%rsi), %xmm0 # 16 bytes of current iteration + movdqu (%rsi, %rcx, 1), %xmm2 # first 16 bytes of the string + pcmpeqb %xmm0, %xmm1 # NUL byte present? + pmovmskb %xmm1, %eax + test %eax, %eax # find match if any + jnz .Lshorty + + movdqu %xmm2, (%rdx) # store beginning of string + + /* main loop, unrolled twice */ + ALIGN_TEXT +0: movdqa 32(%rsi), %xmm2 # load current iteraion + movdqu %xmm0, 16(%rsi, %rdi, 1) # write back previous iteraion + pxor %xmm1, %xmm1 + add $32, %rsi + pcmpeqb %xmm2, %xmm1 # NUL byte present? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 1f + + movdqa 16(%rsi), %xmm0 # load current iteraion + movdqu %xmm2, (%rsi, %rdi, 1) # write back previous iteraion + pxor %xmm1, %xmm1 + pcmpeqb %xmm0, %xmm1 # NUL byte present? + pmovmskb %xmm1, %eax + test %eax, %eax + jz 0b + + /* end of string after main loop has iterated */ + add $16, %rsi # advance rsi to second unrolled half +1: tzcnt %eax, %eax # find location of match + # (behaves as bsf on pre-x86-64-v3 CPUs) + add %rsi, %rax # point to NUL byte + movdqu -15(%rax), %xmm0 # last 16 bytes of string + movdqu %xmm0, -15(%rax, %rdi, 1) # copied to destination + add %rdi, %rax # point to destination's NUL byte + ret + + /* NUL encountered in second iteration */ +.Lshorty: + tzcnt %eax, %eax + add $16, %eax # account for length of first iteration + sub %ecx, %eax # but not the parts before the string + + /* NUL encountered in first iteration */ +.Lrunt: lea 1(%rax), %edi # string length including NUL byte + add %rcx, %rsi # point to beginning of string + add %rdx, %rax # point to NUL byte + + /* transfer 16--32 bytes */ +.L1632: cmp $16, %edi + jb .L0815 + + movdqu -16(%rsi, %rdi, 1), %xmm0 # load last 16 bytes + movdqu %xmm2, (%rdx) # store first 16 bytes + movdqu %xmm0, -15(%rax) # store last 16 bytes + ret + + /* transfer 8--15 bytes */ +.L0815: cmp $8, %edi + jb .L0407 + + mov (%rsi), %rcx # load first 8 bytes + mov -8(%rsi, %rdi, 1), %rdi # load last 8 bytes + mov %rcx, (%rdx) # store to dst + mov %rdi, -7(%rax) # dito + ret + + /* transfer 4--7 bytes */ +.L0407: cmp $4, %edi + jb .L0203 + + mov (%rsi), %ecx + mov -4(%rsi, %rdi, 1), %edi + mov %ecx, (%rdx) + mov %edi, -3(%rax) + ret + + /* transfer 2--3 bytes */ +.L0203: cmp $2, %edi + jb .L0101 + + movzwl (%rsi), %ecx + mov %cx, (%rdx) # store first two bytes + + /* transfer 0 bytes (last byte is always NUL) */ +.L0101: movb $0, (%rax) # store terminating NUL byte + ret +ARCHEND(__stpcpy, baseline) + .section .note.GNU-stack,"",%progbits From nobody Mon Aug 21 19:28: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 4RV2b10dsjz4rCvh; Mon, 21 Aug 2023 19:28: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 4RV2b05cWcz4Rvb; Mon, 21 Aug 2023 19:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692646124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MI/6qk+S4C1O4QhPQ/H9c1AHtx5EjXL2WrbSTPIROSc=; b=SZ6owwcfmZAAno6g5sarkzxX9p/K1dpaMYw/NnbT1nJbP/P5FRaAf0mI9Sxeu5haMjkGTx QePjkwugCRWTVzl442+rpb5EDbODIQgHhNPb0oMNfn1BaVA6VSxbS7a2MXplvbckqCmOcq 0n02TzkUNhNSjcJJub+OjMox+ov4mLmUqDucJiwXLdAQzFc2kDf4Tgq3JqEEo8OZgLxvuQ 4MAsLnPLiVx6a+jOSi0JxeDFnTmEgS3eK+Wuqo4nGt4VsLaKgZeRs47aGdoQhYoM90Etgc u14nGqC+JVoC0nriYdRP0s2MJHdxOnr7+f4pOCRQtPQN0v+SNGJKvjbDk1Qgaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692646124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MI/6qk+S4C1O4QhPQ/H9c1AHtx5EjXL2WrbSTPIROSc=; b=EWOM+xJabH9qFA+rwKYnvJOx+BDs5hBzm5ao6ol2LS5OVK7wp5HuqNesHPScCJs7WlE61o 1/BMO7QPoU1VZs0cKtkORfDsc69xm3ucf8awinou4xDpYcuZyeDTBWknyGiRzt7yT9eF37 1BX71hJ7kFkefsJH/EzxumltaGY/6FuwUjCfOBCSO+M0+0em3hy4RQPyf5dhFSae9NUScX AxCNC0mY3I8L94CQ0L1EW5JOdsAfFHBSoavcki8xAkYzcO/UcIwJN73gV0xvcjSH5uLlT3 DRliDkugyxPPrVO2vY84jOBuI8SuhW+XtWIjwzjRfKJQ3fhJtySF9wURCA/AJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692646124; a=rsa-sha256; cv=none; b=nmL7aWDK7P/HeXGXRJCzjori86FJ5waI+iUoAdiHOqi3+0ka0+16LquQ+mroUnkq4W7lnF PpFG8hZnJH9gYG+PTu9GyIJHo47H2OfJ8XqUvLjiP2iJ9rrGzBQfUw4wHJsdzqReIucLqm GGjlUXlaIW7FXkta4M20HJBJi725r7z2jMEN/uMgb16vkDguCAWuJJFkpSP8sG5tBzw4Zg WFMaLIUY7sowyRudmHueliaz1pwONIgKOhw9jBuh6rw/oYgygPTzhSAjmoTpHXin1xjr1s dGtN2RhXcCYkb+VCJkCFOQhIcp2f881vUwf5hDnEMPAFBd0+te3ahnZqFQ1IFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV2b04kHWzYFs; Mon, 21 Aug 2023 19:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LJSipT031074; Mon, 21 Aug 2023 19:28:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LJSi6d031071; Mon, 21 Aug 2023 19:28:44 GMT (envelope-from git) Date: Mon, 21 Aug 2023 19:28:44 GMT Message-Id: <202308211928.37LJSi6d031071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 245fee96c0a5 - main - share/man/man7/simd.7: document SIMD-enhanced stpcpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 245fee96c0a55ae04e432131a7f0aa34fe19ebce Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=245fee96c0a55ae04e432131a7f0aa34fe19ebce commit 245fee96c0a55ae04e432131a7f0aa34fe19ebce Author: Robert Clausecker AuthorDate: 2023-07-07 18:11:04 +0000 Commit: Robert Clausecker CommitDate: 2023-08-21 19:04:07 +0000 share/man/man7/simd.7: document SIMD-enhanced stpcpy() Sponsored by: The FreeBSD Foundation Approved by: mjg kib Differential Revision: https://reviews.freebsd.org/D41349 --- share/man/man7/simd.7 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 9df1b47a8866..928f40cb00f2 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd August 5, 2023 +.Dd August 7, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -63,12 +63,12 @@ Enhanced functions are present in the following architectures: .It memmove Ta S Ta S Ta S Ta S Ta SV .It memset Ta Ta S Ta S Ta S .It rindex Ta S -.It stpcpy Ta Ta Ta S +.It stpcpy Ta Ta Ta S1 .It strcat Ta Ta Ta S Ta S .It strchr Ta S Ta Ta S1 Ta S .It strchrnul Ta Ta Ta S1 .It strcmp Ta Ta S Ta S Ta S -.It strcpy Ta Ta Ta S Ta S Ta S2 +.It strcpy Ta Ta Ta S1 Ta S Ta S2 .It strlen Ta Ta S Ta S1 .It strncmp Ta Ta S Ta Ta S .It strncpy Ta Ta Ta Ta Ta S2 From nobody Mon Aug 21 19:28: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 4RV2b20lhNz4rCvl; Mon, 21 Aug 2023 19:28: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 4RV2b16kxKz4S8d; Mon, 21 Aug 2023 19:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692646126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F/OIf5293LFr1K1FESvqTcKejV0oaQ25L1iQbTLdpjo=; b=RqlThCi8ZjGtvCs8RdTN3M0onyPyffSzgy2fStRZJSEyHG/eWH2Qeui7m3EpcHludiZ77z B1lqG7jJql/2e6a2p3IG3w0lKexna+6Pf2Kj1fpSbqhqT3DxwjpE+m61f7N+Z1Y8vdms0D s/OBZKjAZ6sHXajmo9jhGG1eknNiHozq7LrEq3wqX09XXGCbhGfVzbA9Io9BJe5B1yTIes lq+ZcXwscoYx3MpAwPknviaZAbZYqbCzYZZrN7y0T38hV2Aq305qpsHtScgKnoho1cvv+Y 5pcnGTcVAa3H0J5xJPrXnKKA/7YaO/CM6bbNRVbugeIo1CwfmMhnEf8B9FXrGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692646126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F/OIf5293LFr1K1FESvqTcKejV0oaQ25L1iQbTLdpjo=; b=MidOKmQCjB2ARosAZxeEmEhHDrE0FDKhrKgol01eE9Co6/NDRtfH9TVwOe7NpuFcsSzuDr OGcNbnyno5WJQdZACp8r2MB0jbBkkDVzvUn4sTE9YwyPBlFbrLlagKLyPH+bEaAEMU7zpa F1bNF9xDu6gJ4Z2T9En/oimL+TC3Bql1VFh8yrG+BMv+VyQyQ6XQ1g5/UDcVN+DwK8AmMi imR+E+/1etDhya1VOD8UG+8OLCh+xvDVqLERoAqf5zjwfCemgqdpoC9zaJ0F6CP+UPHF+z EjyLtTEGs7YwgjLUjFx+ewtIbzy0Uqlt5G1s0yn7M1JiSxoScfxqQ1zE5jSQUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692646126; a=rsa-sha256; cv=none; b=vjQ/hDI1cfZadU0kp/LrxpCruPLOmCW8UgrHOubNPXhb4NiPTpJuvtRvjwENq9ciVzOO4q tAMT0Of9o1fzi2upc8O2zf/q4t3cS95puST6uJexGaFmFsmOAFI9h7gbQLLcghRPNgqG1m vZQ2Mo/7v08eieRUxeSKvPR5UV9OR0WXLsIMPG2ckvfvgzCbOQ7Sou89XNqiVNWXI8Dl7j RT1cMx+DNcHpBeL+SbCnL1bz2Gah8tpvm+rQoFsOOFcCZo/V/Wir+OLibn+w9IpyOhfTiU Q9VkTNTOjPFm2s6L0yge3E+iIRMcWpNuDBtgbLkOT/DpnOcfHmeO/oYAnlDzVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV2b15pPFzYNb; Mon, 21 Aug 2023 19:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LJSjrN031113; Mon, 21 Aug 2023 19:28:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LJSjW3031110; Mon, 21 Aug 2023 19:28:45 GMT (envelope-from git) Date: Mon, 21 Aug 2023 19:28:45 GMT Message-Id: <202308211928.37LJSjW3031110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 8803f01e9322 - main - lib/libc/amd64/string/memcmp.S: add baseline implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8803f01e932275cd405690526bb8dba031a02ffe Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=8803f01e932275cd405690526bb8dba031a02ffe commit 8803f01e932275cd405690526bb8dba031a02ffe Author: Robert Clausecker AuthorDate: 2023-07-12 13:35:13 +0000 Commit: Robert Clausecker CommitDate: 2023-08-21 19:19:46 +0000 lib/libc/amd64/string/memcmp.S: add baseline implementation This changeset adds a baseline implementation of memcmp and bcmp for amd64. The same code is used for both functions with conditional code were the behaviour differs (we need more precise output for the memcmp case). FreeBSD documents that memcmp returns the difference between the mismatching characters. Slightly faster code would be possible could we relax this requirement to the ISO/IEC 9899:1999 requirement of merely returning a negative/positive integer or zero. Performance is better than bionic and glibc, except for long strings were the two are 13% faster. This could be because they use SSE4 ptest which we cannot use in a baseline kernel. Sponsored by: The FreeBSD Foundation Approved by: mjg Differential Revision: https://reviews.freebsd.org/D41442 --- lib/libc/amd64/string/memcmp.S | 181 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 175 insertions(+), 6 deletions(-) diff --git a/lib/libc/amd64/string/memcmp.S b/lib/libc/amd64/string/memcmp.S index fea5cebc65f2..d192229677b3 100644 --- a/lib/libc/amd64/string/memcmp.S +++ b/lib/libc/amd64/string/memcmp.S @@ -1,9 +1,12 @@ /*- - * Copyright (c) 2018 The FreeBSD Foundation + * Copyright (c) 2018, 2023 The FreeBSD Foundation * * This software was developed by Mateusz Guzik * under sponsorship from the FreeBSD Foundation. * + * Portions of this software were developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -27,6 +30,10 @@ */ #include +#include + +#include "amd64_archlevel.h" + /* * Note: this routine was written with kernel use in mind (read: no simd), * it is only present in userspace as a temporary measure until something @@ -36,10 +43,15 @@ #define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ #ifdef BCMP -ENTRY(bcmp) -#else -ENTRY(memcmp) +#define memcmp bcmp #endif + +ARCHFUNCS(memcmp) + ARCHFUNC(memcmp, scalar) + ARCHFUNC(memcmp, baseline) +ENDARCHFUNCS(memcmp) + +ARCHENTRY(memcmp, scalar) xorl %eax,%eax 10: cmpq $16,%rdx @@ -157,7 +169,6 @@ ENTRY(memcmp) 1: leal 1(%eax),%eax ret -END(bcmp) #else /* * We need to compute the difference between strings. @@ -230,7 +241,165 @@ END(bcmp) 2: subl %r8d,%eax ret -END(memcmp) #endif +ARCHEND(memcmp, scalar) + +ARCHENTRY(memcmp, baseline) + cmp $32, %rdx # enough to permit use of the long kernel? + ja .Llong + + test %rdx, %rdx # zero bytes buffer? + je .L0 + + /* + * Compare strings of 1--32 bytes. We want to do this by + * loading into two xmm registers and then comparing. To avoid + * crossing into unmapped pages, we either load 32 bytes from + * the start of the buffer or 32 bytes before its end, depending + * on whether there is a page boundary between the overread area + * or not. + */ + + /* check for page boundaries overreads */ + lea 31(%rdi), %eax # end of overread + lea 31(%rsi), %r8d + lea -1(%rdi, %rdx, 1), %ecx # last character in buffer + lea -1(%rsi, %rdx, 1), %r9d + xor %ecx, %eax + xor %r9d, %r8d + test $PAGE_SIZE, %eax # are they on different pages? + jz 0f + + /* fix up rdi */ + movdqu -32(%rdi, %rdx, 1), %xmm0 + movdqu -16(%rdi, %rdx, 1), %xmm1 + lea -8(%rsp), %rdi # end of replacement buffer + sub %rdx, %rdi # start of replacement buffer + movdqa %xmm0, -40(%rsp) # copy to replacement buffer + movdqa %xmm1, -24(%rsp) + +0: test $PAGE_SIZE, %r8d + jz 0f + + /* fix up rsi */ + movdqu -32(%rsi, %rdx, 1), %xmm0 + movdqu -16(%rsi, %rdx, 1), %xmm1 + lea -40(%rsp), %rsi # end of replacement buffer + sub %rdx, %rsi # start of replacement buffer + movdqa %xmm0, -72(%rsp) # copy to replacement buffer + movdqa %xmm1, -56(%rsp) + + /* load data and compare properly */ +0: movdqu 16(%rdi), %xmm1 + movdqu 16(%rsi), %xmm3 + movdqu (%rdi), %xmm0 + movdqu (%rsi), %xmm2 + mov %edx, %ecx + mov $-1, %edx + shl %cl, %rdx # ones where the buffer is not + pcmpeqb %xmm3, %xmm1 + pcmpeqb %xmm2, %xmm0 + pmovmskb %xmm1, %ecx + pmovmskb %xmm0, %eax + shl $16, %ecx + or %ecx, %eax # ones where the buffers match + or %edx, %eax # including where the buffer is not + not %eax # ones where there is a mismatch +#ifndef BCMP + bsf %eax, %edx # location of the first mismatch + cmovz %eax, %edx # including if there is no mismatch + movzbl (%rdi, %rdx, 1), %eax # mismatching bytes + movzbl (%rsi, %rdx, 1), %edx + sub %edx, %eax +#endif + ret + + /* empty input */ +.L0: xor %eax, %eax + ret + + /* compare 33+ bytes */ + ALIGN_TEXT +.Llong: movdqu (%rdi), %xmm0 # load head + movdqu (%rsi), %xmm2 + mov %rdi, %rcx + sub %rdi, %rsi # express rsi as distance from rdi + and $~0xf, %rdi # align rdi to 16 bytes + movdqu 16(%rsi, %rdi, 1), %xmm1 + pcmpeqb 16(%rdi), %xmm1 # compare second half of this iteration + add %rcx, %rdx # pointer to last byte in buffer + pcmpeqb %xmm2, %xmm0 + pmovmskb %xmm0, %eax + xor $0xffff, %eax # any mismatch? + jne .Lmismatch_head + add $64, %rdi # advance to next iteration + jmp 1f # and get going with the loop + + /* process buffer 32 bytes at a time */ + ALIGN_TEXT +0: movdqu -32(%rsi, %rdi, 1), %xmm0 + movdqu -16(%rsi, %rdi, 1), %xmm1 + pcmpeqb -32(%rdi), %xmm0 + pcmpeqb -16(%rdi), %xmm1 + add $32, %rdi # advance to next iteration +1: pand %xmm0, %xmm1 # 0xff where both halves matched + pmovmskb %xmm1, %eax + cmp $0xffff, %eax # all bytes matched? + jne .Lmismatch + cmp %rdx, %rdi # end of buffer reached? + jb 0b + + /* less than 32 bytes left to compare */ + movdqu -16(%rdx), %xmm1 # load 32 byte tail through end pointer + movdqu -16(%rdx, %rsi, 1), %xmm3 + movdqu -32(%rdx), %xmm0 + movdqu -32(%rdx, %rsi, 1), %xmm2 + pcmpeqb %xmm3, %xmm1 + pcmpeqb %xmm2, %xmm0 + pmovmskb %xmm1, %ecx + pmovmskb %xmm0, %eax + shl $16, %ecx + or %ecx, %eax # ones where the buffers match + not %eax # ones where there is a mismatch +#ifndef BCMP + bsf %eax, %ecx # location of the first mismatch + cmovz %eax, %ecx # including if there is no mismatch + add %rcx, %rdx # pointer to potential mismatch + movzbl -32(%rdx), %eax # mismatching bytes + movzbl -32(%rdx, %rsi, 1), %edx + sub %edx, %eax +#endif + ret + +#ifdef BCMP +.Lmismatch: + mov $1, %eax +.Lmismatch_head: + ret +#else /* memcmp */ +.Lmismatch_head: + tzcnt %eax, %eax # location of mismatch + add %rax, %rcx # pointer to mismatch + movzbl (%rcx), %eax # mismatching bytes + movzbl (%rcx, %rsi, 1), %ecx + sub %ecx, %eax + ret + +.Lmismatch: + movdqu -48(%rsi, %rdi, 1), %xmm1 + pcmpeqb -48(%rdi), %xmm1 # reconstruct xmm1 before PAND + pmovmskb %xmm0, %eax # mismatches in first 16 bytes + pmovmskb %xmm1, %edx # mismatches in second 16 bytes + shl $16, %edx + or %edx, %eax # mismatches in both + not %eax # matches in both + tzcnt %eax, %eax # location of mismatch + add %rax, %rdi # pointer to mismatch + movzbl -64(%rdi), %eax # mismatching bytes + movzbl -64(%rdi, %rsi, 1), %ecx + sub %ecx, %eax + ret +#endif +ARCHEND(memcmp, baseline) .section .note.GNU-stack,"",%progbits From nobody Mon Aug 21 19:28: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 4RV2b318XSz4rDBJ; Mon, 21 Aug 2023 19:28: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 4RV2b30hHRz4SK0; Mon, 21 Aug 2023 19:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692646127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mxqvwLLa6hsIUIRuhzJN6dr3aFUhRWbP8rk1BYkozww=; b=gmttRJF/OJQpAB2PpdQ6z8nLcS07w6f9EDsU4TqoY4t2elOMKQ0HtrSPXmFCrlpYlM9w/N qsbFSbgZ/YJDE58+IgKizHjFoqaP1DWK03074Lnuk/xMsJrlFbJnjqNYkAqINlNh9cXVBG RJFhn5cUq6dh8V+tTdL9+5Qx/OPRJUPkj30fp3v7izpebvMjw5SBt+DXy+1go51a7sh9D1 d9zvdGu4lfOcrvYlgr47rBK4dO7YWIMDhh1erFTHK0aixPcnJKVF1jnYuiQPiXA4fYFwBx VxQnGdFvRtf//YB2Y5QWIYI8DpINcsSdg1xY3DiGswL0dvWnQUtlvZp1FFDh0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692646127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mxqvwLLa6hsIUIRuhzJN6dr3aFUhRWbP8rk1BYkozww=; b=tiQ9VbJbl4G2h9C0k6QrfWQtLU7ZhDLZqPDikkfQ9TBnEvZwmW9bZdbvmFV6z6VD5btKDL d2089SHbXwU7J56CkubU/u2SG7l+1oMCBwRzfCQ88XQ1bZgdu4R1teJ9xJci9vHGlarEkz Gc4UQ2g9tKvak+q5btoc5tBuE0DJRKrkO9Qyig132U+2lrcKiQhYqgOuQfojDVS423w1wd O62sE+PfTrMtCYI/8AwS23DB81uEflbbb9eIiZVmFeNoWeB2ZP/DXA+VPBcBDTKR7MIyDi 8OmGdmwIKnG8tYKNceEX8RzXuHnt/8Jcq7JrWmhrQFKUlWr4Q7mplmKxos8TaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692646127; a=rsa-sha256; cv=none; b=LgczW2f/TPamBh/PnSYlWgTVtyfgCwJYnnXDciZxa4F+8SK4mfTLzjnlTKv2x0VUnI5bQv MMwFCIaWei1spdOzSrfSh2tSF3Qvw7vvu7o43RzqIaQNwJt9q+4xO625Xt3Cir8Gksx4yF QVLoDAp0Dt4G8QLDadNTtuE8wyH3ESb0o3N2RGnzfVdFUc6F3TUoeHPl9ChFKEpx7c5Buq KAsYUsU6Gi0pz821Wi5lrH1jqJbxhMaJuK+UNN8El3FNf0g2D9+vClARp8xZl3xCxJ/WFr sI9vnNSUh/9inxXWykdZDZs1PgHMl6VDk7SIapSSJjKvSvlOlzrGv3BqEMPp+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV2b26rHCzYLZ; Mon, 21 Aug 2023 19:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LJSktO031163; Mon, 21 Aug 2023 19:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LJSkMw031160; Mon, 21 Aug 2023 19:28:46 GMT (envelope-from git) Date: Mon, 21 Aug 2023 19:28:46 GMT Message-Id: <202308211928.37LJSkMw031160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: b404e0300706 - main - share/man/man7/simd.7: document new amd64 memcmp/bcmp baseline routines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b404e030070686bfb3101c314f3e17168dbd16ca Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=b404e030070686bfb3101c314f3e17168dbd16ca commit b404e030070686bfb3101c314f3e17168dbd16ca Author: Robert Clausecker AuthorDate: 2023-07-14 11:58:19 +0000 Commit: Robert Clausecker CommitDate: 2023-08-21 19:19:46 +0000 share/man/man7/simd.7: document new amd64 memcmp/bcmp baseline routines Sponsored by: The FreeBSD Foundation bcmp(3) is implemented as a variant of memcmp(3) and benefits from the same optimisations. Sponsored by: The FreeBSD Foundation Approved by: kib Differential Revision: https://reviews.freebsd.org/D41442 --- share/man/man7/simd.7 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 928f40cb00f2..bf33d4eb5531 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd August 7, 2023 +.Dd August 13, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -51,14 +51,14 @@ can be used to override this mechanism. Enhanced functions are present in the following architectures: .Bl -column FUNCTION__ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent .It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 -.It bcmp Ta Ta Ta S Ta S +.It bcmp Ta Ta Ta S1 Ta S .It bcopy Ta Ta S Ta S Ta S Ta SV .It bzero Ta Ta S Ta S Ta S .It div Ta Ta Ta S Ta S .It index Ta S Ta Ta S1 .It ldiv Ta Ta Ta S Ta S .It lldiv Ta Ta Ta S -.It memcmp Ta Ta S Ta S Ta S +.It memcmp Ta Ta S Ta S1 Ta S .It memcpy Ta S Ta S Ta S Ta S Ta SV .It memmove Ta S Ta S Ta S Ta S Ta SV .It memset Ta Ta S Ta S Ta S From nobody Mon Aug 21 19:54: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 4RV3892PKrz4rFYN; Mon, 21 Aug 2023 19:54: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 4RV3891wX1z4Wlf; Mon, 21 Aug 2023 19:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692647641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JHwfvKeRSFa0xWve3RqGM3TsGMKpwXxsow60VYV3XdE=; b=k58b4R/jmmi4wKKDuYk0vE79Hr32Y4T6cNWB1g5Hk8uJTwXVpVgG01vsB6E/361JFCk/nq ulcYOhpzboeKXKimm+7UjeljS8qo7uQybuLpv92hW2KNuEDbvOqOT1teGgTVQr4amjG+9+ PCNYaBHCK9kK+Uu7s0uUOKyzEVOG1eZFVWRpRPSY7RU1yCKB1K63RemTr/FcQ051X3HIJd byUW4L8+IicFz+x+FPXDhQkzTiqqIayPirKGtHbr5XxR3MHwxhjN7Qsx69d1AhDPqXUtJq z7r3jf9d/Bh57QdmZPJjnh0UYJXoZrDrh9PDXlwaBcbxoctDu7LcwZ2RI4TqYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692647641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JHwfvKeRSFa0xWve3RqGM3TsGMKpwXxsow60VYV3XdE=; b=okwoXlYQosw+IlC9Y1LZ3ExXQHsmOdPqMVoWYjSvVjto2/m8Fdz95/WsDsdFEuNwkBzksq wsOPPa0k5A8c3yQfUovRX/YI0O9B3XID4w/wObNfl6Mo+xlVSz6K7LeFy1/1vaLxYaqatQ IVe4ekcF1KoaN6jrcXi80NkQVAePpKp5yC+el60thReZBr01bfCMB7Clh1woNnn70oJosB cqDxQU+VXPuCXEZn8PHT+00BXgJj5VN4LxaHer2U7ZnvrGsZhFJEvqzcf48O7VBci1rism xISc1EKq09crOxKZNL0Pew6kzkqVep/k3ftAe/y3dAhkrcVEMLm68o2yMUnF4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692647641; a=rsa-sha256; cv=none; b=bUa/SD3CGPjod8l5Fi2zkHI6evs235wnta9OKJaIhSRJb0RkeM+28SxwNUUhoYXWNppkEE FaetAcaQ/klmtrbXFIccdfsG8dIrJh9hPDV4AoXrnwvirksYLAZ220+5GgWVuL5/ohqwdm 6D0VQdepcK+IzZfrGEpIH5TrrAQqKzIejoLPbAzwkuZxS1cBJdWZ3OwjKmicMDi8YdPSRj ve6tJb11HA4LCUIlZTLmFMpoLdE5wgMdXl/qzogwmf9tBr1tyNZn5FcxMlcs2UFqOnBtjd BoQGlSldBpcl+Jnq7Elg5wSP+ne/msKq79A8of/vCSL0sS0Mnvanb76FwI99wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RV389101szZV6; Mon, 21 Aug 2023 19:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LJs1Ew079856; Mon, 21 Aug 2023 19:54:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LJs153079853; Mon, 21 Aug 2023 19:54:01 GMT (envelope-from git) Date: Mon, 21 Aug 2023 19:54:01 GMT Message-Id: <202308211954.37LJs153079853@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: 4258eb5a0d97 - main - x86: handle domains with no CPUs usable for intr delivery List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4258eb5a0d971cf9b1ea5e8e98535e29ef3053f1 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4258eb5a0d971cf9b1ea5e8e98535e29ef3053f1 commit 4258eb5a0d971cf9b1ea5e8e98535e29ef3053f1 Author: Ed Maste AuthorDate: 2023-08-18 03:29:33 +0000 Commit: Ed Maste CommitDate: 2023-08-21 19:52:10 +0000 x86: handle domains with no CPUs usable for intr delivery We can end up with a domain having no CPUs capable of receiving I/O interrupts. This can occur, for example, when all APIC IDs in a given domain are 256 or greater, and we have no IOMMU. In this case disable per-domain interrupt support, effectively reverting to the behaviour before commit a48de40bcc09 ("Only use CPUs in the domain the device is attached to for default"). This has a performance impact but at least allows the system to be functional. It is a stop- gap until we can rely on the presence of an IOMMU on all x86 platforms. Thanks to AMD for providing the high-thread-count machine I used for testing this change, and to cperciva for testing on other hardware. Reviewed by: jhb Tested by: cperciva, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41501 --- sys/x86/x86/intr_machdep.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c index b8dbe3611a42..b43fa790d264 100644 --- a/sys/x86/x86/intr_machdep.c +++ b/sys/x86/x86/intr_machdep.c @@ -578,10 +578,17 @@ DB_SHOW_COMMAND(irqs, db_show_irqs) /* * Support for balancing interrupt sources across CPUs. For now we just * allocate CPUs round-robin. + * + * XXX If the system has a domain with without any usable CPUs (e.g., where all + * APIC IDs are 256 or greater and we do not have an IOMMU) we use + * intr_no_domain to fall back to assigning interrupts without regard for + * domain. Once we can rely on the presence of an IOMMU on all x86 platforms + * we can revert this. */ cpuset_t intr_cpus = CPUSET_T_INITIALIZER(0x1); static int current_cpu[MAXMEMDOM]; +static bool intr_no_domain; static void intr_init_cpus(void) @@ -589,7 +596,15 @@ intr_init_cpus(void) int i; for (i = 0; i < vm_ndomains; i++) { + if (CPU_OVERLAP(&cpuset_domain[i], &intr_cpus) == 0) { + intr_no_domain = true; + printf("%s: unable to route interrupts to CPUs in domain %d\n", + __func__, i); + } + current_cpu[i] = 0; + if (intr_no_domain && i > 0) + continue; if (!CPU_ISSET(current_cpu[i], &intr_cpus) || !CPU_ISSET(current_cpu[i], &cpuset_domain[i])) intr_next_cpu(i); @@ -615,6 +630,8 @@ intr_next_cpu(int domain) return (PCPU_GET(apic_id)); #endif + if (intr_no_domain) + domain = 0; mtx_lock_spin(&icu_lock); apic_id = cpu_apic_ids[current_cpu[domain]]; do { @@ -622,7 +639,8 @@ intr_next_cpu(int domain) if (current_cpu[domain] > mp_maxid) current_cpu[domain] = 0; } while (!CPU_ISSET(current_cpu[domain], &intr_cpus) || - !CPU_ISSET(current_cpu[domain], &cpuset_domain[domain])); + (!CPU_ISSET(current_cpu[domain], &cpuset_domain[domain]) && + !intr_no_domain)); mtx_unlock_spin(&icu_lock); return (apic_id); } From nobody Tue Aug 22 01:37:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RVBmy4VdZz4YlRP; Tue, 22 Aug 2023 01:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RVBmy3z1jz3Vsm; Tue, 22 Aug 2023 01:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692668274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=95XXifqiTF9XFJ6X//DgRs9pa++I3bgJg4JX7UGotuE=; b=FVRVei6Lht7WJv8Hgg3rrW0ucQzqK5OE73lUXisIJ7uipu0TALoGz2KgeoEgb/svATVVZ0 SU6jVFHuf81dmPwN68JJM7ZmXb1zo1lFZ33zBvEnDD4a4G9JqKayhO/sFN234KjMGuekVY 80IEID7maM6uk8JocVRGsnVakLZGSadnIjWHgbdcvhTq/K314kAM0Bk4IvTMClWxaQ/BWy O9Wb1QjVQd6mEbJgHCRBq8PmTWqEVV0n5louwNHFu2bh1RbAENk6BDhcgl96SR4WyWx3uk Q88QvKNy6nQjeienCQl1yjuihKGl3WiOnCzQuu5y74TcWbIDkRFpMup1w0iNtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692668274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=95XXifqiTF9XFJ6X//DgRs9pa++I3bgJg4JX7UGotuE=; b=uhmOKHz9LsPejNaWPtmBUGIX7VQb8mNCP/fU7GxpAM7pl0Zhf7eAlv9dPJdWQPI1F5xJvk ZjrHJkYXOFANuJQz9G9JZXVfWaup95Hsij//TwGIBGNSFVfM796GHaucATKnpJJhsa9l+l 20Xs9T+NXCBExr7W1JbJyPVifj4ap8XwbnkDwtQ7ySNBX7T7ZimSD3G3ccPRUXLXbqaK+c EmbJWgwln2MTlqImsIeWQlzEfH7PSy8mSJZehJu70jDf1I5EaQeESnu3i/BvMxhEg+zKXU p5bCnLgHrz3wntECU+GCfNFsOkK41pBRIMiX/UwGP4fA42dc6gxzYg7EXJzuLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692668274; a=rsa-sha256; cv=none; b=JMJvmR6Y4gGc0rSnRSV2D23y3ck5Pfu0Mdq5y/0Hsx+JpOYZfSp+gNLc2LFTdGjHzUAgqn 43sfM/Z9MHOzL2QFRNFm3pjTBc0356AjAZ6eDyTh51BAs4P4NKFuZptWKm93P5Y2YNjRhH Brq7jcpfY3shChc+k/Zvm3XfCho182MeSdB6PeN5VAFaIkfw6XH3wP0n5VkgyMAO3YVCks 9EWuFYuFnZPuDy2Z7xiEI60NJOFYN7IZUiMsqw+GwXxIMrQQGqrG2l2mCPzCALddOccVUi inroLQrfzSZamXNOqjEpYfmDSQyaDUNUU5CI8pGWkSNamZXgcdHgD1kz5fPQcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVBmy324JzkRY; Tue, 22 Aug 2023 01:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M1bsKS043722; Tue, 22 Aug 2023 01:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M1bsUM043719; Tue, 22 Aug 2023 01:37:54 GMT (envelope-from git) Date: Tue, 22 Aug 2023 01:37:54 GMT Message-Id: <202308220137.37M1bsUM043719@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b376ef36f569 - main - Update freebsd-yeet for mfc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b376ef36f569c85cbd135349b6e8b9737bba5d2a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b376ef36f569c85cbd135349b6e8b9737bba5d2a commit b376ef36f569c85cbd135349b6e8b9737bba5d2a Author: Warner Losh AuthorDate: 2023-08-22 01:37:13 +0000 Commit: Warner Losh CommitDate: 2023-08-22 01:37:20 +0000 Update freebsd-yeet for mfc --- tools/build/freebsd-yeet.pl | 86 +++++++++++++++++++++++++++++++++------------ 1 file changed, 63 insertions(+), 23 deletions(-) diff --git a/tools/build/freebsd-yeet.pl b/tools/build/freebsd-yeet.pl old mode 100644 new mode 100755 index ee7f27f81637..33466a5c1094 --- a/tools/build/freebsd-yeet.pl +++ b/tools/build/freebsd-yeet.pl @@ -1,3 +1,5 @@ +#!/usr/local/bin/perl +# # Remove almost all of the $ FreeBSD $ tags in the tree. # # Copyright (c) 2023, Warner Losh @@ -39,13 +41,17 @@ my $pretty; my $pattern; my $repl; my $count; +my $syshash; +my $hash; sub do_one { $pretty = $_[0]; $pattern = $_[1]; $repl = ""; - $repl = $_[2] if defined($_[2]); + $repl = $_[2]; + $syshash = $_[3]; + $hash = $_[4]; $count = 0; sub findfiles @@ -73,35 +79,69 @@ sub do_one find({ wanted => \&findfiles, }, './sys'); if ($count > 0) { print "Changed $pretty\n"; - system("git commit -a -m'sys: Remove \$FreeBSD\$: $pretty\n\nRemove /$pattern/'"); + system("git commit -a -m'sys: Remove \$FreeBSD\$: $pretty\n\nRemove /$pattern/\n\nSimilar commit in current:\n(cherry picked from commit $syshash)'"); } $count = 0; find({ wanted => \&findfiles, }, '.'); if ($count > 0) { print "Changed $pretty\n"; - system("git commit -a -m'Remove \$FreeBSD\$: $pretty\n\nRemove /$pattern/'"); + system("git commit -a -m'Remove \$FreeBSD\$: $pretty\n\nRemove /$pattern/\n\nSimilar commit in main:\n(cherry picked from commit $hash)'"); } } +# These are the commits to head +# 9524e274b548 Remove $FreeBSD$: one-line xdr pattern +# 26a58599a09a Remove $FreeBSD$: one-line forth tag +# 401ab69cff8f Remove $FreeBSD$: one-line ps tag +# 6ef644f5889a Remove $FreeBSD$: one-line lua tag +# 9636a14538f5 Remove $FreeBSD$: two-line lua tag +# 8c99d94c900f sys: Remove $FreeBSD$: two-line lua tag +# ae992a336e8d Remove $FreeBSD$: one-line catalog +# 2063df147163 sys: Remove $FreeBSD$: one-line catalog +# 05248206f720 Remove $FreeBSD$: one-line bare tag +# 78d146160dc5 sys: Remove $FreeBSD$: one-line bare tag +# b2c76c41be32 Remove $FreeBSD$: one-line nroff pattern +# fa9896e082a1 Remove $FreeBSD$: two-line nroff pattern +# 9e7892125655 sys: Remove $FreeBSD$: two-line nroff pattern +# d0b2dbfa0ecf Remove $FreeBSD$: one-line sh pattern +# 031beb4e239b sys: Remove $FreeBSD$: one-line sh pattern +# b1cfcffa89e6 Remove $FreeBSD$: one-line .S pattern +# d4bf8003ee42 sys: Remove $FreeBSD$: one-line .S pattern +# c8573564095b Remove $FreeBSD$: alt one-line .c pattern +# da5432eda807 Remove $FreeBSD$: alt two-line .c pattern +# 1d386b48a555 Remove $FreeBSD$: one-line .c pattern +# 685dc743dc3b sys: Remove $FreeBSD$: one-line .c pattern +# e5d258c9e599 Remove $FreeBSD$: two-line .c pattern +# dfc016587a1e sys: Remove $FreeBSD$: two-line .c pattern +# 2a63c3be1582 Remove $FreeBSD$: one-line .c comment pattern +# 71625ec9ad2a sys: Remove $FreeBSD$: one-line .c comment pattern +# 42b388439bd3 Remove $FreeBSD$: one-line .h pattern +# 2ff63af9b88c sys: Remove $FreeBSD$: one-line .h pattern +# b3e7694832e8 Remove $FreeBSD$: two-line .h pattern +# 95ee2897e98f sys: Remove $FreeBSD$: two-line .h pattern +# d54a7d337331 Remove $FreeBSD$: one-line m4 tag +# 82a265ad9bad sys: Remove $FreeBSD$: sound driver version + # Note: Do two line before one line -do_one("sound driver version", 'SND_DECLARE_FILE\("\$FreeBSD\$"\);', 'SND_DECLARE_FILE("");'); -do_one("one-line m4 tag", '^dnl\s*\$FreeBSD\$.*$\n'); -do_one("two-line .h pattern", '^\s*\*\n \*\s+\$FreeBSD\$$\n'); -do_one("one-line .h pattern", '^\s*\*+\s*\$FreeBSD\$.*$\n'); -do_one("one-line .c comment pattern", '^/[*/]\s*\$FreeBSD\$.*\n'); -do_one("two-line .c pattern", '^#include\s+.*$\n\s+__FBSDID\("\$FreeBSD\$"\);\n'); -do_one("one-line .c pattern", '^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n'); -do_one("alt two-line .c pattern", '^\s*__RCSID\("\$FreeBSD\$"\);\n\n'); -do_one("alt one-line .c pattern", '^\s*__RCSID\("\$FreeBSD\$"\);\n'); -do_one("one-line .S pattern", '^\s\.(asciz|ident)\s+\"\$FreeBSD\$\".*\n'); -do_one("one-line sh pattern", '^\s*#[#!]?\s*\$FreeBSD\$.*$\n'); -do_one("two-line nroff pattern", '^\.\\\\"\n\.\\\\"\s*\$FreeBSD\$$\n'); -do_one("one-line nroff pattern", '^\.\\\\"\s*\$FreeBSD\$$\n'); -do_one("one-line bare tag", '^\s*\$FreeBSD\$$\n'); -do_one("one-line catalog", '^\s*\$\s*\$FreeBSD\$$\n'); -do_one("two-line lua tag", '^--\n--\s*\$FreeBSD\$.*$\n'); -do_one("one-line lua tag", '^--\s*\$FreeBSD\$.*$\n'); -do_one("one-line ps tag", '^%\s*RCSID:\s*\$FreeBSD\$.*$\n'); -do_one("one-line forth tag", '^\\\\[\s*]*\$FreeBSD\$.*$\n'); -do_one("one-line xdr pattern", '^\s*%\s*__FBSDID\("\$FreeBSD\$"\);?\s*\n'); +# commit message pattern replacement or '' sys hash src hash +do_one("sound driver version", 'SND_DECLARE_FILE\("\$FreeBSD\$"\);', 'SND_DECLARE_FILE("");', '', '82a265ad9bad'); +do_one("one-line m4 tag", '^dnl\s*\$FreeBSD\$.*$\n', '', '', 'd54a7d337331'); +do_one("two-line .h pattern", '^\s*\*\n \*\s+\$FreeBSD\$$\n', '', '95ee2897e98f', 'b3e7694832e8'); +do_one("one-line .h pattern", '^\s*\*+\s*\$FreeBSD\$.*$\n', '', '2ff63af9b88c', '42b388439bd3'); +do_one("one-line .c comment pattern", '^/[*/]\s*\$FreeBSD\$.*\n', '', '71625ec9ad2a', '2a63c3be1582'); +do_one("two-line .c pattern", '^#include\s+.*$\n\s+__FBSDID\("\$FreeBSD\$"\);\n','', 'dfc016587a1e', 'e5d258c9e599'); +do_one("one-line .c pattern", '^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n', '', '685dc743dc3b', '1d386b48a555'); +do_one("alt two-line .c pattern", '^\s*__RCSID\("\$FreeBSD\$"\);\n\n', '', '', 'da5432eda807'); +do_one("alt one-line .c pattern", '^\s*__RCSID\("\$FreeBSD\$"\);\n', '', '', 'c8573564095b'); +do_one("one-line .S pattern", '^\s\.(asciz|ident)\s+\"\$FreeBSD\$\".*\n', '', 'd4bf8003ee42', 'b1cfcffa89e6'); +do_one("one-line sh pattern", '^\s*#[#!]?\s*\$FreeBSD\$.*$\n', '', '031beb4e239b', 'd0b2dbfa0ecf'); +do_one("two-line nroff pattern", '^\.\\\\"\n\.\\\\"\s*\$FreeBSD\$$\n', '', '9e7892125655', 'fa9896e082a1'); +do_one("one-line nroff pattern", '^\.\\\\"\s*\$FreeBSD\$$\n', '', '', 'b2c76c41be32'); +do_one("one-line bare tag", '^\s*\$FreeBSD\$$\n', '', '78d146160dc5', '05248206f720'); +do_one("one-line catalog", '^\s*\$\s*\$FreeBSD\$$\n', '', '2063df147163', 'ae992a336e8d'); +do_one("two-line lua tag", '^--\n--\s*\$FreeBSD\$.*$\n', '', '8c99d94c900f', '9636a14538f5'); +do_one("one-line lua tag", '^--\s*\$FreeBSD\$.*$\n', '', '', '6ef644f5889a'); +do_one("one-line ps tag", '^%\s*RCSID:\s*\$FreeBSD\$.*$\n', '', '', '401ab69cff8f'); +do_one("one-line forth tag", '^\\\\[\s*]*\$FreeBSD\$.*$\n', '', '', '26a58599a09a'); +do_one("one-line xdr pattern", '^\s*%\s*__FBSDID\("\$FreeBSD\$"\);?\s*\n', '', '', '9524e274b548'); exit; From nobody Tue Aug 22 01:37:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RVBmz5fZJz4Yl2T; Tue, 22 Aug 2023 01:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RVBmz59h7z3WGB; Tue, 22 Aug 2023 01:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692668275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UbLN0WdmDMCNspY2ptNoGX+8OZlzJARrDEH6IvUr3EU=; b=b57OAbSwKKv0r5xP/10mamRSyCZ92kICeB7RVTQfK95gnS1axRKS0NdzejEvBZTfK5dFL1 qewf0iSQhkqmvn/MB0idQ1xNw/kDu4QxnVxvwMHsILs2k05PYuCq4CCr7CiYRIS13udokP WnZ1DemhTjGg9yWVlXMPnM9kY2VX4EjRo2zLX1TBaKazzCgfb6YXFQaYGw2J8Q2n9qfx2a jvDn/qCe/PgmwpoD6f8U7TjmQSu2bVj3xvFhO+N3ktciMtuDJj8n0J9A1i/wEXiuP8ZDYx Ckss8f/GYXAahcJPOEhQ5yRnuIFg8V7CVyfelgLrNhsEwcTp6Lz/s9o+Ahhrbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692668275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UbLN0WdmDMCNspY2ptNoGX+8OZlzJARrDEH6IvUr3EU=; b=OziCbFkZSOjKCh4BOtxcUB5pMGzvV9qtDCqjAzQMTT7Lnx1Sgb1V6ZN0o/TqstDWRHtEfy o+UGyyUxqrJy2a0npuO2MEdKwBAdYG9LFcb1Ix3Ry8Esb8cCAt0sUlZ4urfa3VS31Z+5bx 7lxzsGmU5jv2oGRczT3r9ZTucVzBcL5XKdisFRuficU8Ued9DjwngPcme0fUtDWkYwbQyP HN829Gb3QRqfHTDKdOxi0/r+Q4DkSLJumIdX9+TzVIvABv0Two2mBsY6dE9uM4kXzPwxnL lVD6HBSOOzyg4NxHqeQHDkDlWQuqs9jszJAXXbQGK8bvoPyrISKRP8xIe2RJrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692668275; a=rsa-sha256; cv=none; b=Jt8hbnqFOFrsvm+WkHHU/6Db2j9OiCNskdTz484yyOufmc1Z1CrHvDpCG606vGOZDXGfV8 w8DDNy36aBs9EY6VBBomU7pTT+BpVcH8GIY9HyHZAYb4S41bYaBz0NbTPdCH2u7J4IPZbx WKr0LUX69IVrGzXPljxDM8qW32h3xvsbvfmUeZzIzmSHCX7aMZCwQ488oqD1W9Cj2qzkwN f9QijCV4bSBY/92tpwdAzqkYfcXeCYpVbZXITEi2DrO4x6DA5za7y9c0yUWUnp+1khMuB6 ZgIwBxSDdPwIDRTwP2JxXgWz/ABDCTvo9DlAgjiSmqu7v4erIrPmLQRMvBDwNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVBmz3yPbzk8N; Tue, 22 Aug 2023 01:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M1bt9U043767; Tue, 22 Aug 2023 01:37:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M1btL8043764; Tue, 22 Aug 2023 01:37:55 GMT (envelope-from git) Date: Tue, 22 Aug 2023 01:37:55 GMT Message-Id: <202308220137.37M1btL8043764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 682d5a87e519 - main - Delete trailing whitespace from $FreeBSD$ removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 682d5a87e51966939710fb52cc4e8fbb7bff04b5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=682d5a87e51966939710fb52cc4e8fbb7bff04b5 commit 682d5a87e51966939710fb52cc4e8fbb7bff04b5 Author: Warner Losh AuthorDate: 2023-08-22 01:34:15 +0000 Commit: Warner Losh CommitDate: 2023-08-22 01:37:28 +0000 Delete trailing whitespace from $FreeBSD$ removal Fixes: d4bf8003ee42 Sponsored by: Netflix --- sys/crypto/aesni/aeskeys_amd64.S | 1 - sys/crypto/aesni/aeskeys_i386.S | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/crypto/aesni/aeskeys_amd64.S b/sys/crypto/aesni/aeskeys_amd64.S index 83f704c9ae53..667e64f441a5 100644 --- a/sys/crypto/aesni/aeskeys_amd64.S +++ b/sys/crypto/aesni/aeskeys_amd64.S @@ -219,4 +219,3 @@ ENTRY(aesni_set_deckey) retq .cfi_endproc END(aesni_set_deckey) - diff --git a/sys/crypto/aesni/aeskeys_i386.S b/sys/crypto/aesni/aeskeys_i386.S index 346014412640..770c21dbf938 100644 --- a/sys/crypto/aesni/aeskeys_i386.S +++ b/sys/crypto/aesni/aeskeys_i386.S @@ -269,4 +269,3 @@ ENTRY(aesni_set_deckey) retl .cfi_endproc END(aesni_set_deckey) - From nobody Tue Aug 22 04:04: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 4RVG1v5Nmmz4qGPt; Tue, 22 Aug 2023 04:04: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 4RVG1v4cqtz4Dl3; Tue, 22 Aug 2023 04:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692677059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9jE23AW0T58I8fVHUN64PKO8RRiAR8PUVF0h1ncMhP4=; b=jbo01HhNZ8jzZkXDOH9EC4MPKdByc0lytXrt7oeE3JAnxpdowk0I8lhVZlSMLUixzyXBtr at9qYHg7vA4llVGyUw+IB4ieURTK06WhlV43UylGIzk8HaA5Y9GIRLVI9UTrJyIaZGiIxk r/OtK5/s80Jp3jSQYYPvetEZ1D4DMp05F10HlB0jgcrNgWejRxHsdZnzkEbblsJtXah6y7 TbGqOeHOJX1hLBnjWM4uWt3NPd/kBb7Xeg2PPXmvuGNEqdGCXc+jgHXIDNtm6CxaNaRL8s CmSnDScPyAqHsgLFNv5a8MZpFKliG60YXwNttttm/Ly+GsdlS3UklZwd2CMxjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692677059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9jE23AW0T58I8fVHUN64PKO8RRiAR8PUVF0h1ncMhP4=; b=ybV5A+k/76l0bjh9hZENt3EG0o4eNHhCZepXS8OSoMdW/3UCrqAVJYRUHei8YsutouUPJn 6uN1FUTKLv6ldNaIGHGSx0Xl5edIjLNzQW5yHPJMAQGIGywpVQbuIgh9grLw8jSeP41p+o EiQu7djvbwyUGkaaHGBQIF0+VeIZQkiaU2KbIw9/s2GLlh/JJORn4iH7gPSKDThp/lMfUo /SEbwUlOmRyaSgXwl7eUZ1Wq+peDdvdO7Hj2puoLDZFH4GDAXYDXpx6y2XR+j6M0Rnfcgm 2Ck3V8/Br37HW6GelaBtljOOghIZyOlF5AHKe5Q4bGQjn1Eoojc+4E1Jan9ydg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692677059; a=rsa-sha256; cv=none; b=gDNYANQT2X8bvxmj9uiIosGj2jRYlp1REqD2YK8ysJZ7npeDQauUZVkyYkDa+t3H6iJsMN L5HhsU9EI0cr57uv30/Omf29O+TCPJCXA/hRDPh9efva9QCXMEZbfMPjrImVzdkd/3dhMN 3bMD8x4RQ9R5GiGi1Hn6iVR5wuFivtc7UoAHXm5OAPieTx3TAljoAXYcATVS95VHuxa2c3 s0HsC/AkyaD5+gpvyBGLcHBsLrXfyRjNgl7jARiEIIBgAW7Hu4zZ/FcrIZw7FGUa+9oYcz QpdpLcQcTEeJh9YQksSudDV3d7j2Erxx86VVbbK9rASS3b0WasqNP0A6znq3Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVG1v3gP2zpMH; Tue, 22 Aug 2023 04:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M44JvX093238; Tue, 22 Aug 2023 04:04:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M44Jcx093235; Tue, 22 Aug 2023 04:04:19 GMT (envelope-from git) Date: Tue, 22 Aug 2023 04:04:19 GMT Message-Id: <202308220404.37M44Jcx093235@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: 7ccaf76a27f1 - main - riscv db_trace: Ensure trapframe pointer is suitably aligned. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ccaf76a27f138bde3f2b162a9c8ebb6216c05bc Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7ccaf76a27f138bde3f2b162a9c8ebb6216c05bc commit 7ccaf76a27f138bde3f2b162a9c8ebb6216c05bc Author: John Baldwin AuthorDate: 2023-08-22 04:00:26 +0000 Commit: John Baldwin CommitDate: 2023-08-22 04:00:26 +0000 riscv db_trace: Ensure trapframe pointer is suitably aligned. Suggested by: jrtc27 Reviewed by: jrtc27 Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41534 --- sys/riscv/riscv/db_trace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/riscv/riscv/db_trace.c b/sys/riscv/riscv/db_trace.c index 00ec1a750e33..12972839c29d 100644 --- a/sys/riscv/riscv/db_trace.c +++ b/sys/riscv/riscv/db_trace.c @@ -84,7 +84,8 @@ db_stack_trace_cmd(struct thread *td, struct unwind_state *frame) struct trapframe *tf; tf = (struct trapframe *)(uintptr_t)frame->sp; - if (!kstack_contains(td, (vm_offset_t)tf, + if (!__is_aligned(tf, _Alignof(*tf)) || + !kstack_contains(td, (vm_offset_t)tf, sizeof(*tf))) { db_printf("--- invalid trapframe %p\n", tf); break; From nobody Tue Aug 22 04:04: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 4RVG1w6H3Jz4qGS3; Tue, 22 Aug 2023 04:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RVG1w5hTTz4F79; Tue, 22 Aug 2023 04:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692677060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQWNjg55tUeZEAqVmBgoVdEEXfekDK1nmgjRbdDx6fY=; b=FYAEN4uzzVK7T6Af283PGFU4fmqt/I2AalgoHuNhrlNkB1LcialOEK/faSMeKOrqkvPdDz +XzNi/8wXmH3aS0z2L96vyeVnZ+H8Dglp0WqacQudNQN+JM6zBPOAen86jHP/E0ndlHzf2 C1n6qwtM4bp3vLf+FfJwHrFPPgQPZ5ZDSq331YTTTrExc9MFlH3jtbGnDx0usFQUAmuGCA 8YEznUHybuT1D8FXXkEav6ajaKm7Cm+SJgg0uyMEnGUvICwsCL+MhbnxoAsKkScW9Og4e6 r1y/iMQ9Oe8b0fb/BvrcHz+pFwWGybCFCF3ZXcE9G61q+IPIumICqDTCJUgK4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692677060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQWNjg55tUeZEAqVmBgoVdEEXfekDK1nmgjRbdDx6fY=; b=lToZOyttmYOQ4IOocklw65XQRBcSzdf1RYi/DlE8lKr66HQKlNkwKPX/vfvhszliy2PerK qaEySln8a4fpSqwo2kmRuHJRpuxtMnTfw6xWO8JWHWVOPc1uN6ybbeslzyVOVkdzubMrFa Sbln/7pnrcYs6ylFd3X3KPgKGXeQg4U4ba3RBxZV6yGPN0lrazhMMisNcjp8eKSzlliwUq 0WO58gRjTb1xEhOwyTa+BUoZLiErpZEh9Zax+gqV5TyYpGvSg+Uxo2wun94hPcSmfbxC2d ncgQgaL+NJALge8G2w3hlTVVkEbZZSqEUJvLhx5683Wx+lbYKLCSnzlyFN8jXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692677060; a=rsa-sha256; cv=none; b=BCltZ//sUXWswpucbhw0wWQZSx4SOUKlpcKAThG7XBLLzy/xV9A5vkA5ZVvDkTSR6KH3a1 +c3126hBSAbwEX9F669jGTLXqXXQsGPmA9tuCw99dgejLzrD9cHy9Y3QK85PgkYhg8Cd/t limypktDJMsJ3yUMjIM72R3Wjec7WGGs4c05qLjMlZ6TaCYnB5P0tCrA+tjLrutb1PBLio 6KLA+kqQbuisNv2VNeDGsyAKpW9NCdgBPuLAfr/Vp8ahHdTftnXgMAVlwHCtechY/W8v8j I4qF3VrzPGaSlE/tBxdUwWijh0hLEyBXZQjEUhujRSQzMwB1+maHt8Xl1xvl4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVG1w4WKSznyf; Tue, 22 Aug 2023 04:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M44KOT093287; Tue, 22 Aug 2023 04:04:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M44KDm093284; Tue, 22 Aug 2023 04:04:20 GMT (envelope-from git) Date: Tue, 22 Aug 2023 04:04:20 GMT Message-Id: <202308220404.37M44KDm093284@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: 834f73d25358 - main - build{libcompat}: Pass UNIVERSE_TOOLCHAIN_PATH to the _lc_build-tools submake List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 834f73d253581dba80a2d67a7c06b102b78c8a58 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=834f73d253581dba80a2d67a7c06b102b78c8a58 commit 834f73d253581dba80a2d67a7c06b102b78c8a58 Author: John Baldwin AuthorDate: 2023-08-22 04:00:45 +0000 Commit: John Baldwin CommitDate: 2023-08-22 04:00:45 +0000 build{libcompat}: Pass UNIVERSE_TOOLCHAIN_PATH to the _lc_build-tools submake This fixes make UNIVERSE_TOOLCHAIN=yes with libcompats. Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D41535 --- Makefile.libcompat | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.libcompat b/Makefile.libcompat index a717cd9639b0..a957c47598e6 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -63,6 +63,7 @@ build${libcompat}: .PHONY DESTDIR= \ OBJTOP=${LIB${_LIBCOMPAT}_OBJTOP} \ OBJROOT='$${OBJTOP}/' \ + UNIVERSE_TOOLCHAIN_PATH=${UNIVERSE_TOOLCHAIN_PATH} \ MAKEOBJDIRPREFIX= \ -DNO_LINT \ -DNO_CPU_CFLAGS \ From nobody Tue Aug 22 04: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 4RVG1y0Pt2z4qGLB; Tue, 22 Aug 2023 04: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 4RVG1x6YqMz4FJT; Tue, 22 Aug 2023 04: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=1692677061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UQvsPgGXh/eQ8CwdvVS/g0pZhfiwYDp/Nqg3UGJeAgY=; b=Bxz8znrmcuIKPhZthj2jWVkDCL+y3ZUK/IIcLHX4JzJlzP91Kfs7FDLKd24CkD8XFfOHQl haZWMuYsUB1iN+e1tmdKkWtl1DERF7xf8FWdqZpyfTHhi+K0al88elm6zy4hhcOe8N0ZKn aRg6thHFZ0rlJEVJZ7/4kiClIrthxiD+iJf9OFU3POcAOs0ucdngu7ugOrvYqX3IsMqA2u y0YytTHdsMpJEetWnzMrzzW2c4OrBlyoIiWugH8kO+GWgaq7foQwKKOarQbOQwCcjupKy+ XbbNCRiIdzJBE2eNUx3pGTLzj1asHRnANrwBhtVMTxqe7BWRdwQHYZpCp2DHdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692677061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UQvsPgGXh/eQ8CwdvVS/g0pZhfiwYDp/Nqg3UGJeAgY=; b=uDRWG6hkxoPHDE2EgVaEPu5yb3jsCyviWcfpw2KDc4dvIjSDEBRMu1T0Lq5Y8kqhVJQ+LW XmN1PeeWtKUmModpx6Vis+QzD92o2b3GiPbA3wiMdvzZHxk43qDbiz2zHqbdxNS7moHdQ6 FhCtx4Vk48M61sV6iOsuNc6Ti7D5YSG0X8u4wpfilLQ4fzgO8SYjAM6od705LMGGfwcAyc VKz/EmCB5GuJo5s/8m3dq8O3V41EBdf8PSr23fXefhthvpYO9XeWwSKck1oEzQdWIg092z s4j27hiYdkkp6rnTXnDl/WGlUeLuQA3E9oxwyLgFVc7V6UfPu/wr2O9CGDDSPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692677061; a=rsa-sha256; cv=none; b=csSuCQtMPgMNKc70e55r2QpLlp2jvacysSYaAyoNa3gnmp2g22QO12m1eJQ5Fl/PADUvzJ AslgZ+H7pgXmZKUTl3rrfMaqgJzz/j63IH7Iy5xJbfJ+F4UqZgVXQHNOkMGhhWeaUO8So+ bra1fGRPiPQhSAsENV4Fn5AnlwEQV0q9JQllEMltUC7ZZPuXHy9T3vCs0E2bch6WXLopZ/ UUZyDooYuuUkqYZJcuXA0+VP691F68L4OJfUGFCz6aX1gQtML+VKAmUE1vrB7x6PUTfo8I +ABPKfmriOvK/aa0V/dZcy2sScfRtG/jvb3zA9yjpwqjATFHVx0SHlY70Yd6EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVG1x5SpczpK1; Tue, 22 Aug 2023 04:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M44LC1093343; Tue, 22 Aug 2023 04:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M44LWJ093340; Tue, 22 Aug 2023 04:04:21 GMT (envelope-from git) Date: Tue, 22 Aug 2023 04:04:21 GMT Message-Id: <202308220404.37M44LWJ093340@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: 7a56f5af7185 - main - libcrypto: Don't embed $FreeBSD$ in generated assembly 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a56f5af71851c8b502720ca956629c302821430 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7a56f5af71851c8b502720ca956629c302821430 commit 7a56f5af71851c8b502720ca956629c302821430 Author: John Baldwin AuthorDate: 2023-08-22 04:01:48 +0000 Commit: John Baldwin CommitDate: 2023-08-22 04:01:48 +0000 libcrypto: Don't embed $FreeBSD$ in generated assembly files Reviewed by: gallatin, ngie, emaste Differential Revision: https://reviews.freebsd.org/D41536 --- secure/lib/libcrypto/Makefile.asm | 57 +++++++++++++-------------------------- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm index 791e36229343..b9af383e492f 100644 --- a/secure/lib/libcrypto/Makefile.asm +++ b/secure/lib/libcrypto/Makefile.asm @@ -51,14 +51,12 @@ CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/} sha256-armv8.s sha256-armv8.S: sha512-armv8.pl env CC=cc perl ${.ALLSRC} linux64 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux64 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_amd64) @@ -131,8 +129,7 @@ CLEANFILES= ${ASM} ${SHA_ASM:S/$/.s/} .SUFFIXES: .pl .pl.S: - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ env CC=cc perl ${.IMPSRC} elf ) > ${.TARGET} ${SHA_TMP}: ${SHA_SRC} @@ -140,8 +137,7 @@ ${SHA_TMP}: ${SHA_SRC} .for s in ${SHA_ASM} ${s}.S: ${s}.s - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${SHA_SRC}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${SHA_SRC}. */' ;\ cat ${s}.s ) > ${.TARGET} .endfor @@ -190,14 +186,12 @@ CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/} .SUFFIXES: .pl aes-armv4.S: aes-armv4.pl - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ env CC=cc perl ${.ALLSRC} linux32 ) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_i386) @@ -285,8 +279,7 @@ CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/} .SUFFIXES: .pl .pl.S: - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ echo '#ifdef PIC' ;\ env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} -fpic -DPIC ${.IMPSRC:R:S/$/.s/} ;\ cat ${.IMPSRC:R:S/$/.s/} ;\ @@ -337,26 +330,22 @@ CLEANFILES= ${ASM} bn-ppc.S: ppc.pl env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256-ppc.S: sha512-ppc.pl env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256p8-ppc.S: sha512p8-ppc.pl env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_powerpc64) @@ -408,26 +397,22 @@ CLEANFILES= ${ASM} bn-ppc.S: ppc.pl env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256-ppc.S: sha512-ppc.pl env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256p8-ppc.S: sha512p8-ppc.pl env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_powerpc64le) @@ -479,26 +464,22 @@ CLEANFILES= ${ASM} bn-ppc.S: ppc.pl env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256-ppc.S: sha512-ppc.pl env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256p8-ppc.S: sha512p8-ppc.pl env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .endif From nobody Tue Aug 22 04: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 4RVG1z1BlYz4qGLF; Tue, 22 Aug 2023 04:04: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 4RVG1z0QYzz4FMb; Tue, 22 Aug 2023 04:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692677063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6YATYCVBLqfKXq+/wB5WUiB9capkPbEOa6ghjRysr4s=; b=d1ttUQd2GakhKNsz46HsuLGh/jX44o4ugKKKnY+IOJuqL91LVjIjJwt+FJ0lrLtv3/NmNL vOP0eEB93tD0Fd3yO0KgPOccbf5OPxz6uA56vLp3xYzBr51uciRVNmgaGOHE2ZwiNZ2EHL 6TWQZIb58XkY7I3/z/yPRr16Kb9Y70oUSFrEAXHLz9r9AZwBz0lCYyiV1ctXcjsiCcSPy7 lOwjpvgJgklFSclxoImnlEPiaJqS9Nh9iNu53DmFAnfNR4sZGlVyJR1g0iROC2eqzONi6U w6sWbs+/PSXhW7rpJGEXYC0UDF6rW3Bh1L7oJkObxcVc+fFlJCDr8+CIacNhgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692677063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6YATYCVBLqfKXq+/wB5WUiB9capkPbEOa6ghjRysr4s=; b=huNfxIogTZHhsuNpsUvms0oa7oHPLua3w99yS1UN+pVpBHm3RjJH+jeLgBAgbB1i65NXvw f8Ap+ONFgZa3Vo3anMe+9rLK7G3ERV0LZI12ssRAcnt20I1bf2NqdHsboQoxFACnkhJXoS 4tYZpqX+kLRc3DcQ6wgA2kodRw3wGfQaksCDgaj+iVR+SDjl70WhGPyn3Yn+NLpk5SS1Z8 On6s/94yXEnjJ/vPjJ5hc3fhx9dH7ikAB95ezWNjCRt8h2QxO29SGf7w78Zhggb4yOWvLg gC07Jk7zoegg0cNaq+VdyhDzNcS/+9R4mgB8BHgK0zTX9AVc+WOmCEDIQ+qw0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692677063; a=rsa-sha256; cv=none; b=JjCTCWwCsDrV7YUFr+5P5FP/77noiTsr8HegrC7BcnSH8VagqFBD0bMuZeeiybP+MaSfpr dQMkS6KW6tXxX0bDQceXfB/L4SQ5qullSMn+02yOdFiwBD3LCUMAGDOEQIx2GJGVVyKbYG qBXFsLYMRiQni8peUsbqG33JN96BrS2FTEHIuwSshGSNdf7VqYW1H2Qnf3FcCCbWmcwnUh ozZX7k4v7yy6apPM4X9b4Rm/jRNBsRR+wZRR0GHsy4xnSXF3QPIMHSU6vExXUCZqiHlu+c MkHatXvxxyBijosOEGS37AmjdCh4rWiC4eQ50OLA6iNKZvDpuuAHGszuB9BYwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVG1y66P9znyg; Tue, 22 Aug 2023 04:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M44M5W093398; Tue, 22 Aug 2023 04:04:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M44MEE093395; Tue, 22 Aug 2023 04:04:22 GMT (envelope-from git) Date: Tue, 22 Aug 2023 04:04:22 GMT Message-Id: <202308220404.37M44MEE093395@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: f3cac6c020ba - main - libcrypto: Add new assembly files added in OpenSSL 3.0. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3cac6c020ba474b11432eb9b29c91519962488a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f3cac6c020ba474b11432eb9b29c91519962488a commit f3cac6c020ba474b11432eb9b29c91519962488a Author: John Baldwin AuthorDate: 2023-08-22 04:02:12 +0000 Commit: John Baldwin CommitDate: 2023-08-22 04:02:12 +0000 libcrypto: Add new assembly files added in OpenSSL 3.0. This only affects amd64 and i386, but in particular includes wrappers for AES encryption/decryption that gate all of the accelerated AES. Reviewed by: gallatin, ngie, emaste Differential Revision: https://reviews.freebsd.org/D41537 --- secure/lib/libcrypto/Makefile.asm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm index b9af383e492f..65cc0322f3ca 100644 --- a/secure/lib/libcrypto/Makefile.asm +++ b/secure/lib/libcrypto/Makefile.asm @@ -79,11 +79,12 @@ sha256-armv8.S: sha512-armv8.pl SRCS= x86_64cpuid.pl # aes -SRCS+= aesni-mb-x86_64.pl aesni-sha1-x86_64.pl aesni-sha256-x86_64.pl \ - aesni-x86_64.pl vpaes-x86_64.pl +SRCS+= aes-x86_64.pl \ + aesni-mb-x86_64.pl aesni-sha1-x86_64.pl aesni-sha256-x86_64.pl \ + aesni-x86_64.pl bsaes-x86_64.pl vpaes-x86_64.pl # bn -SRCS+= rsaz-avx2.pl rsaz-avx512.S rsaz-x86_64.pl x86_64-gf2m.pl \ +SRCS+= rsaz-avx2.pl rsaz-avx512.pl rsaz-x86_64.pl x86_64-gf2m.pl \ x86_64-mont.pl x86_64-mont5.pl # camellia @@ -221,7 +222,7 @@ aes-armv4.S: aes-armv4.pl SRCS= x86cpuid.pl # aes -SRCS+= aesni-x86.pl vpaes-x86.pl +SRCS+= aes-586.pl aesni-x86.pl vpaes-x86.pl # blowfish SRCS+= bf-586.pl From nobody Tue Aug 22 04:04: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 4RVG204mH1z4qGFQ; Tue, 22 Aug 2023 04:04: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 4RVG201CLLz4FCC; Tue, 22 Aug 2023 04:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692677064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rznlVYxZXsuqE3EjOZ27DuhUA5ndyVS2YZfHnMSTgVA=; b=ucXR9si3KgnCJ+JsioXVQoCUDoPANl+jymFkf/CRq0Fn2J/00JStOIYwJswwrvgE8EbFej xmFCsmQUQfGegsenK7tpUVpdQJgTAhEC0U6Hwsl7CauFeG9koDs/9/IlZ6gy7hZpSB8u26 T5eXRhUBO6AXoJw3Kmw9LbqXkJQq8Bb+ZJDA7rk8fGx8kn83Zu7wdt7/kaEpcgSWEUaaL8 HssbYmpNLHmGrztxHTEyj/WamozLHp5nckvCQd8Y6CHzB0+DPsirySzlIrpVO9UAT5MP13 7sf9ZhyTGXdsFM936SJEp5cT5AT5oES9xetgvJ3x+9JRzsGofkQoEIky1kEoLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692677064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rznlVYxZXsuqE3EjOZ27DuhUA5ndyVS2YZfHnMSTgVA=; b=MVlJLz5jWlTp31cZRz6dPgLVE4HuLxtnOA0E65tLdT4BOf6GkJuhUwf8LkLW5NHBwoX0gq K5rgmq6DyTyBWIqjO5gdJTcCXwC5dQaOaFQTl8opfmYkOpVHworiPtxhMeR0LMUcvEU0hC ochZNYMruHuOYHrqscdCn6wzhrPTIbPQde9rMVREXYdmbMjof6zGc1pOY+/d97IUjFXB8l yDYiMct1N3M3h27Ujk+Mi1PpnLZBNfyrQHY3qi+WXh////T2MYxx+FDigIDoOJGjnEaPGe uL2jsUNi+fCinI2rTDvyC8lMMRvHNBuXUquNH7Mjb53+zcAZVeD3+y10sXo7iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692677064; a=rsa-sha256; cv=none; b=yCvEAEY4+cji+YuQJqL2+zqo10Hvc2rsBMkBSpANxoeSa7cnwnZulNYROzoXOc3+6xr/hK SbDbuHYVkbI1a1A2Pq66+4sjzXeURfi2yvOvwnxJjcXagGFJenEGv8qwZT9ga84o8b85CA ZEtc+5GLoMo8rA0oFvcBIkRnc++yo5c8U1N2u2VuZUhpuz79X1vLBDgQUUrEf00Qp+BtHq 7Kn7cT5+lrwfkexTAYKa0DEAxlleDWPmE9pOD3nYnYc7jmEpoKN0JEQUNG7rZqmV23tWwo LSogtwnk2nHWKOaZOlU9JueS7nlsDdw7BV8lRetO+MHuTd5h1GQxAggEJztGkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVG200GhPzpK2; Tue, 22 Aug 2023 04:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M44NmM093449; Tue, 22 Aug 2023 04:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M44N7n093446; Tue, 22 Aug 2023 04:04:23 GMT (envelope-from git) Date: Tue, 22 Aug 2023 04:04:23 GMT Message-Id: <202308220404.37M44N7n093446@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: 74d73bb743c7 - main - libcrypto: Generate new files added in OpenSSL 3.0. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74d73bb743c759e6d4d67435d383d501585c4680 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=74d73bb743c759e6d4d67435d383d501585c4680 commit 74d73bb743c759e6d4d67435d383d501585c4680 Author: John Baldwin AuthorDate: 2023-08-22 04:02:29 +0000 Commit: John Baldwin CommitDate: 2023-08-22 04:02:29 +0000 libcrypto: Generate new files added in OpenSSL 3.0. Reviewed by: gallatin, ngie, emaste Differential Revision: https://reviews.freebsd.org/D41538 --- secure/lib/libcrypto/arch/amd64/aes-x86_64.S | 2680 ++++++++++ secure/lib/libcrypto/arch/amd64/bsaes-x86_64.S | 2619 ++++++++++ secure/lib/libcrypto/arch/i386/aes-586.S | 6644 ++++++++++++++++++++++++ 3 files changed, 11943 insertions(+) diff --git a/secure/lib/libcrypto/arch/amd64/aes-x86_64.S b/secure/lib/libcrypto/arch/amd64/aes-x86_64.S new file mode 100644 index 000000000000..fc375184a20a --- /dev/null +++ b/secure/lib/libcrypto/arch/amd64/aes-x86_64.S @@ -0,0 +1,2680 @@ +/* Do not modify. This file is auto-generated from aes-x86_64.pl. */ +.text +.type _x86_64_AES_encrypt,@function +.align 16 +_x86_64_AES_encrypt: +.cfi_startproc + xorl 0(%r15),%eax + xorl 4(%r15),%ebx + xorl 8(%r15),%ecx + xorl 12(%r15),%edx + + movl 240(%r15),%r13d + subl $1,%r13d + jmp .Lenc_loop +.align 16 +.Lenc_loop: + + movzbl %al,%esi + movzbl %bl,%edi + movzbl %cl,%ebp + movl 0(%r14,%rsi,8),%r10d + movl 0(%r14,%rdi,8),%r11d + movl 0(%r14,%rbp,8),%r12d + + movzbl %bh,%esi + movzbl %ch,%edi + movzbl %dl,%ebp + xorl 3(%r14,%rsi,8),%r10d + xorl 3(%r14,%rdi,8),%r11d + movl 0(%r14,%rbp,8),%r8d + + movzbl %dh,%esi + shrl $16,%ecx + movzbl %ah,%ebp + xorl 3(%r14,%rsi,8),%r12d + shrl $16,%edx + xorl 3(%r14,%rbp,8),%r8d + + shrl $16,%ebx + leaq 16(%r15),%r15 + shrl $16,%eax + + movzbl %cl,%esi + movzbl %dl,%edi + movzbl %al,%ebp + xorl 2(%r14,%rsi,8),%r10d + xorl 2(%r14,%rdi,8),%r11d + xorl 2(%r14,%rbp,8),%r12d + + movzbl %dh,%esi + movzbl %ah,%edi + movzbl %bl,%ebp + xorl 1(%r14,%rsi,8),%r10d + xorl 1(%r14,%rdi,8),%r11d + xorl 2(%r14,%rbp,8),%r8d + + movl 12(%r15),%edx + movzbl %bh,%edi + movzbl %ch,%ebp + movl 0(%r15),%eax + xorl 1(%r14,%rdi,8),%r12d + xorl 1(%r14,%rbp,8),%r8d + + movl 4(%r15),%ebx + movl 8(%r15),%ecx + xorl %r10d,%eax + xorl %r11d,%ebx + xorl %r12d,%ecx + xorl %r8d,%edx + subl $1,%r13d + jnz .Lenc_loop + movzbl %al,%esi + movzbl %bl,%edi + movzbl %cl,%ebp + movzbl 2(%r14,%rsi,8),%r10d + movzbl 2(%r14,%rdi,8),%r11d + movzbl 2(%r14,%rbp,8),%r12d + + movzbl %dl,%esi + movzbl %bh,%edi + movzbl %ch,%ebp + movzbl 2(%r14,%rsi,8),%r8d + movl 0(%r14,%rdi,8),%edi + movl 0(%r14,%rbp,8),%ebp + + andl $0x0000ff00,%edi + andl $0x0000ff00,%ebp + + xorl %edi,%r10d + xorl %ebp,%r11d + shrl $16,%ecx + + movzbl %dh,%esi + movzbl %ah,%edi + shrl $16,%edx + movl 0(%r14,%rsi,8),%esi + movl 0(%r14,%rdi,8),%edi + + andl $0x0000ff00,%esi + andl $0x0000ff00,%edi + shrl $16,%ebx + xorl %esi,%r12d + xorl %edi,%r8d + shrl $16,%eax + + movzbl %cl,%esi + movzbl %dl,%edi + movzbl %al,%ebp + movl 0(%r14,%rsi,8),%esi + movl 0(%r14,%rdi,8),%edi + movl 0(%r14,%rbp,8),%ebp + + andl $0x00ff0000,%esi + andl $0x00ff0000,%edi + andl $0x00ff0000,%ebp + + xorl %esi,%r10d + xorl %edi,%r11d + xorl %ebp,%r12d + + movzbl %bl,%esi + movzbl %dh,%edi + movzbl %ah,%ebp + movl 0(%r14,%rsi,8),%esi + movl 2(%r14,%rdi,8),%edi + movl 2(%r14,%rbp,8),%ebp + + andl $0x00ff0000,%esi + andl $0xff000000,%edi + andl $0xff000000,%ebp + + xorl %esi,%r8d + xorl %edi,%r10d + xorl %ebp,%r11d + + movzbl %bh,%esi + movzbl %ch,%edi + movl 16+12(%r15),%edx + movl 2(%r14,%rsi,8),%esi + movl 2(%r14,%rdi,8),%edi + movl 16+0(%r15),%eax + + andl $0xff000000,%esi + andl $0xff000000,%edi + + xorl %esi,%r12d + xorl %edi,%r8d + + movl 16+4(%r15),%ebx + movl 16+8(%r15),%ecx + xorl %r10d,%eax + xorl %r11d,%ebx + xorl %r12d,%ecx + xorl %r8d,%edx +.byte 0xf3,0xc3 +.cfi_endproc +.size _x86_64_AES_encrypt,.-_x86_64_AES_encrypt +.type _x86_64_AES_encrypt_compact,@function +.align 16 +_x86_64_AES_encrypt_compact: +.cfi_startproc + leaq 128(%r14),%r8 + movl 0-128(%r8),%edi + movl 32-128(%r8),%ebp + movl 64-128(%r8),%r10d + movl 96-128(%r8),%r11d + movl 128-128(%r8),%edi + movl 160-128(%r8),%ebp + movl 192-128(%r8),%r10d + movl 224-128(%r8),%r11d + jmp .Lenc_loop_compact +.align 16 +.Lenc_loop_compact: + xorl 0(%r15),%eax + xorl 4(%r15),%ebx + xorl 8(%r15),%ecx + xorl 12(%r15),%edx + leaq 16(%r15),%r15 + movzbl %al,%r10d + movzbl %bl,%r11d + movzbl %cl,%r12d + movzbl %dl,%r8d + movzbl %bh,%esi + movzbl %ch,%edi + shrl $16,%ecx + movzbl %dh,%ebp + movzbl (%r14,%r10,1),%r10d + movzbl (%r14,%r11,1),%r11d + movzbl (%r14,%r12,1),%r12d + movzbl (%r14,%r8,1),%r8d + + movzbl (%r14,%rsi,1),%r9d + movzbl %ah,%esi + movzbl (%r14,%rdi,1),%r13d + movzbl %cl,%edi + movzbl (%r14,%rbp,1),%ebp + movzbl (%r14,%rsi,1),%esi + + shll $8,%r9d + shrl $16,%edx + shll $8,%r13d + xorl %r9d,%r10d + shrl $16,%eax + movzbl %dl,%r9d + shrl $16,%ebx + xorl %r13d,%r11d + shll $8,%ebp + movzbl %al,%r13d + movzbl (%r14,%rdi,1),%edi + xorl %ebp,%r12d + + shll $8,%esi + movzbl %bl,%ebp + shll $16,%edi + xorl %esi,%r8d + movzbl (%r14,%r9,1),%r9d + movzbl %dh,%esi + movzbl (%r14,%r13,1),%r13d + xorl %edi,%r10d + + shrl $8,%ecx + movzbl %ah,%edi + shll $16,%r9d + shrl $8,%ebx + shll $16,%r13d + xorl %r9d,%r11d + movzbl (%r14,%rbp,1),%ebp + movzbl (%r14,%rsi,1),%esi + movzbl (%r14,%rdi,1),%edi + movzbl (%r14,%rcx,1),%edx + movzbl (%r14,%rbx,1),%ecx + + shll $16,%ebp + xorl %r13d,%r12d + shll $24,%esi + xorl %ebp,%r8d + shll $24,%edi + xorl %esi,%r10d + shll $24,%edx + xorl %edi,%r11d + shll $24,%ecx + movl %r10d,%eax + movl %r11d,%ebx + xorl %r12d,%ecx + xorl %r8d,%edx + cmpq 16(%rsp),%r15 + je .Lenc_compact_done + movl $0x80808080,%r10d + movl $0x80808080,%r11d + andl %eax,%r10d + andl %ebx,%r11d + movl %r10d,%esi + movl %r11d,%edi + shrl $7,%r10d + leal (%rax,%rax,1),%r8d + shrl $7,%r11d + leal (%rbx,%rbx,1),%r9d + subl %r10d,%esi + subl %r11d,%edi + andl $0xfefefefe,%r8d + andl $0xfefefefe,%r9d + andl $0x1b1b1b1b,%esi + andl $0x1b1b1b1b,%edi + movl %eax,%r10d + movl %ebx,%r11d + xorl %esi,%r8d + xorl %edi,%r9d + + xorl %r8d,%eax + xorl %r9d,%ebx + movl $0x80808080,%r12d + roll $24,%eax + movl $0x80808080,%ebp + roll $24,%ebx + andl %ecx,%r12d + andl %edx,%ebp + xorl %r8d,%eax + xorl %r9d,%ebx + movl %r12d,%esi + rorl $16,%r10d + movl %ebp,%edi + rorl $16,%r11d + leal (%rcx,%rcx,1),%r8d + shrl $7,%r12d + xorl %r10d,%eax + shrl $7,%ebp + xorl %r11d,%ebx + rorl $8,%r10d + leal (%rdx,%rdx,1),%r9d + rorl $8,%r11d + subl %r12d,%esi + subl %ebp,%edi + xorl %r10d,%eax + xorl %r11d,%ebx + + andl $0xfefefefe,%r8d + andl $0xfefefefe,%r9d + andl $0x1b1b1b1b,%esi + andl $0x1b1b1b1b,%edi + movl %ecx,%r12d + movl %edx,%ebp + xorl %esi,%r8d + xorl %edi,%r9d + + rorl $16,%r12d + xorl %r8d,%ecx + rorl $16,%ebp + xorl %r9d,%edx + roll $24,%ecx + movl 0(%r14),%esi + roll $24,%edx + xorl %r8d,%ecx + movl 64(%r14),%edi + xorl %r9d,%edx + movl 128(%r14),%r8d + xorl %r12d,%ecx + rorl $8,%r12d + xorl %ebp,%edx + rorl $8,%ebp + xorl %r12d,%ecx + movl 192(%r14),%r9d + xorl %ebp,%edx + jmp .Lenc_loop_compact +.align 16 +.Lenc_compact_done: + xorl 0(%r15),%eax + xorl 4(%r15),%ebx + xorl 8(%r15),%ecx + xorl 12(%r15),%edx +.byte 0xf3,0xc3 +.cfi_endproc +.size _x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact +.globl AES_encrypt +.type AES_encrypt,@function +.align 16 +.globl asm_AES_encrypt +.hidden asm_AES_encrypt +asm_AES_encrypt: +AES_encrypt: +.cfi_startproc +.byte 243,15,30,250 + movq %rsp,%rax +.cfi_def_cfa_register %rax + pushq %rbx +.cfi_offset %rbx,-16 + pushq %rbp +.cfi_offset %rbp,-24 + pushq %r12 +.cfi_offset %r12,-32 + pushq %r13 +.cfi_offset %r13,-40 + pushq %r14 +.cfi_offset %r14,-48 + pushq %r15 +.cfi_offset %r15,-56 + + + leaq -63(%rdx),%rcx + andq $-64,%rsp + subq %rsp,%rcx + negq %rcx + andq $0x3c0,%rcx + subq %rcx,%rsp + subq $32,%rsp + + movq %rsi,16(%rsp) + movq %rax,24(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 +.Lenc_prologue: + + movq %rdx,%r15 + movl 240(%r15),%r13d + + movl 0(%rdi),%eax + movl 4(%rdi),%ebx + movl 8(%rdi),%ecx + movl 12(%rdi),%edx + + shll $4,%r13d + leaq (%r15,%r13,1),%rbp + movq %r15,(%rsp) + movq %rbp,8(%rsp) + + + leaq .LAES_Te+2048(%rip),%r14 + leaq 768(%rsp),%rbp + subq %r14,%rbp + andq $0x300,%rbp + leaq (%r14,%rbp,1),%r14 + + call _x86_64_AES_encrypt_compact + + movq 16(%rsp),%r9 + movq 24(%rsp),%rsi +.cfi_def_cfa %rsi,8 + movl %eax,0(%r9) + movl %ebx,4(%r9) + movl %ecx,8(%r9) + movl %edx,12(%r9) + + movq -48(%rsi),%r15 +.cfi_restore %r15 + movq -40(%rsi),%r14 +.cfi_restore %r14 + movq -32(%rsi),%r13 +.cfi_restore %r13 + movq -24(%rsi),%r12 +.cfi_restore %r12 + movq -16(%rsi),%rbp +.cfi_restore %rbp + movq -8(%rsi),%rbx +.cfi_restore %rbx + leaq (%rsi),%rsp +.cfi_def_cfa_register %rsp +.Lenc_epilogue: + .byte 0xf3,0xc3 +.cfi_endproc +.size AES_encrypt,.-AES_encrypt +.type _x86_64_AES_decrypt,@function +.align 16 +_x86_64_AES_decrypt: +.cfi_startproc + xorl 0(%r15),%eax + xorl 4(%r15),%ebx + xorl 8(%r15),%ecx + xorl 12(%r15),%edx + + movl 240(%r15),%r13d + subl $1,%r13d + jmp .Ldec_loop +.align 16 +.Ldec_loop: + + movzbl %al,%esi + movzbl %bl,%edi + movzbl %cl,%ebp + movl 0(%r14,%rsi,8),%r10d + movl 0(%r14,%rdi,8),%r11d + movl 0(%r14,%rbp,8),%r12d + + movzbl %dh,%esi + movzbl %ah,%edi + movzbl %dl,%ebp + xorl 3(%r14,%rsi,8),%r10d + xorl 3(%r14,%rdi,8),%r11d + movl 0(%r14,%rbp,8),%r8d + + movzbl %bh,%esi + shrl $16,%eax + movzbl %ch,%ebp + xorl 3(%r14,%rsi,8),%r12d + shrl $16,%edx + xorl 3(%r14,%rbp,8),%r8d + + shrl $16,%ebx + leaq 16(%r15),%r15 + shrl $16,%ecx + + movzbl %cl,%esi + movzbl %dl,%edi + movzbl %al,%ebp + xorl 2(%r14,%rsi,8),%r10d + xorl 2(%r14,%rdi,8),%r11d + xorl 2(%r14,%rbp,8),%r12d + + movzbl %bh,%esi + movzbl %ch,%edi + movzbl %bl,%ebp + xorl 1(%r14,%rsi,8),%r10d + xorl 1(%r14,%rdi,8),%r11d + xorl 2(%r14,%rbp,8),%r8d + + movzbl %dh,%esi + movl 12(%r15),%edx + movzbl %ah,%ebp + xorl 1(%r14,%rsi,8),%r12d + movl 0(%r15),%eax + xorl 1(%r14,%rbp,8),%r8d + + xorl %r10d,%eax + movl 4(%r15),%ebx + movl 8(%r15),%ecx + xorl %r12d,%ecx + xorl %r11d,%ebx + xorl %r8d,%edx + subl $1,%r13d + jnz .Ldec_loop + leaq 2048(%r14),%r14 + movzbl %al,%esi + movzbl %bl,%edi + movzbl %cl,%ebp + movzbl (%r14,%rsi,1),%r10d + movzbl (%r14,%rdi,1),%r11d + movzbl (%r14,%rbp,1),%r12d + + movzbl %dl,%esi + movzbl %dh,%edi + movzbl %ah,%ebp + movzbl (%r14,%rsi,1),%r8d + movzbl (%r14,%rdi,1),%edi + movzbl (%r14,%rbp,1),%ebp + + shll $8,%edi + shll $8,%ebp + + xorl %edi,%r10d + xorl %ebp,%r11d + shrl $16,%edx + + movzbl %bh,%esi + movzbl %ch,%edi + shrl $16,%eax + movzbl (%r14,%rsi,1),%esi + movzbl (%r14,%rdi,1),%edi + + shll $8,%esi + shll $8,%edi + shrl $16,%ebx + xorl %esi,%r12d + xorl %edi,%r8d + shrl $16,%ecx + + movzbl %cl,%esi + movzbl %dl,%edi + movzbl %al,%ebp + movzbl (%r14,%rsi,1),%esi + movzbl (%r14,%rdi,1),%edi + movzbl (%r14,%rbp,1),%ebp + + shll $16,%esi + shll $16,%edi + shll $16,%ebp + + xorl %esi,%r10d + xorl %edi,%r11d + xorl %ebp,%r12d + + movzbl %bl,%esi + movzbl %bh,%edi + movzbl %ch,%ebp + movzbl (%r14,%rsi,1),%esi + movzbl (%r14,%rdi,1),%edi + movzbl (%r14,%rbp,1),%ebp + + shll $16,%esi + shll $24,%edi + shll $24,%ebp + + xorl %esi,%r8d + xorl %edi,%r10d + xorl %ebp,%r11d + + movzbl %dh,%esi + movzbl %ah,%edi + movl 16+12(%r15),%edx + movzbl (%r14,%rsi,1),%esi + movzbl (%r14,%rdi,1),%edi + movl 16+0(%r15),%eax + + shll $24,%esi + shll $24,%edi + + xorl %esi,%r12d + xorl %edi,%r8d + + movl 16+4(%r15),%ebx + movl 16+8(%r15),%ecx + leaq -2048(%r14),%r14 + xorl %r10d,%eax + xorl %r11d,%ebx + xorl %r12d,%ecx + xorl %r8d,%edx +.byte 0xf3,0xc3 +.cfi_endproc +.size _x86_64_AES_decrypt,.-_x86_64_AES_decrypt +.type _x86_64_AES_decrypt_compact,@function +.align 16 +_x86_64_AES_decrypt_compact: +.cfi_startproc + leaq 128(%r14),%r8 + movl 0-128(%r8),%edi + movl 32-128(%r8),%ebp + movl 64-128(%r8),%r10d + movl 96-128(%r8),%r11d + movl 128-128(%r8),%edi + movl 160-128(%r8),%ebp + movl 192-128(%r8),%r10d + movl 224-128(%r8),%r11d + jmp .Ldec_loop_compact + +.align 16 +.Ldec_loop_compact: + xorl 0(%r15),%eax + xorl 4(%r15),%ebx + xorl 8(%r15),%ecx + xorl 12(%r15),%edx + leaq 16(%r15),%r15 + movzbl %al,%r10d + movzbl %bl,%r11d + movzbl %cl,%r12d + movzbl %dl,%r8d + movzbl %dh,%esi + movzbl %ah,%edi + shrl $16,%edx + movzbl %bh,%ebp + movzbl (%r14,%r10,1),%r10d + movzbl (%r14,%r11,1),%r11d + movzbl (%r14,%r12,1),%r12d + movzbl (%r14,%r8,1),%r8d + + movzbl (%r14,%rsi,1),%r9d + movzbl %ch,%esi + movzbl (%r14,%rdi,1),%r13d + movzbl (%r14,%rbp,1),%ebp + movzbl (%r14,%rsi,1),%esi + + shrl $16,%ecx + shll $8,%r13d + shll $8,%r9d + movzbl %cl,%edi + shrl $16,%eax + xorl %r9d,%r10d + shrl $16,%ebx + movzbl %dl,%r9d + + shll $8,%ebp + xorl %r13d,%r11d + shll $8,%esi + movzbl %al,%r13d + movzbl (%r14,%rdi,1),%edi + xorl %ebp,%r12d + movzbl %bl,%ebp + + shll $16,%edi + xorl %esi,%r8d + movzbl (%r14,%r9,1),%r9d + movzbl %bh,%esi + movzbl (%r14,%rbp,1),%ebp + xorl %edi,%r10d + movzbl (%r14,%r13,1),%r13d + movzbl %ch,%edi + + shll $16,%ebp + shll $16,%r9d + shll $16,%r13d + xorl %ebp,%r8d + movzbl %dh,%ebp + xorl %r9d,%r11d + shrl $8,%eax + xorl %r13d,%r12d + + movzbl (%r14,%rsi,1),%esi + movzbl (%r14,%rdi,1),%ebx + movzbl (%r14,%rbp,1),%ecx + movzbl (%r14,%rax,1),%edx + + movl %r10d,%eax + shll $24,%esi + shll $24,%ebx + shll $24,%ecx + xorl %esi,%eax + shll $24,%edx + xorl %r11d,%ebx + xorl %r12d,%ecx + xorl %r8d,%edx + cmpq 16(%rsp),%r15 + je .Ldec_compact_done + + movq 256+0(%r14),%rsi + shlq $32,%rbx + shlq $32,%rdx + movq 256+8(%r14),%rdi + orq %rbx,%rax + orq %rdx,%rcx + movq 256+16(%r14),%rbp + movq %rsi,%r9 + movq %rsi,%r12 + andq %rax,%r9 + andq %rcx,%r12 + movq %r9,%rbx + movq %r12,%rdx + shrq $7,%r9 + leaq (%rax,%rax,1),%r8 + shrq $7,%r12 + leaq (%rcx,%rcx,1),%r11 + subq %r9,%rbx + subq %r12,%rdx + andq %rdi,%r8 + andq %rdi,%r11 + andq %rbp,%rbx + andq %rbp,%rdx + xorq %rbx,%r8 + xorq %rdx,%r11 + movq %rsi,%r10 + movq %rsi,%r13 + + andq %r8,%r10 + andq %r11,%r13 + movq %r10,%rbx + movq %r13,%rdx + shrq $7,%r10 + leaq (%r8,%r8,1),%r9 + shrq $7,%r13 + leaq (%r11,%r11,1),%r12 + subq %r10,%rbx + subq %r13,%rdx + andq %rdi,%r9 + andq %rdi,%r12 + andq %rbp,%rbx + andq %rbp,%rdx + xorq %rbx,%r9 + xorq %rdx,%r12 + movq %rsi,%r10 + movq %rsi,%r13 + + andq %r9,%r10 + andq %r12,%r13 + movq %r10,%rbx + movq %r13,%rdx + shrq $7,%r10 + xorq %rax,%r8 + shrq $7,%r13 + xorq %rcx,%r11 + subq %r10,%rbx + subq %r13,%rdx + leaq (%r9,%r9,1),%r10 + leaq (%r12,%r12,1),%r13 + xorq %rax,%r9 + xorq %rcx,%r12 + andq %rdi,%r10 + andq %rdi,%r13 + andq %rbp,%rbx + andq %rbp,%rdx + xorq %rbx,%r10 + xorq %rdx,%r13 + + xorq %r10,%rax + xorq %r13,%rcx + xorq %r10,%r8 + xorq %r13,%r11 + movq %rax,%rbx + movq %rcx,%rdx + xorq %r10,%r9 + shrq $32,%rbx + xorq %r13,%r12 + shrq $32,%rdx + xorq %r8,%r10 + roll $8,%eax + xorq %r11,%r13 + roll $8,%ecx + xorq %r9,%r10 + roll $8,%ebx + xorq %r12,%r13 + + roll $8,%edx + xorl %r10d,%eax + shrq $32,%r10 + xorl %r13d,%ecx + shrq $32,%r13 + xorl %r10d,%ebx + xorl %r13d,%edx + + movq %r8,%r10 + roll $24,%r8d + movq %r11,%r13 + roll $24,%r11d + shrq $32,%r10 + xorl %r8d,%eax + shrq $32,%r13 + xorl %r11d,%ecx + roll $24,%r10d + movq %r9,%r8 + roll $24,%r13d + movq %r12,%r11 + shrq $32,%r8 + xorl %r10d,%ebx + shrq $32,%r11 + xorl %r13d,%edx + + movq 0(%r14),%rsi + roll $16,%r9d + movq 64(%r14),%rdi + roll $16,%r12d + movq 128(%r14),%rbp + roll $16,%r8d + movq 192(%r14),%r10 + xorl %r9d,%eax + roll $16,%r11d + xorl %r12d,%ecx + movq 256(%r14),%r13 + xorl %r8d,%ebx + xorl %r11d,%edx + jmp .Ldec_loop_compact +.align 16 +.Ldec_compact_done: + xorl 0(%r15),%eax + xorl 4(%r15),%ebx + xorl 8(%r15),%ecx + xorl 12(%r15),%edx +.byte 0xf3,0xc3 +.cfi_endproc +.size _x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact +.globl AES_decrypt +.type AES_decrypt,@function +.align 16 +.globl asm_AES_decrypt +.hidden asm_AES_decrypt +asm_AES_decrypt: +AES_decrypt: +.cfi_startproc +.byte 243,15,30,250 + movq %rsp,%rax +.cfi_def_cfa_register %rax + pushq %rbx +.cfi_offset %rbx,-16 + pushq %rbp +.cfi_offset %rbp,-24 + pushq %r12 +.cfi_offset %r12,-32 + pushq %r13 +.cfi_offset %r13,-40 + pushq %r14 +.cfi_offset %r14,-48 + pushq %r15 +.cfi_offset %r15,-56 + + + leaq -63(%rdx),%rcx + andq $-64,%rsp + subq %rsp,%rcx + negq %rcx + andq $0x3c0,%rcx + subq %rcx,%rsp + subq $32,%rsp + + movq %rsi,16(%rsp) + movq %rax,24(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 +.Ldec_prologue: + + movq %rdx,%r15 + movl 240(%r15),%r13d + + movl 0(%rdi),%eax + movl 4(%rdi),%ebx + movl 8(%rdi),%ecx + movl 12(%rdi),%edx + + shll $4,%r13d + leaq (%r15,%r13,1),%rbp + movq %r15,(%rsp) + movq %rbp,8(%rsp) + + + leaq .LAES_Td+2048(%rip),%r14 + leaq 768(%rsp),%rbp + subq %r14,%rbp + andq $0x300,%rbp + leaq (%r14,%rbp,1),%r14 + shrq $3,%rbp + addq %rbp,%r14 + + call _x86_64_AES_decrypt_compact + + movq 16(%rsp),%r9 + movq 24(%rsp),%rsi +.cfi_def_cfa %rsi,8 + movl %eax,0(%r9) + movl %ebx,4(%r9) + movl %ecx,8(%r9) + movl %edx,12(%r9) + + movq -48(%rsi),%r15 +.cfi_restore %r15 + movq -40(%rsi),%r14 +.cfi_restore %r14 + movq -32(%rsi),%r13 +.cfi_restore %r13 + movq -24(%rsi),%r12 +.cfi_restore %r12 + movq -16(%rsi),%rbp +.cfi_restore %rbp + movq -8(%rsi),%rbx +.cfi_restore %rbx + leaq (%rsi),%rsp +.cfi_def_cfa_register %rsp +.Ldec_epilogue: + .byte 0xf3,0xc3 +.cfi_endproc +.size AES_decrypt,.-AES_decrypt +.globl AES_set_encrypt_key +.type AES_set_encrypt_key,@function +.align 16 +AES_set_encrypt_key: +.cfi_startproc +.byte 243,15,30,250 + pushq %rbx +.cfi_adjust_cfa_offset 8 +.cfi_offset %rbx,-16 + pushq %rbp +.cfi_adjust_cfa_offset 8 +.cfi_offset %rbp,-24 + pushq %r12 +.cfi_adjust_cfa_offset 8 +.cfi_offset %r12,-32 + pushq %r13 +.cfi_adjust_cfa_offset 8 +.cfi_offset %r13,-40 + pushq %r14 +.cfi_adjust_cfa_offset 8 +.cfi_offset %r14,-48 + pushq %r15 +.cfi_adjust_cfa_offset 8 +.cfi_offset %r15,-56 + subq $8,%rsp +.cfi_adjust_cfa_offset 8 +.Lenc_key_prologue: + + call _x86_64_AES_set_encrypt_key + + movq 40(%rsp),%rbp +.cfi_restore %rbp + movq 48(%rsp),%rbx +.cfi_restore %rbx + addq $56,%rsp +.cfi_adjust_cfa_offset -56 +.Lenc_key_epilogue: + .byte 0xf3,0xc3 +.cfi_endproc +.size AES_set_encrypt_key,.-AES_set_encrypt_key + +.type _x86_64_AES_set_encrypt_key,@function +.align 16 +_x86_64_AES_set_encrypt_key: +.cfi_startproc + movl %esi,%ecx + movq %rdi,%rsi + movq %rdx,%rdi + + testq $-1,%rsi + jz .Lbadpointer + testq $-1,%rdi + jz .Lbadpointer + + leaq .LAES_Te(%rip),%rbp + leaq 2048+128(%rbp),%rbp + + + movl 0-128(%rbp),%eax + movl 32-128(%rbp),%ebx + movl 64-128(%rbp),%r8d + movl 96-128(%rbp),%edx + movl 128-128(%rbp),%eax + movl 160-128(%rbp),%ebx + movl 192-128(%rbp),%r8d + movl 224-128(%rbp),%edx + + cmpl $128,%ecx + je .L10rounds + cmpl $192,%ecx *** 10995 LINES SKIPPED *** From nobody Tue Aug 22 04:04: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 4RVG215ZzMz4qGFT; Tue, 22 Aug 2023 04:04: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 4RVG212CKdz4FHc; Tue, 22 Aug 2023 04:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692677065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LjIGV5HSelAdZrFoVmwIg8qwHlmbqziWGjjk+ZZlokU=; b=ywjNCgkkMNrgymyuIvoGT1iExw9JUdlSnpWvLJ4wY7BVn2onEzhurMV9csHmqR7QU1ABQP vdn7sANmxKN/f/Qaeo8WljQl+JUCjNekXEey84i0ChO+j6GhmiTLoVBW6qsnyDd3AnHJVO wnWWhRDxiR4V6hH+PmfHEahmbu5ZjgTBD8BbGxJEsPHsPqc496R3PYlfIiazXtyuj3bggC pki8av5wFz3fRhoRw3AnjAl9qJ1+bu7mbQxFscghaowRhNHkCjhLb8l3gyfmJHnPrXAY2F XK7mbbqjtmtYbuBYtWmAScSxQoGxDdJuJUXF2qVe+hXbO+OhxSNiO/4fUsE47Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692677065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LjIGV5HSelAdZrFoVmwIg8qwHlmbqziWGjjk+ZZlokU=; b=ro+UKnywb3bYlyoAmFc0CaPpXTdK/FVjhMV0u7hmM/4FracyqyeRqFYbMJWdcrahTDS9J0 r2W/+fQ4JdRJnTYSLf3P+IL6dMUXRsptqHfQogd9xx6+JGizqCLGXuPfKgn9FycLeFGHAd 9ZGCsVTMSMX6Mm1LxPbhEGrFnQPrdI33YRo3QoCi5yP2lgntnx1p3XGLlzBf3K+j7VIWEC aaenS/GAuC7Cqg2/pOx1leYCkWLm05VTTo+hue2JhNsEncT5wr5CWK1OZJ4eOda4CUVBn8 sLpOtVQ4j8suAj8lYSJYZq59DZCCx9xyURoFFveptr6CoPLiytuRPVOWaojZnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692677065; a=rsa-sha256; cv=none; b=bSKUrzYA3iEaPIA2BqjPqCAerZ9dakOLZMGoEOVAgLhaBDi/Z0TK7WYmsjGOfLd8rWOgh1 JYBYtOly0E5h+6Ua5QbHYuRbmo5Qz9Fe3z3TcM6j9No34zBNrTkSrjdqCItIJFO1IaYTXB lzjis8wydTwLkgmOF+nNmtYDvq6SRa82IJ79Zf3sJ3/5RtMU64X5X+QSMZ9usCVCg5uWZB nguXGsESOOVS+hK+39khPnK4GYGW5HZhOrIStp3/wRcDT2xcpsgp0Aoh/zB606MNmVWK53 zElGvBNIWh0IdzW9H/yZC5zFBTBMvnlXT8XnJBsXP3ig8s0PkpSFMrN7VeQYOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVG2112XczpK3; Tue, 22 Aug 2023 04:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M44PYr093506; Tue, 22 Aug 2023 04:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M44PZk093503; Tue, 22 Aug 2023 04:04:25 GMT (envelope-from git) Date: Tue, 22 Aug 2023 04:04:25 GMT Message-Id: <202308220404.37M44PZk093503@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: 3250c9d52728 - main - libcrypto: Update assembly build glue for x86 for OpenSSL 3.0. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3250c9d5272821e5b796144c63b1de982cd4e43b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3250c9d5272821e5b796144c63b1de982cd4e43b commit 3250c9d5272821e5b796144c63b1de982cd4e43b Author: John Baldwin AuthorDate: 2023-08-22 04:02:42 +0000 Commit: John Baldwin CommitDate: 2023-08-22 04:02:42 +0000 libcrypto: Update assembly build glue for x86 for OpenSSL 3.0. Notably, define AES_ASM which is required for any AES acceleration (OpenSSL 1.0 gated all AES acceleration on OPENSSL_CPUID_OBJ instead). Enabling this exposed that new assembly files added in OpenSSL 3.0 needed to be included in the build (aes-x86-64.S and aes-586.S). Both of these files supplant both aes_core.c and aes_cbc.c. The last file had to be moved out of the MI SRCS line for aes and into each ASM_* for non-x86. As part of this I audited the generated configdata.pm for amd64, i386, and aarch64 and found the following additional discrepecancies that are fixed here as well: - Enabled BSAES_ASM on amd64 which requires bsase-x86_64.S - Enabled WHIRLPOOL_ASM on amd64 (asm sources already built) - Enabled CMLL_ASM on amd64 and i386 (asm sources already built) aarch64 had no discreprecancies in configdata.pm, and no *.pl asm generators were missing for aarch64 in Makefile.asm. I did not check powerpc or armv7, but for armv7 all of the asm generators seem to be present in Makefile.asm. Reported by: gallatin (AES-GCM using plain software on amd64) Reviewed by: gallatin, ngie, emaste Differential Revision: https://reviews.freebsd.org/D41539 --- secure/lib/libcrypto/Makefile | 20 ++++++++++---------- secure/lib/libcrypto/Makefile.common | 6 ++++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index d4102c6cd0cf..f4bd4a3247f3 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -41,25 +41,25 @@ SRCS+= mem_clr.c .endif # aes -SRCS+= aes_cbc.c aes_cfb.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c +SRCS+= aes_cfb.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c .if defined(ASM_aarch64) -SRCS+= aes_core.c aesv8-armx.S vpaes-armv8.S +SRCS+= aes_cbc.c aes_core.c aesv8-armx.S vpaes-armv8.S ACFLAGS.aesv8-armx.S= -march=armv8-a+crypto .elif defined(ASM_amd64) -SRCS+= aes_core.c aesni-mb-x86_64.S aesni-sha1-x86_64.S aesni-sha256-x86_64.S -SRCS+= aesni-x86_64.S vpaes-x86_64.S +SRCS+= aes-x86_64.S aesni-mb-x86_64.S aesni-sha1-x86_64.S +SRCS+= aesni-sha256-x86_64.S aesni-x86_64.S bsaes-x86_64.S vpaes-x86_64.S .elif defined(ASM_arm) -SRCS+= aes-armv4.S aesv8-armx.S bsaes-armv7.S +SRCS+= aes_cbc.c aes-armv4.S aesv8-armx.S bsaes-armv7.S .elif defined(ASM_i386) -SRCS+= aes_core.c aesni-x86.S vpaes-x86.S +SRCS+= aes-586.S aesni-x86.S vpaes-x86.S .elif defined(ASM_powerpc) -SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S +SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S .elif defined(ASM_powerpc64) -SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S +SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S .elif defined(ASM_powerpc64le) -SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S +SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S .else -SRCS+= aes_core.c +SRCS+= aes_cbc.c aes_core.c .endif # asn1 diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Makefile.common index 620bc9178f38..a52e2979060a 100644 --- a/secure/lib/libcrypto/Makefile.common +++ b/secure/lib/libcrypto/Makefile.common @@ -32,8 +32,12 @@ CFLAGS+= -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM CFLAGS+= -DKECCAK1600_ASM CFLAGS+= -DRC4_ASM CFLAGS+= -DMD5_ASM +CFLAGS+= -DAES_ASM +CFLAGS+= -DBSAES_ASM CFLAGS+= -DVPAES_ASM +CFLAGS+= -DWHIRLPOOL_ASM CFLAGS+= -DGHASH_ASM +CFLAGS+= -DCMLL_ASM CFLAGS+= -DECP_NISTZ256_ASM -DX25519_ASM CFLAGS+= -DPADLOCK_ASM CFLAGS+= -DPOLY1305_ASM @@ -53,9 +57,11 @@ CFLAGS+= -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM CFLAGS+= -DRC4_ASM CFLAGS+= -DMD5_ASM CFLAGS+= -DRMD160_ASM +CFLAGS+= -DAES_ASM CFLAGS+= -DVPAES_ASM CFLAGS+= -DWHIRLPOOL_ASM CFLAGS+= -DGHASH_ASM +CFLAGS+= -DCMLL_ASM CFLAGS+= -DECP_NISTZ256_ASM CFLAGS+= -DPADLOCK_ASM CFLAGS+= -DPOLY1305_ASM From nobody Tue Aug 22 05:49: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 4RVJM44xcsz4qNVR; Tue, 22 Aug 2023 05:49: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 4RVJM44RVPz4StM; Tue, 22 Aug 2023 05:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692683360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kUK9uWeewmc662GxJtfHb37VStQrm0+r6/tBmnAWuCc=; b=x0B74FmA65G2fqIc28cuiTzAu8Gb0i+mfmnabkK5BStoSS14ci8VdIpKq7W2Of77be7f/R G7hHI3fatRmxivdygLViW/IzvZWncJR6rnEAfriv41ydS3mQcQCGhzjK6kCo8/nWmqz3Mh 0Iwl+96TtSZgPHku77sI4WWxRLHAwRXximqDVAP/txqVYKxssa2kqnNe8uXeGIQJAeXTC4 7j2kzYmEQvsdsZ/x6inQj0YrfN2Hb48gMgDBT/8W8zYh/+AK25ZgzSl2NShF+urCbr1XpK rzS0+Tvae6cyvuLiKCe7PRJ7rUHU+mabUOIAlu+Csh+GvymaY5PVg7P62apcnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692683360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kUK9uWeewmc662GxJtfHb37VStQrm0+r6/tBmnAWuCc=; b=K5wvonGzikmk0c+85vadt4mSYgUn8643PIxF90k6YZd81XDOTP8Q8jn04Kr87lykfEbToF wiJu/+TWFsZJjeSQloRMRC7L7sdq1Ns5qLUc7diHKiiSuAm4+1gAPegHwVGy67glsV//uW a2rD1mvXwR5ad0n74GLg0lTLPawqUaPX9Qdlf81auBmLzqBhhGgpxApbofrNC65KG7P5du Ak8StXyGbXhtxzxkxXssd7ts0y3YrdcM85tTcNDcUF/MNSu6whXnJH2XgxPYuSEyqsnFji QUb4qgAK8gD4XceuHT0Wvwyy+zyNbdy73jiEFQxc9LOwhYPHQkVZY495IiGHMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692683360; a=rsa-sha256; cv=none; b=lAnmJegp3sWIfxUpiQGXDCVjQqmvj4lP3FU+LjF2C8s73AxpW2hRTf2pSbkppUwzy9ljc1 XtP0N9XjhxQzf7OeBZGE9fK4ejNUMDnh83vJ4KOEbJZ5GF7SMTekq5v4J1YhyUM8mxuW47 IDEkR4Y2tACqsxAsKg5FvBFRtVpy7w/nneQElsBuEg0Bzo8qZP3agLtrObVw+Accizij6T CYeTya4xgXVemfmLeyiLHAzRHRakwf6TfAh8jQO4mWcJ7SvDZmnG3ntEs76LA9P7mEAPMi QNZeLJfF1aSz/snzGrcKMwYUFUCwcAddgfyAEqRc5BJCZeYlMt5O+z4eP6DjmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVJM43B4NzrJy; Tue, 22 Aug 2023 05:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M5nKpM058853; Tue, 22 Aug 2023 05:49:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M5nKMg058850; Tue, 22 Aug 2023 05:49:20 GMT (envelope-from git) Date: Tue, 22 Aug 2023 05:49:20 GMT Message-Id: <202308220549.37M5nKMg058850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 6f7e9779fcb1 - main - bhyve: add config option to load ACPI tables into memory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f7e9779fcb196e2d66720e1b97de89b69677208 Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=6f7e9779fcb196e2d66720e1b97de89b69677208 commit 6f7e9779fcb196e2d66720e1b97de89b69677208 Author: Corvin Köhne AuthorDate: 2022-07-27 12:47:54 +0000 Commit: Corvin Köhne CommitDate: 2023-08-22 05:49:00 +0000 bhyve: add config option to load ACPI tables into memory For backward compatibility, the ACPI tables are loaded into the guest memory. Windows scans the memory, finds the ACPI tables and uses them. It ignores the ACPI tables provided by the UEFI. We are patching the ACPI tables in the guest memory, so that's mostly fine. However, Windows will break when the ACPI tables become to large or when we add entries which can't be patched by bhyve. One example of an unpatchable entry, is a TPM log. The TPM log has to be allocated by the guest firmware. As the address of the TPM log is unpredictable, bhyve can't assign it in the memory version of the ACPI tables. Additionally, this makes it impossible for bhyve to calculate a correct checksum of the table. By default ACPI tables are still loaded into guest memory for backward compatibility. The new acpi_tables_in_memory config value can be set to false to avoid this behaviour. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39979 --- usr.sbin/bhyve/basl.c | 53 +++++++++++++++++++++++++++++++------------ usr.sbin/bhyve/bhyve_config.5 | 7 ++++++ usr.sbin/bhyve/bhyverun.c | 1 + 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/usr.sbin/bhyve/basl.c b/usr.sbin/bhyve/basl.c index 8a4f2c4f311e..c20a52571937 100644 --- a/usr.sbin/bhyve/basl.c +++ b/usr.sbin/bhyve/basl.c @@ -20,6 +20,7 @@ #include #include "basl.h" +#include "config.h" #include "qemu_loader.h" struct basl_table_checksum { @@ -60,6 +61,7 @@ static STAILQ_HEAD(basl_table_list, basl_table) basl_tables = STAILQ_HEAD_INITIA static struct qemu_loader *basl_loader; static struct basl_table *rsdt; static struct basl_table *xsdt; +static bool load_into_memory; static __inline uint64_t basl_le_dec(void *pp, size_t len) @@ -153,6 +155,16 @@ basl_finish_install_guest_tables(struct basl_table *const table, uint32_t *const return (EFAULT); } + /* Cause guest BIOS to copy the ACPI table into guest memory. */ + BASL_EXEC( + qemu_fwcfg_add_file(table->fwcfg_name, table->len, table->data)); + BASL_EXEC(qemu_loader_alloc(basl_loader, table->fwcfg_name, + table->alignment, QEMU_LOADER_ALLOC_HIGH)); + + if (!load_into_memory) { + return (0); + } + /* * Install ACPI tables directly in guest memory for use by guests which * do not boot via EFI. EFI ROMs provide a pointer to the firmware @@ -168,12 +180,6 @@ basl_finish_install_guest_tables(struct basl_table *const table, uint32_t *const } memcpy(gva, table->data, table->len); - /* Cause guest bios to copy the ACPI table into guest memory. */ - BASL_EXEC( - qemu_fwcfg_add_file(table->fwcfg_name, table->len, table->data)); - BASL_EXEC(qemu_loader_alloc(basl_loader, table->fwcfg_name, - table->alignment, QEMU_LOADER_ALLOC_HIGH)); - return (0); } @@ -197,6 +203,14 @@ basl_finish_patch_checksums(struct basl_table *const table) assert(checksum->start < table->len); assert(checksum->start + len <= table->len); + /* Cause guest BIOS to patch the checksum. */ + BASL_EXEC(qemu_loader_add_checksum(basl_loader, + table->fwcfg_name, checksum->off, checksum->start, len)); + + if (!load_into_memory) { + continue; + } + /* * Install ACPI tables directly in guest memory for use by * guests which do not boot via EFI. EFI ROMs provide a pointer @@ -230,10 +244,6 @@ basl_finish_patch_checksums(struct basl_table *const table) sum += *(gva + i); } *checksum_gva = -sum; - - /* Cause guest bios to patch the checksum. */ - BASL_EXEC(qemu_loader_add_checksum(basl_loader, - table->fwcfg_name, checksum->off, checksum->start, len)); } return (0); @@ -278,6 +288,15 @@ basl_finish_patch_pointers(struct basl_table *const table) return (EFAULT); } + /* Cause guest BIOS to patch the pointer. */ + BASL_EXEC( + qemu_loader_add_pointer(basl_loader, table->fwcfg_name, + src_table->fwcfg_name, pointer->off, pointer->size)); + + if (!load_into_memory) { + continue; + } + /* * Install ACPI tables directly in guest memory for use by * guests which do not boot via EFI. EFI ROMs provide a pointer @@ -301,11 +320,6 @@ basl_finish_patch_pointers(struct basl_table *const table) val = basl_le_dec(gva + pointer->off, pointer->size); val += BHYVE_ACPI_BASE + src_table->off; basl_le_enc(gva + pointer->off, val, pointer->size); - - /* Cause guest bios to patch the pointer. */ - BASL_EXEC( - qemu_loader_add_pointer(basl_loader, table->fwcfg_name, - src_table->fwcfg_name, pointer->off, pointer->size)); } return (0); @@ -338,6 +352,15 @@ basl_finish(void) return (EINVAL); } + /* + * If we install ACPI tables by FwCfg and by memory, Windows will use + * the tables from memory. This can cause issues when using advanced + * features like a TPM log because we aren't able to patch the memory + * tables accordingly. + */ + load_into_memory = get_config_bool_default("acpi_tables_in_memory", + true); + /* * We have to install all tables before we can patch them. Therefore, * use two loops. The first one installs all tables and the second one diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index d074d4503894..6904ad096c0d 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -122,6 +122,13 @@ The value must be formatted as described in Wire guest memory. .It Va acpi_tables Ta bool Ta false Ta Generate ACPI tables. +.It Va acpi_tables_in_memory Ta bool Ta true Ta +.Xr bhyve 8 +always exposes ACPI tables by FwCfg. +For backward compatibility bhyve copies them into the guest memory as well. +This can cause problems if the guest uses the in-memory version, since certain +advanced features, such as TPM emulation, are exposed only via FwCfg. +Therefore, it is recommended to set this flag to false when running Windows guests. .It Va destroy_on_poweroff Ta bool Ta false Ta Destroy the VM on guest-initiated power-off. .It Va gdb.address Ta string Ta localhost Ta diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 3d32bfd35408..3db796c65a28 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1202,6 +1202,7 @@ set_defaults(void) { set_config_bool("acpi_tables", false); + set_config_bool("acpi_tables_in_memory", true); set_config_value("memory.size", "256M"); set_config_bool("x86.strictmsr", true); set_config_value("lpc.fwcfg", "bhyve"); From nobody Tue Aug 22 06:41: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 4RVKVx5yyTz4qS6n; Tue, 22 Aug 2023 06:41: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 4RVKVx5D1rz4bhy; Tue, 22 Aug 2023 06:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692686473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rIF/HqBd0KYRKIEFisf6HTg3bt5nVvYPu2G7a5My7Pk=; b=WeicUGbQF7N6iqN/1cOB3lYD5WvRyOBgfiBInh1DCf5ZsYiV7IG0UBQ4GTPMLh7xzxdwjS cPlWUgl0aE7pYqm6yIBLHMOjd48yD3QHXbb4pGywiTSouXiPFnbymeGMEQuNry0UBmFKd4 4lWGkiedIFQJFwRbvYLQpQDqYFR+efoH+11Qq6rNn/DnHV36SnSI/G/M7q99Zf3cW8TqIW Y5oQgZIuVCpQw3uuOYSRx2ijr9+PIf1z/m+hdeeQ/mZUy0sKb1Pir2c0M+n0pKLWoOJ41I omy9VytK3aN6mhGIAIHisovsfrLbG6qxUnm6O9ZuUban8eUaS1jBGIG6CbjG8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692686473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rIF/HqBd0KYRKIEFisf6HTg3bt5nVvYPu2G7a5My7Pk=; b=vryLZu357PL3NIeKXJmEEzYKkRvj1ZKH/FMQuWUymXYAPOPhR3vFmomJ0NLoolGAUUA+Xu gKwKpkFnyZy0cck/+8h9a4p5Bc/9Ew6hvAJYRUSrYovyrH0cFn+Pe3uCMDC6ejjLqrbG6N lI+18nA7dG4E5hngloJ/42HkYe9wMlsqK8PYSsse+lvzCw8ZUTWXm5QBXbULK8g6h447ML fj9PUVAeq5Ju9ETvlJfU1EG4EH63Ik0lVhzhVcQvH0WLEymeZe45RpOscA9sg5Kf6pgt9N XmyQU8mfjIiiczCSubrvkKKyKxN0u3FWWs88Dv2L1HwTI888eUH1dfzoMSWtiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692686473; a=rsa-sha256; cv=none; b=t9AFvx/42Phstc1WLDyqsO7moxroV1kU9VmO/UJbtHjfjglyhb++/mDORBq0FLi2LGbSYC T+YP1W1kyMJUJA9/VeMXGzbvA8hkZYZt1VZH9A587XnkjPntwdVEZiA/QETrRKejU/yoEG Fb8a+b7DtXyEss3DBe8mbseZjE7l0OE1zriKoD+TTswlxvC/JZ3inO47xTpd8DA4Hb8J/n c1tOYm3gyZEAXW7YOOT79PIYhp9rEDX8V68nw7xYzIxZlZm6Wf2zx5td+zEphNBlXE0Mxw i+a74kTZzP5oLRU+gN2RErp4VbIDnzMkBbHlN6oUA9KJcHPJjaPKsYtNPiJEMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVKVx4Hvszt3D; Tue, 22 Aug 2023 06:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M6fDM8053215; Tue, 22 Aug 2023 06:41:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M6fD17053212; Tue, 22 Aug 2023 06:41:13 GMT (envelope-from git) Date: Tue, 22 Aug 2023 06:41:13 GMT Message-Id: <202308220641.37M6fD17053212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 4d004ccce24b - main - Document strnstr()'s history. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d004ccce24ba06f0043503570d1fdbd39c9211f Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=4d004ccce24ba06f0043503570d1fdbd39c9211f commit 4d004ccce24ba06f0043503570d1fdbd39c9211f Author: David E. O'Brien AuthorDate: 2023-08-22 06:40:46 +0000 Commit: David E. O'Brien CommitDate: 2023-08-22 06:40:46 +0000 Document strnstr()'s history. --- lib/libc/string/strstr.3 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/libc/string/strstr.3 b/lib/libc/string/strstr.3 index 25af1ac6c08b..7ff9ec8c54e1 100644 --- a/lib/libc/string/strstr.3 +++ b/lib/libc/string/strstr.3 @@ -152,3 +152,9 @@ The function conforms to .St -isoC . +.Sh HISTORY +The +.Fn strnstr +function was introduced by +.Fx 4.5 +and is non-standard. From nobody Tue Aug 22 09:19: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 4RVP1158LDz4qd3H; Tue, 22 Aug 2023 09:19: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 4RVP114T17z4t3w; Tue, 22 Aug 2023 09:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692695941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62oHkMQzxkgXIB6hJAHw5yq34VD2CUCRS187ZurNbgs=; b=vBvuOk5/fSd08wRkPe1fSfvrkUywYB3ziYKwCajuJAA+OJnroVj7xJheA/AeeoBSd3QhNo KWSaDyPnlMuy/eAW8wsYoUTmQFWzsRVw5lbzS8gNLQnUKjrzjLK5LmG1ywbfs14vVEH3Oi K2IFNA9PZXbdypx6I1ESUKRHcUnzLm38U0vqp6X446lO9ALygWhGVkAdGmonH/Eu+lHn4Q VhM2bseUYfCJFs/SjsuF0MVF++tv53EcPvxsJu6n1btpb/EgcBz3HMERVESQ2oC/8LpAUY WYbXl7qlAPxUu7coNQwziRVgvRQTBT0F88abXgBStUPhpp+t4iI+KdhEIgcskA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692695941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62oHkMQzxkgXIB6hJAHw5yq34VD2CUCRS187ZurNbgs=; b=KyKjCWx7Ts5JWkLuqF41DYGkgmPpadpWnljU6tINilBijO7U59o8BQ+BcA8wt3Y5NcG0zg G/81VIlPRXEm2tW99JIhtfOtVShZvgy9eLTB5DNcfDDT3/1XXKEV5TUTdxFHTpZCzCW9UF +8tMMOOBUupnayWGS0drRdWI4YD3nUz1ZiP4Vpe9mdXlTQFrhRrHenSyUuqQdPFLiJArDG /sHM+9B+TJvtHgyMqGtci3LL1CY881plziRN19Ph/sa1Q5OP8kBUIQQlre5sS2xTeih35L c+jk6f45YAvwnJhaKdl7dro0cqayE2X+BJ87TBp1TILiPcssL+UhGl2hTKYQ7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692695941; a=rsa-sha256; cv=none; b=mX2XbQ5fY4KqX7fpwak2/EJes1SN/nzNh2AUYOwgdQBP/SEI4mouh36UJAVApuRrImx9v+ cxTv2aVk9m2dCOS1hXMAiABeXFqUB/YQomIj0T0PDkWDxAscYYicHldjlOaPOMJHCpJEj4 iIXnRrUX+rC1GgeRQDXLvjW4Pg9kl1ry/DrKS1ag0U8XLkGT1hat9Cr0XVp+CmoQ2OYOuK GnpiiuJA4897FFnghVF3EH8IR+TIBC94igmIu/6GJCQ/tLi07een24GCWozEzqP03SxEF4 JWx6E4EyqhlvvTzzhfPzg/M2nQLieqIhbPT/dgfBtXbNSidI8+V604DRQr15Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVP113WRYzxj1; Tue, 22 Aug 2023 09:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M9J1gX007455; Tue, 22 Aug 2023 09:19:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M9J1lm007452; Tue, 22 Aug 2023 09:19:01 GMT (envelope-from git) Date: Tue, 22 Aug 2023 09:19:01 GMT Message-Id: <202308220919.37M9J1lm007452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: cb1883b03223 - stable/13 - linux(4): Fix linker warning about undefined vdso symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cb1883b032233bb6e382efa9475d54502592b33d Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=cb1883b032233bb6e382efa9475d54502592b33d commit cb1883b032233bb6e382efa9475d54502592b33d Author: Dmitry Chagin AuthorDate: 2023-08-19 21:48:36 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-22 09:18:48 +0000 linux(4): Fix linker warning about undefined vdso symbols Pointed out by: bz MFC after: 3 days (cherry picked from commit a129642ced9e6ceacf98c7663bc1178eb32a78be) --- sys/compat/linux/linux_vdso_gtod.inc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_vdso_gtod.inc b/sys/compat/linux/linux_vdso_gtod.inc index 05f19c67022a..e508f821725d 100644 --- a/sys/compat/linux/linux_vdso_gtod.inc +++ b/sys/compat/linux/linux_vdso_gtod.inc @@ -26,6 +26,14 @@ * SUCH DAMAGE. */ +#if defined(__aarch64__) +#define __VDSO_PREFIX __kernel +#else +#define __VDSO_PREFIX __vdso +#endif + +#define __vdsoN(x) __CONCAT(__CONCAT(__VDSO_PREFIX,_),x) + static int fls(int mask) { @@ -295,7 +303,7 @@ freebsd_clock_gettime(clockid_t clock_id, struct timespec *ts) * */ int -__vdso_clock_gettime(clockid_t clock_id, struct l_timespec *lts) +__vdsoN(clock_gettime)(clockid_t clock_id, struct l_timespec *lts) { struct timespec ts; clockid_t which; @@ -312,7 +320,7 @@ __vdso_clock_gettime(clockid_t clock_id, struct l_timespec *lts) } int -__vdso_gettimeofday(l_timeval *ltv, struct timezone *tz) +__vdsoN(gettimeofday)(l_timeval *ltv, struct timezone *tz) { struct timeval tv; int error; @@ -324,7 +332,7 @@ __vdso_gettimeofday(l_timeval *ltv, struct timezone *tz) } int -__vdso_clock_getres(clockid_t clock_id, struct l_timespec *lts) +__vdsoN(clock_getres)(clockid_t clock_id, struct l_timespec *lts) { return (__vdso_clock_getres_fallback(clock_id, lts)); From nobody Tue Aug 22 09:39: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 4RVPSJ2LT5z4qf7X; Tue, 22 Aug 2023 09:39: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 4RVPSJ1sd3z3CDF; Tue, 22 Aug 2023 09:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692697152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHw9DxqAzmu+u7UFGC9K+nBzgTDeUcZOaX7NsANJ8Kc=; b=Cec2Hg29EA9O/XJYq9IEAgxSp2e/UneVF4eMLnyIMaP6lntD8N8XaIzHOBUp9UbeIwyhtE qjIgX+nnr8A6gsyDjZNNhTfu8S11toNlN74YaPXYS615YKfGXn/5zE22nODo6W1cB1LqQU ykJXaFid92KmX3RnNBOpbSouWFu2ZJQ7L3Qog6IgHNRTab1bRaiL2b724Z+03QsKwd1Zdh rqybA1fp+m/cOvvpC/kNqkX/ZxHK0cMbzeNkY4mg64kfL48yAfds6HHiBr/k6pyegK+M4c 2E8NoTvgFNwoeJHHyWN+WaQfLsOSJDpoXXoMpjvBbLYiJM2M4DmMO1sVOBVw+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692697152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHw9DxqAzmu+u7UFGC9K+nBzgTDeUcZOaX7NsANJ8Kc=; b=ROjb6iAGyNsQ20IP4L3WnJ8sSfCDXfL2P24zTxi7aT1Nhx4S4QOXFSqYmCdJJILP3arr8y 7staMk5Ds8PUTTTSFg8AKri8/kNHRvIb3zHcdAPFAu5fUz+XimGDuZHutQghNsZvV1ImmD 5CzKhiJPibpGDs0vsH8xzcmRzQm58q6BUjWlxE7W41ySAHhH030Qb7v40f8k+bhq6W4yx5 VIiFwY1nDNivfDZ8vxuor3c3xOYHNviR/cmkIZnQz8JQuf0KHlti/ox7ALOS0AUwx2AOHm rhvrFMXl6xiRLTwXQ0vb9GlAP3JyczUN+r20cQYgXBIrxit9k9faHYCOA+p2og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692697152; a=rsa-sha256; cv=none; b=Ol0zUzeZilQTj1MMcJyv6MZpyxmH9PRDYkTc7puLKXNPpDWnrH0PGgps96s61FPIpw7zRV U82uiVT85Pmow8GUu0RjIzkIPvNHCgKwpeMh3q89DANx1AhJBYjII1F/cm0uJv0+Z013lu N4j57MY1C9McU6TPTzTxiZhG66wwu7/6iBJo5T9pXv0Q2GvMaXBYCwNfWBW/gGBCLgEwOI +m8Jgmiut12d5UFUCIXC0FRPfGlnUMJ6P/LSwbdLZG0F3wPji/diKnH2w9bFDAj1zKf9cP Jeu0GujV2vKbpAgK4Vw8vtrH0J7mt3w08/Oq9sZ0vpB4yjv6SS/F5UK8R91KJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVPSJ0x8Fzy3Q; Tue, 22 Aug 2023 09:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M9dCiq040669; Tue, 22 Aug 2023 09:39:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M9dCn2040666; Tue, 22 Aug 2023 09:39:12 GMT (envelope-from git) Date: Tue, 22 Aug 2023 09:39:12 GMT Message-Id: <202308220939.37M9dCn2040666@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: c941b82e1c31 - main - geom_linux_lvm: Check the offset of physical volume header List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c941b82e1c31a67a025c43cc7bd31f269fa62588 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c941b82e1c31a67a025c43cc7bd31f269fa62588 commit c941b82e1c31a67a025c43cc7bd31f269fa62588 Author: Zhenlei Huang AuthorDate: 2023-08-22 09:20:10 +0000 Commit: Zhenlei Huang CommitDate: 2023-08-22 09:20:10 +0000 geom_linux_lvm: Check the offset of physical volume header The LVM label is stored on any of the first four sectors, and the PV (physical volume) header is stored within the same sector following the LVM label. The current implementation does not fully check the offset of PV header, when attaching a bad formatted LVM PV the kernel may crash due to out-of-bounds memory read. PR: 266562 Reviewed by: jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D36773 --- sys/geom/linux_lvm/g_linux_lvm.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/geom/linux_lvm/g_linux_lvm.c b/sys/geom/linux_lvm/g_linux_lvm.c index 2e4bbcaa045a..dddc3ae9184e 100644 --- a/sys/geom/linux_lvm/g_linux_lvm.c +++ b/sys/geom/linux_lvm/g_linux_lvm.c @@ -67,7 +67,8 @@ static int g_llvm_read_label(struct g_consumer *, struct g_llvm_label *); static int g_llvm_read_md(struct g_consumer *, struct g_llvm_metadata *, struct g_llvm_label *); -static int llvm_label_decode(const u_char *, struct g_llvm_label *, int); +static int llvm_label_decode(const u_char *, struct g_llvm_label *, + int, u_int); static int llvm_md_decode(const u_char *, struct g_llvm_metadata *, struct g_llvm_label *); static int llvm_textconf_decode(u_char *, int, @@ -637,7 +638,8 @@ g_llvm_read_label(struct g_consumer *cp, struct g_llvm_label *ll) /* Search the four sectors for the LVM label. */ for (i = 0; i < 4; i++) { - error = llvm_label_decode(&buf[i * pp->sectorsize], ll, i); + error = llvm_label_decode(&buf[i * pp->sectorsize], ll, i, + pp->sectorsize); if (error == 0) break; /* found it */ } @@ -703,7 +705,8 @@ g_llvm_read_md(struct g_consumer *cp, struct g_llvm_metadata *md, } static int -llvm_label_decode(const u_char *data, struct g_llvm_label *ll, int sector) +llvm_label_decode(const u_char *data, struct g_llvm_label *ll, int sector, + u_int sectorsize) { uint64_t off; char *uuid; @@ -728,6 +731,13 @@ llvm_label_decode(const u_char *data, struct g_llvm_label *ll, int sector) return (EINVAL); } + /* XXX The minimal possible size of physical volume header is 88 */ + if (ll->ll_offset < 32 || ll->ll_offset > sectorsize - 88) { + G_LLVM_DEBUG(0, "Invalid physical volume header offset %u", + ll->ll_offset); + return (EINVAL); + } + off = ll->ll_offset; /* * convert the binary uuid to string format, the format is From nobody Tue Aug 22 16:21: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 4RVZNn6WWCz4r5nS; Tue, 22 Aug 2023 16:21:45 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) (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 4RVZNn4rVMz4XQq; Tue, 22 Aug 2023 16:21:45 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x22d.google.com with SMTP id 5614622812f47-3a76d882052so3344148b6e.0; Tue, 22 Aug 2023 09:21:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692721304; x=1693326104; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=U33b3NK23BybR7jfdMv+VIKl5XZMNm8zN+2NplkcyjQ=; b=C8cSgHDDBVj0agMhM+viN5jqc0mHR0zBkJ51XYHoyGn1q8eniNCSiiKlJgMJdR91DO UkwcvgWsQh6joYPebT8gFyKeazNAFZIKa/cUrQ0PecZ/Jq+n3xcoz5/OqRAhlbEOvprg m8CiinEb48vXzOysAB5lKhCjQAgyovofALavakP5ZmIsRrEaDSoYju9STUGMz+2rGTbX VsDZbCl82+45xqvh8BJIYXCSy2umULnB61kZ88ip07wqhOAAON2kscFTq7G3YcqkKrzW fpi6lwS7uTWwjmLgsFFkGts272KBOLau1JAhKzAOWJiCePo1s+4nXKhl9QRAYFGHu+kT glKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692721304; x=1693326104; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=U33b3NK23BybR7jfdMv+VIKl5XZMNm8zN+2NplkcyjQ=; b=LKoT9+xqyyeKmW9NX5gLzDsLyxeRUktF8wvDwrlCHf8Mcv2huwvLyY3Jbu9Ssdl2IU 524JwpHsh4fAzhZoQ5EkZ4jQ4yvHLo4gC8zJby2/RLk/01z8jg09Yyo41PisntvLoTo/ seJnx99qkUi+WP/duZ9/VSEdp3vjCatflx5BpHYxEuH1R/EYMSAkTIw8/k0QecZyfQKW hmvUY84GCnW1yNQ0ZLWVya6gCKafONvk3+DH/D4w4bbSCYnSxgTQa6jXOtUc8o0u7U+k fyCr1Ns+14Gm1S+KdqSuWjwn/wtguRIShED6SrGOUsL36Sm+u76yHr/YqPoqdXpMBHxo K+mg== X-Gm-Message-State: AOJu0YweJtLGE8/goDLcj20CM1I/RHe3P2Z/gmWacLZp2wlwYJOH+wqM SPI6z2eM1uadQHU26Gh3WhvDmq1PJZI= X-Google-Smtp-Source: AGHT+IFJJR+AswX4hGkWbbfAK9Oip4OaFrQBqWGywLFEXu6YIGFB6Z62rNJWu5eOsIPn4j3ReDqAUg== X-Received: by 2002:aca:3442:0:b0:3a7:9837:7148 with SMTP id b63-20020aca3442000000b003a798377148mr8339185oia.58.1692721304040; Tue, 22 Aug 2023 09:21:44 -0700 (PDT) Received: from smtpclient.apple (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id s26-20020a639e1a000000b0055b5f206ea2sm8144616pgd.39.2023.08.22.09.21.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Aug 2023 09:21:43 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_EC3692D3-DEDD-4563-87B8-3E51B603BCD2"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 7a56f5af7185 - main - libcrypto: Don't embed $FreeBSD$ in generated assembly files From: Enji Cooper In-Reply-To: <202308220404.37M44LWJ093340@gitrepo.freebsd.org> Date: Tue, 22 Aug 2023 09:21:31 -0700 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <202308220404.37M44LWJ093340@gitrepo.freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RVZNn4rVMz4XQq X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] --Apple-Mail=_EC3692D3-DEDD-4563-87B8-3E51B603BCD2 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Aug 21, 2023, at 9:04 PM, John Baldwin wrote: >=20 > The branch main has been updated by jhb: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D7a56f5af71851c8b502720ca956629c3= 02821430 >=20 > commit 7a56f5af71851c8b502720ca956629c302821430 > Author: John Baldwin > AuthorDate: 2023-08-22 04:01:48 +0000 > Commit: John Baldwin > CommitDate: 2023-08-22 04:01:48 +0000 >=20 > libcrypto: Don't embed $FreeBSD$ in generated assembly files >=20 > Reviewed by: gallatin, ngie, emaste > Differential Revision: https://reviews.freebsd.org/D41536 I wonder =E2=80=94 should this be MFCed? It doesn=E2=80=99t seem like = there=E2=80=99s much value in the $FreeBSD$ tags now that FreeBSD has = moved its source to git. Cheers, -Enji --Apple-Mail=_EC3692D3-DEDD-4563-87B8-3E51B603BCD2 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEtvtxN6kOllEF3nmX5JFNMZeDGN4FAmTk4IwACgkQ5JFNMZeD GN7BOQ/+Lk+B8FtcH388j3UsPfRA7ioS1c+ELL5jI+yG83PpmfnLgSZpLBikMtwF 8sS88ZIJdRQxdwFydR7XasIAJ6Aw+eUir2QjzQ5J3jHE0HLfDlMPvBE6IKhb1UU9 ZQWmpXuWsQCz4TMfh3B4ehdDsmNtqtrDJ6BAXtLeC0LfWw0K7YHGS9IYX+0Fq1Au dZZYeoLqNVwqNQyZtKDqdShz0Q2yRIgDw5TDDHFo7QwlRuVbgNsuWQNgwZd6yTuH rzQyhQ5Me6mCcdUj1NcVYfg6xEiy5Eb6Qne+WBHvuAzVJrkerYg/emghTzZEc/ZC vsVDT7UavRt4Zq0acb6bunDM4cT5Ynu4Xx55IvJ08YvLzrqe2ccKM+aTTCPJkMlX RIz4yqBkp5xdgBLn4MFcJquf2B/EQALRsqme19rf+oKap2GbxjioneQz1t1ncf8H YB0z1iPN4aDfc8K70LPv6SYBrqRakPQmHXEAu3aWFDFCyVJHJUYgAE89uXrbkM7k bAKl1mcJUVav/SR49sq5TnO8aYSDv6WGEwT/3C6WNwvQOHxA+VgjAzDoKDdHLrb4 y5zQOf+2nj+ukAaTdXIlcXY7mxBi22Tiwiiso/OuBJW43CFAtw+fJZBaCArh1LqJ qlnuPtiDCR2NYp6Em99jDFYDcvPvdBl4D0S8j96/uwY2IFhbbYo= =DYvH -----END PGP SIGNATURE----- --Apple-Mail=_EC3692D3-DEDD-4563-87B8-3E51B603BCD2-- From nobody Tue Aug 22 16:48: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 4RVZzh3DChz4r7hM for ; Tue, 22 Aug 2023 16:48:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) (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 4RVZzh1NPCz4d6l for ; Tue, 22 Aug 2023 16:48:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-99bf8e5ab39so639548266b.2 for ; Tue, 22 Aug 2023 09:48:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692722911; x=1693327711; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=MXceORh3UvvQW8zS8SQ+kbDBFeFQCyXxvwReVmrymsI=; b=FdRy2cpnFK5dtOokSF2CyuSekuE5Rfg0uAU71UGIzeEz7FnKqe8w1kV58fa3MjoIcZ jzX1dfHcOKhbkYStnxa5B+YXi5yPvtVGQX/t4NiRNUmVqOQd1DEz93FqSWRHi14OaW2M WszEGPKL0qQclc51k0T6+AN/L/MP0ntwi4Dt5ARR1U8ayrlQ8nxALC8dkzt6/lnMgGGl bap1aI2SyzgdzFegB2vXU8IvqZMuuLsdS7zwc27y3FqBkW7lDzu78lisAqGSi7F/2pVL PH5FV+Y9Rw9ldMQYt65u76C0+zim2ooX8yZNbOYwqJxqY4+9frulvkyQfLn2TZVS7QBY elOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692722911; x=1693327711; 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=MXceORh3UvvQW8zS8SQ+kbDBFeFQCyXxvwReVmrymsI=; b=H2MT17KirzoVj69FwoSjePk3yJmhvX+rWVxYqqM2bpKQClJIY1JZi+OfvP0mEzd2fG 43rKWvF9a/C2t4HsGLu5pVGZy7QBdVxLXOHz2xomSxb36KEHCo7FqkivF4f64gWZ+XVy 9AWGLKul+QeEuPcY/yFvcYAe9jq71Lta0eFyc4K5Uy/cYT39Ck8H57Rd2TsTH0wNfGjS xOC4B+kIUni6t+Q8ybyzLooO517c6lvNvIw8f4ff4g7pp0zjoyprjfWq0GtycbDSB6Cj OtRC+WLRP9p1aLfd57PhDRGMwzYSyUkW3zAJPxugn6p1MCRaZmrDkEqoZ4bITHau/Ppk Dy/w== X-Gm-Message-State: AOJu0Yz5ax0wLTZBtvHR3zXeRk7/61taWrSYvaMGEXztjeWgnz84O+uq 7L+18vim9+nSiEeoacqMIaEOjTctsDrRBsSxs2Fdag== X-Google-Smtp-Source: AGHT+IH6EGbpfqw+dO7nujAex2n8CLGDqSi9A3hq3tuPyde0YD+gcwBIf7S8rDZt+Jl59fkhBstaWAzNkr7ffDziU+k= X-Received: by 2002:a17:907:7897:b0:993:f15f:efb7 with SMTP id ku23-20020a170907789700b00993f15fefb7mr7997050ejc.8.1692722910672; Tue, 22 Aug 2023 09:48: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: <202308220404.37M44LWJ093340@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 22 Aug 2023 10:48:19 -0600 Message-ID: Subject: Re: git: 7a56f5af7185 - main - libcrypto: Don't embed $FreeBSD$ in generated assembly files To: Enji Cooper Cc: John Baldwin , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000cb4dc0060385c344" X-Rspamd-Queue-Id: 4RVZzh1NPCz4d6l X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --000000000000cb4dc0060385c344 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Aug 22, 2023 at 10:21=E2=80=AFAM Enji Cooper wrote: > > > On Aug 21, 2023, at 9:04 PM, John Baldwin wrote: > > > > The branch main has been updated by jhb: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D7a56f5af71851c8b502720ca956629c= 302821430 > > > > commit 7a56f5af71851c8b502720ca956629c302821430 > > Author: John Baldwin > > AuthorDate: 2023-08-22 04:01:48 +0000 > > Commit: John Baldwin > > CommitDate: 2023-08-22 04:01:48 +0000 > > > > libcrypto: Don't embed $FreeBSD$ in generated assembly files > > > > Reviewed by: gallatin, ngie, emaste > > Differential Revision: https://reviews.freebsd.org/D41536 > > I wonder =E2=80=94 should this be MFCed? It doesn=E2=80=99t seem like the= re=E2=80=99s much value > in the $FreeBSD$ tags now that FreeBSD has moved its source to git. > I literally have the MFC of all this junk to stable/13 sitting on my machine waiting for it to make it through universe. Note: I think we need to fix the first few lines of this Makefile though: # to the arch subdir, and correct any exposed paths and $ FreeBSD $ tags. to s/,.*\././ since that last bit is no longer relevant. Warner --000000000000cb4dc0060385c344 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, Aug 22, 2023 at 10:21=E2=80= =AFAM Enji Cooper <yaneurabeya@= gmail.com> wrote:

> On Aug 21, 2023, at 9:04 PM, John Baldwin <jhb@freebsd.org> wrote:
>
> The branch main has been updated by jhb:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D7a56f5af71851c8b502720ca956629c302821430<= /a>
>
> commit 7a56f5af71851c8b502720ca956629c302821430
> Author:=C2=A0 =C2=A0 =C2=A0John Baldwin <jhb@FreeBSD.org>
> AuthorDate: 2023-08-22 04:01:48 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0John Baldwin <jhb@FreeBSD.org>
> CommitDate: 2023-08-22 04:01:48 +0000
>
>=C2=A0 =C2=A0 libcrypto: Don't embed $FreeBSD$ in generated assembl= y files
>
>=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 gallatin, ngie, emaste
>=C2=A0 =C2=A0 Differential Revision:=C2=A0 https://reviews.fre= ebsd.org/D41536

I wonder =E2=80=94 should this be MFCed? It doesn=E2=80=99t seem like there= =E2=80=99s much value in the $FreeBSD$ tags now that FreeBSD has moved its = source to git.

I literally have the MFC= of all this junk to stable/13 sitting on my machine waiting for it to make= it through universe.

Note: I think we need to fix= the first few lines of this Makefile though:

# to= the arch subdir, and correct any exposed paths and $ FreeBSD $ tags.

to s/,.*\././ since that last bit is no longer rele= vant.

Warner
--000000000000cb4dc0060385c344-- From nobody Tue Aug 22 17:53: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 4RVcQc5kK3z4rC5N; Tue, 22 Aug 2023 17:53: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 4RVcQc54VLz3LZD; Tue, 22 Aug 2023 17:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692726808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oZaA8izJQe168CmSVyftl/kJb3y7UDFaIGnTvyb3/EU=; b=p2nRHdEbqk45xoSr2MxUZo/NjkygtAqQkUECJQBHlSvcnIT5PWPmlKL1RPPcZx2A1ubQ1m 6qViqxw+HLSO34ecCDoXINi4UAK6P3Jhr72xjiiRSt2n8omkL9AQb/UXYhAihQi7OPZ7oW Y/qqW9nwcQF4PKzsiCeLBpqjPoeAxhLuFoI0E8uTn+Wp+M3CcP3+OnddT4Vo7mCIS0wz0X BXUJwn62bftklH3IrIX9u4w2CxcHCYna33hLyrR7AN7aCtQsN3vN9TKMrmTBdBEArFvLAU 0SOvxRIQMm4hWULmZyqQwEzs9wOV6NX/OwL2x/BDOGZNfjniAX4r7tpOC8cxvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692726808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oZaA8izJQe168CmSVyftl/kJb3y7UDFaIGnTvyb3/EU=; b=fzmqQSNdBG0YdRwGWInH3IVJaYqGmI+Ro7/oUAZsBvM+1jMuxq5xlRUST1Jq3z+M0GFJLG kFzJxEWIwJRsy70E8nWmVGxpUu1wvmgmrJZKbvEaKInV12x2+uWOe+yIxLRLyFO4EU8dAd E/nVHDQ5KjbjAt6U/tONwY9kSwwQ3O84bjrYXkst/xQhVHFSMh5BKLEVDb/s1Gyc+SkFq7 NgZQ1H8eAi3aUIlvqO/ckXLbRR6kE5DnF0I/LhrSuYSDIvvEaRkbE1E7kw8O4N7CWhjzP9 TV2HUDjVVsvY+29UMw/pcLwJl8dtRbB+B8xQCTdPp/zike4lnvOSRD0oso2wdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692726808; a=rsa-sha256; cv=none; b=OcWuD2Vt+RmDA5Xv8aYcw3wnPIl0W+s9cCRgLCrWAh66S1zf+82gm1YLuZYwJLFoRCNFW+ 3HY9WTLHmQS7lYafa5m0tjXabgJG+/ueYzVhliOf4gQYSbfOyjz5WmeFEqrnUWBAfA4lAT Fy8IB9dlcNsIeT6sV9T9wCMsf2yK6FPmadVQYOw7m7fIoI2st9ZrrFFoCvNCS5TQ05+3Lo lQj/qnQUe0FiSla53sfGlVmbsVdG2wanndF6niEfx2JVRjY/AgqMciS25u8j20YEs/pIN7 8SNkOi6/JpzQf7qy5jA9O0s17HF0N/8CCOUI6Kw58OM9bcTVASxoIisl3NHdMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVcQc47bKz1BwR; Tue, 22 Aug 2023 17:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MHrSnF066543; Tue, 22 Aug 2023 17:53:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MHrSfB066540; Tue, 22 Aug 2023 17:53:28 GMT (envelope-from git) Date: Tue, 22 Aug 2023 17:53:28 GMT Message-Id: <202308221753.37MHrSfB066540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 3b4da25ead62 - main - tools/build/make.py: Make flake8 clean List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b4da25ead62c346d05199bc96cd6935e896849f Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3b4da25ead62c346d05199bc96cd6935e896849f commit 3b4da25ead62c346d05199bc96cd6935e896849f Author: Jessica Clarke AuthorDate: 2023-08-22 17:52:57 +0000 Commit: Jessica Clarke CommitDate: 2023-08-22 17:52:57 +0000 tools/build/make.py: Make flake8 clean --- tools/build/make.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/build/make.py b/tools/build/make.py index 05c095e10172..7ae6a95e8c23 100755 --- a/tools/build/make.py +++ b/tools/build/make.py @@ -112,6 +112,7 @@ def check_required_make_env_var(varname, binary_name, bindir): if parsed_args.debug: run([guess, "--version"]) + def check_xtool_make_env_var(varname, binary_name): # Avoid calling brew --prefix on macOS if all variables are already set: if os.getenv(varname): @@ -122,6 +123,7 @@ def check_xtool_make_env_var(varname, binary_name): return check_required_make_env_var(varname, binary_name, parsed_args.cross_bindir) + def default_cross_toolchain(): # default to homebrew-installed clang on MacOS if available if sys.platform.startswith("darwin"): @@ -249,7 +251,7 @@ if __name__ == "__main__": and not is_make_var_set("WITHOUT_CLEAN")): # Avoid accidentally deleting all of the build tree and wasting lots of # time cleaning directories instead of just doing a rm -rf ${.OBJDIR} - want_clean = input("You did not set -DWITHOUT_CLEAN/--clean/--no-clean." + want_clean = input("You did not set -DWITHOUT_CLEAN/--(no-)clean." " Did you really mean to do a clean build? y/[N] ") if not want_clean.lower().startswith("y"): bmake_args.append("-DWITHOUT_CLEAN") From nobody Tue Aug 22 17:53: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 4RVcQf3Q4Zz4rCGw; Tue, 22 Aug 2023 17: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 4RVcQd63yMz3M0p; Tue, 22 Aug 2023 17:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692726809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ck0/lSRixWa/y5jx//2TT8y4E9kiZ3v+pe2A+OQ8e9M=; b=NfyzHZwz8FP90NOwJ8R6/rnvzqha9QEO8Si1nV4CqowS6rdfmy2lFoqPb/15+VL3JVfu9X mlORxzmxIFYs2UslQFWJRC07vS4oErnebvsplKOMLRJAKaFvnGpgHM1rbw/Gz79wPd5oKc MOUSo23ry0fvGxAVpnj4afn/TckWFWweT2BZML3gOAmaFPnTPLgbeOmRhzMLF+sdHrx4di HdjKC3UZStY8TULBDQIlSVZDFjyqldq09nGjcbBD/eB5rMKzAZfTvpA70xoUiGhRpA8V8S hbCSxsm1HQgqgYCbJDgXiIXFxAE+mEl5DoWB4WXiTeKTp/jDj8MDMXXJ1NcDfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692726809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ck0/lSRixWa/y5jx//2TT8y4E9kiZ3v+pe2A+OQ8e9M=; b=sjyHSppz6PIdSnJxaynn18PdFtyJEbgvjXcVJBtHlai/+iMP0ldWQRLNifPHyR/9j00NNH GrFQMjw6n3wSsdwbLzFTLDtqur7zp8tVAlYlVnUsYAE0+U9NmJXits6lFM4k684NYI1Aph KNcuAj7VtU/EJS7H3OvibwqwG9whdH3REPlOKRG19slBy8f9X9856Gv7sWcCqxHFZJtG98 WZj5EOwaJ6JSKTlGkjTiho8Dj4OpE/D1QqWnTFJccx0peF29y3+hpJKB5FKt2XiVG7uov5 yXirg/mj9IUjTIy9U1gIaHCE6C/KaJypIRjVMHBYl/1SwK4wujOGfhREV1zxSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692726809; a=rsa-sha256; cv=none; b=UrOUqgj4CcI/mCUqKOw7OsyK/4xZzHmp+dxlAC7IpmS6YHPqsFFj19WL2B/+OvpdN9E0kJ ZotBH0yTRODqNR8BsjrT6IhCXSvxCvWn30IHCLvb8Il8IQbps0jBoDD225j1JYV91DzfN/ +NIACJkASK/f49sJtEFQo8G39v8qNiA7El32odsbaoXsTVBoFSsnnWLM4hXt/HIAMttw73 GB1QcbubWB4tdk7GMrBK2JoYR6bcb2OVLOrNJ93k+LOThl73DZdkTk2Jhd34x7yZ0Cz0sO HDJ0lDVSNbC3gFPurH86QnNlG6ZZckXxob9EB7JWyaWH8umBpOS22B2/SITcng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVcQd57Dwz1C8T; Tue, 22 Aug 2023 17:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MHrTV8066591; Tue, 22 Aug 2023 17:53:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MHrT88066588; Tue, 22 Aug 2023 17:53:29 GMT (envelope-from git) Date: Tue, 22 Aug 2023 17:53:29 GMT Message-Id: <202308221753.37MHrT88066588@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 5157b451c654 - main - tools/build/make.py: Grow the list of MI targets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5157b451c65480deecbc0e7c223684830a4af7ce Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=5157b451c65480deecbc0e7c223684830a4af7ce commit 5157b451c65480deecbc0e7c223684830a4af7ce Author: Jessica Clarke AuthorDate: 2023-08-22 17:53:13 +0000 Commit: Jessica Clarke CommitDate: 2023-08-22 17:53:13 +0000 tools/build/make.py: Grow the list of MI targets --- tools/build/make.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/build/make.py b/tools/build/make.py index 7ae6a95e8c23..74454aa51b08 100755 --- a/tools/build/make.py +++ b/tools/build/make.py @@ -48,6 +48,24 @@ import sys from pathlib import Path +# List of targets that are independent of TARGET/TARGET_ARCH and thus do not +# need them to be set. Keep in the same order as Makefile documents them (if +# they are documented). +mach_indep_targets = [ + "cleanuniverse", + "universe", + "universe-toolchain", + "tinderbox" + "worlds", + "kernels", + "kernel-toolchains", + "targets", + "toolchains", + "makeman", + "sysent", +] + + def run(cmd, **kwargs): cmd = list(map(str, cmd)) # convert all Path objects to str debug("Running", cmd) @@ -190,7 +208,7 @@ if __name__ == "__main__": new_env_vars = {} if not sys.platform.startswith("freebsd"): if not is_make_var_set("TARGET") or not is_make_var_set("TARGET_ARCH"): - if "universe" not in sys.argv and "tinderbox" not in sys.argv: + if not set(sys.argv).intersection(set(mach_indep_targets)): sys.exit("TARGET= and TARGET_ARCH= must be set explicitly " "when building on non-FreeBSD") if not parsed_args.bootstrap_toolchain: From nobody Tue Aug 22 18:05: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 4RVchB3hgYz4rD5y; Tue, 22 Aug 2023 18:05: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 4RVchB1nYhz3NXY; Tue, 22 Aug 2023 18:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692727514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oLCIGL+P3AtwRcyad7CYy7Wu+n2iGYWe+2QdO6ae7Ik=; b=eZbWhIYEhmxBjYfHDjLYejcpo6NZvMJbFWYQGSVi4xlIMcmnN1mRtX8mYA+hZJ37caxu+o 29wBZsUxrvUPp8CLln16PnU6xf838ywilKAUigQGy3TBH7LhJBprowO3Rl8110i96eRoV/ yGx/oQCQAUd/3U0BIk4ChLXQ1BH4SgmbBxmLMZjqidKWhO6XyEMFxrlJ9/tc+qzuuAAXRH 1/loAw6hL+J6CEkNnW3y0xY6Ir0eNczP33mh+/fJ5w6b2dTrzbCYXyBMmmd+Xg+e/KXjiP GHv/aQvUQSVWDD070Q20Xj34BcJyfQdeAYQR/gstDimzZXaoo/OkbLghzsZyfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692727514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oLCIGL+P3AtwRcyad7CYy7Wu+n2iGYWe+2QdO6ae7Ik=; b=Da0Ll7gjWcBWRzizBLSTGDBZp7ZS/uMOpgL8bTb4j8VPFUZYNSX66/9h1vSYcJrSIR55SV myKOKJwCO2v1t/qZ4OhL5JrsC1ZBGAenscIswSFz5Np/hyZO7ncaxXAObUvvs46KDSMbvJ Ql+DiqJ5tSs5xJIoQawxGmNReLq0bRIyNwxOrWnN7rV6VMYPX1nzczgRGfrXlmPaeJZCm4 lhm8wcBMqd7pN46OJPO5GkhLJblYPDme4KVOa6NJuXqgTlPYRXYUQvz4TpAUYx9Xx1iPF/ Z0wpBm+E2f3vGthNC8Z4u0txxuTSxiGqEDzP3YxH2uUVsDEp+8UNUTgGAubX9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692727514; a=rsa-sha256; cv=none; b=g29zDKLXcmeIPHC600Mp68qt7WgaWgheOdAu/18XUGiXTGBB1ipVUQKwExflTbuuVOnG1U WfAMOt8hs0vt8IwFBW6BMf25+dlBTuIBj08LGehxrpmTG8dAtc0k0Y/lEuruQ7tz2M0cg6 h2ZWpgafYL/j5fbZDa+wYnArMuM2/aqbijpkR4kEsXjHWHxlkhkHRrYDo8/qOFbyjBtpqR aOsSeUyzZyEw9MzWQVrxrKgSsSOEmcQdS2vtbLEfug0/vXEKgl90O+/LbRmOXyGy4UFeY9 n3CLPX4gq9R6tFSGg+J0/uNcB7XzDHugRn1/TsfWTDW5VHJFz2UN++zOn4o2rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVchB0sXsz1Cb1; Tue, 22 Aug 2023 18:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MI5EjB084374; Tue, 22 Aug 2023 18:05:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MI5EQZ084371; Tue, 22 Aug 2023 18:05:14 GMT (envelope-from git) Date: Tue, 22 Aug 2023 18:05:14 GMT Message-Id: <202308221805.37MI5EQZ084371@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 9d6049d5da8c - main - etc: remove leftover leading empty comments, blank lines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d6049d5da8ce70b3f815431bdedcee9c04f60cc Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=9d6049d5da8ce70b3f815431bdedcee9c04f60cc commit 9d6049d5da8ce70b3f815431bdedcee9c04f60cc Author: Mike Karels AuthorDate: 2023-08-22 18:03:28 +0000 Commit: Mike Karels CommitDate: 2023-08-22 18:03:28 +0000 etc: remove leftover leading empty comments, blank lines Remove leftover empty leading comments/blank lines that had been spacers between $FreeBSD$ and the following content in config files in src/etc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41548 --- etc/group | 1 - etc/mail/Makefile | 2 -- etc/master.passwd | 1 - etc/mtree/Makefile | 1 - etc/mtree/README | 1 - etc/root/dot.k5login | 1 - etc/shells | 1 - 7 files changed, 8 deletions(-) diff --git a/etc/group b/etc/group index c9aa917b99f0..35df51838ae4 100644 --- a/etc/group +++ b/etc/group @@ -1,4 +1,3 @@ -# wheel:*:0:root daemon:*:1: kmem:*:2: diff --git a/etc/mail/Makefile b/etc/mail/Makefile index 0e8823492e83..784023d6f9c0 100644 --- a/etc/mail/Makefile +++ b/etc/mail/Makefile @@ -1,5 +1,3 @@ -# -# # This Makefile provides an easy way to generate the configuration # file and database maps for the sendmail(8) daemon. # diff --git a/etc/master.passwd b/etc/master.passwd index 52acc3df998c..416b2b4e4874 100644 --- a/etc/master.passwd +++ b/etc/master.passwd @@ -1,4 +1,3 @@ -# root::0:0::0:0:Charlie &:/root:/bin/sh toor:*:0:0::0:0:Bourne-again Superuser:/root: daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile index 4bce54e5d5eb..fc1e81d97d66 100644 --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/etc/mtree/README b/etc/mtree/README index fd4a062552d9..bd813057b5bd 100644 --- a/etc/mtree/README +++ b/etc/mtree/README @@ -1,4 +1,3 @@ - Note: If you modify these files, please keep hier(7) updated! These files are used to create empty file hierarchies for building the diff --git a/etc/root/dot.k5login b/etc/root/dot.k5login index 5721e640fe21..c3b55dfc6f0b 100644 --- a/etc/root/dot.k5login +++ b/etc/root/dot.k5login @@ -1,3 +1,2 @@ -# # user1/root@YOUR.REALM.WHEREVER # user2/root@YOUR.REALM.WHEREVER diff --git a/etc/shells b/etc/shells index 3f96d65c43a4..d840afb12bad 100644 --- a/etc/shells +++ b/etc/shells @@ -1,4 +1,3 @@ -# # List of acceptable shells for chpass(1). # ftpd(8) will not allow users to connect who are not using # one of these shells. From nobody Tue Aug 22 18:30: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 4RVdFS68Qzz4qFyk; Tue, 22 Aug 2023 18:30: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 4RVdFS5gBnz3SG9; Tue, 22 Aug 2023 18:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692729036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tigp06aaeQQsYRsx5iDJc3vTvCFr9FjLw1WxI/wmrBI=; b=Hz/DgqVuBRCtICjZzJzOt6tLhRVbFDo949o4KAoEpv7/fmaLCsfrUpTjTs7uoz52AlJGyR VO4sv8pJMW26V8p8stA5AVEJEo61tuQt4QHmnFNCokVaSnYK7j5ZfTBiOFAC8yOKIyIpUQ ozFzz+abWALw3thzj9+gwK/Z5ep+64sR/ouwZbGjytDaVxEVyo3MYjr909EjCjyyrXBn4J 8e7EsLhUxxUp4ksPXUi4FdbKRQJYbYoBTakTPyCIuDrYRSLcUrhNkx4LeUext49CqptZ7t Namj9sTMM3N9bRTVob1DTtLoO0NN2hJ5r8iNC14lg0QnxlMtrRnZNhp7hL7Njw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692729036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tigp06aaeQQsYRsx5iDJc3vTvCFr9FjLw1WxI/wmrBI=; b=C/N8JHQhP28j6OPzfJW2wEE9enmKeVV+aj65aafJzqJDv+xWdOwLYc0cFC9xwDKiAHrd9x 6+hvteOA3uWYG8/5mwTwdcBL0jjsW0bF1DMC27bgq4VLOaA+YInqtK8/yPx/VAWlysetwd +tS1KGd2gneq1rYqH08TUPkNml5PdtT6vj5MFk/erXDMIAcZPogIgeBVQD46ZRKG8VRQJi wu52PO8cd0e/S74kOUCa4afg0uLRxnw+2pNzfiHRcSNmESvIA5444Wb6Vwm9sw14vnyn1n iehB4gDQ5yDb59D4cHVYyhsC6E4uM+gKusZGGfAkkIoYbId2CPV+lECkKMTbxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692729036; a=rsa-sha256; cv=none; b=babWuoy7ns22RaThiGFrevLy+2I+uT3g6Cq5705wytmB+uhI34TNNfhwBDm0Tf9JSR8uSV +W0pCHCEEb/dCZqR2eAGHJ43qj/an0sS2bBBKVPFOKbPa2Bzn0cheES/7IpvjccGtgbpNa 7/jLSi+WANwd0/ns80kxLoe3dKeOy5OnJ/phOL6RXtO9cu71A1wbpUsS1mhCVpu3GQzvAa 5e3hVInR98AEPZme4H9JtwETF/feBk5xEGufRtCH5vHBEdeeY2xJTehaKqne9Bja4KCnGl mjkVv8rBxaVDFuDUT20rI4YxVdqMhl4nrsJjrycaEWYhD56rrfxS7tITNAWVVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVdFS4mm3zDk; Tue, 22 Aug 2023 18:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MIUaUD027154; Tue, 22 Aug 2023 18:30:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MIUa2Y027151; Tue, 22 Aug 2023 18:30:36 GMT (envelope-from git) Date: Tue, 22 Aug 2023 18:30:36 GMT Message-Id: <202308221830.37MIUa2Y027151@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: 949491f2a639 - main - if_ovpn: clear mbuf flags on rx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 949491f2a6397f2514f8fcde1c7dc61bd82f201a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=949491f2a6397f2514f8fcde1c7dc61bd82f201a commit 949491f2a6397f2514f8fcde1c7dc61bd82f201a Author: Kristof Provost AuthorDate: 2023-08-22 15:39:02 +0000 Commit: Kristof Provost CommitDate: 2023-08-22 18:30:11 +0000 if_ovpn: clear mbuf flags on rx When we receive a packet and remove the encapsulating layer we should also clear out protocol flags and any mbuf tags. If we do not we risk confusing firewalls filtering the tunneled packet. See also: https://redmine.pfsense.org/issues/14682#change-69073 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_ovpn.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index a05b06f090e3..1b5d419fe58b 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -1548,6 +1548,10 @@ ovpn_finish_rx(struct ovpn_softc *sc, struct mbuf *m, /* Clear checksum flags in case the real hardware set them. */ m->m_pkthdr.csum_flags = 0; + /* Clear mbuf tags & flags */ + m_tag_delete_nonpersistent(m); + m_clrprotoflags(m); + /* Ensure we can read the first byte. */ m = m_pullup(m, 1); if (m == NULL) { From nobody Tue Aug 22 18:38: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 4RVdQq3Wmxz4qGKh; Tue, 22 Aug 2023 18:38: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 4RVdQq2wDbz3Sgp; Tue, 22 Aug 2023 18:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692729523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P4FOF5e2pau3t0Flz+vhM8WN3LNhJUbCOgYK/UloJiA=; b=Ualendo5IjcjWLu0TXKC+nAGQ+EolsXJYAfWRJ+rilTM4lgoG3d8+GIBxKY7g4QBfMvzEw s2bkO9KUSdSlxFwnkuxXFZ9PQEXyIObAHYnjTAPlpWa5M5WlDhCeqU3m1Ou7hJRUdoyCMN I2Pr06+DCZhiQbvqEcrB65DGOatkP0RCKVkPO7MVHEtVwJ0QZVfH7b6IJ26q5CtSiMR2wa kHosBnKDI/xYoQ9gxIRLkhksApKiXPjG16p3QxXYEhzqRAYU2Oy2Sd3ZcD8Z2Skm7Zhcsp XKJ0prFImtRokIE3ny/gSO1qZ5LQyNFiJ950BilmYzmZ0ggCfqUgl3kiXrKwDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692729523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P4FOF5e2pau3t0Flz+vhM8WN3LNhJUbCOgYK/UloJiA=; b=yFjPhxN87zzfnfwJ+8Y/JUrz4DuqaRt5z02KRDE5SVgnVQP7M2YKwfvEN3GcjBdtEUhP0F ngaaXR3rdOUX8rhpIR3R3PrFQnjxRvEtzlnrhOpMsOmdDE3pAi+F3UXorRdl5ftSvhX0Mp afslkLx6e6G5hsO5sjYtUkf+Z/jh5RtknOe7QYGIkwaJRxXO/XV7PoJScwCruT6+5j57Xc eszxFX+H2LLs7jF+0b7gakMdKe+eVMHErpLeAFWFgg9uGY+d7hkepFrY3ARPNO3H9I1O2z h+/I3rHYAqHw9YZ4ytbQiqnH8SM4iZ+DzHsc2R3bf7w/yLrhqGzKzBDKsEE9TQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692729523; a=rsa-sha256; cv=none; b=hAJufY45VJ22C/vTdKZ3PZPQcemo/hU9fetkZw4ZROCKe7mRXB3VsJdHYTAOG3MT3Qudya 3zp+H3S77pg2Lud/YhrCTdqzhaGTB2Om8+b++tEr24uSoRCJjU0eD4U8V+f2HVjwsKLAMy 21cwaQrgv3oe00HsRz+jzjUkXKg9VjQgNwH3tgvngQFYhKpq6DMCNKZD9t8sUMaxOltfsv ogkYQ2JNfYp7g2SZBP7uec6307n7JJK840FQY4Tj+ETJ6XIwRyxZsXtAJiS+u1TVPuk6qu qilKz6hdCiVhBRFoULUBAtfzZKy1E9ckMVMe29ejsRO10MwNKaFI0nx75FARzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVdQq1rsBz1Cg3; Tue, 22 Aug 2023 18:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MIchfp034159; Tue, 22 Aug 2023 18:38:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MIchYA034156; Tue, 22 Aug 2023 18:38:43 GMT (envelope-from git) Date: Tue, 22 Aug 2023 18:38:43 GMT Message-Id: <202308221838.37MIchYA034156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 8c6104c48ea3 - main - tcp_fill_info(): Change lock assertion on INPCB to locked only List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c6104c48ea3f0ffaabeb9784b0f2327db04e7af Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=8c6104c48ea3f0ffaabeb9784b0f2327db04e7af commit 8c6104c48ea3f0ffaabeb9784b0f2327db04e7af Author: Marius Strobl AuthorDate: 2023-08-22 17:03:42 +0000 Commit: Marius Strobl CommitDate: 2023-08-22 18:33:49 +0000 tcp_fill_info(): Change lock assertion on INPCB to locked only This function actually only ever reads from the TCP PCB. Consequently, also make the pointer to its TCP PCB parameter const. Sponsored by: NetApp, Inc. (originally) --- sys/dev/cxgbe/tom/t4_tom.c | 4 ++-- sys/netinet/tcp_offload.c | 4 ++-- sys/netinet/tcp_offload.h | 2 +- sys/netinet/tcp_usrreq.c | 8 ++++---- sys/netinet/toecore.c | 2 +- sys/netinet/toecore.h | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index cb2131a4c0c2..c5a7e9290666 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -810,12 +810,12 @@ fill_tcp_info(struct adapter *sc, u_int tid, struct tcp_info *ti) * the tcp_info for an offloaded connection. */ static void -t4_tcp_info(struct toedev *tod, struct tcpcb *tp, struct tcp_info *ti) +t4_tcp_info(struct toedev *tod, const struct tcpcb *tp, struct tcp_info *ti) { struct adapter *sc = tod->tod_softc; struct toepcb *toep = tp->t_toe; - INP_WLOCK_ASSERT(tptoinpcb(tp)); + INP_LOCK_ASSERT(tptoinpcb(tp)); MPASS(ti != NULL); fill_tcp_info(sc, toep->tid, ti); diff --git a/sys/netinet/tcp_offload.c b/sys/netinet/tcp_offload.c index 0a37d0a8ba30..6a362484d46f 100644 --- a/sys/netinet/tcp_offload.c +++ b/sys/netinet/tcp_offload.c @@ -186,12 +186,12 @@ tcp_offload_ctloutput(struct tcpcb *tp, int sopt_dir, int sopt_name) } void -tcp_offload_tcp_info(struct tcpcb *tp, struct tcp_info *ti) +tcp_offload_tcp_info(const struct tcpcb *tp, struct tcp_info *ti) { struct toedev *tod = tp->tod; KASSERT(tod != NULL, ("%s: tp->tod is NULL, tp %p", __func__, tp)); - INP_WLOCK_ASSERT(tptoinpcb(tp)); + INP_LOCK_ASSERT(tptoinpcb(tp)); tod->tod_tcp_info(tod, tp, ti); } diff --git a/sys/netinet/tcp_offload.h b/sys/netinet/tcp_offload.h index 2524a56d0369..b397336ab487 100644 --- a/sys/netinet/tcp_offload.h +++ b/sys/netinet/tcp_offload.h @@ -45,7 +45,7 @@ void tcp_offload_input(struct tcpcb *, struct mbuf *); int tcp_offload_output(struct tcpcb *); void tcp_offload_rcvd(struct tcpcb *); void tcp_offload_ctloutput(struct tcpcb *, int, int); -void tcp_offload_tcp_info(struct tcpcb *, struct tcp_info *); +void tcp_offload_tcp_info(const struct tcpcb *, struct tcp_info *); int tcp_offload_alloc_tls_session(struct tcpcb *, struct ktls_session *, int); void tcp_offload_detach(struct tcpcb *); void tcp_offload_pmtu_update(struct tcpcb *, tcp_seq, int); diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 811dfbaa51bd..a6101bc422f7 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -125,7 +125,7 @@ static int tcp6_connect(struct tcpcb *, struct sockaddr_in6 *, #endif /* INET6 */ static void tcp_disconnect(struct tcpcb *); static void tcp_usrclosed(struct tcpcb *); -static void tcp_fill_info(struct tcpcb *, struct tcp_info *); +static void tcp_fill_info(const struct tcpcb *, struct tcp_info *); static int tcp_pru_options_support(struct tcpcb *tp, int flags); @@ -1538,11 +1538,11 @@ tcp6_connect(struct tcpcb *tp, struct sockaddr_in6 *sin6, struct thread *td) * constants -- for example, the numeric values for tcpi_state will differ * from Linux. */ -static void -tcp_fill_info(struct tcpcb *tp, struct tcp_info *ti) +void +tcp_fill_info(const struct tcpcb *tp, struct tcp_info *ti) { - INP_WLOCK_ASSERT(tptoinpcb(tp)); + INP_LOCK_ASSERT(tptoinpcb(tp)); bzero(ti, sizeof(*ti)); ti->tcpi_state = tp->t_state; diff --git a/sys/netinet/toecore.c b/sys/netinet/toecore.c index 5f5863431dfe..76aadad9a3b9 100644 --- a/sys/netinet/toecore.c +++ b/sys/netinet/toecore.c @@ -183,7 +183,7 @@ toedev_ctloutput(struct toedev *tod __unused, struct tcpcb *tp __unused, } static void -toedev_tcp_info(struct toedev *tod __unused, struct tcpcb *tp __unused, +toedev_tcp_info(struct toedev *tod __unused, const struct tcpcb *tp __unused, struct tcp_info *ti __unused) { diff --git a/sys/netinet/toecore.h b/sys/netinet/toecore.h index 746d21c138f0..a8e5afd6b50a 100644 --- a/sys/netinet/toecore.h +++ b/sys/netinet/toecore.h @@ -107,7 +107,7 @@ struct toedev { void (*tod_ctloutput)(struct toedev *, struct tcpcb *, int, int); /* Update software state */ - void (*tod_tcp_info)(struct toedev *, struct tcpcb *, + void (*tod_tcp_info)(struct toedev *, const struct tcpcb *, struct tcp_info *); /* Create a TLS session */ From nobody Tue Aug 22 18:38: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 4RVdQr5Rg9z4qGVk; Tue, 22 Aug 2023 18:38: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 4RVdQr3hyDz3Sgs; Tue, 22 Aug 2023 18:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692729524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jpW1i9v32nfsD5tr0gcrMWV2+oF/5OmieZy9AftCpq8=; b=T61zv8tlmrbAgE+nNJ2+7oWxuspMrT0047TK2rCRHgqEC4sU35AARVMO8FenyiRZvAEU+C YFhgNQsnRVV2dav9PLMsYOmB047UNGHEa141+Y/0gfyaOv2ZvhAv7TgflUZ24ihv5xK9oY nidZFGmbZkMnzUCAtkupgDVAi1xi0OaSa4lqRH7rF3br4IXiTNpnG05TnNtX0Rnm8GfcLt reFcFnsMGtlewtrfBrSWInjqUe6kpGF6LdKhFaXLktNsf0DkYDAZe24S8gjDdFLJyif28Z TaBUFlWQxN3iPvt7GeZFxXMNFcihd6pmMb+07JmKyzpaiG081OcG953vWhBjsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692729524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jpW1i9v32nfsD5tr0gcrMWV2+oF/5OmieZy9AftCpq8=; b=Z7k5x59dda2mhTxTsmdqnG7/zPvS0I2euxq8imhwrPDGrJCc5RFjAtRfKBnSzbGhFmTMwY qN8/gliDAqxkTi2o82fML1UgwUZm6V+qhfnuGKtNreqbtuGkOYJmNjKBKxaZks9yWbt40J imgbxvD9nwmDjHG+1ENZOqKk9392vxed72EV4ZjOQKKu8TmriHy/5ypVOiLguqISjP5H2q PUQsZfFkgeh03oZootqHnDu6UlFuJMyDV17RdYDAo9lMXWXRuWju1wmJDqRZVw5MorvqaA NTMoxr3BbUGJ4+/dY1qLQf8a+ngpFY7iN+xJrE2nXpdR4vYVagzNtEZcAvB3Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692729524; a=rsa-sha256; cv=none; b=Txxrnj8hoRXxo5ZJalc1xSWibNJwvLFMlQid0OeWSeH6wSCFekMng0Bj+/bcO+ECo7PjSQ PAaQs4cwmXlUgL5KOrxz+oiYyALF0FeXnmpIz/yepCw/vcAUeTdobDxmliaISiLlRn/oGL l/tsiVjkqioBY3I2UNeT/Rjdhx4vMknKS7INlgU7N8iN4n8fn62tGyjKX7qZBmzhFdDdFO 0LWtnEpfO/EymPCWlGGMj2PMLylC1pgBl4gLUXWBj+wpTupxHGyyc/+Z/XJGnbM9iMrSXt Faj3G/hV/EzM/C8Vqwzm3BW++HsGiZYDwsIoSMBRGS2KGpfrlCUeZyxVoWBwpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVdQr2cKMz1CyN; Tue, 22 Aug 2023 18:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MIciLZ034210; Tue, 22 Aug 2023 18:38:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MIcisE034207; Tue, 22 Aug 2023 18:38:44 GMT (envelope-from git) Date: Tue, 22 Aug 2023 18:38:44 GMT Message-Id: <202308221838.37MIcisE034207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: dc485b968dde - main - tcp_info: Add and export more FreeBSD-specific fields List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc485b968ddeb070d23354f55164a8c336acf081 Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=dc485b968ddeb070d23354f55164a8c336acf081 commit dc485b968ddeb070d23354f55164a8c336acf081 Author: Marius Strobl AuthorDate: 2023-08-22 18:12:59 +0000 Commit: Marius Strobl CommitDate: 2023-08-22 18:34:01 +0000 tcp_info: Add and export more FreeBSD-specific fields This change adds struct tcp_info fields corresponding to the following struct tcpcb ones: - snd_una - snd_max - rcv_numsacks - rcv_adv - dupacks Note that while both tcp_fill_info() and fill_tcp_info_from_tcb() are extended accordingly, no counterpart of rcv_numsacks is available in the cxgbe(4) TOE PCB, though. Sponsored by: NetApp, Inc. (originally) --- sys/dev/cxgbe/tom/t4_tom.c | 4 ++++ sys/netinet/tcp.h | 8 +++++++- sys/netinet/tcp_usrreq.c | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index c5a7e9290666..e5b173964451 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -730,9 +730,13 @@ fill_tcp_info_from_tcb(struct adapter *sc, uint64_t *tcb, struct tcp_info *ti) ti->tcpi_snd_ssthresh = GET_TCB_FIELD(tcb, SND_SSTHRESH); ti->tcpi_snd_cwnd = GET_TCB_FIELD(tcb, SND_CWND); ti->tcpi_rcv_nxt = GET_TCB_FIELD(tcb, RCV_NXT); + ti->tcpi_rcv_adv = GET_TCB_FIELD(tcb, RCV_ADV); + ti->tcpi_dupacks = GET_TCB_FIELD(tcb, T_DUPACKS); v = GET_TCB_FIELD(tcb, TX_MAX); ti->tcpi_snd_nxt = v - GET_TCB_FIELD(tcb, SND_NXT_RAW); + ti->tcpi_snd_una = v - GET_TCB_FIELD(tcb, SND_UNA_RAW); + ti->tcpi_snd_max = v - GET_TCB_FIELD(tcb, SND_MAX_RAW); /* Receive window being advertised by us. */ ti->tcpi_rcv_wscale = GET_TCB_FIELD(tcb, SND_SCALE); /* Yes, SND. */ diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 209be3c9345a..2b898d062b0d 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -427,8 +427,14 @@ struct tcp_info { u_int32_t tcpi_total_tlp; /* tail loss probes sent */ u_int64_t tcpi_total_tlp_bytes; /* tail loss probe bytes sent */ + u_int32_t tcpi_snd_una; /* Unacked seqno sent */ + u_int32_t tcpi_snd_max; /* Highest seqno sent */ + u_int32_t tcpi_rcv_numsacks; /* Distinct SACK blks present */ + u_int32_t tcpi_rcv_adv; /* Peer advertised window */ + u_int32_t tcpi_dupacks; /* Consecutive dup ACKs recvd */ + /* Padding to grow without breaking ABI. */ - u_int32_t __tcpi_pad[19]; /* Padding. */ + u_int32_t __tcpi_pad[14]; /* Padding. */ }; /* diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index a6101bc422f7..8b0b3c296c62 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1591,6 +1591,11 @@ tcp_fill_info(const struct tcpcb *tp, struct tcp_info *ti) ti->tcpi_snd_rexmitpack = tp->t_sndrexmitpack; ti->tcpi_rcv_ooopack = tp->t_rcvoopack; ti->tcpi_snd_zerowin = tp->t_sndzerowin; + ti->tcpi_snd_una = tp->snd_una; + ti->tcpi_snd_max = tp->snd_max; + ti->tcpi_rcv_numsacks = tp->rcv_numsacks; + ti->tcpi_rcv_adv = tp->rcv_adv; + ti->tcpi_dupacks = tp->t_dupacks; #ifdef TCP_OFFLOAD if (tp->t_flags & TF_TOE) { ti->tcpi_options |= TCPI_OPT_TOE; From nobody Tue Aug 22 20:01: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 4RVgGb5DlYz4qML2; Tue, 22 Aug 2023 20:01: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 4RVgGb4ng4z3fQx; Tue, 22 Aug 2023 20:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692734503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ulbN4B1rHuivQ+Ckzs7kuk64zPlMpWn8KUKOY/nBCLo=; b=CvvZle2Pfcy1+ma5Z0iY9/0+NPeH6N7RnWyaG1KuudhDSYUsoLnwgc8SyO2y7EMpJd3RJU lJJy0eGA36m5si1J+NDRghWeES8ywuR2F8Q2QKZMYOsv6IhFQo89cixdQ0JZNiLzzI42a8 YOjAi4GQU7RKtZhjOIh1QGdBBHOeLJLBaxHBdvAhwBsYJZOzmDMtSXNywRZzSgpugfMR2F p4D0VkBAJmtruHrxevEZwDQWaqEKopiWXD0epz/Xg+1W66+pIzfDBKXvoxTScR9FnfMlN+ aGtreDNjoTEOGIwcgTX4nVumrxCXo4Eu8DYbaMo7mes3OHceJ2JGoojF2Mo4qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692734503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ulbN4B1rHuivQ+Ckzs7kuk64zPlMpWn8KUKOY/nBCLo=; b=XHAkpBwJB+4TWIcDNRG73th0NiumnHyAyK8zhw7A4vgTdpz3H3uxwmu88JkYOmPFGBlb1n DNPLcZI3+nrljCCQK3BfWvRA2fX1fK4criV5i/Rk4QYtK72t3hDdxSlz8srdjbqfvEHHPN oBnKdjE1GR0TdD2qZ4xZ2ZQTIlQYMWgwkIPEoLC0j7mGrwSeyhCsyzsVDq9rY+cJ6P7hwq aeo+DjeCLG8oiejcGa15cyl3qcr2BxpmuRosX/7RyGnMNRp28wmqON8A6fFh4pxZc3Py80 /Oti13Ug643FAnTxzQV5ys5MwhS9JLjIEjtlRMdyQM6bQVCNOMPnrAhPxQQyhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692734503; a=rsa-sha256; cv=none; b=JJePLesnIoen5DUbFW4N4NVnX51Hj71yioBrYJ/dDxV86q9+KASOGPiCXLw9Lv2Lg2LHfq Y+xFL2lmFyPJPVpXW7iPtP3q8jrttTFB712f/gYzKLyxaMNYGeoa415qNhrGQzkrNy/KWl rt3nApkvJeidF7dumSUfbtG03be7HGJ9KMIcKf2CTL4qf9ssDaQ0H9dEgL39E/rR+hcjFs HyLBr/iU8HU3q5SnuSAfJCluou9hRjTtiOUqnUbAw69geZ9Pq4svw9y9rNGJtUze4/LLpV RbLMn9E4nvc9fuAo9YKvXGBEZlpboFfdgjgWJqnp9iQS/GZb6jLiRP0MERH8ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVgGb3XyGz1ws; Tue, 22 Aug 2023 20:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MK1hEx082916; Tue, 22 Aug 2023 20:01:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MK1h4O082913; Tue, 22 Aug 2023 20:01:43 GMT (envelope-from git) Date: Tue, 22 Aug 2023 20:01:43 GMT Message-Id: <202308222001.37MK1h4O082913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 968a3db71516 - main - kbdcontrol: Support building as a bootstrap tool on old and non-FreeBSD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 968a3db7151644bda2036e1be8d4c536220b318f Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=968a3db7151644bda2036e1be8d4c536220b318f commit 968a3db7151644bda2036e1be8d4c536220b318f Author: Jessica Clarke AuthorDate: 2023-08-22 20:00:28 +0000 Commit: Jessica Clarke CommitDate: 2023-08-22 20:00:28 +0000 kbdcontrol: Support building as a bootstrap tool on old and non-FreeBSD Systems that predate 971bac5ace7a ("kbd: consolidate kb interfaces (phase one)") cannot build kbdcontrol since kbdelays and kbrates moved to sys/kbio.h. Moreover, on non-FreeBSD, it requires all kinds of ioctls and sysctls that are highly FreeBSD-specific to build, but we use it as a bootstrap tool to generate the keymaps used by some kernels (LINT ones in particular). Thus, when bootstrapping kbdcontrol, disable everything that's not needed for that singular use, and use the in-tree kbio.h to get the definitions of the necessary structures. This allows KBDMUX_DFLT_KEYMAP, UKBD_DFLT_KEYMAP and ATKBD_DFLT_KEYMAP to be enabled when building on non-FreeBSD, and thus LINT kernels. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41541 --- Makefile.inc1 | 4 ---- tools/build/Makefile | 2 ++ usr.sbin/kbdcontrol/Makefile | 5 +++++ usr.sbin/kbdcontrol/kbdcontrol.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 295c93d0282c..8838d31c795a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2384,15 +2384,11 @@ _bootstrap_tools_links+=crunchgen # The ATKBD_DFLT_KEYMAP, UKBD_DFLT_KEYMAP and KBDMUX_DFLT_KEYMAP kernel options # require kbdcontrol. Note that, even on FreeBSD, the host will lack kbdcontrol # if built with WITHOUT_LEGACY_CONSOLE. -# -# XXX: kbdcontrol cannot currently be bootstrapped on non-FreeBSD systems -.if !defined(CROSSBUILD_HOST) .if defined(BOOTSTRAP_ALL_TOOLS) || !exists(/usr/sbin/kbdcontrol) _kbdcontrol= usr.sbin/kbdcontrol .else _bootstrap_tools_links+=kbdcontrol .endif -.endif .if ${MK_DISK_IMAGE_TOOLS_BOOTSTRAP} != "no" _etdump= usr.bin/etdump diff --git a/tools/build/Makefile b/tools/build/Makefile index 2aa34f4f87cf..8ad104f904ea 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -289,6 +289,8 @@ SYSINCS+= ${SRCTOP}/sys/sys/fnv_hash.h INCS+= ${SRCTOP}/include/elf.h SYSINCS+= ${SRCTOP}/sys/sys/elf.h SYSINCS+= ${SRCTOP}/sys/sys/ctf.h +# for kbdcontrol: +SYSINCS+= ${SRCTOP}/sys/sys/kbio.h # We want to run the build with only ${WORLDTMP} in $PATH to ensure we don't # accidentally run tools that are incompatible but happen to be in $PATH. diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile index 219f0fc1dca6..982fa42e1564 100644 --- a/usr.sbin/kbdcontrol/Makefile +++ b/usr.sbin/kbdcontrol/Makefile @@ -8,7 +8,12 @@ SRCS= kbdcontrol.c lex.l WARNS?= 4 CFLAGS+= -I${.CURDIR} +.ifdef BOOTSTRAPPING +# Provide minimal load and dump functionality +CFLAGS+= -DBOOTSTRAP_KBDCONTROL +.else # temporarily added for pre-Unicode accent key API/ABI compatibility CFLAGS+= -DCOMPAT_FREEBSD13 +.endif .include diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c index 522aab54c466..e55165fd0888 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.c +++ b/usr.sbin/kbdcontrol/kbdcontrol.c @@ -46,12 +46,14 @@ #define SPECIAL 0x80000000 +#ifndef BOOTSTRAP_KBDCONTROL static const char ctrl_names[32][4] = { "nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel", "bs ", "ht ", "nl ", "vt ", "ff ", "cr ", "so ", "si ", "dle", "dc1", "dc2", "dc3", "dc4", "nak", "syn", "etb", "can", "em ", "sub", "esc", "fs ", "gs ", "rs ", "us " }; +#endif static const char acc_names[15][5] = { "dgra", "dacu", "dcir", "dtil", "dmac", "dbre", "ddot", @@ -65,6 +67,7 @@ static const char acc_names_u[15][5] = { "DCAR", }; +#ifndef BOOTSTRAP_KBDCONTROL static const char fkey_table[96][MAXFK] = { /* 01-04 */ "\033[M", "\033[N", "\033[O", "\033[P", /* 05-08 */ "\033[Q", "\033[R", "\033[S", "\033[T", @@ -91,10 +94,13 @@ static const char fkey_table[96][MAXFK] = { /* 89-92 */ "" , "" , "" , "" , /* 93-96 */ "" , "" , "" , "" , }; +#endif +#ifndef BOOTSTRAP_KBDCONTROL static const int ndelays = nitems(kbdelays); static const int nrepeats = nitems(kbrates); static int hex = 0; +#endif static int paths_configured = 0; static int token; @@ -109,9 +115,12 @@ static int get_accent_definition_line(accentmap_t *); static int get_entry(void); static int get_key_definition_line(keymap_t *); static void load_keymap(char *opt, int dumponly); +#ifndef BOOTSTRAP_KBDCONTROL static void load_default_functionkeys(void); +#endif static char * nextarg(int ac, char **av, int *indp, int oc); static char * mkfullname(const char *s1, const char *s2, const char *s3); +#ifndef BOOTSTRAP_KBDCONTROL static void print_accent_definition_line(FILE *fp, int accent, struct acc_t *key); static void print_entry(FILE *fp, int value); @@ -125,6 +134,7 @@ static void set_functionkey(char *keynumstr, char *string); static void set_keyboard(char *device); static void set_keyrates(char *opt); static void show_kbd_info(void); +#endif static void usage(void) __dead2; struct pathent { @@ -133,6 +143,7 @@ struct pathent { }; static STAILQ_HEAD(, pathent) pathlist = STAILQ_HEAD_INITIALIZER(pathlist); +#ifndef BOOTSTRAP_KBDCONTROL /* Detect presence of vt(4). */ static int is_vt4(void) @@ -144,6 +155,7 @@ is_vt4(void) return (0); return (strcmp(vty_name, "vt") == 0); } +#endif static char * nextarg(int ac, char **av, int *indp, int oc) @@ -390,6 +402,7 @@ get_accent_definition_line(accentmap_t *map) return (accent + 1); } +#ifndef BOOTSTRAP_KBDCONTROL static void print_entry(FILE *fp, int value) { @@ -590,6 +603,7 @@ print_accent_definition_line(FILE *fp, int accent, struct acc_t *key) } fprintf(fp, "\n"); } +#endif static void dump_entry(int value) @@ -836,10 +850,12 @@ load_keymap(char *opt, int dumponly) if (cp != NULL) add_keymap_path(cp); add_keymap_path(""); +#ifndef BOOTSTRAP_KBDCONTROL if (is_vt4()) add_keymap_path(vt_keymap_path); else add_keymap_path(keymap_path); +#endif paths_configured = 1; } @@ -875,6 +891,7 @@ load_keymap(char *opt, int dumponly) dump_accent_definition(opt, &accentmap); return; } +#ifndef BOOTSTRAP_KBDCONTROL if ((keymap.n_keys > 0) && (ioctl(0, PIO_KEYMAP, &keymap) < 0)) { warn("setting keymap"); fclose(file); @@ -892,6 +909,7 @@ load_keymap(char *opt, int dumponly) return; } } +#endif } #ifdef OPIO_DEADKEYMAP @@ -911,6 +929,7 @@ to_new_accentmap(oaccentmap_t *from, accentmap_t *to) } #endif /* OPIO_DEADKEYMAP */ +#ifndef BOOTSTRAP_KBDCONTROL static void print_keymap(void) { @@ -1240,14 +1259,20 @@ mux_keyboard(u_int op, char *kbd) if (ioctl(0, op, &info) == -1) warn("unable to (un)mux the keyboard"); } +#endif static void usage(void) { +#ifdef BOOTSTRAP_KBDCONTROL + fprintf(stderr, "%s\n", +"usage: kbdcontrol [-L mapfile] [-P path]"); +#else fprintf(stderr, "%s\n%s\n%s\n", "usage: kbdcontrol [-dFKix] [-A name] [-a name] [-b duration.pitch | [quiet.]belltype]", " [-r delay.repeat | speed] [-l mapfile] [-f # string]", " [-k device] [-L mapfile] [-P path]"); +#endif exit(1); } @@ -1255,7 +1280,11 @@ usage(void) int main(int argc, char **argv) { +#ifdef BOOTSTRAP_KBDCONTROL + const char *optstring = "L:P:"; +#else const char *optstring = "A:a:b:df:iKk:Fl:L:P:r:x"; +#endif int opt; /* Collect any -P arguments, regardless of where they appear. */ @@ -1269,6 +1298,7 @@ main(int argc, char **argv) optind = optreset = 1; while ((opt = getopt(argc, argv, optstring)) != -1) switch(opt) { +#ifndef BOOTSTRAP_KBDCONTROL case 'A': case 'a': mux_keyboard((opt == 'A')? KBRELKBD : KBADDKBD, optarg); @@ -1282,11 +1312,13 @@ main(int argc, char **argv) case 'l': load_keymap(optarg, 0); break; +#endif case 'L': load_keymap(optarg, 1); break; case 'P': break; +#ifndef BOOTSTRAP_KBDCONTROL case 'f': set_functionkey(optarg, nextarg(argc, argv, &optind, 'f')); @@ -1309,6 +1341,7 @@ main(int argc, char **argv) case 'x': hex = 1; break; +#endif default: usage(); } From nobody Tue Aug 22 20:01: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 4RVgGc5yWvz4qMnx; Tue, 22 Aug 2023 20:01: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 4RVgGc5CP2z3fKf; Tue, 22 Aug 2023 20:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692734504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p6yJCHg7u7VnGojIkkDFVcTVdRmGEx7NE4PUNBu8DYI=; b=H9Up4gcBmcz/DdNF6zJq5fvMyTDpWPUOSEkSFEtI350hfYMri1xUislcErg0aOHBxTtpge QAjITG1082+hdeVQLBvsRZZwOl3HRF9E/C7Sk4+Cs4DZMeGEPkj1imWaUIFp8Q1rFX1nOJ +p2vRJvnAM+9p4bZaKRj5GZJzGTqV01U3sm56Y4gVNttEjgpzmLgYVQA2IQCLq4piDgPvC TNNfRgUunvBpe1+d+zffm+n+8XQ+wAXANCHUCagAp+PSgBUQabVlIBym7VW4d25hvRMW4t dFi3tzRJwjYRVI/fo6fFnrpsinzymk+9o7RpLKNzXNSxqoR8Fx4JPHxarcfxjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692734504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p6yJCHg7u7VnGojIkkDFVcTVdRmGEx7NE4PUNBu8DYI=; b=Kxocxiy9n7Y8aKYMquiHuraBzDl66STPUft1Ogfir16xEJYi6wOePSdmfibNqF/GAMSErS sliro+ykzT8GSFlBo4MxDGTrlgJ54YVqgt5JFDdp0gdZ+QbbCfjjQ4d/4lju1c9SAQMZmQ /wb+8rx6S6SrYAnqMw/Aspxz4SYJtdPyAlYEJ52sfBxGfVWOL+6ES2oKjONFpiITZinOGD WFFCRtaKK8rN53P+9helyY+eO9BqQEhW5o1G3XX4uhR90PSF3XhLwx9WOynap/XkUUoMYv ByT6VqxouerV3dYjeGBHQTd0A//rTGAeuw2eXvXBd42+HDRPM3npfkrpt47klA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692734504; a=rsa-sha256; cv=none; b=PPg+y1qIKJRSaxwsQdPMreDEdK/BaNZ5k49ZMZVecvF2bkanKta5kYZIIrkX+PnjkWwg3o nMSze5WPmfoEYHl8inn7QzCwsurazD7IVBNGZa3U73XaHsIIZLNmAum931meE6c/RBkELs SYNO4gR+MwCvZ6LXeOeuFhCotg7JZjV9R6v2fG8x4+gOp0OC9Nv2r7T3isWHcyaVbYmZZp qek5TGhyKpKkSnJ2VyW0Yu+F18PCjyTo75nn+q6wSM99MyNhxYyd56irXTVJ+i4Wed04sV nTvnmLWUMW1sNwgzGn1sUaphy5EeTHLZtnNqXTUZwxIhtserCgHC5ENHFA0m4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVgGc4Hxcz2Qw; Tue, 22 Aug 2023 20:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MK1iLd082965; Tue, 22 Aug 2023 20:01:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MK1i5n082962; Tue, 22 Aug 2023 20:01:44 GMT (envelope-from git) Date: Tue, 22 Aug 2023 20:01:44 GMT Message-Id: <202308222001.37MK1i5n082962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: c9b2751d76bd - main - arm: Add missing no-ctfconvert for fw_stub.awk target List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9b2751d76bd5a212fedab46512abb533e9ea695 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c9b2751d76bd5a212fedab46512abb533e9ea695 commit c9b2751d76bd5a212fedab46512abb533e9ea695 Author: Jessica Clarke AuthorDate: 2023-08-22 20:00:37 +0000 Commit: Jessica Clarke CommitDate: 2023-08-22 20:00:37 +0000 arm: Add missing no-ctfconvert for fw_stub.awk target This target produces a C file not an object file, so using ctfconvert on it should not be attempted. This keeps it in sync with all other uses of fw_stub.awk, squashes a warning seen during the build of TEGRA124 on FreeBSD and avoids the same issue failing the build on non-FreeBSD (such errors are #ifdef'ed into being warnings on FreeBSD in ctfconvert, which should be revisited in the future). Reviewed by: manu MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41542 --- sys/arm/nvidia/tegra124/files.tegra124 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/nvidia/tegra124/files.tegra124 b/sys/arm/nvidia/tegra124/files.tegra124 index 7ec57879b9c3..640889c0b240 100644 --- a/sys/arm/nvidia/tegra124/files.tegra124 +++ b/sys/arm/nvidia/tegra124/files.tegra124 @@ -45,7 +45,7 @@ arm/nvidia/drm2/tegra_bo.c optional drm2 tegra124_xusb_fw.c optional tegra124_xusb_fw \ dependency "$S/arm/nvidia/tegra124/files.tegra124" \ compile-with "${AWK} -f $S/tools/fw_stub.awk tegra124_xusb.fw:tegra124_xusb_fw -mtegra124_xusb_fw -c${.TARGET}" \ - no-implicit-rule before-depend local \ + no-ctfconvert no-implicit-rule before-depend local \ clean "tegra124_xusb_fw.c" tegra124_xusb.fwo optional tegra124_xusb_fw \ dependency "tegra124_xusb.fw" \ From nobody Tue Aug 22 20:01: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 4RVgGf0dF3z4qMhq; Tue, 22 Aug 2023 20:01: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 4RVgGd6yMVz3fdC; Tue, 22 Aug 2023 20:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692734506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6g43SaIInK5nAI/4tiQzHt8WJhKP8W3kpOQJpj2oz4=; b=LBuFY6vXs73WGEHwDL8Nfjx4V++Bs79BArfY1GM3bKLc+qO0j702SRy7OoP+vFKSf0QS/e 7IK12IMHK1BmxDPxqfTsRLhfTPZ0zd93Qii2d1WPiOyjp8jP5qyuIxJ6TX/DXdj0ZoRkXy 2qwG85rkzvSDYBCkaSfYYg7GiX/rnIjvi1ghJo9dRtKpYol+18hzzB+sfDmiwY4zoMVrpe Q9Om62tIFfm5mhgNv/aqlsgDFbEGWbF1W6ut0qHS5b/5a6EN6c9iQNSgytDeTGfyMO/2Ff unneKLNYNLZQN+BdpmBVsSELaVkFzEsW2OgGCLAMqk2seRZPEC6JwRvil0IG9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692734506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6g43SaIInK5nAI/4tiQzHt8WJhKP8W3kpOQJpj2oz4=; b=L53vISLiJ12k4Tth/rljx6NMnwp4gyWiUTk45ls/N61cPST/jLyX5B3y4iP4gg8ktUAAUc Ya+9z7Gmx5tz/v69G81IyNgSr2SQ4Oukt246pQSoseGeF7woRNa7lh7F19K68qZj5JQGvC f7BbCARvf846I/BDTuBeq67fBdOdmT1Haf52BCYubdLUHymg8NeSTo3dGWUziPhPCrIL2s +iAjiSYDrhw2dNjtO3Xwab+BgAPtc+/gnQ9HIC2ofOC7IcrqF/7mSSZWKuKlf1u7WuKa6k tx2AxHMVOehGrytufyuOSQZEcJ6hBFxciYXq+u4RP90kzGrhi39KbiSsANdiMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692734506; a=rsa-sha256; cv=none; b=OwSRheLe8miWPEsyHDFFrWHPomBuDKdy8NArTwLLn9dMFthpnnQIUFPv61xSYWtOlBiW0P E6S0GeTgL7jfyXMQBUXa7iSOY8yxrHmSEvd0Mf8wD0uzlVv+Xiooq1f6t/0aVfrwgguL7s ZmOhEfE8fiwD3Svfr4laIGfwe63JnjNqrcjXAGb6UVWW0MJPuwxwNRO7oyj6hMks2lF/OL 7nyRL/N1gvcMLR+3CKAgYr+MQBE37WLeuenCxrIlBWDKaO/6C0dm/Eqd4EJSBSENB+0gqH P4mcQfLzNkYw4ejIWqE+oXZ5mAZ8HGD1amHk4NYBZm8CQUaUPxHDSYUiAvuBUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVgGd5YQFz23C; Tue, 22 Aug 2023 20:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MK1j4X083006; Tue, 22 Aug 2023 20:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MK1jT9083003; Tue, 22 Aug 2023 20:01:45 GMT (envelope-from git) Date: Tue, 22 Aug 2023 20:01:45 GMT Message-Id: <202308222001.37MK1jT9083003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 4101bcfa18c0 - main - libzstd: Explicitly define ZSTD_DISABLE_ASM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4101bcfa18c0f12a3294971f2f68f354d3e1d864 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=4101bcfa18c0f12a3294971f2f68f354d3e1d864 commit 4101bcfa18c0f12a3294971f2f68f354d3e1d864 Author: Jessica Clarke AuthorDate: 2023-08-22 20:01:03 +0000 Commit: Jessica Clarke CommitDate: 2023-08-22 20:01:03 +0000 libzstd: Explicitly define ZSTD_DISABLE_ASM On FreeBSD, ZSTD_ASM_SUPPORTED is defined as 0, but on macOS and Linux it is defined as 1, yet we don't build any of the assembly sources. Rather than add them just for bootstrapping on non-FreeBSD, explicitly define ZSTD_DISABLE_ASM so they're not needed and everything is consistent. This fixes building a bootstrap LLVM toolchain on non-FreeBSD amd64 (the only architecture with assembly available). Reviewed by: emaste, imp Differential Revision: https://reviews.freebsd.org/D41543 --- lib/libzstd/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile index 7b8211d0a584..080b6247fee8 100644 --- a/lib/libzstd/Makefile +++ b/lib/libzstd/Makefile @@ -38,6 +38,11 @@ CFLAGS+= -I${ZSTDDIR}/lib -I${ZSTDDIR}/lib/common -DXXH_NAMESPACE=ZSTD_ \ -DZSTD_MULTITHREAD=1 -fvisibility=hidden LIBADD= pthread +# ZSTD_ASM_SUPPORTED is 0 on FreeBSD but 1 on macOS and Linux. Since we build +# this as a bootstrap library and don't include any assembly sources in SRCS, +# explicitly disable assembly. +CFLAGS+= -DZSTD_DISABLE_ASM + PRIVATELIB= yes PACKAGE= runtime From nobody Tue Aug 22 21:07: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 4RVhkd1Dqnz4qSTL; Tue, 22 Aug 2023 21:07:37 +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 4RVhkd0kSnz4KHy; Tue, 22 Aug 2023 21:07:37 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692738457; 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=lU+/b7GGav8FZteBVWLqA4YvEvsT0GToUysoQVFsq7E=; b=Mv3cPg0qfojs8vxI2GuGyJUFebSEf30v0O5As5Oc0ioIYMyy2fWQF/wXLQ4Z0xhPE1AqW7 btnZVOUIbcAZ60qQbg9sTB/QeF5y4jSafBlg+qjcdqoiTUjLaNzH5L+D5ZVUWaSHsfCqE3 1kR+qetUUjPFCknZ9bde4zz2L1yijcaPw9jlc1vV6x2774WS4pcVzYBQJpvBhWbBhCp8No zP9KESoIEAV/yKBV/xKwEp/+nRNGhm2zajowvN2UJ5UB66/zPzSVIitvKvHcC08A+xKazX hZ1Lyrn8yugDH4lLbUNfEXrSnAFIdGwDZ4FD98CFMxlRU4Cxn1ohboIY07TQ8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692738457; 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=lU+/b7GGav8FZteBVWLqA4YvEvsT0GToUysoQVFsq7E=; b=SLY4YaCOIkTCK2ycS1zXbqT+nY9hdrRuiPGz8futL63O8Ci9ptMiFMHCv+DLG1ytcgSvQg TXSu0RvrS5/pvIv2xnBBNhjSWmD2Q2Ri+lzE2T5WAAcbwSulaXO6bN3Geud5ZII7AeQvYC jT/LmiXR6QGE2UGVxRPksbVy4NjO0a0UMgAD/+eaKIhwdRSgsLofBDc/ljkKYjPOSh5iqe OjxaqAlOrnAysrYjb0wfjkheXg02JmXCWGe7Ph9wFQPj+d3G5FC+TNgGrHj+SSegCThrFA ZUnDaZAY5X7MWWCspuNAERdv+loFihGliiXZIek921YnAIxEU/vmFCZgMG2cOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692738457; a=rsa-sha256; cv=none; b=FJIId9RvEbdJdtZHUyd8B1/u06Nyjb3k/TDKrnD9d7J3QyMTarUZsy0Fprun9s7Om78xsn 12ZPoU/e9l2/J1eJ11Iw96vHamhh8m8JUzMdKqNIrtPh9jhOBuXh62xvoSxUn/jAWL+fRa IFIqVXYe4BzfKmN8cyNAz8y8jXJoZwWbYlpyI0nRMZ9MDn/GF7rzNIG++uUvrwbuOV2YPF hXZozcIp6wna5td9cqUAQ93qLMesgXU+2wSJM3KiONmNaDwEydHj27B8BANZ+YhT8E/Ydl +TjwwDLVJ3KknhmL9G3+bhwiqx5tKoTzHC+JDXjxwbmnqkACf4QvC5NrD61Khg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RVhkc5Zn0z19rX; Tue, 22 Aug 2023 21:07:36 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id BEBEF4D40D; Tue, 22 Aug 2023 23:07:33 +0200 (CEST) From: Kristof Provost To: Warner Losh , Sumit Saxena Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 91fcacc35597 - main - if_bnxt: Add support for VLAN on Thor Date: Tue, 22 Aug 2023 23:07:32 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: <05979953-C089-4D56-99E3-BBBF066FE277@FreeBSD.org> In-Reply-To: <419530F4-DB8F-46EA-BF45-C130BCF8A3DE@FreeBSD.org> References: <202211042255.2A4MtqVv032693@gitrepo.freebsd.org> <419530F4-DB8F-46EA-BF45-C130BCF8A3DE@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/alternative; boundary="=_MailMate_FC533F11-A875-4AC6-843D-E98CF46C9FF7_=" --=_MailMate_FC533F11-A875-4AC6-843D-E98CF46C9FF7_= Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable On 27 Jun 2023, at 11:17, Kristof Provost wrote: > On 4 Nov 2022, at 23:55, Warner Losh wrote: >> The branch main has been updated by imp: >> >> URL: = >> https://cgit.FreeBSD.org/src/commit/?id=3D91fcacc355971f74aa26fc786102= 0dc3a2a2d717 >> >> commit 91fcacc355971f74aa26fc7861020dc3a2a2d717 >> Author: Sumit Saxena >> AuthorDate: 2022-11-04 22:24:32 +0000 >> Commit: Warner Losh >> CommitDate: 2022-11-04 22:24:32 +0000 >> >> if_bnxt: Add support for VLAN on Thor >> >> Reviewed by: imp >> Differential Revision: https://reviews.freebsd.org/D36443 >> --- >> sys/dev/bnxt/bnxt.h | 3 +- >> sys/dev/bnxt/bnxt_hwrm.c | 110 = >> ++++++++++++++++++++++++++++------------------- >> sys/dev/bnxt/bnxt_hwrm.h | 7 ++- >> sys/dev/bnxt/if_bnxt.c | 7 ++- >> 4 files changed, 74 insertions(+), 53 deletions(-) >> > > This commit appears to have broken vlan on these interfaces. > My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet, (in = > a Dell T640, if that helps). > > A simple vlan creation on top of one: > ifconfig vlan create > ifconfig vlan0 vlan 201 vlandev bnxt0 > > Results in a loss of connectivity. The kernel logs this, which I = > assume is related: > > `bnxt0: HWRM_CFA_L2_FILTER_ALLOC command returned INVALID_PARAMS = > error.` > > > After reverting this (and 72e9dbb58cad5262190cf2eae47f764021072128) I = > can create vlan interfaces on top of bnxt0 without losing = > connectivity. > Should we revert this before 14.0? There=E2=80=99s also a report of what I think is the same issue in = [https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D269133](https://bugs= =2Efreebsd.org/bugzilla/show_bug.cgi?id=3D269133) There=E2=80=99s a proposed patch there, but it did not work for me. Best regards, Kristof --=_MailMate_FC533F11-A875-4AC6-843D-E98CF46C9FF7_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 27 Jun 2023, at 11:17, Kristof Provost wrote:

On 4 Nov 2022, at 23:55, Warner Los= h wrote:

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3D91fcacc355971f74aa26fc7861020dc3a2a2d717

commit 91fcacc355971f74aa26fc7861020dc3a2a2d717
Author: Sumit Saxena <sumit.saxena@broadcom.com>
AuthorDate: 2022-11-04 22:24:32 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-11-04 22:24:32 +0000

if_bnxt: Add support for VLAN on Thor

Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D36443
---
sys/dev/bnxt/bnxt.h | 3 +-
sys/dev/bnxt/bnxt_hwrm.c | 110 ++++++++++++++++++++++++++++-------------= ------
sys/dev/bnxt/bnxt_hwrm.h | 7 ++-
sys/dev/bnxt/if_bnxt.c | 7 ++-
4 files changed, 74 insertions(+), 53 deletions(-)

This commit appears to have broken vlan on t= hese interfaces.
My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet, (in a = Dell T640, if that helps).

A simple vlan creation on top of one:
ifconfig vlan create
ifconfig vlan0 vlan 201 vlandev bnxt0

Results in a loss of connectivity. The kernel logs this, = which I assume is related:

`bnxt0: HWRM_CFA_L2_FILTER_ALLOC command returned INVALID= _PARAMS error.`

After reverting this (and 72e9dbb58cad5262190cf2eae47f764= 021072128) I can create vlan interfaces on top of bnxt0 without losing co= nnectivity.


Should we revert this before 14.0?

There=E2=80=99s also a report of what I think is the same= issue in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D269133

There=E2=80=99s a proposed patch there, but it did not wo= rk for me.

Best regards,
Kristof

--=_MailMate_FC533F11-A875-4AC6-843D-E98CF46C9FF7_=-- From nobody Tue Aug 22 21:24: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 4RVj6m5hKLz4qTNl for ; Tue, 22 Aug 2023 21:25:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) (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 4RVj6m3h5pz4LsC for ; Tue, 22 Aug 2023 21:25:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2bbad32bc79so83507521fa.0 for ; Tue, 22 Aug 2023 14:25:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692739502; x=1693344302; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=+usIdgICw3E9oJD+43oSdoJyHFn1wFMxjGZC31xELS0=; b=W3q2Kxm2hJU2GaI/vphSXqV0Gbfxkyyh6zpKdOl6SDnqIweCC+6WyXvd7rbL2u6FIL 6Rs0Fvi7eJLKISdWB40d7vvScRCTMSeRvplnFnIULzlBy9CjCV6fbna0P9rdfkCUEZDA ogXZKHGbRBpxDP3Qarv4SNdXhVKD9n23JFFb6M6u0G8OQMTn2OpxO5fPsKar2pvWno4G lznDBoW+58aJhEzO6mdIGz6caZm5aKKkrYilvxHBLDSklIjWMm3UWPBgpxD0jmw+M09I MbYZhhjUApriRF7yHQZL0gX3ioxJK71IdTsUu4A50mVm6yZPBpzwyUFkfaiNLZAHUsGR MWVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692739502; x=1693344302; 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=+usIdgICw3E9oJD+43oSdoJyHFn1wFMxjGZC31xELS0=; b=Kjl2S/8a8dDd3yFGS5LMdTEC5uHhxtOzaaSqr+emjOHfrNNG9R5oYsbhzE3rvFg3PY jQd6IgzPKnV33v/faUjjXC1WkEckA1ENafdbF1A/r3W4GVxCYvA/6LjxoZ3IeZOMjSas BW2FZEhlLaD4VtKnSgrvEQwcRECoHEdn9FHXIriFZ+bGYsRYWFkW/IGgJ3enOYqWlJqs pktgGe+40elJO7fIHOyMws4T5icpvs+ADZDvOvGsTeuwpMklvFYgAB8l2r0arTYklOlR VPrg9kPaWoy7eqU3j6MJ9XQ/C2BaJzl9DhLQRGnN0EX75SgM/Xid+Jzb88UOeuHt5gC8 Tt+w== X-Gm-Message-State: AOJu0YxNcP4sQHwRcKtsYawKAjIPaeXB9HSNUeu5EJAAp2iilqNBS0tC O4xAsPTYCSThvQRSUj8One4p2f+3Zv87u7Vo+IEgxA== X-Google-Smtp-Source: AGHT+IFoJ3SYq2SdQyekbmwB9cEFT1zoJ4zIhOQ9XrNafAVrnwS433UnKSAJn0XT2pAxqv1QaMNczK1IMGsChiyFTnA= X-Received: by 2002:a2e:b707:0:b0:2b9:f1ad:9503 with SMTP id j7-20020a2eb707000000b002b9f1ad9503mr7962021ljo.35.1692739501884; Tue, 22 Aug 2023 14:25:01 -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: <202211042255.2A4MtqVv032693@gitrepo.freebsd.org> <419530F4-DB8F-46EA-BF45-C130BCF8A3DE@FreeBSD.org> <05979953-C089-4D56-99E3-BBBF066FE277@FreeBSD.org> In-Reply-To: <05979953-C089-4D56-99E3-BBBF066FE277@FreeBSD.org> From: Warner Losh Date: Tue, 22 Aug 2023 15:24:50 -0600 Message-ID: Subject: Re: git: 91fcacc35597 - main - if_bnxt: Add support for VLAN on Thor To: Kristof Provost Cc: Warner Losh , Sumit Saxena , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000b52593060389a0ab" X-Rspamd-Queue-Id: 4RVj6m3h5pz4LsC X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --000000000000b52593060389a0ab Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Aug 22, 2023 at 3:07=E2=80=AFPM Kristof Provost wr= ote: > On 27 Jun 2023, at 11:17, Kristof Provost wrote: > > On 4 Nov 2022, at 23:55, Warner Losh wrote: > > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D91fcacc355971f74aa26fc7861020dc= 3a2a2d717 > > commit 91fcacc355971f74aa26fc7861020dc3a2a2d717 > Author: Sumit Saxena > AuthorDate: 2022-11-04 22:24:32 +0000 > Commit: Warner Losh > CommitDate: 2022-11-04 22:24:32 +0000 > > if_bnxt: Add support for VLAN on Thor > > Reviewed by: imp > Differential Revision: https://reviews.freebsd.org/D36443 > --- > sys/dev/bnxt/bnxt.h | 3 +- > sys/dev/bnxt/bnxt_hwrm.c | 110 > ++++++++++++++++++++++++++++------------------- > sys/dev/bnxt/bnxt_hwrm.h | 7 ++- > sys/dev/bnxt/if_bnxt.c | 7 ++- > 4 files changed, 74 insertions(+), 53 deletions(-) > > This commit appears to have broken vlan on these interfaces. > My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet, (in a > Dell T640, if that helps). > > A simple vlan creation on top of one: > ifconfig vlan create > ifconfig vlan0 vlan 201 vlandev bnxt0 > > Results in a loss of connectivity. The kernel logs this, which I assume i= s > related: > > `bnxt0: HWRM_CFA_L2_FILTER_ALLOC command returned INVALID_PARAMS error.` > > After reverting this (and 72e9dbb58cad5262190cf2eae47f764021072128) I can > create vlan interfaces on top of bnxt0 without losing connectivity. > > Should we revert this before 14.0? > > There=E2=80=99s also a report of what I think is the same issue in > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D269133 > > There=E2=80=99s a proposed patch there, but it did not work for me. > I think we're going to need to, unless Sumit and/or the broadcom team has a solution. This bug is biting more people than the bugs it supposedly fixed. Warner --000000000000b52593060389a0ab Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, Aug 22, 2023 at 3:07=E2=80=AF= PM Kristof Provost <kp@freebsd.org= > wrote:
<= /u>

On 27 Jun 2023, at 11:17, Kristof Provost wrote:

On 4 Nov 2022, at 23:55, Warner Losh wrote:

The branch main = has been updated by imp:

URL: https://cgit.Fre= eBSD.org/src/commit/?id=3D91fcacc355971f74aa26fc7861020dc3a2a2d717

commit 91fcacc355971f74aa26fc7861020dc3a2a2d717
Author: Sumit Saxena <sumit.saxena@broadcom.com>
AuthorDate: 2022-11-04 22:24:32 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-11-04 22:24:32 +0000

if_bnxt: Add support for VLAN on Thor

Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D36443
---
sys/dev/bnxt/bnxt.h | 3 +-
sys/dev/bnxt/bnxt_hwrm.c | 110 ++++++++++++++++++++++++++++---------------= ----
sys/dev/bnxt/bnxt_hwrm.h | 7 ++-
sys/dev/bnxt/if_bnxt.c | 7 ++-
4 files changed, 74 insertions(+), 53 deletions(-)

This commit appears to have broken vlan on the= se interfaces.
My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet, (in a De= ll T640, if that helps).

A simple vlan creation on top of one:
ifconfig vlan create
ifconfig vlan0 vlan 201 vlandev bnxt0

Results in a loss of connectivity. The kernel logs this, wh= ich I assume is related:

`bnxt0: HWRM_CFA_L2_FILTER_ALLOC command returned INVALID_P= ARAMS error.`

After reverting this (and 72e9dbb58cad5262190cf2eae47f76402= 1072128) I can create vlan interfaces on top of bnxt0 without losing connec= tivity.


Should we revert this before 14.0?

There=E2=80=99s also a report of what I think is the same i= ssue in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D2= 69133

There=E2=80=99s a proposed patch there, but it did not work= for me.


I think we&#= 39;re going to need to, unless Sumit and/or the broadcom team has a solutio= n. This bug is biting more people than the bugs it supposedly fixed.
<= div>
Warner=C2=A0
--000000000000b52593060389a0ab-- From nobody Tue Aug 22 21:49: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 4RVjfT4PS5z4qVYB; Tue, 22 Aug 2023 21:49: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 4RVjfT3tDzz4Q93; Tue, 22 Aug 2023 21:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692740945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZwQvKkF7+pTLnAgoiRaHY4wVukCjBn/T07C7hWQjrc=; b=VRd0fjDdrS36rrkSeQLT4jnFE7sEVy/NrzBLJ7enRfG8sRk6lHW+KPlDOpAow8DT+atCdz qKAL/In4RQC3Hpx2E+tr6JlRDKwYfsSruP+PhyxD9HsbI8En5NxYA5+BI+cBCPCkvtAZkz PcSEqhnlKs35gFmPHZsefMGVgk8oW6KNDOzycAkn0YcyToYEB4MxmaRo1BY0hqLfcwtGtX yNt1MnjVKEpjR2hIehDeVmd9y4YQSQOO4+e5P4FwJybrJzOiV9/EVgM3tx+QGrKv6pr6G1 PHQ2uLJwgJs9nDjUwaDq8g7BKN/Gr+yonD1NG+hXUbkK7yC9RRulykhEoOuWhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692740945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZwQvKkF7+pTLnAgoiRaHY4wVukCjBn/T07C7hWQjrc=; b=DJYcG+dOE6OmyZp5Rv40/ZbpobUc2MAqrGhHaZl+TJPseAJI9WEHXcmlx2eU1G/lYN5eSs oOsrCwbJGh4H31umdgijG2iTVFPeV2MYpYpwaU8xdLdjHolbO7XTkAK70Vp82UKXN1BLhC m4Z75zw2wCqbFGyPjtpJQy9q/nMHs2dSKC8R3qyjp2eGfdFmhyMpZAA54VfImRBRrEpRZz rRVB+i+1w1z4Ex/vbfRIFyyGISd+yMDmIUKouv0s9YvtTk5HHblzix9DRZCi2ihtA6OT4J anfO1v+WGZdR0l65w3k9Y5LMyITIVEyFFwg71OlqerNtx5e+gPaPSf0WBCaZYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692740945; a=rsa-sha256; cv=none; b=OciVo7zC6PKDBnB0C+p9yd29s8wOhqLmJPqO3ycjHawD+7DaONmlEGTtRLZTPJk12r79eu hJR28JjUQhtiVkVj6u0UNwC3yCe9J0hOdkgmSxjwrpaZtBETuqfO0Yr4mUXEBNbxEbZ3NV Y4WKJkxBdfbZ3OLEdvsZlxr1FpFCkkjXiTaGd1ZMK2MHtUAsh15CALc3njvhtS7Iew/BCM r56barZKDJxeJN4OYEUS7OfeRzEJnP5+v36O1rmDA1r5IzrpvvV7cht+6dFRzNPvYXuex/ u2OjtsD4SFTNQ33i4lkJxh8gac0ztm+NYFyoVPQ8FdygaufgxwMxd4Rkr/YyHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVjfT2wR3z4n4; Tue, 22 Aug 2023 21:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MLn58U050359; Tue, 22 Aug 2023 21:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MLn5cF050356; Tue, 22 Aug 2023 21:49:05 GMT (envelope-from git) Date: Tue, 22 Aug 2023 21:49:05 GMT Message-Id: <202308222149.37MLn5cF050356@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: 80e9ea426c5e - main - Makefile.asm: Drop mention of $FreeBSD$ from instructions. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 80e9ea426c5ee7b86c4c4c89d765aa0f7b17b1fc Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=80e9ea426c5ee7b86c4c4c89d765aa0f7b17b1fc commit 80e9ea426c5ee7b86c4c4c89d765aa0f7b17b1fc Author: John Baldwin AuthorDate: 2023-08-22 21:48:40 +0000 Commit: John Baldwin CommitDate: 2023-08-22 21:48:40 +0000 Makefile.asm: Drop mention of $FreeBSD$ from instructions. --- secure/lib/libcrypto/Makefile.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm index 65cc0322f3ca..1199dc830a50 100644 --- a/secure/lib/libcrypto/Makefile.asm +++ b/secure/lib/libcrypto/Makefile.asm @@ -1,7 +1,7 @@ # Use this to help generate the asm *.S files after an import. It is not # perfect by any means, but does what is needed. # Do a 'make -f Makefile.asm all' and it will generate *.S. Move them -# to the arch subdir, and correct any exposed paths and $ FreeBSD $ tags. +# to the arch subdir, and correct any exposed paths. .include "Makefile.inc" From nobody Tue Aug 22 22: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 4RVkn04xPxz4qYJm for ; Tue, 22 Aug 2023 22:39:48 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) (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 4RVkn033V3z4TK2 for ; Tue, 22 Aug 2023 22:39:48 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-68a3236a414so2873170b3a.0 for ; Tue, 22 Aug 2023 15:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; t=1692743987; x=1693348787; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=vePIr0jqPTLv1V9Aij6wnKeJYX5/h09Oa4V1mYJa31Q=; b=pur6ZGvJDlvsNwxughvQHVxy2uo1gmMo897Fo49s443Q/Atd1FXTHHzPMdepPaGIsc kolQZlOlz1QLHC1vAZDdI3fQeImJ+OKneopPKFjqIvDJHYxP5fT+Z5nB1Q5rI1Bc/u8r BtQ0GFhjgWcC97ILzZCJC76ssZ+4c3F2/iikM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692743987; x=1693348787; 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=vePIr0jqPTLv1V9Aij6wnKeJYX5/h09Oa4V1mYJa31Q=; b=SIgPlC6SkFH6nSiqhq9dV/oaygNjZTc4oUSsyNy2AAlzJ1Xqpr80YUvjAEtHq+X3pB z0JM5DOw1VV/v1SaWE3T1dHkbCv3ekftRwd7p7bmqyZGVlTYLMcssdPVO5OCGGrZdN8W jAyTuqOPhps126bTEdS4nkMg9r5+4lSNXBwyeDxoMUmXVwVpjwidcr9ACRxZB9k7wyVk 7A4QwB97Xs+/aoqgvlfXHw48znggEecDfwE9eFwOK2XZJoaj/WilyA5rPYuemKD0NkzT nCwRRrP7OtCi2AfQZg9aHgt3S1cJfz4w+eNeeTpBHzOHgEQ7XW4Us1jYTKfEnT3jIsaW +Hnw== X-Gm-Message-State: AOJu0YxolcJFsas2IpZKoBBbCNVHTLXxjyrE/E+/eqSJ3GPK04pE9WxL dRmznQ4s/oC039JK1DhQhHyRjXVaLLvqxK7Hru8oLg== X-Google-Smtp-Source: AGHT+IECMoO5FNpARycR5EkNvgJmxAs7EtSQYOg5URollFC1guFp2bXdU7ffO0ilwT6CDrpyuweVIHYIS/q9haTe104= X-Received: by 2002:a05:6a20:7489:b0:13d:b8ed:a5b8 with SMTP id p9-20020a056a20748900b0013db8eda5b8mr14555037pzd.12.1692743987182; Tue, 22 Aug 2023 15:39:47 -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: <202211042255.2A4MtqVv032693@gitrepo.freebsd.org> <419530F4-DB8F-46EA-BF45-C130BCF8A3DE@FreeBSD.org> <05979953-C089-4D56-99E3-BBBF066FE277@FreeBSD.org> In-Reply-To: <05979953-C089-4D56-99E3-BBBF066FE277@FreeBSD.org> From: Kevin Bowling Date: Tue, 22 Aug 2023 15:39:35 -0700 Message-ID: Subject: Re: git: 91fcacc35597 - main - if_bnxt: Add support for VLAN on Thor To: Kristof Provost Cc: Sumit Saxena , Warner Losh , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, src-committers@freebsd.org Content-Type: multipart/alternative; boundary="0000000000000d585606038aac0f" X-Rspamd-Queue-Id: 4RVkn033V3z4TK2 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] --0000000000000d585606038aac0f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Aug 22, 2023 at 2:07 PM Kristof Provost wrote: > On 27 Jun 2023, at 11:17, Kristof Provost wrote: > > On 4 Nov 2022, at 23:55, Warner Losh wrote: > > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D91fcacc355971f74aa26fc7861020dc= 3a2a2d717 > > commit 91fcacc355971f74aa26fc7861020dc3a2a2d717 > Author: Sumit Saxena > AuthorDate: 2022-11-04 22:24:32 +0000 > Commit: Warner Losh > CommitDate: 2022-11-04 22:24:32 +0000 > > if_bnxt: Add support for VLAN on Thor > > Reviewed by: imp > Differential Revision: https://reviews.freebsd.org/D36443 > --- > sys/dev/bnxt/bnxt.h | 3 +- > sys/dev/bnxt/bnxt_hwrm.c | 110 > ++++++++++++++++++++++++++++------------------- > sys/dev/bnxt/bnxt_hwrm.h | 7 ++- > sys/dev/bnxt/if_bnxt.c | 7 ++- > 4 files changed, 74 insertions(+), 53 deletions(-) > > This commit appears to have broken vlan on these interfaces. > My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet, (in a > Dell T640, if that helps). > > A simple vlan creation on top of one: > ifconfig vlan create > ifconfig vlan0 vlan 201 vlandev bnxt0 > > Results in a loss of connectivity. The kernel logs this, which I assume i= s > related: > > `bnxt0: HWRM_CFA_L2_FILTER_ALLOC command returned INVALID_PARAMS error.` > > After reverting this (and 72e9dbb58cad5262190cf2eae47f764021072128) I can > create vlan interfaces on top of bnxt0 without losing connectivity. > > Should we revert this before 14.0? > > There=E2=80=99s also a report of what I think is the same issue in > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D269133 > > There=E2=80=99s a proposed patch there, but it did not work for me. > In markj=E2=80=99s analysis he mentions the issue of the reinit. It sounds like there are multiple bugs in this driver but one quick band aid may be to mark the driver as not needing re-init for VLAN modifications.. that sounds unlikely and was probably an accident when the if reset functionality was added. You can check e1000 for that. Note I don=E2=80=99t have this hw and haven=E2=80=99t audited the code so t= his could be noise but it=E2=80=99s an easy thing to check. Best regards, > Kristof > --0000000000000d585606038aac0f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Tue, Aug 22, 2023 at 2:07 PM Kristof Provost <kp@freebsd.org> wrote:

On 27 Jun 2023, at 11:17, = Kristof Provost wrote:

On 4 = Nov 2022, at 23:55, Warner Losh wrote:

The branch main has been updated by imp:

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

commit 91fcacc355971f74aa2= 6fc7861020dc3a2a2d717
Author: Sumit Saxena <sumit.saxena@broadcom.com= >
AuthorDate: 2022-11-04 22:24:32 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-11-04 22:24:32 +0000

if_bnxt: Add support f= or VLAN on Thor

Reviewed by: imp
Differential Revision: https://reviews.freebsd.o= rg/D36443
---
sys/dev/bnxt/bnxt.h | 3 +-
sys/dev/bnxt/bnxt_hwrm.c | 110 ++++++++++++++++++++++++++++---------------= ----
sys/dev/bnxt/bnxt_hwrm.h | 7 ++-
sys/dev/bnxt/if_bnxt.c | 7 ++-
4 files changed, 74 insertions(+), 53 deletions(-)

This commit a= ppears to have broken vlan on these interfaces.
My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet, (in a De= ll T640, if that helps).

A simple vlan creation on = top of one:
ifconfig vlan create
ifconfig vlan0 vlan 201 vlandev bnxt0

Results in a loss of conne= ctivity. The kernel logs this, which I assume is related:

`bnxt0: HWRM_CFA_L2_FILTER= _ALLOC command returned INVALID_PARAMS error.`

After reverting this (and = 72e9dbb58cad5262190cf2eae47f764021072128) I can create vlan interfaces on t= op of bnxt0 without losing connectivity.


Should we revert this befo= re 14.0?

There=E2=80=99s also a rep= ort of what I think is the same issue in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D269133=

There=E2=80=99s a proposed= patch there, but it did not work for me.


In markj=E2=80=99s analysis = he mentions the issue of the reinit.

It sounds like there are multiple bugs in this driver but one = quick band aid may be to mark the driver as not needing re-init for VLAN mo= difications.. that sounds unlikely and was probably an accident when the if= reset functionality was added.=C2=A0 You can check e1000 for that.

Note I don=E2=80=99t have this = hw and haven=E2=80=99t audited the code so this could be noise but it=E2=80= =99s an easy thing to check.

Best regards,
Kristof

--0000000000000d585606038aac0f-- From nobody Tue Aug 22 23:10: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 4RVlSM3m9Lz4qb20; Tue, 22 Aug 2023 23:10: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 4RVlSM2nTGz4W9x; Tue, 22 Aug 2023 23:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692745827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WPY/cPeEMFlMhNQ9XoGw8yZHT04aUfQ07wMXz94Jz8w=; b=mZxkIDDveofuFTKKcktHE3RIeRBGjpVYAqzcs9H2PlzTc0EK1nGBY0ZHQM2JbRWPYpaimz BFvitLlDSelH2dNT8/BztY3bQENc3d0TfESTCqK70XctblJyDapuKSZVDI41AmfzCDDJXl DXd/Lp6NDwOPKJ3WSqw7x5Ni+RWqpHiPFOOeB+vB8zFDFASkI8FBvuDVQDcV5jCtYJrmNj 2Mm579FKsC1N3RZKOS+cDh4DfwFtBziPAjG0GGYh9ek7v905J02zJWq/eFNQG0QwBe+ynl gUIwPh/ZphsscNeokA6V28NpOAhYHsXRwxArJU+kKEsCpn8hkgI3ijYZYGV6Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692745827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WPY/cPeEMFlMhNQ9XoGw8yZHT04aUfQ07wMXz94Jz8w=; b=pdx2X60sjqWILwEKCrZaP32acoTTluEYS2XcezryVnSB1aM9j6vDPplfFzXJAafC/l2aRJ dPXaGDeDwayqWbvSbx4MpSTfeNGdr1Z4PSv8q9BX+boyVkVwZ3wk5ofzuYd8D0ux+gKVhZ 1Jii3KqBhlzEtyWJ/jkmiBhoNUQ03nFTH+PbCV54F3IqfsKrwVo2wDpWW4tr5HbUn6UH+X f7niYQa97MSIA2XUmA4Jw3RYH968LBA1hmJl71ibCa48/0vxdTXYHL0f9LTF52hnAU81mH V3SJdl59b32fuZAJiGrB3yHPw+aSu+5ZvJ+kffjnadG3P4BUxJHSpBp5lbkzzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692745827; a=rsa-sha256; cv=none; b=Xn8EzO5T2E5OWCBMZCYufxudSK+ozOstgaweydQpPFCxQChGSs1h7HICLTsRbAxwsewR68 09hsFMgIUeCYDJMOEBvsP59CoxUMqUxtRi7kTzlJwQajFhgQ4shisY/d+eYIilQl8YkrfE 1quyONu1qfSRwX1oMiqLow1ocJsZ8INz5GQN5E04y6s1f4L0utzKUdHovMIWmM6Xup/G9z ElCUPH0ICd5yPEgOSdngr88ly4FYr8Brt8gHbXk7oQZL2WBUQa9eXg3e2meb47q8x9izKN 9d3+qoOCAnKglytfUFJJrLPmha1fOQGjVgxM+Nnsnat82shiXf1a9yCDV1WdOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVlSM1c5Mz72V; Tue, 22 Aug 2023 23:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MNAR65092112; Tue, 22 Aug 2023 23:10:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MNARIL092109; Tue, 22 Aug 2023 23:10:27 GMT (envelope-from git) Date: Tue, 22 Aug 2023 23:10:27 GMT Message-Id: <202308222310.37MNARIL092109@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: c7f73a1588dc - main - ofed: mask seq_num identifier to occupy only 3 bytes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c7f73a1588dc58db28100fcbc1d72a830b674b34 Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=c7f73a1588dc58db28100fcbc1d72a830b674b34 commit c7f73a1588dc58db28100fcbc1d72a830b674b34 Author: Bartosz Sobczak AuthorDate: 2023-08-22 23:07:11 +0000 Commit: Eric Joyner CommitDate: 2023-08-22 23:09:13 +0000 ofed: mask seq_num identifier to occupy only 3 bytes The seq_num among other things is used to assign rq_psn value, which is a 24-bit identifier. When the seq_num is full 4-byte value, we are usually receiving: '_ib_modify_qp rq_psn overflow, masking to 24 bits' warning. This is burdensome for running rdma traffic with large number of connections, because the number of logs is growing fast. Signed-off-by: Bartosz Sobczak Signed-off-by: Eric Joyner Reviewed by: kib@, erj@ MFC after: 3 days Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D41531 --- sys/ofed/drivers/infiniband/core/ib_cma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/ofed/drivers/infiniband/core/ib_cma.c b/sys/ofed/drivers/infiniband/core/ib_cma.c index fe6e3282dbf9..44783cbf8362 100644 --- a/sys/ofed/drivers/infiniband/core/ib_cma.c +++ b/sys/ofed/drivers/infiniband/core/ib_cma.c @@ -787,6 +787,7 @@ struct rdma_cm_id *rdma_create_id(struct vnet *net, INIT_LIST_HEAD(&id_priv->listen_list); INIT_LIST_HEAD(&id_priv->mc_list); get_random_bytes(&id_priv->seq_num, sizeof id_priv->seq_num); + id_priv->seq_num &= 0x00ffffff; id_priv->id.route.addr.dev_addr.net = net; return &id_priv->id; From nobody Tue Aug 22 23:59: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 4RVmYQ4vD2z4qdyv for ; Tue, 22 Aug 2023 23:59:54 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-oi1-x235.google.com (mail-oi1-x235.google.com [IPv6:2607:f8b0:4864:20::235]) (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 4RVmYP53kjz4YNX for ; Tue, 22 Aug 2023 23:59:53 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Authentication-Results: mx1.freebsd.org; dkim=none ("invalid DKIM record") header.d=kev009.com header.s=google header.b=NIPY7OOy; spf=pass (mx1.freebsd.org: domain of kevin.bowling@kev009.com designates 2607:f8b0:4864:20::235 as permitted sender) smtp.mailfrom=kevin.bowling@kev009.com; dmarc=none Received: by mail-oi1-x235.google.com with SMTP id 5614622812f47-3a85cc7304fso1707169b6e.1 for ; Tue, 22 Aug 2023 16:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; t=1692748792; x=1693353592; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=Qf4+6OSa4ZzODy9D2XgA1IA+oKFEofk81Da8CfSjyn4=; b=NIPY7OOyFnidGmZQu08yk4mCiXw35bZXS+kqfLKvji1mLyLzFFsE9FZ+XnRk9RllFr hjla0UEzcYEqlNhizfBusZFO28UR21ltifGmyactZuszuuQcXMw1WtPHrA0VsEe0RGUm 2SHsWGXYN6X3KpeihvaQ1FL5t/UKSqA3McVkw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692748792; x=1693353592; 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=Qf4+6OSa4ZzODy9D2XgA1IA+oKFEofk81Da8CfSjyn4=; b=THdXmxhS9Ck/LwloPvqSwkrrtvKmtGt6gaSHuhBEtcAZ+75ClaErSHW+QhA7LhjCWD Y+Y624Dbz4t+YSWhaKa6VolmzEs8gvY4wATQKJEB+xx32VUzVjqjEHxYrPrpr1KmjXPf 0qG0vsy6xYe9wltXHwqVgM1Yw26tSg740t2VUfraG1whWZFieV2teE7dsrmvAn7wkRNw ivornGAxQCJG7MXsy/G/neznmBWEzDDpmNmWd9gEiheDcUHfsxmybCxfejDjDKMQhP1i Drs3MPxd0m7Bs+GVXWrbkoP29AquoOBlvjrVAnmZCXmKTmySBNHqKtMGtl3znk5NPX1L jLrw== X-Gm-Message-State: AOJu0YzF3K5aydkYzfsUhcWc8OFoopAshSYR/3Hzheb4hrWRnXAeedOs h3H8wSZx4gyh40LA9bHtZ4FoWn2ZZx9ARxRa3EnqBA== X-Google-Smtp-Source: AGHT+IF0+VHyIoPJWAeumx5vgOhziTTnc43Hyk0tGCrWYiAoZBIoaPG+oDXFRyBMSgR3p5uMsECdFYrLUL60xWF6N5M= X-Received: by 2002:a05:6808:ec7:b0:3a7:5d83:14d2 with SMTP id q7-20020a0568080ec700b003a75d8314d2mr15144667oiv.17.1692748792233; Tue, 22 Aug 2023 16:59:52 -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: <202211042255.2A4MtqVv032693@gitrepo.freebsd.org> <419530F4-DB8F-46EA-BF45-C130BCF8A3DE@FreeBSD.org> <05979953-C089-4D56-99E3-BBBF066FE277@FreeBSD.org> In-Reply-To: From: Kevin Bowling Date: Tue, 22 Aug 2023 16:59:40 -0700 Message-ID: Subject: Re: git: 91fcacc35597 - main - if_bnxt: Add support for VLAN on Thor To: Kristof Provost Cc: Sumit Saxena , Warner Losh , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, src-committers@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.28 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; NEURAL_HAM_LONG(-0.98)[-0.980]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_PERMFAIL(0.00)[kev009.com:s=google]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_COUNT_ONE(0.00)[1]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::235:from]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[kev009.com:~]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; RCPT_COUNT_FIVE(0.00)[6]; DMARC_NA(0.00)[kev009.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Spamd-Bar: --- X-Rspamd-Queue-Id: 4RVmYP53kjz4YNX On Tue, Aug 22, 2023 at 3:39=E2=80=AFPM Kevin Bowling wrote: > > > > On Tue, Aug 22, 2023 at 2:07 PM Kristof Provost wrote: >> >> On 27 Jun 2023, at 11:17, Kristof Provost wrote: >> >> On 4 Nov 2022, at 23:55, Warner Losh wrote: >> >> The branch main has been updated by imp: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D91fcacc355971f74aa26fc786= 1020dc3a2a2d717 >> >> commit 91fcacc355971f74aa26fc7861020dc3a2a2d717 >> Author: Sumit Saxena >> AuthorDate: 2022-11-04 22:24:32 +0000 >> Commit: Warner Losh >> CommitDate: 2022-11-04 22:24:32 +0000 >> >> if_bnxt: Add support for VLAN on Thor >> >> Reviewed by: imp >> Differential Revision: https://reviews.freebsd.org/D36443 >> --- >> sys/dev/bnxt/bnxt.h | 3 +- >> sys/dev/bnxt/bnxt_hwrm.c | 110 ++++++++++++++++++++++++++++-------------= ------ >> sys/dev/bnxt/bnxt_hwrm.h | 7 ++- >> sys/dev/bnxt/if_bnxt.c | 7 ++- >> 4 files changed, 74 insertions(+), 53 deletions(-) >> >> This commit appears to have broken vlan on these interfaces. >> My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet, (in a= Dell T640, if that helps). >> >> A simple vlan creation on top of one: >> ifconfig vlan create >> ifconfig vlan0 vlan 201 vlandev bnxt0 >> >> Results in a loss of connectivity. The kernel logs this, which I assume = is related: >> >> `bnxt0: HWRM_CFA_L2_FILTER_ALLOC command returned INVALID_PARAMS error.` >> >> After reverting this (and 72e9dbb58cad5262190cf2eae47f764021072128) I ca= n create vlan interfaces on top of bnxt0 without losing connectivity. >> >> >> Should we revert this before 14.0? >> >> There=E2=80=99s also a report of what I think is the same issue in https= ://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D269133 >> >> There=E2=80=99s a proposed patch there, but it did not work for me. > > > In markj=E2=80=99s analysis he mentions the issue of the reinit. > > It sounds like there are multiple bugs in this driver but one quick band = aid may be to mark the driver as not needing re-init for VLAN modifications= .. that sounds unlikely and was probably an accident when the if reset func= tionality was added. You can check e1000 for that. Here's what I mean as a patch https://reviews.freebsd.org/D41558 > Note I don=E2=80=99t have this hw and haven=E2=80=99t audited the code so= this could be noise but it=E2=80=99s an easy thing to check. > >> Best regards, >> Kristof From nobody Wed Aug 23 00:07: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 4RVmkJ17jDz4qfdX; Wed, 23 Aug 2023 00:07: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 4RVmkJ0fpbz4ZX7; Wed, 23 Aug 2023 00:07:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692749256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oaTFZa5MKhlGxSRBelCY4g0z5yt2+aDdEzTKVYNzQ4s=; b=NZRGWqAXg8qRhB7f5H8WV9AvGgbmOWZIFMloaSyHr0LCmKvTbGRmimZu/pSSjnhemx6+gN tNIUKU0+jTE8S5VvPmZ9YMOcg/7HO5v78qRU2zm3IA2dVfPsdWBKs4tSN/wSVlSTC59CVx n/liVUhkXVq3PuVCvXfPXrpVMAZAQQFQ2CwbeepMv2H/AEjm55VO28tDE/ZJtfZ46mIi2d 4ON2PgcCpmKgUq3svQXmgzQCR1k/g3peP5hWDbw5QZIxA7gaoNyLwA35EyUHd5OI6zPCmh h6D8eR/5x9AMUHJWHkkshlRBOVE9JmDFtRiISIbLrmnkLyLOQC7aS395gD8npw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692749256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oaTFZa5MKhlGxSRBelCY4g0z5yt2+aDdEzTKVYNzQ4s=; b=JqxuZt/KO2KL5K0zTXrl9/4CAMjEhn+Z5ukx5+m+N7Yy+G+moDmyvCKaYOjq2tEksZl6aB 5sMjRG25yVh9W+Kp/lpg89YCca19vyUoFb9jrZ/Z8rsaQTChDaUlt2PbDm/WT61ITEBY32 pbWPA+qYcGttIpKeuzb3dsDinWLxjEmlAWrlVKmmIx+l1sXkU1dNFh2/jmBP/bp6kZJid+ yb7P36AFPbyyzyjDfDrE1aHtVEh5Ib7Q1SaWi5XYdbys3k+HQA9H4RgD3CVb46+ksjUhoI faqfGiWkC0c+sUhtikrKiFZU1yX4ES0Zz5xoE+24uxjoCEcTm86KFscWKepADA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692749256; a=rsa-sha256; cv=none; b=HnbI9tUty+Nir47zep0/J9/pDPdxFPHPVlGFqt+S42Zf3kjU6BVuh3wgBYX6kYvfdoO0Y6 aq4RnMUS2cc4P8kjbRnsapvW2YUIxmp+9CMCCT7FKCCUnV1JvduuLYVR+7k08bUOZrk7jA bSrKnZtFE//Xa8qUHI5ulhrM/VuIPeW4JEhUlya/qN8ldzRytCNAH6zk+AHTWQ5Vl2rkX7 fE12yvObUmfV/1v19OtOgJmZJHHK0wpemz/IZo7WWClYMFoTZw9/Ss7NG+BhqyapTFeEA0 Ad1iilJvSPcL1ET5ei4pJ7Vn425DHPALxAx7Oza+butMKXb1ddu0Gs7qO2RoYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVmkH6rXYz8cs; Wed, 23 Aug 2023 00:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37N07ZPJ082836; Wed, 23 Aug 2023 00:07:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37N07ZCX082833; Wed, 23 Aug 2023 00:07:35 GMT (envelope-from git) Date: Wed, 23 Aug 2023 00:07:35 GMT Message-Id: <202308230007.37N07ZCX082833@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: 8882b7852acf - main - add pmap_active_cpus() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8882b7852acf2588d87ccb6d4c6bf7694511fc56 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8882b7852acf2588d87ccb6d4c6bf7694511fc56 commit 8882b7852acf2588d87ccb6d4c6bf7694511fc56 Author: Konstantin Belousov AuthorDate: 2021-10-07 22:25:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-23 00:02:21 +0000 add pmap_active_cpus() For amd64, i386, arm, and riscv, i.e. all architectures except arm64, the custom implementation is provided since we maintain the bitmask of active CPUs anyway. Arm64 uses somewhat naive iteration over CPUs and match current vmspace' pmap with the argument. It is not guaranteed that vmspace->pmap is the same as the active pmap, but the inaccuracy should be toleratable. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D32360 --- sys/amd64/amd64/pmap.c | 6 ++++++ sys/arm/arm/pmap-v6.c | 6 ++++++ sys/arm64/include/pmap.h | 2 ++ sys/i386/i386/pmap_base.c | 6 ++++++ sys/powerpc/powerpc/pmap_dispatch.c | 6 ++++++ sys/riscv/riscv/pmap.c | 6 ++++++ sys/vm/pmap.h | 2 ++ sys/vm/vm_kern.c | 26 ++++++++++++++++++++++++++ 8 files changed, 60 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index c7151fa59b91..b10997fd657b 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -10256,6 +10256,12 @@ pmap_activate_boot(pmap_t pmap) PCPU_SET(ucr3, PMAP_NO_CR3); } +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} + void pmap_sync_icache(pmap_t pm, vm_offset_t va, vm_size_t sz) { diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 5aa8eb169cad..719851432203 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -6194,6 +6194,12 @@ pmap_activate(struct thread *td) critical_exit(); } +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} + /* * Perform the pmap work for mincore(2). If the page is not both referenced and * modified by this pmap, returns its physical address so that the caller can diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index fd8dc8d33f38..1789588210c3 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -129,6 +129,8 @@ extern struct pmap kernel_pmap_store; (uint64_t)(asid) << TTBR_ASID_SHIFT; \ }) +#define PMAP_WANT_ACTIVE_CPUS_NAIVE + extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; diff --git a/sys/i386/i386/pmap_base.c b/sys/i386/i386/pmap_base.c index b0c3413d1735..50229ee40caa 100644 --- a/sys/i386/i386/pmap_base.c +++ b/sys/i386/i386/pmap_base.c @@ -944,6 +944,12 @@ pmap_kremove(vm_offset_t va) pmap_methods_ptr->pm_kremove(va); } +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} + extern struct pmap_methods pmap_pae_methods, pmap_nopae_methods; int pae_mode; SYSCTL_INT(_vm_pmap, OID_AUTO, pae_mode, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c index ebf81551fa07..3f1ac937433f 100644 --- a/sys/powerpc/powerpc/pmap_dispatch.c +++ b/sys/powerpc/powerpc/pmap_dispatch.c @@ -253,3 +253,9 @@ pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) return (FALSE); } } + +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 20e6ccd22b62..49ee54b37918 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -4687,6 +4687,12 @@ pmap_activate_boot(pmap_t pmap) PCPU_SET(curpmap, pmap); } +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} + void pmap_sync_icache(pmap_t pmap, vm_offset_t va, vm_size_t sz) { diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index 7272882132e0..65e909df9b8f 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -90,6 +90,7 @@ typedef struct pmap_statistics *pmap_statistics_t; #include #ifdef _KERNEL +#include struct thread; /* @@ -118,6 +119,7 @@ extern vm_offset_t kernel_vm_end; #define PMAP_TS_REFERENCED_MAX 5 void pmap_activate(struct thread *td); +void pmap_active_cpus(pmap_t pmap, cpuset_t *res); void pmap_advise(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, int advice); void pmap_align_superpage(vm_object_t, vm_ooffset_t, vm_offset_t *, diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index c3695b5c94eb..f94200d77c47 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -78,6 +78,7 @@ #include #include #include +#include #include #include #include @@ -907,6 +908,31 @@ kmem_bootstrap_free(vm_offset_t start, vm_size_t size) #endif } +#ifdef PMAP_WANT_ACTIVE_CPUS_NAIVE +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + struct thread *td; + struct proc *p; + struct vmspace *vm; + int c; + + CPU_ZERO(res); + CPU_FOREACH(c) { + td = cpuid_to_pcpu[c]->pc_curthread; + p = td->td_proc; + if (p == NULL) + continue; + vm = vmspace_acquire_ref(p); + if (vm == NULL) + continue; + if (pmap == vmspace_pmap(vm)) + CPU_SET(c, res); + vmspace_free(vm); + } +} +#endif + /* * Allow userspace to directly trigger the VM drain routine for testing * purposes. From nobody Wed Aug 23 00:07: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 4RVmkK2DZNz4qfbf; Wed, 23 Aug 2023 00:07: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 4RVmkK1PWdz4ZVk; Wed, 23 Aug 2023 00:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692749257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sAEy/rrwfz6MQp1twMd5r7ICLZI9gW0h64/81kQJdh4=; b=aBRzPhSklgS4hohB241DG0Ooy9TFqe7YXqMZzcRvzPPa5/whZMUqN0fhy5ZPkWOm0Tr2hk bttSwDNguBaeXFq4zQ+Dfd0p0AXGKsIdCcTCXNkjQyYuF/IsNKnn3ewE+Vm4WkZaXN7kyZ cFOh6NgiqbagK8iflZskJQeUO8Bi9by7U2ChLQ7MGp5qXczqg8kFahN2O57RgzWSHCQMPn iCLB0cNNhEFwJ0LzlRBueff8HiWgmNavxuPQkRrJXe/KEDch7jCOD5LsYfjoHCV9WgPfyv zUMwpbMz/5VH2KOjlHHJlxYWQXo94Uw6cOt5j0gibcB46LdqDs/QId5tH36DxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692749257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sAEy/rrwfz6MQp1twMd5r7ICLZI9gW0h64/81kQJdh4=; b=N/dE7vMSCJ3IfgHrbUfuUniTG78CGMRk5RBRcV/DPOqBNxahNhxGX2ZVA0Wsl1zSaDakGi 7yrTHSW44it7ojO+Mmj3Gn93+IDCevDTPCRPl6EquABA3mSarN6nyU/72FJUeb7N5M1f30 YerqzH4QBcsdn1MOblkfCbHGoboL2BOQec8QuFENwZ3ivrWPOTF+DB4vlC+JpYXqFsTCKs m3bzlm7rRfNcihx2BnHEklWT7Xj3r/F1Cb1PfPFJl9GM8rOUOvTmytW+Rq6LHUHsDqtnAy kNLB96Ki7LgWdXSU463/Q4yWxmOfnJgNyHW78Wqto6Tyt0Ofc/6wOjl4ymP3Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692749257; a=rsa-sha256; cv=none; b=P5SVeNMCadfTuHsk70jDXTI8vJGM3UprAxw80vOoQf7IO51xQzbn8MoCSO3hmTDJgEosWL zi5KPTcjXBzYnFu5/kYwctVcvF3zpIRHPIyRQgp997gqMvq7IDqbaZTU664FlaVXBiGJUv yPj3V/yzVWSi2tEYJIAHVmzPNacJm4kBpCDoc3N5pktqDT8jfqdd68ENEb8ql8LdN15iqZ CkR7/lCyHxhkdWaeZj1F+WOH7GiIFzXsQm0PLvPyjpnc5uu1MkhYK5I8wjSc4CKhGvYqPk DyJ4KSzLdMgFO/9hDHoyw72BEP4F5OCDoXNcWULYQBHCTAi4UR1fW2kGzPq5nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVmkK0T9gz8DD; Wed, 23 Aug 2023 00:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37N07bmc082869; Wed, 23 Aug 2023 00:07:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37N07acf082866; Wed, 23 Aug 2023 00:07:36 GMT (envelope-from git) Date: Wed, 23 Aug 2023 00:07:36 GMT Message-Id: <202308230007.37N07acf082866@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: 74ccb8ecf6c1 - main - Add cpu_sync_core() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 74ccb8ecf6c115a79f008bc32d4981f1126b63a8 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=74ccb8ecf6c115a79f008bc32d4981f1126b63a8 commit 74ccb8ecf6c115a79f008bc32d4981f1126b63a8 Author: Konstantin Belousov AuthorDate: 2021-10-07 21:57:55 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-23 00:02:21 +0000 Add cpu_sync_core() Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D32360 --- sys/amd64/amd64/support.S | 21 +++++++++++++++++++++ sys/arm/arm/vm_machdep.c | 5 +++++ sys/arm64/arm64/vm_machdep.c | 11 +++++++++++ sys/i386/i386/support.S | 8 ++++++++ sys/powerpc/powerpc/vm_machdep.c | 10 ++++++++++ sys/riscv/riscv/vm_machdep.c | 7 +++++++ sys/sys/proc.h | 1 + 7 files changed, 63 insertions(+) diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index ae2793aa7584..6e541b75cdae 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -1969,3 +1969,24 @@ ENTRY(mds_handler_silvermont) popq %rax retq END(mds_handler_silvermont) + +/* + * Do the same as Linux and execute IRET explicitly, despite IPI + * return does it as well. + */ +ENTRY(cpu_sync_core) +/* + * Can utilize SERIALIZE when instruction is moved from + * 'future extensions' to SDM. + */ + movq (%rsp), %rdx + movl %ss, %eax + pushq %rax + pushq %rsp + addq $16, (%rsp) + pushfq + movl %cs, %eax + pushq %rax + pushq %rdx + iretq +END(cpu_sync_core) diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c index ace6b4ce668b..b7c08cd4e97f 100644 --- a/sys/arm/arm/vm_machdep.c +++ b/sys/arm/arm/vm_machdep.c @@ -311,3 +311,8 @@ cpu_procctl(struct thread *td __unused, int idtype __unused, id_t id __unused, return (EINVAL); } + +void +cpu_sync_core(void) +{ +} diff --git a/sys/arm64/arm64/vm_machdep.c b/sys/arm64/arm64/vm_machdep.c index 06e063d916f1..5e45b45dc320 100644 --- a/sys/arm64/arm64/vm_machdep.c +++ b/sys/arm64/arm64/vm_machdep.c @@ -310,3 +310,14 @@ cpu_procctl(struct thread *td __unused, int idtype __unused, id_t id __unused, return (EINVAL); } + +void +cpu_sync_core(void) +{ + /* + * Do nothing. According to ARM ARMv8 D1.11 Exception return + * If FEAT_ExS is not implemented, or if FEAT_ExS is + * implemented and the SCTLR_ELx.EOS field is set, exception + * return from ELx is a context synchronization event. + */ +} diff --git a/sys/i386/i386/support.S b/sys/i386/i386/support.S index 58c01f37a3fc..982108a0b968 100644 --- a/sys/i386/i386/support.S +++ b/sys/i386/i386/support.S @@ -578,3 +578,11 @@ ENTRY(mds_handler_silvermont) movl %eax, %cr0 3: ret END(mds_handler_silvermont) + +ENTRY(cpu_sync_core) + popl %eax + pushfl + pushl %cs + pushl %eax + iretl +END(cpu_sync_core) diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c index b53da3dd04fa..1a31959b278b 100644 --- a/sys/powerpc/powerpc/vm_machdep.c +++ b/sys/powerpc/powerpc/vm_machdep.c @@ -239,3 +239,13 @@ cpu_procctl(struct thread *td __unused, int idtype __unused, id_t id __unused, return (EINVAL); } + +void +cpu_sync_core(void) +{ + /* + * Linux performs "rfi" there. Our rendezvous IPI handler on + * the target cpu does "rfi" before and lwsync/sync after the + * action, which is stronger than required. + */ +} diff --git a/sys/riscv/riscv/vm_machdep.c b/sys/riscv/riscv/vm_machdep.c index 3b2553996bb8..58acf5df9e14 100644 --- a/sys/riscv/riscv/vm_machdep.c +++ b/sys/riscv/riscv/vm_machdep.c @@ -49,6 +49,7 @@ #include #include +#include #include #include #include @@ -267,3 +268,9 @@ cpu_procctl(struct thread *td __unused, int idtype __unused, id_t id __unused, return (EINVAL); } + +void +cpu_sync_core(void) +{ + fence_i(); +} diff --git a/sys/sys/proc.h b/sys/sys/proc.h index a35446690526..05ab914af409 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1229,6 +1229,7 @@ void cpu_idle(int); int cpu_idle_wakeup(int); extern void (*cpu_idle_hook)(sbintime_t); /* Hook to machdep CPU idler. */ void cpu_switch(struct thread *, struct thread *, struct mtx *); +void cpu_sync_core(void); void cpu_throw(struct thread *, struct thread *) __dead2; bool curproc_sigkilled(void); void userret(struct thread *, struct trapframe *); From nobody Wed Aug 23 00:07: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 4RVmkL5Bf4z4qfbj; Wed, 23 Aug 2023 00:07: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 4RVmkL2fg6z4ZWC; Wed, 23 Aug 2023 00:07:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692749258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QqJl/CvZvlLCfzsizVE3vpsbU9t8xGff+6h/Ox1mr48=; b=Qt2eAVkifQlV5vn71CrIZu8dWMWjefRUq7+i5L2RxV9uT+FECIwxz3oVHqzfjh4LgSFY/2 gHt/MzmYWeyc74zxHwZX4j1TZgTyjwqMyPY5EQecsVD3tVgp+W2gNRISTUT3B6HgVNceHy U6JbPpxOEwLPMEaZgK0GKKtCizZb0j0Q9gTU+1Xh4JCgT4Yai2hSjBnPi5DbmeGMqC/HvU i2STiJi8f2vdKNsn7P11FxTx7/OL8GKTNRnq1Wf7PcrqVG4aUnrNTS94ky90bc7WaUaw3I 5EUflQVPLkomnsOFHhDgBdsVnmph69m36bBBziisXoThU+Z9i+AsDYU0estxSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692749258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QqJl/CvZvlLCfzsizVE3vpsbU9t8xGff+6h/Ox1mr48=; b=YrCAuOe6vT+DhF7CBKiFQYYG21EnwmDrQIKDungXrMJGSl9rAG+RCn/x6gYysACzsDZjBq CDZ8CxDV4biW6uz1lYInLnj9vb8nw4ZUE3ca0SOG9fzau3tMaCeyuRspugbjli1wbTjrXi gC8BVaUEEGyykwDLKo0Xa2gPO/vABNDvqfEI9KOkPoWCwmaNRtkST8UV+D1p2F4I2PAEUq klPXCzcBbtZPiXOCeAeYXFEyfl6lP35vRjHxNrZisNqwzutlxToq+OhxTeO8jiMitLu21p wGyzSQwgC26+dhQhUT5Zg01d558D6qwUp/00r/80gTfQN3H9iSHmbMQr/YN3tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692749258; a=rsa-sha256; cv=none; b=BfTzuuMub6OG2boQt6GNxii06tNYoBxzFv48FuboBuPKvXNEE2cvX/uS2bUEkhq645TFwm dMg3onsnVzUSgitoAerubRTT3BVnBlXQGn6NgAHgR6SwtuU7eCQk0iuqYFNA/rucN4UmU8 6XaodvCkvkRHZ9BfhGlJBA/XiGceUt2z+GMWEsRpW3nlKNDHUKDQkt2mBLNxrywT4gXUos YkAuLeP3XQuxmfSdKiayVKObhW09mBuIXx6aYO/VoPWPC554tW7yUjQs4iCtp2u0XBvH+W 1PiXdT9c1T8sMwiV/TomQrTBILBihxaUbFL5m1ApbL/d5GCtcJIeyY42/+XN8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVmkL1mYLz8f6; Wed, 23 Aug 2023 00:07:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37N07coL082909; Wed, 23 Aug 2023 00:07:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37N07cOK082906; Wed, 23 Aug 2023 00:07:38 GMT (envelope-from git) Date: Wed, 23 Aug 2023 00:07:38 GMT Message-Id: <202308230007.37N07cOK082906@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: 4a69fc16a583 - main - Add membarrier(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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a69fc16a583face922319c476f3e739d9ce9140 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4a69fc16a583face922319c476f3e739d9ce9140 commit 4a69fc16a583face922319c476f3e739d9ce9140 Author: Konstantin Belousov AuthorDate: 2021-10-07 21:10:07 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-23 00:02:21 +0000 Add membarrier(2) This is an attempt at clean-room implementation of the Linux' membarrier(2) syscall. For documentation, you would need to read both membarrier(2) Linux man page, the comments in Linux kernel/sched/membarrier.c implementation and possibly look at actual uses. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D32360 --- lib/libc/sys/Symbol.map | 1 + sys/conf/files | 1 + sys/kern/kern_exec.c | 2 + sys/kern/kern_membarrier.c | 239 +++++++++++++++++++++++++++++++++++++++++++++ sys/kern/syscalls.master | 9 +- sys/sys/membarrier.h | 70 +++++++++++++ sys/sys/proc.h | 6 ++ sys/sys/syscallsubr.h | 2 + 8 files changed, 329 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index c09c3696c17b..9a07bb457eb8 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -419,6 +419,7 @@ FBSD_1.7 { _Fork; fspacectl; kqueuex; + membarrier; swapoff; }; diff --git a/sys/conf/files b/sys/conf/files index b5cd85cba0e4..3f79ce752c80 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3780,6 +3780,7 @@ kern/kern_lockstat.c optional kdtrace_hooks kern/kern_loginclass.c standard kern/kern_malloc.c standard kern/kern_mbuf.c standard +kern/kern_membarrier.c standard kern/kern_mib.c standard kern/kern_module.c standard kern/kern_mtxpool.c standard diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 6b0798921da2..ae2b624c2659 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -805,6 +805,8 @@ interpret: p->p_flag2 &= ~P2_NOTRACE; if ((p->p_flag2 & P2_STKGAP_DISABLE_EXEC) == 0) p->p_flag2 &= ~P2_STKGAP_DISABLE; + p->p_flag2 &= ~(P2_MEMBAR_PRIVE | P2_MEMBAR_PRIVE_SYNCORE | + P2_MEMBAR_GLOBE); if (p->p_flag & P_PPWAIT) { p->p_flag &= ~(P_PPWAIT | P_PPTRACE); cv_broadcast(&p->p_pwait); diff --git a/sys/kern/kern_membarrier.c b/sys/kern/kern_membarrier.c new file mode 100644 index 000000000000..eabd00e8ddf4 --- /dev/null +++ b/sys/kern/kern_membarrier.c @@ -0,0 +1,239 @@ +/*- + * Copyright (c) 2021 The FreeBSD Foundation + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#define MEMBARRIER_SUPPORTED_CMDS ( \ + MEMBARRIER_CMD_GLOBAL | \ + MEMBARRIER_CMD_GLOBAL_EXPEDITED | \ + MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED | \ + MEMBARRIER_CMD_PRIVATE_EXPEDITED | \ + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED | \ + MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE | \ + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE) + +static void +membarrier_action_seqcst(void *arg __unused) +{ + atomic_thread_fence_seq_cst(); +} + +static void +membarrier_action_seqcst_sync_core(void *arg __unused) +{ + atomic_thread_fence_seq_cst(); + cpu_sync_core(); +} + +static void +do_membarrier_ipi(cpuset_t *csp, void (*func)(void *)) +{ + atomic_thread_fence_seq_cst(); + smp_rendezvous_cpus(*csp, smp_no_rendezvous_barrier, func, + smp_no_rendezvous_barrier, NULL); + atomic_thread_fence_seq_cst(); +} + +static void +check_cpu_switched(int c, cpuset_t *csp, uint64_t *swt, bool init) +{ + struct pcpu *pc; + uint64_t sw; + + if (CPU_ISSET(c, csp)) + return; + + pc = cpuid_to_pcpu[c]; + if (pc->pc_curthread == pc->pc_idlethread) { + CPU_SET(c, csp); + return; + } + + /* + * Sync with context switch to ensure that override of + * pc_curthread with non-idle thread pointer is visible before + * reading of pc_switchtime. + */ + atomic_thread_fence_acq(); + + sw = pc->pc_switchtime; + if (init) + swt[c] = sw; + else if (sw != swt[c]) + CPU_SET(c, csp); +} + +/* + * + * XXXKIB: We execute the requested action (seq_cst and possibly + * sync_core) on current CPU as well. There is no guarantee that + * current thread executes anything with the full fence semantics + * during syscall execution. Similarly, cpu_core_sync() semantics + * might be not provided by the syscall return. E.g. on amd64 we + * typically return without IRET. + */ +int +kern_membarrier(struct thread *td, int cmd, unsigned flags, int cpu_id) +{ + struct proc *p, *p1; + struct thread *td1; + cpuset_t cs; + uint64_t *swt; + int c, error; + bool first; + + if (flags != 0 || (cmd & ~MEMBARRIER_SUPPORTED_CMDS) != 0) + return (EINVAL); + + if (cmd == MEMBARRIER_CMD_QUERY) { + td->td_retval[0] = MEMBARRIER_SUPPORTED_CMDS; + return (0); + } + + p = td->td_proc; + error = 0; + + switch (cmd) { + case MEMBARRIER_CMD_GLOBAL: + swt = malloc((mp_maxid + 1) * sizeof(*swt), M_TEMP, M_WAITOK); + CPU_ZERO(&cs); + sched_pin(); + CPU_SET(PCPU_GET(cpuid), &cs); + for (first = true; error == 0; first = false) { + CPU_FOREACH(c) + check_cpu_switched(c, &cs, swt, first); + if (CPU_CMP(&cs, &all_cpus) == 0) + break; + error = pause_sig("mmbr", 1); + if (error == EWOULDBLOCK) + error = 0; + } + sched_unpin(); + free(swt, M_TEMP); + atomic_thread_fence_seq_cst(); + break; + + case MEMBARRIER_CMD_GLOBAL_EXPEDITED: + if ((td->td_proc->p_flag2 & P2_MEMBAR_GLOBE) == 0) { + error = EPERM; + } else { + CPU_ZERO(&cs); + CPU_FOREACH(c) { + td1 = cpuid_to_pcpu[c]->pc_curthread; + p1 = td1->td_proc; + if (p1 != NULL && + (p1->p_flag2 & P2_MEMBAR_GLOBE) != 0) + CPU_SET(c, &cs); + } + do_membarrier_ipi(&cs, membarrier_action_seqcst); + } + break; + + case MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED: + if ((p->p_flag2 & P2_MEMBAR_GLOBE) == 0) { + PROC_LOCK(p); + p->p_flag2 |= P2_MEMBAR_GLOBE; + PROC_UNLOCK(p); + } + break; + + case MEMBARRIER_CMD_PRIVATE_EXPEDITED: + if ((td->td_proc->p_flag2 & P2_MEMBAR_PRIVE) == 0) { + error = EPERM; + } else { + pmap_active_cpus(vmspace_pmap(p->p_vmspace), &cs); + do_membarrier_ipi(&cs, membarrier_action_seqcst); + } + break; + + case MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED: + if ((p->p_flag2 & P2_MEMBAR_PRIVE) == 0) { + PROC_LOCK(p); + p->p_flag2 |= P2_MEMBAR_PRIVE; + PROC_UNLOCK(p); + } + break; + + case MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE: + if ((td->td_proc->p_flag2 & P2_MEMBAR_PRIVE_SYNCORE) == 0) { + error = EPERM; + } else { + /* + * Calculating the IPI multicast mask from + * pmap active mask means that we do not call + * cpu_sync_core() on CPUs that were missed + * from pmap active mask but could be switched + * from or to meantime. This is fine at least + * on amd64 because threads always use slow + * (IRETQ) path to return from syscall after + * context switch. + */ + pmap_active_cpus(vmspace_pmap(p->p_vmspace), &cs); + + do_membarrier_ipi(&cs, + membarrier_action_seqcst_sync_core); + } + break; + + case MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE: + if ((p->p_flag2 & P2_MEMBAR_PRIVE_SYNCORE) == 0) { + PROC_LOCK(p); + p->p_flag2 |= P2_MEMBAR_PRIVE_SYNCORE; + PROC_UNLOCK(p); + } + break; + + default: + error = EINVAL; + break; + } + + return (error); +} + +int +sys_membarrier(struct thread *td, struct membarrier_args *uap) +{ + return (kern_membarrier(td, uap->cmd, uap->flags, uap->cpu_id)); +} diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 209c3c2fd6db..158ea7036d50 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3300,7 +3300,6 @@ 581 AUE_NULL STD|CAPENABLED { int sched_getcpu(void); } - 582 AUE_SWAPOFF STD { int swapoff( _In_z_ const char *name, @@ -3312,5 +3311,13 @@ u_int flags ); } +584 AUE_NULL STD|CAPENABLED { + int membarrier( + int cmd, + unsigned flags, + int cpu_id + ); + } + ; vim: syntax=off diff --git a/sys/sys/membarrier.h b/sys/sys/membarrier.h new file mode 100644 index 000000000000..958b769da23e --- /dev/null +++ b/sys/sys/membarrier.h @@ -0,0 +1,70 @@ +/*- + * Copyright (c) 2021 The FreeBSD Foundation + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are 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 __SYS_MEMBARRIER_H__ +#define __SYS_MEMBARRIER_H__ + +#include + +/* + * The enum membarrier_cmd values are bits. The MEMBARRIER_CMD_QUERY + * command returns a bitset indicating which commands are supported. + * Also the value of MEMBARRIER_CMD_QUERY is zero, so it is + * effectively not returned by the query. + */ +enum membarrier_cmd { + MEMBARRIER_CMD_QUERY = 0x00000000, + MEMBARRIER_CMD_GLOBAL = 0x00000001, + MEMBARRIER_CMD_SHARED = MEMBARRIER_CMD_GLOBAL, + MEMBARRIER_CMD_GLOBAL_EXPEDITED = 0x00000002, + MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED = 0x00000004, + MEMBARRIER_CMD_PRIVATE_EXPEDITED = 0x00000008, + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = 0x00000010, + MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE = 0x00000020, + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE = 0x00000040, + + /* + * RSEQ constants are defined for source compatibility but are + * not yes supported, MEMBARRIER_CMD_QUERY does not return + * them in the mask. + */ + MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ = 0x00000080, + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ = 0x00000100, +}; + +enum membarrier_cmd_flag { + MEMBARRIER_CMD_FLAG_CPU = 0x00000001, +}; + +#ifndef _KERNEL +__BEGIN_DECLS +int membarrier(int, unsigned, int); +__END_DECLS +#endif /* _KERNEL */ + +#endif /* __SYS_MEMBARRIER_H__ */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 05ab914af409..3102cae7add0 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -883,6 +883,12 @@ struct proc { external thread_single() is permitted */ #define P2_REAPKILLED 0x00080000 +#define P2_MEMBAR_PRIVE 0x00100000 /* membar private expedited + registered */ +#define P2_MEMBAR_PRIVE_SYNCORE 0x00200000 /* membar private expedited + sync core registered */ +#define P2_MEMBAR_GLOBE 0x00400000 /* membar global expedited + registered */ /* Flags protected by proctree_lock, kept in p_treeflags. */ #define P_TREE_ORPHANED 0x00000001 /* Reparented, on orphan list */ diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 62cda6d03fd4..8be860dc0fd4 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -204,6 +204,8 @@ int kern_minherit(struct thread *td, uintptr_t addr, size_t len, int inherit); int kern_mkdirat(struct thread *td, int fd, const char *path, enum uio_seg segflg, int mode); +int kern_membarrier(struct thread *td, int cmd, unsigned flags, + int cpu_id); int kern_mkfifoat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, int mode); int kern_mknodat(struct thread *td, int fd, const char *path, From nobody Wed Aug 23 00:07: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 4RVmkM4rgFz4qfbl; Wed, 23 Aug 2023 00:07: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 4RVmkM3LYyz4ZmH; Wed, 23 Aug 2023 00:07:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692749259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5CpDiHeloqWz8x31Cyxn//pNWPGcMW9hLVnjJzqN4r8=; b=HP5S7ep2vafdGONhNR7gYe2lSCjpTVqB0lyxhxD/X2fSNj7P2hlQktdHTHmL9w5T1n3F96 ovGOkTZhCwUBrI88UjF7IMgfUQo9n8dyJbTKGb8NpJ2MDZIVjsH94SHTKYnQlqqx/QoN4R nPcV6dirmifs40AaCNVYQCg/Y9MtgBaNp/E42T+jsipUcVfPY4N/EcpO+0t6kY1/ZNliz4 xQUqDwSKGB4GwAi/5aMVWIqb52liEnPk+BwyDf0yA4vD5Gee4KSwwd/JU0flr5T5HsO0I+ TnlsMxnk+o6DdlM3pNmMBSL7LIUewfoNwMHYdBP6HdGFoqEGcdtGGHx0A93qAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692749259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5CpDiHeloqWz8x31Cyxn//pNWPGcMW9hLVnjJzqN4r8=; b=VEh3wc26H5aJ7NXZsPZyWr1ZMcCP+YQHHPy4VX9m1jQYnajXqF13f9PBs3aogZrshK8QJe VnNCHBF4dGTd1j1HoeG5c47GBrA4oUWQOCo+lF1ULwuwvbt276pLAxOICYa8w+LSuQ/l+B V0zredizgESURnqDRrg8g13ZCV2/Lh2EDLaD3/uFTyaaR0dVLn0n4QoBZ3E9GmjvvvmJgg Dzr/oVltYeV6WgPs5jjtLlWsFW93UB1xCaCqXCbX+U5g6+yNhYPLMRNkNEmBr/aoyGSvSv /IJn9K8VcMB3WW8wICLVmdz/mkACKGgReWdwe9CsKl/tY5rGr7GEuQV6KVMZ1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692749259; a=rsa-sha256; cv=none; b=rcuGW46+5qufJCavSV+fMiXn++Q61AKr5bzooo0BkhFVzG5YA5eWG41uqJotwAq9n7T4um 1JdR53JjqjyJ0tsg+VH9DoNDmejzLh8fYh47Mqz0hkMcgowbwUOtEqzdYhFJP2I8e/GXjU unVZSnOobxSEsM/CTAZJNlEuIxvNax1kpUauIKjmHAar1/q9+1nbgqdRcIjb0nxfn0GZBk W70AJTYTcgcvPdhsCrhC3RgozENrEUb2j/Ob998c1D5YI1mv/LcuqlNG/B+BD0d0k1JNs8 nBPmYatViA2ydkskpOT1oSEdx9LXiTynYwLJ80NPKROXiK9btrryDma3F7gMfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVmkM2RcKz8hP; Wed, 23 Aug 2023 00:07:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37N07dY6082939; Wed, 23 Aug 2023 00:07:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37N07dIw082936; Wed, 23 Aug 2023 00:07:39 GMT (envelope-from git) Date: Wed, 23 Aug 2023 00:07:39 GMT Message-Id: <202308230007.37N07dIw082936@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: c7df87209634 - 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: c7df87209634129df476049c2f38cd4ebefa386f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c7df87209634129df476049c2f38cd4ebefa386f commit c7df87209634129df476049c2f38cd4ebefa386f Author: Konstantin Belousov AuthorDate: 2023-08-22 15:53:35 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-23 00:02:21 +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 | 30 ++++++++++++++++++++++++++ sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 30 ++++++++++++++++++++++++++ sys/sys/syscall.h | 3 ++- sys/sys/syscall.mk | 3 ++- sys/sys/sysproto.h | 7 ++++++ 10 files changed, 77 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 7b282257d2a0..c3d8617abf4b 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -501,4 +501,5 @@ #define FREEBSD32_SYS_sched_getcpu 581 #define FREEBSD32_SYS_swapoff 582 #define FREEBSD32_SYS_kqueuex 583 -#define FREEBSD32_SYS_MAXSYSCALL 584 +#define FREEBSD32_SYS_membarrier 584 +#define FREEBSD32_SYS_MAXSYSCALL 585 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 36bfc0c8e847..19d454743c55 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -589,4 +589,5 @@ const char *freebsd32_syscallnames[] = { "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ "kqueuex", /* 583 = kqueuex */ + "membarrier", /* 584 = membarrier */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 3ec8bce6986b..971f06a643c5 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 = 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(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ + { .sy_narg = AS(membarrier_args), .sy_call = (sy_call_t *)sys_membarrier, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 584 = membarrier */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 01288c111644..5dfc82c30b7b 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3327,6 +3327,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 1; break; } + /* membarrier */ + case 584: { + struct membarrier_args *p = params; + iarg[a++] = p->cmd; /* int */ + uarg[a++] = p->flags; /* unsigned */ + iarg[a++] = p->cpu_id; /* int */ + *n_args = 3; + break; + } default: *n_args = 0; break; @@ -8980,6 +8989,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* membarrier */ + case 584: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "unsigned"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -10843,6 +10868,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* membarrier */ + case 584: + 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 c175a43d19cb..1e62c46b8be0 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -644,4 +644,5 @@ struct sysent sysent[] = { { .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(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ + { .sy_narg = AS(membarrier_args), .sy_call = (sy_call_t *)sys_membarrier, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 584 = membarrier */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index aafb1f26bd0b..bfbc51e0903d 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -589,4 +589,5 @@ const char *syscallnames[] = { "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ "kqueuex", /* 583 = kqueuex */ + "membarrier", /* 584 = membarrier */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 594636c585db..d023391aa7a7 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3423,6 +3423,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 1; break; } + /* membarrier */ + case 584: { + struct membarrier_args *p = params; + iarg[a++] = p->cmd; /* int */ + uarg[a++] = p->flags; /* unsigned */ + iarg[a++] = p->cpu_id; /* int */ + *n_args = 3; + break; + } default: *n_args = 0; break; @@ -9150,6 +9159,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* membarrier */ + case 584: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "unsigned"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -11108,6 +11133,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* membarrier */ + case 584: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 96e525f99a86..1af14eecec73 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -520,4 +520,5 @@ #define SYS_sched_getcpu 581 #define SYS_swapoff 582 #define SYS_kqueuex 583 -#define SYS_MAXSYSCALL 584 +#define SYS_membarrier 584 +#define SYS_MAXSYSCALL 585 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 88a004a98332..4337ccb32a0c 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -425,4 +425,5 @@ MIASM = \ fspacectl.o \ sched_getcpu.o \ swapoff.o \ - kqueuex.o + kqueuex.o \ + membarrier.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 46bd4970e04d..9e1ea67730e3 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1857,6 +1857,11 @@ struct swapoff_args { struct kqueuex_args { char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; }; +struct membarrier_args { + char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; + char flags_l_[PADL_(unsigned)]; unsigned flags; char flags_r_[PADR_(unsigned)]; + char cpu_id_l_[PADL_(int)]; int cpu_id; char cpu_id_r_[PADR_(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 *); @@ -2253,6 +2258,7 @@ 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_kqueuex(struct thread *, struct kqueuex_args *); +int sys_membarrier(struct thread *, struct membarrier_args *); #ifdef COMPAT_43 @@ -3223,6 +3229,7 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #define SYS_AUE_sched_getcpu AUE_NULL #define SYS_AUE_swapoff AUE_SWAPOFF #define SYS_AUE_kqueuex AUE_KQUEUE +#define SYS_AUE_membarrier AUE_NULL #undef PAD_ #undef PADL_ From nobody Wed Aug 23 00:26: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 4RVn8p5Sw8z4qgxw for ; Wed, 23 Aug 2023 00:27:06 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RVn8p1jySz4fDm for ; Wed, 23 Aug 2023 00:27:06 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-99c0290f0a8so640281466b.1 for ; Tue, 22 Aug 2023 17:27:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692750424; x=1693355224; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=CTYViZgAAcQhFBg8riPyx/UjVWzp+kRb4o5TeXlQsLA=; b=m7z5Hlu0LC9MTP1gdJcz7h46Nl9fpYqlfS7E+N4I5lxrGs3/ECWhToJ0Ia9/VU/iW5 9rVKIqrORYMsRvSy8IByj5vcSeIOnUFm0jq5qMfZXWBxqoQ4SAcXV87Gc5WFMC3QKkPF uM6yus6/nUtiTxiO5fEZMb3nPycbVjVAd9pabX5qvJ+GNyvjDLlR4xunqMXYNnKndXor 8igaES8dHdvYVdA/FFXY+8IdQSCu0iI4cV1wXmbl5vgkK4GMX7Vc6XYaRwXmJYUJuyOo 5MK3rupM5gn64YWN4CCR8m0femdk1b6zIOfJG4IDN3GIc/R5Rb+0r2VZ8vMOmUUbFMX8 v7XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692750424; x=1693355224; 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=CTYViZgAAcQhFBg8riPyx/UjVWzp+kRb4o5TeXlQsLA=; b=H54O8nvIhvNXjJQcRAhgGXrkmDkJOvk/YCnrJEya6la/24D2J426BiHlSKZe2URKiy uhTPZllN/GDwDPqwJdbbNePWrR/A46V/60uQ7VjeznVieaOqZNg+vl4y/s/AEIShXYP1 4ex2WsFJ+9N27wD87zejys8K/wDU2ePlSE/5/uwKf+tmFonxlE+ScH9sBK9hl5SVLuk+ x0cgvS2c+odaHVsxk3rZA6Yjsv0W7kkeI6rdYsPbaEF8qBMs4fy1No1ZtFMOVnKIQbEA m15cVbza0NciNCYkPJmQC2YKtI3LSeW1aYQ9Zq1NkgeJSTnmMevJvOVrs8LZ9pSOfSi7 qWZQ== X-Gm-Message-State: AOJu0Yx1fz9mvBcHQtdkxpimdB/zt9yJydamlNIr1dmQeRXGTzgGCaKc 72c0L7u5ZyLeL2dStRtZrrOIf4Awz91F4p6VWFdvJg== X-Google-Smtp-Source: AGHT+IGD+xC5FUQR0aTxwMPv6c6iNhhZAJSRChTgz5eHUlKLIvCtloN/M7ERaK959zWo4PmDKX/Ep3jjhb8mQSCpmCk= X-Received: by 2002:a17:906:31c1:b0:993:ffcb:ad4e with SMTP id f1-20020a17090631c100b00993ffcbad4emr8408132ejf.13.1692750424012; Tue, 22 Aug 2023 17:27:04 -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: <202211042255.2A4MtqVv032693@gitrepo.freebsd.org> <419530F4-DB8F-46EA-BF45-C130BCF8A3DE@FreeBSD.org> <05979953-C089-4D56-99E3-BBBF066FE277@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Tue, 22 Aug 2023 18:26:52 -0600 Message-ID: Subject: Re: git: 91fcacc35597 - main - if_bnxt: Add support for VLAN on Thor To: Kevin Bowling Cc: Kristof Provost , Sumit Saxena , Warner Losh , "" , "" , src-committers Content-Type: multipart/alternative; boundary="000000000000b795f806038c2b3e" X-Rspamd-Queue-Id: 4RVn8p1jySz4fDm X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --000000000000b795f806038c2b3e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Aug 22, 2023, 5:59 PM Kevin Bowling wrote: > On Tue, Aug 22, 2023 at 3:39=E2=80=AFPM Kevin Bowling > wrote: > > > > > > > > On Tue, Aug 22, 2023 at 2:07 PM Kristof Provost wrote: > >> > >> On 27 Jun 2023, at 11:17, Kristof Provost wrote: > >> > >> On 4 Nov 2022, at 23:55, Warner Losh wrote: > >> > >> The branch main has been updated by imp: > >> > >> URL: > https://cgit.FreeBSD.org/src/commit/?id=3D91fcacc355971f74aa26fc7861020dc= 3a2a2d717 > >> > >> commit 91fcacc355971f74aa26fc7861020dc3a2a2d717 > >> Author: Sumit Saxena > >> AuthorDate: 2022-11-04 22:24:32 +0000 > >> Commit: Warner Losh > >> CommitDate: 2022-11-04 22:24:32 +0000 > >> > >> if_bnxt: Add support for VLAN on Thor > >> > >> Reviewed by: imp > >> Differential Revision: https://reviews.freebsd.org/D36443 > >> --- > >> sys/dev/bnxt/bnxt.h | 3 +- > >> sys/dev/bnxt/bnxt_hwrm.c | 110 > ++++++++++++++++++++++++++++------------------- > >> sys/dev/bnxt/bnxt_hwrm.h | 7 ++- > >> sys/dev/bnxt/if_bnxt.c | 7 ++- > >> 4 files changed, 74 insertions(+), 53 deletions(-) > >> > >> This commit appears to have broken vlan on these interfaces. > >> My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet, (in > a Dell T640, if that helps). > >> > >> A simple vlan creation on top of one: > >> ifconfig vlan create > >> ifconfig vlan0 vlan 201 vlandev bnxt0 > >> > >> Results in a loss of connectivity. The kernel logs this, which I assum= e > is related: > >> > >> `bnxt0: HWRM_CFA_L2_FILTER_ALLOC command returned INVALID_PARAMS error= .` > >> > >> After reverting this (and 72e9dbb58cad5262190cf2eae47f764021072128) I > can create vlan interfaces on top of bnxt0 without losing connectivity. > >> > >> > >> Should we revert this before 14.0? > >> > >> There=E2=80=99s also a report of what I think is the same issue in > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D269133 > >> > >> There=E2=80=99s a proposed patch there, but it did not work for me. > > > > > > In markj=E2=80=99s analysis he mentions the issue of the reinit. > > > > It sounds like there are multiple bugs in this driver but one quick ban= d > aid may be to mark the driver as not needing re-init for VLAN > modifications.. that sounds unlikely and was probably an accident when th= e > if reset functionality was added. You can check e1000 for that. > > Here's what I mean as a patch https://reviews.freebsd.org/D41558 > > > Note I don=E2=80=99t have this hw and haven=E2=80=99t audited the code = so this could be > noise but it=E2=80=99s an easy thing to check. > Is there a good bug we can post that link to for someone to test? Warner > > > >> Best regards, > >> Kristof > --000000000000b795f806038c2b3e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Tue, Aug 22, 2023, 5:59 PM Kevin Bowling <kevin.bowling@kev009.com> wrot= e:
On Tue, Aug 22, 2023 at 3:39=E2= =80=AFPM Kevin Bowling <kevin.bowling@kev009.com> wrote: >
>
>
> On Tue, Aug 22, 2023 at 2:07 PM Kristof Provost <kp@freebsd.org>= wrote:
>>
>> On 27 Jun 2023, at 11:17, Kristof Provost wrote:
>>
>> On 4 Nov 2022, at 23:55, Warner Losh wrote:
>>
>> The branch main has been updated by imp:
>>
>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D91fcacc355971f74aa26fc7861= 020dc3a2a2d717
>>
>> commit 91fcacc355971f74aa26fc7861020dc3a2a2d717
>> Author: Sumit Saxena <sumit.saxena@broadcom.com><= br> >> AuthorDate: 2022-11-04 22:24:32 +0000
>> Commit: Warner Losh <imp@FreeBSD.org>
>> CommitDate: 2022-11-04 22:24:32 +0000
>>
>> if_bnxt: Add support for VLAN on Thor
>>
>> Reviewed by: imp
>> Differential Revision: https://reviews.freebsd= .org/D36443
>> ---
>> sys/dev/bnxt/bnxt.h | 3 +-
>> sys/dev/bnxt/bnxt_hwrm.c | 110 ++++++++++++++++++++++++++++-------= ------------
>> sys/dev/bnxt/bnxt_hwrm.h | 7 ++-
>> sys/dev/bnxt/if_bnxt.c | 7 ++-
>> 4 files changed, 74 insertions(+), 53 deletions(-)
>>
>> This commit appears to have broken vlan on these interfaces.
>> My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet,= (in a Dell T640, if that helps).
>>
>> A simple vlan creation on top of one:
>> ifconfig vlan create
>> ifconfig vlan0 vlan 201 vlandev bnxt0
>>
>> Results in a loss of connectivity. The kernel logs this, which I a= ssume is related:
>>
>> `bnxt0: HWRM_CFA_L2_FILTER_ALLOC command returned INVALID_PARAMS e= rror.`
>>
>> After reverting this (and 72e9dbb58cad5262190cf2eae47f764021072128= ) I can create vlan interfaces on top of bnxt0 without losing connectivity.=
>>
>>
>> Should we revert this before 14.0?
>>
>> There=E2=80=99s also a report of what I think is the same issue in= https://bugs.freebsd.org/bugzi= lla/show_bug.cgi?id=3D269133
>>
>> There=E2=80=99s a proposed patch there, but it did not work for me= .
>
>
> In markj=E2=80=99s analysis he mentions the issue of the reinit.
>
> It sounds like there are multiple bugs in this driver but one quick ba= nd aid may be to mark the driver as not needing re-init for VLAN modificati= ons.. that sounds unlikely and was probably an accident when the if reset f= unctionality was added.=C2=A0 You can check e1000 for that.

Here's what I mean as a patch https://reviews.freeb= sd.org/D41558

> Note I don=E2=80=99t have this hw and haven=E2=80=99t audited the code= so this could be noise but it=E2=80=99s an easy thing to check.

Is there a = good bug we can post that link to for someone to test?

Warner
>
>> Best regards,
>> Kristof
--000000000000b795f806038c2b3e-- From nobody Wed Aug 23 00:31: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 4RVnFw1xSqz4qgtS for ; Wed, 23 Aug 2023 00:31:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) (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 4RVnFv3PMbz4gHk for ; Wed, 23 Aug 2023 00:31:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20221208.gappssmtp.com header.s=20221208 header.b=RspwnWl+; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::630) smtp.mailfrom=wlosh@bsdimp.com; dmarc=none Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-986d8332f50so674896066b.0 for ; Tue, 22 Aug 2023 17:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692750690; x=1693355490; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=H3nSdXldIUTriMy0CFD7SCxAbR+Qk9QNvkiqdLha/E0=; b=RspwnWl+l1bxLHwCNWqT2w/LANeZqn7AeJwYelAvGninCb7517/RMt/n1Z6dxjJ2kX 7gZewSvZ8nWO/W9MEGrWRM+xipDre3w/LxNT2CwjvALjVVMq9qZUARkd3xA/6tSKeDoC DLfzbQ/PsAHs9/I1d+xzkNLSUtD8a7b3Yn//FSJlg1BkXwmzdioiDR0o59AXthw+kr8b jz5i0mkiCKo1X82/34hdhcOFt0nxmrAzGdA/bTs6G+AnxxilArC3t9BY0K2CCmy9BU0J kdGvSAxYobEaqgu2psCN+04X5iuMvbfeyS5cmmWOngk5OXKwLiz5rk+Zg7lQW6KIoCWt YdQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692750690; x=1693355490; 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=H3nSdXldIUTriMy0CFD7SCxAbR+Qk9QNvkiqdLha/E0=; b=htEujZDfPxV/kh7w14ggLaCq5ypIQX5eooPlejVyPQKY7T1INyz0Tl5dueucJNUqz0 PTKSJrwgeWqcn+msHD3rOqoXG9dEay/jwOCdmR/0ZWGOT0/brnqXNmGyVn4/g3QK9mtz QdFzt/osvShjjjFr/YvY+G5M7P4sKpchrAAsevFyMS1BftzRe9dvAgbVfbbb6kenR/a+ 1vfM8ZBQPL+vLL84/Rsu+N/N/LuyEVSVPtdMQF7dxbaT+SibGr+HXPIL9D17PCr8gyAf o6GYS0G58bJzhHiQ4htfQfewX2ZtzwLgvTX76PxmUUuBoN4GuCCDzbBMXaFUiSzjqK4/ 92fQ== X-Gm-Message-State: AOJu0Yxd4kfyMjSDfF2XVjWE5mfs29f2PggRzp6WVTObkE+x2T0sonzA XyiZmaSQRk2S1mzfheR/fud7gAzjNFt5jjfJkZR1tA== X-Google-Smtp-Source: AGHT+IEcKwAOm/FMM3QAd5DmgsTj5Ix9Po7gy++csKlfOHoHLZqYgSoXyiR6qAAStfhGpDcWFcrQ4JR79XVMVavyPjI= X-Received: by 2002:a17:906:28d:b0:99c:3b4:940f with SMTP id 13-20020a170906028d00b0099c03b4940fmr9528571ejf.27.1692750690209; Tue, 22 Aug 2023 17:31: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: <202211042255.2A4MtqVv032693@gitrepo.freebsd.org> <419530F4-DB8F-46EA-BF45-C130BCF8A3DE@FreeBSD.org> <05979953-C089-4D56-99E3-BBBF066FE277@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Tue, 22 Aug 2023 18:31:19 -0600 Message-ID: Subject: Re: git: 91fcacc35597 - main - if_bnxt: Add support for VLAN on Thor To: Kevin Bowling Cc: Kristof Provost , Sumit Saxena , Warner Losh , "" , "" , src-committers Content-Type: multipart/alternative; boundary="0000000000009562ad06038c3b84" X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20221208.gappssmtp.com:s=20221208]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::630:from]; DKIM_TRACE(0.00)[bsdimp-com.20221208.gappssmtp.com:+]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; DMARC_NA(0.00)[bsdimp.com]; TO_DN_ALL(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4RVnFv3PMbz4gHk --0000000000009562ad06038c3b84 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Aug 22, 2023, 6:26 PM Warner Losh wrote: > > > On Tue, Aug 22, 2023, 5:59 PM Kevin Bowling > wrote: > >> On Tue, Aug 22, 2023 at 3:39=E2=80=AFPM Kevin Bowling >> wrote: >> > >> > >> > >> > On Tue, Aug 22, 2023 at 2:07 PM Kristof Provost wrote= : >> >> >> >> On 27 Jun 2023, at 11:17, Kristof Provost wrote: >> >> >> >> On 4 Nov 2022, at 23:55, Warner Losh wrote: >> >> >> >> The branch main has been updated by imp: >> >> >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D91fcacc355971f74aa26fc7861020d= c3a2a2d717 >> >> >> >> commit 91fcacc355971f74aa26fc7861020dc3a2a2d717 >> >> Author: Sumit Saxena >> >> AuthorDate: 2022-11-04 22:24:32 +0000 >> >> Commit: Warner Losh >> >> CommitDate: 2022-11-04 22:24:32 +0000 >> >> >> >> if_bnxt: Add support for VLAN on Thor >> >> >> >> Reviewed by: imp >> >> Differential Revision: https://reviews.freebsd.org/D36443 >> >> --- >> >> sys/dev/bnxt/bnxt.h | 3 +- >> >> sys/dev/bnxt/bnxt_hwrm.c | 110 >> ++++++++++++++++++++++++++++------------------- >> >> sys/dev/bnxt/bnxt_hwrm.h | 7 ++- >> >> sys/dev/bnxt/if_bnxt.c | 7 ++- >> >> 4 files changed, 74 insertions(+), 53 deletions(-) >> >> >> >> This commit appears to have broken vlan on these interfaces. >> >> My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet, (i= n >> a Dell T640, if that helps). >> >> >> >> A simple vlan creation on top of one: >> >> ifconfig vlan create >> >> ifconfig vlan0 vlan 201 vlandev bnxt0 >> >> >> >> Results in a loss of connectivity. The kernel logs this, which I >> assume is related: >> >> >> >> `bnxt0: HWRM_CFA_L2_FILTER_ALLOC command returned INVALID_PARAMS >> error.` >> >> >> >> After reverting this (and 72e9dbb58cad5262190cf2eae47f764021072128) I >> can create vlan interfaces on top of bnxt0 without losing connectivity. >> >> >> >> >> >> Should we revert this before 14.0? >> >> >> >> There=E2=80=99s also a report of what I think is the same issue in >> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D269133 >> >> >> >> There=E2=80=99s a proposed patch there, but it did not work for me. >> > >> > >> > In markj=E2=80=99s analysis he mentions the issue of the reinit. >> > >> > It sounds like there are multiple bugs in this driver but one quick >> band aid may be to mark the driver as not needing re-init for VLAN >> modifications.. that sounds unlikely and was probably an accident when t= he >> if reset functionality was added. You can check e1000 for that. >> >> Here's what I mean as a patch https://reviews.freebsd.org/D41558 >> >> > Note I don=E2=80=99t have this hw and haven=E2=80=99t audited the code= so this could be >> noise but it=E2=80=99s an easy thing to check. >> > > Is there a good bug we can post that link to for someone to test? > Duh.. posted to bug above and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D222680 Warner > Warner > >> > >> >> Best regards, >> >> Kristof >> > --0000000000009562ad06038c3b84 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Tue, Aug 22, 2023, 6:26 PM Warner Losh <imp@bsdimp.com> wrote:


On Tue, Aug 22, 2023, 5:59 PM Ke= vin Bowling <kevin.bowling@kev009.com> wrote:
On Tue, Aug 22, 2023 at 3:39=E2=80=AFPM Kevin Bo= wling <kevin.bowling@kev009.com> wrote:
>
>
>
> On Tue, Aug 22, 2023 at 2:07 PM Kristof Provost <kp@freebsd.= org> wrote:
>>
>> On 27 Jun 2023, at 11:17, Kristof Provost wrote:
>>
>> On 4 Nov 2022, at 23:55, Warner Losh wrote:
>>
>> The branch main has been updated by imp:
>>
>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D91fcacc355971f7= 4aa26fc7861020dc3a2a2d717
>>
>> commit 91fcacc355971f74aa26fc7861020dc3a2a2d717
>> Author: Sumit Saxena <sumit.saxena@broadcom.c= om>
>> AuthorDate: 2022-11-04 22:24:32 +0000
>> Commit: Warner Losh <imp@FreeBSD.org>
>> CommitDate: 2022-11-04 22:24:32 +0000
>>
>> if_bnxt: Add support for VLAN on Thor
>>
>> Reviewed by: imp
>> Differential Revision: https://revi= ews.freebsd.org/D36443
>> ---
>> sys/dev/bnxt/bnxt.h | 3 +-
>> sys/dev/bnxt/bnxt_hwrm.c | 110 ++++++++++++++++++++++++++++-------= ------------
>> sys/dev/bnxt/bnxt_hwrm.h | 7 ++-
>> sys/dev/bnxt/if_bnxt.c | 7 ++-
>> 4 files changed, 74 insertions(+), 53 deletions(-)
>>
>> This commit appears to have broken vlan on these interfaces.
>> My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet,= (in a Dell T640, if that helps).
>>
>> A simple vlan creation on top of one:
>> ifconfig vlan create
>> ifconfig vlan0 vlan 201 vlandev bnxt0
>>
>> Results in a loss of connectivity. The kernel logs this, which I a= ssume is related:
>>
>> `bnxt0: HWRM_CFA_L2_FILTER_ALLOC command returned INVALID_PARAMS e= rror.`
>>
>> After reverting this (and 72e9dbb58cad5262190cf2eae47f764021072128= ) I can create vlan interfaces on top of bnxt0 without losing connectivity.=
>>
>>
>> Should we revert this before 14.0?
>>
>> There=E2=80=99s also a report of what I think is the same issue in= https://bugs.freebs= d.org/bugzilla/show_bug.cgi?id=3D269133
>>
>> There=E2=80=99s a proposed patch there, but it did not work for me= .
>
>
> In markj=E2=80=99s analysis he mentions the issue of the reinit.
>
> It sounds like there are multiple bugs in this driver but one quick ba= nd aid may be to mark the driver as not needing re-init for VLAN modificati= ons.. that sounds unlikely and was probably an accident when the if reset f= unctionality was added.=C2=A0 You can check e1000 for that.

Here's what I mean as a patch https://re= views.freebsd.org/D41558

> Note I don=E2=80=99t have this hw and haven=E2=80=99t audited the code= so this could be noise but it=E2=80=99s an easy thing to check.

Is there a = good bug we can post that link to for someone to test?

Duh.. posted = to bug above and

= Warner


Warner
>
>> Best regards,
>> Kristof
--0000000000009562ad06038c3b84-- From nobody Wed Aug 23 01:18: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 4RVpJ13fzcz4qkvq for ; Wed, 23 Aug 2023 01:18:25 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.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 4RVpJ11kZ1z3GGw for ; Wed, 23 Aug 2023 01:18:25 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-3fed6c2a5cfso43731365e9.3 for ; Tue, 22 Aug 2023 18:18:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692753503; x=1693358303; 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=orfvJmWr4h/2GrxqZlbpWPxqG/RlFVA6ld6PfpRkby4=; b=c6EXk2+EfDVcXLP7xfzS+W4QCPxZ+XQkZtr0A2I0uFEcjA2WoiEY8SidaeKWIfDTWM 9QLGQcc6fb3blrlHhQcL8VYzfWw/KbvhPgCc8KhKYufj/6xeudpeC5BU6V4GcuXss8yd hjLDPGq+vvlflA7yClo25JBsu7xA2LIz3F+i/mKIrI5OvzOzbnMmBzDoPglH58vNt7GE ZBSEhFH3P46S4u3RWLQUziNgpiLS4IbnKL8elOC3wMLo2l96bj6tw4EDCXUVaseNUBEX 3jk6xWTPCTftZ/DtcKVcvA8fChfNbxLfh/O2gNxSubpwPBfQH9FHcbzv375Wp6L3mu/Y VY4g== X-Gm-Message-State: AOJu0YxyBJawQFMdVU3HPZcTRkR1okEjZfgRA3QBYmq5Rjhip3kVYttm M+NKO5hQwHFzEFoTo8ZDgSiqcQ== X-Google-Smtp-Source: AGHT+IGnq/OfjQCLEWV2ZaacgXgED+L9Iasbh3ouK/44RLXlZcdrK03lBGPVpd4nK+v1CcMhkvv4Ng== X-Received: by 2002:a05:600c:ce:b0:3fe:f726:4a94 with SMTP id u14-20020a05600c00ce00b003fef7264a94mr3307108wmm.14.1692753503458; Tue, 22 Aug 2023 18:18:23 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id l13-20020a5d410d000000b003142e438e8csm17317217wrp.26.2023.08.22.18.18.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Aug 2023 18:18:23 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 4a69fc16a583 - main - Add membarrier(2) From: Jessica Clarke In-Reply-To: <202308230007.37N07cOK082906@gitrepo.freebsd.org> Date: Wed, 23 Aug 2023 02:18:12 +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: <748B7A01-5011-44EE-BB04-282AE96F9B5B@freebsd.org> References: <202308230007.37N07cOK082906@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RVpJ11kZ1z3GGw X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 23 Aug 2023, at 01:07, Konstantin Belousov wrote: >=20 > The branch main has been updated by kib: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D4a69fc16a583face922319c476f3e739= d9ce9140 >=20 > commit 4a69fc16a583face922319c476f3e739d9ce9140 > Author: Konstantin Belousov > AuthorDate: 2021-10-07 21:10:07 +0000 > Commit: Konstantin Belousov > CommitDate: 2023-08-23 00:02:21 +0000 >=20 > Add membarrier(2) >=20 > This is an attempt at clean-room implementation of the Linux' > membarrier(2) syscall. For documentation, you would need to read > both membarrier(2) Linux man page, the comments in Linux > kernel/sched/membarrier.c implementation and possibly look at > actual uses. >=20 > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D32360 > --- > ... > diff --git a/sys/sys/membarrier.h b/sys/sys/membarrier.h > new file mode 100644 > index 000000000000..958b769da23e > --- /dev/null > +++ b/sys/sys/membarrier.h > @@ -0,0 +1,70 @@ > +/*- > + * Copyright (c) 2021 The FreeBSD Foundation > + * > + * This software were developed by Konstantin Belousov = > + * under sponsorship from the FreeBSD Foundation. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are 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 __SYS_MEMBARRIER_H__ > +#define __SYS_MEMBARRIER_H__ > + > +#include > + > +/* > + * The enum membarrier_cmd values are bits. The MEMBARRIER_CMD_QUERY > + * command returns a bitset indicating which commands are supported. > + * Also the value of MEMBARRIER_CMD_QUERY is zero, so it is > + * effectively not returned by the query. > + */ > +enum membarrier_cmd { > + MEMBARRIER_CMD_QUERY =3D 0x00000000, > + MEMBARRIER_CMD_GLOBAL =3D 0x00000001, > + MEMBARRIER_CMD_SHARED =3D MEMBARRIER_CMD_GLOBAL, > + MEMBARRIER_CMD_GLOBAL_EXPEDITED =3D 0x00000002, > + MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED =3D 0x00000004, > + MEMBARRIER_CMD_PRIVATE_EXPEDITED =3D 0x00000008, > + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED =3D 0x00000010, > + MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE =3D 0x00000020, > + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE =3D 0x00000040, > + > + /* > + * RSEQ constants are defined for source compatibility but are > + * not yes supported, MEMBARRIER_CMD_QUERY does not return > + * them in the mask. > + */ > + MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ =3D 0x00000080, > + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ =3D 0x00000100, Or we could not define them. membarrier(2) came into Linux in 4.3, but these two are only since 5.10. Defining something we may or may not ever implement that code should have compatibility for anyway seems like a bad idea. Or should we provide all of the Linux UAPI to FreeBSD processes with ENOSYS stubs? Clearly not. So why is this special? IMO these should not be added unless we have an rseq implementation, which has itself received several objections on the review. I also don=E2=80=99t see why this is suddenly being landed now without = warning. There=E2=80=99s been no activity by you on the review since just over a = year ago. And landing new syscalls days before the 14 branch point doesn=E2=80=99= t seem like great practice to me... Jess From nobody Wed Aug 23 02:38: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 4RVr474mV5z4qpqJ; Wed, 23 Aug 2023 02:38:15 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RVr471nDMz3M7b; Wed, 23 Aug 2023 02:38: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 37N2c6PB064288 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 23 Aug 2023 05:38:10 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 37N2c6PB064288 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 37N2c6ME064287; Wed, 23 Aug 2023 05:38:06 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 23 Aug 2023 05:38:06 +0300 From: Konstantin Belousov To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 4a69fc16a583 - main - Add membarrier(2) Message-ID: References: <202308230007.37N07cOK082906@gitrepo.freebsd.org> <748B7A01-5011-44EE-BB04-282AE96F9B5B@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: <748B7A01-5011-44EE-BB04-282AE96F9B5B@freebsd.org> 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: 4RVr471nDMz3M7b X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] On Wed, Aug 23, 2023 at 02:18:12AM +0100, Jessica Clarke wrote: > On 23 Aug 2023, at 01:07, Konstantin Belousov wrote: > > > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=4a69fc16a583face922319c476f3e739d9ce9140 > > > > commit 4a69fc16a583face922319c476f3e739d9ce9140 > > Author: Konstantin Belousov > > AuthorDate: 2021-10-07 21:10:07 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2023-08-23 00:02:21 +0000 > > > > Add membarrier(2) > > > > This is an attempt at clean-room implementation of the Linux' > > membarrier(2) syscall. For documentation, you would need to read > > both membarrier(2) Linux man page, the comments in Linux > > kernel/sched/membarrier.c implementation and possibly look at > > actual uses. > > > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > Differential revision: https://reviews.freebsd.org/D32360 > > --- > > ... > > diff --git a/sys/sys/membarrier.h b/sys/sys/membarrier.h > > new file mode 100644 > > index 000000000000..958b769da23e > > --- /dev/null > > +++ b/sys/sys/membarrier.h > > @@ -0,0 +1,70 @@ > > +/*- > > + * Copyright (c) 2021 The FreeBSD Foundation > > + * > > + * This software were developed by Konstantin Belousov > > + * under sponsorship from the FreeBSD Foundation. > > + * > > + * Redistribution and use in source and binary forms, with or without > > + * modification, are permitted provided that the following conditions > > + * are 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 __SYS_MEMBARRIER_H__ > > +#define __SYS_MEMBARRIER_H__ > > + > > +#include > > + > > +/* > > + * The enum membarrier_cmd values are bits. The MEMBARRIER_CMD_QUERY > > + * command returns a bitset indicating which commands are supported. > > + * Also the value of MEMBARRIER_CMD_QUERY is zero, so it is > > + * effectively not returned by the query. > > + */ > > +enum membarrier_cmd { > > + MEMBARRIER_CMD_QUERY = 0x00000000, > > + MEMBARRIER_CMD_GLOBAL = 0x00000001, > > + MEMBARRIER_CMD_SHARED = MEMBARRIER_CMD_GLOBAL, > > + MEMBARRIER_CMD_GLOBAL_EXPEDITED = 0x00000002, > > + MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED = 0x00000004, > > + MEMBARRIER_CMD_PRIVATE_EXPEDITED = 0x00000008, > > + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = 0x00000010, > > + MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE = 0x00000020, > > + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE = 0x00000040, > > + > > + /* > > + * RSEQ constants are defined for source compatibility but are > > + * not yes supported, MEMBARRIER_CMD_QUERY does not return > > + * them in the mask. > > + */ > > + MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ = 0x00000080, > > + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ = 0x00000100, > > Or we could not define them. membarrier(2) came into Linux in 4.3, but > these two are only since 5.10. Defining something we may or may not > ever implement that code should have compatibility for anyway seems > like a bad idea. Or should we provide all of the Linux UAPI to FreeBSD > processes with ENOSYS stubs? Clearly not. So why is this special? IMO > these should not be added unless we have an rseq implementation, which > has itself received several objections on the review. The added _RSEQ bits behave according to the membarrier(2) specification, they are defined but not returned in the mask of supported operations. I found that have all of them defined makes compiling some program easier, AFAIR. > > I also don’t see why this is suddenly being landed now without warning. > There’s been no activity by you on the review since just over a year > ago. And landing new syscalls days before the 14 branch point doesn’t > seem like great practice to me... Would I know that reviewers did not act for a year, I committed the patch a year ago. The addition does not change any existing code path in the kernel. From nobody Wed Aug 23 03:41:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RVsSs2yNfz4qtG2; Wed, 23 Aug 2023 03:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RVsSs2FCwz3SS1; Wed, 23 Aug 2023 03:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692762077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gb6SOKTJ5kBPZKq/XMFiTz7iBeyAu3t+NBwFBgDZuNI=; b=GklkGuZhVlfXey533hhUMVZo7TCnD6Myma8/PGlAngQ9qfFHNJv8VL4ZKI9cBxDILg2h+3 FlBRMaCNn3FWuLvl7fyUILXVC65BBPwIWLbJPEhZo/fiP7mkntmz47Rh9b/O2USVp6lifv mF3D1isnRMvzvNckLEkaGqCP6r/R9IMpwjANkQLpNdR9cnKcXc3K8XzA22YJidhMTHzXRz XchZ3FUvoM1QlnM5nDQ9mxX9xuwsAr3ZT4/+79O8Elr11Rn3CDjHxQeoSXlHCNP8k0r6Rx FSDylDTWN0MdB2W38j72YxCqu1u9l3QTX7DcOZD8hewQvMFIPl44F13YB8TrWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692762077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gb6SOKTJ5kBPZKq/XMFiTz7iBeyAu3t+NBwFBgDZuNI=; b=ZYMtgjchqQDgygpI5wNyJVnQtTiV2+toJ4/T9Fh2bs0469G5H6OcP+7sjelaw/p9kkNMws Dk7l6sZc0i7sMW8pIFox5GKMRf7tBhzQEY96xzyBi4GHIUbsYdFrJ114g7aDay6OIskGXe TyXhwk96q/1ciU1GwiLYsumdPF8Z5a9MKrqoAF3D2VIofH6z0wlay7D6Nc5DJ7ZLewHQlP RguVNUyCMvg/p97bwfWlF2hHFLdd6NlLLAjSVDXVYtxmkaE6iODlE+DE0/imSvQ3JG9dsl Dyp1VX7SdsgBgkvHc81PDACSAQC7iBit1jGZu/PSJG+2nKx0bZhGeX9hjwBLfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692762077; a=rsa-sha256; cv=none; b=oa1c7/9ehNl4QZ/YBch8J24b4H7e0YRnkPeZULG9IuHeW+8BGukGirm/eLzvta39pvu1i5 MNPmg7zf+FwznWf0iTRcdJLr1Lazl73Dsa3qZ9S+VV3tajMghA7bTmvhLko7+DIdmxoJPO aDot02o3xNp19blpikiZ4/96naIAR5E+nyYBzouGYiCIBZCjLcW2SVpiV/6XYZqxDo7qZR zvW0PqEa1vnM67dRbDou2PQx/cuALa0vu0IVaxP+iTlmNSmuQem7UL4YwJnzilOL3C7T3f g8ZlpLu+OMxRnQoks8ioMhuHmKEiWq3ZS8QLzptJ3Y9LkJgF5/tJKRC9YYi/qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVsSs10RtzVXZ; Wed, 23 Aug 2023 03:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37N3fHYG041096; Wed, 23 Aug 2023 03:41:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37N3fHOO041093; Wed, 23 Aug 2023 03:41:17 GMT (envelope-from git) Date: Wed, 23 Aug 2023 03:41:17 GMT Message-Id: <202308230341.37N3fHOO041093@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: e2030ca246a7 - main - libc: fix c*rtomb/mbrtoc* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e2030ca246a777c50a7aacb3a35f88addded21cf Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e2030ca246a777c50a7aacb3a35f88addded21cf commit e2030ca246a777c50a7aacb3a35f88addded21cf Author: Kyle Evans AuthorDate: 2023-08-23 03:40:45 +0000 Commit: Kyle Evans CommitDate: 2023-08-23 03:40:45 +0000 libc: fix c*rtomb/mbrtoc* In 693f88c9da8d ("iconv_std: complete the //IGNORE support"), we more completely implemented //IGNORE, which changed the semantics of ci_discard_ilseq. DISCARD_ILSEQ semantics are supposed to match //IGNORE, so we really can't do much about that particular incompatibility. This broke c*rtomb and mbrtoc* handling of invalid sequences, but it turns out they don't want DISCARD_ILSEQ semantics at all; they really want the subset that we call _CITRUS_ICONV_F_HIDE_INVALID. This restores the exact flow in iconv_std to precisely how it happened prior to 693f88c9da8d. PR: 265871 Fixes: 693f88c9da8d ("iconv_std: complete the //IGNORE support") Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D41513 --- lib/libc/locale/cXXrtomb_iconv.h | 4 ++-- lib/libc/locale/mbrtocXX_iconv.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/locale/cXXrtomb_iconv.h b/lib/libc/locale/cXXrtomb_iconv.h index cf171a49d439..8f123e85c66d 100644 --- a/lib/libc/locale/cXXrtomb_iconv.h +++ b/lib/libc/locale/cXXrtomb_iconv.h @@ -75,7 +75,7 @@ cXXrtomb_l(char * __restrict s, charXX_t c, mbstate_t * __restrict ps, errno = EINVAL; return (-1); } - handle->cv_shared->ci_discard_ilseq = true; + handle->cv_shared->ci_discard_ilseq = false; handle->cv_shared->ci_hooks = NULL; cs->srcbuf_len = 0; cs->initialized = true; @@ -92,7 +92,7 @@ cXXrtomb_l(char * __restrict s, charXX_t c, mbstate_t * __restrict ps, dst = s; dstleft = MB_CUR_MAX_L(locale); err = _citrus_iconv_convert(handle, &src, &srcleft, &dst, &dstleft, - 0, &invlen); + _CITRUS_ICONV_F_HIDE_INVALID, &invlen); /* Character is part of a surrogate pair. We need more input. */ if (err == EINVAL) diff --git a/lib/libc/locale/mbrtocXX_iconv.h b/lib/libc/locale/mbrtocXX_iconv.h index 148ba55e548a..22b8a7d4031c 100644 --- a/lib/libc/locale/mbrtocXX_iconv.h +++ b/lib/libc/locale/mbrtocXX_iconv.h @@ -78,7 +78,7 @@ mbrtocXX_l(charXX_t * __restrict pc, const char * __restrict s, size_t n, errno = EINVAL; return (-1); } - handle->cv_shared->ci_discard_ilseq = true; + handle->cv_shared->ci_discard_ilseq = false; handle->cv_shared->ci_hooks = NULL; cs->srcbuf_len = cs->dstbuf_len = 0; cs->initialized = true; @@ -110,7 +110,7 @@ mbrtocXX_l(charXX_t * __restrict pc, const char * __restrict s, size_t n, assert(srcleft <= sizeof(cs->srcbuf) && dstleft <= sizeof(cs->dstbuf.bytes)); err = _citrus_iconv_convert(handle, &src, &srcleft, - &dst, &dstleft, 0, &invlen); + &dst, &dstleft, _CITRUS_ICONV_F_HIDE_INVALID, &invlen); cs->dstbuf_len = (dst - cs->dstbuf.bytes) / sizeof(charXX_t); /* Got new character(s). Return the first. */ From nobody Wed Aug 23 03:41: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 4RVsSt3qZtz4qtJh; Wed, 23 Aug 2023 03:41: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 4RVsSt3K2Pz3SSM; Wed, 23 Aug 2023 03:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692762078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6D4vLJK4hYmu0thxii35zPOUXRSh8KxzXeVLhersLxg=; b=wmk8HP2N/H7wuAf7lD+D71wJdUL3MKUgrqHyfkeTQW175Bvw9mQ82rq3kgnBciePY4Jvsq HMSKlJBUEfm9F8zMR6oBTcOqQ/3Kv2Ns9Y2e9e27tWC/9WRenTYqFEwC85KarBtg4haL1t bNStO11I7+a3NnpFpfg9Of1MSXg8yUG6sNwLss0rfYsIFLAF8mkvsRTwbyj9/Rq0nnQUZH eAeYtCiDQ+tl9s2dCICAJrNEgS6KpGPfMpjM6IiBGZSqXoeoD1Yp6Dq9XjRo+DVEgPDOYz CSbVCMnXqR7fgI09GwA9uhOvKN/QfH5BL3S2ryMDXMtj5gWC2u3dgA3yb9DeAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692762078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6D4vLJK4hYmu0thxii35zPOUXRSh8KxzXeVLhersLxg=; b=IFVdeu4KHr+3JLZWEuC7CQRAroUMEao5C7jSqzT7fxgbyYY9HB2vT1d6ZWimbVaszwZrtZ SqufnQRG9mYJqARd+sqjDlPPvJ8rbYrmLI804Yu9xR+jAh8tgrD8PLh6Ylhn4+F+O1KY4M kw2dsZcHEYHFPewicvkeXt4jClODIhyxFOH5A86KnlSV/GLMeMwWr5gVvbh0/zofcP2mGm kUhFFPn14E6KP+rqWuYOxgc4hXtIw33DBUqUPeowXhumWEK6WtuwMF4dz+RDbwK+YZf/YW EJvyYv6+0JttEtZdUUqrP5gUhoWFitvsT57EFKarsvOw3Q1COJMaXNiUZDGk5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692762078; a=rsa-sha256; cv=none; b=msilODM8oiUSPt+cOrd2gPRHcPyivxuENMyWVT6dxQZYUb593FAGZISnSTNE1S57DLcPpg 8ox6s/aZh+9Zqgn2geV+eXmOaQKzslh3YfkOcvI6imMHqS4xSpID6p5voFaPWuBNi+/EPY KspwSrDr2gfdsZhdL7CNggoewvkKCM6D+hH/dIUbGh5okY3PnnYncY5YeZRsftq6sXIJK8 yGFIuywcuOMqEfiaUZbIAREweh05ETrYwEQWpE0otxDLgfVjJV4kDLpx4dCKlQHMojrRNa +LQX1cJu9t+KGUAp0BS/cBPCkgvL3Ry6dp6imXBU1fHxSa0HYhh1RsIwkx7imQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVsSt1kByzVXb; Wed, 23 Aug 2023 03:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37N3fIYU041144; Wed, 23 Aug 2023 03:41:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37N3fIe7041141; Wed, 23 Aug 2023 03:41:18 GMT (envelope-from git) Date: Wed, 23 Aug 2023 03:41:18 GMT Message-Id: <202308230341.37N3fIe7041141@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: 939199a2b5e8 - main - libc: iconv: zero out cv_shared on allocation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 939199a2b5e8b5c793b9481401e468d19fda65ec Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=939199a2b5e8b5c793b9481401e468d19fda65ec commit 939199a2b5e8b5c793b9481401e468d19fda65ec Author: Kyle Evans AuthorDate: 2023-08-23 03:40:45 +0000 Commit: Kyle Evans CommitDate: 2023-08-23 03:40:45 +0000 libc: iconv: zero out cv_shared on allocation Right now we have to zero-initialize most fields in the varius callers, but this is a little error prone. Simplify it by zeroing it out upon allocation instead, drop the other redundant initialization. Reviewed by: markj Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D41546 --- lib/libc/iconv/bsd_iconv.c | 2 -- lib/libc/iconv/citrus_iconv.c | 5 +---- lib/libc/locale/cXXrtomb_iconv.h | 2 -- lib/libc/locale/mbrtocXX_iconv.h | 2 -- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/libc/iconv/bsd_iconv.c b/lib/libc/iconv/bsd_iconv.c index 744af30212a1..fe2491d665dd 100644 --- a/lib/libc/iconv/bsd_iconv.c +++ b/lib/libc/iconv/bsd_iconv.c @@ -70,8 +70,6 @@ __bsd___iconv_open(const char *out, const char *in, struct _citrus_iconv *handle } handle->cv_shared->ci_discard_ilseq = strcasestr(out, "//IGNORE"); - handle->cv_shared->ci_ilseq_invalid = false; - handle->cv_shared->ci_hooks = NULL; return ((iconv_t)(void *)handle); } diff --git a/lib/libc/iconv/citrus_iconv.c b/lib/libc/iconv/citrus_iconv.c index ecb176c46063..a2ff7b5177c8 100644 --- a/lib/libc/iconv/citrus_iconv.c +++ b/lib/libc/iconv/citrus_iconv.c @@ -140,14 +140,11 @@ open_shared(struct _citrus_iconv_shared * __restrict * __restrict rci, /* initialize iconv handle */ len_convname = strlen(convname); - ci = malloc(sizeof(*ci) + len_convname + 1); + ci = calloc(1, sizeof(*ci) + len_convname + 1); if (!ci) { ret = errno; goto err; } - ci->ci_module = NULL; - ci->ci_ops = NULL; - ci->ci_closure = NULL; ci->ci_convname = (void *)&ci[1]; memcpy(ci->ci_convname, convname, len_convname + 1); diff --git a/lib/libc/locale/cXXrtomb_iconv.h b/lib/libc/locale/cXXrtomb_iconv.h index 8f123e85c66d..cca2c1f160d4 100644 --- a/lib/libc/locale/cXXrtomb_iconv.h +++ b/lib/libc/locale/cXXrtomb_iconv.h @@ -75,8 +75,6 @@ cXXrtomb_l(char * __restrict s, charXX_t c, mbstate_t * __restrict ps, errno = EINVAL; return (-1); } - handle->cv_shared->ci_discard_ilseq = false; - handle->cv_shared->ci_hooks = NULL; cs->srcbuf_len = 0; cs->initialized = true; if (s == NULL) diff --git a/lib/libc/locale/mbrtocXX_iconv.h b/lib/libc/locale/mbrtocXX_iconv.h index 22b8a7d4031c..c3c832149617 100644 --- a/lib/libc/locale/mbrtocXX_iconv.h +++ b/lib/libc/locale/mbrtocXX_iconv.h @@ -78,8 +78,6 @@ mbrtocXX_l(charXX_t * __restrict pc, const char * __restrict s, size_t n, errno = EINVAL; return (-1); } - handle->cv_shared->ci_discard_ilseq = false; - handle->cv_shared->ci_hooks = NULL; cs->srcbuf_len = cs->dstbuf_len = 0; cs->initialized = true; if (s == NULL) From nobody Wed Aug 23 05:37: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 4RVw2j0BNfz4r6V4 for ; Wed, 23 Aug 2023 05:37:17 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 4RVw2h5GNdz4JL8 for ; Wed, 23 Aug 2023 05:37:16 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-313e742a787so3178422f8f.1 for ; Tue, 22 Aug 2023 22:37:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692769034; x=1693373834; 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=xap7qbhY/6O4Od10d25qlcaj1ncny3uX87NmRkzwNAE=; b=I14MUee9PEcOJt+Fxp4A3yjH+CWZYkw3ecC7Sigjl702PLxprKYokPHzsUpIbA9nM8 ca0LpMa+JQQTbGkrU4fIocejeZl8+9cP06TJ7K+UcdNBxrnSqyIWkraHyfEdKsgl4au+ RJancivgVENbKhTeKuiCtmvQ6+zdbJc4yqV9u12P0YPsyYx+zTIR3NbmPfkCh483y5dr aF2dQHmTqs2zPqWiwwvARaj+HQgyHDgjtjzSYEBAn81EVWNvu8wn+HqgC+bxhIh7QxRp 8sIiH44X0h2FKOnwXF38IXQWrktp4CuP9QTPYOTjuP+nz6eyOp/9PlxpCX851IIiPyVo 8VvA== X-Gm-Message-State: AOJu0YyOavplHMoWYnDUK4Eiq9ISIf5zT+By+h0BZY9zOtO8KFNJoRCA qXdGAUgNtWW3hFxY1pdlD57rdA== X-Google-Smtp-Source: AGHT+IG+c5rEqkPJPowukhZCNBWoFesKNE9fmEnvIvY0OWAzZw3ToxQlykzyfaeu3P1kN6URG92/wA== X-Received: by 2002:a5d:6109:0:b0:319:8c99:989a with SMTP id v9-20020a5d6109000000b003198c99989amr10480120wrt.8.1692769034543; Tue, 22 Aug 2023 22:37:14 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id o1-20020a5d58c1000000b003180155493esm17522712wrf.67.2023.08.22.22.37.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Aug 2023 22:37:13 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 4a69fc16a583 - main - Add membarrier(2) From: Jessica Clarke In-Reply-To: Date: Wed, 23 Aug 2023 06:37:03 +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: <0F3EA94D-6696-471C-ABF6-840B5E92967F@freebsd.org> References: <202308230007.37N07cOK082906@gitrepo.freebsd.org> <748B7A01-5011-44EE-BB04-282AE96F9B5B@freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RVw2h5GNdz4JL8 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 23 Aug 2023, at 03:38, Konstantin Belousov = wrote: > On Wed, Aug 23, 2023 at 02:18:12AM +0100, Jessica Clarke wrote: >> On 23 Aug 2023, at 01:07, Konstantin Belousov = wrote: >>>=20 >>> The branch main has been updated by kib: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D4a69fc16a583face922319c476f3e739= d9ce9140 >>>=20 >>> commit 4a69fc16a583face922319c476f3e739d9ce9140 >>> Author: Konstantin Belousov >>> AuthorDate: 2021-10-07 21:10:07 +0000 >>> Commit: Konstantin Belousov >>> CommitDate: 2023-08-23 00:02:21 +0000 >>>=20 >>> Add membarrier(2) >>>=20 >>> This is an attempt at clean-room implementation of the Linux' >>> membarrier(2) syscall. For documentation, you would need to read >>> both membarrier(2) Linux man page, the comments in Linux >>> kernel/sched/membarrier.c implementation and possibly look at >>> actual uses. >>>=20 >>> Sponsored by: The FreeBSD Foundation >>> MFC after: 1 week >>> Differential revision: https://reviews.freebsd.org/D32360 >>> --- >>> ... >>> diff --git a/sys/sys/membarrier.h b/sys/sys/membarrier.h >>> new file mode 100644 >>> index 000000000000..958b769da23e >>> --- /dev/null >>> +++ b/sys/sys/membarrier.h >>> @@ -0,0 +1,70 @@ >>> +/*- >>> + * Copyright (c) 2021 The FreeBSD Foundation >>> + * >>> + * This software were developed by Konstantin Belousov = >>> + * under sponsorship from the FreeBSD Foundation. >>> + * >>> + * Redistribution and use in source and binary forms, with or = without >>> + * modification, are permitted provided that the following = conditions >>> + * are 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 __SYS_MEMBARRIER_H__ >>> +#define __SYS_MEMBARRIER_H__ >>> + >>> +#include >>> + >>> +/* >>> + * The enum membarrier_cmd values are bits. The = MEMBARRIER_CMD_QUERY >>> + * command returns a bitset indicating which commands are = supported. >>> + * Also the value of MEMBARRIER_CMD_QUERY is zero, so it is >>> + * effectively not returned by the query. >>> + */ >>> +enum membarrier_cmd { >>> + MEMBARRIER_CMD_QUERY =3D 0x00000000, >>> + MEMBARRIER_CMD_GLOBAL =3D 0x00000001, >>> + MEMBARRIER_CMD_SHARED =3D MEMBARRIER_CMD_GLOBAL, >>> + MEMBARRIER_CMD_GLOBAL_EXPEDITED =3D 0x00000002, >>> + MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED =3D 0x00000004, >>> + MEMBARRIER_CMD_PRIVATE_EXPEDITED =3D 0x00000008, >>> + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED =3D 0x00000010, >>> + MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE =3D 0x00000020, >>> + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE =3D = 0x00000040, >>> + >>> + /* >>> + * RSEQ constants are defined for source compatibility but are >>> + * not yes supported, MEMBARRIER_CMD_QUERY does not return >>> + * them in the mask. >>> + */ >>> + MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ =3D 0x00000080, >>> + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ =3D 0x00000100, >>=20 >> Or we could not define them. membarrier(2) came into Linux in 4.3, = but >> these two are only since 5.10. Defining something we may or may not >> ever implement that code should have compatibility for anyway seems >> like a bad idea. Or should we provide all of the Linux UAPI to = FreeBSD >> processes with ENOSYS stubs? Clearly not. So why is this special? IMO >> these should not be added unless we have an rseq implementation, = which >> has itself received several objections on the review. > The added _RSEQ bits behave according to the membarrier(2) = specification, > they are defined but not returned in the mask of supported operations. So would implementing io_uring_enter(2) as EOPNOTSUPP... > I found that have all of them defined makes compiling some program = easier, > AFAIR. Which programs? I can=E2=80=99t imagine many even try and use this in = the first place, and of those that do a large proportion likely have fallback code for pre-5.10. >> I also don=E2=80=99t see why this is suddenly being landed now = without warning. >> There=E2=80=99s been no activity by you on the review since just over = a year >> ago. And landing new syscalls days before the 14 branch point = doesn=E2=80=99t >> seem like great practice to me... > Would I know that reviewers did not act for a year, I committed the = patch > a year ago. You didn=E2=80=99t even ping the patch once since 16th August 2022, a = day when you did receive reviewer feedback. > The addition does not change any existing code path in the kernel. No, but it commits us to a new syscall being stable just days before 14 branches and has its ABI frozen. Jess From nobody Wed Aug 23 07:00: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 4RVxth4HvBz4rCgy; Wed, 23 Aug 2023 07:00: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 4RVxth3mndz4St5; Wed, 23 Aug 2023 07:00:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692774028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NmTUTwIuefMjnsR0cQ+ijXD+yyg4RwQ/v7yeIQK69Og=; b=lV7FRfS3i1Fm4Nf2DNEAhc1ZyBWb88tagD4aCy11JIvvMwun3ay+kow2eaOBRj8fPX7f8u 7mH0ZGj1sWOHO6ZjNq6kN/2xsjE02WntM8gVFzj5xZ2tZL6ewVmHeoacGJZHLLoDPIRaXt 1yY8pPFRSWxroaClV3WlGWm8wCUmgvFi37BmZV931wTBHD/FVO7Dk/SJQ39BIhwR422/Di 21orUdaB+j08i3ZBYAkh1VpcY/VhkmVG+Hbq7jH1lYJiaYQYmloLISTlzqX+mP/mAcNOCa lNwDxJhSNppOEJoFPLhVPgWIgH3W5Y8mGWlm7Yvx2HtrqTiRvNpieL9RvXQjhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692774028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NmTUTwIuefMjnsR0cQ+ijXD+yyg4RwQ/v7yeIQK69Og=; b=q/61zGU1TT++OVPnddbF/i8zELiHeeTKcCJxD2WlGM4NhbmyXfLOW6SdiPWXgbhGeyX2GL sFLjR2vSdKuItXD2X8+nFJ+pp30nxf+sUCYViQZ7dIZDl0h/ap48bkDngLE5wCeXoK2oT9 Fh7QiBlw0Ix0MDwFl3h+hc0wuwsactaDI2Sa8a+uW1D/VUuMmJksDDhLmiI1JYlNq2ZkSM OVxJKF1DKOv7rM016v6wlUokOo2Ya7DyhbwVnZkE+gPtAjP102I9nhwYiOHkLAPj9IVfgV x953l4fTFyT58rQsZQ+RYXVd7nz13rctUIEjS1MEg4SSsV7mtB+ix2TV1MmDvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692774028; a=rsa-sha256; cv=none; b=joNBYRynmWKn7Zgu1nsBgj1H3W1LVEyvwEbsV8potzG+WQxwgdb3cDDPxFyRWuiuBekSTa btLYZhsr6Ve/UH1NUkTYJkc7KQXpmejqHToQIHcs0aeNhvEs+wF5E4vZNjFiC8DyMUj4Ts 0VCWFS3y6tjiSYQh/sloSv3zGWqyf38b/Y9olvzVvFLnzXUmooGLmAEytEHqWU4YMZZEL+ R+t0muPxSWq7fOq+0GZRWFR9nKpFW2UpHOxaV9rWSbCh3C8874N/qXhH+GuHMO0W+EJGJD YHceQNw7K2CY1qsuMK0v87UndNJ9F9HiYQrKf+Bh/lIswCb90rzy/PanPEIgiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVxth2rK2zbS9; Wed, 23 Aug 2023 07:00:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37N70SEi072509; Wed, 23 Aug 2023 07:00:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37N70Sm9072506; Wed, 23 Aug 2023 07:00:28 GMT (envelope-from git) Date: Wed, 23 Aug 2023 07:00:28 GMT Message-Id: <202308230700.37N70Sm9072506@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: 29bfcb3a286f - main - arm64: xilinx: Add glue driver for usb3 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29bfcb3a286fcf53ae6479f735d8ed49bd4a7c1f Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=29bfcb3a286fcf53ae6479f735d8ed49bd4a7c1f commit 29bfcb3a286fcf53ae6479f735d8ed49bd4a7c1f Author: Emmanuel Vadot AuthorDate: 2023-08-23 06:58:03 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-23 07:00:05 +0000 arm64: xilinx: Add glue driver for usb3 controller Like other dwc3 controller, on Xilinx ZynqMP the base node is just here to provide resets, the main dwc3 controller node is a child node. Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/conf/files.arm64 | 1 + sys/dev/usb/controller/xlnx_dwc3.c | 149 +++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 2036bbe918ba..390d9e5db487 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -697,3 +697,4 @@ arm64/rockchip/clk/rk3568_pmucru.c optional fdt soc_rockchip_rk3568 # Xilinx arm/xilinx/uart_dev_cdnc.c optional uart soc_xilinx_zynq fdt arm/xilinx/zy7_gpio.c optional gpio soc_xilinx_zynq fdt +dev/usb/controller/xlnx_dwc3.c optional fdt xhci soc_xilinx_zynq fdt diff --git a/sys/dev/usb/controller/xlnx_dwc3.c b/sys/dev/usb/controller/xlnx_dwc3.c new file mode 100644 index 000000000000..aad929663eed --- /dev/null +++ b/sys/dev/usb/controller/xlnx_dwc3.c @@ -0,0 +1,149 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG + * + * 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. + */ + +/* + * Xilinx DWC3 glue + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +static struct ofw_compat_data compat_data[] = { + { "xlnx,zynqmp-dwc3", 1 }, + { NULL, 0 } +}; + +struct xlnx_dwc3_softc { + struct simplebus_softc sc; + device_t dev; + hwreset_t rst_crst; + hwreset_t rst_hibrst; + hwreset_t rst_apbrst; +}; + +static int +xlnx_dwc3_probe(device_t dev) +{ + phandle_t node; + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + /* Binding says that we need a child node for the actual dwc3 controller */ + node = ofw_bus_get_node(dev); + if (OF_child(node) <= 0) + return (ENXIO); + + device_set_desc(dev, "Xilinx ZYNQMP DWC3"); + return (BUS_PROBE_DEFAULT); +} + +static int +xlnx_dwc3_attach(device_t dev) +{ + struct xlnx_dwc3_softc *sc; + device_t cdev; + phandle_t node, child; + + sc = device_get_softc(dev); + sc->dev = dev; + node = ofw_bus_get_node(dev); + + /* + * Put module out of reset + * Based on the bindings this should be mandatory to have + * but reality shows that they aren't always there. + * This is the case on the DTB in the AVnet Ultra96 + */ + if (hwreset_get_by_ofw_name(dev, node, "usb_crst", &sc->rst_crst) == 0) { + if (hwreset_deassert(sc->rst_crst) != 0) { + device_printf(dev, "Cannot deassert reset\n"); + return (ENXIO); + } + } + if (hwreset_get_by_ofw_name(dev, node, "usb_hibrst", &sc->rst_hibrst) == 0) { + if (hwreset_deassert(sc->rst_crst) != 0) { + device_printf(dev, "Cannot deassert reset\n"); + return (ENXIO); + } + } + if (hwreset_get_by_ofw_name(dev, node, "usb_apbrst", &sc->rst_apbrst) == 0) { + if (hwreset_deassert(sc->rst_crst) != 0) { + device_printf(dev, "Cannot deassert reset\n"); + return (ENXIO); + } + } + + simplebus_init(dev, node); + if (simplebus_fill_ranges(node, &sc->sc) < 0) { + device_printf(dev, "could not get ranges\n"); + return (ENXIO); + } + + for (child = OF_child(node); child > 0; child = OF_peer(child)) { + cdev = simplebus_add_device(dev, child, 0, NULL, -1, NULL); + if (cdev != NULL) + device_probe_and_attach(cdev); + } + + return (bus_generic_attach(dev)); +} + +static device_method_t xlnx_dwc3_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, xlnx_dwc3_probe), + DEVMETHOD(device_attach, xlnx_dwc3_attach), + + DEVMETHOD_END +}; + +DEFINE_CLASS_1(xlnx_dwc3, xlnx_dwc3_driver, xlnx_dwc3_methods, + sizeof(struct xlnx_dwc3_softc), simplebus_driver); +DRIVER_MODULE(xlnx_dwc3, simplebus, xlnx_dwc3_driver, 0, 0); From nobody Wed Aug 23 07:18:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RVyHf5M6Jz4rDQr for ; Wed, 23 Aug 2023 07:18:38 +0000 (UTC) (envelope-from sumit.saxena@broadcom.com) Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RVyHf2Xbnz4Wm8 for ; Wed, 23 Aug 2023 07:18:38 +0000 (UTC) (envelope-from sumit.saxena@broadcom.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-5007abb15e9so5187109e87.0 for ; Wed, 23 Aug 2023 00:18:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1692775116; x=1693379916; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Hlcv8rcGJW8OAV8cZvCrLOxNqHkTySu2lYHVC6xgN74=; b=Wo7NujdFYIZ04W+9QILkdPUUo8ghNY/fIolCEE4PoPpiKxRFQGFlkOXgMD/FudOSRr nJN3/SweoysPFDNlN/J+F8NaiNEyEWCrRB59cswZ38zy5RsBLpveACu7g/NgTRP52VAz 6J387vLPHhQuR2PVQtsAnax7MQz8WwaxB2GjM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692775116; x=1693379916; 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=Hlcv8rcGJW8OAV8cZvCrLOxNqHkTySu2lYHVC6xgN74=; b=hasi94DSFEaK7PPRLUrqisct4KbgDseVrRvdxibPBVA0nQQHzPypuzF10yMs6MquH2 ldZBZSROboM2x6jb/oKF31BTCfUwx+7bj2TcAi3cfX0+Wa6D0cE0yy2LFFdtPfzyJztc NBZ92/eFWAkqgDSyHJ4qqyaQhV1RBWePRYTIExLldwLPFo/+yEsssBt/QygkDephnYrS 5x/39PdkXyRppEKQsA23WkVpQxiUegAhNc5l3YSmpD3eFtNf2O64+z5WfpOQDJrwGvbb 9qZJZEyL8T64hezAvd1fQt7l+jzAGspCE0yGKk63h4fHfyDI27e6oWj8HAa++8uusUGg fHQA== X-Gm-Message-State: AOJu0YygJSBKTGzyN3nlJPujGWyME/9ozEmTtZUMPzi4B1NH4SP1w/5w fhcSJ2GdFhK5FuQCiiYjy4NjDcC0Me3Yu6mulJ5kyA== X-Google-Smtp-Source: AGHT+IECSfsRMe7U8KY+zAUkh6HUHHpkBMwvQk5iobEtzmI8ell8QR5ZuJbvHXPqZI/O0yXMM/BUppnutVO15S8bzjE= X-Received: by 2002:a05:6512:1047:b0:4ff:8aad:8c7b with SMTP id c7-20020a056512104700b004ff8aad8c7bmr10679205lfb.68.1692775116004; Wed, 23 Aug 2023 00:18:36 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202211042255.2A4MtqVv032693@gitrepo.freebsd.org> <419530F4-DB8F-46EA-BF45-C130BCF8A3DE@FreeBSD.org> <05979953-C089-4D56-99E3-BBBF066FE277@FreeBSD.org> In-Reply-To: From: Sumit Saxena Date: Wed, 23 Aug 2023 12:48:08 +0530 Message-ID: Subject: Re: git: 91fcacc35597 - main - if_bnxt: Add support for VLAN on Thor To: Warner Losh Cc: Kevin Bowling , Kristof Provost , Warner Losh , "" , "" , src-committers , Chandrakanth Patil Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="00000000000082bdad060391eb42" X-Rspamd-Queue-Id: 4RVyHf2Xbnz4Wm8 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --00000000000082bdad060391eb42 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable +Chandrakanth Patil Chandrakanth is working on this bug. -Sumit On Wed, Aug 23, 2023 at 6:01=E2=80=AFAM Warner Losh wrote: > > > > On Tue, Aug 22, 2023, 6:26 PM Warner Losh wrote: >> >> >> >> On Tue, Aug 22, 2023, 5:59 PM Kevin Bowling w= rote: >>> >>> On Tue, Aug 22, 2023 at 3:39=E2=80=AFPM Kevin Bowling wrote: >>> > >>> > >>> > >>> > On Tue, Aug 22, 2023 at 2:07 PM Kristof Provost wrot= e: >>> >> >>> >> On 27 Jun 2023, at 11:17, Kristof Provost wrote: >>> >> >>> >> On 4 Nov 2022, at 23:55, Warner Losh wrote: >>> >> >>> >> The branch main has been updated by imp: >>> >> >>> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D91fcacc355971f74aa26f= c7861020dc3a2a2d717 >>> >> >>> >> commit 91fcacc355971f74aa26fc7861020dc3a2a2d717 >>> >> Author: Sumit Saxena >>> >> AuthorDate: 2022-11-04 22:24:32 +0000 >>> >> Commit: Warner Losh >>> >> CommitDate: 2022-11-04 22:24:32 +0000 >>> >> >>> >> if_bnxt: Add support for VLAN on Thor >>> >> >>> >> Reviewed by: imp >>> >> Differential Revision: https://reviews.freebsd.org/D36443 >>> >> --- >>> >> sys/dev/bnxt/bnxt.h | 3 +- >>> >> sys/dev/bnxt/bnxt_hwrm.c | 110 ++++++++++++++++++++++++++++---------= ---------- >>> >> sys/dev/bnxt/bnxt_hwrm.h | 7 ++- >>> >> sys/dev/bnxt/if_bnxt.c | 7 ++- >>> >> 4 files changed, 74 insertions(+), 53 deletions(-) >>> >> >>> >> This commit appears to have broken vlan on these interfaces. >>> >> My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet, (= in a Dell T640, if that helps). >>> >> >>> >> A simple vlan creation on top of one: >>> >> ifconfig vlan create >>> >> ifconfig vlan0 vlan 201 vlandev bnxt0 >>> >> >>> >> Results in a loss of connectivity. The kernel logs this, which I ass= ume is related: >>> >> >>> >> `bnxt0: HWRM_CFA_L2_FILTER_ALLOC command returned INVALID_PARAMS err= or.` >>> >> >>> >> After reverting this (and 72e9dbb58cad5262190cf2eae47f764021072128) = I can create vlan interfaces on top of bnxt0 without losing connectivity. >>> >> >>> >> >>> >> Should we revert this before 14.0? >>> >> >>> >> There=E2=80=99s also a report of what I think is the same issue in h= ttps://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D269133 >>> >> >>> >> There=E2=80=99s a proposed patch there, but it did not work for me. >>> > >>> > >>> > In markj=E2=80=99s analysis he mentions the issue of the reinit. >>> > >>> > It sounds like there are multiple bugs in this driver but one quick b= and aid may be to mark the driver as not needing re-init for VLAN modificat= ions.. that sounds unlikely and was probably an accident when the if reset = functionality was added. You can check e1000 for that. >>> >>> Here's what I mean as a patch https://reviews.freebsd.org/D41558 >>> >>> > Note I don=E2=80=99t have this hw and haven=E2=80=99t audited the cod= e so this could be noise but it=E2=80=99s an easy thing to check. >> >> >> Is there a good bug we can post that link to for someone to test? > > > Duh.. posted to bug above and > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D222680 > > Warner > >> >> Warner >>> >>> > >>> >> Best regards, >>> >> Kristof --00000000000082bdad060391eb42 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIIQbQYJKoZIhvcNAQcCoIIQXjCCEFoCAQExDzANBglghkgBZQMEAgEFADALBgkqhkiG9w0BBwGg gg3EMIIFDTCCA/WgAwIBAgIQeEqpED+lv77edQixNJMdADANBgkqhkiG9w0BAQsFADBMMSAwHgYD VQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UE AxMKR2xvYmFsU2lnbjAeFw0yMDA5MTYwMDAwMDBaFw0yODA5MTYwMDAwMDBaMFsxCzAJBgNVBAYT AkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEdDQyBS MyBQZXJzb25hbFNpZ24gMiBDQSAyMDIwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA vbCmXCcsbZ/a0fRIQMBxp4gJnnyeneFYpEtNydrZZ+GeKSMdHiDgXD1UnRSIudKo+moQ6YlCOu4t rVWO/EiXfYnK7zeop26ry1RpKtogB7/O115zultAz64ydQYLe+a1e/czkALg3sgTcOOcFZTXk38e aqsXsipoX1vsNurqPtnC27TWsA7pk4uKXscFjkeUE8JZu9BDKaswZygxBOPBQBwrA5+20Wxlk6k1 e6EKaaNaNZUy30q3ArEf30ZDpXyfCtiXnupjSK8WU2cK4qsEtj09JS4+mhi0CTCrCnXAzum3tgcH cHRg0prcSzzEUDQWoFxyuqwiwhHu3sPQNmFOMwIDAQABo4IB2jCCAdYwDgYDVR0PAQH/BAQDAgGG MGAGA1UdJQRZMFcGCCsGAQUFBwMCBggrBgEFBQcDBAYKKwYBBAGCNxQCAgYKKwYBBAGCNwoDBAYJ KwYBBAGCNxUGBgorBgEEAYI3CgMMBggrBgEFBQcDBwYIKwYBBQUHAxEwEgYDVR0TAQH/BAgwBgEB /wIBADAdBgNVHQ4EFgQUljPR5lgXWzR1ioFWZNW+SN6hj88wHwYDVR0jBBgwFoAUj/BLf6guRSSu TVD6Y5qL3uLdG7wwegYIKwYBBQUHAQEEbjBsMC0GCCsGAQUFBzABhiFodHRwOi8vb2NzcC5nbG9i YWxzaWduLmNvbS9yb290cjMwOwYIKwYBBQUHMAKGL2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5j b20vY2FjZXJ0L3Jvb3QtcjMuY3J0MDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwuZ2xvYmFs c2lnbi5jb20vcm9vdC1yMy5jcmwwWgYDVR0gBFMwUTALBgkrBgEEAaAyASgwQgYKKwYBBAGgMgEo CjA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzAN BgkqhkiG9w0BAQsFAAOCAQEAdAXk/XCnDeAOd9nNEUvWPxblOQ/5o/q6OIeTYvoEvUUi2qHUOtbf jBGdTptFsXXe4RgjVF9b6DuizgYfy+cILmvi5hfk3Iq8MAZsgtW+A/otQsJvK2wRatLE61RbzkX8 9/OXEZ1zT7t/q2RiJqzpvV8NChxIj+P7WTtepPm9AIj0Keue+gS2qvzAZAY34ZZeRHgA7g5O4TPJ /oTd+4rgiU++wLDlcZYd/slFkaT3xg4qWDepEMjT4T1qFOQIL+ijUArYS4owpPg9NISTKa1qqKWJ jFoyms0d0GwOniIIbBvhI2MJ7BSY9MYtWVT5jJO3tsVHwj4cp92CSFuGwunFMzCCA18wggJHoAMC AQICCwQAAAAAASFYUwiiMA0GCSqGSIb3DQEBCwUAMEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9v dCBDQSAtIFIzMRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTA5 MDMxODEwMDAwMFoXDTI5MDMxODEwMDAwMFowTDEgMB4GA1UECxMXR2xvYmFsU2lnbiBSb290IENB IC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wggEiMA0GCSqG SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMJXaQeQZ4Ihb1wIO2hMoonv0FdhHFrYhy/EYCQ8eyip0E XyTLLkvhYIJG4VKrDIFHcGzdZNHr9SyjD4I9DCuul9e2FIYQebs7E4B3jAjhSdJqYi8fXvqWaN+J J5U4nwbXPsnLJlkNc96wyOkmDoMVxu9bi9IEYMpJpij2aTv2y8gokeWdimFXN6x0FNx04Druci8u nPvQu7/1PQDhBjPogiuuU6Y6FnOM3UEOIDrAtKeh6bJPkC4yYOlXy7kEkmho5TgmYHWyn3f/kRTv riBJ/K1AFUjRAjFhGV64l++td7dkmnq/X8ET75ti+w1s4FRpFqkD2m7pg5NxdsZphYIXAgMBAAGj QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSP8Et/qC5FJK5N UPpjmove4t0bvDANBgkqhkiG9w0BAQsFAAOCAQEAS0DbwFCq/sgM7/eWVEVJu5YACUGssxOGhigH M8pr5nS5ugAtrqQK0/Xx8Q+Kv3NnSoPHRHt44K9ubG8DKY4zOUXDjuS5V2yq/BKW7FPGLeQkbLmU Y/vcU2hnVj6DuM81IcPJaP7O2sJTqsyQiunwXUaMld16WCgaLx3ezQA3QY/tRG3XUyiXfvNnBB4V 14qWtNPeTCekTBtzc3b0F5nCH3oO4y0IrQocLP88q1UOD5F+NuvDV0m+4S4tfGCLw0FREyOdzvcy a5QBqJnnLDMfOjsl0oZAzjsshnjJYS8Uuu7bVW/fhO4FCU29KNhyztNiUGUe65KXgzHZs7XKR1g/ XzCCBUwwggQ0oAMCAQICDB2B69csh2jp9sI0jzANBgkqhkiG9w0BAQsFADBbMQswCQYDVQQGEwJC RTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTExMC8GA1UEAxMoR2xvYmFsU2lnbiBHQ0MgUjMg UGVyc29uYWxTaWduIDIgQ0EgMjAyMDAeFw0yMjA5MTAwOTE1MzVaFw0yNTA5MTAwOTE1MzVaMIGO MQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCYW5nYWxvcmUxFjAU BgNVBAoTDUJyb2FkY29tIEluYy4xFTATBgNVBAMTDFN1bWl0IFNheGVuYTEoMCYGCSqGSIb3DQEJ ARYZc3VtaXQuc2F4ZW5hQGJyb2FkY29tLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC ggEBALoGydo8plkxTqXV8MOi06PQvWWLx02gZEgN0QNCmUbBNjDUSFh3ONINOfWPHBGHm7xAZwkv 4t5gJ0bMkTp/mTSrDsXyD6voKaTveYz6fDPfzcb+NvqXiDHmYnxR1h2BJ3N37GR8/gMG9J4H9Uny hExFVC4t1YMhXlpVGcRlHPt/nMF8z9sE9vd7z2HFKhRfIQ7eChsb4fv7Qb6gYdK7eMHs2EEeyY1W 1J8x62/iEVbCstJaE1Nt3oXnL5yBlqX1Ihp8cZLe1weS7Wp/v5Jg2Ks13jeYOKW45xXExpqPPd1f 3meFjTf9K+rGZHb63htWaJtf0NYbE+5yIbXFv21cBxECAwEAAaOCAdowggHWMA4GA1UdDwEB/wQE AwIFoDCBowYIKwYBBQUHAQEEgZYwgZMwTgYIKwYBBQUHMAKGQmh0dHA6Ly9zZWN1cmUuZ2xvYmFs c2lnbi5jb20vY2FjZXJ0L2dzZ2NjcjNwZXJzb25hbHNpZ24yY2EyMDIwLmNydDBBBggrBgEFBQcw AYY1aHR0cDovL29jc3AuZ2xvYmFsc2lnbi5jb20vZ3NnY2NyM3BlcnNvbmFsc2lnbjJjYTIwMjAw TQYDVR0gBEYwRDBCBgorBgEEAaAyASgKMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2Jh bHNpZ24uY29tL3JlcG9zaXRvcnkvMAkGA1UdEwQCMAAwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDov L2NybC5nbG9iYWxzaWduLmNvbS9nc2djY3IzcGVyc29uYWxzaWduMmNhMjAyMC5jcmwwJAYDVR0R BB0wG4EZc3VtaXQuc2F4ZW5hQGJyb2FkY29tLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDBDAfBgNV HSMEGDAWgBSWM9HmWBdbNHWKgVZk1b5I3qGPzzAdBgNVHQ4EFgQUTIFIrhFDaoMEbXuV9O+Y+XgS kVwwDQYJKoZIhvcNAQELBQADggEBAFyioHqB2PHWcQ5cU8nprPRk37uSWK2x0w7W50jjc0cooz6G G6pltJ+DvbG7XIzCU8cKHmuyAxoe1+/vhB8yJH78MVdfKDDND7zL/IqfhZedxHcHG5jVqbVH/ufu H19y4fHxo5bLkybX3UxkN9b3bMsBZ4FFCLSCFgFfjI0BmTx6IoGyi0R89rzD0H1rURy7WTn0ijl1 nERsqENeyGfUTJLcDSURb49qpFqqWweJ7ifC64Iak8wCK2CxCe8lHfTyEgC9MuEa586NMQJDguvw jlC7kxrgwf4sZ/9Wj/GS2HLzZPkxWCcQIrgNJm2wceHQwPBpM0ZoqL1D2tsFgOA8BvYxggJtMIIC aQIBATBrMFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQD EyhHbG9iYWxTaWduIEdDQyBSMyBQZXJzb25hbFNpZ24gMiBDQSAyMDIwAgwdgevXLIdo6fbCNI8w DQYJYIZIAWUDBAIBBQCggdQwLwYJKoZIhvcNAQkEMSIEIB2Np5Cgm2An9t9mOB82QxQ5X0IcxSYZ DANcoc8vnIBFMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTIzMDgy MzA3MTgzNlowaQYJKoZIhvcNAQkPMVwwWjALBglghkgBZQMEASowCwYJYIZIAWUDBAEWMAsGCWCG SAFlAwQBAjAKBggqhkiG9w0DBzALBgkqhkiG9w0BAQowCwYJKoZIhvcNAQEHMAsGCWCGSAFlAwQC ATANBgkqhkiG9w0BAQEFAASCAQCFADAZhycjINuPHF3n1Nv42XMLTrm8QaRUxnlENXbKgJtdmXHW l0KF2Tou94j2SjvOqyGXGCpRPI2eGSf/ZQhfatHV3By+a202L+s1CJz6l7gPlkJPQZ8u1eTgU3SP zOvrXuKaZY7CkIejTIvCHWwp32nrcvlfli7TVtDXRohbNEmo3pUUIFEQDH5GlwRJzGjX1OhMS4qr swgyG/0jtNmhY2TrrQFZyBX8lg3AYQDiRGjIbTrUip/z3m5aqUehENnLkZfglvY4yDwJwnb+KW9T 3DczDgIVJ31/VNpa+EjrPH/CEVTMoFK9YGWJYyffLP2hACe4qVGZDzA5XG+32s1W --00000000000082bdad060391eb42-- From nobody Wed Aug 23 07:43: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 4RVyqq0Pttz4rFh3; Wed, 23 Aug 2023 07:43: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 4RVyqp6RYnz4chl; Wed, 23 Aug 2023 07:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692776582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HtjJlA93AGXYjA7xhCtB5i/PB4WZCS9/5bF3PKG2GIA=; b=TM6zWEdDnoBrxsKZJSITl3QmQKnFkxuLvERTHjDm/Iw6IoL3JSDkBFK+EB2xRlPz7O9Ha0 qr/7bBlDgwkNCiJrHsC8BPkHE5JSjfO5LxgXaM0TGAb0RcjhtGbmWiQcXcA50ruNdLG99j FBME+QvlWq+NHaPzbwPRrg5ohzJ/XAaaeL5/CNJU7cQ/VS2vi/uKCyla2UySO3a7BlfzCW ea7uy4si6S8SYpZdFioC3OHzN2UtKaTf8VophuF7ml0nObHQCxK6+0Pebb4P5HbIs80Bv4 Xc+a5TjSxCeP0bnFWJXMjdlwrOcpm5O1fv5+81vGMWOHesLtz/N6/tDU6L3awQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692776582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HtjJlA93AGXYjA7xhCtB5i/PB4WZCS9/5bF3PKG2GIA=; b=DDCaepb5D9BUopsB5R0L6FTIKct2JxaffSnRKUoh7BAnmQ6mv40p1SlY0V37u+n63eLk4h iE3A17UbRLuRusTCQqLDNr976AmnglbDf3vWkS7ppqSQqnjYMzpNwFnArUzDmK2LoapGvt YYmPjL0jCLceyg0aNI6WuZnwQbS3neZ+Nv543R+zSD+vElKNZjxgGcrvbvCoN0fukub2F4 7pcwoiWr021kyPm8uFfLfMYBPKw6kF1RnUKfNPBtMYQLZr9EPR30Jpn39CVGefd0wDT0J4 /lxuDPzV/B0Cg1Cs0dHunUABneMD+r718uecTEMiAPxfl+0WQDMJ744rr4Z7HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692776582; a=rsa-sha256; cv=none; b=c7FeszW1nWfvmQP31SnOogi/+9+qD6ls28qeOE+N4y9kZPd+mErqvTD8au3w1FnAqWjpP5 +Yk5lCL3e2sKooKz5OHPg/iFOgyiEb1L+1arg04DquzfoxO2UpEdI+ULWm1IBaozjVSugH rILkTBsJW4IUYpdw127fZ7NqH5bCuHXLUWGPzrJaKZ72GB/J0DR0ojAs4kLz+rKbXnh4YH eO74AN/+MKRGxmj0hOvbf8g8C5v/9LbPGe31bOzTj8mV3vjk5Dz1V2/eM3zd5319UbTDmQ nGSnq6QYqQzKzwz58d2imBIBJWvqy56UCtl7j4ISB7IygZUSUWFBiZxUG2BLKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVyqp5V8GzcdQ; Wed, 23 Aug 2023 07:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37N7h2AD045618; Wed, 23 Aug 2023 07:43:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37N7h2mF045615; Wed, 23 Aug 2023 07:43:02 GMT (envelope-from git) Date: Wed, 23 Aug 2023 07:43:02 GMT Message-Id: <202308230743.37N7h2mF045615@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: 5fb94d0e1667 - main - arm64: xilinx: dwc3: Fix reset names List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5fb94d0e1667faa3298d1785bb8d297f3a36ae35 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=5fb94d0e1667faa3298d1785bb8d297f3a36ae35 commit 5fb94d0e1667faa3298d1785bb8d297f3a36ae35 Author: Emmanuel Vadot AuthorDate: 2023-08-23 07:41:47 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-23 07:42:40 +0000 arm64: xilinx: dwc3: Fix reset names Use the correct resets and not the same one three times in a row. Reported by: rpokala Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dev/usb/controller/xlnx_dwc3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/controller/xlnx_dwc3.c b/sys/dev/usb/controller/xlnx_dwc3.c index aad929663eed..0a53fb855034 100644 --- a/sys/dev/usb/controller/xlnx_dwc3.c +++ b/sys/dev/usb/controller/xlnx_dwc3.c @@ -109,13 +109,13 @@ xlnx_dwc3_attach(device_t dev) } } if (hwreset_get_by_ofw_name(dev, node, "usb_hibrst", &sc->rst_hibrst) == 0) { - if (hwreset_deassert(sc->rst_crst) != 0) { + if (hwreset_deassert(sc->rst_hibrst) != 0) { device_printf(dev, "Cannot deassert reset\n"); return (ENXIO); } } if (hwreset_get_by_ofw_name(dev, node, "usb_apbrst", &sc->rst_apbrst) == 0) { - if (hwreset_deassert(sc->rst_crst) != 0) { + if (hwreset_deassert(sc->rst_apbrst) != 0) { device_printf(dev, "Cannot deassert reset\n"); return (ENXIO); } From nobody Wed Aug 23 09:16: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 4RW0vD2BNnz4rLMX; Wed, 23 Aug 2023 09:16: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 4RW0vD1Yhhz3GZC; Wed, 23 Aug 2023 09:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692782168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=krkeyubctl/tPvhAuzIBA4/zDWcmuL1t5c5UlqBB+hU=; b=BMbWG2aFnuOHGl14zRb4oS9XjzSRVieqGhsHAJOR/jmv3uaypxnbk/+tnZystVP/DsAJqW Fl7A7YTkD/taEUMIRaByI6jHKV8PUpNyuKLizYcVHXXP87jD5550ZeI7jdVLXE13SudfrM pJweXVavqLMzBXzGWl396rWFCLs8qKxWvQaH39PPQs2/7xSS7snmSYLaKeQc48fgw/5l9x qPhaESMYM2LgSrEW9iiBU+x9Pt5RtMLN5MB9QOB793B6zXG6x26VhanRE94zoT8urt0pbK g6+0TDWpoLLiWlG9w8j0cvgcCzxznrF7XC9RXE0gOgbDElbv7zQzub4cl5ZNrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692782168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=krkeyubctl/tPvhAuzIBA4/zDWcmuL1t5c5UlqBB+hU=; b=T9jrLTrN13Gb/pImJ/H/NhtbatyrQDDLGOqPVzSTq2K5iBsbCQD7PsHvEjuYmaPwF48tFf nzV/iRhOmXECJa0S8bcN/arRZROej/YzrtX0QCOLiet8eoGA+TiVXcyF/QeVyQuCuaiwHt e9sL09wLsB+fWDtWMmA8gksmKuKUO/6Fp6mClttpsgF8syxmj5TYNdWCsuFILh7/iVVh3a suzY9V39FhnHrPIWc2Y7+T3O6ez7Fopq5Wfq+S2qpD4PMvdDoyBSZ1Uco+rAfg6U8ozF55 CQtySYnXzaOV7k6P5/CWxgIqjXbnVETFqMu0hQ2wqC2C8jSbK0HoK8xjDmSTiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692782168; a=rsa-sha256; cv=none; b=t4HrEvgobeJ2IRRLBtv+34CVGw+Pu70FDd4podx/r33TR+G6EIFQnkz9zpjjXP9rfT/S9Y uTF+4p7J6fO/fTBatmAK1esX5ZzWuR+zcDFl4+1vCn4M42I7tMbeg+7c0YhzviEyrMAjua ggn+fHq2ossokUu7kosEP84rrp1cL399ThV4s5v1QpxOrJvu6nbSgsTC5NPhs+B5xPDghA J0zgjfa7Jr8fpklUN2khruIrjM5wFoCc15pdYKFdflhs4vX4euk1dSjxohd8FudExggp1b bt1HmK2e33VQAemClwiqzpTkcVMxrLB+VkZqCpxw8//7JubQJfUBq1+tnUH8yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RW0vD0cN8zfrR; Wed, 23 Aug 2023 09:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37N9G7X3094946; Wed, 23 Aug 2023 09:16:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37N9G7Ym094944; Wed, 23 Aug 2023 09:16:07 GMT (envelope-from git) Date: Wed, 23 Aug 2023 09:16:07 GMT Message-Id: <202308230916.37N9G7Ym094944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: d18c845f99cb - main - sctp: improve handling of SHUTDOWN and SHUTDOWN ACK chunks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d18c845f99cbd2d3c0e70b3b9b09d80c655b6fb6 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d18c845f99cbd2d3c0e70b3b9b09d80c655b6fb6 commit d18c845f99cbd2d3c0e70b3b9b09d80c655b6fb6 Author: Michael Tuexen AuthorDate: 2023-08-23 06:36:15 +0000 Commit: Michael Tuexen CommitDate: 2023-08-23 06:36:15 +0000 sctp: improve handling of SHUTDOWN and SHUTDOWN ACK chunks When handling a SHUTDOWN or SHUTDOWN ACK chunk detect if the peer is violating the protocol by not having made sure all user messages are reveived by the peer. If this situation is detected, abort the association. MFC after: 1 week --- sys/netinet/sctp_input.c | 54 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index f3227c913e1e..e6dc41e08909 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -829,6 +829,38 @@ sctp_start_net_timers(struct sctp_tcb *stcb) } } +static void +sctp_check_data_from_peer(struct sctp_tcb *stcb, int *abort_flag) +{ + char msg[SCTP_DIAG_INFO_LEN]; + struct sctp_association *asoc; + struct mbuf *op_err; + unsigned int i; + + *abort_flag = 0; + asoc = &stcb->asoc; + if (SCTP_TSN_GT(asoc->highest_tsn_inside_map, asoc->cumulative_tsn) || + SCTP_TSN_GT(asoc->highest_tsn_inside_nr_map, asoc->cumulative_tsn)) { + SCTP_SNPRINTF(msg, sizeof(msg), "Missing TSN"); + *abort_flag = 1; + } + if (!*abort_flag) { + for (i = 0; i < asoc->streamincnt; i++) { + if (!TAILQ_EMPTY(&asoc->strmin[i].inqueue) || + !TAILQ_EMPTY(&asoc->strmin[i].uno_inqueue)) { + SCTP_SNPRINTF(msg, sizeof(msg), "Missing user data"); + *abort_flag = 1; + break; + } + } + } + if (*abort_flag) { + op_err = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg); + stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INPUT + SCTP_LOC_9; + sctp_abort_an_association(stcb->sctp_ep, stcb, op_err, false, SCTP_SO_NOT_LOCKED); + } +} + static void sctp_handle_shutdown(struct sctp_shutdown_chunk *cp, struct sctp_tcb *stcb, struct sctp_nets *net, int *abort_flag) @@ -852,12 +884,10 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk *cp, if (*abort_flag) { return; } - /* - * FIXME MT: Handle the case where there are still incomplete - * received user messages or known missing user messages from the - * peer. One way to handle this is to abort the associations in this - * case. - */ + sctp_check_data_from_peer(stcb, abort_flag); + if (*abort_flag) { + return; + } if (stcb->sctp_socket) { if ((SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_RECEIVED) && (SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_ACK_SENT) && @@ -914,6 +944,8 @@ sctp_handle_shutdown_ack(struct sctp_shutdown_ack_chunk *cp SCTP_UNUSED, struct sctp_tcb *stcb, struct sctp_nets *net) { + int abort_flag; + SCTPDBG(SCTP_DEBUG_INPUT2, "sctp_handle_shutdown_ack: handling SHUTDOWN ACK\n"); if (stcb == NULL) { @@ -934,12 +966,10 @@ sctp_handle_shutdown_ack(struct sctp_shutdown_ack_chunk *cp SCTP_UNUSED, SCTP_TCB_UNLOCK(stcb); return; } - /* - * FIXME MT: Handle the case where there are still incomplete - * received user messages or known missing user messages from the - * peer. One way to handle this is to abort the associations in this - * case. - */ + sctp_check_data_from_peer(stcb, &abort_flag); + if (abort_flag) { + return; + } #ifdef INVARIANTS if (!TAILQ_EMPTY(&stcb->asoc.send_queue) || !TAILQ_EMPTY(&stcb->asoc.sent_queue) || From nobody Wed Aug 23 09:56: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 4RW1pM3k1Jz4rNj5; Wed, 23 Aug 2023 09:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RW1pM38c9z3JVJ; Wed, 23 Aug 2023 09:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692784619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UrcmxM6lHtWhLp8TDyUHACsJU1auheGkM0fA/TpaoB0=; b=rJPLCC7FjZWCDXfgEX2v2CB7aGbn+WMMEzFi7QEKB/AJALtfd6V8hYy6cf3s2AeZMU0Sd5 Cz2SougDOd5GCXm/UEAmKJfYi+tag7ROies8TDvhl62NU1gYwk9ny4I9FjYDfObIVdETFL 3osKnZiqGScNFN6OXSlMDngcMNOY+c4W0qqZ9o7GUOL4Gjv0jzJBQ72X0/bvBLZCkGS7/K wGKcf+SytxeTdhYk38qMo+033KIiIPSehrajf6y2Al5ft/acAqy/KzMOajmG4Hp+NezUNX WHjIcRMoO+74UL6lDJdCpekkpzSNzlZvEBwAE9ddCyjpLAiedMrJgoGqfJTjhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692784619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UrcmxM6lHtWhLp8TDyUHACsJU1auheGkM0fA/TpaoB0=; b=LFeDQBcqzl0ausTlWjptQzIx7JvUQB5EL3Z49D8QP+P3KyLJU8DPRvBeOTUKgBL0NzAIvG 9ocUd/jJcUdCEY+LRJQ0sDfrBl85+aJsPFxyjNionD0axTdrFXsC/rPwrPWRxnjPmDhwcv I8aSW1owtd+dWr4D20Y+m/M/LwqjzkCN94mOlpWWfekpPWPriHSG+sZAakJ9UuBqEWSX68 QYbm7CReGL3AaxTMigomVAyNnK4jxpsT45pU3VqZYdcNZRXIWIyNN7VtAVyrjVpmf/zYi5 bbEKLWIrL6+qquPpqrc3l5ejYlI5qTJtnrBskFSujvtOXqWp6aAo8dDVi8UvPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692784619; a=rsa-sha256; cv=none; b=Pn3nmNjgsVts6PdkviWG6hCI6lAomDp7uwr3WOgQu7tXcQ4UYHuV9AuzwVYMklew+00gM2 3n/Xit7/l4uvmBYPwQKvQgyhLhsuHPuxZEajhFxXAGVXk6EMo6gqZ4kgRe5LdJeqAiEJqO qDV01KEP2e3l1KGjz6wcd5WBRHESfDYCUpSr7eMo6DrlTkK0gB5ZF6fw33NN605pGz9rV6 kMskGQ3+nMuC1IcVIk/GtUDANFMnQ77IC6phkQZmnFAXdw4oJl2My1Pgc4AGTwqnwmLN8o s3z+Lxm0v+HKXNy3Ss0dLdkOV1TlxIWmbfuqnQQ6JPNkv+MnKWTRfJUjPzAoYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RW1pM2D1Pzh6x; Wed, 23 Aug 2023 09:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37N9uxdJ060341; Wed, 23 Aug 2023 09:56:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37N9uxk3060338; Wed, 23 Aug 2023 09:56:59 GMT (envelope-from git) Date: Wed, 23 Aug 2023 09:56:59 GMT Message-Id: <202308230956.37N9uxk3060338@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: 838c8c47860a - main - net: Do not overwrite if_vlan's PCP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 838c8c47860a0203130bd558d507a0565a2eba8f Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=838c8c47860a0203130bd558d507a0565a2eba8f commit 838c8c47860a0203130bd558d507a0565a2eba8f Author: Zhenlei Huang AuthorDate: 2023-08-23 09:48:12 +0000 Commit: Zhenlei Huang CommitDate: 2023-08-23 09:53:48 +0000 net: Do not overwrite if_vlan's PCP In commit c7cffd65c5d8 the function ether_8021q_frame() was slightly refactored to use pointer of struct ether_8021q_tag as parameter qtag to include the new option proto. It is wrong to write to qtag->pcp as it will effectively change the memory that qtag points to. Unfortunately the transmit routine of if_vlan parses pointer of the member ifv_qtag of its softc which stores vlan interface's PCP internally, when transmitting mbufs that contains PCP the vlan interface's PCP will get overwritten. Fix by operating on a local copy of qtag->pcp. Also mark 'struct ether_8021q_tag' as const so that compilers can pick up such kind of bug. PR: 273304 Reviewed by: kp Fixes: c7cffd65c5d85 Add support for stacked VLANs (IEEE 802.1ad, AKA Q-in-Q) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39505 --- sys/net/ethernet.h | 2 +- sys/net/if_ethersubr.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h index 8a4b9336b9cc..fca6748a0da7 100644 --- a/sys/net/ethernet.h +++ b/sys/net/ethernet.h @@ -446,7 +446,7 @@ void ether_vlan_mtap(struct bpf_if *, struct mbuf *, void *, u_int); struct mbuf *ether_vlanencap_proto(struct mbuf *, uint16_t, uint16_t); bool ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, - struct ifnet *p, struct ether_8021q_tag *); + struct ifnet *p, const struct ether_8021q_tag *); void ether_gen_addr(struct ifnet *ifp, struct ether_addr *hwaddr); static __inline struct mbuf *ether_vlanencap(struct mbuf *m, uint16_t tag) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 25f4d151866e..63ea5e7591c2 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1400,11 +1400,12 @@ SYSCTL_INT(_net_link_vlan, OID_AUTO, mtag_pcp, CTLFLAG_RW | CTLFLAG_VNET, bool ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, - struct ether_8021q_tag *qtag) + const struct ether_8021q_tag *qtag) { struct m_tag *mtag; int n; uint16_t tag; + uint8_t pcp = qtag->pcp; static const char pad[8]; /* just zeros */ /* @@ -1437,7 +1438,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, * If PCP is set in mbuf, use it */ if ((*mp)->m_flags & M_VLANTAG) { - qtag->pcp = EVL_PRIOFTAG((*mp)->m_pkthdr.ether_vtag); + pcp = EVL_PRIOFTAG((*mp)->m_pkthdr.ether_vtag); } /* @@ -1451,7 +1452,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, MTAG_8021Q_PCP_OUT, NULL)) != NULL) tag = EVL_MAKETAG(qtag->vid, *(uint8_t *)(mtag + 1), 0); else - tag = EVL_MAKETAG(qtag->vid, qtag->pcp, 0); + tag = EVL_MAKETAG(qtag->vid, pcp, 0); if ((p->if_capenable & IFCAP_VLAN_HWTAGGING) && (qtag->proto == ETHERTYPE_VLAN)) { (*mp)->m_pkthdr.ether_vtag = tag; From nobody Wed Aug 23 12:47: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 4RW5bR6NJXz4qZGT; Wed, 23 Aug 2023 12:47: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 4RW5bR5g6gz3SZp; Wed, 23 Aug 2023 12:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692794867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bgKrxf4WRTlPj3/jGFZ5l2LmxLL3XvAhdUnio4ms9U8=; b=S3eGnhlf7GYskc7bFQdT3aGQ24b9ZUUH+IkVoI9No4ynADemgrUrmVXRiiiEO2Ijy+8CCi rLBXeFkd5DIxMF8PpydqHqOaDdm4q3dEGjkd2ASsqAi4yYcdF2yfRBof0C3EMDD1xEN1lC bb97fEI7y7ThGD9WvQARKyda6q3D+OmPPhSI4OXCgZV0+TkRtlZofxzAuvpUkUDLTAS/bc tmvB/nYUQEr6Myx1ME4XF4oQX5YmBiBDHgH0VTyj/g/WsBkvIE6GCUp3sFaAmr1DUBFfKd E98CegYcfZ0TFqrVdnGG/K5YG/L5GpP7Z3Etv+n+6SS43D1WDKL/9JBUTGd3SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692794867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bgKrxf4WRTlPj3/jGFZ5l2LmxLL3XvAhdUnio4ms9U8=; b=VJHYozVAPZS3EFTOGVissny81WRG+RcANqw9EgffidNwi4Rn7a7fnQC9rItUlSvvDm9Sp8 66acwQKYa2ihf2p9Jvm+PD42/zqqcTxK6fufUcAinTSVlKDzqWujXgC31XADDI8IKwfwW+ TjLiV8r6f1R/IpelbLvuQ7JxGD8Qy9H5dipGXKGxNHYEn++tcMlagg6NICxIIlGXUSBnpt VkdTVj5nUHeE0RqSqP6KqbgI5mJrTicQnso2BmKMxn+Fj67YVwanwWG4ADgljb2HzJJSR0 udsLkFoVQPjTjkmMNhyb7f3LDmu+dZ1VoMksfyAjTErfeykte7rkwWRNmaUbag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692794867; a=rsa-sha256; cv=none; b=yKqsUSNZbMeb7pEfy+KzRjlq40kKxKYmWdlZp8baCNRbEjKsDofSYBcCX8hYgbDYO3a1rx 2mqJ88jvPlRfaRFxxNiW1KlCL8gw+SLkddj9zL95OT+c9AcBXi4n5zr/2lvqMVAVnlMxJZ 9UXIeK9iZ90coHrN4UCK4shLRKTKsXx+/2FqEIEmZChwQfY/YgTiQ4GK3Zp32ShUIhl0sy us0scVUDXn43Lxc0kJN8tu7v6IpqpulSc3pnMvZiZS3OIhn2iulW9/A2WocZhzldH0i2Y+ tRB30gpfyRWMoEHZCuBTuEpLqXPXH+8LJUrOZk80NeHN/qeh/FgDds2VbrrhWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RW5bR494bzlZK; Wed, 23 Aug 2023 12:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NCllBn042509; Wed, 23 Aug 2023 12:47:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NCllfv042506; Wed, 23 Aug 2023 12:47:47 GMT (envelope-from git) Date: Wed, 23 Aug 2023 12:47:47 GMT Message-Id: <202308231247.37NCllfv042506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 0834f13da9e3 - main - iavf: remove compatibility code and address some warnings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0834f13da9e3b2912368f9ee3467997cd76911a4 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=0834f13da9e3b2912368f9ee3467997cd76911a4 commit 0834f13da9e3b2912368f9ee3467997cd76911a4 Author: Piotr Kubaj AuthorDate: 2023-08-22 10:45:56 +0000 Commit: Piotr Kubaj CommitDate: 2023-08-23 12:48:11 +0000 iavf: remove compatibility code and address some warnings Code for pre-11 FreeBSD versions is removed. Also removed are macros that are not used anymore and "i" variable does not shadow anymore other "i" variable. Differential Revision: https://reviews.freebsd.org/D41547 Approved by: erj --- sys/dev/iavf/iavf_iflib.h | 3 --- sys/dev/iavf/iavf_lib.h | 14 -------------- sys/dev/iavf/iavf_vc_common.c | 34 +++++++++++----------------------- sys/dev/iavf/if_iavf_iflib.c | 4 ++-- 4 files changed, 13 insertions(+), 42 deletions(-) diff --git a/sys/dev/iavf/iavf_iflib.h b/sys/dev/iavf/iavf_iflib.h index 927c89fceeed..ec083d66a209 100644 --- a/sys/dev/iavf/iavf_iflib.h +++ b/sys/dev/iavf/iavf_iflib.h @@ -122,9 +122,6 @@ ((struct iavf_sc *)iflib_get_softc(_ctx)) /* Use the correct assert function for each lock type */ -#define IFLIB_CTX_ASSERT(_ctx) \ - sx_assert(iflib_ctx_lock_get(_ctx), SA_XLOCKED) - #define IAVF_VC_LOCK(_sc) mtx_lock(&(_sc)->vc_mtx) #define IAVF_VC_UNLOCK(_sc) mtx_unlock(&(_sc)->vc_mtx) #define IAVF_VC_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->vc_mtx) diff --git a/sys/dev/iavf/iavf_lib.h b/sys/dev/iavf/iavf_lib.h index d560d971b0f6..f3ccd9f0c52f 100644 --- a/sys/dev/iavf/iavf_lib.h +++ b/sys/dev/iavf/iavf_lib.h @@ -204,20 +204,6 @@ MALLOC_DECLARE(M_IAVF); IAVF_DEFAULT_RSS_HENA_BASE | \ IAVF_DEFAULT_ADV_RSS_HENA) -/* Pre-11 counter(9) compatibility */ -#define IAVF_SET_IPACKETS(vsi, count) (vsi)->ipackets = (count) -#define IAVF_SET_IERRORS(vsi, count) (vsi)->ierrors = (count) -#define IAVF_SET_OPACKETS(vsi, count) (vsi)->opackets = (count) -#define IAVF_SET_OERRORS(vsi, count) (vsi)->oerrors = (count) -#define IAVF_SET_COLLISIONS(vsi, count) /* Do nothing; collisions is always 0. */ -#define IAVF_SET_IBYTES(vsi, count) (vsi)->ibytes = (count) -#define IAVF_SET_OBYTES(vsi, count) (vsi)->obytes = (count) -#define IAVF_SET_IMCASTS(vsi, count) (vsi)->imcasts = (count) -#define IAVF_SET_OMCASTS(vsi, count) (vsi)->omcasts = (count) -#define IAVF_SET_IQDROPS(vsi, count) (vsi)->iqdrops = (count) -#define IAVF_SET_OQDROPS(vsi, count) (vsi)->oqdrops = (count) -#define IAVF_SET_NOPROTO(vsi, count) (vsi)->noproto = (count) - /* For stats sysctl naming */ #define IAVF_QUEUE_NAME_LEN 32 diff --git a/sys/dev/iavf/iavf_vc_common.c b/sys/dev/iavf/iavf_vc_common.c index 4577757090f5..8f45fe044094 100644 --- a/sys/dev/iavf/iavf_vc_common.c +++ b/sys/dev/iavf/iavf_vc_common.c @@ -39,10 +39,6 @@ */ #include "iavf_vc_common.h" -/* busy wait delay in msec */ -#define IAVF_BUSY_WAIT_DELAY 10 -#define IAVF_BUSY_WAIT_COUNT 50 - /* Static function decls */ static void iavf_handle_link_event(struct iavf_sc *sc, struct virtchnl_pf_event *vpe); @@ -662,27 +658,19 @@ void iavf_update_stats_counters(struct iavf_sc *sc, struct iavf_eth_stats *es) { struct iavf_vsi *vsi = &sc->vsi; - uint64_t tx_discards; - - tx_discards = es->tx_discards; /* Update ifnet stats */ - IAVF_SET_IPACKETS(vsi, es->rx_unicast + - es->rx_multicast + - es->rx_broadcast); - IAVF_SET_OPACKETS(vsi, es->tx_unicast + - es->tx_multicast + - es->tx_broadcast); - IAVF_SET_IBYTES(vsi, es->rx_bytes); - IAVF_SET_OBYTES(vsi, es->tx_bytes); - IAVF_SET_IMCASTS(vsi, es->rx_multicast); - IAVF_SET_OMCASTS(vsi, es->tx_multicast); - - IAVF_SET_OERRORS(vsi, es->tx_errors); - IAVF_SET_IQDROPS(vsi, es->rx_discards); - IAVF_SET_OQDROPS(vsi, tx_discards); - IAVF_SET_NOPROTO(vsi, es->rx_unknown_protocol); - IAVF_SET_COLLISIONS(vsi, 0); + vsi->ipackets = es->rx_unicast + es->rx_multicast + es->rx_broadcast; + vsi->opackets = es->tx_unicast + es->tx_multicast + es->tx_broadcast; + vsi->ibytes = es->rx_bytes; + vsi->obytes = es->tx_bytes; + vsi->imcasts = es->rx_multicast; + vsi->omcasts = es->tx_multicast; + + vsi->oerrors = es->tx_errors; + vsi->iqdrops = es->rx_discards; + vsi->oqdrops = es->tx_discards; + vsi->noproto = es->rx_unknown_protocol; vsi->eth_stats = *es; } diff --git a/sys/dev/iavf/if_iavf_iflib.c b/sys/dev/iavf/if_iavf_iflib.c index d53e59e29b51..b2531b797941 100644 --- a/sys/dev/iavf/if_iavf_iflib.c +++ b/sys/dev/iavf/if_iavf_iflib.c @@ -728,7 +728,7 @@ iavf_if_init(if_ctx_t ctx) INIT_DBG_IF(ifp, "begin"); - IFLIB_CTX_ASSERT(ctx); + sx_assert(iflib_ctx_lock_get(ctx), SA_XLOCKED); error = iavf_reset_complete(hw); if (error) { @@ -870,7 +870,7 @@ iavf_if_msix_intr_assign(if_ctx_t ctx, int msix __unused) fail: iflib_irq_free(ctx, &vsi->irq); rx_que = vsi->rx_queues; - for (int i = 0; i < vsi->num_rx_queues; i++, rx_que++) + for (i = 0; i < vsi->num_rx_queues; i++, rx_que++) iflib_irq_free(ctx, &rx_que->que_irq); return (err); } From nobody Wed Aug 23 13:01: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 4RW5vq3Nnbz4qZWT for ; Wed, 23 Aug 2023 13:01:59 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) (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 4RW5vp5lKwz3TfP for ; Wed, 23 Aug 2023 13:01:58 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-4fe27849e6aso8543472e87.1 for ; Wed, 23 Aug 2023 06:01:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692795717; x=1693400517; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=V/3o9a0K6YyGT6xYTEHemEFWJBMS/0WL1lWGTr5TGV0=; b=CoazkeMawZsGQu/2ZloidVAnHOcA1hYjFfdLtoYJH1iOWbNRPD5vPxxXlB9omt+IST cSsmCaWKFjTbps6wKO94EOpXb4036gEpp11o5GKmLEScqddKXXupBcSr72r1jDx9D5b9 GlFLrA2NOMbKuH0jyAnSGstMBYBdZkKw9kvz6cTQlP3DgZx9uLyKDDQ21bF1QNnhjSBJ VJ7Opvnqm5MGBQoMD5kH2fxYF6P4oa5IadZBZcAY+2wzZWsa2GD9PP9+rJwgP/4jW159 Fy1bkpZfFZ/1caD2oXa8wq50d2oXU6tZzsernfmI0oyHblWyV8xgBy/tXyuYq5+qCQnZ Fi8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692795717; x=1693400517; 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=V/3o9a0K6YyGT6xYTEHemEFWJBMS/0WL1lWGTr5TGV0=; b=jr0s1k9eKwuQB0SZ+kPDWcGK1UbAMSTS1RGX9kurMKSnAVKrdfCAPaxlB0bov+dmvS XudnIZN3XMMPMatIB9LE8dw9D1NTUoUWcJNOQOg2+nAjfHu9qQwRwuJnVF/e/ym4Miwd 6LBDKg3NQE4/PN81nrjc12cTo03tW6ywOtmdB5usEyt7YoZNOCvxROcTyIi6SLEz0G6o ywMTNw8JwZxs+MU1QqGlVARdq4KM11rTjalUoBUdbU6xASFZg9JGue2o8hPU7rbx89/r 1b33CtECECzkO03lJFHkBgTZi44xVDIZxsZ2GETtYrFDvP6QALT60FTEba/XHW2VHOAj HM2g== X-Gm-Message-State: AOJu0YzjZBmH3gJcdruOzmMldAelghE7qBN1ZHWBxnQCKBBHIIedQe76 EpBKpRHlIa0/2cvOj6txJV0yepbY70oPB62CZKCZrg== X-Google-Smtp-Source: AGHT+IH4cuiRDJVUTbwvRna+N1tEfizX/pB424tvKuvKivqgcite19niZJc8GuN6+Rs9DoXDvdYdEJvM+qvELABzy6Y= X-Received: by 2002:a05:6512:33c5:b0:4fe:3a57:7c98 with SMTP id d5-20020a05651233c500b004fe3a577c98mr10970902lfg.32.1692795716957; Wed, 23 Aug 2023 06:01:56 -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: <202308230007.37N07cOK082906@gitrepo.freebsd.org> <748B7A01-5011-44EE-BB04-282AE96F9B5B@freebsd.org> <0F3EA94D-6696-471C-ABF6-840B5E92967F@freebsd.org> In-Reply-To: <0F3EA94D-6696-471C-ABF6-840B5E92967F@freebsd.org> From: Warner Losh Date: Wed, 23 Aug 2023 07:01:53 -0600 Message-ID: Subject: Re: git: 4a69fc16a583 - main - Add membarrier(2) To: Jessica Clarke Cc: Konstantin Belousov , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000631868060396b7c9" X-Rspamd-Queue-Id: 4RW5vp5lKwz3TfP X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --000000000000631868060396b7c9 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Aug 22, 2023 at 11:37=E2=80=AFPM Jessica Clarke wrote: > > > The addition does not change any existing code path in the kernel. > > No, but it commits us to a new syscall being stable just days before 14 > branches and has its ABI frozen. > I'd planned on committing timerfd later today. I didn't consider it an ABI breakage, since it was just additive. It's one of the things that can be MFC'd (we don't prohibit new system calls). Warner --000000000000631868060396b7c9 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, Aug 22, 2023 at 11:37=E2=80= =AFPM Jessica Clarke <jrtc27@freeb= sd.org> wrote:

> The addition does not change any existing code path in the kernel.

No, but it commits us to a new syscall being stable just days before 14
branches and has its ABI frozen.

I'= d planned on committing timerfd later today. I didn't consider it an AB= I
breakage, since it was just additive. It's one of the thing= s that can be
MFC'd (we don't prohibit new system calls).=

Warner
--000000000000631868060396b7c9-- From nobody Wed Aug 23 14:53:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RW8Nv6Nq9z4qjmh; Wed, 23 Aug 2023 14:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RW8Nv5jz7z3bpL; Wed, 23 Aug 2023 14:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692802431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LKr1R1R81oZCN3TiIvQIV88F7VIkl3dRTc7CtL2tuDc=; b=I8T4ouZGafs8gyn+x1PpdwkFBDf0A70Y+2+FgzlOWcRH7V5kElK8Uk/rKDLsP8GqB05uRE NtfON4d2DPT+sF4s2gnVWJCN+d6TQbOp7rPS0iPdaHiVso271vjTNKqSBo0jSvAt3fPtEw ramcifs+OJFjpWv/6OdCZdxMGfrKd+ZvFXzOYsYAtJD6IImrvK15PxM7tIK0f1CIx6eyUP nUgYakPqYf0fdA+b1UmkdvvEbx49D1Ovg/AcWZSws+kVd9RoFLtdg2RUhOlqJWLObNhbZ1 vlTjJtSpxWM5cTug6L3mPxACtsgtDn5eOQBphq5XIAqM+LGq8jOplk2MCKOUJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692802431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LKr1R1R81oZCN3TiIvQIV88F7VIkl3dRTc7CtL2tuDc=; b=aVBJOIsp7nVBoxWrv0f3rw4urGuyFU9dlb79V1SR2KSUvqf8VsHaRSTE58GubsOOqgwYLM dPNKcZy/cLG35aLHEpsMAyaDMbNxEIgyF9qb5ongj48PlDOtGILsHTexvvY1jACCeGoTww 17c/qodsXkwM/1ubjoouLEPwaHx9klhV3S1VEQM6k1R4cqBQwxcCKj+4RnCHEq1rVFUwv+ oWG1RxlTKs9Zzob5hdcBACNXEBNqXA+qObJPjqIYN+CYyNL4gm06IWb2RWiCccTnpJkaj2 V/bn8lVaTuoqhV/Bssm4Br7cVUvjfI2O9Ur37iRxRojAO/a2IPFz8KArinkCkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692802431; a=rsa-sha256; cv=none; b=bNZhxhMGotFjlyRXDMyKmBi6P4HvTRQp5EzzZtNzUNjvdJgIb8+txOxOfrJFHhTYxf3cFy ot6ecTkY/fhBv/Xq6X4JJPjn3FRPKOlQBipTGi5m2l5DmiNVESzcJmWU1E6duGm2Qm/HOs 10XboIvBa3/K6NEcJzk0RMPUA1qIvbbxEN8rbQ9pClaVZHkWK2R4ZxAAGd1c28NyoLte0O mIxu1ym9MrFmrX+qXE/hWkRlsGjOm8zVd6G74pCFRZ0FB9x0vp98u0JheHjuZUsDvJCTBQ XfP/JoTM93v6bRfbYpIseNeU7nxVfM7BN4ycd3s//PaVFK9GtyPacl6/izsmGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RW8Nv4n8yzq3c; Wed, 23 Aug 2023 14:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NErpFq056041; Wed, 23 Aug 2023 14:53:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NErpkR056038; Wed, 23 Aug 2023 14:53:51 GMT (envelope-from git) Date: Wed, 23 Aug 2023 14:53:51 GMT Message-Id: <202308231453.37NErpkR056038@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: 3fc4f7c88085 - main - gicv3: Split out finding the page size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fc4f7c88085dc94c88348839074b8db6f19fae1 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3fc4f7c88085dc94c88348839074b8db6f19fae1 commit 3fc4f7c88085dc94c88348839074b8db6f19fae1 Author: Andrew Turner AuthorDate: 2023-08-22 10:51:26 +0000 Commit: Andrew Turner CommitDate: 2023-08-23 14:29:34 +0000 gicv3: Split out finding the page size When adding indirect (2 level) tabled we will need to know the page size to calculate the size of the level 1 table. To allow for this find the page size before entering the loop to calculate the final register value. Reviewed by: gallatin, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41551 --- sys/arm64/arm64/gicv3_its.c | 72 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 14 deletions(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index 0e2ccb5037ce..d67b19e7d345 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -424,6 +424,52 @@ gicv3_its_cmdq_init(struct gicv3_its_softc *sc) gic_its_write_8(sc, GITS_CWRITER, 0x0); } +static int +gicv3_its_table_page_size(struct gicv3_its_softc *sc, int table) +{ + uint64_t reg, tmp; + int page_size; + + page_size = PAGE_SIZE_64K; + reg = gic_its_read_8(sc, GITS_BASER(table)); + + while (1) { + reg &= GITS_BASER_PSZ_MASK; + switch (page_size) { + case PAGE_SIZE_4K: /* 4KB */ + reg |= GITS_BASER_PSZ_4K << GITS_BASER_PSZ_SHIFT; + break; + case PAGE_SIZE_16K: /* 16KB */ + reg |= GITS_BASER_PSZ_16K << GITS_BASER_PSZ_SHIFT; + break; + case PAGE_SIZE_64K: /* 64KB */ + reg |= GITS_BASER_PSZ_64K << GITS_BASER_PSZ_SHIFT; + break; + } + + /* Write the new page size */ + gic_its_write_8(sc, GITS_BASER(table), reg); + + /* Read back to check */ + tmp = gic_its_read_8(sc, GITS_BASER(table)); + + /* The page size is correct */ + if ((tmp & GITS_BASER_PSZ_MASK) == (reg & GITS_BASER_PSZ_MASK)) + return (page_size); + + switch (page_size) { + default: + return (-1); + case PAGE_SIZE_16K: + page_size = PAGE_SIZE_4K; + break; + case PAGE_SIZE_64K: + page_size = PAGE_SIZE_16K; + break; + } + } +} + static int gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) { @@ -460,20 +506,30 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) cache = GITS_BASER_CACHE_WAWB; } share = GITS_BASER_SHARE_IS; - page_size = PAGE_SIZE_64K; for (i = 0; i < GITS_BASER_NUM; i++) { reg = gic_its_read_8(sc, GITS_BASER(i)); /* The type of table */ type = GITS_BASER_TYPE(reg); + if (type == GITS_BASER_TYPE_UNIMPL) + continue; + /* The table entry size */ esize = GITS_BASER_ESIZE(reg); + /* Find the tables page size */ + page_size = gicv3_its_table_page_size(sc, i); + if (page_size == -1) { + device_printf(dev, "No valid page size for table %d\n", + i); + return (EINVAL); + } + switch(type) { case GITS_BASER_TYPE_DEV: nidents = (1 << devbits); its_tbl_size = esize * nidents; - its_tbl_size = roundup2(its_tbl_size, PAGE_SIZE_64K); + its_tbl_size = roundup2(its_tbl_size, page_size); break; case GITS_BASER_TYPE_VP: case GITS_BASER_TYPE_PP: /* Undocumented? */ @@ -540,18 +596,6 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) continue; } - if ((tmp & GITS_BASER_PSZ_MASK) != - (reg & GITS_BASER_PSZ_MASK)) { - switch (page_size) { - case PAGE_SIZE_16K: - page_size = PAGE_SIZE_4K; - continue; - case PAGE_SIZE_64K: - page_size = PAGE_SIZE_16K; - continue; - } - } - if (tmp != reg) { device_printf(dev, "GITS_BASER%d: " "unable to be updated: %lx != %lx\n", From nobody Wed Aug 23 14:53: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 4RW8Nx0gWNz4qjN6; Wed, 23 Aug 2023 14:53: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 4RW8Nw6x7Jz3cDs; Wed, 23 Aug 2023 14:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692802433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UIpSbDANdj24xnQYpvoVcoZ8m89b+So8/QuCMb/dJaA=; b=Uik6yei6uz6JUKazc3XFvw0w3Bb3zkvH/psV2inODY5DE5yMWQUt7UMGdgno6zAz/ta5qm RNgBi/4hluHdli8ulUnEK7s6YE1ORE69eUc4q5+mmzDx2hT67IFEjJ/NaqWYDARCpF9MW/ YI57kbB9lRZ95L1IbS44Y6NFMn/EGP5pOWQlQ65b8Lmq2GeiBZYKDyIEyFD4tm4cwae4EB 6C4rLS0xtNBeazRcAv0GHDG/D71zergzRjIruR1Hg95CVUHmAuBgyfjkuBn0xICTq88QcW T3tATIY5wfY+83g6obV5A7Gqzcj7SdqinvTlWwo3+iPiKPstC9dxjcqtJSoPEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692802433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UIpSbDANdj24xnQYpvoVcoZ8m89b+So8/QuCMb/dJaA=; b=XtnOg/rBq1ld7AsFUELSdyYpQmwFrAOWBdUqikK0Ynm7nRtZ2OxD33gRrvG6EMFpAmtIzG ldB0bDuB1Pj2TwcgZy7oG2WnHPBbH0Z8hrsXRXojNPDzWzICmeF+GjfJvPyC8/DGqlYFDW oZmcAEQiZj+kUBkal7ejDq982MIkE6IqVsQqgoWmzlqZWNFWxNmj0Yv2B0rhNrc1a7gcPt wk5OXkyx7liPLRIyjSOH/N6hIE5m5AVGz37Mf6ukrz3kiAfAhn4q+gEMsbi/iCkyD0ySrI rnxRlgk2+Ak3heg/JwUtFt45nUtBwjttwBpio8OgIgCISf6QzrMe2AIvxl8Qkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692802433; a=rsa-sha256; cv=none; b=n8rZq21ifAS0ptsZUPVYihqn4JtJjAyjbNJxFsgSCPSvkv8QR+Mb1Dz/te+1MvFm9gyQub rX1bsREMCFrzKTZI61pXhilmfeTmU7gEAqjaWVOH+YfqdyQJZs8i8WsIsy8sAQyO+7PKUR qmwrvReZfpdcu42DxEaOWzp5p6Gu3DNAp2ApEB5hNqPiTnGU3K7T86zzDFk6yZHrBQJhGt BPzQ6grMfaE7JSEkwsqIwLX7mAqaSqs5OdfLrDo3d1q+CbQHq4k1x1oz45LR63WVK7aRtA 6F3A7k16q7Po6aEpHxim+UxpsOQiLSlb/FpPPqI1fp7ChgyJyU3kbXRWgcl4WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RW8Nw5jP8zqHm; Wed, 23 Aug 2023 14:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NErqM7056088; Wed, 23 Aug 2023 14:53:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NErq7b056085; Wed, 23 Aug 2023 14:53:52 GMT (envelope-from git) Date: Wed, 23 Aug 2023 14:53:52 GMT Message-Id: <202308231453.37NErq7b056085@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: 47a4b8ca96e3 - main - gicv3: Stop setting the esize field List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 47a4b8ca96e3e18262629c05e46228c99a618487 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=47a4b8ca96e3e18262629c05e46228c99a618487 commit 47a4b8ca96e3e18262629c05e46228c99a618487 Author: Andrew Turner AuthorDate: 2023-08-22 11:29:03 +0000 Commit: Andrew Turner CommitDate: 2023-08-23 14:29:34 +0000 gicv3: Stop setting the esize field The GITS_BASER esize field is read-only, there is no need to change it. Reviewed by: gallatin, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41551 --- sys/arm64/arm64/gicv3_its.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index d67b19e7d345..ef73c76d2062 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -557,14 +557,13 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) /* Clear the fields we will be setting */ reg &= ~(GITS_BASER_VALID | GITS_BASER_INDIRECT | GITS_BASER_CACHE_MASK | GITS_BASER_TYPE_MASK | - GITS_BASER_ESIZE_MASK | GITS_BASER_PA_MASK | + GITS_BASER_PA_MASK | GITS_BASER_SHARE_MASK | GITS_BASER_PSZ_MASK | GITS_BASER_SIZE_MASK); /* Set the new values */ reg |= GITS_BASER_VALID | (cache << GITS_BASER_CACHE_SHIFT) | (type << GITS_BASER_TYPE_SHIFT) | - ((esize - 1) << GITS_BASER_ESIZE_SHIFT) | paddr | (share << GITS_BASER_SHARE_SHIFT) | (nitspages - 1); From nobody Wed Aug 23 14:53: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 4RW8Ny5TRFz4qjQj; Wed, 23 Aug 2023 14:53: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 4RW8Ny0Nltz3cFF; Wed, 23 Aug 2023 14:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692802434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mMq6Lb0EH03q90c3X7T+Evslmt9P2jIHut5opQ2MGq0=; b=atw+jMzhwEutxcCsklUodhH8Eh643MRm076VByoyU3FttbgOvjwHZRE8Y0qtsnZL40M1Lv Tnc2L2PsqzHl2++/d2KZeo+TjQdCi8WIW3VdGpwQzyh6mX4l5Bo7/9N13m2LvalFMTQB/+ 4QE22wHwy1lgviZebfNwsN45wA8cgQb3+HQvbGqTcfhU8pO9QatuXm6rxfv9zHM0aNjwLi y42/uQlu3drgVnYqyk19n4nV8ivRyEeBWQXdIXn0DSFrVdBV3LFxN7m+JhzI9mg4A8qQGL QRVCp6i8/9+ShfZUGXD2RCAekBH4aUJbb6mhEVM9CXaCfUBsYQTcx6HnqU6ESQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692802434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mMq6Lb0EH03q90c3X7T+Evslmt9P2jIHut5opQ2MGq0=; b=ukGWM0OI3gcfxUQovV+oTSNPYcd0caaATemGt+ThTzuMSeX2dQt64xEyeU9kf1bgnsadLw 0GzVBNz+pinPbGN000wiPu1NbCvyk3b4F/biXr8CpJ4tQniZG9hK466ettPBuOcrGLu4kr c0JINEc+Aqz7BDje51c4MWMbsFbkCk/F0y8Yx5U7HPVYrt3jpLV/W3nNoh7TW0sii0nP9g 0R4iDoHWK88Pe77BlEwgWVQ5kjyHkmFqOJMBHZtL3fWwXPTl3GaUaPuUR0NS6fEEFhUKMy 7lBM8grvD6iJ0N5BqPjFEW0YgvFRQTVkRPB+Os0AnhaUwj/ZASTyBGtcOFR5uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692802434; a=rsa-sha256; cv=none; b=yRqgJJGGAa/Gz7n7RlPXHdXkP+90covV9mnZJHPTA37Hs1i2uOd/K7Vl7OAUlL9GyVmJCY bVIWsRsl7iZMCrIIiaFYI8QgeOQl/iHdhBUO2MQGs0SifFPqgVK8pRlPJV4fsnJU8gz88w bAKHcRQnn4Wp7x07CY1J0O4ADF5vAt1ENkOZWrJgaE/tFfybBjJ+fYhdoVc9I+baU2GMSX V7k1OsmbHjO4IxGUx1LEaUfPxT4zB64mb1SeWJ+kI7ytRMVE+wpniLmC5rw/h+pw/3N+8y KYQ9tqg1dE2DimNMK35RDIqLo4MDPyFd8zuAqolAzE41vpdiuaDXh4BmEENnkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RW8Nx6TXkzq3d; Wed, 23 Aug 2023 14:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NErr7j056139; Wed, 23 Aug 2023 14:53:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NErri3056136; Wed, 23 Aug 2023 14:53:53 GMT (envelope-from git) Date: Wed, 23 Aug 2023 14:53:53 GMT Message-Id: <202308231453.37NErri3056136@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: 7f9694ad7e7c - main - gicv3: Add a verbose message for unknown tables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f9694ad7e7c271e341cba65ce482a552ea47230 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7f9694ad7e7c271e341cba65ce482a552ea47230 commit 7f9694ad7e7c271e341cba65ce482a552ea47230 Author: Andrew Turner AuthorDate: 2023-08-22 11:30:50 +0000 Commit: Andrew Turner CommitDate: 2023-08-23 14:29:34 +0000 gicv3: Add a verbose message for unknown tables Add a message under bootverbose when we find a gicv3 its table type that is unknown. Reviewed by: gallatin, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41551 --- sys/arm64/arm64/gicv3_its.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index ef73c76d2062..cc743e72b032 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -537,6 +537,9 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) its_tbl_size = page_size; break; default: + if (bootverbose) + device_printf(dev, "Unhandled table type %lx\n", + type); continue; } npages = howmany(its_tbl_size, PAGE_SIZE); From nobody Wed Aug 23 14:53: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 4RW8Nz5DDQz4qjWJ; Wed, 23 Aug 2023 14:53: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 4RW8Nz1Jqcz3cFW; Wed, 23 Aug 2023 14:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692802435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QfpytRehHE+1SeFjNZRvRGdnc5NnqDfhko+UZputGQw=; b=cc5HuFy26Z+27vsxNy2kRf1wy4NzchWrvkjY6IF/Xq/T1EyUA4C3YSz4D1GWia1sUfYmoN HOP9jVMJnPix8GvQdySiYm8YxqDfGLU49ex0twgM6LF2y0Azl+GyBfMlcb2AU/xUqqtFWY d17gla8N/Da0ptPO9ZQ38hK7PTh4f96MPjBxn9Qtv2P/CePt/es/3fgwUwwIotQ8LVpTj7 tUC+JZFxRVP8Di4FAu+8fpIyC5QXSzk3OZTgS9RTShID1UVNHO4vqxOTyRQpstJF/O4nyX 6GhGA/hRuuYqG5cl0k1G1QAUNwsOTI+5/9aiuiqWgglQ700nKQyH+nzsHD4Kwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692802435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QfpytRehHE+1SeFjNZRvRGdnc5NnqDfhko+UZputGQw=; b=oaegt0QaBjIPEJMxbBtyggF3JVo/fE+8XrsiLZhUZIoGhqCHFDYK07+qYGeQQTzdu1ngmn 10S/0KK1foK7uUpKoYR0VTVGTBaHAA927KhHrzIubvETGCrC6/AKL2nWwvRLeFqpQ1z8Vg CRYfw0dMN/3XtPe5Fu9ER/IxoAm7YclqjqZDgUVe1nG4C4nZhnNJJ1riD3iNnNIw3KgWq2 zxQN8PpAzMJOI2IuPmklva/kgAJojmNaKdhqha4uFIkiOXHx8SMg2jy6LtV5YzPLuH2Y3x r5F06usk/O/qBO+59GLIXEV+1wulGRf7OtHZQSgZx0irLOXfBQL0L3ZvXmHWeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692802435; a=rsa-sha256; cv=none; b=YF8R81ajGOOVkUlyllc4v/MaYELUB3VV2zOyw+ttCwT/rcvQf0Uxo8RvkQhKT3T781U5JG qgjuCoXb8YqeUL+OnRQigSnffCS4SX4VHl29ByzVlS+U+U53WJ8V0mvsXM2jCQ3vU/rQOA 4dYIIkcvhci6RGr5nOGEBz2hXgyYoK19akmOkXOCjxbHqrQneDV4l9Ub/zAu6SxN67DdL0 fPzd1qMejpX5u2u5pXTzvVo/HFPwm8lBqR0Y86rKBO5NT6+HARpLzli0Jg5R02OqmDh31y tJlQIGdeg46vnhZ+gOEA3rz8vfklqIKyrRTeGpshCVc65CYLrA68bGPjiaLhjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RW8Nz0Q7KzqHn; Wed, 23 Aug 2023 14:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NErsJf056191; Wed, 23 Aug 2023 14:53:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NErsQH056188; Wed, 23 Aug 2023 14:53:54 GMT (envelope-from git) Date: Wed, 23 Aug 2023 14:53:54 GMT Message-Id: <202308231453.37NErsQH056188@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: 950421e231e5 - main - gicv3: Add checks for the device 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 950421e231e5e5067dcb09b026e14f9810cc3cd4 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=950421e231e5e5067dcb09b026e14f9810cc3cd4 commit 950421e231e5e5067dcb09b026e14f9810cc3cd4 Author: Andrew Turner AuthorDate: 2023-08-22 14:37:19 +0000 Commit: Andrew Turner CommitDate: 2023-08-23 14:29:34 +0000 gicv3: Add checks for the device ID Add checks that the device ID is supported by the hardware and is within the range allocated when the driver attaches. Reviewed by: gallatin, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41551 --- sys/arm64/arm64/gicv3_its.c | 48 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index cc743e72b032..cb655eaca412 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -221,7 +221,10 @@ struct its_cmd { /* An ITS private table */ struct its_ptable { vm_offset_t ptab_vaddr; - unsigned long ptab_size; + /* Size of the L1 table */ + size_t ptab_l1_size; + /* Number of L1 entries */ + int ptab_l1_nidents; }; /* ITS collection description. */ @@ -246,6 +249,8 @@ struct gicv3_its_softc { cpuset_t sc_cpus; struct domainset *sc_ds; u_int gic_irq_cpu; + int sc_devbits; + int sc_dev_table_idx; struct its_ptable sc_its_ptab[GITS_BASER_NUM]; struct its_col *sc_its_cols[MAXCPU]; /* Per-CPU collections */ @@ -476,7 +481,8 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) vm_offset_t table; vm_paddr_t paddr; uint64_t cache, reg, share, tmp, type; - size_t esize, its_tbl_size, nidents, nitspages, npages; + size_t its_tbl_size, nitspages, npages; + size_t l1_esize, l1_nidents; int i, page_size; int devbits; @@ -505,6 +511,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) devbits = GITS_TYPER_DEVB(gic_its_read_8(sc, GITS_TYPER)); cache = GITS_BASER_CACHE_WAWB; } + sc->sc_devbits = devbits; share = GITS_BASER_SHARE_IS; for (i = 0; i < GITS_BASER_NUM; i++) { @@ -515,7 +522,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) continue; /* The table entry size */ - esize = GITS_BASER_ESIZE(reg); + l1_esize = GITS_BASER_ESIZE(reg); /* Find the tables page size */ page_size = gicv3_its_table_page_size(sc, i); @@ -527,8 +534,13 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) switch(type) { case GITS_BASER_TYPE_DEV: - nidents = (1 << devbits); - its_tbl_size = esize * nidents; + if (sc->sc_dev_table_idx != -1) + device_printf(dev, + "Warning: Multiple device tables found\n"); + + sc->sc_dev_table_idx = i; + l1_nidents = (1 << devbits); + its_tbl_size = l1_esize * l1_nidents; its_tbl_size = roundup2(its_tbl_size, page_size); break; case GITS_BASER_TYPE_VP: @@ -550,7 +562,8 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) (1ul << 48) - 1, PAGE_SIZE_64K, 0); sc->sc_its_ptab[i].ptab_vaddr = table; - sc->sc_its_ptab[i].ptab_size = npages * PAGE_SIZE; + sc->sc_its_ptab[i].ptab_l1_size = its_tbl_size; + sc->sc_its_ptab[i].ptab_l1_nidents = l1_nidents; paddr = vtophys(table); @@ -874,6 +887,7 @@ gicv3_its_attach(device_t dev) sc = device_get_softc(dev); + sc->sc_dev_table_idx = -1; sc->sc_irq_length = gicv3_get_nirqs(dev); sc->sc_irq_base = GIC_FIRST_LPI; sc->sc_irq_base += device_get_unit(dev) * sc->sc_irq_length; @@ -1200,6 +1214,23 @@ its_device_find(device_t dev, device_t child) return (its_dev); } +static bool +its_device_alloc(struct gicv3_its_softc *sc, int devid) +{ + struct its_ptable *ptable; + + /* No device table */ + if (sc->sc_dev_table_idx < 0) { + if (devid < (1 << sc->sc_devbits)) + return (true); + return (false); + } + + ptable = &sc->sc_its_ptab[sc->sc_dev_table_idx]; + /* Check the devid is within the table limit */ + return (devid < ptable->ptab_l1_nidents); +} + static struct its_dev * its_device_get(device_t dev, device_t child, u_int nvecs) { @@ -1225,6 +1256,11 @@ its_device_get(device_t dev, device_t child, u_int nvecs) its_dev->lpis.lpi_num = nvecs; its_dev->lpis.lpi_free = nvecs; + if (!its_device_alloc(sc, its_dev->devid)) { + free(its_dev, M_GICV3_ITS); + return (NULL); + } + if (vmem_alloc(sc->sc_irq_alloc, nvecs, M_FIRSTFIT | M_NOWAIT, &irq_base) != 0) { free(its_dev, M_GICV3_ITS); From nobody Wed Aug 23 14:53: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 4RW8P105Lpz4qjKs; Wed, 23 Aug 2023 14:53: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 4RW8P02ZmHz3cN1; Wed, 23 Aug 2023 14:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692802436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5UA4ed8zwL2BaAbykRS1H3lDyp0UurmxQMvytIOZHtc=; b=DgZAdhFrX7UFvZCZLuvWlrjMN83ZAB0uaHdejiL/DfFvfawNuT6vnGJZb22l6xLOZ/sgH8 DAy76tUNEtP4rjWL1Wc/dt+c9mtfN2c5Ftv/pCOsS40A3pjdMkkOsUisGfvr0116UiV366 4+E7o/aOgVmM9ib+35ZGUqRdkimxLd2gmhVglRFHenXGgFN/EZcA0KLjDaY11Dj+UJSRmF zAtoMLD3culvDDBQR2LzyhxRkqkrpAjqK7jAuj1eopdXsQSNG42r1sVhXKuv16D7SFMNre JnImiPFDCoCGLamaCxJn5sUYJSqYmm/DMBPdb9KZc96iX5x4Hv6vQzkRR2G1Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692802436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5UA4ed8zwL2BaAbykRS1H3lDyp0UurmxQMvytIOZHtc=; b=v6utQ/zG2ULFQTG4ghfV2Z/OeqEfigKIFX1Hn93iEztlZxYetvJQZTSgppBy6DmAnAkbfz wpblx8DiXYBaY6RsYXV61wchEZUlHFDQxjbO8qLzj+7zpIazfoL4JosaqFFP07vaulpCzb fEmfXpGXUJwvjJ/8t46CmKc4W/rIHrsf8G9a2h+octLcOB/OSp61/+ECqA1r+Gp9zkXGuY 6vkrf+gCGEoHIYpFK64cffoV3gGjKOVEwxTUKSj6+nSpWAXqgW2JVXKSk9g6mgQgGVwqzn 6QZndZpG/ijPqDxRWXnFlL8OTnO4IQUGwRkmioH1LgNFX3h6QhxxzQ3vtZHXXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692802436; a=rsa-sha256; cv=none; b=KR+B3YQp11cgRnt3GLubZuhUi8FOzC48MVRDyov+vszN2PHQ+1SUv8JCxXySVUcA/6ayoT Oj2ME8e+gkxAsGdxELytB+T1aBz+i8F4Jir15izTwFtm2n+ATjdR3+YlgJhEgLzjVCSma6 gJlSOcDw2NOsU0Xb8GkkpyQjiPpFLsLZMNnpQQECUkr8S+7PjKNY0w0EIhR6GmwsQaEyvS xk+gKIpnIdGtrQwfId0oKwTFnKq0We5sCz/7qgptAbKz111+YZw4cqkPY/sHH9O1xIK6jl xwFPQ4Eylt5xe1WIWXlzRsAznXLAzyrXmJcc3ejcVzSRmrBXxGKvvlBTIjafZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RW8P01NmTzpRM; Wed, 23 Aug 2023 14:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NEru3L056236; Wed, 23 Aug 2023 14:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NErugD056233; Wed, 23 Aug 2023 14:53:56 GMT (envelope-from git) Date: Wed, 23 Aug 2023 14:53:56 GMT Message-Id: <202308231453.37NErugD056233@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: 676386b5563f - main - Support dynamically sized register sets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 676386b5563f60739d5ea2244cd0d770b390a1d7 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=676386b5563f60739d5ea2244cd0d770b390a1d7 commit 676386b5563f60739d5ea2244cd0d770b390a1d7 Author: Andrew Turner AuthorDate: 2023-08-23 14:32:56 +0000 Commit: Andrew Turner CommitDate: 2023-08-23 14:32:56 +0000 Support dynamically sized register sets We don't always know the size of the register set at compile time, e.g. on arm64 the size of the SVE registers need to be queried on boot. To support register sets that needs to be calculated at run time query the correct size when it is zero. Reviewed by: markj, kib (earlier version) Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41302 --- sys/kern/sys_process.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 86b9ec532c11..647487f86b02 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -190,8 +190,21 @@ proc_read_regset(struct thread *td, int note, struct iovec *iov) if (regset == NULL) return (EINVAL); + if (regset->get == NULL) + return (EINVAL); + + size = regset->size; + /* + * The regset is dynamically sized, e.g. the size could change + * depending on the hardware, or may have a per-thread size. + */ + if (size == 0) { + if (!regset->get(regset, td, NULL, &size)) + return (EINVAL); + } + if (iov->iov_base == NULL) { - iov->iov_len = regset->size; + iov->iov_len = size; if (iov->iov_len == 0) return (EINVAL); @@ -199,14 +212,10 @@ proc_read_regset(struct thread *td, int note, struct iovec *iov) } /* The length is wrong, return an error */ - if (iov->iov_len != regset->size) - return (EINVAL); - - if (regset->get == NULL) + if (iov->iov_len != size) return (EINVAL); error = 0; - size = regset->size; p = td->td_proc; /* Drop the proc lock while allocating the temp buffer */ @@ -218,7 +227,7 @@ proc_read_regset(struct thread *td, int note, struct iovec *iov) if (!regset->get(regset, td, buf, &size)) { error = EINVAL; } else { - KASSERT(size == regset->size, + KASSERT(size == regset->size || regset->size == 0, ("%s: Getter function changed the size", __func__)); iov->iov_len = size; @@ -245,14 +254,23 @@ proc_write_regset(struct thread *td, int note, struct iovec *iov) if (regset == NULL) return (EINVAL); + size = regset->size; + /* + * The regset is dynamically sized, e.g. the size could change + * depending on the hardware, or may have a per-thread size. + */ + if (size == 0) { + if (!regset->get(regset, td, NULL, &size)) + return (EINVAL); + } + /* The length is wrong, return an error */ - if (iov->iov_len != regset->size) + if (iov->iov_len != size) return (EINVAL); if (regset->set == NULL) return (EINVAL); - size = regset->size; p = td->td_proc; /* Drop the proc lock while allocating the temp buffer */ From nobody Wed Aug 23 16:34: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 4RWBdZ1rb2z4r5d3; Wed, 23 Aug 2023 16:34: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 4RWBdZ0crDz4J5m; Wed, 23 Aug 2023 16:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=niYB6mBb9NJCggDAiTZkd9lKZ4+vL4BdiYjpdkVPO18=; b=YjSZC9IKwqx1nxUHyBZxkJ+4feQD6NSL+U9dqmfoQZK84FX7V16CpbfuF8ULKpgQ4S05uk 4jTQzfxQiUtuedYXe/4IcXXPz/vepV5z3F5AQ6fhUE/0bRyZI/YYYpzrl1OzOFcaea/QWA DRNqsOhrNVWvoGR1OGryplR4xvzXLJdmHWkiGsDo5urN5Ac0TUHqYdnf9PoOsv2q8RlJ5L 4vUYIl+pT9Y6zveSLqleCmCuJbixhfesRLWf5CzXsIaWJIDh71NiDiB5nZzL9cTnKrd77v EFFxllbSLYB9LAG64JlnA/MNl+SCD/ra/4QolgAkjO1+Q+Uw8KtE5+/JLg/ieg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=niYB6mBb9NJCggDAiTZkd9lKZ4+vL4BdiYjpdkVPO18=; b=njkwyoHdoLehx2WjtL8thZLpI3425y4Ra6zQw76cKwHMAST+0AQxosimqr4H8nbR/mwgbK vr04XmfjIGeOB/hyQgDUUWp1mpyIuIRfLuBXHoGevttchUaOXkoSGanDKl/naDenMP2W9n iFMdorL80iio33YxjpiZ4lTRwybrSrzyUn+6ohFfysnZ37TDMVtz9/gzAe5YHEWj6L4F0B 8MjEEgpK7sADA1nqnrAHP/XDIUBgViwxMHdGLn1Bej6jqrdMMIzS9qwbCmp7dT4QmQNpWB dCF7iEAnSkjZ/PMWe+jKUPV1avuw8cJMmr/YzVR1F1xlySLeWGIy8qLcrxzHzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692808498; a=rsa-sha256; cv=none; b=tq0uNCvaoeHv1K3U0hfqFuxEOwtSK0hk0VJD404y/MCZqrjrjzmQ8fusi0kItCeB19yYpC Dg3GPsilzFokbyLjiuo5owulBAMVDhooSDkWn4OAu4JED0lt+DBjF+fDWFhUz/D3c1sqwD W0m/ULn6MTCoBws6XtNyZ5h30BdvxhFMLcaqPgP3ixC+RvBxm1dYgLqfItocckxXTJS4xo NqzZR16ZmqMkE9iQeILBOsfLOPz4G7oDnwDCWd6Hm/9aeKXcmOaXGFxFryLMcYnO7GefaN yWKdAuQ9iiXhgVAPAGKyNLd5/Fkj2vPvgFGdeCm+ethA7u8ZOACJccVsdfQysA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWBdY6q3Xzshb; Wed, 23 Aug 2023 16:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NGYvag022657; Wed, 23 Aug 2023 16:34:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NGYveE022654; Wed, 23 Aug 2023 16:34:57 GMT (envelope-from git) Date: Wed, 23 Aug 2023 16:34:57 GMT Message-Id: <202308231634.37NGYveE022654@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: fcace2906ddf - main - syslogd: Add some basic regression 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcace2906ddfae6bee6064b63a6df44be1bdf04b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fcace2906ddfae6bee6064b63a6df44be1bdf04b commit fcace2906ddfae6bee6064b63a6df44be1bdf04b Author: Jake Freeland AuthorDate: 2023-06-22 21:19:51 +0000 Commit: Mark Johnston CommitDate: 2023-08-23 16:17:40 +0000 syslogd: Add some basic regression tests Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41403 --- etc/mtree/BSD.tests.dist | 2 + usr.sbin/syslogd/Makefile | 3 + usr.sbin/syslogd/tests/Makefile | 3 + usr.sbin/syslogd/tests/syslogd_test.sh | 299 +++++++++++++++++++++++++++++++++ 4 files changed, 307 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 48b6d9fffde2..fb755b4001ac 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1181,6 +1181,8 @@ .. sa .. + syslogd + .. .. .. diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile index 8bdc107dd1c1..803ec8c93056 100644 --- a/usr.sbin/syslogd/Makefile +++ b/usr.sbin/syslogd/Makefile @@ -44,4 +44,7 @@ PPPPACKAGE= ppp CFLAGS+= -I${SRCTOP}/usr.bin/wall +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/usr.sbin/syslogd/tests/Makefile b/usr.sbin/syslogd/tests/Makefile new file mode 100644 index 000000000000..9f7e151a3938 --- /dev/null +++ b/usr.sbin/syslogd/tests/Makefile @@ -0,0 +1,3 @@ +ATF_TESTS_SH+= syslogd_test + +.include diff --git a/usr.sbin/syslogd/tests/syslogd_test.sh b/usr.sbin/syslogd/tests/syslogd_test.sh new file mode 100644 index 000000000000..e4927868e47f --- /dev/null +++ b/usr.sbin/syslogd/tests/syslogd_test.sh @@ -0,0 +1,299 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2021, 2023 The FreeBSD Foundation +# +# This software was developed by Mark Johnston under sponsorship from +# the FreeBSD Foundation. +# +# This software was developed by Jake Freeland under sponsorship from +# the FreeBSD Foundation. +# + +# Tests to-do: +# actions: hostname, users + +readonly SYSLOGD_UDP_PORT="5140" +readonly SYSLOGD_CONFIG="${PWD}/syslog.conf" +readonly SYSLOGD_LOCAL_SOCKET="${PWD}/log.sock" +readonly SYSLOGD_PIDFILE="${PWD}/syslogd.pid" +readonly SYSLOGD_LOCAL_PRIVSOCKET="${PWD}/logpriv.sock" + +# Start a private syslogd instance. +syslogd_start() +{ + syslogd \ + -b ":${SYSLOGD_UDP_PORT}" \ + -C \ + -d \ + -f "${SYSLOGD_CONFIG}" \ + -H \ + -p "${SYSLOGD_LOCAL_SOCKET}" \ + -P "${SYSLOGD_PIDFILE}" \ + -S "${SYSLOGD_LOCAL_PRIVSOCKET}" \ + $@ \ + & + + # Give syslogd a bit of time to spin up. + while [ "$((i+=1))" -le 20 ]; do + [ -S "${SYSLOGD_LOCAL_SOCKET}" ] && return + sleep 0.1 + done + atf_fail "timed out waiting for syslogd to start" +} + +# Simple logger(1) wrapper. +syslogd_log() +{ + atf_check -s exit:0 -o empty -e empty logger $* +} + +# Make syslogd reload its configuration file. +syslogd_reload() +{ + pkill -HUP -F "${SYSLOGD_PIDFILE}" +} + +# Stop a private syslogd instance. +syslogd_stop() +{ + pid=$(cat "${SYSLOGD_PIDFILE}") + if pkill -F "${SYSLOGD_PIDFILE}"; then + wait "${pid}" + rm -f "${SYSLOGD_PIDFILE}" "${SYSLOGD_LOCAL_SOCKET}" \ + "${SYSLOGD_LOCAL_PRIVSOCKET}" + fi +} + +atf_test_case "basic" "cleanup" +basic_head() +{ + atf_set descr "Messages are logged via supported transports" +} +basic_body() +{ + logfile="${PWD}/basic.log" + printf "user.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + syslogd_start + + syslogd_log -p user.debug -t basic -h "${SYSLOGD_LOCAL_SOCKET}" \ + "hello, world (unix)" + atf_check -s exit:0 -o match:"basic: hello, world \(unix\)" \ + tail -n 1 "${logfile}" + + # Grab kernel configuration file. + sysctl kern.conftxt > conf.txt + + # We have INET transport; make sure we can use it. + if grep -qw "INET" conf.txt; then + syslogd_log -4 -p user.debug -t basic -h 127.0.0.1 -P "${SYSLOGD_UDP_PORT}" \ + "hello, world (v4)" + atf_check -s exit:0 -o match:"basic: hello, world \(v4\)" \ + tail -n 1 "${logfile}" + fi + # We have INET6 transport; make sure we can use it. + if grep -qw "INET6" conf.txt; then + syslogd_log -6 -p user.debug -t basic -h ::1 -P "${SYSLOGD_UDP_PORT}" \ + "hello, world (v6)" + atf_check -s exit:0 -o match:"basic: hello, world \(v6\)" \ + tail -n 1 "${logfile}" + fi +} +basic_cleanup() +{ + syslogd_stop +} + +atf_test_case "reload" "cleanup" +reload_head() +{ + atf_set descr "SIGHUP correctly refreshes configuration" +} +reload_body() +{ + logfile="${PWD}/reload.log" + printf "user.debug\t/${logfile}\n" > "${SYSLOGD_CONFIG}" + syslogd_start + + syslogd_log -p user.debug -t reload -h "${SYSLOGD_LOCAL_SOCKET}" \ + "pre-reload" + atf_check -s exit:0 -o match:"reload: pre-reload" tail -n 1 "${logfile}" + + # Override the old rule. + truncate -s 0 "${logfile}" + printf "news.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + syslogd_reload + + syslogd_log -p user.debug -t reload -h "${SYSLOGD_LOCAL_SOCKET}" \ + "post-reload user" + syslogd_log -p news.debug -t reload -h "${SYSLOGD_LOCAL_SOCKET}" \ + "post-reload news" + atf_check -s exit:0 -o not-match:"reload: post-reload user" cat ${logfile} + atf_check -s exit:0 -o match:"reload: post-reload news" cat ${logfile} +} +reload_cleanup() +{ + syslogd_stop +} + +atf_test_case "prog_filter" "cleanup" +prog_filter_head() +{ + atf_set descr "Messages are only received from programs in the filter" +} +prog_filter_body() +{ + logfile="${PWD}/prog_filter.log" + printf "!prog1,prog2\nuser.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + syslogd_start + + for i in 1 2 3; do + syslogd_log -p user.debug -t "prog${i}" -h "${SYSLOGD_LOCAL_SOCKET}" \ + "hello this is prog${i}" + done + atf_check -s exit:0 -o match:"prog1: hello this is prog1" cat "${logfile}" + atf_check -s exit:0 -o match:"prog2: hello this is prog2" cat "${logfile}" + atf_check -s exit:0 -o not-match:"prog3: hello this is prog3" cat "${logfile}" + + # Override the old rule. + truncate -s 0 ${logfile} + printf "!-prog1,prog2\nuser.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + syslogd_reload + + for i in 1 2 3; do + syslogd_log -p user.debug -t "prog${i}" -h "${SYSLOGD_LOCAL_SOCKET}" \ + "hello this is prog${i}" + done + atf_check -s exit:0 -o not-match:"prog1: hello this is prog1" cat "${logfile}" + atf_check -s exit:0 -o not-match:"prog2: hello this is prog2" cat "${logfile}" + atf_check -s exit:0 -o match:"prog3: hello this is prog3" cat "${logfile}" +} +prog_filter_cleanup() +{ + syslogd_stop +} + +atf_test_case "host_filter" "cleanup" +host_filter_head() +{ + atf_set descr "Messages are only received from hostnames in the filter" +} +host_filter_body() +{ + logfile="${PWD}/host_filter.log" + printf "+host1,host2\nuser.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + syslogd_start + + for i in 1 2 3; do + syslogd_log -p user.debug -t "host${i}" -H "host${i}" \ + -h "${SYSLOGD_LOCAL_SOCKET}" "hello this is host${i}" + done + atf_check -s exit:0 -o match:"host1: hello this is host1" cat "${logfile}" + atf_check -s exit:0 -o match:"host2: hello this is host2" cat "${logfile}" + atf_check -s exit:0 -o not-match:"host3: hello this is host3" cat "${logfile}" + + # Override the old rule. + truncate -s 0 ${logfile} + printf "\-host1,host2\nuser.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + syslogd_reload + + for i in 1 2 3; do + syslogd_log -p user.debug -t "host${i}" -H "host${i}" \ + -h "${SYSLOGD_LOCAL_SOCKET}" "hello this is host${i}" + done + atf_check -s exit:0 -o not-match:"host1: hello this is host1" cat "${logfile}" + atf_check -s exit:0 -o not-match:"host2: hello this is host2" cat "${logfile}" + atf_check -s exit:0 -o match:"host3: hello this is host3" cat "${logfile}" +} +host_filter_cleanup() +{ + syslogd_stop +} + +atf_test_case "prop_filter" "cleanup" +prop_filter_head() +{ + atf_set descr "Messages are received based on conditions in the propery based filter" +} +prop_filter_body() +{ + logfile="${PWD}/prop_filter.log" + printf ":msg,contains,\"FreeBSD\"\nuser.debug\t${logfile}\n" \ + > "${SYSLOGD_CONFIG}" + syslogd_start + + syslogd_log -p user.debug -t "prop1" -h "${SYSLOGD_LOCAL_SOCKET}" "FreeBSD" + syslogd_log -p user.debug -t "prop2" -h "${SYSLOGD_LOCAL_SOCKET}" "freebsd" + atf_check -s exit:0 -o match:"prop1: FreeBSD" cat "${logfile}" + atf_check -s exit:0 -o not-match:"prop2: freebsd" cat "${logfile}" + + truncate -s 0 ${logfile} + printf ":msg,!contains,\"FreeBSD\"\nuser.debug\t${logfile}\n" \ + > "${SYSLOGD_CONFIG}" + syslogd_reload + + syslogd_log -p user.debug -t "prop1" -h "${SYSLOGD_LOCAL_SOCKET}" "FreeBSD" + syslogd_log -p user.debug -t "prop2" -h "${SYSLOGD_LOCAL_SOCKET}" "freebsd" + atf_check -s exit:0 -o not-match:"prop1: FreeBSD" cat "${logfile}" + atf_check -s exit:0 -o match:"prop2: freebsd" cat "${logfile}" + + truncate -s 0 ${logfile} + printf ":msg,icase_contains,\"FreeBSD\"\nuser.debug\t${logfile}\n" \ + > "${SYSLOGD_CONFIG}" + syslogd_reload + + syslogd_log -p user.debug -t "prop1" -h "${SYSLOGD_LOCAL_SOCKET}" "FreeBSD" + syslogd_log -p user.debug -t "prop2" -h "${SYSLOGD_LOCAL_SOCKET}" "freebsd" + atf_check -s exit:0 -o match:"prop1: FreeBSD" cat "${logfile}" + atf_check -s exit:0 -o match:"prop2: freebsd" cat "${logfile}" + + truncate -s 0 ${logfile} + printf ":msg,!icase_contains,\"FreeBSD\"\nuser.debug\t${logfile}\n" \ + > "${SYSLOGD_CONFIG}" + syslogd_reload + + syslogd_log -p user.debug -t "prop1" -h "${SYSLOGD_LOCAL_SOCKET}" "FreeBSD" + syslogd_log -p user.debug -t "prop2" -h "${SYSLOGD_LOCAL_SOCKET}" "freebsd" + syslogd_log -p user.debug -t "prop3" -h "${SYSLOGD_LOCAL_SOCKET}" "Solaris" + atf_check -s exit:0 -o not-match:"prop1: FreeBSD" cat "${logfile}" + atf_check -s exit:0 -o not-match:"prop2: freebsd" cat "${logfile}" + atf_check -s exit:0 -o match:"prop3: Solaris" cat "${logfile}" +} +prop_filter_cleanup() +{ + syslogd_stop +} + +atf_test_case "pipe_action" "cleanup" +pipe_action_head() +{ + atf_set descr "The pipe action evaluates provided command in sh(1)" +} +pipe_action_body() +{ + logfile="${PWD}/pipe_action.log" + printf "\"While I'm digging in the tunnel, the elves will often come to me \ + with solutions to my problem.\"\n-Saymore Crey" > ${logfile} + + printf "!pipe\nuser.debug\t| sed -i '' -e 's/Saymore Crey/Seymour Cray/g' \ + ${logfile}\n" > "${SYSLOGD_CONFIG}" + syslogd_start + + syslogd_log -p user.debug -t "pipe" -h "${SYSLOGD_LOCAL_SOCKET}" \ + "fix spelling error" + atf_check -s exit:0 -o match:"Seymour Cray" cat "${logfile}" +} +pipe_action_cleanup() +{ + syslogd_stop +} + +atf_init_test_cases() +{ + atf_add_test_case "basic" + atf_add_test_case "reload" + atf_add_test_case "prog_filter" + atf_add_test_case "host_filter" + atf_add_test_case "prop_filter" + atf_add_test_case "pipe_action" +} From nobody Wed Aug 23 16:38: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 4RWBk93dxFz4r5k9; Wed, 23 Aug 2023 16:38: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 4RWBk92vltz4JLm; Wed, 23 Aug 2023 16:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YzHvFtCmD7+FBPZmJlAv72U2KZxe5fL2EYaFqaxzh8=; b=EMq5HxQI1Kbe3EpheaWrKhiETDPHeDbdi5lF0Ef6yS2lDuaZagqxFyBWwkF9jHp26vkvbO B6/SmUu6I3ovR9ygQDf2NOB2yZdKVGqzqqSdiUShGApWgsMtObHO53wA+dl274CGbYQ2qx wKzHfZj/VYwpUisUbl0+J5rCXzKGOEl8wBq1oR7NGKY+tCV1n1DNzorHY1Uzw+fkRYHi0g LC18uwOys9Vcb+jPjRTMcraIw/ApOvzqObF9kmlNZtVlKaa6A7xpkq2G6lyXnZ57ADvywZ XGW00htZQ63q8AKQLbV/DBFGAPgaMvadPCHbRb7oqX+xUPNBrnFKUTLdy69XPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YzHvFtCmD7+FBPZmJlAv72U2KZxe5fL2EYaFqaxzh8=; b=pIie3qZEDEToybpuNcqByFmvJSgdu1zc1tjD2JbPdmKwDzt/IWVYeUUUjZkBVVqiAUkBzM nLGl9z8uz/0DKYYztGFBCmPZ8+mEexsljj9HZUdOowvrCyU9MWyC+BJxhqMRz9ghEjvyr5 dLzdI9kLVz7JJZpCXKZtJ5fi8bO3aMYrJ35uiEqZNmhSIpgQ+sD51jCqy7ps+ZO1eaPorA 5pWzEsGEQGbsnIRMayOfPayFCYXdBFZ4//y6+juHXjI+Ig4CYv4E9vnAHYDrxCHrg9yUzK Pn5atKYnMbrAKHSr9u5hwIzljQ+qCKjmD2dAXpNzgnZwdym6ykeGjmctr19iLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692808737; a=rsa-sha256; cv=none; b=w1hgT6TEX8R6h/gOqi/swFXdor+41qfJxlfwr1ty65lamUUWw0sIuQ5n8sv2fWPnuQWQRT Z1+kbEAu/3mD4s6ty4NxpxSxUMwd0b9ZdOpojeRvlLENDb4yGtSsMp5li1m5TmY6DBrl6Z /H4uEGBDmYlKCEOykjBpWYJ9ii2pRj18QoeAGfjdVsF66SGPA4IdO0+bkZmIj5L/8sTuMZ gyZoEb2XY80Wpdd0SRoIk8dUJOxT+RyNh0NaheT4qNJWGDJixwKLUibVebtN7l1F0jX54O gl2v5GXSc61qpXJcclifjQ8BnYh9VCfVEpDONjgZFcW1PU5jydMtrkBQHauuUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWBk91xQzzscK; Wed, 23 Aug 2023 16:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NGcvVM023374; Wed, 23 Aug 2023 16:38:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NGcvBL023371; Wed, 23 Aug 2023 16:38:57 GMT (envelope-from git) Date: Wed, 23 Aug 2023 16:38:57 GMT Message-Id: <202308231638.37NGcvBL023371@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: 160919c86435 - main - Revert "gicv3: Add checks for the device 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 160919c8643579639756c811cb563f4f6852f6bc Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=160919c8643579639756c811cb563f4f6852f6bc commit 160919c8643579639756c811cb563f4f6852f6bc Author: Andrew Turner AuthorDate: 2023-08-23 15:34:42 +0000 Commit: Andrew Turner CommitDate: 2023-08-23 16:38:20 +0000 Revert "gicv3: Add checks for the device ID" This reverts commit 950421e231e5e5067dcb09b026e14f9810cc3cd4. It has the wrong differential review link --- sys/arm64/arm64/gicv3_its.c | 48 ++++++--------------------------------------- 1 file changed, 6 insertions(+), 42 deletions(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index cb655eaca412..cc743e72b032 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -221,10 +221,7 @@ struct its_cmd { /* An ITS private table */ struct its_ptable { vm_offset_t ptab_vaddr; - /* Size of the L1 table */ - size_t ptab_l1_size; - /* Number of L1 entries */ - int ptab_l1_nidents; + unsigned long ptab_size; }; /* ITS collection description. */ @@ -249,8 +246,6 @@ struct gicv3_its_softc { cpuset_t sc_cpus; struct domainset *sc_ds; u_int gic_irq_cpu; - int sc_devbits; - int sc_dev_table_idx; struct its_ptable sc_its_ptab[GITS_BASER_NUM]; struct its_col *sc_its_cols[MAXCPU]; /* Per-CPU collections */ @@ -481,8 +476,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) vm_offset_t table; vm_paddr_t paddr; uint64_t cache, reg, share, tmp, type; - size_t its_tbl_size, nitspages, npages; - size_t l1_esize, l1_nidents; + size_t esize, its_tbl_size, nidents, nitspages, npages; int i, page_size; int devbits; @@ -511,7 +505,6 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) devbits = GITS_TYPER_DEVB(gic_its_read_8(sc, GITS_TYPER)); cache = GITS_BASER_CACHE_WAWB; } - sc->sc_devbits = devbits; share = GITS_BASER_SHARE_IS; for (i = 0; i < GITS_BASER_NUM; i++) { @@ -522,7 +515,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) continue; /* The table entry size */ - l1_esize = GITS_BASER_ESIZE(reg); + esize = GITS_BASER_ESIZE(reg); /* Find the tables page size */ page_size = gicv3_its_table_page_size(sc, i); @@ -534,13 +527,8 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) switch(type) { case GITS_BASER_TYPE_DEV: - if (sc->sc_dev_table_idx != -1) - device_printf(dev, - "Warning: Multiple device tables found\n"); - - sc->sc_dev_table_idx = i; - l1_nidents = (1 << devbits); - its_tbl_size = l1_esize * l1_nidents; + nidents = (1 << devbits); + its_tbl_size = esize * nidents; its_tbl_size = roundup2(its_tbl_size, page_size); break; case GITS_BASER_TYPE_VP: @@ -562,8 +550,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) (1ul << 48) - 1, PAGE_SIZE_64K, 0); sc->sc_its_ptab[i].ptab_vaddr = table; - sc->sc_its_ptab[i].ptab_l1_size = its_tbl_size; - sc->sc_its_ptab[i].ptab_l1_nidents = l1_nidents; + sc->sc_its_ptab[i].ptab_size = npages * PAGE_SIZE; paddr = vtophys(table); @@ -887,7 +874,6 @@ gicv3_its_attach(device_t dev) sc = device_get_softc(dev); - sc->sc_dev_table_idx = -1; sc->sc_irq_length = gicv3_get_nirqs(dev); sc->sc_irq_base = GIC_FIRST_LPI; sc->sc_irq_base += device_get_unit(dev) * sc->sc_irq_length; @@ -1214,23 +1200,6 @@ its_device_find(device_t dev, device_t child) return (its_dev); } -static bool -its_device_alloc(struct gicv3_its_softc *sc, int devid) -{ - struct its_ptable *ptable; - - /* No device table */ - if (sc->sc_dev_table_idx < 0) { - if (devid < (1 << sc->sc_devbits)) - return (true); - return (false); - } - - ptable = &sc->sc_its_ptab[sc->sc_dev_table_idx]; - /* Check the devid is within the table limit */ - return (devid < ptable->ptab_l1_nidents); -} - static struct its_dev * its_device_get(device_t dev, device_t child, u_int nvecs) { @@ -1256,11 +1225,6 @@ its_device_get(device_t dev, device_t child, u_int nvecs) its_dev->lpis.lpi_num = nvecs; its_dev->lpis.lpi_free = nvecs; - if (!its_device_alloc(sc, its_dev->devid)) { - free(its_dev, M_GICV3_ITS); - return (NULL); - } - if (vmem_alloc(sc->sc_irq_alloc, nvecs, M_FIRSTFIT | M_NOWAIT, &irq_base) != 0) { free(its_dev, M_GICV3_ITS); From nobody Wed Aug 23 16:38: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 4RWBkB4MqTz4r5M4; Wed, 23 Aug 2023 16:38: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 4RWBkB3wrrz4Jd3; Wed, 23 Aug 2023 16:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6PgqcCKQdzWuZtnsqjeYlxtjnuBhPA9Fjo71Yhw/oMs=; b=JLWg1Tb/W5BEZofxieFkYTGZEkHlInzXN2HI5p816y+p5E40yczAcI63sTVypj/aE1lSOy Vu5g7xKegIaOBqa3SbFX4GeBDtQ1YJa+u7f68DQUfvnVKKEJd+ZeNPNdC/TO8/PnCOVkny DyUYMAfZbeg2+U+PCERbgHUo+bimge2t/lyh8vBraBO0CCMKBsXpUXnzfprFqy4+xRGYd7 1BbDiw1iqyWhSZCmfsGz25DE75mN9JOSrgMnkWWj19kf02tBefDOXrgup7b9njncoCTpzt jpYJ+SzUqXEXtzTiAb3RRUrCdXz9UwYCm8T2BQIrg4dHxr8DUP2fSVbRzTl7wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6PgqcCKQdzWuZtnsqjeYlxtjnuBhPA9Fjo71Yhw/oMs=; b=PB+vz2yeLIMj6NyR2h5LAjNiQQeBc1z8fMqRkPCBQTr/gibXm0R03TENUyGjy9ABc87nrf 8787v4oASh2joIEzorrMJEm952tGY3t/hbJm3VtCi2IXMMhMQDuUWGZTtVeSw3p5G8dnlA VCQEgIPDR/KLVjHV6j7Wt0tXCaP36SU/P6Pp42wBoelhXUUEb63ZDkgXGLLaU8abyh1NpU p48GuXlRRoP1SF4m4J60B1xir2+1VMbBrtLNwvTcvVcvjQS6nNR7MJtyvEaZT6avA+R0Sy ILznZyueKKTuz6w3UU5ISGz2f6UypDLdSZdTP9VYIVQR+ZZRAQ+XFvrNWC5S1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692808738; a=rsa-sha256; cv=none; b=f2zgyuz5K+ikc/9BjOQkKvUZLjcvwWDel6uZvET26aCo6zzpLOfP7GIkqh6bLgD2R4p2EO GODdq6ql/T9h9dHioeuiY+mukEgtmCk8E2UvySNq7WlIvx3GIweF8fQaTcATmK7tGts75F gmnbq9KC2PDiZ+bo5i7ejZR2ypa1tgZdnwJlaFXbdTAvnaXl+XGdA+8IjZVDF0IM0TmnS6 3SBRWh37MpbtYlPDZ+IVg3zak25eamijh/8vniZeSKaxXwTvDkWXcAxX8N3sCnGBQh9QRW JPpVL3DYJr4LspmJuKIsmCQncGkyN3d5emTw9qGhw1aV1VyhElNa5u/YneHDNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWBkB2xLRzsZB; Wed, 23 Aug 2023 16:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NGcwcg023428; Wed, 23 Aug 2023 16:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NGcw6F023425; Wed, 23 Aug 2023 16:38:58 GMT (envelope-from git) Date: Wed, 23 Aug 2023 16:38:58 GMT Message-Id: <202308231638.37NGcw6F023425@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: b9cdb04f4ea2 - main - Revert "gicv3: Add a verbose message for unknown tables" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9cdb04f4ea2f5ba61a45af2d6bc23dbd5f0869d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b9cdb04f4ea2f5ba61a45af2d6bc23dbd5f0869d commit b9cdb04f4ea2f5ba61a45af2d6bc23dbd5f0869d Author: Andrew Turner AuthorDate: 2023-08-23 15:34:50 +0000 Commit: Andrew Turner CommitDate: 2023-08-23 16:38:20 +0000 Revert "gicv3: Add a verbose message for unknown tables" This reverts commit 7f9694ad7e7c271e341cba65ce482a552ea47230. It has the wrong differential review link --- sys/arm64/arm64/gicv3_its.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index cc743e72b032..ef73c76d2062 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -537,9 +537,6 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) its_tbl_size = page_size; break; default: - if (bootverbose) - device_printf(dev, "Unhandled table type %lx\n", - type); continue; } npages = howmany(its_tbl_size, PAGE_SIZE); From nobody Wed Aug 23 16:38: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 4RWBkC6DLqz4r5kD; Wed, 23 Aug 2023 16:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWBkC4Z2Nz4JbQ; Wed, 23 Aug 2023 16:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3sjm1nGT0qr9OoPpjrpH9G7kEUoR+K4hlxDi72qeC44=; b=e1jSRUbcoAn2bdYTSr6IvjMY338LD3m7+WO9dHW/k1+6X0DRQu7utAk9p/IuiECF23U0K+ iUsIlJ28wKvjZ6EALu7TXTL6B1lkEyzoPwGb0zQBB693uAj13UQrD0fScBAQ8Kfqv8LNt1 uKRpxZV9vH4tGm/vdzmN+QzrYrE5jniaDvwT8i8kaVrbKOBaMEIfzWGG+rkw+QJlynxJ8P D8iLANYnozsDU1sJc0JKQ0pHNsFMXhmJdE3YZ6t5pL08BJxD1XLFaKw1ZBn9+w4/XFyBL9 /OzixTORSK10dbPN1tvzFJ2rqtSQdHH+u81ly6A6Nfl/ntwFTl0rJTu+EMBUHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3sjm1nGT0qr9OoPpjrpH9G7kEUoR+K4hlxDi72qeC44=; b=ogDBECq2QcTkEilKdp53c24ijHazvBBGMzSHrl/dIKVUjXP/i0K/Rw9NC2QMgUzapIDcNy l55DtIN5DcDb9OhIGqMaZq5x8TJm+Qh/ZLkG4o21Xl/i8oWP9MXhhpUHFJSX87hRYG0UMQ L7uZDsC9i+R7+KHwN7COVSyZ/iyLczvdZqKLbRMaO4k2VlI64ltnRu5pom/FA4TauUricG oVuChIuIA9qX3WCUTpEtPSCEjXeJdB6LbshtX0csql1g+/vGEF0+PE/SGZ/AMGuqEJ3yK0 d6trbySLp61uDy3tzXjAxLYMP+AxaF3Tfyw76mGAlkmjoLMEcfOyDZbnKd1HRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692808739; a=rsa-sha256; cv=none; b=DsWfR34Efw8sAep83UDkHhZA8Z0Cno3t5pfzWsY+fuA3NStILeDwveq4X6SmG1tly7yK+M A6nNg8oYmCi9O9/pYbT5Gx80/w6gZAmtwnN2ClrlhSSyyzLheiFxM5PTJCzVcHu8+UhBex HrPmv1UYtvC2geABWpBEI2VGHlDAKhiJqA1riXzB4K/eUHjd9KyZ1UpJAmLlLP6bLudVvI e3gpBWJkQ1GD52bSDkNOB0hSseCRwwEoH4C24SC+TGF7Pe9eET97ZwAs6HS6oHA17TrnWZ U0CeSJBF77Mxsd+ouJ/xwBPGKB9duZpDKfFwpMMK2ZKiBYO7NnoE6pYgx0MuYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWBkC3fPhzscL; Wed, 23 Aug 2023 16:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NGcxHe023476; Wed, 23 Aug 2023 16:38:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NGcx01023473; Wed, 23 Aug 2023 16:38:59 GMT (envelope-from git) Date: Wed, 23 Aug 2023 16:38:59 GMT Message-Id: <202308231638.37NGcx01023473@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: 43d74fcac058 - main - Revert "gicv3: Stop setting the esize field" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 43d74fcac0589b3e6ee39bf4c2b307998aa5759d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=43d74fcac0589b3e6ee39bf4c2b307998aa5759d commit 43d74fcac0589b3e6ee39bf4c2b307998aa5759d Author: Andrew Turner AuthorDate: 2023-08-23 15:34:54 +0000 Commit: Andrew Turner CommitDate: 2023-08-23 16:38:20 +0000 Revert "gicv3: Stop setting the esize field" This reverts commit 47a4b8ca96e3e18262629c05e46228c99a618487. It has the wrong differential review link --- sys/arm64/arm64/gicv3_its.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index ef73c76d2062..d67b19e7d345 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -557,13 +557,14 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) /* Clear the fields we will be setting */ reg &= ~(GITS_BASER_VALID | GITS_BASER_INDIRECT | GITS_BASER_CACHE_MASK | GITS_BASER_TYPE_MASK | - GITS_BASER_PA_MASK | + GITS_BASER_ESIZE_MASK | GITS_BASER_PA_MASK | GITS_BASER_SHARE_MASK | GITS_BASER_PSZ_MASK | GITS_BASER_SIZE_MASK); /* Set the new values */ reg |= GITS_BASER_VALID | (cache << GITS_BASER_CACHE_SHIFT) | (type << GITS_BASER_TYPE_SHIFT) | + ((esize - 1) << GITS_BASER_ESIZE_SHIFT) | paddr | (share << GITS_BASER_SHARE_SHIFT) | (nitspages - 1); From nobody Wed Aug 23 16:39: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 4RWBkD6CYtz4r5n6; Wed, 23 Aug 2023 16:39: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 4RWBkD5Z8Nz4JkW; Wed, 23 Aug 2023 16:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6KiOyWDeHKWvX2D797fYQXzqh70EsJACFVIZzvNTB0=; b=X9QrCNoLupKe99qxYeb5cc1tp4WpiMVVFaguoewuw9QK6ok2f3bTel7yYuuz6ALCyfd6/R UUeoMlcEgBfcWOxJRiuymEUVq0Ptsia/D/Ci/l51wrngwDTRYJDC9/84+5F+fkqfD4zZ/b llKal3m85oiOYbl/lZPNq9fdXg/WY7Df5Uu3ISBrrKk/ueyeUQwn5Ih97ww/mgpUG8gPGr plMK2HkBV/TYHLEvr5wadrM+THpB1V07QRtI3EjMx3iZt+4IEIg4v2Vfj6i1beDnifKPGU 4jRhHiQg58vFsp+ioy+IMKEGoV191amcBDdWIOPMdpmhlHUPO5zy7RTQzzVUKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6KiOyWDeHKWvX2D797fYQXzqh70EsJACFVIZzvNTB0=; b=Hh0QZsOTN8A+luOttL2w+E5d0CZPcaWLr78YDaISOfSaKuQazQem+ovUKZ9S2I4nStsRs9 wnjbA8j3vbbV9kFQzEBjaw9HxeJE0Egb03c7h4DNs7tpkya56/qPv7mSJdzrmAgtIHVe+X tTOGPcJLeLMrL/TJgIHTlRuFLMC9wcCrmuryK+QJ09Z73ZE2hH1VHbiBAEQ3dNnsqdAs5U WLHEsEzIpHa9fXDmez2ZbBdrigQsPze5/Kb42ZgUgUlCbVNVPIDe8IY2rQx7lIzujaILWJ DV9ETlreKxpRmcO/CoF4tomX0FG50Y+2Nyp0OWx0aYv+zPo3J14D9a2upkeF6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692808740; a=rsa-sha256; cv=none; b=yXhWpv98Axvx6+4/4ultFffTsvvh5l6kEz1slz3BmEs85HptskKWWr5fmi8EVIdeSWU8AI +mJfiyi9z3Pha2jnpXi4ROkOYay2NBO+jY4X7vGtSpldxQiMku92Tn9CJckrDHjYIdWVtn 7p4LhVToC8ST2UfxdYmMuNSWePzmHOcQ17YOn8uwd9Ev7DI+GSVHFGVprEHjcuBFI3GSJ7 NrL4LpbR800Uy5exyiVloH8+uREjLqQCb7yyss0sh9poQJm0DC9yxjI+3rlVTL19OIM13i /Z3M3a/+HQdLEceEZ21zfj7t1qnaqwtIjLu7IpPg/ZRfLBaUFGlPLs4L5e/vVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWBkD4ZWKzsZC; Wed, 23 Aug 2023 16:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NGd0rq023528; Wed, 23 Aug 2023 16:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NGd0p0023525; Wed, 23 Aug 2023 16:39:00 GMT (envelope-from git) Date: Wed, 23 Aug 2023 16:39:00 GMT Message-Id: <202308231639.37NGd0p0023525@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: 2f11b2abfc18 - main - gicv3: Stop setting the esize field List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2f11b2abfc185d3d4f45e6a3dae270b859cdd388 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2f11b2abfc185d3d4f45e6a3dae270b859cdd388 commit 2f11b2abfc185d3d4f45e6a3dae270b859cdd388 Author: Andrew Turner AuthorDate: 2023-08-22 11:29:03 +0000 Commit: Andrew Turner CommitDate: 2023-08-23 16:38:20 +0000 gicv3: Stop setting the esize field The GITS_BASER esize field is read-only, there is no need to change it. Reviewed by: gallatin, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41552 --- sys/arm64/arm64/gicv3_its.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index d67b19e7d345..ef73c76d2062 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -557,14 +557,13 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) /* Clear the fields we will be setting */ reg &= ~(GITS_BASER_VALID | GITS_BASER_INDIRECT | GITS_BASER_CACHE_MASK | GITS_BASER_TYPE_MASK | - GITS_BASER_ESIZE_MASK | GITS_BASER_PA_MASK | + GITS_BASER_PA_MASK | GITS_BASER_SHARE_MASK | GITS_BASER_PSZ_MASK | GITS_BASER_SIZE_MASK); /* Set the new values */ reg |= GITS_BASER_VALID | (cache << GITS_BASER_CACHE_SHIFT) | (type << GITS_BASER_TYPE_SHIFT) | - ((esize - 1) << GITS_BASER_ESIZE_SHIFT) | paddr | (share << GITS_BASER_SHARE_SHIFT) | (nitspages - 1); From nobody Wed Aug 23 16:39: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 4RWBkG04nfz4r59d; Wed, 23 Aug 2023 16:39: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 4RWBkF6TZLz4K3N; Wed, 23 Aug 2023 16:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6BP+EBcEu9FRAsTmeLtWCoi6L/9wmN0vBMw0XUPSbhY=; b=RzecP/S+5ooSrmmS1Zt/YxrvRvVJCiQSZTKiEvqcnQzsVP+ugLrxR79P8/DbFUN25WcE+A UWVrU0vv8cIpAp513dDsRl7mk0y4WzbqwssP07WnO2N7FprS5z4O5rjkC/tIedbJpgslkn DuH/xxYGoiqt+dQDbkS+rTsVVEiriF6W11g2oAzYQQYkynaRbE2jkZM0fkiGeiCc3ePn0b iBGQYVAO8d4MGF5kSi4lS9yUFQrhpyYmDlqGoiOafNrfFGnTn91W9rPTMl0ptsjt1H+Gd3 uKH30WC8XhnMlY9455y+Cp2uEMJ8ROSZ4JDIRUn7KxlXHDahV8Su7P6sPm+zoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6BP+EBcEu9FRAsTmeLtWCoi6L/9wmN0vBMw0XUPSbhY=; b=G99OTcGSgDcceAo/C4v+ZSm+hQEhwh7vGzSUJTgcGj3n/XNpN5AWzWQXswazpDosLnEvln 8I1/JvIFAuhNi0PA+I9zzRoUu5scWwitZKjr5Y91mDif4uvWOuX8HlnvGBGujoku9yhmAJ qbaAazUthyYHZMt4f/DtTE7+yCu692xqahGgOZsXeozGA4NNuIihmiv3JIfBZo5zeSn/2g LYUzN8J4vPWD81qzTZJHtP02obwxJsNns+oPazPfMl+u5pnuxRU7GFy6irZEtA9uafSq4k gs7KZpR53k42jMJ3nNM8Tq7rbOLzC5RthOwmUdWaYGuZKJnsdBl55W9onCLY+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692808741; a=rsa-sha256; cv=none; b=i+fTlG+XY4KqLZM2lRN5bPNaNiMunmS4m1KFIX7obpcB0IaewwKXMg9P/HblFhuHZHVWRB 31oNzVySfr5GdwYaioNbz5dnT/w1xXFthRuMcehNlZ7gPACD02VFjTGAd66zEQ8NLYN5k2 ZXzQ97hZDTyPKW8KXgtGC0l/R06uQ1B+s5JmDNv5Yeopuer/6PAKV3s4/l02TQpeWnVCFR Beqp/F9VD+wAwx18LTYiy6z3Uz0hP3wJU675laskmaNKEXzuvWWKIN5ggVCV3AJ2ps4e9e mDnm59818qeWSdUEzAONgYHlMpWI7VEkO42V+Ynly7aPOC0OldLXxY3bfG0aJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWBkF5bGnzsBD; Wed, 23 Aug 2023 16:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NGd1eQ023581; Wed, 23 Aug 2023 16:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NGd1Ix023578; Wed, 23 Aug 2023 16:39:01 GMT (envelope-from git) Date: Wed, 23 Aug 2023 16:39:01 GMT Message-Id: <202308231639.37NGd1Ix023578@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: 629734783de5 - main - gicv3: Add a verbose message for unknown tables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 629734783de5212ea2a7cdc6a8fb7cf6834b1344 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=629734783de5212ea2a7cdc6a8fb7cf6834b1344 commit 629734783de5212ea2a7cdc6a8fb7cf6834b1344 Author: Andrew Turner AuthorDate: 2023-08-22 11:30:50 +0000 Commit: Andrew Turner CommitDate: 2023-08-23 16:38:20 +0000 gicv3: Add a verbose message for unknown tables Add a message under bootverbose when we find a gicv3 its table type that is unknown. Reviewed by: gallatin, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41553 --- sys/arm64/arm64/gicv3_its.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index ef73c76d2062..cc743e72b032 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -537,6 +537,9 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) its_tbl_size = page_size; break; default: + if (bootverbose) + device_printf(dev, "Unhandled table type %lx\n", + type); continue; } npages = howmany(its_tbl_size, PAGE_SIZE); From nobody Wed Aug 23 16:39: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 4RWBkH0t7Qz4r5hg; Wed, 23 Aug 2023 16:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWBkH0CK9z4K4D; Wed, 23 Aug 2023 16:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lw7KukhqqjJEpyvAtsosllJ8ws6auMtHeNfwaDBU6FY=; b=BM4EKdhTkwmOmiCJrtwgLhv0KOwvNi9aQc6Zrze7AB+pcZ1ol+pHVJhazYz6sI7W8VVv9m xPRYnPtoaLKcXWKQxNiuIPRolBoczvGlJ2+p9SWo3WOqvJbZwAtiPILRtshsckYbzcm7d4 S+Yu0x1KrIpre0zJ/sfaw5QKlgRhUtiAs07w9jT8WncjvZrHgS0MMuTv6eGgL8RRY1GDWk NjUKUO9JtjNRWPpNFZENsEWn9QSfGKudaqEas6WIMU0bhP7L73QyKs3Hpk1w16cuN5LYcF 9CvBUjzxcRHLFwfleSLtrHUZC4vceh6dz+GcrTB0UmIJe3eq5EvCqjJyTwVa8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692808743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lw7KukhqqjJEpyvAtsosllJ8ws6auMtHeNfwaDBU6FY=; b=dNYrE7ZRI53Yaonx9LsCfDnAGhvPt/9qiyNaBIhdqTNei8yArD6yLK2zIUK30sODymJJyD seNUjO6WkE9aDmn0mDgcNZ8fZ2IM1Vtu/IgCsmQ++jDsxogQhcnpRA/jjV53FiqOE3AO6O TiOBr7A9AocmO5sKTQcxOB3/Z2Eb4BvgnouadHXSyuuUD0llNsRDPZCG1h1jXgDkgjSlA+ H33RrqiqbHZv2BHLzyHEuA5cc2t/ZKcfMU15BzPUkQLZ/m4hmCp1VMMLKrL7RxH61bpyQ7 QxSfMrehaISPXiyiJgLE8wE0hRRDLr2sHPMoiufHc+H6veMpjHK5euHRjOxSbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692808743; a=rsa-sha256; cv=none; b=oZPgq+n7tEAB1rSv9USTjp7ce6cXHYtQmyjSKEupDEtkBeJUb0rvXRxAh75QrKZwBwflJM S+SwBdpcjM0B16S+vuPmSJMRy55JPK6eACy/aPBlkxIXyEyn3Ou1CCpbdUz0rUzCK8STxE LiazvgA9x3fcEWTAzdxP9QrTwZ//m3hjA6ji7M/gUDHgAdy9qhvVyb+1psZv9cpo0NdCHX SKsYaOGJSS3AT/8rr+li/Gn8aZtB81wzllOKxO+rFu+FtYbHCtzUPaGWe9iByAng4SHaE4 QbFIZoLZyqiqvud1o6nVGGKc6a+7WuRqKoM9sKL3ziz+aOqgPivF/VODpBTcVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWBkG6Cq8zscM; Wed, 23 Aug 2023 16:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NGd2Pd023637; Wed, 23 Aug 2023 16:39:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NGd2VF023634; Wed, 23 Aug 2023 16:39:02 GMT (envelope-from git) Date: Wed, 23 Aug 2023 16:39:02 GMT Message-Id: <202308231639.37NGd2VF023634@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: 7d2dd08d013d - main - gicv3: Add checks for the device 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d2dd08d013d79dc3f2a22747b079628a571cea2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7d2dd08d013d79dc3f2a22747b079628a571cea2 commit 7d2dd08d013d79dc3f2a22747b079628a571cea2 Author: Andrew Turner AuthorDate: 2023-08-22 14:37:19 +0000 Commit: Andrew Turner CommitDate: 2023-08-23 16:38:20 +0000 gicv3: Add checks for the device ID Add checks that the device ID is supported by the hardware and is within the range allocated when the driver attaches. Reviewed by: gallatin, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41554 --- sys/arm64/arm64/gicv3_its.c | 48 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index cc743e72b032..cb655eaca412 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -221,7 +221,10 @@ struct its_cmd { /* An ITS private table */ struct its_ptable { vm_offset_t ptab_vaddr; - unsigned long ptab_size; + /* Size of the L1 table */ + size_t ptab_l1_size; + /* Number of L1 entries */ + int ptab_l1_nidents; }; /* ITS collection description. */ @@ -246,6 +249,8 @@ struct gicv3_its_softc { cpuset_t sc_cpus; struct domainset *sc_ds; u_int gic_irq_cpu; + int sc_devbits; + int sc_dev_table_idx; struct its_ptable sc_its_ptab[GITS_BASER_NUM]; struct its_col *sc_its_cols[MAXCPU]; /* Per-CPU collections */ @@ -476,7 +481,8 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) vm_offset_t table; vm_paddr_t paddr; uint64_t cache, reg, share, tmp, type; - size_t esize, its_tbl_size, nidents, nitspages, npages; + size_t its_tbl_size, nitspages, npages; + size_t l1_esize, l1_nidents; int i, page_size; int devbits; @@ -505,6 +511,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) devbits = GITS_TYPER_DEVB(gic_its_read_8(sc, GITS_TYPER)); cache = GITS_BASER_CACHE_WAWB; } + sc->sc_devbits = devbits; share = GITS_BASER_SHARE_IS; for (i = 0; i < GITS_BASER_NUM; i++) { @@ -515,7 +522,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) continue; /* The table entry size */ - esize = GITS_BASER_ESIZE(reg); + l1_esize = GITS_BASER_ESIZE(reg); /* Find the tables page size */ page_size = gicv3_its_table_page_size(sc, i); @@ -527,8 +534,13 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) switch(type) { case GITS_BASER_TYPE_DEV: - nidents = (1 << devbits); - its_tbl_size = esize * nidents; + if (sc->sc_dev_table_idx != -1) + device_printf(dev, + "Warning: Multiple device tables found\n"); + + sc->sc_dev_table_idx = i; + l1_nidents = (1 << devbits); + its_tbl_size = l1_esize * l1_nidents; its_tbl_size = roundup2(its_tbl_size, page_size); break; case GITS_BASER_TYPE_VP: @@ -550,7 +562,8 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) (1ul << 48) - 1, PAGE_SIZE_64K, 0); sc->sc_its_ptab[i].ptab_vaddr = table; - sc->sc_its_ptab[i].ptab_size = npages * PAGE_SIZE; + sc->sc_its_ptab[i].ptab_l1_size = its_tbl_size; + sc->sc_its_ptab[i].ptab_l1_nidents = l1_nidents; paddr = vtophys(table); @@ -874,6 +887,7 @@ gicv3_its_attach(device_t dev) sc = device_get_softc(dev); + sc->sc_dev_table_idx = -1; sc->sc_irq_length = gicv3_get_nirqs(dev); sc->sc_irq_base = GIC_FIRST_LPI; sc->sc_irq_base += device_get_unit(dev) * sc->sc_irq_length; @@ -1200,6 +1214,23 @@ its_device_find(device_t dev, device_t child) return (its_dev); } +static bool +its_device_alloc(struct gicv3_its_softc *sc, int devid) +{ + struct its_ptable *ptable; + + /* No device table */ + if (sc->sc_dev_table_idx < 0) { + if (devid < (1 << sc->sc_devbits)) + return (true); + return (false); + } + + ptable = &sc->sc_its_ptab[sc->sc_dev_table_idx]; + /* Check the devid is within the table limit */ + return (devid < ptable->ptab_l1_nidents); +} + static struct its_dev * its_device_get(device_t dev, device_t child, u_int nvecs) { @@ -1225,6 +1256,11 @@ its_device_get(device_t dev, device_t child, u_int nvecs) its_dev->lpis.lpi_num = nvecs; its_dev->lpis.lpi_free = nvecs; + if (!its_device_alloc(sc, its_dev->devid)) { + free(its_dev, M_GICV3_ITS); + return (NULL); + } + if (vmem_alloc(sc->sc_irq_alloc, nvecs, M_FIRSTFIT | M_NOWAIT, &irq_base) != 0) { free(its_dev, M_GICV3_ITS); From nobody Wed Aug 23 17:01: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 4RWCD530Cgz4r6VW; Wed, 23 Aug 2023 17:01: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 4RWCD52MZ1z4N0s; Wed, 23 Aug 2023 17:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692810085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RW1gNiJfCTNwifqoM0SezB8XCBgToYCwi9HNDnbuD+E=; b=ixMXcrUYTJ0SokW+/DC9ZLYhWuiNT0avUAdOvU06Y7fcxGO3eza3Dwc2mLAy0c7OiYXo2n 1Fl0forKSxOl+dnrKlhTk5+OdNDjwzS6+Gme1ou2pa+dHGBAZz+QaZMdKQjACTke+A2oGc EgH5jJLaflx45bdYM1A5NvgWHPkzousIKPHqIR/rCKDtevvmdPAPLCwmfTjCvbnGSJYO20 WXfnPNCBPWGOaOB9aTTK+jMglwGvLb6oLowi1dNdzaszTXdKsNm1vIiuHe4bV+715GX+WJ awfHGkYSyoyOktO/WW6mrZanpDAi480jI/oHaVV4pRGDG7VORdD8ZzCvBHrN1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692810085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RW1gNiJfCTNwifqoM0SezB8XCBgToYCwi9HNDnbuD+E=; b=v08jtygF4kdpsJWg4J1SNIMTlAZQZopo1q8RLpKBSqOK7nxcACk9lzkI/ve5iWxQNMX+hJ oiLpfWv5s5GeK8nLVZZ1Gz5FJgo8orb5ZfBoOPTIGT8Cux32yK+CCf/eskcRkRS9D7juE4 75ELtlQbC+3QNML8MT4465gDBQyIvTJQidNRJC60gjhuS1LJhdMelC/LabCCpgxTULtlNJ rBOgBbb3lQ2XZQvRFhvNer5G9kKkufmGcLjKUGhJEEUdbqxjv0q+ZeTEfw/VVJ20TKN5Pn de2oZR4lH1Q7lc77jOccVIcteGDJCP08KcSb8pAzqjBw6wfv9YhSp2XpBB20jA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692810085; a=rsa-sha256; cv=none; b=fIxANSwe+AM4xe9I8PzABUNDoBElpsqUrOLn5fL1dQgQOswE/IOO9tYMJBWrsPk6Bhuyxe Mlw4Xbx0zC7JCbnZJkDcX2hdrHfm47qEI1IPUy9R40RmL2fMKryPNXnr7+rHXNWtavwFwK e3vzyaYEzovsS697XinpqkUt7VYhRbLVDPFwPiD9UVuqpfPLBT2WMLyOffD3yAmQxq6IEd Al5HZ1G7gSd7+XECBU1PaUHY17sxr3aIXps3fqTq/2kHQjPObQIYXBdfIvb1NXBWUguAB/ QdPATKDhpi9HXVYMDw2Yl8SKtKsnb+2IvxX752nOUpyC2LTl89iz6CkykKTljw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWCD51R6QzshP; Wed, 23 Aug 2023 17:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NH1Pf9070016; Wed, 23 Aug 2023 17:01:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NH1PJF070013; Wed, 23 Aug 2023 17:01:25 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:01:25 GMT Message-Id: <202308231701.37NH1PJF070013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 69cfdc81ea7b - main - tools/build/make.py: Keep bootstrapped bmake binary 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69cfdc81ea7bdfe1e7300a7e1106419156aee434 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=69cfdc81ea7bdfe1e7300a7e1106419156aee434 commit 69cfdc81ea7bdfe1e7300a7e1106419156aee434 Author: Jessica Clarke AuthorDate: 2023-08-23 16:56:50 +0000 Commit: Jessica Clarke CommitDate: 2023-08-23 16:56:50 +0000 tools/build/make.py: Keep bootstrapped bmake binary up-to-date We currently assume that any existing bootstrapped bmake binary will work, but this means it never gets updated as contrib/bmake is, and similarly we won't rebuild it as and when the configure arguments given to boot-strap change. Whilst the former isn't necessarily a huge problem given WANT_MAKE_VERSION rarely gets bumped in Makefile, having fewer variables is a good thing, and so it's easiest if we just always keep it up-to-date rather than trying to do something similar to what's already in Makefile (which may or may not be accurate, given updating FreeBSD gives you an updated bmake, but nothing does so for our bootstrapped bmake on non-FreeBSD). The latter is more problematic, though, and the next commit will be changing this configuration. We thus now add in two checks. The first is to compare MAKE_VERSION against _MAKE_VERSION from contrib/bmake/VERSION. The second is to record at bootstrap time the exact configuration used, and compare that against what we would bootstrap with. Reviewed by: arichardson, sjg Differential Revision: https://reviews.freebsd.org/D41556 --- tools/build/make.py | 58 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/tools/build/make.py b/tools/build/make.py index 74454aa51b08..e25922c9a70d 100755 --- a/tools/build/make.py +++ b/tools/build/make.py @@ -72,31 +72,71 @@ def run(cmd, **kwargs): subprocess.check_call(cmd, **kwargs) +# Always bootstraps in order to control bmake's config to ensure compatibility def bootstrap_bmake(source_root, objdir_prefix): bmake_source_dir = source_root / "contrib/bmake" bmake_build_dir = objdir_prefix / "bmake-build" bmake_install_dir = objdir_prefix / "bmake-install" bmake_binary = bmake_install_dir / "bin/bmake" + bmake_config = bmake_install_dir / ".make-py-config" - if (bmake_install_dir / "bin/bmake").exists(): + bmake_source_version = subprocess.run([ + "sh", "-c", ". \"$0\"/VERSION; echo $_MAKE_VERSION", + bmake_source_dir], capture_output=True).stdout.strip() + try: + bmake_source_version = int(bmake_source_version) + except ValueError: + sys.exit("Invalid source bmake version '" + bmake_source_version + "'") + + bmake_installed_version = 0 + if bmake_binary.exists(): + bmake_installed_version = subprocess.run([ + bmake_binary, "-r", "-f", "/dev/null", "-V", "MAKE_VERSION"], + capture_output=True).stdout.strip() + try: + bmake_installed_version = int(bmake_installed_version.strip()) + except ValueError: + print("Invalid installed bmake version '" + + bmake_installed_version + "', treating as not present") + + configure_args = [ + "--with-default-sys-path=" + str(bmake_install_dir / "share/mk"), + "--with-machine=amd64", # TODO? "--with-machine-arch=amd64", + "--without-filemon", "--prefix=" + str(bmake_install_dir)] + + configure_args_str = ' '.join([shlex.quote(x) for x in configure_args]) + if bmake_config.exists(): + last_configure_args_str = bmake_config.read_text() + else: + last_configure_args_str = "" + + debug("Source bmake version: " + str(bmake_source_version)) + debug("Installed bmake version: " + str(bmake_installed_version)) + debug("Configure args: " + configure_args_str) + debug("Last configure args: " + last_configure_args_str) + + if bmake_installed_version == bmake_source_version and \ + configure_args_str == last_configure_args_str: return bmake_binary + print("Bootstrapping bmake...") - # TODO: check if the host system bmake is new enough and use that instead - if not bmake_build_dir.exists(): - os.makedirs(str(bmake_build_dir)) + if bmake_build_dir.exists(): + shutil.rmtree(str(bmake_build_dir)) + if bmake_install_dir.exists(): + shutil.rmtree(str(bmake_install_dir)) + + os.makedirs(str(bmake_build_dir)) + env = os.environ.copy() global new_env_vars env.update(new_env_vars) - configure_args = [ - "--with-default-sys-path=" + str(bmake_install_dir / "share/mk"), - "--with-machine=amd64", # TODO? "--with-machine-arch=amd64", - "--without-filemon", "--prefix=" + str(bmake_install_dir)] run(["sh", bmake_source_dir / "boot-strap"] + configure_args, cwd=str(bmake_build_dir), env=env) - run(["sh", bmake_source_dir / "boot-strap", "op=install"] + configure_args, cwd=str(bmake_build_dir)) + bmake_config.write_text(configure_args_str) + print("Finished bootstrapping bmake...") return bmake_binary From nobody Wed Aug 23 17: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 4RWCD63y9qz4r6rh; Wed, 23 Aug 2023 17:01: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 4RWCD632zfz4MbQ; Wed, 23 Aug 2023 17:01:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692810086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GTHWUAWn9e8S0KmmfWbCrYw4D+FC33TBQdACzvklkMY=; b=U2LKi1xi71l6QUPBy86ccMgJD/1CJJgabVySRiFtZgwYTcqhrWAMqMpdeiNwHmnTxX4NII LHKXO7+pu6ilIkXe9hXcS484Kn0uy7KJYWG2RsgawSgRAW4kNahi+F4sy/8fWhX3DOQrL1 XXdtvHf9hY9jN2J+UEle0sGncGBdQpHPCYVAq/KsBRf282FzfEGYKd8xnbeO4hk+c+dR/O cpIg+AuATd7la1Aug5hYGY4RF6YDdSIvL4Ue1QaJEWEa37N7uR2E++SUSD0LOkzkQaeAiX vjz/335G2syjB+EXEa66WprtLWPhngdroj1KobFCj/0e854cO7Fj3+bppI39FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692810086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GTHWUAWn9e8S0KmmfWbCrYw4D+FC33TBQdACzvklkMY=; b=BgX9MUTOO77bg5AC1Iak6JSMLKRFic2BsBjloz9NlldDDI9Ja79CZ2Jg+3meBzLPwaZava VerDxNYkIihzpLAcYAL3zcbTPFhJrht/PBbl+F7Y+aZNQKiLPrpSyNsOkmJlKQ7AMWOkXB uU3r0CF6MeHPBdArSwldjrVTaolMSe1KewLmP5fIdoekr7r5J8HvFKPVg+xYNMz4C1p2r3 tBpuKvdDiErDNKsa/J8egicc3NlJDN8O1RfNkXLMo/IlVFW1bSifWS74ES1QZQLKJ4aLco fNvb8UijfcHYonlE7akPPf0fn9JDYt20u8frLbekudJAGrFXphqU3EK2FwHPfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692810086; a=rsa-sha256; cv=none; b=J1jE0kOYjBYE2YVUWjeZJg8nri/mP1v0XOavlMgXfVugGzz2nAXe7hb4l9nrOWWC8+LQPN h8Y6JTMq2fBAJM2VJ5PvmZwWbMjrWa4otr05PaHW6O9dDRXWbNNfnh6CERuMOylzLeO4db dzrsFUdJA6lBC+/e3ivjVOEpi/jDg24wgEB97ff9KZYrGjiBSdoa4lix8+rH1MEiYKDAG8 46aondeYyhn7Wo6cE4w0FXSphY2w5EWtSFNVWBZHHAuiVRB/ZwiMTYn1U3cSuI0H8xzIX5 qquRUf8gG/afg6JuTz2DlNgPah18ik153Unj34CfHT5/SIT0u10SI3Nw4GnQWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWCD628HkzshQ; Wed, 23 Aug 2023 17:01:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NH1Q8I070060; Wed, 23 Aug 2023 17:01:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NH1Q5G070057; Wed, 23 Aug 2023 17:01:26 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:01:26 GMT Message-Id: <202308231701.37NH1Q5G070057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 62f243acea24 - main - tools/build/make.py: Make --with-default-sys-path mirror usr.bin/bmake List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62f243acea24f52c6420720db615535045489c50 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=62f243acea24f52c6420720db615535045489c50 commit 62f243acea24f52c6420720db615535045489c50 Author: Jessica Clarke AuthorDate: 2023-08-23 16:56:56 +0000 Commit: Jessica Clarke CommitDate: 2023-08-23 16:56:56 +0000 tools/build/make.py: Make --with-default-sys-path mirror usr.bin/bmake The top-level Makefile passes -m to its sub-makes in order to ensure they use the in-tree mk files in share/mk, but the top-level make itself has to rely on whatever environment the bmake used has. For FreeBSD, we configure the system bmake with .../share/mk:/usr/share/mk, which means it will pick up src's share/mk whenever run from within the src tree, but currently for non-FreeBSD we configure our bootstrap bmake only with bmake's own mk files. This is mostly compatible, with two exceptions: 1. "targets" runs at the top level, but needs TARGET_MACHINE_LIST and the corresponding MACHINE_ARCH_LIST_${target}, otherwise it will just print an empty list. 2. "universe" and "universe-toolchain", when run at the top level (i.e. not via the various wrappers around universe like tinderbox), end up failing in universe-toolchain itself with: bmake[1]: "/path/to/freebsd/share/mk/src.sys.obj.mk" line 112: Cannot use MAKEOBJDIR= Unset MAKEOBJDIR to get default: MAKEOBJDIR='${.CURDIR:S,^${SRCTOP},${OBJTOP},}' By including .../share/mk in the default sys path like FreeBSD's system bmake we ensure that we get the in-tree mk files for the top-level make, not just sub-makes, and avoid such issues. Note that we cannot (yet) stop using the installed mk files, since the MAKEOBJDIRPREFIX check in Makefile runs in the object directory and uses env -i, thereby losing the MAKESYSPATH exported by src.sys.env.mk. Other such issues may also exist, though are likely rare if so. Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D41544 --- tools/build/make.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/build/make.py b/tools/build/make.py index e25922c9a70d..5c483e8b45be 100755 --- a/tools/build/make.py +++ b/tools/build/make.py @@ -100,7 +100,8 @@ def bootstrap_bmake(source_root, objdir_prefix): bmake_installed_version + "', treating as not present") configure_args = [ - "--with-default-sys-path=" + str(bmake_install_dir / "share/mk"), + "--with-default-sys-path=.../share/mk:" + + str(bmake_install_dir / "share/mk"), "--with-machine=amd64", # TODO? "--with-machine-arch=amd64", "--without-filemon", "--prefix=" + str(bmake_install_dir)] From nobody Wed Aug 23 17:01: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 4RWCD75TTYz4r6pr; Wed, 23 Aug 2023 17:01: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 4RWCD74Zgqz4N3s; Wed, 23 Aug 2023 17:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692810087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gr2pp246tJUhqFJHqv7293bKhmpV5dWLwjHSxE8veHA=; b=x0ZQIDe3th0DhaHjec/D7Y23i9jhRf+xN2WIDafdTo3g8pVEIGUqn4YCQ0gDIxDnVmPVnM ThVnB+t1IjRPyyogB562uIl9uzMwLwfjqk8h75A3tu2iFbnpmhAFC6CsAcnELxHD2OOGcX OOCQEyW9HFKTosRev/0eHSP0CorJ/DFfsTu4Qka6C69Bcu2wTonarpX0T0N0zgmJ9NQSOJ qlIqhamXVC545Mll+Gu/tdxoZB7n1um3jB3YGuhRBTcv51btd45D6JWBTzc2e811TbF8gu 9Srgxvlz2EIgsGPknbkegBmjkvz8z24/UEi7pqctanBl77ULhi+afWnj3/x2/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692810087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gr2pp246tJUhqFJHqv7293bKhmpV5dWLwjHSxE8veHA=; b=dNNN3+qHuwDR9J49Gl8OIYldNcv0LQBxUMa54Fy/CuewgpTQhyax3Ii5H5wBGNkutTUP3p XmRESAiMmI902j7hyQe72qmjtUkP+H2wQd28saDlsDN3+LihI34/u0cxVQ4pkBE+/hX1DX uJEmnh/GFJ7b93nT8LFFfWVRNi6RaFADgT+Mkf8Qh2mlXPfWT35csGOUNftt9mR4Zh3ktF F+7ttO30XedqdQuzUN/77YHrzOGf7IbU3Vl2j3hnMnu+KjSS4mbhFsYakR9fBEDsQF7zRP I3KMs4ZBTRWdbW2pQlGy1qdc6vgD8F3X1/yP2JXjibek2weQMum/wga6B29Vxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692810087; a=rsa-sha256; cv=none; b=Mey/QMi7r0ce47jPJTRBUqs/65yQZz8JBw6djkaSa51kbZBEuyL2+TFDZxFr3nmhj/Fgbj A2WEdYj8dAXoNQ+UHbBs4GdE+sbOgBC9aVy0xvPPS3dSMt1P9WWPvVVbqQjSebFIfm32rg nXoNS0UfFJ8W9NEwJMmaG97morRbfGw7NBv0CDs5nC7dzSRJbxXbehgdJRjR16qZpoH0bb +3yjBVKSUosdha4iDjnFBA16xoeBcxafG+54UCAp7T/uzfoUHDiVKFgMkm0X9Sru6Yb3BZ UdbSzmlEX6lLCiWdeFpgi9PR+9ierCivGrv2pKaCmzfHLSnsGLcXZ1YIJMOqSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWCD73NGhzshR; Wed, 23 Aug 2023 17:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NH1RYX070103; Wed, 23 Aug 2023 17:01:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NH1RTT070100; Wed, 23 Aug 2023 17:01:27 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:01:27 GMT Message-Id: <202308231701.37NH1RTT070100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ecf01a8ebc44 - main - Makefile: Support universe-toolchain on non-FreeBSD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecf01a8ebc443d1b33c7b61a22f28145f41c25a9 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ecf01a8ebc443d1b33c7b61a22f28145f41c25a9 commit ecf01a8ebc443d1b33c7b61a22f28145f41c25a9 Author: Jessica Clarke AuthorDate: 2023-08-23 17:00:16 +0000 Commit: Jessica Clarke CommitDate: 2023-08-23 17:00:16 +0000 Makefile: Support universe-toolchain on non-FreeBSD We currently pass MACHINE and MACHINE_ARCH as TARGET and TARGET_ARCH respectively for universe-toolchain, but on non-FreeBSD these may not have values that we understand (e.g. on Linux it will be x86_64 rather than amd64) for TARGET/TARGET_ARCH (note that we do support them for MACHINE/MACHINE_ARCH). Since the choice is a bit arbitrary and merely determines what LLVM's default triple will be, use amd64 on non-FreeBSD as a known-good default. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D41545 --- Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4b8d7c850bd6..b36e27e7f294 100644 --- a/Makefile +++ b/Makefile @@ -582,6 +582,17 @@ MAKE_PARAMS_${arch}?= CROSS_TOOLCHAIN=${TOOLCHAIN_${arch}} UNIVERSE_TARGET?= buildworld KERNSRCDIR?= ${.CURDIR}/sys +.if ${.MAKE.OS} == "FreeBSD" +UNIVERSE_TOOLCHAIN_TARGET?= ${MACHINE} +UNIVERSE_TOOLCHAIN_TARGET_ARCH?= ${MACHINE_ARCH} +.else +# MACHINE/MACHINE_ARCH may not follow the same naming as us (e.g. x86_64 vs +# amd64) on non-FreeBSD. Rather than attempt to sanitise it, arbitrarily use +# amd64 as the default universe toolchain target. +UNIVERSE_TOOLCHAIN_TARGET?= amd64 +UNIVERSE_TOOLCHAIN_TARGET_ARCH?= amd64 +.endif + targets: .PHONY @echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets" .for target in ${TARGETS} @@ -613,7 +624,8 @@ universe-toolchain: .PHONY universe_prologue @echo "--------------------------------------------------------------" ${_+_}@cd ${.CURDIR}; \ env PATH=${PATH:Q} ${SUB_MAKE} ${JFLAG} kernel-toolchain \ - TARGET=${MACHINE} TARGET_ARCH=${MACHINE_ARCH} \ + TARGET=${UNIVERSE_TOOLCHAIN_TARGET} \ + TARGET_ARCH=${UNIVERSE_TOOLCHAIN_TARGET_ARCH} \ OBJTOP="${HOST_OBJTOP}" \ WITHOUT_SYSTEM_COMPILER=yes \ WITHOUT_SYSTEM_LINKER=yes \ From nobody Wed Aug 23 17: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 4RWCmH08LFz4r8Bq; Wed, 23 Aug 2023 17: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 4RWCmG6L32z4Py6; Wed, 23 Aug 2023 17:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692811550; h=from:from:reply-to:subject:subject: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/JwjyQ6Fmc6efDnw6G0wFyTTV+4XfwYLU8rsF8zAns=; b=WYTGRWG78SdD8W1/jyVCTv6xZ+TMfzn+WvMN8859U+O/0bVgrsy31yWLJxrNcGnbnig+EQ KSNV60twi/yxqcl5X2vYybm1+HGRXtKlOaA5nwIzPchimAbW31b9HDSG6dkfc9221m45J8 9so2HoNeP3S2W6U2BI1YhMGNbynUmRbVYnzL3b2y3yvYlXfh7YAMOMIYyMp2IJ0YGNzoJG P08ooR6njPlLJ5WSi7tooqSSkvXq0C2mxKinjCFsa/3iDRPNcW8xLQkzuplEFND6kaTztN ydY1oIXdNYbz1gwqO8kfJfe1pJjEQxPUkCBhOuswzhSwjLjfCLbB3tWnKe+bHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692811550; h=from:from:reply-to:subject:subject: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/JwjyQ6Fmc6efDnw6G0wFyTTV+4XfwYLU8rsF8zAns=; b=HEd0XkblqQoHe6X7IymCI3NcNcQlyXvauZiqFq9NYxGkNocQ9ob56lTq5F/8c2F5xkg7p0 QuY2lNVQUERyFtp5VQMOHfREZFjDJMTuV7pAB45HFGkqIDeaQ7T2swq43MyXuMI2uoYn7I Ntxz/yiN1+iG6xc2MLP2npemIwYzqJH3BBMn1o7YelsQe1VQM8XSBQpNymhBWMXM270TJp 3DxhjTLi+qBGAWrPSNa0Jy92DSJMIq2x4raorbyOjFWrgt+4sp7ppl6xf2CnOIbR1Iaj2m UYASTeaRtTLgwzw3zZ+PHU+x1RAV+vR38WopP2RRKl8ANK8btiF3LOMgum9b2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692811550; a=rsa-sha256; cv=none; b=oOr+scsxTday6etmu3FeIKFWL65v0LUIS4PC85u0cCTXISblB9AFh1fhb9rmHY1iS1++0i arqP4eC9/EUGUJrdqtxYRN+h1RcGCdfvkjX5rj98J99/MdxiLG7cmyS45zINXXs0X72IWB k4UXq+Wm9LOf0W1m6LFljh+5loD3Z5wkwyvi01PaKPwQrXwyFUY9b5wWIvqASNvaMRg/ov UvvYSaWfFDD17UD6D2JB3I5XSga/w+BUfuWO59eMeLxyFTYty4lJwCs5/oW7BLnBFoUYsQ +RFNq+c3b2rYh+DoHbzfySXg7tpa0ZXy+nh+tZSfMpxWUtbYibGCvFhbD3MH+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWCmG5Mg5ztWB; Wed, 23 Aug 2023 17:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHPoS8005954; Wed, 23 Aug 2023 17:25:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHPoik005951; Wed, 23 Aug 2023 17:25:50 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:25:50 GMT Message-Id: <202308231725.37NHPoik005951@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: c903f664780e - main - sh tests: Update $LINENO tests after $FreeBSD$ removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c903f664780e2df7aff9ca84089d55dec5ff1dae Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c903f664780e2df7aff9ca84089d55dec5ff1dae commit c903f664780e2df7aff9ca84089d55dec5ff1dae Author: Mark Johnston AuthorDate: 2023-08-23 17:24:36 +0000 Commit: Mark Johnston CommitDate: 2023-08-23 17:25:35 +0000 sh tests: Update $LINENO tests after $FreeBSD$ removal Fixes: d0b2dbfa0ecf ("Remove $FreeBSD$: one-line sh pattern") --- bin/sh/tests/builtins/lineno.0.stdout | 4 ++-- bin/sh/tests/builtins/lineno3.0.stdout | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/sh/tests/builtins/lineno.0.stdout b/bin/sh/tests/builtins/lineno.0.stdout index 82583a93c82e..ab5ad9cbef51 100644 --- a/bin/sh/tests/builtins/lineno.0.stdout +++ b/bin/sh/tests/builtins/lineno.0.stdout @@ -1,9 +1,9 @@ +1 2 -3 2 3 +11 12 -13 foo foo 2 diff --git a/bin/sh/tests/builtins/lineno3.0.stdout b/bin/sh/tests/builtins/lineno3.0.stdout index 6e0e4ac8ca57..f8b44636cb5d 100644 --- a/bin/sh/tests/builtins/lineno3.0.stdout +++ b/bin/sh/tests/builtins/lineno3.0.stdout @@ -1,2 +1,2 @@ -before: 3 -after: 6 +before: 2 +after: 5 From nobody Wed Aug 23 17:49: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 4RWDHG4Hf4z4r9Sl; Wed, 23 Aug 2023 17:49: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 4RWDHG3qL2z4RNp; Wed, 23 Aug 2023 17:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812954; h=from:from:reply-to:subject:subject: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/Io9KkhO7tJiU71Fr2GYTkAMSxztABFLwiA47KtFeI=; b=gd2XfDK277GWcBeigh0tF0LhfQQpnXux7DUbIvRauL+pYTDWWzokGmcHvVXbbRNgrCsmXq jaH85KFXFNuJlFrHcXK0UbElY/+dHglKQ6A32YMRC5X1dmm0WFoe8bp1DJSBSSLpYY5V33 ptrSX6D2XPtLW6K7vPOXazI4sCQnBhiqIt9Gf2lie7dgIYmBz5V9walajmkgN61kipTwoE yKY9WIPP8BM7NMEhZNsw3kgEp1eHzLmZdu8M8FKotFSjl9vNLcmRdz+mS1fWp3fzhPl2AG 7AnldBGXG1m0anR6IIowZGmPzQ4JCXcvzBMGsqowzWrQwNOstr6Vg0fK0ggcJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812954; h=from:from:reply-to:subject:subject: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/Io9KkhO7tJiU71Fr2GYTkAMSxztABFLwiA47KtFeI=; b=xOduYe/+ZvGYswqQAIiIKlLjIQPHHhFEpJ7w9dMDiuHEYq7dTCyn6XpUs1KieEn2Pzh4gy BfUJ22ARp1uEJ9AFwch7pf+zSsKigokhgU0QpdGW8tzmTNgQKeVhQah14zAe/xYP618cs7 kC+UeVyLdYtABXwLH90WTVMiJLE0Kf4XrZ/KoKpEIRMj5Gc02pUK2dvg2T1WPkNvgaEkyM HPSbTrBAulR78KEYg9M/TrI9086V2Ua5BEAG4DadaCcTlmyX2NSBvCWpnoKBcMOWGtYH1r qjc+ICvBsKFH4x9XTy6ZFoyd5AUzcs/gqM49/V4UQmiGFCNkxNSi9vo6GyAPbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812954; a=rsa-sha256; cv=none; b=t8SmT61PaImYhVQvYQF2TOI5vHVYmJ2RdAnOisPWkTEfxH5R10Pq/gMoGZl3adrad7KqG5 MtxuI11GdGwntLeehQCaif15zw3TwyfQphhfLpzjcHF49NcM+6UNoBtUcuxeGqfOSuP4xN pTwkshl3C34JvaYlbZ210XDwxDsZXuDhcAMEJ/thws/xCXsnR2m91748rEcKEh7ym0gQ3g kk9SbFtjUhyAKSD3LJjEXYILuwAhqRtRIIUNZ7RjfNtaiuQlBi1bVdZM9sWzbkvFM3GCP+ KfQxF1s/QKiGxsTpNPbuxHRY/wy/Y+gHpvPLoakpPTvjadpHygJh9FtFcH+Y4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHG2tQBzv61; Wed, 23 Aug 2023 17:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnETw039874; Wed, 23 Aug 2023 17:49:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnEtX039871; Wed, 23 Aug 2023 17:49:14 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:14 GMT Message-Id: <202308231749.37NHnEtX039871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c32a5d6e6e32 - stable/13 - systat: Remove obsolete copyright string List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c32a5d6e6e32c14b2989fd8b4a5961c5a5756879 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c32a5d6e6e32c14b2989fd8b4a5961c5a5756879 commit c32a5d6e6e32c14b2989fd8b4a5961c5a5756879 Author: Warner Losh AuthorDate: 2023-08-16 03:22:50 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:17 +0000 systat: Remove obsolete copyright string This is unused, so remove it. We don't put a copyright string in most of the other binaries. This one doesn't need one either. Sponsored by: Netflix (cherry picked from commit bf46512a54cdf9a5b2e4f520be860add21efbfd5) --- usr.bin/systat/main.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index b84351379f41..7fdab312830e 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -37,12 +37,6 @@ __FBSDID("$FreeBSD$"); static const char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #endif -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1980, 1992, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif - #include #include #include From nobody Wed Aug 23 17:49: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 4RWDHJ0Phcz4r93r; Wed, 23 Aug 2023 17:49: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 4RWDHH4fBlz4RLx; Wed, 23 Aug 2023 17:49:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ccwXv3k8D3anlFdk/AkPezlF7SlQQxjX3AyXbufZtP8=; b=dR/W1vfWJOyoZgcGg985kaYNGMKyZNQuNFOmQkGnRif9U1aC8ZNma7jh8xYewZhxmbPQaQ arwrmCP4UirWM5toFwieo9tSsMn/PDeMJKB9Sb8SobdpMGL6XevpBOXmeWaClgh2hkVCst pBnhPc56AdTztlKMLP+7PvfwiXeZKPOJ2HeMPKJWDbRSKYBeRUlaHS55v40OpOoYIRUBkQ cdsECvz4pAJuyZ9t7EtnOLRECCIRJWxLP5IjN3ycInd+/M7XhudA325OO2jm6P/3+zX8R7 eYf+V8FasDWyYrQ0LwwdaaN+Ne6V0t9mWTtWcPfzP6Fq5NzLwAS++rnSwjJ8mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ccwXv3k8D3anlFdk/AkPezlF7SlQQxjX3AyXbufZtP8=; b=KttahYgve6pG8ZO8lkK5hY2L/ZQ9FVy1f+ILYpQgUg0ncnxuWMepn430m5/Ah42yydEHSr Y1L3bm7wGHYVmzAJxYX4HiTZ2VXc+GQUnG0tF0BqYXPflvu7M2E3EB32AM+uTFRoSjdecD roMii493Zn7P0ytynJj50diDkRZVkn3o5JRC30jiY5qCP7iIG6whn+P1y9Q6lxfC+s/Fl9 souyTCUuAIVfGNIBnNst9kU+QYNwetkJeJ3ZvvSjKlH5YViGFsPkZ9uRWh8vTu9JyeTGt2 4WS644Jg9IaBURKcy6TSUZgTwF3iot9vFT1tv2pvkWbfuVj0BRH/sECBGUJf0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812955; a=rsa-sha256; cv=none; b=bBtY+HF8XM3QIxb6CsuqaxqwOEOz452H+j7MCh+lEzf6BRFzBUrsFkvQJrN9swTlGW8yp4 uJN68W2X5UE1qFe+tOyrdNuCaEqlmaCxXS8D3WkslRDfNWtQveD5R54rqpPwPbLzGuPtJt sEDNe/5Yt6ixYac2Ckl+hJjdQ7INhj5Pke/wp1476DaAgoXIcrMODjNi5Me7pDag29mJmz mUlOa4yGTVGtdIfnG/HJGA2kM8j2y6d7V1hnAhbouOiUGta30DCiSqnJVN5Tj5SRZ1hoyZ F/6iwEc9K4HOa9x4dd3XshFQ9wc+0uK34Ks+jvQ3wEPi+4pM8j7Obgz8Fdq2HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHH3h5mztxL; Wed, 23 Aug 2023 17:49:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnFgN039927; Wed, 23 Aug 2023 17:49:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnFlm039924; Wed, 23 Aug 2023 17:49:15 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:15 GMT Message-Id: <202308231749.37NHnFlm039924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 1ddda65e6fd7 - stable/13 - usbdevs2h: Ignore First Line and stop generating $FreeBSD$ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1ddda65e6fd720b0366c0e9da64d2eff3279b8ee Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1ddda65e6fd720b0366c0e9da64d2eff3279b8ee commit 1ddda65e6fd720b0366c0e9da64d2eff3279b8ee Author: Warner Losh AuthorDate: 2023-08-16 05:32:04 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:17 +0000 usbdevs2h: Ignore First Line and stop generating $FreeBSD$ Just ignore the first line of the usbdevs file. And stop recording what the usbdevs* files were generated from. It's said '$FreeBSD$' for years now... Sponsored by: Netflix (cherry picked from commit 94b73d30ef2b0d85d4834a1e4dc29e0457a8faef) --- sys/tools/usbdevs2h.awk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/tools/usbdevs2h.awk b/sys/tools/usbdevs2h.awk index 42e57cf190a8..25c29c798b3e 100644 --- a/sys/tools/usbdevs2h.awk +++ b/sys/tools/usbdevs2h.awk @@ -45,9 +45,6 @@ function header(file) printf("/*\n") > file printf(" * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ > file - printf(" *\n") > file - printf(" * generated from:\n") > file - printf(" *\t%s\n", VERSION) > file printf(" */\n") > file } @@ -234,8 +231,6 @@ line=0; while ((getline < srcfile) > 0) { line++; if (line == 1) { - VERSION = $0 - gsub("\\$", "", VERSION) if (dfile) header(dfile) if (hfile) From nobody Wed Aug 23 17:49: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 4RWDHJ63sTz4r93s; Wed, 23 Aug 2023 17:49: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 4RWDHJ5cPsz4RS9; Wed, 23 Aug 2023 17:49:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vkI5/gYNh235VFhbX7AO+zdLixcWasHvde1fJE1M7z0=; b=n2FLQWPtMdF7fvx0qGw4+gpNpKki07alO1zBf4r/SDp7dGt65awFNL68KW+KM4xFTBBKqy l5eVDLn3TsiYXinLY5pu0wic0CGQsgpVYU3D9+JYs6VglQW6ymnh+WwJNgURbq8WXUI23V b+LrZZnv5w/+sGDbEG5g+zKR14134IswMoXVrvb+MiNMByJJfG4R5oTEcYUjb3B0LZyW/M 2+3yZdUg05SAYLL5d+OX/rldYBZZUa0tM96Ty6SC1VwRrwIKlhbn8dDJuOr43MV2HJivYK zy6RFPCIu8uaO7CDS+A/SHfJMmLwAlCvU8BS9Sb/hqck1Jy8uk66eCcvyS4h5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vkI5/gYNh235VFhbX7AO+zdLixcWasHvde1fJE1M7z0=; b=FO6VvqX0yT09MuYZCulwX331aBe+YvUE/coIbJNO734GeBkxyruogB1hGrWZ3E3ZLQNk0i YSFCqUO44AE3x0vWZejfdwyHlPvT+YGpOQ0G7HG3/0Uo2yHrX561npFlhzWzFPqqYDTl1E 2Gel5pRFP6gMp22/NAxznIoBKg5R/HQWN/MIlc9SmXWRpWBCXOymCEJF6Jb7cqyh371LEz 16GGB2JIosP7XMlF1+dUO2Juw7Sv9TgD83SBJeE5COfb4XdePH5v91Rap8IVPXePxx2Wrj 193RVEnruWoT070vx8I6vtE4IjppKdhm2s38Q2ZCEwwLtm7Vt+V9vRfOcpr7Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812956; a=rsa-sha256; cv=none; b=j4Jo7btg8/1t/qVJ28X6Xt0AV2RuTa1k8HaosBXvkzphsUMFfQ/QcAOGEEFNmBkWxBDRQh gcRpxAZ5mIjtJhE4KyGOeKElTKLDPAzHGkvuvN0k3fbHuyumTh2PRuWcRHYgg5ffL0wJGQ gd5zaVySxOe7FUx+5vHN/MhHtUAFlMxCA9bVpOM/+tpludD4BeQFhUs6AbK0Y9FEHjeuu0 Tp6HSKtYOzalGqeQNGezvC1BeWqyGgUV7wDbdiI28K/qWcc2opvrr1rhwXZtW1/z74PYtm Z9iJxt8HCWr3FuAht5ymoYO/QKuJl8CIpBG/+v0pto2GzhCzm0F2S8HkhyEhvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHJ4fWvzv62; Wed, 23 Aug 2023 17:49:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnGjO039969; Wed, 23 Aug 2023 17:49:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnGEE039966; Wed, 23 Aug 2023 17:49:16 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:16 GMT Message-Id: <202308231749.37NHnGEE039966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5197a1c13266 - stable/13 - miidevs2h: Ignore the first line List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5197a1c13266334c937dc643f33bdc8899ebd9fb Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5197a1c13266334c937dc643f33bdc8899ebd9fb commit 5197a1c13266334c937dc643f33bdc8899ebd9fb Author: Warner Losh AuthorDate: 2023-08-16 05:33:18 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:18 +0000 miidevs2h: Ignore the first line The first line hasn't contained version information in years. Ignore it entirely. Sponsored by: Netflix (cherry picked from commit 021c4fa6b04ced4bed9a4937086c62ebbe571f63) --- sys/tools/miidevs2h.awk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/tools/miidevs2h.awk b/sys/tools/miidevs2h.awk index 54b9c28fe508..fba5049460d2 100644 --- a/sys/tools/miidevs2h.awk +++ b/sys/tools/miidevs2h.awk @@ -93,16 +93,9 @@ BEGIN { hfile="miidevs.h" } NR == 1 { - VERSION = $0 - gsub("\\$", "", VERSION) - - printf("/* \$FreeBSD\$ */\n\n") > hfile printf("/*\n") > hfile printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ > hfile - printf(" *\n") > hfile - printf(" * generated from:\n") > hfile - printf(" *\t%s\n", VERSION) > hfile printf(" */\n") > hfile next From nobody Wed Aug 23 17:49: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 4RWDHK6mfFz4r9Nx; Wed, 23 Aug 2023 17:49: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 4RWDHK6Kn3z4RXk; Wed, 23 Aug 2023 17:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EMBlw8DKwhfSmImvaiRo7N50wFvFI4ho7G1sFhjdShs=; b=UBGrc4/wlikw+iL7s+BbxfUsuY88mQHvl0jnFAEr9dSL2vgcAwXMHUpZjJge51GYSbnBMb GZ2iFTiNJAwJOpuG4Usj5WZxc2SByqMdjHIlz4GZdKSd7gJFUW5dm1+nSHiZ8yYG2Z8Yg3 UgfbZF8ylGZWkmGjh589sejGC3WcAYInGc9Inij/1/XvGkQud4GsOxaBtVnSR4XeGVbX1Y iAE7IHf7XrPCj2tfwOYJSxv5td8mSXQC4u/ujmi8nKD9ZZNxOz3t9+UadpY1/i/XFJMMjB 9b6cVtKjDguElmgI47L2IepxMlETWYCqsj4nQfjYTeTz7+LDfn98EYu48V2uxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EMBlw8DKwhfSmImvaiRo7N50wFvFI4ho7G1sFhjdShs=; b=j3PsKC3uRMcm0KX7RvWYqowepD8IM73PWDkbNQ4AP2JVCqFWO5pgHlbsiSDM/EqSO95LaF 6eEOmnUqxM/zHvey/XGv7ImUM07FG8fFPfq5t/Qkpc1ibyn5cQqyrQGZsC4y3UWAyCBpZh Sojgj2CN03VPY2bEnUHsLwihp+0N8F1APAhT8KRVwoLKgdLOFA9hvrP+fp6g0IYqTG6VCC L68OjfO2RBhNkz7C45Ybj4WLxDlVhroc2Dg4mftzNeLKhkx6eFj9PmeZhMshNx94WLUJXH IWzrVEruwo8kQ2nLIwRIVFWHPHsjB4/N/QShTokGNjgIrR0GwrcgSgq4fTipHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812957; a=rsa-sha256; cv=none; b=Xk4nzFxhOsMMkAcUIqf7T8Yv0Lil4ncobHl+bDvXfkw/HefvHd3E5czJsHe6ZCPhQLUPIB FMrnzHHkOrwdRdZMTDhdhKZkZEVAa3uxN7tLpYhYzcZt/Z1yit3gAnZCiYWrnJZycTVZqY iN6X2ZEUWDtVF+6+1jAkef+pcJg1cyzcLuSQHeyLaInrc/TTA9dlYVVIQJSF0CKe4s781C dWNaFJlDPyJnccrJj7DvMtYnOHGVuP6cWkGssqWSMX42I4D2H4z6prqgl7Ok3vZkRK1085 mH4lkxD35fU+z0QoXWDDRz2QLnbbfI79hvopzeUUo5KtHpGyDAN6cq3MctzPKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHK5RHrzvN5; Wed, 23 Aug 2023 17:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnHOr040012; Wed, 23 Aug 2023 17:49:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnHpu040009; Wed, 23 Aug 2023 17:49:17 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:17 GMT Message-Id: <202308231749.37NHnHpu040009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5b375162dec5 - stable/13 - pccard: Don't include 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5b375162dec501d4277436f094863570ade17811 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b375162dec501d4277436f094863570ade17811 commit 5b375162dec501d4277436f094863570ade17811 Author: Warner Losh AuthorDate: 2023-08-22 13:16:30 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:18 +0000 pccard: Don't include version information. $FreeBSD$ is about to be removed, so don't include the next line. Sponsored by: Netflix --- sys/tools/pccarddevs2h.awk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/tools/pccarddevs2h.awk b/sys/tools/pccarddevs2h.awk index 923e63dbca83..df902984f1c5 100644 --- a/sys/tools/pccarddevs2h.awk +++ b/sys/tools/pccarddevs2h.awk @@ -92,16 +92,9 @@ BEGIN { hfile="pccarddevs.h" } NR == 1 { - VERSION = $0 - gsub("\\$", "", VERSION) - - printf("/*\t\$FreeBSD\$\t*/\n\n") > hfile printf("/*\n") > hfile printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ > hfile - printf(" *\n") > hfile - printf(" * generated from:\n") > hfile - printf(" *\t%s\n", VERSION) > hfile printf(" */\n") > hfile next From nobody Wed Aug 23 17:49: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 4RWDHM0jGhz4r9St; Wed, 23 Aug 2023 17:49: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 4RWDHM0FYxz4Rdx; Wed, 23 Aug 2023 17:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lq8N41Df/8VlsnozcX9I42cwe5ohCb7+LHs6a4Bibrk=; b=ZUhdLo40SJAJJknnCaDL3jbmNQens2JAVYwnG32SrIhHA//s6Bh+RgK3RkLh3XFmhvugYg y2Aor6RC76KhAqUW369Z611H5IJGOX33O8fmQQKRODhQ1m+WJMtnB35l9Kx11LiFLGFKMH ejB+ouFiaxzMASAvphVz6ZaM5qiLld0eDZjTFs7oFq4tBpwZXdnACCJicm40lflMyVj6Vr 9KfrgujWRjt863sVHq0Nf7bOMSv0lC7LvrW21HWsOEGRNtasH5RT+wNKj7SbP9Kw1Xf/mO 3TdUtvXwSCY6ipXGnRkJtevNDKBh0Z/fA882NZoMagdh7Y6X7FzilLj4KTyV2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lq8N41Df/8VlsnozcX9I42cwe5ohCb7+LHs6a4Bibrk=; b=PIfCkvglnOmvJk2xrhK+uNIsFvFJfHfV21tOPeNsEu514hsVI2nA1o5p0KCNSLFC3nyhPX v71JoJgbNFFR4MjTAOURVIUFnl3JKIE7o3HL7Mg+LszkfI8BdZFc+foo+gUHfFisSyNqX9 6TuTcTZhUaxxqsU28SKOMqwMr9mONT8zJEi1rMDJgMQK+F109XEjmsQp/xi3vj7PlG2xDf b1O7Im8dj64lJ1OFiulNRR3md61zUVjoI5DfGICxt3iBtvOkNfLelbKS2FtT7HqxQ1kdjP bgOmPXX/jFiQRmIhfiiE6fTNI5/5JaPzBiQSixO2m6RXtKyTpma23oJsS0XNxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812959; a=rsa-sha256; cv=none; b=qn0iPW74ZavCY87MZSMtchCKwT1fFL0QIlXYow4UJLzrzmeW5H95Xnrirj3FsCKDC8KE4T EjAOETqmsgJ0n5kv0lNwRXEz6mfeT+gLksyPe0PAg/mkkv8MuabxqbH5p5Na/eueNDgWcG lmGrnDSOLjdgvmAsRq4wm7aEB1h3shBkuiH66+AAqhRm48klSDD6ipWx2J1NtM2iL/QVT/ wyAGxFxKRojPAEYg8Xs2IVa8nZWgjJnKLe9Jjkt9ifNdY78oFAlK+Y5FLPakZEjA1dWaLc ZYNrGrbCNOF0L8TV7cPflNSrq838xWuNbMRmRLOH76XFjP8l3AwzR959cF0Bow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHL6Rn5zvN6; Wed, 23 Aug 2023 17:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnISL040061; Wed, 23 Aug 2023 17:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnILV040058; Wed, 23 Aug 2023 17:49:18 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:18 GMT Message-Id: <202308231749.37NHnILV040058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 2fd33c50012a - stable/13 - fw_stub: Don't add $FreeBSD$ to generated file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2fd33c50012ae70be8cb12bfee67ac778f69cdd9 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2fd33c50012ae70be8cb12bfee67ac778f69cdd9 commit 2fd33c50012ae70be8cb12bfee67ac778f69cdd9 Author: Warner Losh AuthorDate: 2023-08-16 06:21:20 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:18 +0000 fw_stub: Don't add $FreeBSD$ to generated file Sponsored by: Netflix (cherry picked from commit fa12e8fe5145722728bac4e394edb11b2a86c675) --- sys/tools/fw_stub.awk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/tools/fw_stub.awk b/sys/tools/fw_stub.awk index c769c0a5721d..7e4c482a3a37 100644 --- a/sys/tools/fw_stub.awk +++ b/sys/tools/fw_stub.awk @@ -126,8 +126,7 @@ gsub(/[-\.]/, "_", modname); # Avoid a literal generated file tag here. generated = "@" "generated"; printc("/*\ - * Automatically " generated " by:\ - * $FreeBSD$\ + * Automatically " generated "\ */"); printc("#include "); printc("#include "); From nobody Wed Aug 23 17:49: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 4RWDHN1vSMz4r9Qj; Wed, 23 Aug 2023 17:49: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 4RWDHN1G7Sz4RZS; Wed, 23 Aug 2023 17:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YE+rn2g6JaqvO9xELSJjwjuRnfQ7wFTU/+/2zO8dTts=; b=NrIclXrE+hxk9p9FV4Aqa6+3S/rNE2PuzDvQKPz3DDTsE4Td/UEtLVoYgAvbAjoC67PaAc 2M4vONc8A2qWxYJr6H8jzKgDO+U8m/my6uGEA6CPxqf5O7rd6eZEz9Ko+lZCRfdU/9ic8W dHZ1VK+P+dgIQB9Xl0FJ0JRM8EmZugAyiQlT2Dpropx29to6ODj54apkCbKI6wzu8AKnwg HjT6aTjOhrr/QFoRmSY0ZZzfzNeEs6D58V3pCMSoJcFbHl64snHFZpi0BtGjv+BA04ysdY 8zWxih2KooIVnklb+HtksNoczYfT1I0HJ5yuRdus9q8+x+dFJaAOhFYvEfDqVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YE+rn2g6JaqvO9xELSJjwjuRnfQ7wFTU/+/2zO8dTts=; b=ANdFRpiO4dy4OyLQf/+rypOgwWC3NvsuvNCt3goV4VLBh7DUvMUo0lTSAH9Sd5a7FwdKiX yNAUMZXW6yoGO+h3Fphz2IAU5BFkMWOvO1NULK9hUzEBG9jXBWGQXKSaMju9k/IKBAlKAG rocFDY6Z6bwXMRdUnrDDi9VphgWNZmRs5xUrGlJs71CKJ5alM5qCLXHIWYhrz+DjZd3vuf ogpvBfU9aThvVTqirVoKMddhUiXtnHDtMTLxUhwN49HFW5SERUYeDdMSBMys5bDIahyY7p f6J5A3tDqqUEDHOy8UwvLooTFQf15g9HlWp+FPKSKTag15D80OCRqMRjW5VQlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812960; a=rsa-sha256; cv=none; b=P+/p5vWhmwMBUaF7FFKNAGdPDE6ZpL3L9vhZhRPLCRH0yQxAb2Z950qX3nJOIwYCTPqP6M ky+uiQp3He/kNMdePuk3MRYbEMutDOxvORROTW8mf2yB+DY19r5Y9AEH1vlH5su7yWx/hV iHNR1LX34nlEkzY7jbL7dOX04NfiCH50RlwO/mDEBZvIegZ4ewjE11doYdBWlY7U5hpbx/ w5RqPF6UrCJ4FerToPLnv+OqgtXN6RqQx4QqtqUM+1ejrAk1XQ42ARH8QV1wOq7izFbbqY jL0iT5reJ+NVUcZfmn1HtQgYd3WjjYnPmQVnsAeYd7lWC/d6/LwMmIFJlTvalA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHN0KYSzv63; Wed, 23 Aug 2023 17:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnJ4Y040109; Wed, 23 Aug 2023 17:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnJsx040106; Wed, 23 Aug 2023 17:49:19 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:19 GMT Message-Id: <202308231749.37NHnJsx040106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e63ec086a790 - stable/13 - vnode_if: Don't add $FreeBSD$ to the output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e63ec086a790ae4f8693ea3768c1b1e9ceb10426 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e63ec086a790ae4f8693ea3768c1b1e9ceb10426 commit e63ec086a790ae4f8693ea3768c1b1e9ceb10426 Author: Warner Losh AuthorDate: 2023-08-16 06:22:54 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:18 +0000 vnode_if: Don't add $FreeBSD$ to the output Sponsored by: Netflix (cherry picked from commit 750a49b606f173fdc2a53461882260fcf6a407f1) --- sys/tools/vnode_if.awk | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk index 486f0e6b2ce1..cc706f3a42d7 100644 --- a/sys/tools/vnode_if.awk +++ b/sys/tools/vnode_if.awk @@ -173,8 +173,6 @@ common_head = \ "/*\n" \ " * This file is " generated " automatically.\n" \ " * Do not modify anything in here by hand.\n" \ - " *\n" \ - " * Created from $FreeBSD$\n" \ " */\n" \ "\n"; From nobody Wed Aug 23 17:49: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 4RWDHP4JMxz4r9Wb; Wed, 23 Aug 2023 17:49: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 4RWDHP2S4lz4RjY; Wed, 23 Aug 2023 17:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yx7YWQ3cBUxCyXN2mk+cQlxUh1zf28htUgUXHSlkypQ=; b=VwChpTWQjbfnwae0K2IcSM87gyhSyy/Q1K3RMZ99Mw3qAVLgi8yw/wM2xhxfPqmHZExoo5 SKMB68UjuWHqMw3sU5bpHxStjycPDlVSBrlsT9q6ogmpvHu3JBSpSnKFaOJkZolFHE1W4B U0A8CmlTM3HzWBRHsBEdY6TC8Xp/BG/md/cp35iYbO4Y9DBfRYH5LoYP9HCxZr1/zGBIfF dO1UZIdE3xOlnLTXY5NqDYMWrwXlL/tI9bbOjPsbP/BFUSbDnlkNYvlQ5Lipli37PP8NLs 62nEJU2ubcmLuY5H5+wJEgMiMgtyZ+kN1VxVqLvUYd6rogyEI1uxhACDlmlozA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yx7YWQ3cBUxCyXN2mk+cQlxUh1zf28htUgUXHSlkypQ=; b=b4ftMqBNpr+RbNiRgcxlipKEqxzh34QjJcvmhei/YZUPVWhX0k29R0ZHUta4koOofh3vRJ am+vi/nMlvUVWgo9i0/qjNKB+TI87DyL3lFsISaO9ixDYvpm+rDLNpERJ5McwS366QIWlv 652RlgqJCdKJGB5bbPxk/kLCdMFVLM5ybelqdEsJ3GX9E84g6FAI8utGwugg4NvJCyB89m 8c3rjBJA5pvP6AC/KblL/E5sIvreJJZCFgdl5uvvMX7pmC5yesq5fNk6g1Cxs3pFtGfcEp lE8APeCpnhk/NckS8+Dko81Zugb9jwENQEv378moYbmcz5UUu4Q8lkCcoh23Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812961; a=rsa-sha256; cv=none; b=I4QQ8GS/l6reDqUmJJQViZ4jVMV4wtAw7xJzFwlorCG+0EdetbxlM7oZJnYRict8IWhxT6 I4ldEMDBYtZ2GlqywSDX3NiVAsiS/h2mLsVtmMSqwSQ5yNYYv3qCo3O0x9dusjVVTv+T6g mbnrBdrfx+rLPQ5OPxoRQW/kDR1tptXD1bLvcUjm8hGDdk+pK3t6DXC+HX6/5YA0c882lx 2djbuzr7lma39T9OKHTTcbbG3eKNK5ksdMX8ogu+pHh73yR4rHb7ElbLKBncZ5LB8AS3GQ yhokFewhEiuhjUb31JWldUpau1jgNuFlE/5xmCeLEuoojiIzZYy8kXYemBTTMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHP1Yx7ztsR; Wed, 23 Aug 2023 17:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnLoi040158; Wed, 23 Aug 2023 17:49:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnLOw040155; Wed, 23 Aug 2023 17:49:21 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:21 GMT Message-Id: <202308231749.37NHnLOw040155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 58bc4f0c2f43 - stable/13 - generate-hfs.sh: don't embed $FreeBSD$ in generated code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 58bc4f0c2f43de64a23fc5e17ed263f886a5c66c Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=58bc4f0c2f43de64a23fc5e17ed263f886a5c66c commit 58bc4f0c2f43de64a23fc5e17ed263f886a5c66c Author: Warner Losh AuthorDate: 2023-08-16 07:24:03 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:18 +0000 generate-hfs.sh: don't embed $FreeBSD$ in generated code Sponsored by: Netflix (cherry picked from commit bed13771a3596e9501adec2f133db1b511c05b7e) --- stand/powerpc/boot1.chrp/generate-hfs.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/stand/powerpc/boot1.chrp/generate-hfs.sh b/stand/powerpc/boot1.chrp/generate-hfs.sh index ef368d1566b4..4ecebfb305b9 100755 --- a/stand/powerpc/boot1.chrp/generate-hfs.sh +++ b/stand/powerpc/boot1.chrp/generate-hfs.sh @@ -50,14 +50,12 @@ BOOTINFO_OFFSET=$(echo 0x$BOOTINFO_OFFSET | awk '{printf("%x\n",$1/512);}') BOOT1_OFFSET=$(echo 0x$BOOT1_OFFSET | awk '{printf("%x\n",$1/512);}') echo '# This file autogenerated by generate-hfs.sh - DO NOT EDIT' > Makefile.hfs -echo '# $FreeBSD$' >> Makefile.hfs echo "BOOTINFO_OFFSET=0x$BOOTINFO_OFFSET" >> Makefile.hfs echo "BOOT1_OFFSET=0x$BOOT1_OFFSET" >> Makefile.hfs bzip2 $OUTPUT_FILE echo 'HFS template boot filesystem created by generate-hfs.sh' > $OUTPUT_FILE.bz2.uu echo 'DO NOT EDIT' >> $OUTPUT_FILE.bz2.uu -echo '$FreeBSD$' >> $OUTPUT_FILE.bz2.uu uuencode $OUTPUT_FILE.bz2 $OUTPUT_FILE.bz2 >> $OUTPUT_FILE.bz2.uu rm $OUTPUT_FILE.bz2 From nobody Wed Aug 23 17:49: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 4RWDHQ3jqQz4r9T0; Wed, 23 Aug 2023 17:49: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 4RWDHQ3BG3z4Rt6; Wed, 23 Aug 2023 17:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhxLgltriWTDL2lTfm9LLEOWX9MhuWVpYv6+C9WdOmA=; b=XQch6/WQeHTSr0zvSfrhpdxmQ6SnOuiYJ3j4ZjfvrIASFTAd6ttIqb/jf/fAKjusq0ScA7 9LFdLiUl1fbhydw6FZDfKgyrv7WUw5AQoIpCh3M8gbTO9vNXLVBvw2qFQKtIzPooodl5Cn 3kRHz7F/DiO6SycVWy/VzwUWJXq092/TudkO3bRfrmY0fbPETVgZ25nJ2ENaKAt2G6dwbm u8mgTnqOdRdLxGsHMSqNLswZFEuBcQ4e/3emA7DbcXUv/0PBitTnRuxXlMwUQ0dKe/pVRs 6qGoypc+PqU/nzZmm1PZnp2oXAKHpMOkQy4sQKUW/44lYFubWDjXwPSfxcJTcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhxLgltriWTDL2lTfm9LLEOWX9MhuWVpYv6+C9WdOmA=; b=fSGxKVxKv80sxV5c9dc0bfK5L52HFTKanAtr4Q7hTOxSUMKNtfc1QuLx5cjgnqoqIrK6UY XX45CxMhhfGBAO5aUordtXV49+7+G9dFvtv+chKh4vRBVAtW8ERc2YueGG6uprmaB/fQUg hYhVS9rBkuUR/yQNxd+lWYo227DWgLTAniSdyuyeI8kJu3FaJTcjPhbX3mV9TgIDlzc0h0 B6Soo4wwS1ivNlChsiJ1RV7fhrw6fns+qfT9AhXXOoNM6gXzOSiG3Nknhdky6Dbj+sm7ix PT512VvJWn0CdUcrK7FcbZZMvAfQuEbbra1nak423LbktJzWFyAtWUKWRbfvCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812962; a=rsa-sha256; cv=none; b=IIcwWr32Eo+85866pTaHGNoCMLbws/Dgp/AANtPwxFDDcob+ixcZG0c+q0HfEXkVEBCmv3 NWPQTcrbNPLXXXRVr6HFXT8a1G/Dq5JkifsrIgit48PPqGJPSuQ5kGrQWjvNBxS2oe5u4Q ywQtOQqsgxHstHqh+H4WbAoaSxL/6hRZ9eXnSVaeyERZBafOc1JahsHQS+cpD1oDMDpqUr Y4QFrXuZ40TpmnAeyQsML4jg4EyC+c6ro/pRxxtjhR6y6bE7wSMP4SsoMeV93WiT7BQgxw MMzbPIDHbeVPSzSUzRlK4pDuvfS0DCq/OSBaUCqVUnSrQI2TEaWebfQnbW5yTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHQ2JMXzv64; Wed, 23 Aug 2023 17:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnMIh040207; Wed, 23 Aug 2023 17:49:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnMH8040204; Wed, 23 Aug 2023 17:49:22 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:22 GMT Message-Id: <202308231749.37NHnMH8040204@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 470fa204796d - stable/13 - ps3: Don't add $FreeBSD$ to generated file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 470fa204796dfdfda359fb562b71c53536161051 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=470fa204796dfdfda359fb562b71c53536161051 commit 470fa204796dfdfda359fb562b71c53536161051 Author: Warner Losh AuthorDate: 2023-08-16 07:30:04 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:18 +0000 ps3: Don't add $FreeBSD$ to generated file Sponsored by: Netflix (cherry picked from commit fba400ef51d5e5701f752000e62e3a9dd59ab751) --- sys/powerpc/ps3/ps3-hv-asm.awk | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/powerpc/ps3/ps3-hv-asm.awk b/sys/powerpc/ps3/ps3-hv-asm.awk index 8b8165bde66d..21241a82773e 100644 --- a/sys/powerpc/ps3/ps3-hv-asm.awk +++ b/sys/powerpc/ps3/ps3-hv-asm.awk @@ -9,7 +9,6 @@ # $FreeBSD$ BEGIN { - printf("/* $FreeBSD$ */\n\n"); printf("#include \n\n"); printf("#define hc .long 0x44000022\n\n"); } From nobody Wed Aug 23 17:49: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 4RWDHR52t8z4r9Wj; Wed, 23 Aug 2023 17:49: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 4RWDHR4C3Lz4S4y; Wed, 23 Aug 2023 17:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOoVaCF9oI+e7bXi/U/DUeHIgycUefRMuHjQ/3UFrJA=; b=uzta8uBJYsYGx9bG1CvLaf8c6MjWpSy4c+5iSapb3207zN4LpyvVAErbT6LpJlJRMM5eRd BtOm/D7s0qxhlz9vFI1k4qoGtKaqlERhfUy279M+kUCoUHrqAsBeHrQP3V6lPrZeBHBClJ 9PvaOE/AltVQWCpCySiqBPwK7+rClSWg5M07j5shUs7GeSIHqtZdbMgipvkSr6rupZu5HO P12svh0Y26sdLKFgzh39l4qX7DkDqqUXdsHaxVf4MmnDGlWJoyfW0HwQWgc0Cs3C5glmpF 9UP5xcHVwXdDPKxMtSidNJLm+kvSfMP2bTleHBigNPrfrAB2BGyxVwzyq8VAZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOoVaCF9oI+e7bXi/U/DUeHIgycUefRMuHjQ/3UFrJA=; b=R6kFm51HOnvzcEE9N1k6MmhCxIZ/YyiJn6YgDW+oMirLenDAS58QTGN9C9o301uG3uBVLj tWy/sKd2HapuvDBQmkYvvnu2Z7tp8tA+IxfsaumUxWvNdbO0/EMdDskSIXNhfCqEwinjVz CSQtn//ETsR2wB6f42V9eReb5a1t+nKmS4NoCMKzWov5D0IiwD70NPsKkl+avjAKuw1+pJ 0xMHoyy/EGJvh+iesA9Dd0PXbEGxJQ00ew/EABWgsjarUnZPoNdVlU8KIWx7K1TPTt0e2s c849mgC4flwOh/8OjhFM0a/xVvXsyroWugn6i1FHOPQbUPk85SYI5genMq9MjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812963; a=rsa-sha256; cv=none; b=V4mLa9X1SHL/mqitIUIS86YgJ6tsabt/ooJxyHrMxQrwtluDd5UfCtJZxc/aJ4dxPODIZB YBeE5TgQNMbzkbcT6NO01YWhAPQ6wsWcjALkmL/n0c4KCw3fIo6szQEmnGjlkaAmTpV4ZT KyLtlqfdiFZ57zlX9JQvtFgbU84NGVLUSW6d2lv6Xz7CdLaMaz7NBlrP/wsUm5FtfHcagu 9xGaoubnLUK8Fo910rDWijbQV0Ux5VjSFGtiCTzkTG//xNrEjGlf7G0lxX07zDoGAEcUCO eY46Bq41Hlc88T+u9jiR/7qlZAF/wl7QJP3+xtDTin+DGT7qps9Xo6c5E83CtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHR3JZVzvQS; Wed, 23 Aug 2023 17:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnNNq040249; Wed, 23 Aug 2023 17:49:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnN6X040246; Wed, 23 Aug 2023 17:49:23 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:23 GMT Message-Id: <202308231749.37NHnN6X040246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 94fc46aae3b3 - stable/13 - cursor.bdf: Remove $FreeBSD$ tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 94fc46aae3b39d81f388b6a754b9c3b6bd8a5254 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=94fc46aae3b39d81f388b6a754b9c3b6bd8a5254 commit 94fc46aae3b39d81f388b6a754b9c3b6bd8a5254 Author: Warner Losh AuthorDate: 2023-08-16 07:36:00 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:18 +0000 cursor.bdf: Remove $FreeBSD$ tag Remove $FreeBSD$ tag COMMENT Sponsored by: Netflix (cherry picked from commit 19fae0f66023a97a9b464b3beeeabb2081f575b3) --- sys/dev/syscons/fonts/cursor.bdf | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/syscons/fonts/cursor.bdf b/sys/dev/syscons/fonts/cursor.bdf index 08b90009faea..125ccb4a283f 100644 --- a/sys/dev/syscons/fonts/cursor.bdf +++ b/sys/dev/syscons/fonts/cursor.bdf @@ -1,7 +1,5 @@ STARTFONT 2.1 COMMENT -COMMENT $FreeBSD$ -COMMENT COMMENT Mouse cursors for syscons. All except some unused ones are the COMMENT main 10x16 one scaled down to 9x13 and/or scaled to minimize COMMENT distortion with non-square pixels. Details of the scaling are From nobody Wed Aug 23 17:49: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 4RWDHS65Khz4r96W; Wed, 23 Aug 2023 17:49: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 4RWDHS5Fzqz4S7l; Wed, 23 Aug 2023 17:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EZqcgk8I5hxLEyb3C9eSaYNAxrp47v8VtJkni26B34c=; b=KsurIodJ9lI0cCf4vg/POvOLDaU4PybZT8kR1R8N307GWe+tBcFqGzsGNNdLmmuYie6npy h20CnGfHB/iA2Kg6KmJ+V9iusSft66wDXK1ODj9c4xSayt6CKWxmWa2wqcnS2M3hmyHE61 fFIZfLCNjUx02rgErf6Qx1wK+bYguCaursXJn5O0HG1LvgI9TDKj/Zc6+Z+0WKwp4PDQGR L16dA7+aXh1qJUcx8IVB9Njq3PgYZK0xzfOX0gBUpntI3aJtUctkE+4REZHRb3yhww72gZ dKjv2Zdkv+BM94j5LdR94Ak91VaT9vS62Q1Enet7wZBgAk6w2aTxqzpgQWfSYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EZqcgk8I5hxLEyb3C9eSaYNAxrp47v8VtJkni26B34c=; b=KxnBEi7btJX09m76+sy0FVxeujv3rmgtkFuxQX5ZJBsQC9abASt3VIJ6pHR6B8L/Qs69M7 FMfLB97YbtOUK6wpiJpXsFMMYxXFH5ea99GmDa10tnLSorluRwb6C70BLFyay7Lv7lF2Hw 7DCCIaluTPS2ELd2S2VXZRrbVTb9ABhSF9FnjyH+fuaTAKbcJCmL4Q4EzQvCoA6W0GKlR1 yF328fSlU1ZDJxc0HwTt7+kJe5T/IZjR28KAP05uIuo2dq/4HvoxPnO4kZe+oXeuhHRQw8 ku3wtpw1flYCjR33qWrmGoHI3/JJ0cKXj/45rbEE7WoQdPYQS/HkmY5xyM9Vig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812964; a=rsa-sha256; cv=none; b=V9LzskxgA6XCg7e4AobS3UyJaxnfQJk/1Zyt97wcV6maEPRbJNOiXUurmVAqxvdVoh3pu4 evioQHbRlxljTDiihozd9BnDHgVtgGeSlXlS8N7qjTCd12Ecmal2K4EwXvjdKtAf4oMmqd v6dutyPww/zqQwv8OdrduBaChSBCzMB38HouyN5vcdCNnB3OxK0Lrqso4l7Dp3wEviqel/ o64W43pCVXWI62BgZYzkFnU2zOUDI7PF0S+ClK0pPgxuLxR0tIyMM8N5CeZS6nK3cK5t4Q KB7dhsCFjmc2uPqVc9uZkBA68wcrHQWzWsZ9oblm6RKSpIwLyBrp98SmOQl45w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHS4LSJzv89; Wed, 23 Aug 2023 17:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnOYC040288; Wed, 23 Aug 2023 17:49:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnO5k040285; Wed, 23 Aug 2023 17:49:24 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:24 GMT Message-Id: <202308231749.37NHnO5k040285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: b99859430cb7 - stable/13 - mpool: Remove $FreeBSD$ comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b99859430cb720ca69a3323368c0cd7d0d395f40 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b99859430cb720ca69a3323368c0cd7d0d395f40 commit b99859430cb720ca69a3323368c0cd7d0d395f40 Author: Warner Losh AuthorDate: 2023-08-16 07:37:16 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:18 +0000 mpool: Remove $FreeBSD$ comment Remove non-standard $FreeBSD$ comment. It's not useful Sponsored by: Netflix (cherry picked from commit be6151e43cffa86cea04212ccb212222e608614e) --- lib/libc/db/mpool/mpool.libtp | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/db/mpool/mpool.libtp b/lib/libc/db/mpool/mpool.libtp index bcd827dce29d..b4e893a9987d 100644 --- a/lib/libc/db/mpool/mpool.libtp +++ b/lib/libc/db/mpool/mpool.libtp @@ -1,6 +1,5 @@ /****************************************************************************** -VERSION $FreeBSD$ PACKAGE: User Level Shared Memory Manager DESCRIPTION: From nobody Wed Aug 23 17:49: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 4RWDHV0ZPbz4r9R2; Wed, 23 Aug 2023 17:49: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 4RWDHT5nxwz4S69; Wed, 23 Aug 2023 17:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2EEyKoQ4AI0JeFkgomRFcguGOK4+QHdFp6/KcUuO8MA=; b=Kym2BYyrLXwYjXANQxB7fMHyFZ9VqwA+GoKNb7RvO8vrpLdoO8a1YX1TDkHGm7pke/iu5b xPLz/WxEnvl2Rw1f7Y0iknLncArC5NHVtILsGTr02mJeQmcvPfmmIuoT+Xq7hw++2w7qr9 0upHH6WmAOWoYIr9I3YvzHfWP9lJfqD8IW285EYgvBNNMPqUtkHCq3ed20CIN5aVttKmXo Bi0gagdOKhw2yXQ0MrN24VtYVgbMMXvHp3NT2HZT7mFWqmJTLF/Ki48GnCV4+/toSGqVB9 h6lirp63BoBj/thS8ghjUUdwShSVfprTqbwfDrtKoKHBRqi005swjyvfaqHmYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2EEyKoQ4AI0JeFkgomRFcguGOK4+QHdFp6/KcUuO8MA=; b=K0zvbHgvjz2BdWnITxLI20OpqxKzjgPJSRC9rLoZBeummK6RKLhf7a6GH5dYgQIqxlBqO0 FRwyYflj1NViFfKs6vVqQzj7TlcNp0tzHKs/nqF7Rvv0Hz6MDI9FKbxUfP7MvXIAnuMfZX PTDYr3xaQFKSIxuWzTL0sxJSwx+j6y5iTTBuFnpLgOQCccVemL2U7ZP0bNXzbadCI/p36/ 3F5OXUTXQnXBSTtY5xi5yS2wuB4xb9iyc7t6+cFYGRas8lXaLyNNMyhR4E+nTGl27BLSlv mm6587UnuNk27ZDq1IJpF8lPVH47h9t1zwC5rCK7Vnhja7sqeFjXWVO0qHhqLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812965; a=rsa-sha256; cv=none; b=iMKtHemIb3W/ttwinwCf5N4B+0IvVpobwo+bL/L656JJIA0kEGixx7szz315hoAX+4ICgz mg0dc8ybvkcK8jkVzUgs/ONpwvT1eilpq2JxYBnjFBgoUcIhJu/1QmvaM4Z4yS0nl6fXKP sHQZlIRP3BT3w7FUVQ0MDxHMexBxZLvTQqChcPb1uP5FheG9BLgTABJsPEpMPbEAr7qU4D tS3dm+3wOhIaBm1hcI5kcIm7zera5JS04uyXC7CSusMUEQIeox0JR2ZVpo6i4cbz8oDH0/ yX/9Fh0ZRWFBOZqP7KpPFP2HBxiqpx6Q6or3V2HE2wji7LbyGP33HVLPmAQguw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHT4w1vztsS; Wed, 23 Aug 2023 17:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnPGq040324; Wed, 23 Aug 2023 17:49:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnP4T040321; Wed, 23 Aug 2023 17:49:25 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:25 GMT Message-Id: <202308231749.37NHnP4T040321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 65dd4fceb3fd - stable/13 - glob.h: Remove $FreeBSD$ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 65dd4fceb3fda43e0bb133ad9d021c9f06498bac Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=65dd4fceb3fda43e0bb133ad9d021c9f06498bac commit 65dd4fceb3fda43e0bb133ad9d021c9f06498bac Author: Warner Losh AuthorDate: 2023-08-16 07:42:14 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:19 +0000 glob.h: Remove $FreeBSD$ This likely documented where this file was copied, but the $FreeBSD$ tag was lost as soon as it was committed. Just remove it. Also remove the one that looked like it was intended to track versions. That will simplify the MFC. Sponsored by: Netflix (cherry picked from commit c25155762166bd03329667e525b2e2c1253a4d6a) --- lib/libc/gen/glob-compat11.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libc/gen/glob-compat11.h b/lib/libc/gen/glob-compat11.h index d43086f819c5..720f3fab36f9 100644 --- a/lib/libc/gen/glob-compat11.h +++ b/lib/libc/gen/glob-compat11.h @@ -30,8 +30,6 @@ * SUCH DAMAGE. * * @(#)glob.h 8.1 (Berkeley) 6/2/93 - * from: $FreeBSD$ - * $FreeBSD$ */ #ifndef _GLOB_COMPAT11_H_ From nobody Wed Aug 23 17: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 4RWDHW0b7Cz4r8yQ; Wed, 23 Aug 2023 17:49: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 4RWDHV70Qtz4S1S; Wed, 23 Aug 2023 17:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8CLwKEz8Ijjz52+1CiGN1lSSg0d5YQ/VaTCgtDOIMJk=; b=rBiKqqk+D31q0JcKU5cOX8dC2+sSUBLRGuUhal9RmDhunEX6G3ZmbpcO68Qh3u/f7OaLD7 B+ZpCCp+kYuLt4b7ICjuEQvQGgMXqjRHEQr+PURyMAq0hWORoutagjQp1fQXc+gdSXX5bN t4HR8y52t9VBUmqojYfO88exqL7QTI03hWUrczuo0zhV0FNuICRVsIyvSzyJ130NP4SH2S 32Eq2lX23wPNKjLzAARRupAsRY1VNDCxYAOlq7aDtFubXT7RBsqMZ4P0hYamV3SfTXM/h1 qjpz2WSGFxYbqF27Q+TIn9o01/JNqkqvU/7oBWW1M2tlYx+1MphQMxKGF0sBMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8CLwKEz8Ijjz52+1CiGN1lSSg0d5YQ/VaTCgtDOIMJk=; b=PPhGMur5ETW1QLmdC9TH3ZPAzr8c6fNr3ZGBqMttZ1gNf/7K67WFJc2ebHuMl3qAgvEaJL 5/4yC39h9BI6TkelyohwrWUlTa9vW0knx4H8HtHM8HokcqGiiyL8BkZ2t6o3niR8BgdVJ9 6pFUjDcu+w2WiCLy1b+exIje12HzKxERB1BM5mfF5X2RV3ycuKgz+jnyh2XR8K8e+G0ZUO kW05boWrQfoZB0OiQHEjG8S0CYRmjMA7/GWuujMcRS4XwhqwjpkER+Yf9xUrsVfibLLvTc /U2p63SuUvM1aA1/6N7sgrb22lHwji8quSvz5dBQaDvjtcMylSRZjNH+vcC9IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812967; a=rsa-sha256; cv=none; b=nqV3gna0F3naIqBop0w4TH/ahwECyljBposSaJ74SVIflaSNX42CDDkqnC8dAlYf8QAlQQ AdEcqBQiITyKlnHohGKAoVDJjMo7aeDjxtjue+dKPXOOONQ3MU/dxbXjPJatuXZk9X+lnB oJ1wVa2ZIveTyA+rNPs75DY+TPgwJYSxnyDK6DP3ZV1zVHZLLXZGP5HOi6MMGHI8dleNbz hLMICIOrKc4UXkxzmr9VyL9MT8b/hYXACeQ/6ZLR4jNwp1K1hXu5f8uHbAJdS/NRgONsiv BERxd3NGQ1/LdojytMVoRGjHxsSbGwvX6lSBQuvBbvNxcgUbA3moxvD5xJnPjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHV66QFztxM; Wed, 23 Aug 2023 17:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnQ9v040364; Wed, 23 Aug 2023 17:49:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnQ9L040361; Wed, 23 Aug 2023 17:49:26 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:26 GMT Message-Id: <202308231749.37NHnQ9L040361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e39c9231e9d9 - stable/13 - powerpc/ata: Remove non-standard __FBSDID() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e39c9231e9d9d6643a52ba72fdba9833660a2042 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e39c9231e9d9d6643a52ba72fdba9833660a2042 commit e39c9231e9d9d6643a52ba72fdba9833660a2042 Author: Warner Losh AuthorDate: 2023-08-16 07:42:59 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:19 +0000 powerpc/ata: Remove non-standard __FBSDID() This one has an extra '* ' at the front, so isn't picked up by the scripts Sponsored by: Netflix (cherry picked from commit 77a999ef2f0c3003822ef2085752a4373f3af148) --- sys/powerpc/powermac/ata_dbdma.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/powerpc/powermac/ata_dbdma.c b/sys/powerpc/powermac/ata_dbdma.c index f2484bc0ae0f..4dac1b1196a6 100644 --- a/sys/powerpc/powermac/ata_dbdma.c +++ b/sys/powerpc/powermac/ata_dbdma.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("* $FreeBSD$"); - /* * Common routines for the DMA engine on both the Apple Kauai and MacIO * ATA controllers. From nobody Wed Aug 23 17:49: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 4RWDHX1lYyz4r9PL; Wed, 23 Aug 2023 17:49: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 4RWDHX0lSsz4S9X; Wed, 23 Aug 2023 17:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NyhjfqLkfV6Xwgiq9H8Yq9hVzFp84NTLHgEWnbtr530=; b=Fd8VbpFyfLVknGF9UfcXHmEP46h5AJPyG5nb+IiYbWM6hXFT4rnT9OAjf2pkgkkkzBLI5l lL8oVFMko9PtlYcSLTi127M7NU3NYkeuW0E/702QnMNVNQRG7zAreEtc5zFpZOfQ5Skgzf 0bWGflkGf/fSR/UrRl2uLbQmJnfP8/sx0yhpWkL1e2XYALXx9Rqji+XOM2JVVvuj2nHEwz TLk1o8W43gyQ1Q430ckNc2i3fwFyOZTVpoaILcBYxV7lR01RM8Lu5BklyJsWaH4fiz4KUS E+VwCOe5ePcB6yXq2FV/AAcYchpHh1/obVZEUeKbwxSMog4GGfrPPnjKUKsatQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NyhjfqLkfV6Xwgiq9H8Yq9hVzFp84NTLHgEWnbtr530=; b=n3z71Z3ONAUOSS3X6s14cx/Ose80IgH94kLCia9djC5Yjp4OKVS0QhndINrEOovJ8o3FK0 GYvFQUGcurKZ1AkG2CrKFIRv7Pra64czX2SzN+di2uHK6RiJhq4baXyVyKSzIAOLx/onEH /L+bfYNzw6AocJ0hfdUQQr7YZMUL6s+k4DIgFHjc0yKNSVGRRUYu5esuwkKXuA2e3eNevc oIJE2rMaxSg9pjNI+wuBxdjA0jgHAliWrWP2NfvrxoxmkD1SgkA9VDdV878/pWh/NwQzne e+vf3VG9wm/l6JiJ2kerAE+HFiiOy2Z7Ga1E/iA1UfBErCoe2YXDlkrWTR0Qng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812968; a=rsa-sha256; cv=none; b=fzjNtabUBizrLY86oCfSB/IbcbGZqnIR/tIKdvAkmcTeuPWxu4Zq8ON4XCER881yuJcsZx ew/uF8YL9lPMNIqJLnhVP4TboyMqz/hEbToRuoMYCcKKF0kWjDKU7eLAzCS4Nh4AQJHkNq 2SxvPJowrb3q+G1zjuylqiJtga+dMlvJrcxoDAIs6Wv9sKdUgkBrgT39F/i83DMYWFhpgh ypcy0E7DP6oszXp7vqL//o3OiZjTO7ntUo9VrsWAkSVBqxryT69XRiR95eICTcexp0/kHd 06KrCTW9CzUblJt1T6WxLuf1FRRzoTLHndr7IPmikHMqZbcmUViQk9AbU/umYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHW6qbXztsT; Wed, 23 Aug 2023 17:49:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnRRr040409; Wed, 23 Aug 2023 17:49:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnR4R040406; Wed, 23 Aug 2023 17:49:27 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:27 GMT Message-Id: <202308231749.37NHnR4R040406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: da268f445c57 - stable/13 - sys: Remove $FreeBSD$: sound driver version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: da268f445c570eb40461ef1e2535c4d1685974d8 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=da268f445c570eb40461ef1e2535c4d1685974d8 commit da268f445c570eb40461ef1e2535c4d1685974d8 Author: Warner Losh AuthorDate: 2023-08-22 01:30:48 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:19 +0000 sys: Remove $FreeBSD$: sound driver version Remove /SND_DECLARE_FILE\("\$FreeBSD\$"\);/ Similar commit in current: (cherry picked from commit ) --- sys/arm/broadcom/bcm2835/bcm2835_audio.c | 2 +- sys/dev/sound/isa/ad1816.c | 2 +- sys/dev/sound/isa/ess.c | 2 +- sys/dev/sound/isa/gusc.c | 2 +- sys/dev/sound/isa/mss.c | 2 +- sys/dev/sound/isa/sb16.c | 2 +- sys/dev/sound/isa/sb8.c | 2 +- sys/dev/sound/isa/sbc.c | 2 +- sys/dev/sound/isa/sndbuf_dma.c | 2 +- sys/dev/sound/pci/als4000.c | 2 +- sys/dev/sound/pci/atiixp.c | 2 +- sys/dev/sound/pci/cmi.c | 2 +- sys/dev/sound/pci/cs4281.c | 2 +- sys/dev/sound/pci/csa.c | 2 +- sys/dev/sound/pci/csamidi.c | 2 +- sys/dev/sound/pci/csapcm.c | 2 +- sys/dev/sound/pci/ds1.c | 2 +- sys/dev/sound/pci/emu10k1.c | 2 +- sys/dev/sound/pci/envy24.c | 2 +- sys/dev/sound/pci/envy24ht.c | 2 +- sys/dev/sound/pci/es137x.c | 2 +- sys/dev/sound/pci/fm801.c | 2 +- sys/dev/sound/pci/hda/hdaa.c | 2 +- sys/dev/sound/pci/hda/hdaa_patches.c | 2 +- sys/dev/sound/pci/hda/hdac.c | 2 +- sys/dev/sound/pci/hda/hdacc.c | 2 +- sys/dev/sound/pci/hdspe-pcm.c | 2 +- sys/dev/sound/pci/hdspe.c | 2 +- sys/dev/sound/pci/ich.c | 2 +- sys/dev/sound/pci/maestro.c | 2 +- sys/dev/sound/pci/maestro3.c | 2 +- sys/dev/sound/pci/neomagic.c | 2 +- sys/dev/sound/pci/solo.c | 2 +- sys/dev/sound/pci/t4dwave.c | 2 +- sys/dev/sound/pci/via8233.c | 2 +- sys/dev/sound/pci/via82c686.c | 2 +- sys/dev/sound/pci/vibes.c | 2 +- sys/dev/sound/pcm/ac97.c | 2 +- sys/dev/sound/pcm/ac97_patch.c | 2 +- sys/dev/sound/pcm/buffer.c | 2 +- sys/dev/sound/pcm/channel.c | 2 +- sys/dev/sound/pcm/dsp.c | 2 +- sys/dev/sound/pcm/feeder.c | 2 +- sys/dev/sound/pcm/feeder_chain.c | 2 +- sys/dev/sound/pcm/feeder_eq.c | 2 +- sys/dev/sound/pcm/feeder_format.c | 2 +- sys/dev/sound/pcm/feeder_matrix.c | 2 +- sys/dev/sound/pcm/feeder_mixer.c | 2 +- sys/dev/sound/pcm/feeder_rate.c | 2 +- sys/dev/sound/pcm/feeder_volume.c | 2 +- sys/dev/sound/pcm/mixer.c | 2 +- sys/dev/sound/pcm/sndstat.c | 2 +- sys/dev/sound/pcm/sound.c | 2 +- sys/dev/sound/pcm/vchan.c | 2 +- 54 files changed, 54 insertions(+), 54 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index da5939ec33cb..cb551b2c9532 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -38,7 +38,7 @@ #include "vc_vchi_audioserv_defs.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* Audio destination */ #define DEST_AUTO 0 diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c index c41eff8ea1be..0bd6314e015c 100644 --- a/sys/dev/sound/isa/ad1816.c +++ b/sys/dev/sound/isa/ad1816.c @@ -39,7 +39,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); struct ad1816_info; diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c index a185e9e46b80..f166309567d8 100644 --- a/sys/dev/sound/isa/ess.c +++ b/sys/dev/sound/isa/ess.c @@ -44,7 +44,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define ESS_BUFFSIZE (4096) #define ABS(x) (((x) < 0)? -(x) : (x)) diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c index 061c432cd2d3..e77bced173b5 100644 --- a/sys/dev/sound/isa/gusc.c +++ b/sys/dev/sound/isa/gusc.c @@ -48,7 +48,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define LOGICALID_NOPNP 0 #define LOGICALID_PCM 0x0000561e diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c index faffaa49677e..1da1bd69ff59 100644 --- a/sys/dev/sound/isa/mss.c +++ b/sys/dev/sound/isa/mss.c @@ -35,7 +35,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* board-specific include files */ #include diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c index 669d83b80d9e..4367ffafb7f4 100644 --- a/sys/dev/sound/isa/sb16.c +++ b/sys/dev/sound/isa/sb16.c @@ -44,7 +44,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define SB16_BUFFSIZE 4096 #define PLAIN_SB16(x) ((((x)->bd_flags) & (BD_F_SB16|BD_F_SB16X)) == BD_F_SB16) diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c index 5e4c048df739..a205fd68eb21 100644 --- a/sys/dev/sound/isa/sb8.c +++ b/sys/dev/sound/isa/sb8.c @@ -44,7 +44,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define SB_DEFAULT_BUFSZ 4096 diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c index 376bcd747baa..0574cde0ad00 100644 --- a/sys/dev/sound/isa/sbc.c +++ b/sys/dev/sound/isa/sbc.c @@ -36,7 +36,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define IO_MAX 3 #define IRQ_MAX 1 diff --git a/sys/dev/sound/isa/sndbuf_dma.c b/sys/dev/sound/isa/sndbuf_dma.c index eb3252552e37..9257c6db79c0 100644 --- a/sys/dev/sound/isa/sndbuf_dma.c +++ b/sys/dev/sound/isa/sndbuf_dma.c @@ -34,7 +34,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); int sndbuf_dmasetup(struct snd_dbuf *b, struct resource *drq) diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 12a93115f859..0bbeba68c497 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -48,7 +48,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* Debugging macro's */ #undef DEB diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 4675c4e5cb73..ee1be8bf2b8d 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -69,7 +69,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define ATI_IXP_DMA_RETRY_MAX 100 diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 08ff0e282390..9a2f747e0629 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -61,7 +61,7 @@ #include "mixer_if.h" #include "mpufoi_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* Supported chip ID's */ #define CMI8338A_PCI_ID 0x010013f6 diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index a8fc215f5355..51bd920eebf4 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -45,7 +45,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define CS4281_DEFAULT_BUFSZ 16384 diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 84df765e9fcf..d84d2a1e9310 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -54,7 +54,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* This is the pci device id. */ #define CS4610_PCI_ID 0x60011013 diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c index 0b17df410b99..fb65ac4d55af 100644 --- a/sys/dev/sound/pci/csamidi.c +++ b/sys/dev/sound/pci/csamidi.c @@ -54,7 +54,7 @@ #include "mpufoi_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* pulled from mpu401.c */ #define MPU_DATAPORT 0 diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index 2406dc240b9a..e74fc7c764af 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -43,7 +43,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* Buffer size on dma transfer. Fixed for CS416x. */ #define CS461x_BUFFSIZE (4 * 1024) diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c index 271b0faccd6e..c2fe34701e0e 100644 --- a/sys/dev/sound/pci/ds1.c +++ b/sys/dev/sound/pci/ds1.c @@ -39,7 +39,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index d3a87a4ab394..214825c4b0c1 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -43,7 +43,7 @@ #include #include "mpufoi_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index 89a413bfd6ba..0d1436b16582 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -41,7 +41,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c index 5ecdc7be225d..c9dddb1bc871 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -53,7 +53,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index 9be691124b88..77bd31087405 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -90,7 +90,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define MEM_MAP_REG 0x14 diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 7659640df7fd..ab79234c5a02 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -35,7 +35,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define PCI_VENDOR_FORTEMEDIA 0x1319 #define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index 85cf1fe46b8a..6d5e27b88b1f 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -47,7 +47,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define hdaa_lock(devinfo) snd_mtxlock((devinfo)->lock) #define hdaa_unlock(devinfo) snd_mtxunlock((devinfo)->lock) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 567e11a8cf8a..b53a9fc458fd 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -47,7 +47,7 @@ #include "pin_patch.h" #include "pin_patch_realtek.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static const struct { uint32_t model; diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index f6c6a5ae2828..82b1baacfa98 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -51,7 +51,7 @@ #define HDA_DRV_TEST_REV "20120126_0002" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define hdac_lock(sc) snd_mtxlock((sc)->lock) #define hdac_unlock(sc) snd_mtxunlock((sc)->lock) diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index d37acc17524a..afcc145626e1 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -43,7 +43,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); struct hdacc_fg { device_t dev; diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index c6bef21f123f..a6da2c42bc80 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -40,7 +40,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); struct hdspe_latency { uint32_t n; diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index ccbd0aa18882..7289bd3401dc 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -40,7 +40,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static struct hdspe_channel chan_map_aio[] = { { 0, 1, "line", 1, 1 }, diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index 08c8dbb1d292..77bc2af847dc 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -38,7 +38,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c index f99fcc79074f..c234d52e53d3 100644 --- a/sys/dev/sound/pci/maestro.c +++ b/sys/dev/sound/pci/maestro.c @@ -60,7 +60,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* * PCI IDs of supported chips: diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index aeb4bebc9185..ad8b5c96920b 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -69,7 +69,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index dd0c6fdf49f7..2afefd737ab0 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -40,7 +40,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index d8fa17722fbd..53199b3e8e36 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -39,7 +39,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define SOLO_DEFAULT_BUFSZ 16384 #define ABS(x) (((x) < 0)? -(x) : (x)) diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index 7380f1ccb861..42d8cd10b388 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -37,7 +37,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 6d0224cad798..5bed63a814d3 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -50,7 +50,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define VIA8233_PCI_ID 0x30591106 diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index 1f98a90229f2..e7586046f6d0 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -39,7 +39,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define VIA_PCI_ID 0x30581106 #define NSEGS 4 /* Number of segments in SGD table */ diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index 7b9a32d3c154..45bf9e28816a 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -44,7 +44,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* ------------------------------------------------------------------------- */ /* Constants */ diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c index c155ab130b32..238b5afb5909 100644 --- a/sys/dev/sound/pcm/ac97.c +++ b/sys/dev/sound/pcm/ac97.c @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_patch.c index f1a358b50958..aff8075fe96c 100644 --- a/sys/dev/sound/pcm/ac97_patch.c +++ b/sys/dev/sound/pcm/ac97_patch.c @@ -34,7 +34,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); void ad1886_patch(struct ac97_info* codec) { diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index 1a4f49c53a62..358fb91eca8a 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -40,7 +40,7 @@ #define SND_DECLARE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); struct snd_dbuf * sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index d1c715275e7c..87665fd010f1 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -40,7 +40,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); int report_soft_formats = 1; SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW, diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index bb435bc3925c..98d241e65a52 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -43,7 +43,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static int dsp_mmap_allow_prot_exec = 0; SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN, diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index d379d06b8664..8fb377533907 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -35,7 +35,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 9c3baaf282b5..01def5f6e9cb 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -34,7 +34,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* chain state */ struct feeder_chain_state { diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index bc39d33c03fb..70797a706367 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -46,7 +46,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #endif #include "feeder_eq_gen.h" diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 8a9054561b2b..3a741430e0ca 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -44,7 +44,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #endif #define FEEDFORMAT_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 33bf3ec11ee0..0afdb47c04d8 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -54,7 +54,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #endif #define FEEDMATRIX_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 13afceabf28e..42ebe89d7c09 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -38,7 +38,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #endif #undef SND_FEEDER_MULTIFORMAT diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index a2a3e4544763..febe93284bfe 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -61,7 +61,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #endif #include "feeder_rate_gen.h" diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 724d5a0922e8..fa11a089af76 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -39,7 +39,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #endif typedef void (*feed_volume_t)(int *, int *, uint32_t, uint8_t *, uint32_t); diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 080daeced12d..0c7576390b72 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -37,7 +37,7 @@ #include "feeder_if.h" #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 53c8ae022cbb..4ee73c176909 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -36,7 +36,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define SS_TYPE_MODULE 0 #define SS_TYPE_PCM 1 diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index bbf76869c32b..50c6b6a8a49b 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -44,7 +44,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); devclass_t pcm_devclass; diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 0b0ddc224094..c84d8f14e075 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -36,7 +36,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* * [ac3 , dts , linear , 0, linear, 0] From nobody Wed Aug 23 17:49: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 4RWDHY2dv7z4r9PP; Wed, 23 Aug 2023 17:49: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 4RWDHY1gjLz4SD9; Wed, 23 Aug 2023 17:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mS5jPpMUSPFW3XUClkzZJiKMEXhzoDJVJp7OlOTKuIs=; b=DedgKFN3LpYfxZpLYzWf0/HxwnZIL18oy2jqWAKt3//YMnkegaX5MyQTlyW+V2UPXmPaI/ s77oy1sy+Iw/M47dvdyZzV+Epf/MCak5/WHuaOqiLk5w4hp+ZAT/Qe6HSMo+LF1AZOP6c9 y0qsRWcEGMZr2evnrQ4Ohhwx76+bQjIghZnbjS2Mu3Bbzw1UAjj4bGHl6h33Tl2bu7TXA3 rEvPmojmqBrwV9mUTMdOY/jXKHfzDcDmm234d1wo7SM32VHcT/DNXJ4kQAF/qzCPmRV/8h 5HtUYPECv7VtSza+9AOn9FbJyKoS/pyuKgUaX8rQ2g2oRWzmCFYFZK3s9Tq1Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mS5jPpMUSPFW3XUClkzZJiKMEXhzoDJVJp7OlOTKuIs=; b=rRV//KVDhFMXoGgD91HU7/4aEYkDoB1mbAper39FIg3/LM2k9+7l4QJp16mx3vNVmAnTaa ajVg/HSSX+KwnDKnjHC/xFKVE2WyyshB3zej3dRKu22i60MP3vUcS7B0r8OZCMNOxIPf5B RdTyWsQurZJXHOas2CXUO1cpi25F4iQIQOGXYNmVpAHiv0+bVaHkQGRV1niLUy9wJ5IsSI GtcbCTf73CKhD99Q1BCthXoTJgw23pN79UAqUUYx+48F/qtBrU2D0r2lf5OAfAYLi7fX5e 4Q4BZILLCJQzEnfortZ6OehaQOmhWEeaD4z+kogCpKiTS8D0z2MiYIIwlWsxfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812969; a=rsa-sha256; cv=none; b=mwJ6NPajqFHu4uiFphiW5z68KPMaNIeYxnaoDCJkzuEpOxOGyhBctb6YQFStyenGwWCgc0 byizpuOMFkpeeCd44nn6lEMMe14z4eGGyyE4eo8+R0IwBWBjQQi6GU4ywF1oSBjNu56r8l 0x8PTCNXDMr+gymOJij/2cIdyW3AyI1VC9dCqZuAN0McWeEF1iZLcMCAoBb1ZZ5CxHOhx/ EYxjXt6/M2KuCeabbq01DS/SCuhsqaTdd76RtWiaW63PQ3nqRlSBdqGEcimjzIRa8yz9jY zoSa3jQcyM6T6Zdd3GkOwFZ4Pq5wVBJraIotNBhdn2dmGmJCbz4LguANAOyqEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHY0hxQzv65; Wed, 23 Aug 2023 17:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnTrZ040451; Wed, 23 Aug 2023 17:49:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnTIH040448; Wed, 23 Aug 2023 17:49:29 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:29 GMT Message-Id: <202308231749.37NHnTIH040448@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: f1b1fb19f005 - stable/13 - Remove $FreeBSD$: one-line m4 tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f1b1fb19f0058a64fdba1fdfdd6844b8c04c2824 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f1b1fb19f0058a64fdba1fdfdd6844b8c04c2824 commit f1b1fb19f0058a64fdba1fdfdd6844b8c04c2824 Author: Warner Losh AuthorDate: 2023-08-22 01:30:59 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:19 +0000 Remove $FreeBSD$: one-line m4 tag Remove /^dnl\s*\$FreeBSD\$.*$\n/ Similar commit in main: (cherry picked from commit d54a7d337331) --- usr.bin/m4/TEST/math.m4 | 1 - usr.bin/m4/tests/args.m4 | 1 - usr.bin/m4/tests/args2.m4 | 1 - usr.bin/m4/tests/comments.m4 | 1 - usr.bin/m4/tests/esyscmd.m4 | 1 - usr.bin/m4/tests/eval.m4 | 1 - usr.bin/m4/tests/gnueval.m4 | 1 - usr.bin/m4/tests/gnuformat.m4 | 1 - usr.bin/m4/tests/gnupatterns.m4 | 1 - usr.bin/m4/tests/gnupatterns2.m4 | 1 - usr.bin/m4/tests/gnusofterror.m4 | 1 - usr.bin/m4/tests/includes.aux | 1 - usr.bin/m4/tests/includes.m4 | 1 - usr.bin/m4/tests/m4wrap3.m4 | 1 - usr.bin/m4/tests/patterns.m4 | 1 - usr.bin/m4/tests/quotes.m4 | 1 - usr.bin/m4/tests/redef.m4 | 1 - usr.bin/m4/tests/translit.m4 | 1 - usr.bin/m4/tests/translit2.m4 | 1 - 19 files changed, 19 deletions(-) diff --git a/usr.bin/m4/TEST/math.m4 b/usr.bin/m4/TEST/math.m4 index 0262af66e253..e8cae3333b4e 100644 --- a/usr.bin/m4/TEST/math.m4 +++ b/usr.bin/m4/TEST/math.m4 @@ -1,4 +1,3 @@ -dnl $FreeBSD$ dnl A regression test for m4 C operators (ksb,petef) dnl If you think you have a short-circuiting m4, run us m4 -DSHORCIRCUIT=yes dnl diff --git a/usr.bin/m4/tests/args.m4 b/usr.bin/m4/tests/args.m4 index 3ad30f2442ec..2be7c3fd51fc 100644 --- a/usr.bin/m4/tests/args.m4 +++ b/usr.bin/m4/tests/args.m4 @@ -1,4 +1,3 @@ -dnl $FreeBSD$ dnl $OpenBSD: src/regress/usr.bin/m4/args.m4,v 1.1 2001/10/10 23:23:59 espie Exp $ dnl Expanding all arguments define(`A', `first form: $@, second form $*')dnl diff --git a/usr.bin/m4/tests/args2.m4 b/usr.bin/m4/tests/args2.m4 index 3f9ed600fca7..22f75a0e13af 100644 --- a/usr.bin/m4/tests/args2.m4 +++ b/usr.bin/m4/tests/args2.m4 @@ -1,4 +1,3 @@ -dnl $FreeBSD$ dnl $OpenBSD: src/regress/usr.bin/m4/args2.m4,v 1.1 2008/08/16 09:57:12 espie Exp $ dnl Preserving spaces within nested parentheses define(`foo',`$1')dnl diff --git a/usr.bin/m4/tests/comments.m4 b/usr.bin/m4/tests/comments.m4 index d7038c4f636e..e94165a19079 100644 --- a/usr.bin/m4/tests/comments.m4 +++ b/usr.bin/m4/tests/comments.m4 @@ -1,4 +1,3 @@ -dnl $FreeBSD$ dnl $OpenBSD: src/regress/usr.bin/m4/comments.m4,v 1.1 2005/09/06 15:33:21 espie Exp $ dnl checking the way changecom works. 1: normal diff --git a/usr.bin/m4/tests/esyscmd.m4 b/usr.bin/m4/tests/esyscmd.m4 index 7b1342d39d85..a9b83c478e48 100644 --- a/usr.bin/m4/tests/esyscmd.m4 +++ b/usr.bin/m4/tests/esyscmd.m4 @@ -1,4 +1,3 @@ -dnl $FreeBSD$ changequote(`{',`}')dnl dnl esyscmd({sh -c "m4< To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: f8167e0404da - stable/13 - sys: Remove $FreeBSD$: two-line .h pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f8167e0404dab9ffeaca95853dd237ab7c587f82 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f8167e0404dab9ffeaca95853dd237ab7c587f82 commit f8167e0404dab9ffeaca95853dd237ab7c587f82 Author: Warner Losh AuthorDate: 2023-08-22 01:31:02 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:20 +0000 sys: Remove $FreeBSD$: two-line .h pattern Remove /^\s*\*\n \*\s+\$FreeBSD\$$\n/ Similar commit in current: (cherry picked from commit 95ee2897e98f) --- sys/amd64/acpica/acpi_wakecode.S | 2 -- sys/amd64/amd64/bpf_jit_machdep.h | 2 -- sys/amd64/amd64/cpu_switch.S | 2 -- sys/amd64/amd64/efirt_support.S | 2 -- sys/amd64/amd64/exception.S | 2 -- sys/amd64/amd64/locore.S | 2 -- sys/amd64/amd64/mpboot.S | 2 -- sys/amd64/amd64/sigtramp.S | 2 -- sys/amd64/amd64/support.S | 2 -- sys/amd64/amd64/xen-locore.S | 2 -- sys/amd64/ia32/ia32_exception.S | 2 -- sys/amd64/ia32/ia32_reg.c | 2 -- sys/amd64/ia32/ia32_sigtramp.S | 2 -- sys/amd64/include/_bus.h | 2 -- sys/amd64/include/asmacros.h | 2 -- sys/amd64/include/atomic.h | 2 -- sys/amd64/include/bus_dma.h | 2 -- sys/amd64/include/counter.h | 2 -- sys/amd64/include/cpufunc.h | 2 -- sys/amd64/include/csan.h | 2 -- sys/amd64/include/db_machdep.h | 2 -- sys/amd64/include/efi.h | 2 -- sys/amd64/include/frame.h | 2 -- sys/amd64/include/gdb_machdep.h | 2 -- sys/amd64/include/intr_machdep.h | 2 -- sys/amd64/include/iodev.h | 2 -- sys/amd64/include/kdb.h | 2 -- sys/amd64/include/md_var.h | 2 -- sys/amd64/include/memdev.h | 2 -- sys/amd64/include/minidump.h | 2 -- sys/amd64/include/mp_watchdog.h | 2 -- sys/amd64/include/nexusvar.h | 2 -- sys/amd64/include/pc/bios.h | 2 -- sys/amd64/include/pc/display.h | 2 -- sys/amd64/include/pcpu.h | 2 -- sys/amd64/include/pcpu_aux.h | 2 -- sys/amd64/include/pmc_mdep.h | 2 -- sys/amd64/include/ppireg.h | 2 -- sys/amd64/include/runq.h | 2 -- sys/amd64/include/sf_buf.h | 2 -- sys/amd64/include/sgx.h | 2 -- sys/amd64/include/sgxreg.h | 2 -- sys/amd64/include/smp.h | 2 -- sys/amd64/include/timerreg.h | 2 -- sys/amd64/include/vm.h | 2 -- sys/amd64/include/vmm.h | 2 -- sys/amd64/include/vmm_dev.h | 2 -- sys/amd64/include/vmm_instruction_emul.h | 2 -- sys/amd64/include/vmm_snapshot.h | 2 -- sys/amd64/include/xen/hypercall.h | 2 -- sys/amd64/linux/linux.h | 2 -- sys/amd64/linux/linux_locore.asm | 2 -- sys/amd64/linux/linux_support.s | 2 -- sys/amd64/linux/linux_vdso.lds.s | 2 -- sys/amd64/linux32/linux.h | 2 -- sys/amd64/linux32/linux32_support.s | 2 -- sys/amd64/linux32/linux32_vdso.lds.s | 2 -- sys/amd64/sgx/sgx_support.S | 2 -- sys/amd64/sgx/sgxvar.h | 2 -- sys/amd64/vmm/amd/amdv.c | 2 -- sys/amd64/vmm/amd/amdvi_priv.h | 2 -- sys/amd64/vmm/amd/npt.h | 2 -- sys/amd64/vmm/amd/svm.h | 2 -- sys/amd64/vmm/amd/svm_msr.h | 2 -- sys/amd64/vmm/amd/svm_softc.h | 2 -- sys/amd64/vmm/amd/svm_support.S | 2 -- sys/amd64/vmm/amd/vmcb.h | 2 -- sys/amd64/vmm/intel/ept.c | 2 -- sys/amd64/vmm/intel/ept.h | 2 -- sys/amd64/vmm/intel/vmcs.c | 2 -- sys/amd64/vmm/intel/vmcs.h | 2 -- sys/amd64/vmm/intel/vmx.c | 2 -- sys/amd64/vmm/intel/vmx.h | 2 -- sys/amd64/vmm/intel/vmx_controls.h | 2 -- sys/amd64/vmm/intel/vmx_cpufunc.h | 2 -- sys/amd64/vmm/intel/vmx_genassym.c | 2 -- sys/amd64/vmm/intel/vmx_msr.c | 2 -- sys/amd64/vmm/intel/vmx_msr.h | 2 -- sys/amd64/vmm/intel/vmx_support.S | 2 -- sys/amd64/vmm/intel/vtd.c | 2 -- sys/amd64/vmm/io/iommu.c | 2 -- sys/amd64/vmm/io/iommu.h | 2 -- sys/amd64/vmm/io/ppt.c | 2 -- sys/amd64/vmm/io/ppt.h | 2 -- sys/amd64/vmm/io/vatpic.h | 2 -- sys/amd64/vmm/io/vatpit.h | 2 -- sys/amd64/vmm/io/vhpet.c | 2 -- sys/amd64/vmm/io/vhpet.h | 2 -- sys/amd64/vmm/io/vioapic.c | 2 -- sys/amd64/vmm/io/vioapic.h | 2 -- sys/amd64/vmm/io/vlapic.c | 2 -- sys/amd64/vmm/io/vlapic.h | 2 -- sys/amd64/vmm/io/vlapic_priv.h | 2 -- sys/amd64/vmm/io/vpmtmr.h | 2 -- sys/amd64/vmm/io/vrtc.h | 2 -- sys/amd64/vmm/vmm.c | 2 -- sys/amd64/vmm/vmm_dev.c | 2 -- sys/amd64/vmm/vmm_host.c | 2 -- sys/amd64/vmm/vmm_host.h | 2 -- sys/amd64/vmm/vmm_instruction_emul.c | 2 -- sys/amd64/vmm/vmm_ioport.h | 2 -- sys/amd64/vmm/vmm_ktr.h | 2 -- sys/amd64/vmm/vmm_lapic.c | 2 -- sys/amd64/vmm/vmm_lapic.h | 2 -- sys/amd64/vmm/vmm_mem.c | 2 -- sys/amd64/vmm/vmm_mem.h | 2 -- sys/amd64/vmm/vmm_stat.c | 2 -- sys/amd64/vmm/vmm_stat.h | 2 -- sys/amd64/vmm/vmm_util.c | 2 -- sys/amd64/vmm/vmm_util.h | 2 -- sys/amd64/vmm/x86.c | 2 -- sys/amd64/vmm/x86.h | 2 -- sys/arm/allwinner/a10_codec.c | 2 -- sys/arm/allwinner/a10_dmac.h | 2 -- sys/arm/allwinner/a10_fb.c | 2 -- sys/arm/allwinner/a10_hdmi.c | 2 -- sys/arm/allwinner/a10_hdmiaudio.c | 2 -- sys/arm/allwinner/a10_sramc.c | 2 -- sys/arm/allwinner/a10_sramc.h | 2 -- sys/arm/allwinner/a20/a20_cpu_cfg.h | 2 -- sys/arm/allwinner/a64/a64_padconf.c | 2 -- sys/arm/allwinner/a64/a64_r_padconf.c | 2 -- sys/arm/allwinner/a83t/a83t_padconf.c | 2 -- sys/arm/allwinner/a83t/a83t_r_padconf.c | 2 -- sys/arm/allwinner/allwinner_pinctrl.h | 2 -- sys/arm/allwinner/aw_ccu.c | 2 -- sys/arm/allwinner/aw_gmacclk.c | 2 -- sys/arm/allwinner/aw_machdep.h | 2 -- sys/arm/allwinner/aw_mmc.h | 2 -- sys/arm/allwinner/aw_mp.h | 2 -- sys/arm/allwinner/aw_pwm.c | 2 -- sys/arm/allwinner/aw_reset.c | 2 -- sys/arm/allwinner/aw_rsb.c | 2 -- sys/arm/allwinner/aw_sid.c | 2 -- sys/arm/allwinner/aw_sid.h | 2 -- sys/arm/allwinner/aw_spi.c | 2 -- sys/arm/allwinner/aw_thermal.c | 2 -- sys/arm/allwinner/aw_usbphy.c | 2 -- sys/arm/allwinner/aw_wdog.h | 2 -- sys/arm/allwinner/axp209reg.h | 2 -- sys/arm/allwinner/axp81x.c | 2 -- sys/arm/allwinner/clkng/aw_ccung.c | 2 -- sys/arm/allwinner/clkng/aw_ccung.h | 2 -- sys/arm/allwinner/clkng/aw_clk.h | 2 -- sys/arm/allwinner/clkng/aw_clk_frac.c | 2 -- sys/arm/allwinner/clkng/aw_clk_frac.h | 2 -- sys/arm/allwinner/clkng/aw_clk_m.c | 2 -- sys/arm/allwinner/clkng/aw_clk_m.h | 2 -- sys/arm/allwinner/clkng/aw_clk_mipi.c | 2 -- sys/arm/allwinner/clkng/aw_clk_mipi.h | 2 -- sys/arm/allwinner/clkng/aw_clk_nkmp.c | 2 -- sys/arm/allwinner/clkng/aw_clk_nkmp.h | 2 -- sys/arm/allwinner/clkng/aw_clk_nm.c | 2 -- sys/arm/allwinner/clkng/aw_clk_nm.h | 2 -- sys/arm/allwinner/clkng/aw_clk_nmm.c | 2 -- sys/arm/allwinner/clkng/aw_clk_nmm.h | 2 -- sys/arm/allwinner/clkng/aw_clk_np.c | 2 -- sys/arm/allwinner/clkng/aw_clk_np.h | 2 -- sys/arm/allwinner/clkng/aw_clk_prediv_mux.c | 2 -- sys/arm/allwinner/clkng/aw_clk_prediv_mux.h | 2 -- sys/arm/allwinner/clkng/ccu_a10.c | 2 -- sys/arm/allwinner/clkng/ccu_a13.c | 2 -- sys/arm/allwinner/clkng/ccu_a31.c | 2 -- sys/arm/allwinner/clkng/ccu_a64.c | 2 -- sys/arm/allwinner/clkng/ccu_a83t.c | 2 -- sys/arm/allwinner/clkng/ccu_de2.c | 2 -- sys/arm/allwinner/clkng/ccu_h3.c | 2 -- sys/arm/allwinner/clkng/ccu_h6.c | 2 -- sys/arm/allwinner/clkng/ccu_h6_r.c | 2 -- sys/arm/allwinner/clkng/ccu_sun8i_r.c | 2 -- sys/arm/allwinner/if_awg.c | 2 -- sys/arm/allwinner/if_awgreg.h | 2 -- sys/arm/allwinner/if_emac.c | 2 -- sys/arm/allwinner/if_emacreg.h | 2 -- sys/arm/altera/socfpga/socfpga_common.h | 2 -- sys/arm/altera/socfpga/socfpga_l3regs.h | 2 -- sys/arm/altera/socfpga/socfpga_mp.h | 2 -- sys/arm/altera/socfpga/socfpga_rstmgr.h | 2 -- sys/arm/annapurna/alpine/alpine_mp.h | 2 -- sys/arm/annapurna/alpine/alpine_serdes.h | 2 -- sys/arm/arm/cpu_asm-v6.S | 2 -- sys/arm/arm/gic.h | 2 -- sys/arm/arm/gic_common.h | 2 -- sys/arm/arm/locore.S | 2 -- sys/arm/arm/mpcore_timervar.h | 2 -- sys/arm/arm/nexusvar.h | 2 -- sys/arm/arm/pmu.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_bscreg.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_bscvar.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_clkman.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_dma.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_firmware.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_mbox.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_spireg.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_spivar.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_vcbus.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_vcbus.h | 2 -- sys/arm/broadcom/bcm2835/bcm2836_mp.h | 2 -- sys/arm/broadcom/bcm2835/bcm2838_pci.c | 2 -- sys/arm/broadcom/bcm2835/bcm2838_xhci.c | 2 -- sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h | 2 -- sys/arm/freescale/fsl_ocotpreg.h | 2 -- sys/arm/freescale/fsl_ocotpvar.h | 2 -- sys/arm/freescale/imx/imx51_ccmreg.h | 2 -- sys/arm/freescale/imx/imx51_ccmvar.h | 2 -- sys/arm/freescale/imx/imx51_dpllreg.h | 2 -- sys/arm/freescale/imx/imx51_ipuv3reg.h | 2 -- sys/arm/freescale/imx/imx51_sdmareg.h | 2 -- sys/arm/freescale/imx/imx51_ssireg.h | 2 -- sys/arm/freescale/imx/imx51_tzicreg.h | 2 -- sys/arm/freescale/imx/imx6_anatopreg.h | 2 -- sys/arm/freescale/imx/imx6_anatopvar.h | 2 -- sys/arm/freescale/imx/imx6_ccmreg.h | 2 -- sys/arm/freescale/imx/imx6_machdep.h | 2 -- sys/arm/freescale/imx/imx6_sdma.h | 2 -- sys/arm/freescale/imx/imx6_src.h | 2 -- sys/arm/freescale/imx/imx_ccmvar.h | 2 -- sys/arm/freescale/imx/imx_gptreg.h | 2 -- sys/arm/freescale/imx/imx_iomux.c | 2 -- sys/arm/freescale/imx/imx_iomuxreg.h | 2 -- sys/arm/freescale/imx/imx_iomuxvar.h | 2 -- sys/arm/freescale/imx/imx_machdep.h | 2 -- sys/arm/freescale/imx/imx_wdogreg.h | 2 -- sys/arm/freescale/vybrid/vf_adc.h | 2 -- sys/arm/freescale/vybrid/vf_common.h | 2 -- sys/arm/freescale/vybrid/vf_dmamux.h | 2 -- sys/arm/freescale/vybrid/vf_edma.h | 2 -- sys/arm/freescale/vybrid/vf_iomuxc.h | 2 -- sys/arm/freescale/vybrid/vf_port.h | 2 -- sys/arm/freescale/vybrid/vf_src.h | 2 -- sys/arm/include/_bus.h | 2 -- sys/arm/include/_stdint.h | 2 -- sys/arm/include/acle-compat.h | 2 -- sys/arm/include/armreg.h | 2 -- sys/arm/include/asm.h | 2 -- sys/arm/include/asmacros.h | 2 -- sys/arm/include/atags.h | 2 -- sys/arm/include/atomic-v6.h | 2 -- sys/arm/include/atomic.h | 2 -- sys/arm/include/blockio.h | 2 -- sys/arm/include/bus.h | 2 -- sys/arm/include/bus_dma.h | 2 -- sys/arm/include/clock.h | 2 -- sys/arm/include/counter.h | 2 -- sys/arm/include/cpu-v6.h | 2 -- sys/arm/include/cpufunc.h | 2 -- sys/arm/include/cpuinfo.h | 2 -- sys/arm/include/debug_monitor.h | 2 -- sys/arm/include/disassem.h | 2 -- sys/arm/include/dump.h | 2 -- sys/arm/include/efi.h | 2 -- sys/arm/include/elf.h | 2 -- sys/arm/include/exec.h | 2 -- sys/arm/include/fdt.h | 2 -- sys/arm/include/fiq.h | 2 -- sys/arm/include/frame.h | 2 -- sys/arm/include/gdb_machdep.h | 2 -- sys/arm/include/ieee.h | 2 -- sys/arm/include/intr.h | 2 -- sys/arm/include/kdb.h | 2 -- sys/arm/include/memdev.h | 2 -- sys/arm/include/metadata.h | 2 -- sys/arm/include/ofw_machdep.h | 2 -- sys/arm/include/pcb.h | 2 -- sys/arm/include/pcpu_aux.h | 2 -- sys/arm/include/platform.h | 2 -- sys/arm/include/platformvar.h | 2 -- sys/arm/include/pmap-v6.h | 2 -- sys/arm/include/pmap.h | 2 -- sys/arm/include/pmap_var.h | 2 -- sys/arm/include/pmc_mdep.h | 2 -- sys/arm/include/psl.h | 2 -- sys/arm/include/pte-v6.h | 2 -- sys/arm/include/resource.h | 2 -- sys/arm/include/runq.h | 2 -- sys/arm/include/sc_machdep.h | 2 -- sys/arm/include/sf_buf.h | 2 -- sys/arm/include/stack.h | 2 -- sys/arm/include/stdarg.h | 2 -- sys/arm/include/sysreg.h | 2 -- sys/arm/include/ucontext.h | 2 -- sys/arm/include/undefined.h | 2 -- sys/arm/include/vdso.h | 2 -- sys/arm/include/vm.h | 2 -- sys/arm/include/vmparam.h | 2 -- sys/arm/mv/a37x0_iicreg.h | 2 -- sys/arm/mv/armada38x/armada38x_pl310.h | 2 -- sys/arm/mv/armada38x/pmsu.h | 2 -- sys/arm/mv/armadaxp/armadaxp_mp.c | 2 -- sys/arm/mv/mv_ap806_clock.c | 2 -- sys/arm/mv/mv_ap806_gicp.c | 2 -- sys/arm/mv/mv_cp110_clock.c | 2 -- sys/arm/mv/mv_cp110_clock.h | 2 -- sys/arm/mv/mv_cp110_icu.c | 2 -- sys/arm/mv/mv_thermal.c | 2 -- sys/arm/mv/mvebu_pinctrl.c | 2 -- sys/arm/mv/mvreg.h | 2 -- sys/arm/mv/mvvar.h | 2 -- sys/arm/mv/mvwin.h | 2 -- sys/arm/nvidia/as3722.h | 2 -- sys/arm/nvidia/drm2/hdmi.h | 2 -- sys/arm/nvidia/drm2/tegra_dc_reg.h | 2 -- sys/arm/nvidia/drm2/tegra_drm.h | 2 -- sys/arm/nvidia/drm2/tegra_hdmi_reg.h | 2 -- sys/arm/nvidia/tegra124/tegra124_car.h | 2 -- sys/arm/nvidia/tegra124/tegra124_mp.h | 2 -- sys/arm/nvidia/tegra124/tegra124_pmc.c | 2 -- sys/arm/nvidia/tegra_efuse.h | 2 -- sys/arm/nvidia/tegra_pmc.h | 2 -- sys/arm/qemu/virt_mp.h | 2 -- sys/arm/rockchip/rk32xx_mp.h | 2 -- sys/arm/ti/am335x/am3359_cppi41.c | 2 -- sys/arm/ti/am335x/am335x_dmtreg.h | 2 -- sys/arm/ti/am335x/am335x_lcd.h | 2 -- sys/arm/ti/am335x/am335x_pwm.h | 2 -- sys/arm/ti/am335x/am335x_reg.h | 2 -- sys/arm/ti/am335x/am335x_rtcreg.h | 2 -- sys/arm/ti/am335x/am335x_rtcvar.h | 2 -- sys/arm/ti/am335x/am335x_scm.h | 2 -- sys/arm/ti/am335x/am335x_scm_padconf.h | 2 -- sys/arm/ti/am335x/am335x_usb_phy.c | 2 -- sys/arm/ti/am335x/tps65217x.h | 2 -- sys/arm/ti/clk/clock_common.c | 2 -- sys/arm/ti/clk/clock_common.h | 2 -- sys/arm/ti/clk/ti_clk_clkctrl.c | 2 -- sys/arm/ti/clk/ti_clk_clkctrl.h | 2 -- sys/arm/ti/clk/ti_clk_dpll.c | 2 -- sys/arm/ti/clk/ti_clk_dpll.h | 2 -- sys/arm/ti/clk/ti_clkctrl.c | 2 -- sys/arm/ti/clk/ti_divider_clock.c | 2 -- sys/arm/ti/clk/ti_dpll_clock.c | 2 -- sys/arm/ti/clk/ti_gate_clock.c | 2 -- sys/arm/ti/clk/ti_mux_clock.c | 2 -- sys/arm/ti/cpsw/if_cpswreg.h | 2 -- sys/arm/ti/cpsw/if_cpswvar.h | 2 -- sys/arm/ti/omap4/omap4_machdep.h | 2 -- sys/arm/ti/omap4/omap4_reg.h | 2 -- sys/arm/ti/omap4/omap4_scm_padconf.h | 2 -- sys/arm/ti/omap4/pandaboard/pandaboard.h | 2 -- sys/arm/ti/ti_adcreg.h | 2 -- sys/arm/ti/ti_adcvar.h | 2 -- sys/arm/ti/ti_cpuid.h | 2 -- sys/arm/ti/ti_edma3.h | 2 -- sys/arm/ti/ti_gpio.h | 2 -- sys/arm/ti/ti_i2c.h | 2 -- sys/arm/ti/ti_mbox.h | 2 -- sys/arm/ti/ti_omap4_cm.c | 2 -- sys/arm/ti/ti_omap4_cm.h | 2 -- sys/arm/ti/ti_pinmux.h | 2 -- sys/arm/ti/ti_prcm.c | 2 -- sys/arm/ti/ti_prcm.h | 2 -- sys/arm/ti/ti_prm.c | 2 -- sys/arm/ti/ti_prm.h | 2 -- sys/arm/ti/ti_pruss.h | 2 -- sys/arm/ti/ti_scm.c | 2 -- sys/arm/ti/ti_scm.h | 2 -- sys/arm/ti/ti_scm_syscon.c | 2 -- sys/arm/ti/ti_sdma.h | 2 -- sys/arm/ti/ti_sdmareg.h | 2 -- sys/arm/ti/ti_spireg.h | 2 -- sys/arm/ti/ti_spivar.h | 2 -- sys/arm/ti/ti_sysc.c | 2 -- sys/arm/ti/ti_sysc.h | 2 -- sys/arm/ti/ti_wdt.h | 2 -- sys/arm/ti/tivar.h | 2 -- sys/arm/ti/twl/twl.h | 2 -- sys/arm/ti/twl/twl_clks.h | 2 -- sys/arm/ti/twl/twl_vreg.h | 2 -- sys/arm/ti/usb/omap_usb.h | 2 -- sys/arm/versatile/versatile_scm.h | 2 -- sys/arm/xilinx/zy7_devcfg.c | 2 -- sys/arm/xilinx/zy7_ehci.c | 2 -- sys/arm/xilinx/zy7_gpio.c | 2 -- sys/arm/xilinx/zy7_l2cache.c | 2 -- sys/arm/xilinx/zy7_machdep.c | 2 -- sys/arm/xilinx/zy7_machdep.h | 2 -- sys/arm/xilinx/zy7_reg.h | 2 -- sys/arm/xilinx/zy7_slcr.c | 2 -- sys/arm/xilinx/zy7_slcr.h | 2 -- sys/arm/xilinx/zy7_spi.c | 2 -- sys/arm64/arm64/gic_v3_reg.h | 2 -- sys/arm64/arm64/gic_v3_var.h | 2 -- sys/arm64/arm64/locore.S | 2 -- sys/arm64/broadcom/genet/if_genet.c | 2 -- sys/arm64/broadcom/genet/if_genetreg.h | 2 -- sys/arm64/cavium/thunder_pcie_common.h | 2 -- sys/arm64/cavium/thunder_pcie_pem.h | 2 -- sys/arm64/coresight/coresight.h | 2 -- sys/arm64/coresight/coresight_etm4x.h | 2 -- sys/arm64/coresight/coresight_funnel.h | 2 -- sys/arm64/coresight/coresight_replicator.h | 2 -- sys/arm64/coresight/coresight_tmc.h | 2 -- sys/arm64/freescale/imx/clk/imx_clk_composite.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_composite.h | 2 -- sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h | 2 -- sys/arm64/freescale/imx/clk/imx_clk_gate.h | 2 -- sys/arm64/freescale/imx/clk/imx_clk_mux.h | 2 -- sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h | 2 -- sys/arm64/freescale/imx/imx_ccm_clk.h | 2 -- sys/arm64/include/_bus.h | 2 -- sys/arm64/include/_stdint.h | 2 -- sys/arm64/include/acpica_machdep.h | 2 -- sys/arm64/include/armreg.h | 2 -- sys/arm64/include/asm.h | 2 -- sys/arm64/include/atomic.h | 2 -- sys/arm64/include/bus.h | 2 -- sys/arm64/include/bus_dma_impl.h | 2 -- sys/arm64/include/counter.h | 2 -- sys/arm64/include/cpufunc.h | 2 -- sys/arm64/include/csan.h | 2 -- sys/arm64/include/db_machdep.h | 2 -- sys/arm64/include/debug_monitor.h | 2 -- sys/arm64/include/disassem.h | 2 -- sys/arm64/include/dump.h | 2 -- sys/arm64/include/efi.h | 2 -- sys/arm64/include/elf.h | 2 -- sys/arm64/include/fpu.h | 2 -- sys/arm64/include/frame.h | 2 -- sys/arm64/include/hypervisor.h | 2 -- sys/arm64/include/ifunc.h | 2 -- sys/arm64/include/intr.h | 2 -- sys/arm64/include/iodev.h | 2 -- sys/arm64/include/kdb.h | 2 -- sys/arm64/include/machdep.h | 2 -- sys/arm64/include/memdev.h | 2 -- sys/arm64/include/metadata.h | 2 -- sys/arm64/include/ofw_machdep.h | 2 -- sys/arm64/include/pcb.h | 2 -- sys/arm64/include/pci_cfgreg.h | 2 -- sys/arm64/include/pcpu_aux.h | 2 -- sys/arm64/include/pmap.h | 2 -- sys/arm64/include/pmc_mdep.h | 2 -- sys/arm64/include/pte.h | 2 -- sys/arm64/include/reg.h | 2 -- sys/arm64/include/resource.h | 2 -- sys/arm64/include/runq.h | 2 -- sys/arm64/include/setjmp.h | 2 -- sys/arm64/include/sf_buf.h | 2 -- sys/arm64/include/smp.h | 2 -- sys/arm64/include/stack.h | 2 -- sys/arm64/include/stdarg.h | 2 -- sys/arm64/include/ucontext.h | 2 -- sys/arm64/include/undefined.h | 2 -- sys/arm64/include/vdso.h | 2 -- sys/arm64/include/vfp.h | 2 -- sys/arm64/include/vm.h | 2 -- sys/arm64/intel/intel-smc.h | 2 -- sys/arm64/intel/stratix10-svc.h | 2 -- sys/arm64/iommu/iommu.h | 2 -- sys/arm64/iommu/smmureg.h | 2 -- sys/arm64/iommu/smmuvar.h | 2 -- sys/arm64/linux/linux_locore.asm | 2 -- sys/arm64/linux/linux_machdep.c | 2 -- sys/arm64/linux/linux_sigframe.h | 2 -- sys/arm64/linux/linux_support.s | 2 -- sys/arm64/linux/linux_vdso.lds.s | 2 -- sys/arm64/nvidia/tegra210/max77620.h | 2 -- sys/arm64/nvidia/tegra210/tegra210_car.h | 2 -- sys/arm64/qoriq/clk/qoriq_clk_pll.h | 2 -- sys/arm64/qoriq/clk/qoriq_clkgen.h | 2 -- sys/arm64/rockchip/clk/rk3288_cru.c | 2 -- sys/arm64/rockchip/clk/rk3328_cru.c | 2 -- sys/arm64/rockchip/clk/rk3399_cru.c | 2 -- sys/arm64/rockchip/clk/rk3399_pmucru.c | 2 -- sys/arm64/rockchip/clk/rk_clk_armclk.c | 2 -- sys/arm64/rockchip/clk/rk_clk_armclk.h | 2 -- sys/arm64/rockchip/clk/rk_clk_composite.c | 2 -- sys/arm64/rockchip/clk/rk_clk_composite.h | 2 -- sys/arm64/rockchip/clk/rk_clk_fract.h | 2 -- sys/arm64/rockchip/clk/rk_clk_gate.h | 2 -- sys/arm64/rockchip/clk/rk_clk_mux.h | 2 -- sys/arm64/rockchip/clk/rk_clk_pll.c | 2 -- sys/arm64/rockchip/clk/rk_clk_pll.h | 2 -- sys/arm64/rockchip/clk/rk_cru.c | 2 -- sys/arm64/rockchip/clk/rk_cru.h | 2 -- sys/arm64/rockchip/rk805reg.h | 2 -- sys/arm64/rockchip/rk_pwm.c | 2 -- sys/arm64/rockchip/rk_spi.c | 2 -- sys/bsm/audit.h | 2 -- sys/bsm/audit_domain.h | 2 -- sys/bsm/audit_errno.h | 2 -- sys/bsm/audit_fcntl.h | 2 -- sys/bsm/audit_internal.h | 2 -- sys/bsm/audit_kevents.h | 2 -- sys/bsm/audit_record.h | 2 -- sys/bsm/audit_socket_type.h | 2 -- sys/cam/ata/ata_all.h | 2 -- sys/cam/cam.h | 2 -- sys/cam/cam_ccb.h | 2 -- sys/cam/cam_compat.h | 2 -- sys/cam/cam_debug.h | 2 -- sys/cam/cam_iosched.c | 2 -- sys/cam/cam_iosched.h | 2 -- sys/cam/cam_periph.h | 2 -- sys/cam/cam_queue.h | 2 -- sys/cam/cam_sim.h | 2 -- sys/cam/cam_xpt.h | 2 -- sys/cam/cam_xpt_internal.h | 2 -- sys/cam/cam_xpt_periph.h | 2 -- sys/cam/cam_xpt_sim.h | 2 -- sys/cam/ctl/ctl_frontend_iscsi.c | 2 -- sys/cam/ctl/ctl_frontend_iscsi.h | 2 -- sys/cam/ctl/ctl_tpc.h | 2 -- sys/cam/mmc/mmc.h | 2 -- sys/cam/mmc/mmc_all.h | 2 -- sys/cam/mmc/mmc_sim.c | 2 -- sys/cam/mmc/mmc_sim.h | 2 -- sys/cam/nvme/nvme_all.h | 2 -- sys/cam/scsi/scsi_all.h | 2 -- sys/cam/scsi/scsi_da.h | 2 -- sys/cam/scsi/scsi_enc_internal.h | 2 -- sys/cam/scsi/scsi_pass.h | 2 -- sys/cam/scsi/scsi_pt.h | 2 -- sys/cam/scsi/scsi_sa.h | 2 -- sys/cam/scsi/scsi_sg.h | 2 -- sys/cam/scsi/scsi_targetio.h | 2 -- sys/cddl/boot/zfs/skein_zfs.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_string.c | 2 -- sys/cddl/compat/opensolaris/sys/assfail.h | 2 -- sys/cddl/compat/opensolaris/sys/atomic.h | 2 -- sys/cddl/compat/opensolaris/sys/bitmap.h | 2 -- sys/cddl/compat/opensolaris/sys/byteorder.h | 2 -- sys/cddl/compat/opensolaris/sys/callo.h | 2 -- sys/cddl/compat/opensolaris/sys/cmn_err.h | 2 -- sys/cddl/compat/opensolaris/sys/cpupart.h | 2 -- sys/cddl/compat/opensolaris/sys/cpuvar.h | 2 -- sys/cddl/compat/opensolaris/sys/cred.h | 2 -- sys/cddl/compat/opensolaris/sys/debug.h | 2 -- sys/cddl/compat/opensolaris/sys/debug_compat.h | 2 -- sys/cddl/compat/opensolaris/sys/dirent.h | 2 -- sys/cddl/compat/opensolaris/sys/disp.h | 2 -- sys/cddl/compat/opensolaris/sys/dkio.h | 2 -- sys/cddl/compat/opensolaris/sys/dnlc.h | 2 -- sys/cddl/compat/opensolaris/sys/elf.h | 2 -- sys/cddl/compat/opensolaris/sys/feature_tests.h | 2 -- sys/cddl/compat/opensolaris/sys/freebsd_rwlock.h | 2 -- sys/cddl/compat/opensolaris/sys/kcondvar.h | 2 -- sys/cddl/compat/opensolaris/sys/kidmap.h | 2 -- sys/cddl/compat/opensolaris/sys/kmem.h | 2 -- sys/cddl/compat/opensolaris/sys/kstat.h | 2 -- sys/cddl/compat/opensolaris/sys/misc.h | 2 -- sys/cddl/compat/opensolaris/sys/mntent.h | 2 -- sys/cddl/compat/opensolaris/sys/mnttab.h | 2 -- sys/cddl/compat/opensolaris/sys/modctl.h | 2 -- sys/cddl/compat/opensolaris/sys/objfs.h | 2 -- sys/cddl/compat/opensolaris/sys/pathname.h | 2 -- sys/cddl/compat/opensolaris/sys/pcpu.h | 2 -- sys/cddl/compat/opensolaris/sys/random.h | 2 -- sys/cddl/compat/opensolaris/sys/rwlock.h | 2 -- sys/cddl/compat/opensolaris/sys/sdt.h | 2 -- sys/cddl/compat/opensolaris/sys/sema.h | 2 -- sys/cddl/compat/opensolaris/sys/sid.h | 2 -- sys/cddl/compat/opensolaris/sys/sig.h | 2 -- sys/cddl/compat/opensolaris/sys/string.h | 2 -- sys/cddl/compat/opensolaris/sys/sunddi.h | 2 -- sys/cddl/compat/opensolaris/sys/varargs.h | 2 -- sys/cddl/compat/opensolaris/sys/vfs.h | 2 -- sys/cddl/compat/opensolaris/sys/vm.h | 2 -- sys/cddl/compat/opensolaris/sys/zone.h | 2 -- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 2 -- sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c | 2 -- sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h | 2 -- sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c | 2 -- sys/cddl/dev/dtmalloc/dtmalloc.c | 2 -- sys/cddl/dev/dtrace/aarch64/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/aarch64/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/amd64/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/amd64/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/amd64/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/arm/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/arm/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/arm/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/dtrace_anon.c | 2 -- sys/cddl/dev/dtrace/dtrace_cddl.h | 2 -- sys/cddl/dev/dtrace/dtrace_debug.c | 2 -- sys/cddl/dev/dtrace/dtrace_ioctl.c | 2 -- sys/cddl/dev/dtrace/dtrace_load.c | 2 -- sys/cddl/dev/dtrace/dtrace_modevent.c | 2 -- sys/cddl/dev/dtrace/dtrace_sysctl.c | 2 -- sys/cddl/dev/dtrace/dtrace_test.c | 2 -- sys/cddl/dev/dtrace/dtrace_unload.c | 2 -- sys/cddl/dev/dtrace/dtrace_vtime.c | 2 -- sys/cddl/dev/dtrace/i386/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/i386/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/i386/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/mips/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/mips/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/mips/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/powerpc/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/powerpc/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/powerpc/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/riscv/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/riscv/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/riscv/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/x86/instr_size.c | 2 -- sys/cddl/dev/fbt/aarch64/fbt_isa.c | 2 -- sys/cddl/dev/fbt/aarch64/fbt_isa.h | 2 -- sys/cddl/dev/fbt/arm/fbt_isa.c | 2 -- sys/cddl/dev/fbt/arm/fbt_isa.h | 2 -- sys/cddl/dev/fbt/fbt.c | 2 -- sys/cddl/dev/fbt/fbt.h | 2 -- sys/cddl/dev/fbt/mips/fbt_isa.c | 2 -- sys/cddl/dev/fbt/mips/fbt_isa.h | 2 -- sys/cddl/dev/fbt/powerpc/fbt_isa.c | 2 -- sys/cddl/dev/fbt/powerpc/fbt_isa.h | 2 -- sys/cddl/dev/fbt/riscv/fbt_isa.c | 2 -- sys/cddl/dev/fbt/riscv/fbt_isa.h | 2 -- sys/cddl/dev/fbt/x86/fbt_isa.c | 2 -- sys/cddl/dev/fbt/x86/fbt_isa.h | 2 -- sys/cddl/dev/profile/profile.c | 2 -- sys/cddl/dev/prototype.c | 2 -- sys/cddl/dev/sdt/sdt.c | 2 -- sys/compat/cloudabi/cloudabi_proto.h | 2 -- sys/compat/cloudabi/cloudabi_util.h | 2 -- sys/compat/cloudabi/cloudabi_vdso.lds | 2 -- sys/compat/cloudabi32/cloudabi32_util.h | 2 -- sys/compat/cloudabi64/cloudabi64_util.h | 2 -- sys/compat/freebsd32/freebsd32.h | 2 -- sys/compat/freebsd32/freebsd32_ioctl.h | 2 -- sys/compat/freebsd32/freebsd32_ipc.h | 2 -- sys/compat/freebsd32/freebsd32_misc.h | 2 -- sys/compat/freebsd32/freebsd32_signal.h | 2 -- sys/compat/freebsd32/freebsd32_util.h | 2 -- sys/compat/ia32/ia32_signal.h | 2 -- sys/compat/ia32/ia32_util.h | 2 -- sys/compat/linux/check_error.d | 2 -- sys/compat/linux/check_internal_locks.d | 2 -- sys/compat/linux/linux.h | 2 -- sys/compat/linux/linux_common.h | 2 -- sys/compat/linux/linux_dtrace.h | 2 -- sys/compat/linux/linux_emul.h | 2 -- sys/compat/linux/linux_errno.h | 2 -- sys/compat/linux/linux_errno.inc | 2 -- sys/compat/linux/linux_event.h | 2 -- sys/compat/linux/linux_file.h | 2 -- sys/compat/linux/linux_fork.h | 2 -- sys/compat/linux/linux_futex.h | 2 -- sys/compat/linux/linux_ioctl.h | 2 -- sys/compat/linux/linux_ipc.h | 2 -- sys/compat/linux/linux_ipc64.h | 2 -- sys/compat/linux/linux_mib.h | 2 -- sys/compat/linux/linux_misc.h | 2 -- sys/compat/linux/linux_mmap.c | 2 -- sys/compat/linux/linux_mmap.h | 2 -- sys/compat/linux/linux_siginfo.h | 2 -- sys/compat/linux/linux_signal.h | 2 -- sys/compat/linux/linux_socket.h | 2 -- sys/compat/linux/linux_sysproto.h | 2 -- sys/compat/linux/linux_time.h | 2 -- sys/compat/linux/linux_vdso.h | 2 -- sys/compat/linux/stats_timing.d | 2 -- sys/compat/linux/trace_futexes.d | 2 -- sys/compat/linuxkpi/common/include/acpi/acpi.h | 2 -- sys/compat/linuxkpi/common/include/acpi/acpi_bus.h | 2 -- sys/compat/linuxkpi/common/include/acpi/video.h | 2 -- sys/compat/linuxkpi/common/include/asm/atomic-long.h | 2 -- sys/compat/linuxkpi/common/include/asm/atomic.h | 2 -- sys/compat/linuxkpi/common/include/asm/atomic64.h | 2 -- sys/compat/linuxkpi/common/include/asm/byteorder.h | 2 -- sys/compat/linuxkpi/common/include/asm/fcntl.h | 2 -- sys/compat/linuxkpi/common/include/asm/io.h | 2 -- sys/compat/linuxkpi/common/include/asm/msr.h | 2 -- sys/compat/linuxkpi/common/include/asm/pgtable.h | 2 -- sys/compat/linuxkpi/common/include/asm/smp.h | 2 -- sys/compat/linuxkpi/common/include/asm/types.h | 2 -- sys/compat/linuxkpi/common/include/asm/uaccess.h | 2 -- sys/compat/linuxkpi/common/include/asm/unaligned.h | 2 -- sys/compat/linuxkpi/common/include/linux/acpi.h | 2 -- sys/compat/linuxkpi/common/include/linux/atomic.h | 2 -- sys/compat/linuxkpi/common/include/linux/average.h | 2 -- sys/compat/linuxkpi/common/include/linux/backlight.h | 2 -- sys/compat/linuxkpi/common/include/linux/bcd.h | 2 -- sys/compat/linuxkpi/common/include/linux/bitfield.h | 2 -- sys/compat/linuxkpi/common/include/linux/bitmap.h | 2 -- sys/compat/linuxkpi/common/include/linux/bitops.h | 2 -- sys/compat/linuxkpi/common/include/linux/bottom_half.h | 2 -- sys/compat/linuxkpi/common/include/linux/bsearch.h | 2 -- sys/compat/linuxkpi/common/include/linux/cache.h | 2 -- sys/compat/linuxkpi/common/include/linux/cdev.h | 2 -- sys/compat/linuxkpi/common/include/linux/clocksource.h | 2 -- sys/compat/linuxkpi/common/include/linux/compat.h | 2 -- sys/compat/linuxkpi/common/include/linux/compiler.h | 2 -- sys/compat/linuxkpi/common/include/linux/completion.h | 2 -- sys/compat/linuxkpi/common/include/linux/cpu.h | 2 -- sys/compat/linuxkpi/common/include/linux/crc32.h | 2 -- sys/compat/linuxkpi/common/include/linux/dcache.h | 2 -- sys/compat/linuxkpi/common/include/linux/debugfs.h | 2 -- sys/compat/linuxkpi/common/include/linux/delay.h | 2 -- sys/compat/linuxkpi/common/include/linux/devcoredump.h | 2 -- sys/compat/linuxkpi/common/include/linux/device.h | 2 -- sys/compat/linuxkpi/common/include/linux/dma-attrs.h | 2 -- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 2 -- sys/compat/linuxkpi/common/include/linux/dmapool.h | 2 -- sys/compat/linuxkpi/common/include/linux/dmi.h | 2 -- sys/compat/linuxkpi/common/include/linux/err.h | 2 -- sys/compat/linuxkpi/common/include/linux/errno.h | 2 -- sys/compat/linuxkpi/common/include/linux/etherdevice.h | 2 -- sys/compat/linuxkpi/common/include/linux/ethtool.h | 2 -- sys/compat/linuxkpi/common/include/linux/export.h | 2 -- sys/compat/linuxkpi/common/include/linux/file.h | 2 -- sys/compat/linuxkpi/common/include/linux/firmware.h | 2 -- sys/compat/linuxkpi/common/include/linux/fs.h | 2 -- sys/compat/linuxkpi/common/include/linux/gcd.h | 2 -- sys/compat/linuxkpi/common/include/linux/gfp.h | 2 -- sys/compat/linuxkpi/common/include/linux/hardirq.h | 2 -- sys/compat/linuxkpi/common/include/linux/hashtable.h | 2 -- sys/compat/linuxkpi/common/include/linux/hrtimer.h | 2 -- sys/compat/linuxkpi/common/include/linux/idr.h | 2 -- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 2 -- sys/compat/linuxkpi/common/include/linux/if_arp.h | 2 -- sys/compat/linuxkpi/common/include/linux/if_ether.h | 2 -- sys/compat/linuxkpi/common/include/linux/if_vlan.h | 2 -- sys/compat/linuxkpi/common/include/linux/in.h | 2 -- sys/compat/linuxkpi/common/include/linux/in6.h | 2 -- sys/compat/linuxkpi/common/include/linux/interrupt.h | 2 -- sys/compat/linuxkpi/common/include/linux/io-mapping.h | 2 -- sys/compat/linuxkpi/common/include/linux/io.h | 2 -- sys/compat/linuxkpi/common/include/linux/ioctl.h | 2 -- sys/compat/linuxkpi/common/include/linux/iopoll.h | 2 -- sys/compat/linuxkpi/common/include/linux/ip.h | 2 -- sys/compat/linuxkpi/common/include/linux/irq_work.h | 2 -- sys/compat/linuxkpi/common/include/linux/irqreturn.h | 2 -- sys/compat/linuxkpi/common/include/linux/jhash.h | 2 -- sys/compat/linuxkpi/common/include/linux/jiffies.h | 2 -- sys/compat/linuxkpi/common/include/linux/kconfig.h | 2 -- sys/compat/linuxkpi/common/include/linux/kdev_t.h | 2 -- sys/compat/linuxkpi/common/include/linux/kernel.h | 2 -- sys/compat/linuxkpi/common/include/linux/kmod.h | 2 -- sys/compat/linuxkpi/common/include/linux/kobject.h | 2 -- sys/compat/linuxkpi/common/include/linux/kref.h | 2 -- sys/compat/linuxkpi/common/include/linux/kthread.h | 2 -- sys/compat/linuxkpi/common/include/linux/ktime.h | 2 -- sys/compat/linuxkpi/common/include/linux/list.h | 2 -- sys/compat/linuxkpi/common/include/linux/lockdep.h | 2 -- sys/compat/linuxkpi/common/include/linux/log2.h | 2 -- sys/compat/linuxkpi/common/include/linux/math64.h | 2 -- sys/compat/linuxkpi/common/include/linux/mhi.h | 2 -- sys/compat/linuxkpi/common/include/linux/miscdevice.h | 2 -- sys/compat/linuxkpi/common/include/linux/mm.h | 2 -- sys/compat/linuxkpi/common/include/linux/mm_types.h | 2 -- sys/compat/linuxkpi/common/include/linux/mmu_context.h | 2 -- sys/compat/linuxkpi/common/include/linux/mmu_notifier.h | 2 -- sys/compat/linuxkpi/common/include/linux/mod_devicetable.h | 2 -- sys/compat/linuxkpi/common/include/linux/module.h | 2 -- sys/compat/linuxkpi/common/include/linux/moduleparam.h | 2 -- sys/compat/linuxkpi/common/include/linux/mutex.h | 2 -- sys/compat/linuxkpi/common/include/linux/net.h | 2 -- sys/compat/linuxkpi/common/include/linux/net_dim.h | 2 -- sys/compat/linuxkpi/common/include/linux/netdev_features.h | 2 -- sys/compat/linuxkpi/common/include/linux/netdevice.h | 2 -- sys/compat/linuxkpi/common/include/linux/nl80211.h | 2 -- sys/compat/linuxkpi/common/include/linux/notifier.h | 2 -- sys/compat/linuxkpi/common/include/linux/numa.h | 2 -- sys/compat/linuxkpi/common/include/linux/overflow.h | 2 -- sys/compat/linuxkpi/common/include/linux/page.h | 2 -- sys/compat/linuxkpi/common/include/linux/pagemap.h | 2 -- sys/compat/linuxkpi/common/include/linux/pci.h | 2 -- sys/compat/linuxkpi/common/include/linux/pci_ids.h | 2 -- sys/compat/linuxkpi/common/include/linux/pfn.h | 2 -- sys/compat/linuxkpi/common/include/linux/pfn_t.h | 2 -- sys/compat/linuxkpi/common/include/linux/pid.h | 2 -- sys/compat/linuxkpi/common/include/linux/platform_device.h | 2 -- sys/compat/linuxkpi/common/include/linux/pm.h | 2 -- sys/compat/linuxkpi/common/include/linux/pm_qos.h | 2 -- sys/compat/linuxkpi/common/include/linux/poll.h | 2 -- sys/compat/linuxkpi/common/include/linux/power_supply.h | 2 -- sys/compat/linuxkpi/common/include/linux/preempt.h | 2 -- sys/compat/linuxkpi/common/include/linux/prefetch.h | 2 -- sys/compat/linuxkpi/common/include/linux/printk.h | 2 -- sys/compat/linuxkpi/common/include/linux/ptp_clock_kernel.h | 2 -- sys/compat/linuxkpi/common/include/linux/radix-tree.h | 2 -- sys/compat/linuxkpi/common/include/linux/random.h | 2 -- sys/compat/linuxkpi/common/include/linux/rbtree.h | 2 -- sys/compat/linuxkpi/common/include/linux/rculist.h | 2 -- sys/compat/linuxkpi/common/include/linux/rcupdate.h | 2 -- sys/compat/linuxkpi/common/include/linux/refcount.h | 2 -- sys/compat/linuxkpi/common/include/linux/rhashtable.h | 2 -- sys/compat/linuxkpi/common/include/linux/rwlock.h | 2 -- sys/compat/linuxkpi/common/include/linux/rwsem.h | 2 -- sys/compat/linuxkpi/common/include/linux/scatterlist.h | 2 -- sys/compat/linuxkpi/common/include/linux/sched.h | 2 -- sys/compat/linuxkpi/common/include/linux/semaphore.h | 2 -- sys/compat/linuxkpi/common/include/linux/seq_file.h | 2 -- sys/compat/linuxkpi/common/include/linux/shmem_fs.h | 2 -- sys/compat/linuxkpi/common/include/linux/shrinker.h | 2 -- sys/compat/linuxkpi/common/include/linux/sizes.h | 2 -- sys/compat/linuxkpi/common/include/linux/skbuff.h | 2 -- sys/compat/linuxkpi/common/include/linux/slab.h | 2 -- sys/compat/linuxkpi/common/include/linux/smp.h | 2 -- sys/compat/linuxkpi/common/include/linux/soc/qcom/qmi.h | 2 -- sys/compat/linuxkpi/common/include/linux/socket.h | 2 -- sys/compat/linuxkpi/common/include/linux/spinlock.h | 2 -- sys/compat/linuxkpi/common/include/linux/srcu.h | 2 -- sys/compat/linuxkpi/common/include/linux/string.h | 2 -- sys/compat/linuxkpi/common/include/linux/stringify.h | 2 -- sys/compat/linuxkpi/common/include/linux/swap.h | 2 -- sys/compat/linuxkpi/common/include/linux/sysfs.h | 2 -- sys/compat/linuxkpi/common/include/linux/tcp.h | 2 -- sys/compat/linuxkpi/common/include/linux/time.h | 2 -- sys/compat/linuxkpi/common/include/linux/timer.h | 2 -- sys/compat/linuxkpi/common/include/linux/tracepoint.h | 2 -- sys/compat/linuxkpi/common/include/linux/types.h | 2 -- sys/compat/linuxkpi/common/include/linux/uaccess.h | 2 -- sys/compat/linuxkpi/common/include/linux/udp.h | 2 -- sys/compat/linuxkpi/common/include/linux/utsname.h | 2 -- sys/compat/linuxkpi/common/include/linux/uuid.h | 2 -- sys/compat/linuxkpi/common/include/linux/vmalloc.h | 2 -- sys/compat/linuxkpi/common/include/linux/wait.h | 2 -- sys/compat/linuxkpi/common/include/linux/wait_bit.h | 2 -- sys/compat/linuxkpi/common/include/linux/workqueue.h | 2 -- sys/compat/linuxkpi/common/include/linux/ww_mutex.h | 2 -- sys/compat/linuxkpi/common/include/linux/xarray.h | 2 -- sys/compat/linuxkpi/common/include/net/addrconf.h | 2 -- sys/compat/linuxkpi/common/include/net/cfg80211.h | 2 -- sys/compat/linuxkpi/common/include/net/ieee80211_radiotap.h | 2 -- sys/compat/linuxkpi/common/include/net/if_inet6.h | 2 -- sys/compat/linuxkpi/common/include/net/ip.h | 2 -- sys/compat/linuxkpi/common/include/net/ipv6.h | 2 -- sys/compat/linuxkpi/common/include/net/mac80211.h | 2 -- sys/compat/linuxkpi/common/include/net/netevent.h | 2 -- sys/compat/linuxkpi/common/include/net/regulatory.h | 2 -- sys/compat/linuxkpi/common/include/net/tcp.h | 2 -- sys/compat/linuxkpi/common/src/linux_acpi.c | 2 -- sys/compat/linuxkpi/common/src/linux_dmi.c | 2 -- sys/compat/linuxkpi/common/src/linux_firmware.c | 2 -- sys/compat/linuxkpi/common/src/linux_interrupt.c | 2 -- sys/compat/linuxkpi/common/src/linux_lock.c | 2 -- sys/compat/linuxkpi/common/src/linux_mhi.c | 2 -- sys/compat/linuxkpi/common/src/linux_shrinker.c | 2 -- sys/compat/linuxkpi/common/src/linux_skbuff.c | 2 -- sys/compat/ndis/cfg_var.h | 2 -- sys/compat/ndis/hal_var.h | 2 -- sys/compat/ndis/ndis_var.h | 2 -- sys/compat/ndis/ntoskrnl_var.h | 2 -- sys/compat/ndis/pe_var.h | 2 -- sys/compat/ndis/resource_var.h | 2 -- sys/compat/ndis/usbd_var.h | 2 -- sys/compat/ndis/winx32_wrap.S | 2 -- sys/compat/ndis/winx64_wrap.S | 2 -- sys/compat/x86bios/x86bios.h | 2 -- sys/conf/ldscript.kmod.amd64 | 2 -- sys/conf/ldscript.kmod.i386 | 2 -- sys/crypto/aesni/aesencdec.h | 2 -- sys/crypto/aesni/aesni.h | 2 -- sys/crypto/aesni/aesni_ccm.c | 2 -- sys/crypto/aesni/aesni_ghash.c | 2 -- sys/crypto/aesni/aesni_os.h | 2 -- sys/crypto/aesni/sha_sse.h | 2 -- sys/crypto/armv8/armv8_crypto.h | 2 -- sys/crypto/camellia/camellia-api.c | 2 -- sys/crypto/camellia/camellia.c | 2 -- sys/crypto/camellia/camellia.h | 2 -- sys/crypto/ccp/ccp.h | 2 -- sys/crypto/ccp/ccp_hardware.h | 2 -- sys/crypto/ccp/ccp_lsb.h | 2 -- sys/crypto/intake.h | 2 -- sys/crypto/openssl/ossl.h | 2 -- sys/crypto/openssl/ossl_aarch64.c | 2 -- sys/crypto/openssl/ossl_hash.h | 2 -- sys/crypto/openssl/ossl_sha.h | 2 -- sys/crypto/openssl/ossl_x86.c | 2 -- sys/crypto/rc4/rc4.h | 2 -- sys/crypto/rijndael/test00.c | 2 -- sys/crypto/sha2/sha224.h | 2 -- sys/crypto/sha2/sha256.h | 2 -- sys/crypto/sha2/sha384.h | 2 -- sys/crypto/sha2/sha512.h | 2 -- sys/crypto/sha2/sha512t.h | 2 -- sys/crypto/siphash/siphash.h | 2 -- sys/crypto/skein/skein_freebsd.h | 2 -- sys/crypto/via/padlock.h | 2 -- sys/ddb/db_access.h | 2 -- sys/ddb/db_break.h | 2 -- sys/ddb/db_command.h | 2 -- sys/ddb/db_lex.h | 2 -- sys/ddb/db_output.h | 2 -- sys/ddb/db_sym.h | 2 -- sys/ddb/db_variables.h | 2 -- sys/ddb/db_watch.h | 2 -- sys/ddb/ddb.h | 2 -- sys/dev/aac/aac_tables.h | 2 -- sys/dev/aac/aacreg.h | 2 -- sys/dev/aac/aacvar.h | 2 -- sys/dev/aacraid/aacraid_debug.h | 2 -- sys/dev/aacraid/aacraid_endian.h | 2 -- sys/dev/aacraid/aacraid_reg.h | 2 -- sys/dev/aacraid/aacraid_var.h | 2 -- sys/dev/acpica/acpi_dock.c | 2 -- sys/dev/acpica/acpi_hpet.h | 2 -- sys/dev/acpica/acpi_pcibvar.h | 2 -- sys/dev/acpica/acpi_pcivar.h | 2 -- sys/dev/acpica/acpi_smbus.h | 2 -- sys/dev/acpica/acpiio.h | 2 -- sys/dev/acpica/acpivar.h | 2 -- sys/dev/adb/adb.h | 2 -- sys/dev/adb/adb_bus.c | 2 -- sys/dev/adb/adb_buttons.c | 2 -- sys/dev/adb/adb_kbd.c | 2 -- sys/dev/adb/adb_mouse.c | 2 -- sys/dev/adb/adbvar.h | 2 -- sys/dev/ae/if_aereg.h | 2 -- sys/dev/ae/if_aevar.h | 2 -- sys/dev/age/if_agereg.h | 2 -- sys/dev/age/if_agevar.h | 2 -- sys/dev/agp/agp_i810.h | 2 -- sys/dev/agp/agppriv.h | 2 -- sys/dev/agp/agpreg.h | 2 -- sys/dev/agp/agpvar.h | 2 -- sys/dev/ahci/ahci.h | 2 -- sys/dev/aic7xxx/aic79xx.h | 2 -- sys/dev/aic7xxx/aic79xx.reg | 2 -- sys/dev/aic7xxx/aic79xx.seq | 2 -- sys/dev/aic7xxx/aic79xx_inline.h | 2 -- sys/dev/aic7xxx/aic79xx_osm.h | 2 -- sys/dev/aic7xxx/aic79xx_reg.h | 2 -- sys/dev/aic7xxx/aic79xx_seq.h | 2 -- sys/dev/aic7xxx/aic7xxx.h | 2 -- sys/dev/aic7xxx/aic7xxx.reg | 2 -- sys/dev/aic7xxx/aic7xxx.seq | 2 -- sys/dev/aic7xxx/aic7xxx_93cx6.h | 2 -- sys/dev/aic7xxx/aic7xxx_inline.h | 2 -- sys/dev/aic7xxx/aic7xxx_osm.h | 2 -- sys/dev/aic7xxx/aic7xxx_reg.h | 2 -- sys/dev/aic7xxx/aic7xxx_seq.h | 2 -- sys/dev/aic7xxx/aic_osm_lib.h | 2 -- sys/dev/aic7xxx/aicasm/aicasm.c | 2 -- sys/dev/aic7xxx/aicasm/aicasm.h | 2 -- sys/dev/aic7xxx/aicasm/aicasm_gram.y | 2 -- sys/dev/aic7xxx/aicasm/aicasm_insformat.h | 2 -- sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y | 2 -- sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l | 2 -- sys/dev/aic7xxx/aicasm/aicasm_scan.l | 2 -- sys/dev/aic7xxx/aicasm/aicasm_symbol.c | 2 -- sys/dev/aic7xxx/aicasm/aicasm_symbol.h | 2 -- sys/dev/al_eth/al_eth.h | 2 -- sys/dev/al_eth/al_init_eth_kr.h | 2 -- sys/dev/al_eth/al_init_eth_lm.h | 2 -- sys/dev/alc/if_alcreg.h | 2 -- sys/dev/alc/if_alcvar.h | 2 -- sys/dev/ale/if_alereg.h | 2 -- sys/dev/ale/if_alevar.h | 2 -- sys/dev/altera/atse/if_atsereg.h | 2 -- sys/dev/altera/avgen/altera_avgen.h | 2 -- sys/dev/altera/jtag_uart/altera_jtag_uart.h | 2 -- sys/dev/altera/msgdma/msgdma.h | 2 -- sys/dev/altera/pio/pio.h | 2 -- sys/dev/altera/sdcard/altera_sdcard.h | 2 -- sys/dev/altera/softdma/a_api.h | 2 -- sys/dev/amd_ecc_inject/ecc_inject.c | 2 -- sys/dev/amdgpio/amdgpio.h | 2 -- sys/dev/amdsbwd/amd_chipset.h | 2 -- sys/dev/amdsmn/amdsmn.h | 2 -- sys/dev/amr/amr_tables.h | 2 -- sys/dev/amr/amrio.h | 2 -- sys/dev/amr/amrreg.h | 2 -- sys/dev/amr/amrvar.h | 2 -- sys/dev/an/if_aironet_ieee.h | 2 -- sys/dev/an/if_anreg.h | 2 -- sys/dev/asmc/asmcvar.h | 2 -- sys/dev/ata/ata-all.h | 2 -- sys/dev/ata/ata-pci.h | 2 -- sys/dev/ath/ah_osdep.c | 2 -- sys/dev/ath/ah_osdep.h | 2 -- *** 52233 LINES SKIPPED *** From nobody Wed Aug 23 17:49: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 4RWDHd4ygMz4r96g; Wed, 23 Aug 2023 17:49: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 4RWDHd3rzPz4SbJ; Wed, 23 Aug 2023 17:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Y3SY+2s43Jdeio8UuX8khZaq85E7gk1izGs9oERtNs=; b=GnKNKT5FMmpgArZgdrjFxLlTFEV3OCppdwSL2etTxxFsfqGtZ6LYVrADvtnKS+vWrzmD58 Zh6ePeQ52gqDKpm/VX2vY51RZ0gpDPZSaEajXBcX6+tSz9HFmbT4e42sDcWoERW4Cq8vqq 0+bo30KJRncf9LeMHh7czCzi2v0XUlqRGzdW/1OKdKarY37gtvbHiO4JbC2KcU9QCouJbi e/Oo9fseYOT78JlcuHvRoboxl/EhXzX6LOx89EhSQZ+NH7tC1FegQ7waYwqwX/+5GOZtAQ n1cL1v52oS7EZAgU/ot5Vm73+m4gN8pgVv1bGQKHHEda0yDlq5VOYYN1D5NZ4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Y3SY+2s43Jdeio8UuX8khZaq85E7gk1izGs9oERtNs=; b=eaJKAOp6kIjEpdyFCgUXLv4G1QUC0+0jsR1sgRYxPFHE/ndDSL9HIDoGJewQHL260fO0Wn GyFiQs0NiwOGdCpVhukx0wR/fStf74rMGWC/1ekzLxRh7W4wT1a/xqnLOaNBHsPjlA/3Rq /wjRSIvVwgg29EPDZng9i/WURZdIsJBlxmTXxhGrFmS9dWOYFQOnGfXxOCHCTNxXmOJUWK 27IHYfLD9W6SdvbNxO9N0a1K2cjBrdQcpYAnWNAakdfcxo1rrq1gqOS5XKN5WRcuyzOQ3s C0O9nA1cu+O2+doD10p/zMgq0YK6/lhGwlkUyVo6t3lyVnfW4iLWX/kd+HBDMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812973; a=rsa-sha256; cv=none; b=b495aaNyP76bapEUctHcYsHIooJ2xP3Z/3gebA/L+hOflUVC2nujr8SPMQJDZ8EGVuMpMJ n7zNql47KtIKx+10fwOokXVV067v9NU/RaS7iN2nt+UF437piSy74D7qGSKo/DVu32E6p3 xZuApRfZwDRzHu7IqciGPqLuPk4Z1UQ22rp8X7+NxUMIXKubdHGA/Nodsvh7OPcHkcruAq m5N+APg0NKFhO+jrEV9gtOFHJnLDj8q4xQ34iv2wcyPcP6YlmxlEBHc8Sgrc/3tln5G/6I QubTMQDmMKiSwWUiDE60ATPAoOusv2k678OUlIXSqRn5hFbGdWjDflpp/G8vmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHd2VXNzv8B; Wed, 23 Aug 2023 17:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnXqR040546; Wed, 23 Aug 2023 17:49:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnWYk040539; Wed, 23 Aug 2023 17:49:32 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:32 GMT Message-Id: <202308231749.37NHnWYk040539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 17da660ad5b3 - stable/13 - Remove $FreeBSD$: two-line .h pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 17da660ad5b3b9cd90e164dd4dbb9beaa7203054 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=17da660ad5b3b9cd90e164dd4dbb9beaa7203054 commit 17da660ad5b3b9cd90e164dd4dbb9beaa7203054 Author: Warner Losh AuthorDate: 2023-08-22 01:31:07 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:21 +0000 Remove $FreeBSD$: two-line .h pattern Remove /^\s*\*\n \*\s+\$FreeBSD\$$\n/ Similar commit in main: (cherry picked from commit b3e7694832e8) --- bin/csh/iconv_stub.c | 2 -- bin/csh/iconv_stub.h | 2 -- bin/date/vary.h | 2 -- bin/dd/gen.c | 2 -- bin/expr/expr.y | 2 -- bin/setfacl/setfacl.h | 2 -- bin/sh/arith_yacc.h | 2 -- bin/sh/cd.h | 2 -- cddl/compat/opensolaris/include/alloca.h | 2 -- cddl/compat/opensolaris/include/assert.h | 2 -- cddl/compat/opensolaris/include/devid.h | 2 -- cddl/compat/opensolaris/include/dtrace.h | 2 -- cddl/compat/opensolaris/include/fcntl.h | 2 -- cddl/compat/opensolaris/include/fsshare.h | 2 -- cddl/compat/opensolaris/include/libproc.h | 2 -- cddl/compat/opensolaris/include/libshare.h | 2 -- cddl/compat/opensolaris/include/sha2.h | 2 -- cddl/compat/opensolaris/include/stdio.h | 2 -- cddl/compat/opensolaris/include/strings.h | 2 -- cddl/compat/opensolaris/include/unistd.h | 2 -- cddl/compat/opensolaris/lib/libumem/umem.c | 2 -- cddl/compat/opensolaris/lib/libumem/umem.h | 2 -- cddl/lib/libdtrace/errno.d | 2 -- cddl/lib/libdtrace/io.d | 2 -- cddl/lib/libdtrace/ip.d | 2 -- cddl/lib/libdtrace/libproc_compat.h | 2 -- cddl/lib/libdtrace/net.d | 2 -- cddl/lib/libdtrace/nfs.d | 2 -- cddl/lib/libdtrace/nfssrv.d | 2 -- cddl/lib/libdtrace/psinfo.d | 2 -- cddl/lib/libdtrace/regs_x86.d | 2 -- cddl/lib/libdtrace/sched.d | 2 -- cddl/lib/libdtrace/sctp.d | 2 -- cddl/lib/libdtrace/siftr.d | 2 -- cddl/lib/libdtrace/signal.d | 2 -- cddl/lib/libdtrace/socket.d | 2 -- cddl/lib/libdtrace/tcp.d | 2 -- cddl/lib/libdtrace/udp.d | 2 -- cddl/lib/libdtrace/udplite.d | 2 -- cddl/lib/libdtrace/unistd.d | 2 -- cddl/usr.sbin/zfsd/callout.cc | 2 -- cddl/usr.sbin/zfsd/callout.h | 2 -- cddl/usr.sbin/zfsd/case_file.h | 2 -- cddl/usr.sbin/zfsd/tests/libmocks.c | 2 -- cddl/usr.sbin/zfsd/tests/libmocks.h | 2 -- cddl/usr.sbin/zfsd/vdev.cc | 2 -- cddl/usr.sbin/zfsd/vdev.h | 2 -- cddl/usr.sbin/zfsd/vdev_iterator.cc | 2 -- cddl/usr.sbin/zfsd/vdev_iterator.h | 2 -- cddl/usr.sbin/zfsd/zfsd.h | 2 -- cddl/usr.sbin/zfsd/zfsd_event.h | 2 -- cddl/usr.sbin/zfsd/zfsd_exception.h | 2 -- cddl/usr.sbin/zfsd/zpool_list.cc | 2 -- cddl/usr.sbin/zfsd/zpool_list.h | 2 -- gnu/lib/libdialog/dlg_config.h | 2 -- include/ar.h | 2 -- include/arpa/ftp.h | 2 -- include/bitstring.h | 2 -- include/complex.h | 2 -- include/cpio.h | 2 -- include/dlfcn.h | 2 -- include/elf-hints.h | 2 -- include/elf.h | 2 -- include/fmtmsg.h | 2 -- include/fnmatch.h | 2 -- include/ftw.h | 2 -- include/gssapi/gssapi.h | 2 -- include/inttypes.h | 2 -- include/iso646.h | 2 -- include/kenv.h | 2 -- include/langinfo.h | 2 -- include/link.h | 2 -- include/malloc_np.h | 2 -- include/memory.h | 2 -- include/monetary.h | 2 -- include/mqueue.h | 2 -- include/nl_types.h | 2 -- include/nlist.h | 2 -- include/nss.h | 2 -- include/printf.h | 2 -- include/proc_service.h | 2 -- include/protocols/dumprestore.h | 2 -- include/protocols/routed.h | 2 -- include/protocols/rwhod.h | 2 -- include/protocols/talkd.h | 2 -- include/protocols/timed.h | 2 -- include/pthread.h | 2 -- include/pthread_np.h | 2 -- include/ranlib.h | 2 -- include/rpc/rpcsec_gss.h | 2 -- include/rpcsvc/nis_db.h | 2 -- include/rpcsvc/nislib.h | 2 -- include/rpcsvc/yp_prot.h | 2 -- include/rpcsvc/ypclnt.h | 2 -- include/semaphore.h | 2 -- include/spawn.h | 2 -- include/stab.h | 2 -- include/stdalign.h | 2 -- include/stdbool.h | 2 -- include/stddef.h | 2 -- include/stdnoreturn.h | 2 -- include/stringlist.h | 2 -- include/strings.h | 2 -- include/sysexits.h | 2 -- include/tar.h | 2 -- include/tgmath.h | 2 -- include/timers.h | 2 -- include/uchar.h | 2 -- include/ulimit.h | 2 -- include/utmpx.h | 2 -- include/uuid.h | 2 -- include/varargs.h | 2 -- include/wchar.h | 2 -- include/wordexp.h | 2 -- include/xlocale.h | 2 -- include/xlocale/_ctype.h | 2 -- include/xlocale/_inttypes.h | 2 -- include/xlocale/_langinfo.h | 2 -- include/xlocale/_locale.h | 2 -- include/xlocale/_monetary.h | 2 -- include/xlocale/_stdio.h | 2 -- include/xlocale/_stdlib.h | 2 -- include/xlocale/_string.h | 2 -- include/xlocale/_strings.h | 2 -- include/xlocale/_time.h | 2 -- include/xlocale/_uchar.h | 2 -- include/xlocale/_wchar.h | 2 -- kerberos5/lib/libgssapi_krb5/gss_krb5.c | 2 -- kerberos5/lib/libgssapi_krb5/prefix.c | 2 -- kerberos5/lib/libgssapi_ntlm/prefix.c | 2 -- kerberos5/lib/libgssapi_spnego/freebsd_compat.c | 2 -- lib/csu/amd64/crt.h | 2 -- lib/csu/common/notes.h | 2 -- lib/csu/i386/crt.h | 2 -- lib/csu/i386/crt1_c.c | 2 -- lib/csu/i386/crt1_s.S | 2 -- lib/csu/mips/crt.h | 2 -- lib/csu/mips/crt1_c.c | 2 -- lib/csu/powerpc/crt.h | 2 -- lib/csu/powerpc64/crt.h | 2 -- lib/flua/libjail/lua_jail.c | 2 -- lib/geom/journal/geom_journal.h | 2 -- lib/lib80211/lib80211_ioctl.c | 2 -- lib/lib80211/lib80211_ioctl.h | 2 -- lib/lib80211/lib80211_regdomain.h | 2 -- lib/libarchive/config_freebsd.h | 2 -- lib/libbe/be.h | 2 -- lib/libbe/be_impl.h | 2 -- lib/libbluetooth/dev.c | 2 -- lib/libbluetooth/hci.c | 2 -- lib/libbsdstat/bsdstat.c | 2 -- lib/libbsdstat/bsdstat.h | 2 -- lib/libbsnmp/tests/bsnmpd_test.c | 2 -- lib/libc/aarch64/SYS.h | 2 -- lib/libc/aarch64/_fpmath.h | 2 -- lib/libc/aarch64/arith.h | 2 -- lib/libc/aarch64/gd_qnan.h | 2 -- lib/libc/aarch64/static_tls.h | 2 -- lib/libc/amd64/_fpmath.h | 2 -- lib/libc/amd64/arith.h | 2 -- lib/libc/amd64/gd_qnan.h | 2 -- lib/libc/amd64/gen/_set_tp.c | 2 -- lib/libc/amd64/static_tls.h | 2 -- lib/libc/amd64/string/memcmp.S | 2 -- lib/libc/amd64/string/memset.S | 2 -- lib/libc/arm/_fpmath.h | 2 -- lib/libc/arm/aeabi/aeabi_vfp.h | 2 -- lib/libc/arm/arith.h | 2 -- lib/libc/arm/gd_qnan.h | 2 -- lib/libc/arm/gen/_set_tp.c | 2 -- lib/libc/arm/static_tls.h | 2 -- lib/libc/gdtoa/glue.c | 2 -- lib/libc/gen/arc4random-compat.c | 2 -- lib/libc/gen/arc4random.h | 2 -- lib/libc/gen/arc4random_uniform.c | 2 -- lib/libc/gen/dirfd.c | 2 -- lib/libc/gen/elf_utils.c | 2 -- lib/libc/gen/fpclassify.c | 2 -- lib/libc/gen/frexp.c | 2 -- lib/libc/gen/gen-compat.h | 2 -- lib/libc/gen/gen-private.h | 2 -- lib/libc/gen/isinf.c | 2 -- lib/libc/gen/isnan.c | 2 -- lib/libc/gen/libc_dlopen.c | 2 -- lib/libc/gen/rand48.h | 2 -- lib/libc/gen/scandir_b.c | 2 -- lib/libc/gen/sem.c | 2 -- lib/libc/gen/sem_new.c | 2 -- lib/libc/gen/telldir.h | 2 -- lib/libc/gen/tls.c | 2 -- lib/libc/gen/ulimit.c | 2 -- lib/libc/gen/unvis-compat.c | 2 -- lib/libc/gen/utxdb.h | 2 -- lib/libc/i386/_fpmath.h | 2 -- lib/libc/i386/arith.h | 2 -- lib/libc/i386/gd_qnan.h | 2 -- lib/libc/i386/gen/_set_tp.c | 2 -- lib/libc/i386/static_tls.h | 2 -- lib/libc/iconv/__iconv.c | 2 -- lib/libc/iconv/__iconv_free_list.c | 2 -- lib/libc/iconv/__iconv_get_list.c | 2 -- lib/libc/iconv/iconv-internal.h | 2 -- lib/libc/iconv/iconv.c | 2 -- lib/libc/iconv/iconv_canonicalize.c | 2 -- lib/libc/iconv/iconv_close.c | 2 -- lib/libc/iconv/iconv_compat.c | 2 -- lib/libc/iconv/iconv_open.c | 2 -- lib/libc/iconv/iconv_open_into.c | 2 -- lib/libc/iconv/iconv_set_relocation_prefix.c | 2 -- lib/libc/iconv/iconvctl.c | 2 -- lib/libc/iconv/iconvlist.c | 2 -- lib/libc/include/block_abi.h | 2 -- lib/libc/include/compat.h | 2 -- lib/libc/include/errlst.h | 2 -- lib/libc/include/fpmath.h | 2 -- lib/libc/include/libc_private.h | 2 -- lib/libc/include/namespace.h | 2 -- lib/libc/include/nscache.h | 2 -- lib/libc/include/nscachedcli.h | 2 -- lib/libc/include/nss_tls.h | 2 -- lib/libc/include/reentrant.h | 2 -- lib/libc/include/spinlock.h | 2 -- lib/libc/include/un-namespace.h | 2 -- lib/libc/locale/collate.h | 2 -- lib/libc/locale/ctype.c | 2 -- lib/libc/locale/ldpart.h | 2 -- lib/libc/locale/lmessages.h | 2 -- lib/libc/locale/lmonetary.h | 2 -- lib/libc/locale/lnumeric.h | 2 -- lib/libc/locale/mblocal.h | 2 -- lib/libc/locale/runefile.h | 2 -- lib/libc/locale/setlocale.h | 2 -- lib/libc/locale/xlocale.c | 2 -- lib/libc/locale/xlocale_private.h | 2 -- lib/libc/mips/_fpmath.h | 2 -- lib/libc/mips/arith.h | 2 -- lib/libc/mips/gd_qnan.h | 2 -- lib/libc/mips/gen/_set_tp.c | 2 -- lib/libc/mips/static_tls.h | 2 -- lib/libc/net/netdb_private.h | 2 -- lib/libc/net/nss_backends.h | 2 -- lib/libc/net/sockatmark.c | 2 -- lib/libc/posix1e/acl_support.h | 2 -- lib/libc/powerpc/_fpmath.h | 2 -- lib/libc/powerpc/arith.h | 2 -- lib/libc/powerpc/gd_qnan.h | 2 -- lib/libc/powerpc/gen/_set_tp.c | 2 -- lib/libc/powerpc/gen/fpgetsticky.c | 2 -- lib/libc/powerpc/static_tls.h | 2 -- lib/libc/powerpc64/_fpmath.h | 2 -- lib/libc/powerpc64/arith.h | 2 -- lib/libc/powerpc64/gd_qnan.h | 2 -- lib/libc/powerpc64/gen/_set_tp.c | 2 -- lib/libc/powerpc64/gen/fpgetsticky.c | 2 -- lib/libc/powerpc64/static_tls.h | 2 -- lib/libc/powerpc64/string/bcopy_vsx.S | 2 -- lib/libc/powerpc64/string/memcpy_vsx.S | 2 -- lib/libc/powerpcspe/gen/fpgetsticky.c | 2 -- lib/libc/resolv/h_errno.c | 2 -- lib/libc/resolv/res_debug.h | 2 -- lib/libc/resolv/res_state.c | 2 -- lib/libc/riscv/SYS.h | 2 -- lib/libc/riscv/_fpmath.h | 2 -- lib/libc/riscv/arith.h | 2 -- lib/libc/riscv/gd_qnan.h | 2 -- lib/libc/riscv/static_tls.h | 2 -- lib/libc/rpc/mt_misc.h | 2 -- lib/libc/rpc/rpc_com.h | 2 -- lib/libc/rpc/rpcsec_gss_stub.c | 2 -- lib/libc/stdio/printfcommon.h | 2 -- lib/libc/stdio/printflocal.h | 2 -- lib/libc/stdio/xprintf.c | 2 -- lib/libc/stdio/xprintf_errno.c | 2 -- lib/libc/stdio/xprintf_float.c | 2 -- lib/libc/stdio/xprintf_hexdump.c | 2 -- lib/libc/stdio/xprintf_int.c | 2 -- lib/libc/stdio/xprintf_quote.c | 2 -- lib/libc/stdio/xprintf_str.c | 2 -- lib/libc/stdio/xprintf_time.c | 2 -- lib/libc/stdio/xprintf_vis.c | 2 -- lib/libc/stdlib/_Exit.c | 2 -- lib/libc/stdlib/bsearch_b.c | 2 -- lib/libc/stdlib/heapsort_b.c | 2 -- lib/libc/stdlib/hsearch.h | 2 -- lib/libc/stdlib/mergesort_b.c | 2 -- lib/libc/stdlib/qsort_r.c | 2 -- lib/libc/stdlib/qsort_s.c | 2 -- lib/libc/stdlib/quick_exit.c | 2 -- lib/libc/stdlib/random.h | 2 -- lib/libc/stdlib/tsearch_path.h | 2 -- lib/libc/stdtime/timelocal.h | 2 -- lib/libc/string/memrchr.c | 2 -- lib/libc/sys/compat-ino64.h | 2 -- lib/libc/sys/compat-stub.c | 2 -- lib/libc/sys/pipe.c | 2 -- lib/libc/sys/vadvise.c | 2 -- lib/libc/tests/gen/fpclassify2_test.c | 2 -- lib/libc/tests/net/ether_test.c | 2 -- lib/libc/tests/net/eui64_aton_test.c | 2 -- lib/libc/tests/net/eui64_ntoa_test.c | 2 -- lib/libc/tests/net/test-eui64.h | 2 -- lib/libc/tests/nss/testutil.h | 2 -- lib/libc/tests/stdlib/test-sort.h | 2 -- lib/libc/tests/string/strerror_test.c | 2 -- lib/libc/uuid/uuid_compare.c | 2 -- lib/libc/uuid/uuid_create.c | 2 -- lib/libc/uuid/uuid_create_nil.c | 2 -- lib/libc/uuid/uuid_equal.c | 2 -- lib/libc/uuid/uuid_from_string.c | 2 -- lib/libc/uuid/uuid_hash.c | 2 -- lib/libc/uuid/uuid_is_nil.c | 2 -- lib/libc/uuid/uuid_to_string.c | 2 -- lib/libc_nonshared/__stub.c | 2 -- lib/libcalendar/calendar.h | 2 -- lib/libcam/camlib.h | 2 -- lib/libcapsicum/capsicum_helpers.h | 2 -- lib/libcasper/libcasper/libcasper.h | 2 -- lib/libcasper/libcasper/libcasper_impl.c | 2 -- lib/libcasper/libcasper/libcasper_impl.h | 2 -- lib/libcasper/libcasper/libcasper_service.h | 2 -- lib/libcasper/libcasper/zygote.h | 2 -- lib/libcasper/services/cap_dns/cap_dns.h | 2 -- lib/libcasper/services/cap_fileargs/cap_fileargs.h | 2 -- lib/libcasper/services/cap_grp/cap_grp.h | 2 -- lib/libcasper/services/cap_net/cap_net.h | 2 -- lib/libcasper/services/cap_pwd/cap_pwd.h | 2 -- lib/libcasper/services/cap_sysctl/cap_sysctl.h | 2 -- lib/libcasper/services/cap_syslog/cap_syslog.h | 2 -- lib/libcrypt/crypt.h | 2 -- lib/libdevctl/devctl.h | 2 -- lib/libdevdctl/consumer.h | 2 -- lib/libdevdctl/event.h | 2 -- lib/libdevdctl/event_factory.h | 2 -- lib/libdevdctl/exception.h | 2 -- lib/libdevdctl/guid.cc | 2 -- lib/libdevdctl/guid.h | 2 -- lib/libdevdctl/tests/libdevdctl_unittest.cc | 2 -- lib/libdevinfo/devinfo.h | 2 -- lib/libdevinfo/devinfo_var.h | 2 -- lib/libdevstat/devstat.h | 2 -- lib/libdpv/dialog_util.h | 2 -- lib/libdpv/dialogrc.h | 2 -- lib/libdpv/dprompt.h | 2 -- lib/libdpv/dpv.h | 2 -- lib/libdpv/dpv_private.h | 2 -- lib/libdpv/status.h | 2 -- lib/libdpv/util.h | 2 -- lib/libedit/readline/history.h | 2 -- lib/libedit/readline/tilde.h | 2 -- lib/libefivar/efi-osdep.h | 2 -- lib/libefivar/efivar-dp.h | 2 -- lib/libefivar/efivar.h | 2 -- lib/libefivar/uefi-dplib.h | 2 -- lib/libfetch/common.h | 2 -- lib/libfetch/fetch.h | 2 -- lib/libfigpar/figpar.h | 2 -- lib/libfigpar/string_m.h | 2 -- lib/libgeom/geom_ctl.c | 2 -- lib/libgeom/geom_getxml.c | 2 -- lib/libgeom/geom_stats.c | 2 -- lib/libgeom/geom_xml2tree.c | 2 -- lib/libgeom/libgeom.h | 2 -- lib/libgpio/gpio.c | 2 -- lib/libgpio/libgpio.h | 2 -- lib/libgssapi/context.h | 2 -- lib/libgssapi/cred.h | 2 -- lib/libgssapi/gss_accept_sec_context.c | 2 -- lib/libgssapi/gss_acquire_cred.c | 2 -- lib/libgssapi/gss_add_cred.c | 2 -- lib/libgssapi/gss_add_oid_set_member.c | 2 -- lib/libgssapi/gss_canonicalize_name.c | 2 -- lib/libgssapi/gss_compare_name.c | 2 -- lib/libgssapi/gss_context_time.c | 2 -- lib/libgssapi/gss_create_empty_oid_set.c | 2 -- lib/libgssapi/gss_decapsulate_token.c | 2 -- lib/libgssapi/gss_delete_sec_context.c | 2 -- lib/libgssapi/gss_display_name.c | 2 -- lib/libgssapi/gss_display_status.c | 2 -- lib/libgssapi/gss_duplicate_name.c | 2 -- lib/libgssapi/gss_duplicate_oid.c | 2 -- lib/libgssapi/gss_encapsulate_token.c | 2 -- lib/libgssapi/gss_export_name.c | 2 -- lib/libgssapi/gss_export_sec_context.c | 2 -- lib/libgssapi/gss_get_mic.c | 2 -- lib/libgssapi/gss_import_name.c | 2 -- lib/libgssapi/gss_import_sec_context.c | 2 -- lib/libgssapi/gss_indicate_mechs.c | 2 -- lib/libgssapi/gss_init_sec_context.c | 2 -- lib/libgssapi/gss_inquire_context.c | 2 -- lib/libgssapi/gss_inquire_cred.c | 2 -- lib/libgssapi/gss_inquire_cred_by_mech.c | 2 -- lib/libgssapi/gss_inquire_mechs_for_name.c | 2 -- lib/libgssapi/gss_inquire_names_for_mech.c | 2 -- lib/libgssapi/gss_inquire_sec_context_by_oid.c | 2 -- lib/libgssapi/gss_krb5.c | 2 -- lib/libgssapi/gss_mech_switch.c | 2 -- lib/libgssapi/gss_names.c | 2 -- lib/libgssapi/gss_process_context_token.c | 2 -- lib/libgssapi/gss_release_buffer.c | 2 -- lib/libgssapi/gss_release_cred.c | 2 -- lib/libgssapi/gss_release_name.c | 2 -- lib/libgssapi/gss_release_oid_set.c | 2 -- lib/libgssapi/gss_seal.c | 2 -- lib/libgssapi/gss_sign.c | 2 -- lib/libgssapi/gss_test_oid_set_member.c | 2 -- lib/libgssapi/gss_unseal.c | 2 -- lib/libgssapi/gss_unwrap.c | 2 -- lib/libgssapi/gss_utils.c | 2 -- lib/libgssapi/gss_verify.c | 2 -- lib/libgssapi/gss_verify_mic.c | 2 -- lib/libgssapi/gss_wrap.c | 2 -- lib/libgssapi/gss_wrap_size_limit.c | 2 -- lib/libgssapi/mech_switch.h | 2 -- lib/libgssapi/name.h | 2 -- lib/libgssapi/spnego.h | 2 -- lib/libgssapi/utils.h | 2 -- lib/libifconfig/libifconfig.c | 2 -- lib/libifconfig/libifconfig.h | 2 -- lib/libifconfig/libifconfig_bridge.c | 2 -- lib/libifconfig/libifconfig_carp.c | 2 -- lib/libifconfig/libifconfig_inet.c | 2 -- lib/libifconfig/libifconfig_inet6.c | 2 -- lib/libifconfig/libifconfig_internal.c | 2 -- lib/libifconfig/libifconfig_internal.h | 2 -- lib/libifconfig/libifconfig_lagg.c | 2 -- lib/libifconfig/libifconfig_media.c | 2 -- lib/libifconfig/libifconfig_sfp.c | 2 -- lib/libifconfig/libifconfig_sfp.h | 2 -- lib/libifconfig/libifconfig_sfp_tables.tpl.c | 2 -- lib/libifconfig/libifconfig_sfp_tables.tpl.h | 2 -- lib/libifconfig/libifconfig_sfp_tables_internal.tpl.h | 2 -- lib/libifconfig/sfp.lua | 2 -- lib/libjail/jail.h | 2 -- lib/libkiconv/kiconv_sysctl.c | 2 -- lib/libkiconv/quirks.c | 2 -- lib/libkiconv/quirks.h | 2 -- lib/libkiconv/xlat16_iconv.c | 2 -- lib/libkiconv/xlat16_sysctl.c | 2 -- lib/libkvm/kvm_aarch64.h | 2 -- lib/libkvm/kvm_amd64.h | 2 -- lib/libkvm/kvm_arm.h | 2 -- lib/libkvm/kvm_i386.h | 2 -- lib/libkvm/kvm_mips.h | 2 -- lib/libkvm/kvm_powerpc64.h | 2 -- lib/libkvm/kvm_riscv.h | 2 -- lib/libkvm/tests/kvm_test_common.h | 2 -- lib/libmd/sha.h | 2 -- lib/libmemstat/memstat.c | 2 -- lib/libmemstat/memstat.h | 2 -- lib/libmemstat/memstat_all.c | 2 -- lib/libmemstat/memstat_internal.h | 2 -- lib/libmemstat/memstat_malloc.c | 2 -- lib/libmemstat/memstat_uma.c | 2 -- lib/libmt/mtlib.h | 2 -- lib/libnetbsd/glob.h | 2 -- lib/libnetbsd/pthread.h | 2 -- lib/libnetbsd/util.c | 2 -- lib/libnetgraph/internal.h | 2 -- lib/libnetgraph/netgraph.h | 2 -- lib/libnetmap/nmctx-pthreads.c | 2 -- lib/libnetmap/nmctx.c | 2 -- lib/libnetmap/nmport.c | 2 -- lib/libnetmap/nmreq.c | 2 -- lib/libnv/common_impl.h | 2 -- lib/libnv/msgio.h | 2 -- lib/libnv/tests/cnv_tests.cc | 2 -- lib/libnv/tests/nvlist_add_test.c | 2 -- lib/libnv/tests/nvlist_append_test.c | 2 -- lib/libnv/tests/nvlist_exists_test.c | 2 -- lib/libnv/tests/nvlist_free_test.c | 2 -- lib/libnv/tests/nvlist_get_test.c | 2 -- lib/libnv/tests/nvlist_move_test.c | 2 -- lib/libopenbsd/imsg-buffer.c | 2 -- lib/libopenbsd/imsg.c | 2 -- lib/libopenbsd/imsg.h | 2 -- lib/libopenbsd/ohash.h | 2 -- lib/libopenbsd/sys/sysctl.h | 2 -- lib/libopenbsd/unistd.h | 2 -- lib/libpam/libpam/security/pam_mod_misc.h | 2 -- lib/libpam/modules/pam_login_access/pam_login_access.h | 2 -- lib/libpathconv/abs2rel.c | 2 -- lib/libpathconv/pathconv.h | 2 -- lib/libpathconv/rel2abs.c | 2 -- lib/libpathconv/tests/abs2rel.c | 2 -- lib/libpathconv/tests/rel2abs.c | 2 -- lib/libpfctl/libpfctl.c | 2 -- lib/libpfctl/libpfctl.h | 2 -- lib/libpjdlog/pjdlog.h | 2 -- lib/libpmc/libpmc_json.cc | 2 -- lib/libpmc/libpmc_pmu_util.c | 2 -- lib/libpmc/libpmcinternal.h | 2 -- lib/libpmc/pmc.h | 2 -- lib/libpmc/pmcformat.h | 2 -- lib/libpmc/pmclog.h | 2 -- lib/libpmc/pmu-events/jsmn.c | 2 -- lib/libpmc/pmu-events/json.c | 2 -- lib/libpmc/pmu-events/list.h | 2 -- lib/libpmcstat/libpmcstat.h | 2 -- lib/libproc/_libproc.h | 2 -- lib/libproc/libproc.h | 2 -- lib/libprocstat/common_kvm.h | 2 -- lib/libprocstat/core.h | 2 -- lib/libprocstat/libprocstat.h | 2 -- lib/libprocstat/libprocstat_compat.c | 2 -- lib/libprocstat/libprocstat_internal.h | 2 -- lib/libprocstat/zfs.c | 2 -- lib/libprocstat/zfs_defs.h | 2 -- lib/libradius/radlib.h | 2 -- lib/libradius/radlib_private.h | 2 -- lib/libradius/radlib_vs.h | 2 -- lib/librpcsec_gss/rpcsec_gss.c | 2 -- lib/librpcsec_gss/rpcsec_gss_conf.c | 2 -- lib/librpcsec_gss/rpcsec_gss_misc.c | 2 -- lib/librpcsec_gss/svc_rpcsec_gss.c | 2 -- lib/librss/librss.h | 2 -- lib/librt/aio.c | 2 -- lib/librt/mq.c | 2 -- lib/librt/sigev_thread.c | 2 -- lib/librt/sigev_thread.h | 2 -- lib/librt/timer.c | 2 -- lib/librtld_db/rtld_db.h | 2 -- lib/libsbuf/tests/sbuf_test_common.h | 2 -- lib/libsecureboot/efi/efi_variables.c | 2 -- lib/libsecureboot/pass_manifest.c | 2 -- lib/libstdbuf/stdbuf.c | 2 -- lib/libstdthreads/call_once.c | 2 -- lib/libstdthreads/cnd.c | 2 -- lib/libstdthreads/mtx.c | 2 -- lib/libstdthreads/thrd.c | 2 -- lib/libstdthreads/threads.h | 2 -- lib/libstdthreads/tss.c | 2 -- lib/libsysdecode/sysdecode.h | 2 -- lib/libtacplus/taclib.h | 2 -- lib/libtacplus/taclib_private.h | 2 -- lib/libthr/arch/aarch64/include/pthread_md.h | 2 -- lib/libthr/arch/aarch64/include/pthread_tls.h | 2 -- lib/libthr/arch/amd64/amd64/_umtx_op_err.S | 2 -- lib/libthr/arch/amd64/include/pthread_md.h | 2 -- lib/libthr/arch/amd64/include/pthread_tls.h | 2 -- lib/libthr/arch/arm/include/pthread_md.h | 2 -- lib/libthr/arch/arm/include/pthread_tls.h | 2 -- lib/libthr/arch/i386/i386/_umtx_op_err.S | 2 -- lib/libthr/arch/i386/include/pthread_md.h | 2 -- lib/libthr/arch/i386/include/pthread_tls.h | 2 -- lib/libthr/arch/mips/include/pthread_tls.h | 2 -- lib/libthr/arch/powerpc/include/pthread_md.h | 2 -- lib/libthr/arch/powerpc/include/pthread_tls.h | 2 -- lib/libthr/arch/powerpc/powerpc/_umtx_op_err.S | 2 -- lib/libthr/arch/riscv/include/pthread_md.h | 2 -- lib/libthr/arch/riscv/include/pthread_tls.h | 2 -- lib/libthr/plockstat.d | 2 -- lib/libthr/sys/thr_error.c | 2 -- lib/libthr/thread/thr_private.h | 2 -- lib/libthr/thread/thr_umtx.h | 2 -- lib/libthread_db/kse.h | 2 -- lib/libthread_db/libpthread_db.h | 2 -- lib/libthread_db/thread_db.h | 2 -- lib/libthread_db/thread_db_int.h | 2 -- lib/libufs/libufs.h | 2 -- lib/libugidfw/ugidfw.c | 2 -- lib/libugidfw/ugidfw.h | 2 -- lib/libulog/ulog.h | 2 -- lib/libulog/utempter.h | 2 -- lib/libusbhid/usbhid.h | 2 -- lib/libusbhid/usbvar.h | 2 -- lib/libutil/kinfo_getallproc.c | 2 -- lib/libutil/kinfo_getproc.c | 2 -- lib/libutil/kld.c | 2 -- lib/libutil/libutil.h | 2 -- lib/libutil/quotafile.c | 2 -- lib/libutil/tests/humanize_number_test.c | 2 -- lib/libvgl/vgl.h | 2 -- lib/libvmmapi/vmmapi.c | 2 -- lib/libvmmapi/vmmapi.h | 2 -- lib/libvmmapi/vmmapi_freebsd.c | 2 -- lib/liby/yyerror.h | 2 -- lib/libypclnt/ypclnt.h | 2 -- lib/libypclnt/ypclnt_connect.c | 2 -- lib/libypclnt/ypclnt_error.c | 2 -- lib/libypclnt/ypclnt_free.c | 2 -- lib/libypclnt/ypclnt_get.c | 2 -- lib/libypclnt/ypclnt_new.c | 2 -- lib/libypclnt/ypclnt_passwd.c | 2 -- lib/msun/aarch64/fenv.c | 2 -- lib/msun/aarch64/fenv.h | 2 -- lib/msun/amd64/fenv.c | 2 -- lib/msun/amd64/s_rintl.S | 2 -- lib/msun/arm/fenv-mangle.h | 2 -- lib/msun/arm/fenv-softfp.c | 2 -- lib/msun/arm/fenv-vfp.c | 2 -- lib/msun/arm/fenv.c | 2 -- lib/msun/arm/fenv.h | 2 -- lib/msun/i387/fenv.c | 2 -- lib/msun/ld128/b_tgammal.c | 2 -- lib/msun/ld128/invtrig.h | 2 -- lib/msun/ld128/s_nanl.c | 2 -- lib/msun/ld80/invtrig.h | 2 -- lib/msun/ld80/s_nanl.c | 2 -- lib/msun/mips/fenv.c | 2 -- lib/msun/mips/fenv.h | 2 -- lib/msun/powerpc/fenv.c | 2 -- lib/msun/powerpc/fenv.h | 2 -- lib/msun/riscv/fenv.c | 2 -- lib/msun/riscv/fenv.h | 2 -- lib/msun/src/fenv-softfloat.h | 2 -- lib/msun/src/s_cimag.c | 2 -- lib/msun/src/s_cimagf.c | 2 -- lib/msun/src/s_cimagl.c | 2 -- lib/msun/src/s_conj.c | 2 -- lib/msun/src/s_conjf.c | 2 -- lib/msun/src/s_conjl.c | 2 -- lib/msun/src/s_copysignl.c | 2 -- lib/msun/src/s_creal.c | 2 -- lib/msun/src/s_crealf.c | 2 -- lib/msun/src/s_creall.c | 2 -- lib/msun/src/s_fabsl.c | 2 -- lib/msun/src/s_frexpl.c | 2 -- lib/msun/src/s_isfinite.c | 2 -- lib/msun/src/s_isnan.c | 2 -- lib/msun/src/s_isnormal.c | 2 -- lib/msun/src/s_modfl.c | 2 -- lib/msun/src/s_nan.c | 2 -- lib/msun/src/s_signbit.c | 2 -- lib/msun/tests/ilogb_test.c | 2 -- lib/msun/tests/test-utils.h | 2 -- lib/msun/x86/fenv.h | 2 -- libexec/bootpd/bootp.h | 2 -- libexec/bootpd/bootpd.h | 2 -- libexec/bootpd/dovend.c | 2 -- libexec/bootpd/dumptab.c | 2 -- libexec/bootpd/getether.c | 2 -- libexec/bootpd/getif.c | 2 -- libexec/bootpd/hwaddr.c | 2 -- libexec/bootpd/hwaddr.h | 2 -- libexec/bootpd/lookup.c | 2 -- libexec/bootpd/patchlevel.h | 2 -- libexec/bootpd/tools/bootptest/print-bootp.c | 2 -- libexec/bootpd/trygetea.c | 2 -- libexec/bootpd/trygetif.c | 2 -- libexec/bootpd/trylook.c | 2 -- libexec/bootpd/tzone.c | 2 -- libexec/fingerd/pathnames.h | 2 -- libexec/flua/modules/lfs.h | 2 -- libexec/mknetid/hash.h | 2 -- libexec/pppoed/pppoed.c | 2 -- libexec/rbootd/defs.h | 2 -- libexec/rbootd/pathnames.h | 2 -- libexec/rbootd/rmp.h | 2 -- libexec/rbootd/rmp_var.h | 2 -- libexec/revnetgroup/hash.h | 2 -- libexec/rpc.rusersd/extern.h | 2 -- libexec/rtld-elf/aarch64/rtld_machdep.h | 2 -- libexec/rtld-elf/amd64/reloc.c | 2 -- libexec/rtld-elf/amd64/rtld_machdep.h | 2 -- libexec/rtld-elf/amd64/rtld_start.S | 2 -- libexec/rtld-elf/arm/rtld_machdep.h | 2 -- libexec/rtld-elf/debug.c | 2 -- libexec/rtld-elf/debug.h | 2 -- libexec/rtld-elf/i386/reloc.c | 2 -- libexec/rtld-elf/i386/rtld_machdep.h | 2 -- libexec/rtld-elf/i386/rtld_start.S | 2 -- libexec/rtld-elf/map_object.c | 2 -- libexec/rtld-elf/mips/rtld_machdep.h | 2 -- libexec/rtld-elf/mips/rtld_start.S | 2 -- libexec/rtld-elf/powerpc/reloc.c | 2 -- libexec/rtld-elf/powerpc/rtld_machdep.h | 2 -- libexec/rtld-elf/powerpc/rtld_start.S | 2 -- libexec/rtld-elf/powerpc64/reloc.c | 2 -- libexec/rtld-elf/powerpc64/rtld_machdep.h | 2 -- libexec/rtld-elf/powerpc64/rtld_start.S | 2 -- libexec/rtld-elf/riscv/rtld_machdep.h | 2 -- libexec/rtld-elf/rtld-libc/libc_private.h | 2 -- libexec/rtld-elf/rtld-libc/namespace.h | 2 -- libexec/rtld-elf/rtld-libc/rtld_libc.c | 2 -- libexec/rtld-elf/rtld-libc/rtld_libc.h | 2 -- libexec/rtld-elf/rtld-libc/un-namespace.h | 2 -- libexec/rtld-elf/rtld.h | 2 -- libexec/rtld-elf/rtld_lock.h | 2 -- libexec/rtld-elf/rtld_malloc.h | 2 -- libexec/rtld-elf/rtld_paths.h | 2 -- libexec/rtld-elf/rtld_printf.c | 2 -- libexec/rtld-elf/rtld_printf.h | 2 -- libexec/rtld-elf/rtld_tls.h | 2 -- libexec/rtld-elf/rtld_utrace.h | 2 -- libexec/rtld-elf/tests/common.c | 2 -- libexec/rtld-elf/tests/common.h | 2 -- libexec/rtld-elf/tests/ld_library_pathfds.c | 2 -- libexec/rtld-elf/tests/ld_preload_fds.c | 2 -- libexec/rtld-elf/tests/libpythagoras/pythagoras.c | 2 -- libexec/rtld-elf/tests/libpythagoras/pythagoras.h | 2 -- libexec/rtld-elf/tests/target/target.c | 2 -- libexec/rtld-elf/xmalloc.c | 2 -- libexec/talkd/extern.h | 2 -- libexec/ypxfr/ypxfr_extern.h | 2 -- sbin/adjkerntz/pathnames.h | 2 -- sbin/bectl/bectl.h | 2 -- sbin/camcontrol/camcontrol.h | 2 -- sbin/camcontrol/progress.h | 2 -- sbin/ddb/ddb.h | 2 -- sbin/devd/devd.h | 2 -- sbin/devd/devd.hh | 2 -- sbin/devd/parse.y | 2 -- sbin/devd/token.l | 2 -- sbin/devfs/extern.h | 2 -- sbin/dhclient/dhcpd.h | 2 -- sbin/dhclient/dhctoken.h | 2 -- sbin/dhclient/privsep.h | 2 -- sbin/dhclient/tree.h | 2 -- sbin/dump/cache.c | 2 -- sbin/dump/dump.h | 2 -- sbin/etherswitchcfg/etherswitchcfg.c | 2 -- sbin/fdisk/fdisk_mbr_enc.h | 2 -- sbin/fsck/fsutil.h | 2 -- sbin/fsck/preen.c | 2 -- sbin/fsdb/fsdb.h | 2 -- sbin/gbde/gbde.c | 2 -- sbin/geom/core/geom.h | 2 -- sbin/geom/misc/subr.h | 2 -- sbin/ggate/ggatec/ggatec.c | 2 -- sbin/ggate/ggated/ggated.c | 2 -- sbin/ggate/ggatel/ggatel.c | 2 -- sbin/ggate/shared/ggate.c | 2 -- sbin/ggate/shared/ggate.h | 2 -- sbin/gvinum/gvinum.c | 2 -- sbin/hastd/activemap.h | 2 -- sbin/hastd/control.h | 2 -- sbin/hastd/ebuf.h | 2 -- sbin/hastd/event.h | 2 -- sbin/hastd/hast.h | 2 -- sbin/hastd/hast_checksum.h | 2 -- sbin/hastd/hast_compression.h | 2 -- sbin/hastd/hast_proto.h | 2 -- sbin/hastd/hastd.h | 2 -- sbin/hastd/hooks.h | 2 -- sbin/hastd/metadata.h | 2 -- sbin/hastd/nv.h | 2 -- sbin/hastd/parse.y | 2 -- sbin/hastd/pjdlog.h | 2 -- sbin/hastd/proto.h | 2 -- sbin/hastd/proto_impl.h | 2 -- sbin/hastd/rangelock.h | 2 -- sbin/hastd/refcnt.h | 2 -- sbin/hastd/subr.h | 2 -- sbin/hastd/synch.h | 2 -- sbin/hastd/token.l | 2 -- sbin/ifconfig/ifconfig.h | 2 -- sbin/ifconfig/iffib.c | 2 -- sbin/ifconfig/ifieee80211.c | 2 -- sbin/ifconfig/ifmac.c | 2 -- sbin/ifconfig/ifpfsync.c | 2 -- sbin/ipfw/altq.c | 2 -- sbin/ipfw/dummynet.c | 2 -- sbin/ipfw/ipfw2.c | 2 -- sbin/ipfw/ipfw2.h | 2 -- sbin/ipfw/ipv6.c | 2 -- sbin/ipfw/main.c | 2 -- sbin/ipfw/nat.c | 2 -- sbin/ipfw/tables.c | 2 -- sbin/iscontrol/iscontrol.h | 2 -- sbin/ldconfig/elfhints.c | 2 -- sbin/ldconfig/ldconfig.h | 2 -- sbin/mdconfig/mdconfig.c | 2 -- sbin/mksnap_ffs/mksnap_ffs.c | 2 -- sbin/mount/extern.h | 2 -- sbin/mount_udf/mount_udf.c | 2 -- sbin/natd/icmp.c | 2 -- sbin/natd/natd.h | 2 -- sbin/newfs/newfs.h | 2 -- sbin/nvmecontrol/comnd.h | 2 -- sbin/nvmecontrol/nvmecontrol.h | 2 -- sbin/nvmecontrol/nvmecontrol_ext.h | 2 -- sbin/pfctl/pfctl.h | 2 -- sbin/pfctl/pfctl_parser.h | 2 -- sbin/pfctl/tests/pfctl_test_list.inc | 2 -- sbin/ping/main.h | 2 -- sbin/ping/ping.h | 2 -- sbin/ping/ping6.h | 2 -- sbin/ping/utils.h | 2 -- sbin/quotacheck/preen.c | 2 -- sbin/quotacheck/quotacheck.h | 2 -- sbin/recoverdisk/recoverdisk.c | 2 -- sbin/routed/defs.h | 2 -- sbin/routed/if.c | 2 -- sbin/routed/input.c | 2 -- sbin/routed/main.c | 2 -- sbin/routed/output.c | 2 -- sbin/routed/parms.c | 2 -- sbin/routed/pathnames.h | 2 -- sbin/routed/radix.c | 2 -- sbin/routed/radix.h | 2 -- sbin/routed/rdisc.c | 2 -- sbin/routed/rtquery/rtquery.c | 2 -- sbin/routed/table.c | 2 -- sbin/routed/trace.c | 2 -- sbin/setkey/test-policy.c | 2 -- sbin/veriexec/manifest_lexer.l | 2 -- sbin/veriexec/manifest_parser.y | 2 -- sbin/veriexec/veriexec.h | 2 -- secure/lib/libcrypt/blowfish.h | 2 -- share/dtrace/blocking | 2 -- share/dtrace/disklatency | 2 -- share/dtrace/disklatencycmd | 2 -- share/dtrace/hotopen | 2 -- share/dtrace/ipfw.d | 2 -- share/dtrace/mbuf.d | 2 -- share/dtrace/nfsattrstats | 2 -- share/dtrace/nfsclienttime | 2 -- share/dtrace/retval | 2 -- share/dtrace/siftr | 2 -- share/dtrace/tcpconn | 2 -- share/dtrace/tcpdebug | 2 -- share/dtrace/tcpstate | 2 -- share/dtrace/tcptrack | 2 -- share/dtrace/udptrack | 2 -- share/examples/find_interface/find_interface.c | 2 -- share/examples/flua/libjail.lua | 2 -- share/examples/hwpmc/overhead.c | 2 -- share/examples/kld/cdev/module/cdev.c | 2 -- share/examples/kld/cdev/module/cdev.h | 2 -- share/examples/kld/cdev/module/cdevmod.c | 2 -- share/examples/kld/cdev/test/testcdev.c | 2 -- share/examples/kld/dyn_sysctl/dyn_sysctl.c | 2 -- share/examples/kld/syscall/module/syscall.c | 2 -- share/examples/kld/syscall/test/call.c | 2 -- share/examples/libifconfig/ifchangevlan.c | 2 -- share/examples/libifconfig/ifcreate.c | 2 -- share/examples/libifconfig/ifcreatevlan.c | 2 -- share/examples/libifconfig/ifdestroy.c | 2 -- share/examples/libifconfig/setdescription.c | 2 -- share/examples/libifconfig/setmtu.c | 2 -- share/examples/libifconfig/status.c | 2 -- share/examples/libusb20/bulk.c | 2 -- share/examples/libusb20/control.c | 2 -- share/examples/libusb20/util.c | 2 -- share/examples/libusb20/util.h | 2 -- share/examples/libvgl/demo.c | 2 -- share/examples/perfmon/perfmon.c | 2 -- share/examples/ppi/ppilcd.c | 2 -- share/examples/scsi_target/scsi_cmds.c | 2 -- share/examples/scsi_target/scsi_target.c | 2 -- share/examples/scsi_target/scsi_target.h | 2 -- share/syscons/scrnmaps/armscii8-2haik8 | 2 -- share/syscons/scrnmaps/iso-8859-1_to_cp437 | 2 -- share/syscons/scrnmaps/iso-8859-4_for_vga9 | 2 -- share/syscons/scrnmaps/koi8-r2cp866 | 2 -- share/syscons/scrnmaps/koi8-u2cp866u | 2 -- share/syscons/scrnmaps/mkscrfil.c | 2 -- stand/arm64/libarm64/cache.h | 2 -- stand/common/bootstrap.h | 2 -- stand/common/dev_net.h | 2 -- stand/common/disk.h | 2 -- stand/common/gfx_fb.c | 2 -- stand/common/gfx_fb.h | 2 -- stand/common/isapnp.h | 2 -- stand/common/part.h | 2 -- stand/common/paths.h | 2 -- stand/common/rbx.h | 2 -- stand/common/readin.h | 2 -- stand/efi/boot1/boot_module.h | 2 -- stand/efi/boot1/proto.h | 2 -- stand/efi/boot1/ufs_module.c | 2 -- stand/efi/boot1/zfs_module.c | 2 -- stand/efi/gptboot/drv.h | 2 -- stand/efi/include/efi_driver_utils.h | 2 -- stand/efi/include/efi_drivers.h | 2 -- stand/efi/include/efichar.h | 2 -- stand/efi/include/efilib.h | 2 -- stand/efi/include/efizfs.h | 2 -- stand/efi/libefi/efi_driver_utils.c | 2 -- stand/efi/libefi/efihttp.c | 2 -- stand/efi/loader/arch/amd64/amd64_tramp.S | 2 -- stand/efi/loader/arch/amd64/exc.S | 2 -- stand/efi/loader/arch/arm/start.S | 2 -- stand/efi/loader/arch/arm64/start.S | 2 -- stand/efi/loader/arch/i386/start.S | 2 -- stand/efi/loader/arch/riscv/start.S | 2 -- stand/efi/loader/framebuffer.h | 2 -- stand/efi/loader/loader_efi.h | 2 -- stand/fdt/fdt_platform.h | 2 -- stand/ficl/loader.c | 2 -- stand/i386/boot0/boot0.S | 2 -- stand/i386/boot2/boot1.S | 2 -- stand/i386/boot2/sio.S | 2 -- stand/i386/btx/btx/btx.S | 2 -- stand/i386/btx/btxldr/btxldr.S | 2 -- stand/i386/common/bootargs.h | 2 -- stand/i386/common/cons.h | 2 -- stand/i386/common/drv.h | 2 -- stand/i386/common/edd.h | 2 -- stand/i386/gptboot/gptldr.S | 2 -- stand/i386/libi386/amd64_tramp.S | 2 -- stand/i386/libi386/libi386.h | 2 -- stand/i386/libi386/multiboot_tramp.S | 2 -- stand/i386/libi386/pxe.h | 2 -- stand/i386/libi386/relocater_tramp.S | 2 -- stand/i386/libi386/vbe.c | 2 -- stand/i386/pxeldr/pxeldr.S | 2 -- stand/i386/zfsboot/zfsldr.S | 2 -- stand/kboot/arch/amd64/amd64_tramp.S | 2 -- stand/kboot/host_syscall.h | 2 -- stand/liblua/float.h | 2 -- stand/liblua/lerrno.h | 2 -- stand/liblua/locale.h | 2 -- stand/liblua/lstd.h | 2 -- stand/liblua/lutils.h | 2 -- stand/liblua/math.h | 2 -- stand/libofw/libofw.h | 2 -- stand/libofw/openfirm.h | 2 -- stand/libsa/bootp.h | 2 -- stand/libsa/dosfs.h | 2 -- stand/libsa/geli/geli_metadata.c | 2 -- stand/libsa/geli/geliboot.c | 2 -- stand/libsa/geli/geliboot.h | 2 -- stand/libsa/geli/geliboot_crypto.c | 2 -- stand/libsa/geli/geliboot_internal.h | 2 -- stand/libsa/geli/gelidev.c | 2 -- stand/libsa/gpt.h | 2 -- stand/libsa/iodesc.h | 2 -- stand/libsa/mips/_setjmp.S | 2 -- stand/libsa/net.h | 2 -- stand/libsa/rpc.h | 2 -- stand/libsa/rpcv2.h | 2 -- stand/libsa/saioctl.h | 2 -- stand/libsa/smbios.h | 2 -- stand/libsa/stand.h | 2 -- stand/libsa/tftp.h | 2 -- stand/libsa/uuid_from_string.c | 2 -- stand/libsa/uuid_to_string.c | 2 -- stand/libsa/xlocale_private.h | 2 -- stand/libsa/zalloc_defs.h | 2 -- stand/libsa/zalloc_mem.h | 2 -- stand/libsa/zalloc_protos.h | 2 -- stand/libsa/zfs/libzfs.h | 2 -- stand/libsa/zfs/zfs.c | 2 -- stand/powerpc/ofw/trampolineLE.S | 2 -- stand/uboot/api_public.h | 2 -- stand/uboot/arch/arm/start.S | 2 -- stand/uboot/arch/mips/start.S | 2 -- stand/uboot/arch/powerpc/start.S | 2 -- stand/uboot/glue.h | 2 -- stand/uboot/libuboot.h | 2 -- stand/userboot/test/test.c | 2 -- stand/userboot/userboot.h | 2 -- stand/userboot/userboot/libuserboot.h | 2 -- tests/freebsd_test_suite/macros.h | 2 -- tests/sys/aio/aio_kqueue_test.c | 2 -- tests/sys/aio/aio_test.c | 2 -- tests/sys/aio/lio_kqueue_test.c | 2 -- tests/sys/aio/lio_test.c | 2 -- tests/sys/aio/local.h | 2 -- tests/sys/audit/administrative.c | 2 -- tests/sys/audit/file-attribute-access.c | 2 -- tests/sys/audit/file-attribute-modify.c | 2 -- tests/sys/audit/file-close.c | 2 -- tests/sys/audit/file-create.c | 2 -- tests/sys/audit/file-delete.c | 2 -- tests/sys/audit/file-read.c | 2 -- tests/sys/audit/file-write.c | 2 -- tests/sys/audit/inter-process.c | 2 -- tests/sys/audit/ioctl.c | 2 -- tests/sys/audit/miscellaneous.c | 2 -- tests/sys/audit/network.c | 2 -- tests/sys/audit/open.c | 2 -- tests/sys/audit/process-control.c | 2 -- tests/sys/audit/utils.c | 2 -- tests/sys/audit/utils.h | 2 -- tests/sys/auditpipe/auditpipe_test.c | 2 -- tests/sys/cddl/zfs/bin/mkfile.c | 2 -- tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.d | 2 -- *** 28206 LINES SKIPPED *** From nobody Wed Aug 23 17:49: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 4RWDHg1r1rz4r9T9; Wed, 23 Aug 2023 17:49: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 4RWDHg11lMz4SQ4; Wed, 23 Aug 2023 17:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BTH+EQtCWeLQpWp0M6l/HCTNdiX7c44YOxsFHgoaI58=; b=QlBPepB7+WNPqaCk942CTB7YR+XS6TIDUQE6CzSyCZDW8WAvYxP2d9BOe8azX7a5nk2PBg G9hmWLF2JbDw9eILqGBL8XuiN8FBjdDa1fIGOMQSDs3tcaXA12nfYcpHO2zDrQrQXaew7f l3MvO3+Z3cOR4iW9YAnzJOWqp+g9tOiPWMvXJMR6qsGsJVFwEvYKGD7a1+hZ6Vl5yDq88b Zxf6SFNXUCNXTZJEL0NpEfOPL7jMkj/FwIb3EI77WrU5IhkgC7Rg3KIVOAr4130IHoePx0 Nm3SdGnUYmjYeP4dMHDGgmotNsqOWUN4OnLCj1R0qAZYTlDyeEWXRPhUCo7QuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BTH+EQtCWeLQpWp0M6l/HCTNdiX7c44YOxsFHgoaI58=; b=C9DXQ+r3LWniJ/VIQyTlXZXjLqX25pM2rUrEYfCIE4NSJqdKySQlDeR16iRgYaNAmugTqD bVyJg1yL4l9lJTBLJaVUX0uZUxcCJVVH3qeIuTNsZpQVxxiJ2p89WBcwo5c4upBST2hKcK MorZpN7V7TaXRCLQ9V2WmKVfmGgnaJdtml7lXbpN7TnRFRvtLpYa++BZBporqKKn+8m03I B1svBDc/f0y6ITT4PYqB59lOxa+29rdo6JwFFG6Fbf4OZzx4CWYgpvF+kXo1ops3Xp9QTs 6gTZc1LshmRHo4IMpPcZQP3aXO+JVGCP4Pa8ehmTf1dowfKg1MdmCVhjhxZUPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812975; a=rsa-sha256; cv=none; b=lpPIuFR6vlsyn5tT51C7dhoGWboMtqlpvReaylKDis2mOL95n52wNfxEZPGVAV5/iSGIlr BWe6cSv9iGlp8bTb6clUl26vsNSTJowu2HWwvv6QcuPb/jUMC6GoTyqrY1LY4UVu3FeHAX VoI181jDsiYmvmdCAQJUrp2bmgV2JkcixANx9S+3o+KNdTFuiXcE3RqIPnSmLlJUIaCS/S j49eyhFUD0BSdfqE22mUEwh7c98xGV5rA/ERkc+qzT+2TSWa5nkn/HA0t7DFRaRRKxFcTE uE031HK7sFJhrjokPTyK5/vwI17pgsUH4SgNYmaCljtV1akEKgInL2PZVFGyIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHf6xBgzvFY; Wed, 23 Aug 2023 17:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnYv7040591; Wed, 23 Aug 2023 17:49:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnYcA040588; Wed, 23 Aug 2023 17:49:34 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:34 GMT Message-Id: <202308231749.37NHnYcA040588@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 4b40a16f0d18 - stable/13 - sys: Remove $FreeBSD$: one-line .h pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4b40a16f0d188422227478889b38cc341d50f88f Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4b40a16f0d188422227478889b38cc341d50f88f commit 4b40a16f0d188422227478889b38cc341d50f88f Author: Warner Losh AuthorDate: 2023-08-22 01:31:09 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:22 +0000 sys: Remove $FreeBSD$: one-line .h pattern Remove /^\s*\*+\s*\$FreeBSD\$.*$\n/ Similar commit in current: (cherry picked from commit 2ff63af9b88c) --- sys/amd64/amd64/apic_vector.S | 1 - sys/amd64/amd64/atpic_vector.S | 1 - sys/amd64/include/asm.h | 1 - sys/amd64/include/cpu.h | 1 - sys/amd64/include/exec.h | 1 - sys/amd64/include/floatingpoint.h | 1 - sys/amd64/include/fpu.h | 1 - sys/amd64/include/ieeefp.h | 1 - sys/amd64/include/in_cksum.h | 1 - sys/amd64/include/limits.h | 1 - sys/amd64/include/param.h | 1 - sys/amd64/include/pcb.h | 1 - sys/amd64/include/pmap.h | 1 - sys/amd64/include/proc.h | 1 - sys/amd64/include/profile.h | 1 - sys/amd64/include/reloc.h | 1 - sys/amd64/include/segments.h | 1 - sys/amd64/include/tss.h | 1 - sys/amd64/include/vmparam.h | 1 - sys/amd64/linux/linux_proto.h | 1 - sys/amd64/linux/linux_syscall.h | 1 - sys/amd64/linux/linux_syscalls.c | 1 - sys/amd64/linux/linux_sysent.c | 1 - sys/amd64/linux/linux_systrace_args.c | 1 - sys/amd64/linux32/linux32_proto.h | 1 - sys/amd64/linux32/linux32_syscall.h | 1 - sys/amd64/linux32/linux32_syscalls.c | 1 - sys/amd64/linux32/linux32_sysent.c | 1 - sys/amd64/linux32/linux32_systrace_args.c | 1 - sys/arm/broadcom/bcm2835/bcm2835_wdog.h | 1 - sys/arm/include/_align.h | 1 - sys/arm/include/_inttypes.h | 1 - sys/arm/include/_limits.h | 1 - sys/arm/include/_types.h | 1 - sys/arm/include/db_machdep.h | 1 - sys/arm/include/endian.h | 1 - sys/arm/include/float.h | 1 - sys/arm/include/floatingpoint.h | 1 - sys/arm/include/in_cksum.h | 1 - sys/arm/include/limits.h | 1 - sys/arm/include/md_var.h | 1 - sys/arm/include/minidump.h | 1 - sys/arm/include/param.h | 1 - sys/arm/include/pcpu.h | 1 - sys/arm/include/pl310.h | 1 - sys/arm/include/proc.h | 1 - sys/arm/include/profile.h | 1 - sys/arm/include/reloc.h | 1 - sys/arm/include/signal.h | 1 - sys/arm/include/vfp.h | 1 - sys/arm/linux/linux_proto.h | 1 - sys/arm/linux/linux_syscall.h | 1 - sys/arm/linux/linux_syscalls.c | 1 - sys/arm/linux/linux_sysent.c | 1 - sys/arm/linux/linux_systrace_args.c | 1 - sys/arm/ti/omap4/omap4_smc.h | 1 - sys/arm/ti/ti_smc.h | 1 - sys/arm64/freescale/imx/imx8mq_ccm.h | 1 - sys/arm64/include/_align.h | 1 - sys/arm64/include/_inttypes.h | 1 - sys/arm64/include/_limits.h | 1 - sys/arm64/include/_types.h | 1 - sys/arm64/include/cpu.h | 1 - sys/arm64/include/endian.h | 1 - sys/arm64/include/float.h | 1 - sys/arm64/include/ieeefp.h | 1 - sys/arm64/include/in_cksum.h | 1 - sys/arm64/include/md_var.h | 1 - sys/arm64/include/minidump.h | 1 - sys/arm64/include/param.h | 1 - sys/arm64/include/pcpu.h | 1 - sys/arm64/include/proc.h | 1 - sys/arm64/include/profile.h | 1 - sys/arm64/include/signal.h | 1 - sys/arm64/include/sysarch.h | 1 - sys/arm64/include/vmparam.h | 1 - sys/arm64/linux/linux.h | 1 - sys/arm64/linux/linux_proto.h | 1 - sys/arm64/linux/linux_syscall.h | 1 - sys/arm64/linux/linux_syscalls.c | 1 - sys/arm64/linux/linux_sysent.c | 1 - sys/arm64/linux/linux_systrace_args.c | 1 - sys/cam/ctl/ctl.h | 1 - sys/cam/ctl/ctl_backend.h | 1 - sys/cam/ctl/ctl_cmd_table.c | 1 - sys/cam/ctl/ctl_debug.h | 1 - sys/cam/ctl/ctl_error.h | 1 - sys/cam/ctl/ctl_frontend.h | 1 - sys/cam/ctl/ctl_ha.h | 1 - sys/cam/ctl/ctl_io.h | 1 - sys/cam/ctl/ctl_ioctl.h | 1 - sys/cam/ctl/ctl_private.h | 1 - sys/cam/ctl/ctl_ser_table.c | 1 - sys/cam/ctl/ctl_util.h | 1 - sys/cam/mmc/mmc_bus.h | 1 - sys/cam/scsi/scsi_cd.h | 1 - sys/cam/scsi/scsi_iu.h | 1 - sys/cam/scsi/scsi_message.h | 1 - sys/cam/scsi/smp_all.h | 1 - sys/cddl/compat/opensolaris/kern/opensolaris_uio.c | 1 - sys/cddl/dev/dtrace/aarch64/regset.h | 1 - sys/cddl/dev/dtrace/arm/regset.h | 1 - sys/cddl/dev/dtrace/mips/regset.h | 1 - sys/cddl/dev/dtrace/powerpc/regset.h | 1 - sys/cddl/dev/dtrace/riscv/regset.h | 1 - sys/cddl/dev/dtrace/x86/dis_tables.c | 1 - sys/cddl/dev/dtrace/x86/dis_tables.h | 1 - sys/cddl/dev/dtrace/x86/regset.h | 1 - sys/compat/cloudabi32/cloudabi32_proto.h | 1 - sys/compat/cloudabi32/cloudabi32_syscall.h | 1 - sys/compat/cloudabi32/cloudabi32_syscalls.c | 1 - sys/compat/cloudabi32/cloudabi32_sysent.c | 1 - sys/compat/cloudabi32/cloudabi32_systrace_args.c | 1 - sys/compat/cloudabi64/cloudabi64_proto.h | 1 - sys/compat/cloudabi64/cloudabi64_syscall.h | 1 - sys/compat/cloudabi64/cloudabi64_syscalls.c | 1 - sys/compat/cloudabi64/cloudabi64_sysent.c | 1 - sys/compat/cloudabi64/cloudabi64_systrace_args.c | 1 - sys/compat/freebsd32/freebsd32_proto.h | 1 - sys/compat/freebsd32/freebsd32_syscall.h | 1 - sys/compat/freebsd32/freebsd32_syscalls.c | 1 - sys/compat/freebsd32/freebsd32_sysent.c | 1 - sys/compat/freebsd32/freebsd32_systrace_args.c | 1 - sys/compat/linux/linux_persona.h | 1 - sys/compat/linux/linux_util.h | 1 - sys/compat/linux/linux_videodev2_compat.h | 1 - sys/compat/linux/linux_videodev_compat.h | 1 - sys/conf/ldscript.mips | 1 - sys/conf/ldscript.mips.cfe | 1 - sys/conf/ldscript.mips.mips64 | 1 - sys/dev/arcmsr/arcmsr.h | 1 - sys/dev/atkbdc/atkbdc_subr.h | 1 - sys/dev/atkbdc/psm.h | 1 - sys/dev/bhnd/bcma/bcma.h | 1 - sys/dev/bhnd/bcma/bcma_dmp.h | 1 - sys/dev/bhnd/bcma/bcma_eromreg.h | 1 - sys/dev/bhnd/bcma/bcma_eromvar.h | 1 - sys/dev/bhnd/bcma/bcmavar.h | 1 - sys/dev/bhnd/bhnd.h | 1 - sys/dev/bhnd/bhnd_erom.h | 1 - sys/dev/bhnd/bhnd_erom_types.h | 1 - sys/dev/bhnd/bhnd_eromvar.h | 1 - sys/dev/bhnd/bhnd_match.h | 1 - sys/dev/bhnd/bhnd_types.h | 1 - sys/dev/bhnd/bhndb/bhndb.h | 1 - sys/dev/bhnd/bhndb/bhndb_hwdata.h | 1 - sys/dev/bhnd/bhndb/bhndb_pci_hwdata.h | 1 - sys/dev/bhnd/bhndb/bhndb_pcireg.h | 1 - sys/dev/bhnd/bhndb/bhndb_pcivar.h | 1 - sys/dev/bhnd/bhndb/bhndb_private.h | 1 - sys/dev/bhnd/bhndb/bhndbvar.h | 1 - sys/dev/bhnd/bhndvar.h | 1 - sys/dev/bhnd/cores/chipc/chipc.h | 1 - sys/dev/bhnd/cores/chipc/chipc_gpiovar.h | 1 - sys/dev/bhnd/cores/chipc/chipc_private.h | 1 - sys/dev/bhnd/cores/chipc/chipc_spi.h | 1 - sys/dev/bhnd/cores/chipc/chipcvar.h | 1 - sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_private.h | 1 - sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctlvar.h | 1 - sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h | 1 - sys/dev/bhnd/cores/pci/bhnd_pcibvar.h | 1 - sys/dev/bhnd/cores/pci/bhnd_pcivar.h | 1 - sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h | 1 - sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h | 1 - sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h | 1 - sys/dev/bhnd/cores/pmu/bhnd_pmu.h | 1 - sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h | 1 - sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_data.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_data_spromvar.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_data_tlvreg.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_datavar.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_io.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_iovar.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_plist.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_plistvar.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_private.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_store.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_storevar.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_value.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_valuevar.h | 1 - sys/dev/bhnd/nvram/bhnd_spromvar.h | 1 - sys/dev/bhnd/siba/siba.h | 1 - sys/dev/bhnd/siba/siba_eromvar.h | 1 - sys/dev/bhnd/siba/sibareg.h | 1 - sys/dev/bhnd/siba/sibavar.h | 1 - sys/dev/bwi/bitops.h | 1 - sys/dev/bwi/bwimac.h | 1 - sys/dev/bwi/bwiphy.h | 1 - sys/dev/bwi/bwirf.h | 1 - sys/dev/bwi/if_bwireg.h | 1 - sys/dev/bwi/if_bwivar.h | 1 - sys/dev/bwn/if_bwn_pcivar.h | 1 - sys/dev/ce/ceddk.h | 1 - sys/dev/ce/machdep.h | 1 - sys/dev/ce/ng_ce.h | 1 - sys/dev/ce/tau32-ddk.h | 1 - sys/dev/cp/cpddk.h | 1 - sys/dev/cp/machdep.h | 1 - sys/dev/cp/ng_cp.h | 1 - sys/dev/cxgb/cxgb_include.h | 1 - sys/dev/dcons/dcons.c | 1 - sys/dev/dcons/dcons.h | 1 - sys/dev/dcons/dcons_crom.c | 1 - sys/dev/dcons/dcons_os.h | 1 - sys/dev/drm2/drm_pciids.h | 1 - sys/dev/et/if_etreg.h | 1 - sys/dev/et/if_etvar.h | 1 - sys/dev/etherswitch/etherswitch.h | 1 - sys/dev/firewire/fwmem.h | 1 - sys/dev/firewire/fwohcireg.h | 1 - sys/dev/firewire/fwohcivar.h | 1 - sys/dev/firewire/fwphyreg.h | 1 - sys/dev/firewire/iec13213.h | 1 - sys/dev/firewire/iec68113.h | 1 - sys/dev/firewire/if_fwevar.h | 1 - sys/dev/firewire/if_fwip.c | 1 - sys/dev/firewire/if_fwipvar.h | 1 - sys/dev/firewire/sbp.h | 1 - sys/dev/fxp/rcvbundl.h | 1 - sys/dev/hptnr/array.h | 1 - sys/dev/ic/i8253reg.h | 1 - sys/dev/ic/nec765.h | 1 - sys/dev/ic/ns16550.h | 1 - sys/dev/ida/idaio.h | 1 - sys/dev/iwm/if_iwm_config.h | 1 - sys/dev/iwm/if_iwm_fw.h | 1 - sys/dev/kbdmux/kbdmux.c | 1 - sys/dev/mii/truephy.c | 1 - sys/dev/mii/truephyreg.h | 1 - sys/dev/netmap/if_re_netmap.h | 1 - sys/dev/netmap/if_vtnet_netmap.h | 1 - sys/dev/netmap/netmap.c | 1 - sys/dev/netmap/netmap_kern.h | 1 - sys/dev/netmap/netmap_mbq.c | 1 - sys/dev/netmap/netmap_mbq.h | 1 - sys/dev/netmap/netmap_mem2.h | 1 - sys/dev/netmap/netmap_monitor.c | 1 - sys/dev/nvram2env/nvram2env.h | 1 - sys/dev/pms/RefTisa/discovery/api/dm.h | 1 - sys/dev/pms/RefTisa/discovery/api/dmapi.h | 1 - sys/dev/pms/RefTisa/discovery/api/tddmapi.h | 1 - sys/dev/pms/RefTisa/discovery/dm/dmdefs.h | 1 - sys/dev/pms/RefTisa/discovery/dm/dmlist.h | 1 - sys/dev/pms/RefTisa/discovery/dm/dmproto.h | 1 - sys/dev/pms/RefTisa/discovery/dm/dmtypes.h | 1 - sys/dev/pms/RefTisa/sallsdk/api/sa.h | 1 - sys/dev/pms/RefTisa/sallsdk/api/sa_err.h | 1 - sys/dev/pms/RefTisa/sallsdk/api/sa_spec.h | 1 - sys/dev/pms/RefTisa/sallsdk/api/saapi.h | 1 - sys/dev/pms/RefTisa/sallsdk/api/saosapi.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/aap18008.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/aap1img.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/ila8008.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/ila8070.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/ilaimg.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/iop8008.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/iop8070.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/iopimg.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/istrimg.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/raae8070.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/mpi.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/mpidebug.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/sadefs.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/saglobal.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/sahwreg.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/sallist.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/samacro.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/sampidefs.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/saproto.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/satypes.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/spcdefs.h | 1 - sys/dev/pms/RefTisa/sat/api/sm.h | 1 - sys/dev/pms/RefTisa/sat/api/smapi.h | 1 - sys/dev/pms/RefTisa/sat/api/tdsmapi.h | 1 - sys/dev/pms/RefTisa/sat/src/smdefs.h | 1 - sys/dev/pms/RefTisa/sat/src/smlist.h | 1 - sys/dev/pms/RefTisa/sat/src/smproto.h | 1 - sys/dev/pms/RefTisa/sat/src/smtypes.h | 1 - sys/dev/pms/RefTisa/tisa/api/ostiapi.h | 1 - sys/dev/pms/RefTisa/tisa/api/tiapi.h | 1 - sys/dev/pms/RefTisa/tisa/api/tidefs.h | 1 - sys/dev/pms/RefTisa/tisa/api/tiglobal.h | 1 - sys/dev/pms/RefTisa/tisa/api/tiscsi.h | 1 - sys/dev/pms/RefTisa/tisa/api/titypes.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/ossa.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/tddefs.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/tdioctl.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/tdlist.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/tdproto.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/tdsatypes.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/tdutil.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/wcs.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/sas/common/tdtypes.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddefs.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itdglobl.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itdtypes.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/sata/host/sat.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/sata/host/satproto.h | 1 - sys/dev/pms/config.h | 1 - sys/dev/pms/freebsd/driver/common/encrypt_ioctl.h | 1 - sys/dev/pms/freebsd/driver/common/lxcommon.h | 1 - sys/dev/pms/freebsd/driver/common/lxencrypt.c | 1 - sys/dev/pms/freebsd/driver/common/lxencrypt.h | 1 - sys/dev/pms/freebsd/driver/common/lxproto.h | 1 - sys/dev/pms/freebsd/driver/common/osdebug.h | 1 - sys/dev/pms/freebsd/driver/common/osenv.h | 1 - sys/dev/pms/freebsd/driver/common/osstring.h | 1 - sys/dev/pms/freebsd/driver/common/ostypes.h | 1 - sys/dev/pms/freebsd/driver/ini/src/agdef.h | 1 - sys/dev/pms/freebsd/driver/ini/src/agtiapi.h | 1 - sys/dev/pms/freebsd/driver/ini/src/agtiproto.h | 1 - sys/dev/pms/freebsd/driver/ini/src/osapi.c | 1 - sys/dev/qlnx/qlnxr/qlnxr_verbs.h | 1 - sys/dev/ral/rt2860reg.h | 1 - sys/dev/ral/rt2860var.h | 1 - sys/dev/rtwn/if_rtwn_fw.h | 1 - sys/dev/rtwn/if_rtwnreg.h | 1 - sys/dev/rtwn/if_rtwnvar.h | 1 - sys/dev/rtwn/pci/rtwn_pci_attach.h | 1 - sys/dev/rtwn/pci/rtwn_pci_var.h | 1 - sys/dev/rtwn/rtl8188e/r88e.h | 1 - sys/dev/rtwn/rtl8188e/r88e_fw_cmd.h | 1 - sys/dev/rtwn/rtl8188e/r88e_priv.h | 1 - sys/dev/rtwn/rtl8188e/r88e_reg.h | 1 - sys/dev/rtwn/rtl8188e/r88e_rx_desc.h | 1 - sys/dev/rtwn/rtl8188e/r88e_tx_desc.h | 1 - sys/dev/rtwn/rtl8188e/usb/r88eu.h | 1 - sys/dev/rtwn/rtl8188e/usb/r88eu_reg.h | 1 - sys/dev/rtwn/rtl8192c/pci/r92ce.h | 1 - sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h | 1 - sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h | 1 - sys/dev/rtwn/rtl8192c/pci/r92ce_rx_desc.h | 1 - sys/dev/rtwn/rtl8192c/pci/r92ce_tx_desc.h | 1 - sys/dev/rtwn/rtl8192c/r92c.h | 1 - sys/dev/rtwn/rtl8192c/r92c_fw_cmd.h | 1 - sys/dev/rtwn/rtl8192c/r92c_priv.h | 1 - sys/dev/rtwn/rtl8192c/r92c_reg.h | 1 - sys/dev/rtwn/rtl8192c/r92c_rom_defs.h | 1 - sys/dev/rtwn/rtl8192c/r92c_rom_image.h | 1 - sys/dev/rtwn/rtl8192c/r92c_rx_desc.h | 1 - sys/dev/rtwn/rtl8192c/r92c_tx_desc.h | 1 - sys/dev/rtwn/rtl8192c/r92c_var.h | 1 - sys/dev/rtwn/rtl8192c/usb/r92cu.h | 1 - sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h | 1 - sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h | 1 - sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h | 1 - sys/dev/rtwn/usb/rtwn_usb_var.h | 1 - sys/dev/sound/pci/ds1.h | 1 - sys/dev/sound/pci/maestro_reg.h | 1 - sys/dev/ti/ti_fw2.h | 1 - sys/dev/usb/uftdiio.h | 1 - sys/dev/usb/wlan/if_rsureg.h | 1 - sys/dev/veriexec/veriexec_ioctl.h | 1 - sys/dev/veriexec/verified_exec.c | 1 - sys/dev/vkbd/vkbd.c | 1 - sys/dev/vkbd/vkbd_var.h | 1 - sys/dev/zlib/zcalloc.c | 1 - sys/dev/zlib/zcalloc.h | 1 - sys/dts/arm/tegra20-paz00.dts | 1 - sys/dts/arm/tegra20.dtsi | 1 - sys/dts/arm/trimslice.dts | 1 - sys/dts/arm/ufw.dts | 1 - sys/dts/arm/versatilepb.dts | 1 - sys/dts/arm/zedboard.dts | 1 - sys/dts/arm/zybo.dts | 1 - sys/dts/arm/zynq-7000.dtsi | 1 - sys/fs/cd9660/cd9660_mount.h | 1 - sys/fs/cd9660/cd9660_node.h | 1 - sys/fs/cd9660/cd9660_rrip.h | 1 - sys/fs/cd9660/iso.h | 1 - sys/fs/cd9660/iso_rrip.h | 1 - sys/fs/deadfs/dead_vnops.c | 1 - sys/fs/ext2fs/ext2_alloc.c | 1 - sys/fs/ext2fs/ext2_balloc.c | 1 - sys/fs/ext2fs/ext2_bmap.c | 1 - sys/fs/ext2fs/ext2_extern.h | 1 - sys/fs/ext2fs/ext2_inode.c | 1 - sys/fs/ext2fs/ext2_inode_cnv.c | 1 - sys/fs/ext2fs/ext2_lookup.c | 1 - sys/fs/ext2fs/ext2_mount.h | 1 - sys/fs/ext2fs/ext2_subr.c | 1 - sys/fs/ext2fs/ext2_vfsops.c | 1 - sys/fs/ext2fs/ext2_vnops.c | 1 - sys/fs/ext2fs/fs.h | 1 - sys/fs/ext2fs/inode.h | 1 - sys/fs/fifofs/fifo_vnops.c | 1 - sys/fs/nullfs/null_vfsops.c | 1 - sys/fs/procfs/procfs.h | 1 - sys/fs/procfs/procfs_dbregs.c | 1 - sys/fs/procfs/procfs_fpregs.c | 1 - sys/fs/procfs/procfs_regs.c | 1 - sys/fs/procfs/procfs_status.c | 1 - sys/fs/unionfs/union.h | 1 - sys/fs/unionfs/union_subr.c | 1 - sys/fs/unionfs/union_vfsops.c | 1 - sys/fs/unionfs/union_vnops.c | 1 - sys/geom/vinum/geom_vinum_var.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_regs.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_radio_2055.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_radio_2056.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_radio_2057.h | 1 - sys/i386/i386/apic_vector.s | 1 - sys/i386/i386/atpic_vector.s | 1 - sys/i386/i386/locore.s | 1 - sys/i386/i386/sigtramp.s | 1 - sys/i386/include/asm.h | 1 - sys/i386/include/cpu.h | 1 - sys/i386/include/cserial.h | 1 - sys/i386/include/exec.h | 1 - sys/i386/include/floatingpoint.h | 1 - sys/i386/include/ieeefp.h | 1 - sys/i386/include/in_cksum.h | 1 - sys/i386/include/limits.h | 1 - sys/i386/include/npx.h | 1 - sys/i386/include/param.h | 1 - sys/i386/include/pcb.h | 1 - sys/i386/include/pmap.h | 1 - sys/i386/include/pmap_nopae.h | 1 - sys/i386/include/pmap_pae.h | 1 - sys/i386/include/proc.h | 1 - sys/i386/include/profile.h | 1 - sys/i386/include/reloc.h | 1 - sys/i386/include/segments.h | 1 - sys/i386/include/signal.h | 1 - sys/i386/include/speaker.h | 1 - sys/i386/include/tss.h | 1 - sys/i386/include/vmparam.h | 1 - sys/i386/linux/linux.h | 1 - sys/i386/linux/linux_proto.h | 1 - sys/i386/linux/linux_syscall.h | 1 - sys/i386/linux/linux_syscalls.c | 1 - sys/i386/linux/linux_sysent.c | 1 - sys/i386/linux/linux_systrace_args.c | 1 - sys/isa/isareg.h | 1 - sys/isa/rtc.h | 1 - sys/kern/init_sysent.c | 1 - sys/kern/syscalls.c | 1 - sys/kern/systrace_args.c | 1 - sys/libkern/jenkins_hash.c | 1 - sys/libkern/quad.h | 1 - sys/mips/broadcom/bcm_bmipsreg.h | 1 - sys/mips/broadcom/bcm_machdep.h | 1 - sys/mips/broadcom/bcm_mips74kreg.h | 1 - sys/mips/broadcom/bcm_mipsvar.h | 1 - sys/mips/broadcom/bcm_nvram_cfevar.h | 1 - sys/mips/broadcom/bcma_nexus.c | 1 - sys/mips/broadcom/bhnd_nexus.c | 1 - sys/mips/broadcom/bhnd_nexusvar.h | 1 - sys/mips/cavium/octeon_irq.h | 1 - sys/mips/cavium/octopci_bus_space.c | 1 - sys/mips/include/_align.h | 1 - sys/mips/include/_bus.h | 1 - sys/mips/include/_inttypes.h | 1 - sys/mips/include/_limits.h | 1 - sys/mips/include/_stdint.h | 1 - sys/mips/include/_types.h | 1 - sys/mips/include/abi.h | 1 - sys/mips/include/asm.h | 1 - sys/mips/include/atomic.h | 1 - sys/mips/include/clock.h | 1 - sys/mips/include/cpu.h | 1 - sys/mips/include/cpufunc.h | 1 - sys/mips/include/db_machdep.h | 1 - sys/mips/include/endian.h | 1 - sys/mips/include/exec.h | 1 - sys/mips/include/float.h | 1 - sys/mips/include/floatingpoint.h | 1 - sys/mips/include/frame.h | 1 - sys/mips/include/gdb_machdep.h | 1 - sys/mips/include/ieeefp.h | 1 - sys/mips/include/in_cksum.h | 1 - sys/mips/include/kdb.h | 1 - sys/mips/include/limits.h | 1 - sys/mips/include/md_var.h | 1 - sys/mips/include/memdev.h | 1 - sys/mips/include/mips_opcode.h | 1 - sys/mips/include/param.h | 1 - sys/mips/include/pcb.h | 1 - sys/mips/include/pcpu.h | 1 - sys/mips/include/pmap.h | 1 - sys/mips/include/pmc_mdep.h | 1 - sys/mips/include/proc.h | 1 - sys/mips/include/profile.h | 1 - sys/mips/include/ptrace.h | 1 - sys/mips/include/reg.h | 1 - sys/mips/include/regdef.h | 1 - sys/mips/include/regnum.h | 1 - sys/mips/include/reloc.h | 1 - sys/mips/include/resource.h | 1 - sys/mips/include/runq.h | 1 - sys/mips/include/setjmp.h | 1 - sys/mips/include/sigframe.h | 1 - sys/mips/include/signal.h | 1 - sys/mips/include/smp.h | 1 - sys/mips/include/trap.h | 1 - sys/mips/include/ucontext.h | 1 - sys/mips/include/vmparam.h | 1 - sys/mips/malta/gt_pci_bus_space.c | 1 - sys/mips/mips/bus_space_generic.c | 1 - sys/mips/mips/exception.S | 1 - sys/mips/mips/fp.S | 1 - sys/mips/mips/gdb_machdep.c | 1 - sys/mips/mips/locore.S | 1 - sys/mips/mips/support.S | 1 - sys/mips/mips/swtch.S | 1 - sys/mips/nlm/board.h | 1 - sys/mips/nlm/clock.h | 1 - sys/mips/nlm/hal/bridge.h | 1 - sys/mips/nlm/hal/cop2.h | 1 - sys/mips/nlm/hal/cpucontrol.h | 1 - sys/mips/nlm/hal/fmn.h | 1 - sys/mips/nlm/hal/haldefs.h | 1 - sys/mips/nlm/hal/iomap.h | 1 - sys/mips/nlm/hal/mips-extns.h | 1 - sys/mips/nlm/hal/mmu.h | 1 - sys/mips/nlm/hal/pcibus.h | 1 - sys/mips/nlm/hal/pic.h | 1 - sys/mips/nlm/hal/sys.h | 1 - sys/mips/nlm/hal/uart.h | 1 - sys/mips/nlm/hal/usb.h | 1 - sys/mips/nlm/interrupt.h | 1 - sys/mips/nlm/mpreset.S | 1 - sys/mips/nlm/msgring.h | 1 - sys/mips/nlm/xlp.h | 1 - sys/modules/zfs/static_ccompile.h | 1 - sys/modules/zfs/zfs_config.h | 1 - sys/net/altq/altq.h | 1 - sys/net/altq/altq_cbq.c | 1 - sys/net/altq/altq_cbq.h | 1 - sys/net/altq/altq_cdnr.h | 1 - sys/net/altq/altq_classq.h | 1 - sys/net/altq/altq_fairq.c | 1 - sys/net/altq/altq_fairq.h | 1 - sys/net/altq/altq_hfsc.c | 1 - sys/net/altq/altq_hfsc.h | 1 - sys/net/altq/altq_priq.c | 1 - sys/net/altq/altq_priq.h | 1 - sys/net/altq/altq_red.c | 1 - sys/net/altq/altq_red.h | 1 - sys/net/altq/altq_rio.c | 1 - sys/net/altq/altq_rio.h | 1 - sys/net/altq/altq_rmclass.c | 1 - sys/net/altq/altq_rmclass.h | 1 - sys/net/altq/altq_rmclass_debug.h | 1 - sys/net/altq/altq_subr.c | 1 - sys/net/altq/altq_var.h | 1 - sys/net/altq/if_altq.h | 1 - sys/net/if.c | 1 - sys/net/if.h | 1 - sys/net/if_arp.h | 1 - sys/net/if_clone.c | 1 - sys/net/if_clone.h | 1 - sys/net/if_disc.c | 1 - sys/net/if_dl.h | 1 - sys/net/if_edsc.c | 1 - sys/net/if_ethersubr.c | 1 - sys/net/if_gre.h | 1 - sys/net/if_llc.h | 1 - sys/net/if_loop.c | 1 - sys/net/if_pfsync.h | 1 - sys/net/if_spppfr.c | 1 - sys/net/if_tap.h | 1 - sys/net/if_types.h | 1 - sys/net/if_var.h | 1 - sys/net/ifq.h | 1 - sys/net/netmap.h | 1 - sys/net/netmap_legacy.h | 1 - sys/net/netmap_user.h | 1 - sys/net/paravirt.h | 1 - sys/net/pfvar.h | 1 - sys/net/radix.c | 1 - sys/net/radix.h | 1 - sys/net/raw_cb.c | 1 - sys/net/raw_cb.h | 1 - sys/net/raw_usrreq.c | 1 - sys/net/route.c | 1 - sys/net/route.h | 1 - sys/net/route/route_ifaddrs.c | 1 - sys/net/rtsock.c | 1 - sys/net/slcompress.c | 1 - sys/net/slcompress.h | 1 - sys/net80211/ieee80211_mesh.h | 1 - sys/netgraph/bluetooth/common/ng_bluetooth.c | 1 - sys/netgraph/bluetooth/drivers/h4/ng_h4.c | 1 - sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h | 1 - sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h | 1 - sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c | 1 - sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h | 1 - sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c | 1 - sys/netgraph/bluetooth/hci/ng_hci_cmds.c | 1 - sys/netgraph/bluetooth/hci/ng_hci_cmds.h | 1 - sys/netgraph/bluetooth/hci/ng_hci_evnt.c | 1 - sys/netgraph/bluetooth/hci/ng_hci_evnt.h | 1 - sys/netgraph/bluetooth/hci/ng_hci_main.c | 1 - sys/netgraph/bluetooth/hci/ng_hci_misc.c | 1 - sys/netgraph/bluetooth/hci/ng_hci_misc.h | 1 - sys/netgraph/bluetooth/hci/ng_hci_prse.h | 1 - sys/netgraph/bluetooth/hci/ng_hci_ulpi.c | 1 - sys/netgraph/bluetooth/hci/ng_hci_ulpi.h | 1 - sys/netgraph/bluetooth/hci/ng_hci_var.h | 1 - sys/netgraph/bluetooth/include/ng_bluetooth.h | 1 - sys/netgraph/bluetooth/include/ng_btsocket.h | 1 - sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h | 1 - sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h | 1 - sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h | 1 - sys/netgraph/bluetooth/include/ng_btsocket_sco.h | 1 - sys/netgraph/bluetooth/include/ng_h4.h | 1 - sys/netgraph/bluetooth/include/ng_hci.h | 1 - sys/netgraph/bluetooth/include/ng_l2cap.h | 1 - sys/netgraph/bluetooth/include/ng_ubt.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h | 1 - sys/netgraph/bluetooth/socket/ng_btsocket.c | 1 - sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c | 1 - sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c | 1 - sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c | 1 - sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c | 1 - sys/netgraph/bluetooth/socket/ng_btsocket_sco.c | 1 - sys/netgraph/netflow/netflow.h | 1 - sys/netgraph/netflow/ng_netflow.h | 1 - sys/netgraph/ng_mppc.c | 1 - sys/netgraph/ng_mppc.h | 1 - sys/netgraph/ng_parse.c | 1 - sys/netgraph/ng_parse.h | 1 - sys/netinet/icmp_var.h | 1 - sys/netinet/if_ether.h | 1 - sys/netinet/igmp.h | 1 - sys/netinet/igmp_var.h | 1 - sys/netinet/in.h | 1 - sys/netinet/in_pcb.h | 1 - sys/netinet/in_systm.h | 1 - sys/netinet/in_var.h | 1 - sys/netinet/ip.h | 1 - sys/netinet/ip_icmp.h | 1 - sys/netinet/ip_mroute.h | 1 - sys/netinet/ip_var.h | 1 - sys/netinet/tcp.h | 1 - sys/netinet/tcp_debug.h | 1 - sys/netinet/tcp_fsm.h | 1 - sys/netinet/tcp_seq.h | 1 - sys/netinet/tcp_syncache.h | 1 - sys/netinet/tcp_timer.h | 1 - sys/netinet/tcp_var.h | 1 - sys/netinet/tcpip.h | 1 - sys/netinet/udp.h | 1 - sys/netinet/udp_var.h | 1 - sys/netinet6/in6.h | 1 - sys/netinet6/in6_ifattach.h | 1 - sys/netinet6/in6_pcb.h | 1 - sys/netinet6/in6_var.h | 1 - sys/netinet6/ip6_ecn.h | 1 - sys/netinet6/ip6_mroute.h | 1 - sys/netinet6/ip6_var.h | 1 - sys/netinet6/ip6protosw.h | 1 - sys/netinet6/nd6.h | 1 - sys/netinet6/pim6.h | 1 - sys/netinet6/pim6_var.h | 1 - sys/netinet6/raw_ip6.h | 1 - sys/netinet6/scope6_var.h | 1 - sys/netinet6/tcp6_var.h | 1 - sys/netinet6/udp6_var.h | 1 - sys/netpfil/ipfilter/netinet/ip_compat.h | 1 - sys/netpfil/ipfilter/netinet/ip_fil.h | 1 - sys/netpfil/ipfilter/netinet/ip_frag.h | 1 - sys/netpfil/ipfilter/netinet/ip_nat.h | 1 - sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c | 1 - sys/netpfil/ipfilter/netinet/ip_state.h | 1 - sys/netpfil/ipfilter/netinet/ipl.h | 1 - sys/netpfil/ipfw/dn_sched_fifo.c | 1 - sys/netpfil/ipfw/dn_sched_prio.c | 1 - sys/netpfil/ipfw/dn_sched_qfq.c | 1 - sys/netpfil/ipfw/dn_sched_rr.c | 1 - sys/netpfil/ipfw/dn_sched_wf2q.c | 1 - sys/netpfil/ipfw/ip_dn_glue.c | 1 - sys/netpfil/ipfw/test/dn_test.h | 1 - sys/netpfil/ipfw/test/main.c | 1 - sys/netpfil/ipfw/test/mylist.h | 1 - sys/netpfil/ipfw/test/test_dn_sched.c | 1 - sys/netpfil/pf/pf.h | 1 - sys/netpfil/pf/pf_altq.h | 1 - sys/nfs/nfs_common.h | 1 - sys/nfs/nfs_lock.h | 1 - sys/nfs/nfsdiskless.h | 1 - sys/nfs/nfsproto.h | 1 - sys/nfs/xdr_subs.h | 1 - sys/nfsclient/nfs.h | 1 - sys/nfsclient/nfsargs.h | 1 - sys/nfsclient/nfsm_subs.h | 1 - sys/nfsclient/nfsmount.h | 1 - sys/nfsclient/nfsnode.h | 1 - sys/nfsclient/nfsstats.h | 1 - sys/nfsclient/nlminfo.h | 1 - sys/nfsserver/nfs.h | 1 - sys/nfsserver/nfsm_subs.h | 1 - sys/nfsserver/nfsrvcache.h | 1 - sys/nfsserver/nfsrvstats.h | 1 - sys/opencrypto/_cryptodev.h | 1 - sys/powerpc/include/_align.h | 1 - sys/powerpc/include/_inttypes.h | 1 - sys/powerpc/include/_limits.h | 1 - sys/powerpc/include/_types.h | 1 - sys/powerpc/include/asm.h | 1 - sys/powerpc/include/bat.h | 1 - sys/powerpc/include/cpu.h | 1 - sys/powerpc/include/db_machdep.h | 1 - sys/powerpc/include/endian.h | 1 - sys/powerpc/include/float.h | 1 - sys/powerpc/include/fpu.h | 1 - sys/powerpc/include/frame.h | 1 - sys/powerpc/include/hid.h | 1 - sys/powerpc/include/ieee.h | 1 - sys/powerpc/include/ieeefp.h | 1 - sys/powerpc/include/in_cksum.h | 1 - sys/powerpc/include/limits.h | 1 - sys/powerpc/include/minidump.h | 1 - sys/powerpc/include/openpicreg.h | 1 - sys/powerpc/include/param.h | 1 - sys/powerpc/include/pcb.h | 1 - sys/powerpc/include/pio.h | 1 - sys/powerpc/include/platform.h | 1 - sys/powerpc/include/proc.h | 1 - sys/powerpc/include/profile.h | 1 - sys/powerpc/include/psl.h | 1 - sys/powerpc/include/pte.h | 1 - sys/powerpc/include/ptrace.h | 1 - sys/powerpc/include/setjmp.h | 1 - sys/powerpc/include/signal.h | 1 - sys/powerpc/include/spr.h | 1 - sys/powerpc/include/trap.h | 1 - sys/powerpc/include/ucontext.h | 1 - sys/powerpc/include/vmparam.h | 1 - sys/powerpc/powerpc/cpu.c | 1 - sys/powerpc/powerpc/genassym.c | 1 - sys/powerpc/powerpc/minidump_machdep.c | 1 - sys/powerpc/powerpc/support.S | 1 - sys/powerpc/powerpc/vm_machdep.c | 1 - sys/riscv/include/_align.h | 1 - sys/riscv/include/_inttypes.h | 1 - sys/riscv/include/_limits.h | 1 - sys/riscv/include/_types.h | 1 - sys/riscv/include/endian.h | 1 - sys/riscv/include/float.h | 1 - sys/riscv/include/in_cksum.h | 1 - sys/riscv/include/md_var.h | 1 - sys/riscv/include/minidump.h | 1 - sys/riscv/include/param.h | 1 - sys/riscv/include/pcpu.h | 1 - sys/riscv/include/proc.h | 1 - sys/riscv/include/profile.h | 1 - sys/riscv/include/signal.h | 1 - sys/riscv/include/sysarch.h | 1 - sys/riscv/include/vmparam.h | 1 - sys/rpc/auth.h | 1 - sys/rpc/clnt.h | 1 - sys/rpc/pmap_prot.h | 1 - sys/rpc/rpc.h | 1 - sys/rpc/rpc_msg.h | 1 - sys/rpc/svc.h | 1 - sys/rpc/svc_auth.h | 1 - sys/rpc/types.h | 1 - sys/rpc/xdr.h | 1 - sys/security/mac_veriexec/mac_veriexec.c | 1 - sys/security/mac_veriexec/mac_veriexec.h | 1 - sys/security/mac_veriexec/mac_veriexec_internal.h | 1 - sys/security/mac_veriexec/mac_veriexec_sha1.c | 1 - sys/security/mac_veriexec/mac_veriexec_sha256.c | 1 - sys/security/mac_veriexec/mac_veriexec_sha384.c | 1 - sys/security/mac_veriexec/mac_veriexec_sha512.c | 1 - sys/security/mac_veriexec/veriexec_fingerprint.c | 1 - sys/security/mac_veriexec/veriexec_metadata.c | 1 - sys/sys/_callout.h | 1 - sys/sys/_iovec.h | 1 - sys/sys/_sigset.h | 1 - sys/sys/_sockaddr_storage.h | 1 - sys/sys/_termios.h | 1 - sys/sys/_timespec.h | 1 - sys/sys/_uio.h | 1 - sys/sys/_winsize.h | 1 - sys/sys/acct.h | 1 - sys/sys/bio.h | 1 - sys/sys/buf.h | 1 - sys/sys/busdma_bufalloc.h | 1 - sys/sys/callout.h | 1 - sys/sys/cdefs.h | 1 - sys/sys/ck.h | 1 - sys/sys/conf.h | 1 - sys/sys/cons.h | 1 - sys/sys/dirent.h | 1 - sys/sys/disk/bsd.h | 1 - sys/sys/disk/mbr.h | 1 - sys/sys/disklabel.h | 1 - sys/sys/diskmbr.h | 1 - sys/sys/dkstat.h | 1 - sys/sys/domain.h | 1 - sys/sys/errno.h | 1 - sys/sys/exec.h | 1 - sys/sys/fcntl.h | 1 - sys/sys/file.h | 1 - sys/sys/filedesc.h | 1 - sys/sys/filio.h | 1 - sys/sys/gmon.h | 1 - sys/sys/hash.h | 1 - sys/sys/imgact_aout.h | 1 - sys/sys/ioccom.h | 1 - sys/sys/ioctl.h | 1 - sys/sys/ioctl_compat.h | 1 - sys/sys/ipc.h | 1 - sys/sys/kbio.h | 1 - sys/sys/kernel.h | 1 - sys/sys/ktr.h | 1 - sys/sys/ktr_class.h | 1 - sys/sys/ktrace.h | 1 - sys/sys/libkern.h | 1 - sys/sys/lock.h | 1 - sys/sys/lockf.h | 1 - sys/sys/malloc.h | 1 - sys/sys/mbuf.h | 1 - sys/sys/md4.h | 1 - sys/sys/md5.h | 1 - sys/sys/mman.h | 1 - sys/sys/mount.h | 1 - sys/sys/msgbuf.h | 1 - sys/sys/mtio.h | 1 - sys/sys/mutex.h | 1 - sys/sys/namei.h | 1 - sys/sys/param.h | 1 - sys/sys/proc.h | 1 - sys/sys/protosw.h | 1 - sys/sys/ptrace.h | 1 - sys/sys/queue.h | 1 - sys/sys/reboot.h | 1 - sys/sys/resource.h | 1 - sys/sys/resourcevar.h | 1 - sys/sys/selinfo.h | 1 - sys/sys/sigio.h | 1 - sys/sys/signal.h | 1 - sys/sys/signalvar.h | 1 - sys/sys/socket.h | 1 - sys/sys/sockio.h | 1 - sys/sys/stat.h | 1 - sys/sys/syscall.h | 1 - sys/sys/sysctl.h | 1 - sys/sys/syslimits.h | 1 - sys/sys/syslog.h | 1 - sys/sys/sysproto.h | 1 - sys/sys/systm.h | 1 - sys/sys/time.h | 1 - sys/sys/timeb.h | 1 - sys/sys/times.h | 1 - sys/sys/timespec.h | 1 - sys/sys/ttycom.h | 1 - sys/sys/ttydefaults.h | 1 - sys/sys/types.h | 1 - sys/sys/ucred.h | 1 - sys/sys/uio.h | 1 - sys/sys/un.h | 1 - sys/sys/unistd.h | 1 - sys/sys/unpcb.h | 1 - sys/sys/user.h | 1 - sys/sys/utsname.h | 1 - sys/sys/vmmeter.h | 1 - sys/sys/vnode.h | 1 - sys/sys/wait.h | 1 - sys/teken/libteken/Symbol.map | 1 - sys/ufs/ffs/ffs_extern.h | 1 - sys/ufs/ffs/fs.h | 1 - sys/ufs/ffs/softdep.h | 1 - sys/ufs/ufs/dinode.h | 1 - sys/ufs/ufs/dir.h | 1 - sys/ufs/ufs/inode.h | 1 - sys/ufs/ufs/quota.h | 1 - sys/ufs/ufs/ufs_extern.h | 1 - sys/ufs/ufs/ufsmount.h | 1 - sys/vm/swap_pager.h | 1 - sys/vm/vm_extern.h | 1 - sys/vm/vm_pager.h | 1 - sys/vm/vnode_pager.h | 1 - sys/x86/include/_align.h | 1 - sys/x86/include/_inttypes.h | 1 - sys/x86/include/_limits.h | 1 - sys/x86/include/_types.h | 1 - sys/x86/include/endian.h | 1 - sys/x86/include/float.h | 1 - sys/x86/include/fpu.h | 1 - sys/x86/include/frame.h | 1 - sys/x86/include/psl.h | 1 - sys/x86/include/ptrace.h | 1 - sys/x86/include/reg.h | 1 - sys/x86/include/segments.h | 1 - sys/x86/include/signal.h | 1 - sys/x86/include/specialreg.h | 1 - sys/x86/include/trap.h | 1 - sys/x86/isa/icu.h | 1 - 909 files changed, 909 deletions(-) diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S index 4de39283f92f..089886ac88c9 100644 --- a/sys/amd64/amd64/apic_vector.S +++ b/sys/amd64/amd64/apic_vector.S @@ -34,7 +34,6 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD$ */ /* diff --git a/sys/amd64/amd64/atpic_vector.S b/sys/amd64/amd64/atpic_vector.S index d82ffd30e1c9..993bac0eb45b 100644 --- a/sys/amd64/amd64/atpic_vector.S +++ b/sys/amd64/amd64/atpic_vector.S @@ -28,7 +28,6 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD$ */ /* diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h index 7b66e9446ff3..8809051e84cc 100644 --- a/sys/amd64/include/asm.h +++ b/sys/amd64/include/asm.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD$ */ #ifndef _MACHINE_ASM_H_ diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h index f7732435fc39..530ba746e0b2 100644 --- a/sys/amd64/include/cpu.h +++ b/sys/amd64/include/cpu.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD$ */ #ifndef _MACHINE_CPU_H_ diff --git a/sys/amd64/include/exec.h b/sys/amd64/include/exec.h index 099ea263e202..f3a8caa5b88d 100644 --- a/sys/amd64/include/exec.h +++ b/sys/amd64/include/exec.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)exec.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD$ */ *** 10778 LINES SKIPPED *** From nobody Wed Aug 23 17:49: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 4RWDHh45R3z4r94V; Wed, 23 Aug 2023 17:49: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 4RWDHh1t99z4ScD; Wed, 23 Aug 2023 17:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W3nqaolks5cyZip6AX/5NWE7nSd7xEb+aOtyw259a/4=; b=E/mVoU5YKoXd9YruIAjrWnTWjNJ+hiKklwJ0cbtsZYGIgs+BXx5ENizz5yp+DB1tHWZyNs b2jGc1i6DymD9Ap5iCTdDcZs8QFGFwkLqGBsvhwYBBoEdpUsXJ1eMS4zXaSp85S8npJEWj fv/lo0v+Iu8bx9sniIUxavUWhbl7yogGv6ipxmziF4iZpGN9kxHnAiHS1hr1FcHOYcgbzl 4H6YBLAV3vop9q24qJQaoUX+PPBbPFblAxgRBDm9diV1MmuxtaxeRbDUbQlW739Rt7p5IX BHGLejaqnyghELCvktvtYQhrmk6ql/V3h27GqAqiqMG5VrusJtqSs72cPy8vNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W3nqaolks5cyZip6AX/5NWE7nSd7xEb+aOtyw259a/4=; b=g6hk07j3Iwv1AM7cU7VQOg/l/JOWNJ3fv14RhcsVqsWFFJ2OGrwIEJOgIG1wJwtx0CDiJB if27xvW69jitcqwttf2Fd/VqgLaGXywLUTWy7dSD8GPZ3O6Oxf5K9feSYMG3+FRGX0+8kU RSxzCAJ9uZARdZeZ8BxAoe7UD2/pVAxrKfFUGFBuQfh4DpEcbifgIEmx0aW9MGymdbK73u WYoqNVq7pAyHcieFEyjD0Co5+pC1tsjka/Zs99rI/VyAuzkzs483ghh9al+zJLmmdkoPo9 ReI4H/mzaOrmvHOEjShQmFqY7jD5Q58XSxKMedUDrZWuwZSmnLnOqICYO6O5Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812976; a=rsa-sha256; cv=none; b=wm4uPSHvFIqkAnBw3v30ZvxaEP27/p+Pj1zAbA3j7KfY7H08wY2iK/3uCLnbQirt8F47Pn bzSVd2KD0Lj/c7gVcy9u1IwgJqGfxbS6NbwsUSwGTC1MSDUZUN2jwV/+FSUNthVjx30XN3 r8quMYA9as8lNU86wkP3qzQXe9w/Xo+jjQQnr7MeQTgUVhaKlkb5j57/BxjxEhGPruvwtm bC/TWW7pglh/uXLcciti4NaSZ7ZmxqAY8KkbqoCygGEgG1MlK0/CDYdXdfXbOlA9rpad82 c6c5nhIYU7m9yE9sw9UrEnmTGrM7nfX76GUSRw+U2BCosbMxEtsz96i7aMjWyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHh0zbqzvL3; Wed, 23 Aug 2023 17:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnaL4040644; Wed, 23 Aug 2023 17:49:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnaGq040641; Wed, 23 Aug 2023 17:49:36 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:36 GMT Message-Id: <202308231749.37NHnaGq040641@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 34041aac835a - stable/13 - Remove $FreeBSD$: one-line .h pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 34041aac835a0bce462bccb7e0239c0ba092f872 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=34041aac835a0bce462bccb7e0239c0ba092f872 commit 34041aac835a0bce462bccb7e0239c0ba092f872 Author: Warner Losh AuthorDate: 2023-08-22 01:31:13 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:22 +0000 Remove $FreeBSD$: one-line .h pattern Remove /^\s*\*+\s*\$FreeBSD\$.*$\n/ Similar commit in main: (cherry picked from commit 42b388439bd3) --- bin/cp/extern.h | 1 - bin/dd/dd.h | 1 - bin/dd/extern.h | 1 - bin/ed/ed.h | 1 - bin/ls/extern.h | 1 - bin/ls/ls.h | 1 - bin/pax/cache.h | 1 - bin/pax/cpio.h | 1 - bin/pax/extern.h | 1 - bin/pax/ftree.h | 1 - bin/pax/options.h | 1 - bin/pax/pat_rep.h | 1 - bin/pax/pax.h | 1 - bin/pax/sel_subs.h | 1 - bin/pax/tables.h | 1 - bin/pax/tar.h | 1 - bin/ps/extern.h | 1 - bin/ps/ps.h | 1 - bin/sh/alias.h | 1 - bin/sh/arith.h | 1 - bin/sh/bltin/bltin.h | 1 - bin/sh/error.h | 1 - bin/sh/eval.h | 1 - bin/sh/exec.h | 1 - bin/sh/expand.h | 1 - bin/sh/input.h | 1 - bin/sh/jobs.h | 1 - bin/sh/mail.h | 1 - bin/sh/main.h | 1 - bin/sh/memalloc.h | 1 - bin/sh/myhistedit.h | 1 - bin/sh/mystring.h | 1 - bin/sh/nodes.c.pat | 1 - bin/sh/options.h | 1 - bin/sh/output.h | 1 - bin/sh/parser.h | 1 - bin/sh/redir.h | 1 - bin/sh/shell.h | 1 - bin/sh/show.h | 1 - bin/sh/trap.h | 1 - bin/sh/var.h | 1 - bin/stty/extern.h | 1 - bin/stty/stty.h | 1 - cddl/compat/opensolaris/include/thread_pool.h | 1 - include/_ctype.h | 1 - include/a.out.h | 1 - include/arpa/inet.h | 1 - include/arpa/nameser.h | 1 - include/arpa/nameser_compat.h | 1 - include/arpa/telnet.h | 1 - include/arpa/tftp.h | 1 - include/assert.h | 1 - include/ctype.h | 1 - include/db.h | 1 - include/dirent.h | 1 - include/err.h | 1 - include/fstab.h | 1 - include/fts.h | 1 - include/glob.h | 1 - include/grp.h | 1 - include/limits.h | 1 - include/locale.h | 1 - include/malloc.h | 1 - include/mpool.h | 1 - include/ndbm.h | 1 - include/netdb.h | 1 - include/paths.h | 1 - include/pwd.h | 1 - include/regex.h | 1 - include/res_update.h | 1 - include/resolv.h | 1 - include/rpc/auth.h | 1 - include/rpc/auth_unix.h | 1 - include/rpc/clnt.h | 1 - include/rpc/des_crypt.h | 1 - include/rpc/pmap_clnt.h | 1 - include/rpc/pmap_prot.h | 1 - include/rpc/pmap_rmt.h | 1 - include/rpc/rpc.h | 1 - include/rpc/rpc_msg.h | 1 - include/rpc/svc.h | 1 - include/rpc/svc_auth.h | 1 - include/rpc/xdr.h | 1 - include/runetype.h | 1 - include/search.h | 1 - include/setjmp.h | 1 - include/signal.h | 1 - include/stdio.h | 1 - include/stdlib.h | 1 - include/string.h | 1 - include/termios.h | 1 - include/time.h | 1 - include/timeconv.h | 1 - include/ttyent.h | 1 - include/unistd.h | 1 - include/utime.h | 1 - include/wctype.h | 1 - lib/libbluetooth/bluetooth.c | 1 - lib/libbluetooth/bluetooth.h | 1 - lib/libc/aarch64/Symbol.map | 1 - lib/libc/amd64/SYS.h | 1 - lib/libc/amd64/Symbol.map | 1 - lib/libc/arm/SYS.h | 1 - lib/libc/arm/Symbol.map | 1 - lib/libc/arm/Symbol_vfp.map | 1 - lib/libc/arm/aeabi/Symbol.map | 1 - lib/libc/capability/Symbol.map | 1 - lib/libc/compat-43/Symbol.map | 1 - lib/libc/db/Symbol.map | 1 - lib/libc/db/btree/btree.h | 1 - lib/libc/db/btree/extern.h | 1 - lib/libc/db/hash/extern.h | 1 - lib/libc/db/hash/hash.h | 1 - lib/libc/db/hash/page.h | 1 - lib/libc/db/recno/extern.h | 1 - lib/libc/db/recno/recno.h | 1 - lib/libc/gdtoa/Symbol.map | 1 - lib/libc/gen/Symbol.map | 1 - lib/libc/gen/fts-compat.h | 1 - lib/libc/gen/fts-compat11.h | 1 - lib/libc/gen/pw_scan.h | 1 - lib/libc/gmon/Symbol.map | 1 - lib/libc/i386/SYS.h | 1 - lib/libc/i386/Symbol.map | 1 - lib/libc/iconv/Symbol.map | 1 - lib/libc/inet/Symbol.map | 1 - lib/libc/isc/eventlib_p.h | 1 - lib/libc/locale/Symbol.map | 1 - lib/libc/mips/Symbol.map | 1 - lib/libc/nameser/Symbol.map | 1 - lib/libc/net/Symbol.map | 1 - lib/libc/nls/Symbol.map | 1 - lib/libc/posix1e/Symbol.map | 1 - lib/libc/powerpc/SYS.h | 1 - lib/libc/powerpc/Symbol.map | 1 - lib/libc/powerpc64/SYS.h | 1 - lib/libc/powerpc64/Symbol.map | 1 - lib/libc/quad/Symbol.map | 1 - lib/libc/quad/quad.h | 1 - lib/libc/regex/Symbol.map | 1 - lib/libc/regex/cname.h | 1 - lib/libc/regex/regex2.h | 1 - lib/libc/regex/utils.h | 1 - lib/libc/resolv/Symbol.map | 1 - lib/libc/riscv/Symbol.map | 1 - lib/libc/rpc/Symbol.map | 1 - lib/libc/secure/Symbol.map | 1 - lib/libc/softfloat/Symbol.map | 1 - lib/libc/stdio/Symbol.map | 1 - lib/libc/stdio/floatio.h | 1 - lib/libc/stdio/fvwrite.h | 1 - lib/libc/stdio/glue.h | 1 - lib/libc/stdio/local.h | 1 - lib/libc/stdlib/Symbol.map | 1 - lib/libc/stdlib/atexit.h | 1 - lib/libc/stdlib/jemalloc/Symbol.map | 1 - lib/libc/stdtime/Symbol.map | 1 - lib/libc/string/Symbol.map | 1 - lib/libc/sys/Symbol.map | 1 - lib/libc/uuid/Symbol.map | 1 - lib/libc/xdr/Symbol.map | 1 - lib/libc/yp/Symbol.map | 1 - lib/libdl/Symbol.map | 1 - lib/libgcc_s/Symbol.map | 1 - lib/libgcc_s/SymbolDefault.map | 1 - lib/libgcc_s/arm/Symbol.map | 1 - lib/libgssapi/Symbol.map | 1 - lib/libkvm/kvm.h | 1 - lib/libkvm/kvm_private.h | 1 - lib/libmd/md4.h | 1 - lib/libmd/ripemd.h | 1 - lib/libmp/Symbol.map | 1 - lib/libnetbsd/sys/event.h | 1 - lib/libnetbsd/sys/types.h | 1 - lib/libnetbsd/sys/wait.h | 1 - lib/libnetmap/libnetmap.h | 1 - lib/libpmc/pmu-events/pmu-events.h | 1 - lib/libprocstat/Symbol.map | 1 - lib/libregex/Symbol.map | 1 - lib/librpcsec_gss/Symbol.map | 1 - lib/librt/Symbol.map | 1 - lib/libsbuf/Symbol.map | 1 - lib/libsdp/sdp-int.h | 1 - lib/libsdp/sdp.h | 1 - lib/libsdp/search.c | 1 - lib/libsdp/service.c | 1 - lib/libsdp/session.c | 1 - lib/libsdp/util.c | 1 - lib/libsecureboot/h/libsecureboot.h | 1 - lib/libsecureboot/libsecureboot-priv.h | 1 - lib/libsecureboot/openpgp/decode.h | 1 - lib/libsecureboot/openpgp/packet.h | 1 - lib/libssp/Symbol.map | 1 - lib/libstdthreads/Symbol.map | 1 - lib/libthr/arch/mips/include/pthread_md.h | 1 - lib/libthr/pthread.map | 1 - lib/libthread_db/Symbol.map | 1 - lib/libulog/Symbol.map | 1 - lib/libutil/login_cap.h | 1 - lib/libveriexec/libveriexec.h | 1 - lib/libveriexec/veriexec_check.c | 1 - lib/libz/Symbol.map | 1 - lib/msun/Symbol.map | 1 - lib/msun/amd64/Symbol.map | 1 - lib/msun/arm/Symbol.map | 1 - lib/msun/bsdsrc/mathimpl.h | 1 - lib/msun/i387/Symbol.map | 1 - lib/msun/mips/Symbol.map | 1 - lib/msun/powerpc/Symbol.map | 1 - lib/msun/riscv/Symbol.map | 1 - lib/msun/src/math.h | 1 - lib/msun/src/math_private.h | 1 - lib/ncurses/ncurses/pathnames.h | 1 - libexec/bootpd/hash.h | 1 - libexec/ftpd/extern.h | 1 - libexec/ftpd/pathnames.h | 1 - libexec/getty/extern.h | 1 - libexec/getty/gettytab.h | 1 - libexec/getty/pathnames.h | 1 - libexec/rtld-elf/Symbol.map | 1 - libexec/rtld-elf/i386/Symbol.map | 1 - libexec/rtld-elf/libmap.c | 1 - libexec/rtld-elf/libmap.h | 1 - libexec/rtld-elf/rtld_lock.c | 1 - sbin/bsdlabel/pathnames.h | 1 - sbin/ccdconfig/pathnames.h | 1 - sbin/dump/pathnames.h | 1 - sbin/fsck_ffs/fsck.h | 1 - sbin/fsck_msdosfs/dosfs.h | 1 - sbin/fsck_msdosfs/ext.h | 1 - sbin/growfs/debug.h | 1 - sbin/init/pathnames.h | 1 - sbin/ipf/iplang/iplang_y.y | 1 - sbin/mount/mntopts.h | 1 - sbin/mount/pathnames.h | 1 - sbin/rcorder/sprite.h | 1 - sbin/restore/extern.h | 1 - sbin/restore/restore.h | 1 - share/man/man9/style.9 | 1 - share/syscons/scrnmaps/iso-8859-7_to_cp437 | 1 - share/syscons/scrnmaps/us-ascii_to_cp437 | 1 - stand/efi/loader/arch/amd64/start.S | 1 - stand/ficl/aarch64/sysdep.h | 1 - stand/ficl/arm/sysdep.h | 1 - stand/ficl/mips/sysdep.h | 1 - stand/ficl/mips64/sysdep.h | 1 - stand/ficl/powerpc/sysdep.h | 1 - stand/ficl/riscv/sysdep.h | 1 - stand/i386/boot2/lib.h | 1 - stand/i386/btx/lib/btxv86.h | 1 - stand/i386/libfirewire/fwohci.c | 1 - stand/i386/libfirewire/fwohci.h | 1 - stand/i386/libi386/multiboot.h | 1 - stand/kboot/arch/powerpc64/kerneltramp.S | 1 - tests/sys/cddl/zfs/bin/chg_usr_exec.c | 1 - tests/sys/cddl/zfs/bin/devname2devid.c | 1 - tests/sys/cddl/zfs/bin/dir_rd_update.c | 1 - tests/sys/cddl/zfs/bin/file_check.c | 1 - tests/sys/cddl/zfs/bin/file_common.h | 1 - tests/sys/cddl/zfs/bin/file_trunc.c | 1 - tests/sys/cddl/zfs/bin/file_write.c | 1 - tests/sys/cddl/zfs/bin/largest_file.c | 1 - tests/sys/cddl/zfs/bin/mktree.c | 1 - tests/sys/cddl/zfs/bin/mmapwrite.c | 1 - tests/sys/cddl/zfs/bin/randfree_file.c | 1 - tests/sys/cddl/zfs/bin/readmmap.c | 1 - tests/sys/cddl/zfs/bin/rename_dir.c | 1 - tests/sys/cddl/zfs/bin/rm_lnkcnt_zero_file.c | 1 - tests/sys/cddl/zfs/tests/ctime/ctime_001_pos.c | 1 - tests/sys/cddl/zfs/tests/exec/mmap_exec.c | 1 - tests/sys/cddl/zfs/tests/threadsappend/threadsappend.c | 1 - tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c | 1 - tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.c | 1 - tests/sys/geom/class/eli/hmac_test.c | 1 - tests/sys/kern/pipe/pipe_fstat_bug_test.c | 1 - tests/sys/kern/pipe/pipe_ino_test.c | 1 - tests/sys/kern/pipe/pipe_overcommit1_test.c | 1 - tests/sys/kern/pipe/pipe_overcommit2_test.c | 1 - tests/sys/kern/pipe/pipe_reverse_test.c | 1 - tests/sys/kern/pipe/pipe_wraparound_test.c | 1 - tools/build/dummy.c | 1 - tools/regression/p1003_1b/prutil.c | 1 - tools/regression/p1003_1b/prutil.h | 1 - tools/regression/p1003_1b/sched.c | 1 - tools/regression/p1003_1b/yield.c | 1 - tools/regression/pthread/unwind/cond_wait_cancel2.cpp | 1 - tools/regression/sysvmsg/msgtest.c | 1 - tools/regression/sysvsem/semtest.c | 1 - tools/regression/sysvshm/shmtest.c | 1 - tools/test/popss/popss.c | 1 - tools/tools/atsectl/atsectl.c | 1 - tools/tools/cxgbtool/reg_defs.c | 1 - tools/tools/cxgbtool/reg_defs_t3.c | 1 - tools/tools/cxgbtool/reg_defs_t3b.c | 1 - tools/tools/cxgbtool/reg_defs_t3c.c | 1 - tools/tools/cxgbtool/version.h | 1 - tools/tools/netmap/pkt-gen.c | 1 - tools/tools/shlib-compat/test/libtest1/Symbol.map | 1 - tools/tools/shlib-compat/test/libtest1/test.c | 1 - tools/tools/shlib-compat/test/libtest2/Symbol.map | 1 - tools/tools/shlib-compat/test/libtest2/test.c | 1 - tools/tools/shlib-compat/test/libtest3/Symbol.map | 1 - tools/tools/shlib-compat/test/libtest3/test.c | 1 - tools/tools/shlib-compat/test/libtestsys/Symbol.map | 1 - usr.bin/bluetooth/bthost/bthost.c | 1 - usr.bin/bluetooth/btsockstat/btsockstat.c | 1 - usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c | 1 - usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c | 1 - usr.bin/calendar/pathnames.h | 1 - usr.bin/chpass/chpass.h | 1 - usr.bin/cksum/extern.h | 1 - usr.bin/diff/diff.h | 1 - usr.bin/find/extern.h | 1 - usr.bin/find/find.h | 1 - usr.bin/finger/extern.h | 1 - usr.bin/finger/finger.h | 1 - usr.bin/fortune/fortune/pathnames.h | 1 - usr.bin/gcore/extern.h | 1 - usr.bin/gprof/gprof.h | 1 - usr.bin/gprof/pathnames.h | 1 - usr.bin/gzip/zuncompress.c | 1 - usr.bin/hexdump/hexdump.h | 1 - usr.bin/indent/indent_codes.h | 1 - usr.bin/indent/indent_globs.h | 1 - usr.bin/ktrace/ktrace.h | 1 - usr.bin/locate/locate/locate.h | 1 - usr.bin/locate/locate/pathnames.h | 1 - usr.bin/login/pathnames.h | 1 - usr.bin/m4/extern.h | 1 - usr.bin/m4/mdef.h | 1 - usr.bin/m4/pathnames.h | 1 - usr.bin/m4/stdd.h | 1 - usr.bin/netstat/common.h | 1 - usr.bin/netstat/netstat.h | 1 - usr.bin/patch/backupfile.c | 1 - usr.bin/patch/backupfile.h | 1 - usr.bin/patch/common.h | 1 - usr.bin/patch/inp.c | 1 - usr.bin/patch/inp.h | 1 - usr.bin/patch/mkpath.c | 1 - usr.bin/patch/patch.c | 1 - usr.bin/patch/pathnames.h | 1 - usr.bin/patch/pch.c | 1 - usr.bin/patch/pch.h | 1 - usr.bin/patch/util.c | 1 - usr.bin/patch/util.h | 1 - usr.bin/pr/extern.h | 1 - usr.bin/pr/pr.h | 1 - usr.bin/primes/primes.h | 1 - usr.bin/rpcgen/rpc_parse.h | 1 - usr.bin/rpcgen/rpc_scan.h | 1 - usr.bin/rpcgen/rpc_util.h | 1 - usr.bin/sed/defs.h | 1 - usr.bin/sed/extern.h | 1 - usr.bin/systat/extern.h | 1 - usr.bin/systat/systat.h | 1 - usr.bin/talk/talk.h | 1 - usr.bin/tftp/tftp.h | 1 - usr.bin/top/machine.h | 1 - usr.bin/top/utils.h | 1 - usr.bin/tr/extern.h | 1 - usr.bin/tset/extern.h | 1 - usr.bin/vgrind/extern.h | 1 - usr.bin/w/extern.h | 1 - usr.sbin/acpi/acpiconf/acpiconf.c | 1 - usr.sbin/bluetooth/bcmfw/bcmfw.c | 1 - usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c | 1 - usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h | 1 - usr.sbin/bluetooth/bthidcontrol/hid.c | 1 - usr.sbin/bluetooth/bthidcontrol/sdp.c | 1 - usr.sbin/bluetooth/bthidd/bthid_config.h | 1 - usr.sbin/bluetooth/bthidd/bthidd.c | 1 - usr.sbin/bluetooth/bthidd/bthidd.h | 1 - usr.sbin/bluetooth/bthidd/client.c | 1 - usr.sbin/bluetooth/bthidd/hid.c | 1 - usr.sbin/bluetooth/bthidd/kbd.c | 1 - usr.sbin/bluetooth/bthidd/kbd.h | 1 - usr.sbin/bluetooth/bthidd/lexer.l | 1 - usr.sbin/bluetooth/bthidd/parser.y | 1 - usr.sbin/bluetooth/bthidd/server.c | 1 - usr.sbin/bluetooth/bthidd/session.c | 1 - usr.sbin/bluetooth/hccontrol/adv_data.c | 1 - usr.sbin/bluetooth/hccontrol/hccontrol.c | 1 - usr.sbin/bluetooth/hccontrol/hccontrol.h | 1 - usr.sbin/bluetooth/hccontrol/host_controller_baseband.c | 1 - usr.sbin/bluetooth/hccontrol/info.c | 1 - usr.sbin/bluetooth/hccontrol/le.c | 1 - usr.sbin/bluetooth/hccontrol/link_control.c | 1 - usr.sbin/bluetooth/hccontrol/link_policy.c | 1 - usr.sbin/bluetooth/hccontrol/node.c | 1 - usr.sbin/bluetooth/hccontrol/send_recv.c | 1 - usr.sbin/bluetooth/hccontrol/status.c | 1 - usr.sbin/bluetooth/hccontrol/util.c | 1 - usr.sbin/bluetooth/hcsecd/hcsecd.c | 1 - usr.sbin/bluetooth/hcsecd/hcsecd.h | 1 - usr.sbin/bluetooth/hcsecd/lexer.l | 1 - usr.sbin/bluetooth/hcsecd/parser.y | 1 - usr.sbin/bluetooth/hcseriald/hcseriald.c | 1 - usr.sbin/bluetooth/l2control/l2cap.c | 1 - usr.sbin/bluetooth/l2control/l2control.c | 1 - usr.sbin/bluetooth/l2control/l2control.h | 1 - usr.sbin/bluetooth/l2ping/l2ping.c | 1 - usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c | 1 - usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c | 1 - usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h | 1 - usr.sbin/bluetooth/sdpcontrol/search.c | 1 - usr.sbin/bluetooth/sdpd/bgd.c | 1 - usr.sbin/bluetooth/sdpd/dun.c | 1 - usr.sbin/bluetooth/sdpd/ftrn.c | 1 - usr.sbin/bluetooth/sdpd/gn.c | 1 - usr.sbin/bluetooth/sdpd/irmc.c | 1 - usr.sbin/bluetooth/sdpd/irmc_command.c | 1 - usr.sbin/bluetooth/sdpd/lan.c | 1 - usr.sbin/bluetooth/sdpd/log.c | 1 - usr.sbin/bluetooth/sdpd/log.h | 1 - usr.sbin/bluetooth/sdpd/main.c | 1 - usr.sbin/bluetooth/sdpd/nap.c | 1 - usr.sbin/bluetooth/sdpd/opush.c | 1 - usr.sbin/bluetooth/sdpd/panu.c | 1 - usr.sbin/bluetooth/sdpd/profile.c | 1 - usr.sbin/bluetooth/sdpd/profile.h | 1 - usr.sbin/bluetooth/sdpd/provider.c | 1 - usr.sbin/bluetooth/sdpd/provider.h | 1 - usr.sbin/bluetooth/sdpd/sar.c | 1 - usr.sbin/bluetooth/sdpd/scr.c | 1 - usr.sbin/bluetooth/sdpd/sd.c | 1 - usr.sbin/bluetooth/sdpd/server.c | 1 - usr.sbin/bluetooth/sdpd/server.h | 1 - usr.sbin/bluetooth/sdpd/sp.c | 1 - usr.sbin/bluetooth/sdpd/srr.c | 1 - usr.sbin/bluetooth/sdpd/ssar.c | 1 - usr.sbin/bluetooth/sdpd/ssr.c | 1 - usr.sbin/bluetooth/sdpd/sur.c | 1 - usr.sbin/bluetooth/sdpd/uuid-private.h | 1 - usr.sbin/bluetooth/sdpd/uuid.c | 1 - usr.sbin/config/config.h | 1 - usr.sbin/config/config.y | 1 - usr.sbin/config/lang.l | 1 - usr.sbin/cron/cron/compat.h | 1 - usr.sbin/cron/cron/pathnames.h | 1 - usr.sbin/dconschat/dconschat.c | 1 - usr.sbin/edquota/pathnames.h | 1 - usr.sbin/fifolog/lib/getdate.y | 1 - usr.sbin/fmtree/extern.h | 1 - usr.sbin/fmtree/mtree.h | 1 - usr.sbin/fstyp/hammer_disk.h | 1 - usr.sbin/fwcontrol/fwmpegts.c | 1 - usr.sbin/inetd/pathnames.h | 1 - usr.sbin/keyserv/keyserv.h | 1 - usr.sbin/lpr/chkprintcap/skimprintcap.h | 1 - usr.sbin/lpr/common_source/ctlinfo.h | 1 - usr.sbin/lpr/common_source/lp.cdefs.h | 1 - usr.sbin/lpr/common_source/lp.h | 1 - usr.sbin/lpr/common_source/lp.local.h | 1 - usr.sbin/lpr/common_source/matchjobs.h | 1 - usr.sbin/lpr/lpd/extern.h | 1 - usr.sbin/makefs/ffs/ffs_extern.h | 1 - usr.sbin/makefs/ffs/ufs_inode.h | 1 - usr.sbin/mountd/pathnames.h | 1 - usr.sbin/newsyslog/extern.h | 1 - usr.sbin/ntp/libntpevent/event2/event-config.h | 1 - usr.sbin/rpc.ypupdated/ypupdated_extern.h | 1 - usr.sbin/rpcbind/rpcb_stat.c | 1 - usr.sbin/rpcbind/rpcb_svc_4.c | 1 - usr.sbin/rpcbind/util.c | 1 - usr.sbin/rpcbind/warmstart.c | 1 - usr.sbin/syslogd/pathnames.h | 1 - usr.sbin/wpa/wpa_supplicant/ntddndis.h | 1 - usr.sbin/ypbind/yp_ping.h | 1 - 469 files changed, 469 deletions(-) diff --git a/bin/cp/extern.h b/bin/cp/extern.h index 65360ccaf6c1..314cfc086ecb 100644 --- a/bin/cp/extern.h +++ b/bin/cp/extern.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/1/94 - * $FreeBSD$ */ typedef struct { diff --git a/bin/dd/dd.h b/bin/dd/dd.h index ea606f288f3f..ce00412073e3 100644 --- a/bin/dd/dd.h +++ b/bin/dd/dd.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)dd.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD$ */ /* Input/output stream state. */ diff --git a/bin/dd/extern.h b/bin/dd/extern.h index 07c08e2ef8f2..784792ead650 100644 --- a/bin/dd/extern.h +++ b/bin/dd/extern.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD$ */ void block(void); diff --git a/bin/ed/ed.h b/bin/ed/ed.h index 4dcf5eb36f37..e4562be8d331 100644 --- a/bin/ed/ed.h +++ b/bin/ed/ed.h @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp - * $FreeBSD$ */ #include diff --git a/bin/ls/extern.h b/bin/ls/extern.h index 0e577a885474..c3a4eafc353d 100644 --- a/bin/ls/extern.h +++ b/bin/ls/extern.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ #include diff --git a/bin/ls/ls.h b/bin/ls/ls.h index 410246ec9903..6d2b1011ad7a 100644 --- a/bin/ls/ls.h +++ b/bin/ls/ls.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ #define NO_PRINT 1 diff --git a/bin/pax/cache.h b/bin/pax/cache.h index 8a7cca9f457a..d2045f51516a 100644 --- a/bin/pax/cache.h +++ b/bin/pax/cache.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)cache.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ /* diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h index e5d61dea36fb..a5976d9b7a63 100644 --- a/bin/pax/cpio.h +++ b/bin/pax/cpio.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)cpio.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ /* diff --git a/bin/pax/extern.h b/bin/pax/extern.h index 12b7fe162a6e..44d0ab0b40fb 100644 --- a/bin/pax/extern.h +++ b/bin/pax/extern.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD$ */ /* diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h index 8e0a710e4ca9..39d08afad0a3 100644 --- a/bin/pax/ftree.h +++ b/bin/pax/ftree.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)ftree.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ /* diff --git a/bin/pax/options.h b/bin/pax/options.h index 973ea0bd5467..637fd4049974 100644 --- a/bin/pax/options.h +++ b/bin/pax/options.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)options.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD$ */ /* diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h index e28064e6a08e..897d50a1a325 100644 --- a/bin/pax/pat_rep.h +++ b/bin/pax/pat_rep.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)pat_rep.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ /* diff --git a/bin/pax/pax.h b/bin/pax/pax.h index 530f8aa0d33d..d48a267fbca1 100644 --- a/bin/pax/pax.h +++ b/bin/pax/pax.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)pax.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD$ */ /* diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h index a628e6981b1a..e2ffae52a50a 100644 --- a/bin/pax/sel_subs.h +++ b/bin/pax/sel_subs.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)sel_subs.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ /* diff --git a/bin/pax/tables.h b/bin/pax/tables.h index fb5bc437b0a0..eaa48066f70d 100644 --- a/bin/pax/tables.h +++ b/bin/pax/tables.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)tables.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ /* diff --git a/bin/pax/tar.h b/bin/pax/tar.h index 91c2400e35ca..0b95bddc1fee 100644 --- a/bin/pax/tar.h +++ b/bin/pax/tar.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)tar.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD$ */ /* diff --git a/bin/ps/extern.h b/bin/ps/extern.h index ea4362eeadd9..6b07a79fbc20 100644 --- a/bin/ps/extern.h +++ b/bin/ps/extern.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD$ */ struct kinfo; diff --git a/bin/ps/ps.h b/bin/ps/ps.h index 03e38af9d517..429dff632872 100644 --- a/bin/ps/ps.h +++ b/bin/ps/ps.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)ps.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ #include diff --git a/bin/sh/alias.h b/bin/sh/alias.h index 92de705bc963..0c6ea99e8b60 100644 --- a/bin/sh/alias.h +++ b/bin/sh/alias.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)alias.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #define ALIASINUSE 1 diff --git a/bin/sh/arith.h b/bin/sh/arith.h index 569d0c58651f..124fd5944a56 100644 --- a/bin/sh/arith.h +++ b/bin/sh/arith.h @@ -27,7 +27,6 @@ * SUCH DAMAGE. * * @(#)arith.h 1.1 (Berkeley) 5/4/95 - * $FreeBSD$ */ #include "shell.h" diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h index 8149895815dd..226d630694b5 100644 --- a/bin/sh/bltin/bltin.h +++ b/bin/sh/bltin/bltin.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)bltin.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* diff --git a/bin/sh/error.h b/bin/sh/error.h index 3a79dec81b9d..c097c529dc01 100644 --- a/bin/sh/error.h +++ b/bin/sh/error.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)error.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* diff --git a/bin/sh/eval.h b/bin/sh/eval.h index d8a12eb79c7f..361e0f2ba269 100644 --- a/bin/sh/eval.h +++ b/bin/sh/eval.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)eval.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ extern char *commandname; /* currently executing command */ diff --git a/bin/sh/exec.h b/bin/sh/exec.h index 03e7e6ab0b0c..04d1b97d7386 100644 --- a/bin/sh/exec.h +++ b/bin/sh/exec.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)exec.h 8.3 (Berkeley) 6/8/95 - * $FreeBSD$ */ /* values of cmdtype */ diff --git a/bin/sh/expand.h b/bin/sh/expand.h index a60ea29514d2..2cf6d2ee0972 100644 --- a/bin/sh/expand.h +++ b/bin/sh/expand.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)expand.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ struct arglist { diff --git a/bin/sh/input.h b/bin/sh/input.h index 71046b9731c3..a5accca7504b 100644 --- a/bin/sh/input.h +++ b/bin/sh/input.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)input.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* PEOF (the end of file marker) is defined in syntax.h */ diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h index 411d08f27a67..050c86a91ff8 100644 --- a/bin/sh/jobs.h +++ b/bin/sh/jobs.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)jobs.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */ diff --git a/bin/sh/mail.h b/bin/sh/mail.h index 0bb565209c7f..0a52e9f198a1 100644 --- a/bin/sh/mail.h +++ b/bin/sh/mail.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)mail.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ void chkmail(int); diff --git a/bin/sh/main.h b/bin/sh/main.h index ff0a1c61fa22..2e144e3c92f0 100644 --- a/bin/sh/main.h +++ b/bin/sh/main.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)main.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ extern int rootpid; /* pid of main shell */ diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h index 6cb7bd818fb5..038d18173c7b 100644 --- a/bin/sh/memalloc.h +++ b/bin/sh/memalloc.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)memalloc.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #include diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h index 1f513f0ae206..ef84a90bf5b0 100644 --- a/bin/sh/myhistedit.h +++ b/bin/sh/myhistedit.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)myhistedit.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #include diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h index ff4384d21c35..dcbdc91cb5d5 100644 --- a/bin/sh/mystring.h +++ b/bin/sh/mystring.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)mystring.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #include diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat index 43fa515fe905..9172c544de3d 100644 --- a/bin/sh/nodes.c.pat +++ b/bin/sh/nodes.c.pat @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)nodes.c.pat 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #include diff --git a/bin/sh/options.h b/bin/sh/options.h index 500d4ad5a903..811b395c1c5f 100644 --- a/bin/sh/options.h +++ b/bin/sh/options.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)options.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ struct shparam { diff --git a/bin/sh/output.h b/bin/sh/output.h index 62f006d32a36..409cc16df75e 100644 --- a/bin/sh/output.h +++ b/bin/sh/output.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)output.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #ifndef OUTPUT_INCL diff --git a/bin/sh/parser.h b/bin/sh/parser.h index aee8244ecf09..5f5249866b0a 100644 --- a/bin/sh/parser.h +++ b/bin/sh/parser.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)parser.h 8.3 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* control characters in argument strings */ diff --git a/bin/sh/redir.h b/bin/sh/redir.h index 08c52359c59e..f49d0ddc9a73 100644 --- a/bin/sh/redir.h +++ b/bin/sh/redir.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)redir.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* flags passed to redirect */ diff --git a/bin/sh/shell.h b/bin/sh/shell.h index 536efe6ce228..64a2be86b4f7 100644 --- a/bin/sh/shell.h +++ b/bin/sh/shell.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)shell.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #ifndef SHELL_H_ diff --git a/bin/sh/show.h b/bin/sh/show.h index 790a62e2942c..9dc77c6857d6 100644 --- a/bin/sh/show.h +++ b/bin/sh/show.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)show.h 1.1 (Berkeley) 5/4/95 - * $FreeBSD$ */ void showtree(union node *); diff --git a/bin/sh/trap.h b/bin/sh/trap.h index fdc4b7a9683a..f7985e8e70a1 100644 --- a/bin/sh/trap.h +++ b/bin/sh/trap.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)trap.h 8.3 (Berkeley) 6/5/95 - * $FreeBSD$ */ extern volatile sig_atomic_t pendingsig; diff --git a/bin/sh/var.h b/bin/sh/var.h index eaf4f427f63b..abd2a47c1979 100644 --- a/bin/sh/var.h +++ b/bin/sh/var.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)var.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* diff --git a/bin/stty/extern.h b/bin/stty/extern.h index 88b58890f7d1..40aa92c35de1 100644 --- a/bin/stty/extern.h +++ b/bin/stty/extern.h @@ -27,7 +27,6 @@ * SUCH DAMAGE. *** 4935 LINES SKIPPED *** From nobody Wed Aug 23 17: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 4RWDHk0n9pz4r9RH; Wed, 23 Aug 2023 17: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 4RWDHj70Qrz4Ssn; Wed, 23 Aug 2023 17:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hb4STz89b9XyUgTtX8omGSfa6H6I/3VJC8zwTPqP/LE=; b=OmYIiGaUWhhKUaHKPSA/A8a7aD+BLFR9vddK6R2g5Ux9C+XUxxklpC7l7KNdQUC95R0rvq QcUSI6cnRR0i5xDpPj+Xr3866RIIIUze6eSRHyudGYkPZF9RWskzx9vsJZkwOst4t3C1xS VQgjavggJTaAHs+Pbs81d+Qtgg54/6s4uFGwwsBKo5cdR3O9g19h92sPGar1BMKb0hPSyq 9e95YdjCptDonAdZF7uCZckeYrAD4FAtXgvFtkq/A/bwOTlmySSbVLo+MFmJX1B7RLNY2v 8fN6OSzW3ZcigoiRPPezTP3xaGasU5NgLcZFsoXzJjy+RIM1Hzv3MqdJEagpBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hb4STz89b9XyUgTtX8omGSfa6H6I/3VJC8zwTPqP/LE=; b=bOGc0vM0fO8QTKYRPVEntTdi93cBvlZGOtQzArVM4zdXueVxvQFFTNvSHbm97oj9rQOI+V xz2WBbQVltZNu4x9VyaaG/mlYtRtS6sh4TTOaeC8CR/J9kTwEeq6O2OxYOZX+U/cL5jfxW 84E0wtIl/KW/JnzT/IoLI9NvhU8GKCtrbuQVQ3boUmWRG1zCLX2FZl1jVAsDy7PdZxR0yU PSUnpcASA9/Q3dUOH17DWTS3RnIc2RVRyerF9KdVG+NzEy5eSWFHD58g2vy1caJzU85CzC kWLXSmyj91DVLH0ipVNZCjjuQ8wBFtmWuvcpiuTvokXmKChhpdB9amb76tlsmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812978; a=rsa-sha256; cv=none; b=EFWNLT8roajyicmTMlb2jPHt1TSvYyLY4eQqr97mJrcgGDOaF2iRLfLsU8RKf0hKfKrSpo ffVg04+QWkWF9lOd91bUHWnfICAs0CQbSYarrvqCiYJy/m5iNjdcajkbXFzIx5fUsC+S8k u7krb1eUaFxiHvd41vTV6KmEysV+2VV4ZvFDogSBu1raBCQQZhf3uzoiwy8QI3pBiYZ7vK bDqP3u7OuJ40QluTy73G1EwjXlcGeMBjXbQwTXbw433W94WfBocBiozMpzuvhm/1y1Oy0/ w3sL7LCwpJSNmV2OVv45fW3REWsuyzuIkrjNiAEQDEUpg+KLEvrEot6YDV02/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHj64RDztxN; Wed, 23 Aug 2023 17:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnbIk040695; Wed, 23 Aug 2023 17:49:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnbi9040689; Wed, 23 Aug 2023 17:49:37 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:37 GMT Message-Id: <202308231749.37NHnbi9040689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 4fbf14e22d7b - stable/13 - sys: Remove $FreeBSD$: one-line .c comment pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4fbf14e22d7b83de7080a8e491ba14a5785a0ff4 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4fbf14e22d7b83de7080a8e491ba14a5785a0ff4 commit 4fbf14e22d7b83de7080a8e491ba14a5785a0ff4 Author: Warner Losh AuthorDate: 2023-08-22 01:31:15 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:22 +0000 sys: Remove $FreeBSD$: one-line .c comment pattern Remove /^/[*/]\s*\$FreeBSD\$.*\n/ Similar commit in current: (cherry picked from commit 71625ec9ad2a) --- sys/amd64/include/_align.h | 1 - sys/amd64/include/_inttypes.h | 1 - sys/amd64/include/_limits.h | 1 - sys/amd64/include/_stdint.h | 1 - sys/amd64/include/_types.h | 1 - sys/amd64/include/acpica_machdep.h | 1 - sys/amd64/include/apm_bios.h | 1 - sys/amd64/include/bus.h | 1 - sys/amd64/include/cputypes.h | 1 - sys/amd64/include/dump.h | 1 - sys/amd64/include/elf.h | 1 - sys/amd64/include/endian.h | 1 - sys/amd64/include/fdt.h | 1 - sys/amd64/include/float.h | 1 - sys/amd64/include/iommu.h | 1 - sys/amd64/include/metadata.h | 1 - sys/amd64/include/npx.h | 1 - sys/amd64/include/ofw_machdep.h | 1 - sys/amd64/include/pci_cfgreg.h | 1 - sys/amd64/include/procctl.h | 1 - sys/amd64/include/psl.h | 1 - sys/amd64/include/ptrace.h | 1 - sys/amd64/include/pvclock.h | 1 - sys/amd64/include/reg.h | 1 - sys/amd64/include/resource.h | 1 - sys/amd64/include/setjmp.h | 1 - sys/amd64/include/sigframe.h | 1 - sys/amd64/include/signal.h | 1 - sys/amd64/include/specialreg.h | 1 - sys/amd64/include/stack.h | 1 - sys/amd64/include/stdarg.h | 1 - sys/amd64/include/sysarch.h | 1 - sys/amd64/include/trap.h | 1 - sys/amd64/include/ucontext.h | 1 - sys/amd64/include/vdso.h | 1 - sys/amd64/include/xen/xen-os.h | 1 - sys/amd64/linux32/linux32_locore.asm | 1 - sys/arm/include/cpu.h | 1 - sys/arm/include/ieeefp.h | 1 - sys/arm/include/machdep.h | 1 - sys/arm/include/procctl.h | 1 - sys/arm/include/ptrace.h | 1 - sys/arm/include/reg.h | 1 - sys/arm/include/setjmp.h | 1 - sys/arm/include/sigframe.h | 1 - sys/arm/include/smp.h | 1 - sys/arm/include/swi.h | 1 - sys/arm/include/sysarch.h | 1 - sys/arm/include/trap.h | 1 - sys/arm64/include/bus_dma.h | 1 - sys/arm64/include/clock.h | 1 - sys/arm64/include/exec.h | 1 - sys/arm64/include/floatingpoint.h | 1 - sys/arm64/include/iommu.h | 1 - sys/arm64/include/procctl.h | 1 - sys/arm64/include/psl.h | 1 - sys/arm64/include/ptrace.h | 1 - sys/arm64/include/reloc.h | 1 - sys/arm64/include/sigframe.h | 1 - sys/arm64/include/trap.h | 1 - sys/cam/README.quirks | 1 - sys/cam/ctl/README.ctl.txt | 1 - sys/cam/scsi/scsi_ch.h | 1 - sys/cam/scsi/scsi_enc.h | 1 - sys/cam/scsi/scsi_ses.h | 1 - sys/cddl/dev/dtrace/dtrace_hacks.c | 1 - sys/compat/linux/linux_errno.c | 1 - sys/compat/linuxkpi/common/include/linux/usb.h | 1 - sys/compat/linuxkpi/common/src/linux_usb.c | 1 - sys/conf/ldscript.amd64 | 1 - sys/conf/ldscript.arm | 1 - sys/conf/ldscript.arm64 | 1 - sys/conf/ldscript.i386 | 1 - sys/conf/ldscript.mips.octeon1 | 1 - sys/conf/ldscript.powerpc | 1 - sys/conf/ldscript.powerpc64 | 1 - sys/conf/ldscript.powerpc64le | 1 - sys/conf/ldscript.powerpcspe | 1 - sys/conf/ldscript.riscv | 1 - sys/crypto/armv8/stdint.h | 1 - sys/crypto/blake2/blake2_kfreebsd.h | 1 - sys/crypto/blake2/blake2b-avx.c | 1 - sys/crypto/blake2/blake2b-sse2.c | 1 - sys/crypto/blake2/blake2b-sse41.c | 1 - sys/crypto/blake2/blake2b-ssse3.c | 1 - sys/crypto/blake2/blake2b-xop.c | 1 - sys/crypto/blake2/blake2s-avx.c | 1 - sys/crypto/blake2/blake2s-sse2.c | 1 - sys/crypto/blake2/blake2s-sse41.c | 1 - sys/crypto/blake2/blake2s-ssse3.c | 1 - sys/crypto/blake2/blake2s-xop.c | 1 - sys/crypto/blake2/config.h | 1 - sys/crypto/blake2/stddef.h | 1 - sys/crypto/blake2/stdint.h | 1 - sys/crypto/blake2/stdio.h | 1 - sys/crypto/blake2/stdlib.h | 1 - sys/crypto/blake2/string.h | 1 - sys/crypto/chacha20/_chacha.h | 1 - sys/crypto/des/arch/i386/des_enc.S | 1 - sys/crypto/des/des.h | 1 - sys/crypto/des/des_locl.h | 1 - sys/crypto/des/podd.h | 1 - sys/crypto/des/sk.h | 1 - sys/crypto/des/spr.h | 1 - sys/crypto/libsodium/limits.h | 1 - sys/crypto/libsodium/stddef.h | 1 - sys/crypto/libsodium/stdint.h | 1 - sys/crypto/libsodium/stdio.h | 1 - sys/crypto/libsodium/stdlib.h | 1 - sys/crypto/libsodium/string.h | 1 - sys/crypto/openssl/aarch64/aesv8-armx.S | 1 - sys/crypto/openssl/aarch64/arm64cpuid.S | 1 - sys/crypto/openssl/aarch64/armv8-mont.S | 1 - sys/crypto/openssl/aarch64/chacha-armv8.S | 1 - sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S | 1 - sys/crypto/openssl/aarch64/ghashv8-armx.S | 1 - sys/crypto/openssl/aarch64/keccak1600-armv8.S | 1 - sys/crypto/openssl/aarch64/poly1305-armv8.S | 1 - sys/crypto/openssl/aarch64/sha1-armv8.S | 1 - sys/crypto/openssl/aarch64/sha256-armv8.S | 1 - sys/crypto/openssl/aarch64/sha512-armv8.S | 1 - sys/crypto/openssl/aarch64/vpaes-armv8.S | 1 - sys/crypto/openssl/amd64/aesni-gcm-x86_64.S | 1 - sys/crypto/openssl/amd64/aesni-mb-x86_64.S | 1 - sys/crypto/openssl/amd64/aesni-sha1-x86_64.S | 1 - sys/crypto/openssl/amd64/aesni-sha256-x86_64.S | 1 - sys/crypto/openssl/amd64/aesni-x86_64.S | 1 - sys/crypto/openssl/amd64/chacha-x86_64.S | 1 - sys/crypto/openssl/amd64/cmll-x86_64.S | 1 - sys/crypto/openssl/amd64/e_padlock-x86_64.S | 1 - sys/crypto/openssl/amd64/ecp_nistz256-x86_64.S | 1 - sys/crypto/openssl/amd64/ghash-x86_64.S | 1 - sys/crypto/openssl/amd64/keccak1600-x86_64.S | 1 - sys/crypto/openssl/amd64/md5-x86_64.S | 1 - sys/crypto/openssl/amd64/poly1305-x86_64.S | 1 - sys/crypto/openssl/amd64/rc4-md5-x86_64.S | 1 - sys/crypto/openssl/amd64/rc4-x86_64.S | 1 - sys/crypto/openssl/amd64/rsaz-avx2.S | 1 - sys/crypto/openssl/amd64/rsaz-x86_64.S | 1 - sys/crypto/openssl/amd64/sha1-mb-x86_64.S | 1 - sys/crypto/openssl/amd64/sha1-x86_64.S | 1 - sys/crypto/openssl/amd64/sha256-mb-x86_64.S | 1 - sys/crypto/openssl/amd64/sha256-x86_64.S | 1 - sys/crypto/openssl/amd64/sha512-x86_64.S | 1 - sys/crypto/openssl/amd64/vpaes-x86_64.S | 1 - sys/crypto/openssl/amd64/wp-x86_64.S | 1 - sys/crypto/openssl/amd64/x25519-x86_64.S | 1 - sys/crypto/openssl/amd64/x86_64-gf2m.S | 1 - sys/crypto/openssl/amd64/x86_64-mont.S | 1 - sys/crypto/openssl/amd64/x86_64-mont5.S | 1 - sys/crypto/openssl/amd64/x86_64cpuid.S | 1 - sys/crypto/openssl/arm/aes-armv4.S | 1 - sys/crypto/openssl/arm/aesv8-armx.S | 1 - sys/crypto/openssl/arm/armv4-gf2m.S | 1 - sys/crypto/openssl/arm/armv4-mont.S | 1 - sys/crypto/openssl/arm/armv4cpuid.S | 1 - sys/crypto/openssl/arm/bsaes-armv7.S | 1 - sys/crypto/openssl/arm/chacha-armv4.S | 1 - sys/crypto/openssl/arm/ecp_nistz256-armv4.S | 1 - sys/crypto/openssl/arm/ghash-armv4.S | 1 - sys/crypto/openssl/arm/ghashv8-armx.S | 1 - sys/crypto/openssl/arm/keccak1600-armv4.S | 1 - sys/crypto/openssl/arm/poly1305-armv4.S | 1 - sys/crypto/openssl/arm/sha1-armv4-large.S | 1 - sys/crypto/openssl/arm/sha256-armv4.S | 1 - sys/crypto/openssl/arm/sha512-armv4.S | 1 - sys/crypto/openssl/i386/aesni-x86.S | 1 - sys/crypto/openssl/i386/bf-586.S | 1 - sys/crypto/openssl/i386/bn-586.S | 1 - sys/crypto/openssl/i386/cast-586.S | 1 - sys/crypto/openssl/i386/chacha-x86.S | 1 - sys/crypto/openssl/i386/cmll-x86.S | 1 - sys/crypto/openssl/i386/co-586.S | 1 - sys/crypto/openssl/i386/crypt586.S | 1 - sys/crypto/openssl/i386/des-586.S | 1 - sys/crypto/openssl/i386/e_padlock-x86.S | 1 - sys/crypto/openssl/i386/ecp_nistz256-x86.S | 1 - sys/crypto/openssl/i386/ghash-x86.S | 1 - sys/crypto/openssl/i386/md5-586.S | 1 - sys/crypto/openssl/i386/poly1305-x86.S | 1 - sys/crypto/openssl/i386/rc4-586.S | 1 - sys/crypto/openssl/i386/rc5-586.S | 1 - sys/crypto/openssl/i386/rmd-586.S | 1 - sys/crypto/openssl/i386/sha1-586.S | 1 - sys/crypto/openssl/i386/sha256-586.S | 1 - sys/crypto/openssl/i386/sha512-586.S | 1 - sys/crypto/openssl/i386/vpaes-x86.S | 1 - sys/crypto/openssl/i386/wp-mmx.S | 1 - sys/crypto/openssl/i386/x86-gf2m.S | 1 - sys/crypto/openssl/i386/x86-mont.S | 1 - sys/crypto/openssl/i386/x86cpuid.S | 1 - sys/crypto/openssl/powerpc/aes-ppc.S | 1 - sys/crypto/openssl/powerpc/aesp8-ppc.S | 1 - sys/crypto/openssl/powerpc/chacha-ppc.S | 1 - sys/crypto/openssl/powerpc/ghashp8-ppc.S | 1 - sys/crypto/openssl/powerpc/poly1305-ppc.S | 1 - sys/crypto/openssl/powerpc/poly1305-ppcfp.S | 1 - sys/crypto/openssl/powerpc/ppc-mont.S | 1 - sys/crypto/openssl/powerpc/ppc.S | 1 - sys/crypto/openssl/powerpc/ppccpuid.S | 1 - sys/crypto/openssl/powerpc/sha1-ppc.S | 1 - sys/crypto/openssl/powerpc/sha256-ppc.S | 1 - sys/crypto/openssl/powerpc/sha256p8-ppc.S | 1 - sys/crypto/openssl/powerpc/sha512-ppc.S | 1 - sys/crypto/openssl/powerpc/sha512p8-ppc.S | 1 - sys/crypto/openssl/powerpc/vpaes-ppc.S | 1 - sys/crypto/openssl/powerpc64/aes-ppc.S | 1 - sys/crypto/openssl/powerpc64/aesp8-ppc.S | 1 - sys/crypto/openssl/powerpc64/chacha-ppc.S | 1 - sys/crypto/openssl/powerpc64/ecp_nistz256-ppc64.S | 1 - sys/crypto/openssl/powerpc64/ghashp8-ppc.S | 1 - sys/crypto/openssl/powerpc64/keccak1600-ppc64.S | 1 - sys/crypto/openssl/powerpc64/poly1305-ppc.S | 1 - sys/crypto/openssl/powerpc64/poly1305-ppcfp.S | 1 - sys/crypto/openssl/powerpc64/ppc-mont.S | 1 - sys/crypto/openssl/powerpc64/ppc.S | 1 - sys/crypto/openssl/powerpc64/ppccpuid.S | 1 - sys/crypto/openssl/powerpc64/sha1-ppc.S | 1 - sys/crypto/openssl/powerpc64/sha256-ppc.S | 1 - sys/crypto/openssl/powerpc64/sha256p8-ppc.S | 1 - sys/crypto/openssl/powerpc64/sha512-ppc.S | 1 - sys/crypto/openssl/powerpc64/sha512p8-ppc.S | 1 - sys/crypto/openssl/powerpc64/vpaes-ppc.S | 1 - sys/crypto/openssl/powerpc64/x25519-ppc64.S | 1 - sys/crypto/openssl/powerpc64le/aes-ppc.S | 1 - sys/crypto/openssl/powerpc64le/aesp8-ppc.S | 1 - sys/crypto/openssl/powerpc64le/chacha-ppc.S | 1 - sys/crypto/openssl/powerpc64le/ecp_nistz256-ppc64.S | 1 - sys/crypto/openssl/powerpc64le/ghashp8-ppc.S | 1 - sys/crypto/openssl/powerpc64le/keccak1600-ppc64.S | 1 - sys/crypto/openssl/powerpc64le/poly1305-ppc.S | 1 - sys/crypto/openssl/powerpc64le/poly1305-ppcfp.S | 1 - sys/crypto/openssl/powerpc64le/ppc-mont.S | 1 - sys/crypto/openssl/powerpc64le/ppc.S | 1 - sys/crypto/openssl/powerpc64le/ppccpuid.S | 1 - sys/crypto/openssl/powerpc64le/sha1-ppc.S | 1 - sys/crypto/openssl/powerpc64le/sha256-ppc.S | 1 - sys/crypto/openssl/powerpc64le/sha256p8-ppc.S | 1 - sys/crypto/openssl/powerpc64le/sha512-ppc.S | 1 - sys/crypto/openssl/powerpc64le/sha512p8-ppc.S | 1 - sys/crypto/openssl/powerpc64le/vpaes-ppc.S | 1 - sys/crypto/openssl/powerpc64le/x25519-ppc64.S | 1 - sys/crypto/rijndael/rijndael-api-fst.h | 1 - sys/crypto/rijndael/rijndael.h | 1 - sys/crypto/rijndael/rijndael_local.h | 1 - sys/crypto/sha1.h | 1 - sys/crypto/skein/skein.h | 1 - sys/crypto/skein/skein_iv.h | 1 - sys/crypto/skein/skein_port.h | 1 - sys/dev/bfe/if_bfereg.h | 1 - sys/dev/bhnd/bhnd_debug.h | 1 - sys/dev/drm2/drm_global.h | 1 - sys/dev/drm2/ttm/ttm_bo_api.h | 1 - sys/dev/drm2/ttm/ttm_bo_driver.h | 1 - sys/dev/drm2/ttm/ttm_execbuf_util.h | 1 - sys/dev/drm2/ttm/ttm_lock.h | 1 - sys/dev/drm2/ttm/ttm_memory.h | 1 - sys/dev/drm2/ttm/ttm_module.h | 1 - sys/dev/drm2/ttm/ttm_object.h | 1 - sys/dev/drm2/ttm/ttm_page_alloc.h | 1 - sys/dev/drm2/ttm/ttm_placement.h | 1 - sys/dev/e1000/e1000_80003es2lan.c | 1 - sys/dev/e1000/e1000_80003es2lan.h | 1 - sys/dev/e1000/e1000_82540.c | 1 - sys/dev/e1000/e1000_82541.c | 1 - sys/dev/e1000/e1000_82541.h | 1 - sys/dev/e1000/e1000_82542.c | 1 - sys/dev/e1000/e1000_82543.c | 1 - sys/dev/e1000/e1000_82543.h | 1 - sys/dev/e1000/e1000_82571.c | 1 - sys/dev/e1000/e1000_82571.h | 1 - sys/dev/e1000/e1000_82575.c | 1 - sys/dev/e1000/e1000_82575.h | 1 - sys/dev/e1000/e1000_api.c | 1 - sys/dev/e1000/e1000_api.h | 1 - sys/dev/e1000/e1000_base.c | 1 - sys/dev/e1000/e1000_base.h | 1 - sys/dev/e1000/e1000_defines.h | 1 - sys/dev/e1000/e1000_hw.h | 1 - sys/dev/e1000/e1000_i210.c | 1 - sys/dev/e1000/e1000_i210.h | 1 - sys/dev/e1000/e1000_ich8lan.c | 1 - sys/dev/e1000/e1000_ich8lan.h | 1 - sys/dev/e1000/e1000_mac.c | 1 - sys/dev/e1000/e1000_mac.h | 1 - sys/dev/e1000/e1000_manage.c | 1 - sys/dev/e1000/e1000_manage.h | 1 - sys/dev/e1000/e1000_mbx.c | 1 - sys/dev/e1000/e1000_mbx.h | 1 - sys/dev/e1000/e1000_nvm.c | 1 - sys/dev/e1000/e1000_nvm.h | 1 - sys/dev/e1000/e1000_osdep.c | 1 - sys/dev/e1000/e1000_osdep.h | 1 - sys/dev/e1000/e1000_phy.c | 1 - sys/dev/e1000/e1000_phy.h | 1 - sys/dev/e1000/e1000_regs.h | 1 - sys/dev/e1000/e1000_vf.c | 1 - sys/dev/e1000/e1000_vf.h | 1 - sys/dev/e1000/em_txrx.c | 1 - sys/dev/e1000/if_em.c | 1 - sys/dev/e1000/if_em.h | 1 - sys/dev/e1000/igb_txrx.c | 1 - sys/dev/esp/am53c974reg.h | 1 - sys/dev/esp/ncr53c9xreg.h | 1 - sys/dev/esp/ncr53c9xvar.h | 1 - sys/dev/exca/excareg.h | 1 - sys/dev/exca/excavar.h | 1 - sys/dev/hid/hid.c | 1 - sys/dev/hid/hid.h | 1 - sys/dev/hid/hidquirk.c | 1 - sys/dev/hid/hidquirk.h | 1 - sys/dev/hifn/hifn7751reg.h | 1 - sys/dev/hifn/hifn7751var.h | 1 - sys/dev/iavf/iavf_adminq.c | 1 - sys/dev/iavf/iavf_adminq.h | 1 - sys/dev/iavf/iavf_adminq_cmd.h | 1 - sys/dev/iavf/iavf_alloc.h | 1 - sys/dev/iavf/iavf_common.c | 1 - sys/dev/iavf/iavf_debug.h | 1 - sys/dev/iavf/iavf_devids.h | 1 - sys/dev/iavf/iavf_drv_info.h | 1 - sys/dev/iavf/iavf_iflib.h | 1 - sys/dev/iavf/iavf_lib.c | 1 - sys/dev/iavf/iavf_lib.h | 1 - sys/dev/iavf/iavf_opts.h | 1 - sys/dev/iavf/iavf_osdep.c | 1 - sys/dev/iavf/iavf_osdep.h | 1 - sys/dev/iavf/iavf_prototype.h | 1 - sys/dev/iavf/iavf_register.h | 1 - sys/dev/iavf/iavf_status.h | 1 - sys/dev/iavf/iavf_sysctls_common.h | 1 - sys/dev/iavf/iavf_sysctls_iflib.h | 1 - sys/dev/iavf/iavf_txrx_common.h | 1 - sys/dev/iavf/iavf_txrx_iflib.c | 1 - sys/dev/iavf/iavf_type.h | 1 - sys/dev/iavf/iavf_vc_common.c | 1 - sys/dev/iavf/iavf_vc_common.h | 1 - sys/dev/iavf/iavf_vc_iflib.c | 1 - sys/dev/iavf/if_iavf_iflib.c | 1 - sys/dev/iavf/virtchnl.h | 1 - sys/dev/ice/ice_adminq_cmd.h | 1 - sys/dev/ice/ice_alloc.h | 1 - sys/dev/ice/ice_bitops.h | 1 - sys/dev/ice/ice_common.c | 1 - sys/dev/ice/ice_common.h | 1 - sys/dev/ice/ice_common_sysctls.h | 1 - sys/dev/ice/ice_common_txrx.h | 1 - sys/dev/ice/ice_controlq.c | 1 - sys/dev/ice/ice_controlq.h | 1 - sys/dev/ice/ice_dcb.c | 1 - sys/dev/ice/ice_dcb.h | 1 - sys/dev/ice/ice_ddp_common.c | 1 - sys/dev/ice/ice_ddp_common.h | 1 - sys/dev/ice/ice_defs.h | 1 - sys/dev/ice/ice_devids.h | 1 - sys/dev/ice/ice_drv_info.h | 1 - sys/dev/ice/ice_features.h | 1 - sys/dev/ice/ice_flex_pipe.c | 1 - sys/dev/ice/ice_flex_pipe.h | 1 - sys/dev/ice/ice_flex_type.h | 1 - sys/dev/ice/ice_flow.c | 1 - sys/dev/ice/ice_flow.h | 1 - sys/dev/ice/ice_fw_logging.c | 1 - sys/dev/ice/ice_fwlog.c | 1 - sys/dev/ice/ice_fwlog.h | 1 - sys/dev/ice/ice_hw_autogen.h | 1 - sys/dev/ice/ice_iflib.h | 1 - sys/dev/ice/ice_iflib_recovery_txrx.c | 1 - sys/dev/ice/ice_iflib_sysctls.h | 1 - sys/dev/ice/ice_iflib_txrx.c | 1 - sys/dev/ice/ice_lan_tx_rx.h | 1 - sys/dev/ice/ice_lib.c | 1 - sys/dev/ice/ice_lib.h | 1 - sys/dev/ice/ice_nvm.c | 1 - sys/dev/ice/ice_nvm.h | 1 - sys/dev/ice/ice_opts.h | 1 - sys/dev/ice/ice_osdep.c | 1 - sys/dev/ice/ice_osdep.h | 1 - sys/dev/ice/ice_protocol_type.h | 1 - sys/dev/ice/ice_rdma.c | 1 - sys/dev/ice/ice_rdma.h | 1 - sys/dev/ice/ice_rdma_internal.h | 1 - sys/dev/ice/ice_resmgr.c | 1 - sys/dev/ice/ice_resmgr.h | 1 - sys/dev/ice/ice_rss.h | 1 - sys/dev/ice/ice_sbq_cmd.h | 1 - sys/dev/ice/ice_sched.c | 1 - sys/dev/ice/ice_sched.h | 1 - sys/dev/ice/ice_status.h | 1 - sys/dev/ice/ice_strings.c | 1 - sys/dev/ice/ice_switch.c | 1 - sys/dev/ice/ice_switch.h | 1 - sys/dev/ice/ice_type.h | 1 - sys/dev/ice/ice_vlan_mode.c | 1 - sys/dev/ice/ice_vlan_mode.h | 1 - sys/dev/ice/if_ice_iflib.c | 1 - sys/dev/ice/virtchnl.h | 1 - sys/dev/ice/virtchnl_inline_ipsec.h | 1 - sys/dev/iir/iir.h | 1 - sys/dev/ipw/if_ipwreg.h | 1 - sys/dev/ipw/if_ipwvar.h | 1 - sys/dev/irdma/fbsd_kcompat.c | 1 - sys/dev/irdma/fbsd_kcompat.h | 1 - sys/dev/irdma/ice_devids.h | 1 - sys/dev/irdma/icrdma.c | 1 - sys/dev/irdma/icrdma_hw.c | 1 - sys/dev/irdma/icrdma_hw.h | 1 - sys/dev/irdma/irdma-abi.h | 1 - sys/dev/irdma/irdma.h | 1 - sys/dev/irdma/irdma_cm.c | 1 - sys/dev/irdma/irdma_cm.h | 1 - sys/dev/irdma/irdma_ctrl.c | 1 - sys/dev/irdma/irdma_defs.h | 1 - sys/dev/irdma/irdma_hmc.c | 1 - sys/dev/irdma/irdma_hmc.h | 1 - sys/dev/irdma/irdma_hw.c | 1 - sys/dev/irdma/irdma_kcompat.c | 1 - sys/dev/irdma/irdma_main.h | 1 - sys/dev/irdma/irdma_pble.c | 1 - sys/dev/irdma/irdma_pble.h | 1 - sys/dev/irdma/irdma_protos.h | 1 - sys/dev/irdma/irdma_puda.c | 1 - sys/dev/irdma/irdma_puda.h | 1 - sys/dev/irdma/irdma_type.h | 1 - sys/dev/irdma/irdma_uda.c | 1 - sys/dev/irdma/irdma_uda.h | 1 - sys/dev/irdma/irdma_uda_d.h | 1 - sys/dev/irdma/irdma_uk.c | 1 - sys/dev/irdma/irdma_user.h | 1 - sys/dev/irdma/irdma_utils.c | 1 - sys/dev/irdma/irdma_verbs.c | 1 - sys/dev/irdma/irdma_verbs.h | 1 - sys/dev/irdma/irdma_ws.c | 1 - sys/dev/irdma/irdma_ws.h | 1 - sys/dev/irdma/osdep.h | 1 - sys/dev/iser/icl_iser.c | 1 - sys/dev/iser/icl_iser.h | 1 - sys/dev/iser/iser_initiator.c | 1 - sys/dev/iser/iser_memory.c | 1 - sys/dev/iser/iser_verbs.c | 1 - sys/dev/isp/DriverManual.txt | 1 - sys/dev/isp/Hardware.txt | 1 - sys/dev/isp/isp_freebsd.h | 1 - sys/dev/isp/isp_ioctl.h | 1 - sys/dev/isp/isp_library.h | 1 - sys/dev/isp/isp_stds.h | 1 - sys/dev/isp/isp_target.h | 1 - sys/dev/isp/ispmbox.h | 1 - sys/dev/isp/ispreg.h | 1 - sys/dev/isp/ispvar.h | 1 - sys/dev/ispfw/asm_2400.h | 1 - sys/dev/ispfw/asm_2500.h | 1 - sys/dev/iwi/if_iwireg.h | 1 - sys/dev/iwi/if_iwivar.h | 1 - sys/dev/iwm/if_iwm_binding.h | 1 - sys/dev/iwm/if_iwm_constants.h | 1 - sys/dev/iwm/if_iwm_mac_ctxt.h | 1 - sys/dev/iwm/if_iwm_notif_wait.h | 1 - sys/dev/iwm/if_iwm_pcie_trans.h | 1 - sys/dev/iwm/if_iwm_phy_ctxt.h | 1 - sys/dev/iwm/if_iwm_phy_db.h | 1 - sys/dev/iwm/if_iwm_power.h | 1 - sys/dev/iwm/if_iwm_scan.h | 1 - sys/dev/iwm/if_iwm_sta.h | 1 - sys/dev/iwm/if_iwm_time_event.h | 1 - sys/dev/iwm/if_iwm_util.h | 1 - sys/dev/iwm/if_iwmreg.h | 1 - sys/dev/iwm/if_iwmvar.h | 1 - sys/dev/iwn/if_iwnreg.h | 1 - sys/dev/iwn/if_iwnvar.h | 1 - sys/dev/ixgbe/if_bypass.c | 1 - sys/dev/ixgbe/if_fdir.c | 1 - sys/dev/ixgbe/if_ix.c | 1 - sys/dev/ixgbe/if_ixv.c | 1 - sys/dev/ixgbe/if_sriov.c | 1 - sys/dev/ixgbe/ix_txrx.c | 1 - sys/dev/ixgbe/ixgbe.h | 1 - sys/dev/ixgbe/ixgbe_82598.c | 1 - sys/dev/ixgbe/ixgbe_82598.h | 1 - sys/dev/ixgbe/ixgbe_82599.c | 1 - sys/dev/ixgbe/ixgbe_82599.h | 1 - sys/dev/ixgbe/ixgbe_api.c | 1 - sys/dev/ixgbe/ixgbe_api.h | 1 - sys/dev/ixgbe/ixgbe_bypass.h | 1 - sys/dev/ixgbe/ixgbe_common.c | 1 - sys/dev/ixgbe/ixgbe_common.h | 1 - sys/dev/ixgbe/ixgbe_dcb.c | 1 - sys/dev/ixgbe/ixgbe_dcb.h | 1 - sys/dev/ixgbe/ixgbe_dcb_82598.c | 1 - sys/dev/ixgbe/ixgbe_dcb_82598.h | 1 - sys/dev/ixgbe/ixgbe_dcb_82599.c | 1 - sys/dev/ixgbe/ixgbe_dcb_82599.h | 1 - sys/dev/ixgbe/ixgbe_fdir.h | 1 - sys/dev/ixgbe/ixgbe_features.h | 1 - sys/dev/ixgbe/ixgbe_mbx.c | 1 - sys/dev/ixgbe/ixgbe_mbx.h | 1 - sys/dev/ixgbe/ixgbe_osdep.c | 1 - sys/dev/ixgbe/ixgbe_osdep.h | 1 - sys/dev/ixgbe/ixgbe_phy.c | 1 - sys/dev/ixgbe/ixgbe_phy.h | 1 - sys/dev/ixgbe/ixgbe_rss.h | 1 - sys/dev/ixgbe/ixgbe_sriov.h | 1 - sys/dev/ixgbe/ixgbe_type.h | 1 - sys/dev/ixgbe/ixgbe_vf.c | 1 - sys/dev/ixgbe/ixgbe_vf.h | 1 - sys/dev/ixgbe/ixgbe_x540.c | 1 - sys/dev/ixgbe/ixgbe_x540.h | 1 - sys/dev/ixgbe/ixgbe_x550.c | 1 - sys/dev/ixgbe/ixgbe_x550.h | 1 - sys/dev/ixl/i40e_adminq.c | 1 - sys/dev/ixl/i40e_adminq.h | 1 - sys/dev/ixl/i40e_adminq_cmd.h | 1 - sys/dev/ixl/i40e_alloc.h | 1 - sys/dev/ixl/i40e_common.c | 1 - sys/dev/ixl/i40e_dcb.c | 1 - sys/dev/ixl/i40e_dcb.h | 1 - sys/dev/ixl/i40e_devids.h | 1 - sys/dev/ixl/i40e_hmc.c | 1 - sys/dev/ixl/i40e_hmc.h | 1 - sys/dev/ixl/i40e_lan_hmc.c | 1 - sys/dev/ixl/i40e_lan_hmc.h | 1 - sys/dev/ixl/i40e_nvm.c | 1 - sys/dev/ixl/i40e_osdep.c | 1 - sys/dev/ixl/i40e_osdep.h | 1 - sys/dev/ixl/i40e_prototype.h | 1 - sys/dev/ixl/i40e_register.h | 1 - sys/dev/ixl/i40e_status.h | 1 - sys/dev/ixl/i40e_type.h | 1 - sys/dev/ixl/if_ixl.c | 1 - sys/dev/ixl/ixl.h | 1 - sys/dev/ixl/ixl_debug.h | 1 - sys/dev/ixl/ixl_iw.c | 1 - sys/dev/ixl/ixl_iw.h | 1 - sys/dev/ixl/ixl_iw_int.h | 1 - sys/dev/ixl/ixl_pf.h | 1 - sys/dev/ixl/ixl_pf_i2c.c | 1 - sys/dev/ixl/ixl_pf_iflib.c | 1 - sys/dev/ixl/ixl_pf_iov.c | 1 - sys/dev/ixl/ixl_pf_iov.h | 1 - sys/dev/ixl/ixl_pf_main.c | 1 - sys/dev/ixl/ixl_pf_qmgr.c | 1 - sys/dev/ixl/ixl_pf_qmgr.h | 1 - sys/dev/ixl/ixl_txrx.c | 1 - sys/dev/ixl/virtchnl.h | 1 - sys/dev/le/am79900reg.h | 1 - sys/dev/le/am79900var.h | 1 - sys/dev/le/am7990reg.h | 1 - sys/dev/le/am7990var.h | 1 - sys/dev/le/lancereg.h | 1 - sys/dev/le/lancevar.h | 1 - sys/dev/liquidio/base/cn23xx_pf_device.c | 1 - sys/dev/liquidio/base/cn23xx_pf_device.h | 1 - sys/dev/liquidio/base/cn23xx_pf_regs.h | 1 - sys/dev/liquidio/base/lio_common.h | 1 - sys/dev/liquidio/base/lio_config.h | 1 - sys/dev/liquidio/base/lio_console.c | 1 - sys/dev/liquidio/base/lio_ctrl.c | 1 - sys/dev/liquidio/base/lio_ctrl.h | 1 - sys/dev/liquidio/base/lio_device.c | 1 - sys/dev/liquidio/base/lio_device.h | 1 - sys/dev/liquidio/base/lio_droq.c | 1 - sys/dev/liquidio/base/lio_droq.h | 1 - sys/dev/liquidio/base/lio_image.h | 1 - sys/dev/liquidio/base/lio_iq.h | 1 - sys/dev/liquidio/base/lio_mem_ops.c | 1 - sys/dev/liquidio/base/lio_mem_ops.h | 1 - sys/dev/liquidio/base/lio_request_manager.c | 1 - sys/dev/liquidio/base/lio_response_manager.c | 1 - sys/dev/liquidio/base/lio_response_manager.h | 1 - sys/dev/liquidio/lio_bsd.h | 1 - sys/dev/liquidio/lio_core.c | 1 - sys/dev/liquidio/lio_ioctl.c | 1 - sys/dev/liquidio/lio_ioctl.h | 1 - sys/dev/liquidio/lio_main.c | 1 - sys/dev/liquidio/lio_main.h | 1 - sys/dev/liquidio/lio_network.h | 1 - sys/dev/liquidio/lio_rss.c | 1 - sys/dev/liquidio/lio_rss.h | 1 - sys/dev/liquidio/lio_rxtx.c | 1 - sys/dev/liquidio/lio_rxtx.h | 1 - sys/dev/liquidio/lio_sysctl.c | 1 - sys/dev/mii/e1000phyreg.h | 1 - sys/dev/mii/lxtphyreg.h | 1 - sys/dev/mii/qsphyreg.h | 1 - sys/dev/mpt/mpilib/mpi.h | 1 - sys/dev/mpt/mpilib/mpi_cnfg.h | 1 - sys/dev/mpt/mpilib/mpi_fc.h | 1 - sys/dev/mpt/mpilib/mpi_init.h | 1 - sys/dev/mpt/mpilib/mpi_ioc.h | 1 - sys/dev/mpt/mpilib/mpi_lan.h | 1 - sys/dev/mpt/mpilib/mpi_log_fc.h | 1 - sys/dev/mpt/mpilib/mpi_log_sas.h | 1 - sys/dev/mpt/mpilib/mpi_raid.h | 1 - sys/dev/mpt/mpilib/mpi_sas.h | 1 - sys/dev/mpt/mpilib/mpi_targ.h | 1 - sys/dev/mpt/mpilib/mpi_tool.h | 1 - sys/dev/mpt/mpilib/mpi_type.h | 1 - sys/dev/mpt/mpt.h | 1 - sys/dev/mpt/mpt_cam.h | 1 - sys/dev/mpt/mpt_raid.h | 1 - sys/dev/mpt/mpt_reg.h | 1 - sys/dev/msk/if_mskreg.h | 1 - sys/dev/netmap/netmap_freebsd.c | 1 - sys/dev/netmap/netmap_legacy.c | 1 - sys/dev/netmap/netmap_null.c | 1 - sys/dev/netmap/netmap_offloadings.c | 1 - sys/dev/netmap/netmap_pipe.c | 1 - sys/dev/oce/oce_hw.c | 1 - sys/dev/oce/oce_hw.h | 1 - sys/dev/oce/oce_if.c | 1 - sys/dev/oce/oce_if.h | 1 - sys/dev/oce/oce_mbox.c | 1 - sys/dev/oce/oce_queue.c | 1 - sys/dev/oce/oce_sysctl.c | 1 - sys/dev/oce/oce_user.h | 1 - sys/dev/oce/oce_util.c | 1 - sys/dev/pccard/pccard_cis.c | 1 - sys/dev/pccard/pccard_cis.h | 1 - sys/dev/pccard/pccardreg.h | 1 - sys/dev/pccard/pccardvar.h | 1 - sys/dev/pms/freebsd/driver/common/lxutil.c | 1 - sys/dev/qat/qat_aevar.h | 1 - sys/dev/qat/qat_c2xxxreg.h | 1 - sys/dev/qat/qat_c3xxxreg.h | 1 - sys/dev/qat/qat_c62xreg.h | 1 - sys/dev/qat/qat_d15xxreg.h | 1 - sys/dev/qat/qat_dh895xccreg.h | 1 - sys/dev/qat/qat_hw15reg.h | 1 - sys/dev/qat/qat_hw15var.h | 1 - sys/dev/qat/qat_hw17reg.h | 1 - sys/dev/qat/qat_hw17var.h | 1 - sys/dev/qat/qatreg.h | 1 - sys/dev/qat/qatvar.h | 1 - sys/dev/ral/rt2560.c | 1 - sys/dev/ral/rt2560reg.h | 1 - sys/dev/ral/rt2560var.h | 1 - sys/dev/ral/rt2661.c | 1 - sys/dev/ral/rt2661reg.h | 1 - sys/dev/ral/rt2661var.h | 1 - sys/dev/rndtest/rndtest.h | 1 - sys/dev/smartpqi/smartpqi_cam.c | 1 - sys/dev/smartpqi/smartpqi_cmd.c | 1 - sys/dev/smartpqi/smartpqi_defines.h | 1 - sys/dev/smartpqi/smartpqi_discovery.c | 1 - sys/dev/smartpqi/smartpqi_event.c | 1 - sys/dev/smartpqi/smartpqi_helper.c | 1 - sys/dev/smartpqi/smartpqi_includes.h | 1 - sys/dev/smartpqi/smartpqi_init.c | 1 - sys/dev/smartpqi/smartpqi_intr.c | 1 - sys/dev/smartpqi/smartpqi_ioctl.c | 1 - sys/dev/smartpqi/smartpqi_ioctl.h | 1 - sys/dev/smartpqi/smartpqi_main.c | 1 - sys/dev/smartpqi/smartpqi_mem.c | 1 - sys/dev/smartpqi/smartpqi_misc.c | 1 - sys/dev/smartpqi/smartpqi_prototypes.h | 1 - sys/dev/smartpqi/smartpqi_queue.c | 1 - sys/dev/smartpqi/smartpqi_request.c | 1 - sys/dev/smartpqi/smartpqi_response.c | 1 - sys/dev/smartpqi/smartpqi_sis.c | 1 - sys/dev/smartpqi/smartpqi_structures.h | 1 - sys/dev/smartpqi/smartpqi_tag.c | 1 - sys/dev/sound/pci/allegro_code.h | 1 - sys/dev/sound/pci/allegro_reg.h | 1 - sys/dev/sound/pci/cs461x_dsp.h | 1 - sys/dev/sound/pci/emuxkireg.h | 1 - sys/dev/sound/usb/uaudio.c | 1 - sys/dev/sound/usb/uaudio.h | 1 - sys/dev/sound/usb/uaudio_pcm.c | 1 - sys/dev/sound/usb/uaudioreg.h | 1 - sys/dev/stge/if_stgereg.h | 1 - sys/dev/sume/adapter.h | 1 - sys/dev/sym/sym_conf.h | 1 - sys/dev/sym/sym_defs.h | 1 - sys/dev/sym/sym_fw.h | 1 - sys/dev/sym/sym_fw1.h | 1 - sys/dev/sym/sym_fw2.h | 1 - sys/dev/syscons/logo/beastie.c | 1 - sys/dev/syscons/logo/logo.c | 1 - sys/dev/usb/controller/atmegadci.c | 1 - sys/dev/usb/controller/atmegadci.h | 1 - sys/dev/usb/controller/avr32dci.c | 1 - sys/dev/usb/controller/avr32dci.h | 1 - sys/dev/usb/controller/dwc_otg.c | 1 - sys/dev/usb/controller/dwc_otg.h | 1 - sys/dev/usb/controller/dwc_otgreg.h | 1 - sys/dev/usb/controller/ehci.c | 1 - sys/dev/usb/controller/ehci.h | 1 - sys/dev/usb/controller/ehcireg.h | 1 - sys/dev/usb/controller/generic_xhci.h | 1 - sys/dev/usb/controller/musb_otg.c | 1 - sys/dev/usb/controller/musb_otg.h | 1 - sys/dev/usb/controller/ohci.c | 1 - sys/dev/usb/controller/ohci.h | 1 - sys/dev/usb/controller/ohcireg.h | 1 - sys/dev/usb/controller/saf1761_otg.c | 1 - sys/dev/usb/controller/saf1761_otg.h | 1 - sys/dev/usb/controller/saf1761_otg_boot.c | 1 - sys/dev/usb/controller/saf1761_otg_fdt.c | 1 - sys/dev/usb/controller/saf1761_otg_reg.h | 1 - sys/dev/usb/controller/uhci.c | 1 - sys/dev/usb/controller/uhci.h | 1 - sys/dev/usb/controller/uhcireg.h | 1 - sys/dev/usb/controller/usb_controller.c | 1 - sys/dev/usb/controller/uss820dci.c | 1 - sys/dev/usb/controller/uss820dci.h | 1 - sys/dev/usb/controller/xhci.c | 1 - sys/dev/usb/controller/xhci.h | 1 - sys/dev/usb/controller/xhcireg.h | 1 - sys/dev/usb/gadget/g_audio.h | 1 - sys/dev/usb/gadget/g_keyboard.h | 1 - sys/dev/usb/gadget/g_modem.h | 1 - sys/dev/usb/gadget/g_mouse.h | 1 - sys/dev/usb/net/if_iphethvar.h | 1 - sys/dev/usb/net/if_mosreg.h | 1 - sys/dev/usb/net/if_udav.c | 1 - sys/dev/usb/net/if_udavreg.h | 1 - sys/dev/usb/net/if_urndisreg.h | 1 - sys/dev/usb/net/if_usievar.h | 1 - sys/dev/usb/net/usb_ethernet.c | 1 - sys/dev/usb/net/usb_ethernet.h | 1 - sys/dev/usb/quirk/usb_quirk.c | 1 - sys/dev/usb/quirk/usb_quirk.h | 1 - sys/dev/usb/serial/uftdi_reg.h | 1 - sys/dev/usb/serial/ugensa.c | 1 - sys/dev/usb/serial/umcs.h | 1 - sys/dev/usb/serial/umoscom.c | 1 - sys/dev/usb/serial/usb_serial.h | 1 - sys/dev/usb/serial/uvisor.c | 1 - sys/dev/usb/storage/rio500_usb.h | 1 - sys/dev/usb/storage/ustorage_fs.c | 1 - sys/dev/usb/template/usb_template.c | 1 - sys/dev/usb/template/usb_template.h | 1 - sys/dev/usb/template/usb_template_audio.c | 1 - sys/dev/usb/template/usb_template_cdce.c | 1 - sys/dev/usb/template/usb_template_cdceem.c | 1 - sys/dev/usb/template/usb_template_kbd.c | 1 - sys/dev/usb/template/usb_template_midi.c | 1 - sys/dev/usb/template/usb_template_modem.c | 1 - sys/dev/usb/template/usb_template_mouse.c | 1 - sys/dev/usb/template/usb_template_msc.c | 1 - sys/dev/usb/template/usb_template_mtp.c | 1 - sys/dev/usb/template/usb_template_phone.c | 1 - sys/dev/usb/ufm_ioctl.h | 1 - sys/dev/usb/usb.h | 1 - sys/dev/usb/usb_bus.h | 1 - sys/dev/usb/usb_busdma.c | 1 - sys/dev/usb/usb_busdma.h | 1 - sys/dev/usb/usb_cdc.h | 1 - sys/dev/usb/usb_controller.h | 1 - sys/dev/usb/usb_core.c | 1 - sys/dev/usb/usb_core.h | 1 - sys/dev/usb/usb_debug.c | 1 - sys/dev/usb/usb_debug.h | 1 - sys/dev/usb/usb_dev.c | 1 - sys/dev/usb/usb_dev.h | 1 - sys/dev/usb/usb_device.c | 1 - sys/dev/usb/usb_device.h | 1 - sys/dev/usb/usb_dynamic.c | 1 - sys/dev/usb/usb_dynamic.h | 1 - sys/dev/usb/usb_endian.h | 1 - sys/dev/usb/usb_error.c | 1 - sys/dev/usb/usb_freebsd.h | 1 - sys/dev/usb/usb_freebsd_loader.h | 1 - sys/dev/usb/usb_generic.c | 1 - sys/dev/usb/usb_generic.h | 1 - sys/dev/usb/usb_handle_request.c | 1 - sys/dev/usb/usb_hid.c | 1 - sys/dev/usb/usb_hub.c | 1 - sys/dev/usb/usb_hub.h | 1 - sys/dev/usb/usb_hub_acpi.c | 1 - sys/dev/usb/usb_hub_private.h | 1 - sys/dev/usb/usb_ioctl.h | 1 - sys/dev/usb/usb_lookup.c | 1 - sys/dev/usb/usb_mbuf.c | 1 - sys/dev/usb/usb_mbuf.h | 1 - sys/dev/usb/usb_msctest.c | 1 - sys/dev/usb/usb_msctest.h | 1 - sys/dev/usb/usb_parse.c | 1 - sys/dev/usb/usb_pci.h | 1 - sys/dev/usb/usb_pf.c | 1 - sys/dev/usb/usb_process.c | 1 - sys/dev/usb/usb_process.h | 1 - sys/dev/usb/usb_request.c | 1 - sys/dev/usb/usb_request.h | 1 - sys/dev/usb/usb_transfer.c | 1 - sys/dev/usb/usb_transfer.h | 1 - sys/dev/usb/usb_util.c | 1 - sys/dev/usb/usb_util.h | 1 - sys/dev/usb/usbhid.h | 1 - sys/dev/usb/video/udl.c | 1 - sys/dev/usb/video/udl.h | 1 - sys/dev/usb/wlan/if_rum.c | 1 - sys/dev/usb/wlan/if_rumfw.h | 1 - sys/dev/usb/wlan/if_rumreg.h | 1 - sys/dev/usb/wlan/if_rumvar.h | 1 - sys/dev/usb/wlan/if_uathreg.h | 1 - sys/dev/usb/wlan/if_uathvar.h | 1 - sys/dev/usb/wlan/if_upgt.c | 1 - sys/dev/usb/wlan/if_upgtvar.h | 1 - sys/dev/usb/wlan/if_ural.c | 1 - sys/dev/usb/wlan/if_uralreg.h | 1 - sys/dev/usb/wlan/if_uralvar.h | 1 - sys/dev/usb/wlan/if_urtwreg.h | 1 - sys/dev/usb/wlan/if_urtwvar.h | 1 - sys/dev/usb/wlan/if_zyd.c | 1 - sys/dev/usb/wlan/if_zydfw.h | 1 - sys/dev/usb/wlan/if_zydreg.h | 1 - sys/dev/videomode/edid.c | 1 - sys/dev/videomode/ediddevs.h | 1 - sys/dev/videomode/ediddevs_data.h | 1 - sys/dev/videomode/edidreg.h | 1 - sys/dev/videomode/edidvar.h | 1 - sys/dev/videomode/modelines | 1 - sys/dev/videomode/pickmode.c | 1 - sys/dev/videomode/test.c | 1 - sys/dev/videomode/vesagtf.c | 1 - sys/dev/videomode/vesagtf.h | 1 - sys/dev/videomode/videomode.c | 1 - sys/dev/videomode/videomode.h | 1 - sys/dev/wpi/if_wpireg.h | 1 - sys/dev/wpi/if_wpivar.h | 1 - sys/dts/arm/overlays/spigen-rpi-b.dtso | 1 - sys/dts/arm/overlays/spigen-rpi2.dtso | 1 - sys/dts/arm64/overlays/spigen-rpi3.dtso | 1 - sys/dts/arm64/overlays/spigen-rpi4.dtso | 1 - sys/dts/mips/fbsd-mt7620a.dtsi | 1 - sys/dts/mips/fbsd-mt7621.dtsi | 1 - sys/dts/mips/fbsd-mt7628an.dtsi | 1 - sys/dts/mips/fbsd-rt3883.dtsi | 1 - sys/dts/powerpc/p1020rdb.dts | 1 - sys/dts/powerpc/p2020ds.dts | 1 - sys/dts/powerpc/p2041rdb.dts | 1 - sys/dts/powerpc/p2041si.dtsi | 1 - sys/dts/powerpc/p3041ds.dts | 1 - sys/dts/powerpc/p3041si.dtsi | 1 - sys/dts/powerpc/p5020ds.dts | 1 - sys/dts/powerpc/p5020si.dtsi | 1 - sys/fs/cuse/cuse.c | 1 - sys/fs/cuse/cuse_defs.h | 1 - sys/fs/cuse/cuse_ioctl.h | 1 - sys/fs/msdosfs/bootsect.h | 1 - sys/fs/msdosfs/bpb.h | 1 - sys/fs/msdosfs/denode.h | 1 - sys/fs/msdosfs/direntry.h | 1 - sys/fs/msdosfs/fat.h | 1 - sys/fs/msdosfs/msdosfs_conv.c | 1 - sys/fs/msdosfs/msdosfs_denode.c | 1 - sys/fs/msdosfs/msdosfs_fat.c | 1 - sys/fs/msdosfs/msdosfs_lookup.c | 1 - sys/fs/msdosfs/msdosfs_vfsops.c | 1 - sys/fs/msdosfs/msdosfs_vnops.c | 1 - sys/fs/msdosfs/msdosfsmount.h | 1 - sys/fs/nfsserver/nfs_fha_new.h | 1 - sys/i386/include/_align.h | 1 - sys/i386/include/_inttypes.h | 1 - sys/i386/include/_limits.h | 1 - sys/i386/include/_stdint.h | 1 - sys/i386/include/_types.h | 1 - sys/i386/include/acpica_machdep.h | 1 - sys/i386/include/apm_bios.h | 1 - sys/i386/include/bus.h | 1 - sys/i386/include/bus_dma.h | 1 - sys/i386/include/dump.h | 1 - sys/i386/include/elf.h | 1 - sys/i386/include/endian.h | 1 - sys/i386/include/fdt.h | 1 - sys/i386/include/float.h | 1 - sys/i386/include/intr_machdep.h | 1 - sys/i386/include/iommu.h | 1 - sys/i386/include/metadata.h | 1 - sys/i386/include/ofw_machdep.h | 1 - sys/i386/include/pci_cfgreg.h | 1 - sys/i386/include/procctl.h | 1 - sys/i386/include/psl.h | 1 - sys/i386/include/ptrace.h | 1 - sys/i386/include/pvclock.h | 1 - sys/i386/include/reg.h | 1 - sys/i386/include/resource.h | 1 - sys/i386/include/setjmp.h | 1 - sys/i386/include/specialreg.h | 1 - sys/i386/include/stack.h | 1 - sys/i386/include/stdarg.h | 1 - sys/i386/include/sysarch.h | 1 - sys/i386/include/trap.h | 1 - sys/i386/include/vdso.h | 1 - sys/i386/include/xen/xen-os.h | 1 - sys/i386/linux/linux_locore.asm | 1 - sys/kgssapi/gssd.x | 1 - sys/mips/atheros/ar531x/ar5312_chip.h | 1 - sys/mips/atheros/ar531x/ar5315_chip.h | 1 - sys/mips/atheros/ar531x/ar5315_cpudef.h | 1 - sys/mips/atheros/ar531x/ar5315_setup.h | 1 - sys/mips/atheros/ar71xx_chip.h | 1 - sys/mips/atheros/ar71xx_cpudef.h | 1 - sys/mips/atheros/ar71xx_setup.h | 1 - sys/mips/atheros/ar71xxreg.h | 1 - sys/mips/atheros/ar724x_chip.h | 1 - sys/mips/atheros/ar724xreg.h | 1 - sys/mips/atheros/ar91xx_chip.h | 1 - sys/mips/atheros/ar91xxreg.h | 1 - sys/mips/atheros/ar933x_chip.h | 1 - sys/mips/atheros/ar934x_chip.h | 1 - sys/mips/atheros/pcf2123reg.h | 1 - sys/mips/atheros/qca953x_chip.h | 1 - sys/mips/atheros/qca955x_chip.h | 1 - sys/mips/cavium/cvmx_config.h | 1 - sys/mips/cavium/octe/cavium-ethernet.h | 1 - sys/mips/cavium/octe/ethernet-common.h | 1 - sys/mips/cavium/octe/ethernet-defines.h | 1 - sys/mips/cavium/octe/ethernet-headers.h | 1 - sys/mips/cavium/octe/ethernet-mdio.h | 1 - sys/mips/cavium/octe/ethernet-mem.h | 1 - sys/mips/cavium/octe/ethernet-rx.h | 1 - sys/mips/cavium/octe/ethernet-tx.h | 1 - sys/mips/cavium/octe/ethernet-util.h | 1 - sys/mips/cavium/octe/wrapper-cvmx-includes.h | 1 - sys/mips/cavium/octeon_pcmap_regs.h | 1 - sys/mips/cavium/octopcireg.h | 1 - sys/mips/cavium/usb/octusb.h | 1 - sys/mips/include/procctl.h | 1 - sys/mips/malta/gtvar.h | 1 - sys/net/if_gif.h | 1 - sys/net/if_media.h | 1 - sys/net/if_stf.c | 1 - sys/net/pfil.c | 1 - sys/net/pfil.h | 1 - sys/net/pfkeyv2.h | 1 - sys/net/rndis.h | 1 - sys/net80211/ieee80211_amrr.h | 1 - sys/net80211/ieee80211_radiotap.h | 1 - sys/net80211/ieee80211_rssadapt.c | 1 - sys/net80211/ieee80211_rssadapt.h | 1 - sys/netinet/icmp6.h | 1 - sys/netinet/ip6.h | 1 - sys/netinet/ip_carp.h | 1 - sys/netinet/ip_ecn.h | 1 - sys/netinet/ip_encap.h | 1 - sys/netinet/libalias/alias_sctp.c | 1 - sys/netinet/libalias/alias_sctp.h | 1 - sys/netinet6/icmp6.h | 1 - sys/netinet6/ip6.h | 1 - sys/netipsec/ah.h | 1 - sys/netipsec/ah_var.h | 1 - sys/netipsec/esp.h | 1 - sys/netipsec/esp_var.h | 1 - sys/netipsec/ipcomp.h | 1 - sys/netipsec/ipcomp_var.h | 1 - sys/netipsec/ipsec.c | 1 - sys/netipsec/ipsec.h | 1 - sys/netipsec/ipsec6.h | 1 - sys/netipsec/key.c | 1 - sys/netipsec/key.h | 1 - sys/netipsec/key_debug.c | 1 - sys/netipsec/key_debug.h | 1 - sys/netipsec/key_var.h | 1 - sys/netipsec/keydb.h | 1 - sys/netipsec/keysock.c | 1 - sys/netipsec/keysock.h | 1 - sys/netipsec/xform.h | 1 - sys/netipsec/xform_ah.c | 1 - sys/netipsec/xform_esp.c | 1 - sys/netipsec/xform_ipcomp.c | 1 - sys/netpfil/ipfilter/netinet/fil.c | 1 - sys/netpfil/ipfilter/netinet/ip_auth.c | 1 - sys/netpfil/ipfilter/netinet/ip_auth.h | 1 - sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c | 1 - sys/netpfil/ipfilter/netinet/ip_frag.c | 1 - sys/netpfil/ipfilter/netinet/ip_frag.h | 1 - sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c | 1 - *** 10891 LINES SKIPPED *** From nobody Wed Aug 23 17:49: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 4RWDHl2ZRpz4r91y; Wed, 23 Aug 2023 17:49: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 4RWDHl1z1hz4T4B; Wed, 23 Aug 2023 17:49:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DioW8Md4R3lZO4JreUPV7oDFo6KjOcrSMdv2S3avlKU=; b=O8Y5oPgcOVlWAdsBqLsz2fkOXA00LnfZbWcT37Y+Pt94IILtX2lRMnmcq6SQfEUPAe35PG K1m5VkTlr8ebWsGkrNBXR5QlBoevQ9H40tJe4JW/W35/MGHRQkIi1VdHEAQddGymQTFmtX x4OL5rhnnQJ8KkbfjEWrATdYsDLrUqx0dCaG5QdHW6bl2IjiUCIMZariSEpTHE5w9wDg3J KBt8SDyulXg177jODAWi37yjPvNFNdzlE7PPY+sDvu9rheHYoNYIhbp67MJ+QKljGxO4i7 Y+x6qHX8SJaIMtA/XJZQt8Pc0UUUK+A0Zl5Rw4XpXl+YwZM0pv/TqXrmQo26tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DioW8Md4R3lZO4JreUPV7oDFo6KjOcrSMdv2S3avlKU=; b=M7W/ysEK/ZZ7x37gU/Z3aIu+ic4XmhQxtmiusVt70+IeZazW4ak56ve3tBLfMK7ELOLQOh /i9/Zvk8EZpiTN1mgFSiMc8/n9av0cV6c5MzN5pq/Fgadkf0B1FF6JB1CeVr7a5ndaksGg QQ1stMbrDCo2l8+nqA18BmxU2yCBUtPYzARELws076mEIPJlex7vagXQl8k/lE+W0v7A8B VoCd+i1T1z7CmzPpHs+G7hc+mFMwQDMww/n8HQZ3NNP4q0JtCI97ezcSkJ2LBfJ3HSpUMq 2EmgVmBfhkiX2p3f9VaSRfQphvTfiPZ1fO+WoLg/xp8d3LuWGqEjeed9SMNtmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812979; a=rsa-sha256; cv=none; b=hWIsyYgu+Mi/AtYnLJtS4jAkwmv5E0TW2whuBRGqeBax4KPi8qsKrqAORb0Rv986U5s+O1 osuQg/woLTcSJHG1ZBeQEezKBw4EmpszeM6zyQY2kH54DnYUXRrGCqb/9eypXUJRWNrPzW IzM7BIe5pzGX6jq7YfQxD/fH89/ccViDAvi8Aj1PCgAuqm2Gfz1LsGn5Us6gDEkhmQUDrv w7fnKK0gGdnWDc+rEjUIJupLvbC4GN/DowiQQ+YxdxniKduUPN6lBpCxj+TsU79rcH2NL7 3Rxd4tVreLVFuCeEVNB1mGcJPVE1vOmwiy2RPSWiLlK8G887K/lyg1yb3APaEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHl14BsztsV; Wed, 23 Aug 2023 17:49:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHndMk040746; Wed, 23 Aug 2023 17:49:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHncDL040743; Wed, 23 Aug 2023 17:49:38 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:38 GMT Message-Id: <202308231749.37NHncDL040743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 8ad303d68cec - stable/13 - Remove $FreeBSD$: one-line .c comment pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8ad303d68cec3ee1133550de37e0009502621e50 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8ad303d68cec3ee1133550de37e0009502621e50 commit 8ad303d68cec3ee1133550de37e0009502621e50 Author: Warner Losh AuthorDate: 2023-08-22 01:31:18 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:23 +0000 Remove $FreeBSD$: one-line .c comment pattern Remove /^/[*/]\s*\$FreeBSD\$.*\n/ Similar commit in main: (cherry picked from commit 2a63c3be1582) --- bin/chio/defs.h | 1 - bin/chio/pathnames.h | 1 - bin/csh/config.h | 1 - bin/csh/config_p.h | 1 - cddl/compat/opensolaris/include/libintl.h | 1 - cddl/compat/opensolaris/include/priv.h | 1 - cddl/compat/opensolaris/include/solaris.h | 1 - cddl/compat/opensolaris/include/zone.h | 1 - include/getopt.h | 1 - include/gssapi.h | 1 - include/hesiod.h | 1 - include/iconv.h | 1 - include/ieeefp.h | 1 - include/ifaddrs.h | 1 - include/libgen.h | 1 - include/netconfig.h | 1 - include/nsswitch.h | 1 - include/readpassphrase.h | 1 - include/rpc/auth_des.h | 1 - include/rpc/auth_kerb.h | 1 - include/rpc/clnt_soc.h | 1 - include/rpc/clnt_stat.h | 1 - include/rpc/des.h | 1 - include/rpc/nettype.h | 1 - include/rpc/raw.h | 1 - include/rpc/rpc_com.h | 1 - include/rpc/rpcb_clnt.h | 1 - include/rpc/rpcent.h | 1 - include/rpc/svc_dg.h | 1 - include/rpc/svc_soc.h | 1 - include/rpcsvc/nis_object.x | 1 - include/rpcsvc/nis_tags.h | 1 - kerberos5/include/config.h | 1 - kerberos5/include/crypto-headers.h | 1 - kerberos5/include/krb5-types.h | 1 - kerberos5/include/version.h | 1 - kerberos5/lib/libgssapi_krb5/gss_oid.c | 1 - kerberos5/lib/libgssapi_krb5/pname_to_uid.c | 1 - lib/csu/aarch64/crt.h | 1 - lib/csu/arm/crt.h | 1 - lib/csu/riscv/crt.h | 1 - lib/libblocksruntime/config.h | 1 - lib/libc++/libc++.ldscript | 1 - lib/libc/amd64/gen/fpgetmask.c | 1 - lib/libc/amd64/gen/fpgetprec.c | 1 - lib/libc/amd64/gen/fpgetround.c | 1 - lib/libc/amd64/gen/fpgetsticky.c | 1 - lib/libc/amd64/gen/fpsetmask.c | 1 - lib/libc/amd64/gen/fpsetprec.c | 1 - lib/libc/amd64/gen/fpsetround.c | 1 - lib/libc/amd64/string/memcpy.S | 1 - lib/libc/arm/softfloat/arm-gcc.h | 1 - lib/libc/arm/softfloat/milieu.h | 1 - lib/libc/arm/softfloat/softfloat.h | 1 - lib/libc/iconv/_strtol.h | 1 - lib/libc/iconv/_strtoul.h | 1 - lib/libc/iconv/bsd_iconv.c | 1 - lib/libc/iconv/citrus_aliasname_local.h | 1 - lib/libc/iconv/citrus_bcs.c | 1 - lib/libc/iconv/citrus_bcs.h | 1 - lib/libc/iconv/citrus_bcs_strtol.c | 1 - lib/libc/iconv/citrus_bcs_strtoul.c | 1 - lib/libc/iconv/citrus_csmapper.c | 1 - lib/libc/iconv/citrus_csmapper.h | 1 - lib/libc/iconv/citrus_db.c | 1 - lib/libc/iconv/citrus_db.h | 1 - lib/libc/iconv/citrus_db_factory.c | 1 - lib/libc/iconv/citrus_db_factory.h | 1 - lib/libc/iconv/citrus_db_file.h | 1 - lib/libc/iconv/citrus_db_hash.c | 1 - lib/libc/iconv/citrus_db_hash.h | 1 - lib/libc/iconv/citrus_esdb.c | 1 - lib/libc/iconv/citrus_esdb.h | 1 - lib/libc/iconv/citrus_esdb_file.h | 1 - lib/libc/iconv/citrus_fix_grouping.h | 1 - lib/libc/iconv/citrus_hash.c | 1 - lib/libc/iconv/citrus_hash.h | 1 - lib/libc/iconv/citrus_iconv.c | 1 - lib/libc/iconv/citrus_iconv.h | 1 - lib/libc/iconv/citrus_iconv_local.h | 1 - lib/libc/iconv/citrus_lock.h | 1 - lib/libc/iconv/citrus_lookup.c | 1 - lib/libc/iconv/citrus_lookup.h | 1 - lib/libc/iconv/citrus_lookup_factory.c | 1 - lib/libc/iconv/citrus_lookup_factory.h | 1 - lib/libc/iconv/citrus_lookup_file.h | 1 - lib/libc/iconv/citrus_mapper.c | 1 - lib/libc/iconv/citrus_mapper.h | 1 - lib/libc/iconv/citrus_mapper_local.h | 1 - lib/libc/iconv/citrus_memstream.c | 1 - lib/libc/iconv/citrus_memstream.h | 1 - lib/libc/iconv/citrus_mmap.c | 1 - lib/libc/iconv/citrus_mmap.h | 1 - lib/libc/iconv/citrus_module.c | 1 - lib/libc/iconv/citrus_module.h | 1 - lib/libc/iconv/citrus_namespace.h | 1 - lib/libc/iconv/citrus_none.c | 1 - lib/libc/iconv/citrus_none.h | 1 - lib/libc/iconv/citrus_pivot_factory.c | 1 - lib/libc/iconv/citrus_pivot_factory.h | 1 - lib/libc/iconv/citrus_pivot_file.h | 1 - lib/libc/iconv/citrus_prop.c | 1 - lib/libc/iconv/citrus_prop.h | 1 - lib/libc/iconv/citrus_region.h | 1 - lib/libc/iconv/citrus_stdenc.c | 1 - lib/libc/iconv/citrus_stdenc.h | 1 - lib/libc/iconv/citrus_stdenc_local.h | 1 - lib/libc/iconv/citrus_stdenc_template.h | 1 - lib/libc/iconv/citrus_types.h | 1 - lib/libc/include/isc/list.h | 1 - lib/libc/include/isc/platform.h | 1 - lib/libc/include/port_after.h | 1 - lib/libc/include/port_before.h | 1 - lib/libc/libc.ldscript | 1 - lib/libc/libc_nossp.ldscript | 1 - lib/libc/locale/c16rtomb_iconv.c | 1 - lib/libc/locale/c32rtomb_iconv.c | 1 - lib/libc/locale/mbrtoc16_iconv.c | 1 - lib/libc/locale/mbrtoc32_iconv.c | 1 - lib/libc/mips/SYS.h | 1 - lib/libc/mips/softfloat/milieu.h | 1 - lib/libc/mips/softfloat/mips-gcc.h | 1 - lib/libc/mips/softfloat/softfloat.h | 1 - lib/libc/net/res_config.h | 1 - lib/libc/powerpc/softfloat/milieu.h | 1 - lib/libc/powerpc/softfloat/powerpc-gcc.h | 1 - lib/libc/powerpc/softfloat/softfloat.h | 1 - lib/libc/powerpc64/softfloat/milieu.h | 1 - lib/libc/powerpc64/softfloat/powerpc-gcc.h | 1 - lib/libc/powerpc64/softfloat/softfloat.h | 1 - lib/libc/powerpc64/string/memcpy_resolver.c | 1 - lib/libc/powerpc64/string/memmove.S | 1 - lib/libc/powerpc64/string/memmove_resolver.c | 1 - lib/libc/powerpc64/string/memmove_vsx.S | 1 - lib/libc/powerpcspe/softfloat/milieu.h | 1 - lib/libc/powerpcspe/softfloat/powerpc-gcc.h | 1 - lib/libc/powerpcspe/softfloat/softfloat.h | 1 - lib/libc/resolv/res_private.h | 1 - lib/libc/riscv/softfloat/milieu.h | 1 - lib/libc/riscv/softfloat/riscv-gcc.h | 1 - lib/libc/riscv/softfloat/softfloat.h | 1 - lib/libc/rpc/DISCLAIMER | 1 - lib/libc/softfloat/bits32/softfloat-macros | 1 - lib/libc/softfloat/bits64/softfloat-macros | 1 - lib/libc/softfloat/softfloat-for-gcc.h | 1 - lib/libc/softfloat/softfloat-specialize | 1 - lib/libc/softfloat/templates/milieu.h | 1 - lib/libc/softfloat/templates/softfloat-specialize | 1 - lib/libc/softfloat/templates/softfloat.h | 1 - lib/libc/tests/resolv/resolv_test.c | 1 - lib/libcuse/cuse.h | 1 - lib/libcuse/cuse_lib.c | 1 - lib/libefivar/ProcessorBind.h | 1 - lib/libefivar/uefi-guid.c | 1 - lib/libelftc/elftc_version.c | 1 - lib/libgssapi/gss_buffer_set.c | 1 - lib/libgssapi/gss_inquire_cred_by_oid.c | 1 - lib/libgssapi/gss_oid_to_str.c | 1 - lib/libgssapi/gss_pname_to_uid.c | 1 - lib/libgssapi/gss_pseudo_random.c | 1 - lib/libgssapi/gss_release_oid.c | 1 - lib/libgssapi/gss_set_cred_option.c | 1 - lib/libgssapi/gss_set_sec_context_option.c | 1 - lib/libiconv_modules/BIG5/citrus_big5.c | 1 - lib/libiconv_modules/BIG5/citrus_big5.h | 1 - lib/libiconv_modules/DECHanyu/citrus_dechanyu.c | 1 - lib/libiconv_modules/DECHanyu/citrus_dechanyu.h | 1 - lib/libiconv_modules/EUC/citrus_euc.c | 1 - lib/libiconv_modules/EUC/citrus_euc.h | 1 - lib/libiconv_modules/EUCTW/citrus_euctw.c | 1 - lib/libiconv_modules/EUCTW/citrus_euctw.h | 1 - lib/libiconv_modules/GBK2K/citrus_gbk2k.c | 1 - lib/libiconv_modules/GBK2K/citrus_gbk2k.h | 1 - lib/libiconv_modules/HZ/citrus_hz.c | 1 - lib/libiconv_modules/HZ/citrus_hz.h | 1 - lib/libiconv_modules/ISO2022/citrus_iso2022.c | 1 - lib/libiconv_modules/ISO2022/citrus_iso2022.h | 1 - lib/libiconv_modules/JOHAB/citrus_johab.c | 1 - lib/libiconv_modules/JOHAB/citrus_johab.h | 1 - lib/libiconv_modules/MSKanji/citrus_mskanji.c | 1 - lib/libiconv_modules/MSKanji/citrus_mskanji.h | 1 - lib/libiconv_modules/UES/citrus_ues.c | 1 - lib/libiconv_modules/UES/citrus_ues.h | 1 - lib/libiconv_modules/UTF1632/citrus_utf1632.c | 1 - lib/libiconv_modules/UTF1632/citrus_utf1632.h | 1 - lib/libiconv_modules/UTF7/citrus_utf7.c | 1 - lib/libiconv_modules/UTF7/citrus_utf7.h | 1 - lib/libiconv_modules/UTF8/citrus_utf8.c | 1 - lib/libiconv_modules/UTF8/citrus_utf8.h | 1 - lib/libiconv_modules/VIQR/citrus_viqr.c | 1 - lib/libiconv_modules/VIQR/citrus_viqr.h | 1 - lib/libiconv_modules/ZW/citrus_zw.c | 1 - lib/libiconv_modules/ZW/citrus_zw.h | 1 - lib/libiconv_modules/iconv_none/citrus_iconv_none.c | 1 - lib/libiconv_modules/iconv_none/citrus_iconv_none.h | 1 - lib/libiconv_modules/iconv_std/citrus_iconv_std.c | 1 - lib/libiconv_modules/iconv_std/citrus_iconv_std.h | 1 - lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h | 1 - lib/libiconv_modules/mapper_646/citrus_mapper_646.c | 1 - lib/libiconv_modules/mapper_646/citrus_mapper_646.h | 1 - lib/libiconv_modules/mapper_none/citrus_mapper_none.c | 1 - lib/libiconv_modules/mapper_none/citrus_mapper_none.h | 1 - lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c | 1 - lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h | 1 - lib/libiconv_modules/mapper_std/citrus_mapper_std.c | 1 - lib/libiconv_modules/mapper_std/citrus_mapper_std.h | 1 - lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h | 1 - lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h | 1 - lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c | 1 - lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h | 1 - lib/libipsec/ipsec_strerror.h | 1 - lib/libipsec/libpfkey.h | 1 - lib/libipsec/policy_token.l | 1 - lib/libmd/i386/rmd160.S | 1 - lib/libmd/i386/sha.S | 1 - lib/libmd/md5.h | 1 - lib/libmp/mp.h | 1 - lib/libnetbsd/efun.c | 1 - lib/libnetbsd/netinet/in.h | 1 - lib/libnetbsd/rmd160.h | 1 - lib/libnetbsd/sha1.h | 1 - lib/libnetbsd/sha2.h | 1 - lib/libnetbsd/stdlib.h | 1 - lib/libnetbsd/sys/cdefs.h | 1 - lib/libnetbsd/util.h | 1 - lib/libopie/config.h | 1 - lib/libpcap/config.h | 1 - lib/libpmc/pmu-events/jsmn.h | 1 - lib/libpmc/pmu-events/json.h | 1 - lib/librpcsec_gss/rpcsec_gss_int.h | 1 - lib/librpcsec_gss/rpcsec_gss_prot.c | 1 - lib/libusb/libusb.h | 1 - lib/libusb/libusb01.c | 1 - lib/libusb/libusb10.c | 1 - lib/libusb/libusb10.h | 1 - lib/libusb/libusb10_desc.c | 1 - lib/libusb/libusb10_hotplug.c | 1 - lib/libusb/libusb10_io.c | 1 - lib/libusb/libusb20.c | 1 - lib/libusb/libusb20.h | 1 - lib/libusb/libusb20_desc.c | 1 - lib/libusb/libusb20_desc.h | 1 - lib/libusb/libusb20_int.h | 1 - lib/libusb/libusb20_ugen20.c | 1 - lib/libusb/libusb_global_linux.h | 1 - lib/libusb/usb.h | 1 - lib/libxo/libxo/xo_config.h | 1 - lib/msun/src/w_dremf.c | 1 - lib/ncurses/ncurses/ncurses_cfg.h | 1 - libexec/bootpd/bptypes.h | 1 - libexec/bootpd/dovend.h | 1 - libexec/bootpd/getether.h | 1 - libexec/bootpd/getif.h | 1 - libexec/bootpd/lookup.h | 1 - libexec/bootpd/readfile.h | 1 - libexec/bootpd/report.c | 1 - libexec/bootpd/report.h | 1 - libexec/bootpd/tools/bootptest/bootptest.h | 1 - libexec/flua/linit_flua.c | 1 - libexec/flua/modules/lposix.h | 1 - libexec/ftpd/blacklist.c | 1 - libexec/ftpd/blacklist_client.h | 1 - libexec/ftpd/config.h | 1 - sbin/dhclient/dhcp.h | 1 - sbin/dhclient/tests/fake.c | 1 - sbin/dhclient/tests/option-domain-search.c | 1 - sbin/etherswitchcfg/ifmedia.c | 1 - sbin/gvinum/gvinum.h | 1 - sbin/ifconfig/carp.c | 1 - sbin/ifconfig/ifmedia.c | 1 - sbin/ipf/common/ipf.h | 1 - sbin/ipf/common/ipf_y.y | 1 - sbin/ipf/common/ipmon.h | 1 - sbin/ipf/common/ipt.h | 1 - sbin/ipf/common/kmem.h | 1 - sbin/ipf/common/lexer.c | 1 - sbin/ipf/common/lexer.h | 1 - sbin/ipf/common/opts.h | 1 - sbin/ipf/common/pcap-ipf.h | 1 - sbin/ipf/ipf/bpf-ipf.h | 1 - sbin/ipf/ipf/bpf_filter.c | 1 - sbin/ipf/ipf/ipf.c | 1 - sbin/ipf/ipf/ipfcomp.c | 1 - sbin/ipf/ipfs/ipfs.c | 1 - sbin/ipf/ipfstat/ipfstat.c | 1 - sbin/ipf/ipfsync/ipsyncm.c | 1 - sbin/ipf/ipfsync/ipsyncs.c | 1 - sbin/ipf/ipftest/ip_fil.c | 1 - sbin/ipf/ipftest/ipftest.c | 1 - sbin/ipf/ipftest/md5.c | 1 - sbin/ipf/ipftest/md5.h | 1 - sbin/ipf/iplang/iplang.h | 1 - sbin/ipf/iplang/iplang_l.l | 1 - sbin/ipf/iplang/iplang_y.y | 1 - sbin/ipf/ipmon/ipmon.c | 1 - sbin/ipf/ipmon/ipmon_y.y | 1 - sbin/ipf/ipnat/ipnat.c | 1 - sbin/ipf/ipnat/ipnat_y.y | 1 - sbin/ipf/ippool/ippool.c | 1 - sbin/ipf/ippool/ippool_y.y | 1 - sbin/ipf/ipscan/ipscan_y.y | 1 - sbin/ipf/ipsend/44arp.c | 1 - sbin/ipf/ipsend/arp.c | 1 - sbin/ipf/ipsend/dlcommon.c | 1 - sbin/ipf/ipsend/dltest.h | 1 - sbin/ipf/ipsend/ip.c | 1 - sbin/ipf/ipsend/ipresend.c | 1 - sbin/ipf/ipsend/ipsend.c | 1 - sbin/ipf/ipsend/ipsend.h | 1 - sbin/ipf/ipsend/ipsopt.c | 1 - sbin/ipf/ipsend/iptest.c | 1 - sbin/ipf/ipsend/iptests.c | 1 - sbin/ipf/ipsend/resend.c | 1 - sbin/ipf/ipsend/sbpf.c | 1 - sbin/ipf/ipsend/sdlpi.c | 1 - sbin/ipf/ipsend/snit.c | 1 - sbin/ipf/ipsend/sock.c | 1 - sbin/ipf/ipsend/sockraw.c | 1 - sbin/ipf/libipf/addicmp.c | 1 - sbin/ipf/libipf/addipopt.c | 1 - sbin/ipf/libipf/bcopywrap.c | 1 - sbin/ipf/libipf/binprint.c | 1 - sbin/ipf/libipf/buildopts.c | 1 - sbin/ipf/libipf/checkrev.c | 1 - sbin/ipf/libipf/count4bits.c | 1 - sbin/ipf/libipf/count6bits.c | 1 - sbin/ipf/libipf/debug.c | 1 - sbin/ipf/libipf/facpri.c | 1 - sbin/ipf/libipf/facpri.h | 1 - sbin/ipf/libipf/fill6bits.c | 1 - sbin/ipf/libipf/flags.c | 1 - sbin/ipf/libipf/gethost.c | 1 - sbin/ipf/libipf/getifname.c | 1 - sbin/ipf/libipf/getnattype.c | 1 - sbin/ipf/libipf/getport.c | 1 - sbin/ipf/libipf/getportproto.c | 1 - sbin/ipf/libipf/getproto.c | 1 - sbin/ipf/libipf/getsumd.c | 1 - sbin/ipf/libipf/hostname.c | 1 - sbin/ipf/libipf/icmpcode.c | 1 - sbin/ipf/libipf/inet_addr.c | 1 - sbin/ipf/libipf/initparse.c | 1 - sbin/ipf/libipf/ionames.c | 1 - sbin/ipf/libipf/ipf_dotuning.c | 1 - sbin/ipf/libipf/ipft_hx.c | 1 - sbin/ipf/libipf/ipft_pc.c | 1 - sbin/ipf/libipf/ipft_tx.c | 1 - sbin/ipf/libipf/ipoptsec.c | 1 - sbin/ipf/libipf/kmem.c | 1 - sbin/ipf/libipf/kmem.h | 1 - sbin/ipf/libipf/kmemcpywrap.c | 1 - sbin/ipf/libipf/kvatoname.c | 1 - sbin/ipf/libipf/load_hash.c | 1 - sbin/ipf/libipf/load_hashnode.c | 1 - sbin/ipf/libipf/load_http.c | 1 - sbin/ipf/libipf/load_pool.c | 1 - sbin/ipf/libipf/load_poolnode.c | 1 - sbin/ipf/libipf/mutex_emul.c | 1 - sbin/ipf/libipf/nametokva.c | 1 - sbin/ipf/libipf/nat_setgroupmap.c | 1 - sbin/ipf/libipf/ntomask.c | 1 - sbin/ipf/libipf/optname.c | 1 - sbin/ipf/libipf/optprint.c | 1 - sbin/ipf/libipf/optprintv6.c | 1 - sbin/ipf/libipf/optvalue.c | 1 - sbin/ipf/libipf/portname.c | 1 - sbin/ipf/libipf/print_toif.c | 1 - sbin/ipf/libipf/printactivenat.c | 1 - sbin/ipf/libipf/printaps.c | 1 - sbin/ipf/libipf/printbuf.c | 1 - sbin/ipf/libipf/printfr.c | 1 - sbin/ipf/libipf/printfraginfo.c | 1 - sbin/ipf/libipf/printhash.c | 1 - sbin/ipf/libipf/printhashnode.c | 1 - sbin/ipf/libipf/printhostmap.c | 1 - sbin/ipf/libipf/printhostmask.c | 1 - sbin/ipf/libipf/printifname.c | 1 - sbin/ipf/libipf/printip.c | 1 - sbin/ipf/libipf/printlog.c | 1 - sbin/ipf/libipf/printmask.c | 1 - sbin/ipf/libipf/printnat.c | 1 - sbin/ipf/libipf/printpacket.c | 1 - sbin/ipf/libipf/printpacket6.c | 1 - sbin/ipf/libipf/printpool.c | 1 - sbin/ipf/libipf/printpoolnode.c | 1 - sbin/ipf/libipf/printportcmp.c | 1 - sbin/ipf/libipf/printsbuf.c | 1 - sbin/ipf/libipf/printstate.c | 1 - sbin/ipf/libipf/printtunable.c | 1 - sbin/ipf/libipf/remove_hash.c | 1 - sbin/ipf/libipf/remove_hashnode.c | 1 - sbin/ipf/libipf/remove_pool.c | 1 - sbin/ipf/libipf/remove_poolnode.c | 1 - sbin/ipf/libipf/resetlexer.c | 1 - sbin/ipf/libipf/rwlock_emul.c | 1 - sbin/ipf/libipf/tcp_flags.c | 1 - sbin/ipf/libipf/tcpflags.c | 1 - sbin/ipf/libipf/tcpoptnames.c | 1 - sbin/ipf/libipf/v6ionames.c | 1 - sbin/ipf/libipf/v6optvalue.c | 1 - sbin/ipf/libipf/var.c | 1 - sbin/ipf/libipf/verbose.c | 1 - sbin/newfs_msdos/mkfs_msdos.h | 1 - sbin/rcorder/ealloc.c | 1 - sbin/rcorder/ealloc.h | 1 - sbin/rcorder/hash.c | 1 - sbin/rcorder/hash.h | 1 - sbin/setkey/parse.y | 1 - sbin/setkey/setkey.c | 1 - sbin/setkey/test-pfkey.c | 1 - sbin/setkey/token.l | 1 - sbin/setkey/vchar.h | 1 - secure/lib/libcrypto/opensslconf.h.in | 1 - share/examples/FreeBSD_version/FreeBSD_version.c | 1 - share/examples/ipfilter/l4check/l4check.c | 1 - share/examples/ipfilter/mlfk_rule.c | 1 - share/examples/ipfilter/samples/proxy.c | 1 - share/examples/ipfilter/samples/relay.c | 1 - share/examples/ipfilter/samples/userauth.c | 1 - share/examples/ses/srcs/chpmon.c | 1 - share/examples/ses/srcs/eltsub.c | 1 - share/examples/ses/srcs/eltsub.h | 1 - share/examples/ses/srcs/getencstat.c | 1 - share/examples/ses/srcs/getnobj.c | 1 - share/examples/ses/srcs/getobjmap.c | 1 - share/examples/ses/srcs/getobjstat.c | 1 - share/examples/ses/srcs/inienc.c | 1 - share/examples/ses/srcs/sesd.c | 1 - share/examples/ses/srcs/setencstat.c | 1 - share/examples/ses/srcs/setobjstat.c | 1 - share/examples/sunrpc/msg/msg_proc.c | 1 - share/examples/sunrpc/msg/printmsg.c | 1 - share/examples/tests/tests/atf/printf_test.c | 1 - share/examples/tests/tests/plain/printf_test.c | 1 - share/examples/tests/tests/tap/printf_test.c | 1 - stand/efi/include/Guid/MemoryTypeInformation.h | 1 - stand/efi/include/Guid/MtcVendor.h | 1 - stand/efi/include/Guid/ZeroGuid.h | 1 - stand/efi/include/Protocol/EdidActive.h | 1 - stand/efi/include/Protocol/EdidDiscovered.h | 1 - stand/efi/include/Protocol/EdidOverride.h | 1 - stand/efi/include/Protocol/Http.h | 1 - stand/efi/include/Protocol/Ip4Config2.h | 1 - stand/efi/include/Protocol/ServiceBinding.h | 1 - stand/efi/include/README | 1 - stand/efi/include/amd64/efibind.h | 1 - stand/efi/include/amd64/pe.h | 1 - stand/efi/include/arm/efibind.h | 1 - stand/efi/include/arm64/efibind.h | 1 - stand/efi/include/efi.h | 1 - stand/efi/include/efi_nii.h | 1 - stand/efi/include/efiapi.h | 1 - stand/efi/include/eficon.h | 1 - stand/efi/include/eficonsctl.h | 1 - stand/efi/include/efidebug.h | 1 - stand/efi/include/efidef.h | 1 - stand/efi/include/efidevp.h | 1 - stand/efi/include/efierr.h | 1 - stand/efi/include/efifpswa.h | 1 - stand/efi/include/efifs.h | 1 - stand/efi/include/efigop.h | 1 - stand/efi/include/efigpt.h | 1 - stand/efi/include/efiip.h | 1 - stand/efi/include/efinet.h | 1 - stand/efi/include/efipart.h | 1 - stand/efi/include/efipciio.h | 1 - stand/efi/include/efipoint.h | 1 - stand/efi/include/efiprot.h | 1 - stand/efi/include/efipxebc.h | 1 - stand/efi/include/efiser.h | 1 - stand/efi/include/efistdarg.h | 1 - stand/efi/include/efitcp.h | 1 - stand/efi/include/efiudp.h | 1 - stand/efi/include/efiuga.h | 1 - stand/efi/include/i386/efibind.h | 1 - stand/efi/include/i386/pe.h | 1 - stand/efi/include/riscv/efibind.h | 1 - stand/efi/loader/arch/amd64/ldscript.amd64 | 1 - stand/efi/loader/arch/arm/ldscript.arm | 1 - stand/efi/loader/arch/arm64/ldscript.arm64 | 1 - stand/efi/loader/arch/i386/ldscript.i386 | 1 - stand/efi/loader/arch/riscv/ldscript.riscv | 1 - stand/ficl/aarch64/sysdep.c | 1 - stand/ficl/amd64/sysdep.c | 1 - stand/ficl/amd64/sysdep.h | 1 - stand/ficl/arm/sysdep.c | 1 - stand/ficl/dict.c | 1 - stand/ficl/ficl.c | 1 - stand/ficl/ficl.h | 1 - stand/ficl/fileaccess.c | 1 - stand/ficl/float.c | 1 - stand/ficl/i386/sysdep.c | 1 - stand/ficl/i386/sysdep.h | 1 - stand/ficl/math64.c | 1 - stand/ficl/math64.h | 1 - stand/ficl/mips/sysdep.c | 1 - stand/ficl/mips64/sysdep.c | 1 - stand/ficl/powerpc/sysdep.c | 1 - stand/ficl/prefix.c | 1 - stand/ficl/riscv/sysdep.c | 1 - stand/ficl/search.c | 1 - stand/ficl/stack.c | 1 - stand/ficl/testmain.c | 1 - stand/ficl/tools.c | 1 - stand/ficl/unix.c | 1 - stand/ficl/vm.c | 1 - stand/ficl/words.c | 1 - stand/ficl/x86/sysdep.c | 1 - stand/i386/boot.ldscript | 1 - stand/kboot/arch/aarch64/ldscript.aarch64 | 1 - stand/kboot/arch/amd64/ldscript.amd64 | 1 - stand/kshim/bsd_busspace.c | 1 - stand/kshim/bsd_global.h | 1 - stand/kshim/bsd_kernel.c | 1 - stand/kshim/bsd_kernel.h | 1 - stand/kshim/sysinit.h | 1 - stand/libsa/bootparam.h | 1 - stand/libsa/crc32_libkern.c | 1 - stand/libsa/netif.h | 1 - stand/libsa/nfsv2.h | 1 - stand/libsa/powerpc/_setjmp.S | 1 - stand/powerpc/ofw/ldscript.powerpc | 1 - stand/powerpc/ofw/ldscript.powerpcle | 1 - stand/uboot/arch/arm/ldscript.arm | 1 - stand/uboot/arch/mips/ldscript.mips | 1 - stand/uboot/arch/powerpc/ldscript.powerpc | 1 - stand/usb/storage/umass_common.c | 1 - stand/usb/storage/umass_common.h | 1 - stand/usb/storage/umass_loader.c | 1 - stand/usb/test/bsd_usbloader_test.c | 1 - stand/usb/tools/sysinit.c | 1 - stand/usb/usb_busdma_loader.c | 1 - tests/sys/geom/class/eli/testvect.h | 1 - tests/sys/kqueue/libkqueue/config.h | 1 - tests/sys/mqueue/mqtest1.c | 1 - tests/sys/mqueue/mqtest2.c | 1 - tests/sys/mqueue/mqtest3.c | 1 - tests/sys/mqueue/mqtest4.c | 1 - tests/sys/mqueue/mqtest5.c | 1 - tests/sys/pjdfstest/config.h | 1 - tools/diag/dumpvfscache/dumpvfscache.c | 1 - tools/kerneldoc/subsys/notreviewed.dox | 1 - tools/regression/ccd/layout/a.c | 1 - tools/regression/ccd/layout/b.c | 1 - tools/regression/p1003_1b/main.c | 1 - tools/regression/poll/pipepoll.c | 1 - tools/regression/poll/pipeselect.c | 1 - tools/regression/poll/sockpoll.c | 1 - tools/regression/posixsem2/semtest.c | 1 - tools/regression/pthread/unwind/Test.cpp | 1 - tools/regression/pthread/unwind/catch_pthread_exit.cpp | 1 - tools/regression/pthread/unwind/cond_wait_cancel.cpp | 1 - tools/regression/pthread/unwind/main_thread_exit.cpp | 1 - tools/regression/pthread/unwind/sem_wait_cancel.cpp | 1 - tools/regression/pthread/unwind/thread_normal_exit.cpp | 1 - tools/regression/sigqueue/sigqtest1/sigqtest1.c | 1 - tools/regression/sigqueue/sigqtest2/sigqtest2.c | 1 - tools/regression/tls/libxx/xx.c | 1 - tools/regression/tls/libyy/yy.c | 1 - tools/regression/tls/ttls1/ttls1.c | 1 - tools/regression/tls/ttls2/ttls2.c | 1 - tools/test/malloc/main.c | 1 - tools/tools/ath/ath_ee_9287_print/9287.h | 1 - tools/tools/ath/ath_ee_9287_print/eeprom.h | 1 - tools/tools/ath/ath_ee_v4k_print/eeprom.h | 1 - tools/tools/ath/ath_ee_v4k_print/v4k.h | 1 - tools/tools/crypto/cryptokeytest.c | 1 - tools/tools/iwi/iwistats.c | 1 - tools/tools/kttcp/kttcp.c | 1 - tools/tools/kttcp/sys/kttcp.c | 1 - tools/tools/kttcp/sys/kttcpio.h | 1 - tools/tools/mctest/mctest.h | 1 - tools/tools/ncpus/ncpus.c | 1 - tools/tools/netmap/ctrs.h | 1 - tools/tools/netmap/lb.c | 1 - tools/tools/netmap/pkt_hash.c | 1 - tools/tools/netmap/pkt_hash.h | 1 - tools/tools/usbtest/usb_control_ep_test.c | 1 - tools/tools/usbtest/usb_modem_test.c | 1 - tools/tools/usbtest/usb_msc_test.c | 1 - tools/tools/usbtest/usb_msc_test.h | 1 - tools/tools/usbtest/usbtest.c | 1 - tools/tools/usbtest/usbtest.h | 1 - tools/tools/vhba/faulty/vhba_faulty.c | 1 - tools/tools/vhba/lots/vhba_lots.c | 1 - tools/tools/vhba/medium/vhba_medium.c | 1 - tools/tools/vhba/mptest/vhba_mptest.c | 1 - tools/tools/vhba/opt_cam.h | 1 - tools/tools/vhba/rptluns/vhba_rptluns.c | 1 - tools/tools/vhba/simple/vhba_simple.c | 1 - tools/tools/vhba/vhba.c | 1 - tools/tools/vhba/vhba.h | 1 - tools/tools/zfsboottest/zfsboottest.c | 1 - usr.bin/bc/bc.library | 1 - usr.bin/bc/extern.h | 1 - usr.bin/bc/pathnames.h | 1 - usr.bin/bc/tty.c | 1 - usr.bin/bmake/config.h | 1 - usr.bin/compress/doc/revision.log | 1 - usr.bin/dc/bcode.h | 1 - usr.bin/dc/extern.h | 1 - usr.bin/fortune/strfile/strfile.h | 1 - usr.bin/ftp/tnftp_config.h | 1 - usr.bin/gcore/elf32core.c | 1 - usr.bin/grep/file.c | 1 - usr.bin/grep/grep.c | 1 - usr.bin/grep/grep.h | 1 - usr.bin/grep/queue.c | 1 - usr.bin/grep/util.c | 1 - usr.bin/gzip/unpack.c | 1 - usr.bin/iconv/iconv.c | 1 - usr.bin/indent/tests/binary.0 | 1 - usr.bin/indent/tests/binary.0.stdout | 1 - usr.bin/indent/tests/comments.0 | 1 - usr.bin/indent/tests/comments.0.pro | 1 - usr.bin/indent/tests/comments.0.stdout | 1 - usr.bin/indent/tests/cs.0 | 1 - usr.bin/indent/tests/cs.0.pro | 1 - usr.bin/indent/tests/cs.0.stdout | 1 - usr.bin/indent/tests/declarations.0 | 1 - usr.bin/indent/tests/declarations.0.stdout | 1 - usr.bin/indent/tests/elsecomment.0 | 1 - usr.bin/indent/tests/elsecomment.0.pro | 1 - usr.bin/indent/tests/elsecomment.0.stdout | 1 - usr.bin/indent/tests/f_decls.0 | 1 - usr.bin/indent/tests/f_decls.0.stdout | 1 - usr.bin/indent/tests/float.0 | 1 - usr.bin/indent/tests/float.0.stdout | 1 - usr.bin/indent/tests/label.0 | 1 - usr.bin/indent/tests/label.0.pro | 1 - usr.bin/indent/tests/label.0.stdout | 1 - usr.bin/indent/tests/list_head.0 | 1 - usr.bin/indent/tests/list_head.0.stdout | 1 - usr.bin/indent/tests/ncs.0 | 1 - usr.bin/indent/tests/ncs.0.pro | 1 - usr.bin/indent/tests/ncs.0.stdout | 1 - usr.bin/indent/tests/offsetof.0 | 1 - usr.bin/indent/tests/offsetof.0.stdout | 1 - usr.bin/indent/tests/parens.0 | 1 - usr.bin/indent/tests/parens.0.pro | 1 - usr.bin/indent/tests/parens.0.stdout | 1 - usr.bin/indent/tests/pcs.0 | 1 - usr.bin/indent/tests/pcs.0.pro | 1 - usr.bin/indent/tests/pcs.0.stdout | 1 - usr.bin/indent/tests/struct.0 | 1 - usr.bin/indent/tests/struct.0.stdout | 1 - usr.bin/indent/tests/surplusbad.0 | 1 - usr.bin/indent/tests/surplusbad.0.pro | 1 - usr.bin/indent/tests/surplusbad.0.stdout | 1 - usr.bin/indent/tests/types_from_file.0 | 1 - usr.bin/indent/tests/types_from_file.0.pro | 1 - usr.bin/indent/tests/types_from_file.0.stdout | 1 - usr.bin/indent/tests/wchar.0 | 1 - usr.bin/indent/tests/wchar.0.stdout | 1 - usr.bin/lex/config.h | 1 - usr.bin/mkcsmapper/ldef.h | 1 - usr.bin/mkcsmapper/lex.l | 1 - usr.bin/mkcsmapper/yacc.y | 1 - usr.bin/mkesdb/ldef.h | 1 - usr.bin/mkesdb/lex.l | 1 - usr.bin/mkesdb/yacc.y | 1 - usr.bin/sdiff/extern.h | 1 - usr.bin/sort/bwstring.h | 1 - usr.bin/sort/coll.h | 1 - usr.bin/sort/file.h | 1 - usr.bin/sort/mem.h | 1 - usr.bin/sort/radixsort.h | 1 - usr.bin/sort/sort.h | 1 - usr.bin/sort/vsort.h | 1 - usr.bin/svn/expat.h | 1 - usr.bin/svn/lib/libapr/apr.h | 1 - usr.bin/svn/lib/libapr/apr_escape_test_char.h | 1 - usr.bin/svn/lib/libapr/apr_private.h | 1 - usr.bin/svn/lib/libapr_util/apr_ldap.h | 1 - usr.bin/svn/lib/libapr_util/apu.h | 1 - usr.bin/svn/lib/libapr_util/apu_config.h | 1 - usr.bin/svn/lib/libapr_util/apu_select_dbm.h | 1 - usr.bin/svn/lib/libapr_util/apu_want.h | 1 - usr.bin/svn/lib/libapr_util/expat.h | 1 - usr.bin/svn/svn_private_config.h | 1 - usr.bin/tip/tip/pathnames.h | 1 - usr.bin/tip/tip/tip.h | 1 - usr.bin/top/display.h | 1 - usr.bin/usbhidaction/usbhidaction.c | 1 - usr.bin/usbhidctl/usbhid.c | 1 - usr.bin/vi/config.h | 1 - usr.bin/vi/ex/version.h | 1 - usr.bin/vi/pathnames.h | 1 - usr.bin/wall/ttymsg.h | 1 - usr.bin/yacc/config.h | 1 - usr.sbin/apmd/contrib/pccardq.c | 1 - usr.sbin/bluetooth/btpand/bnep.c | 1 - usr.sbin/bluetooth/btpand/bnep.h | 1 - usr.sbin/bluetooth/btpand/btpand.c | 1 - usr.sbin/bluetooth/btpand/btpand.h | 1 - usr.sbin/bluetooth/btpand/channel.c | 1 - usr.sbin/bluetooth/btpand/client.c | 1 - usr.sbin/bluetooth/btpand/event.c | 1 - usr.sbin/bluetooth/btpand/event.h | 1 - usr.sbin/bluetooth/btpand/packet.c | 1 - usr.sbin/bluetooth/btpand/sdp.c | 1 - usr.sbin/bluetooth/btpand/sdp.h | 1 - usr.sbin/bluetooth/btpand/server.c | 1 - usr.sbin/bluetooth/btpand/tap.c | 1 - usr.sbin/cron/cron/externs.h | 1 - usr.sbin/crunch/crunchide/extern.h | 1 - usr.sbin/dumpcis/cardinfo.h | 1 - usr.sbin/fifolog/flint.lnt | 1 - usr.sbin/kbdcontrol/path.h | 1 - usr.sbin/kldxref/ef.h | 1 - usr.sbin/mailwrapper/pathnames.h | 1 - usr.sbin/makefs/msdos.h | 1 - usr.sbin/makefs/msdos/direntry.h | 1 - usr.sbin/makefs/msdos/msdosfs_fat.c | 1 - usr.sbin/makefs/msdos/msdosfs_lookup.c | 1 - usr.sbin/ndp/ndp.c | 1 - usr.sbin/ntp/config.h | 1 - usr.sbin/ntp/ntpdc/nl.c | 1 - usr.sbin/pciconf/pathnames.h | 1 - usr.sbin/route6d/route6d.c | 1 - usr.sbin/route6d/route6d.h | 1 - usr.sbin/rpc.lockd/lock_proc.c | 1 - usr.sbin/rpc.lockd/lockd.c | 1 - usr.sbin/rpc.lockd/lockd.h | 1 - usr.sbin/rpc.lockd/lockd_lock.h | 1 - usr.sbin/rpcbind/check_bound.c | 1 - usr.sbin/rpcbind/pmap_svc.c | 1 - usr.sbin/rpcbind/rpcb_svc.c | 1 - usr.sbin/rpcbind/rpcb_svc_com.c | 1 - usr.sbin/rpcbind/rpcbind.c | 1 - usr.sbin/rpcbind/rpcbind.h | 1 - usr.sbin/rpcbind/security.c | 1 - usr.sbin/rtadvd/advcap.c | 1 - usr.sbin/rtadvd/advcap.h | 1 - usr.sbin/rtadvd/config.c | 1 - usr.sbin/rtadvd/config.h | 1 - usr.sbin/rtadvd/if.c | 1 - usr.sbin/rtadvd/if.h | 1 - usr.sbin/rtadvd/pathnames.h | 1 - usr.sbin/rtadvd/rrenum.c | 1 - usr.sbin/rtadvd/rrenum.h | 1 - usr.sbin/rtadvd/rtadvd.c | 1 - usr.sbin/rtadvd/rtadvd.h | 1 - usr.sbin/rtadvd/timer.c | 1 - usr.sbin/rtadvd/timer.h | 1 - usr.sbin/rtadvd/timer_subr.c | 1 - usr.sbin/rtadvd/timer_subr.h | 1 - usr.sbin/rtsold/rtsock.c | 1 - usr.sbin/sesutil/eltsub.c | 1 - usr.sbin/sesutil/eltsub.h | 1 - usr.sbin/tcpdump/tcpdump/config.h | 1 - usr.sbin/unbound/config.h | 1 - usr.sbin/usbconfig/dump.c | 1 - usr.sbin/usbconfig/dump.h | 1 - usr.sbin/usbconfig/usbconfig.c | 1 - usr.sbin/valectl/valectl.c | 1 - usr.sbin/vidcontrol/decode.h | 1 - usr.sbin/vidcontrol/path.h | 1 - usr.sbin/ypldap/aldap.c | 1 - usr.sbin/ypldap/aldap.h | 1 - usr.sbin/ypldap/ber.c | 1 - usr.sbin/ypldap/ber.h | 1 - usr.sbin/ypldap/entries.c | 1 - usr.sbin/ypldap/ldapclient.c | 1 - usr.sbin/ypldap/log.c | 1 - usr.sbin/ypldap/parse.y | 1 - usr.sbin/ypldap/yp.c | 1 - usr.sbin/ypldap/ypldap.h | 1 - usr.sbin/ypldap/ypldap_dns.c | 1 - 769 files changed, 769 deletions(-) diff --git a/bin/chio/defs.h b/bin/chio/defs.h index 8f10c9d9243a..6b4381a3d447 100644 --- a/bin/chio/defs.h +++ b/bin/chio/defs.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /*- * Copyright (c) 1996 Jason R. Thorpe diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h index 5b9b1e429dc2..a8308ed7b0ac 100644 --- a/bin/chio/pathnames.h +++ b/bin/chio/pathnames.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /*- * Copyright (c) 1996 Jason R. Thorpe diff --git a/bin/csh/config.h b/bin/csh/config.h index 103ceb604062..6705cc58f5bd 100644 --- a/bin/csh/config.h +++ b/bin/csh/config.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ diff --git a/bin/csh/config_p.h b/bin/csh/config_p.h index c25e87a903ea..8b7ecd20de19 100644 --- a/bin/csh/config_p.h +++ b/bin/csh/config_p.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* * config.h -- configure various defines for tcsh * diff --git a/cddl/compat/opensolaris/include/libintl.h b/cddl/compat/opensolaris/include/libintl.h index da13f4749081..5dbc06a75b2f 100644 --- a/cddl/compat/opensolaris/include/libintl.h +++ b/cddl/compat/opensolaris/include/libintl.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ #ifndef _LIBINTL_H_ #define _LIBINTL_H_ diff --git a/cddl/compat/opensolaris/include/priv.h b/cddl/compat/opensolaris/include/priv.h index 2fee5b0d40c8..182921a02b3f 100644 --- a/cddl/compat/opensolaris/include/priv.h +++ b/cddl/compat/opensolaris/include/priv.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ #ifndef _OPENSOLARIS_PRIV_H_ #define _OPENSOLARIS_PRIV_H_ diff --git a/cddl/compat/opensolaris/include/solaris.h b/cddl/compat/opensolaris/include/solaris.h index 9bead018bcec..b4fb71be92a6 100644 --- a/cddl/compat/opensolaris/include/solaris.h +++ b/cddl/compat/opensolaris/include/solaris.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ #ifndef _SOLARIS_H_ #define _SOLARIS_H_ diff --git a/cddl/compat/opensolaris/include/zone.h b/cddl/compat/opensolaris/include/zone.h index 8c377cf6574d..66a041772963 100644 --- a/cddl/compat/opensolaris/include/zone.h +++ b/cddl/compat/opensolaris/include/zone.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ #ifndef _ZONE_H_ #define _ZONE_H_ diff --git a/include/getopt.h b/include/getopt.h index 4c0399db8545..caeef8ff5ed7 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -1,5 +1,4 @@ /* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */ -/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause diff --git a/include/gssapi.h b/include/gssapi.h index 5557de8f7356..560edb730960 100644 --- a/include/gssapi.h +++ b/include/gssapi.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ #ifdef __GNUC__ #warning "this file includes which is deprecated, use instead" #endif diff --git a/include/hesiod.h b/include/hesiod.h index a06b69d32413..1fb96b4dc0e0 100644 --- a/include/hesiod.h +++ b/include/hesiod.h @@ -1,5 +1,4 @@ /* $NetBSD: hesiod.h,v 1.3 1999/01/24 23:53:18 lukem Exp $ */ -/* $FreeBSD$ */ /*- diff --git a/include/iconv.h b/include/iconv.h index 338ca1544d8a..05e7427a4bf0 100644 --- a/include/iconv.h +++ b/include/iconv.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $ */ /*- diff --git a/include/ieeefp.h b/include/ieeefp.h index 3f64555d5a14..0639150e40b9 100644 --- a/include/ieeefp.h +++ b/include/ieeefp.h @@ -1,5 +1,4 @@ /* $NetBSD: ieeefp.h,v 1.4 1998/01/09 08:03:43 perry Exp $ */ -/* $FreeBSD$ */ /* * Written by J.T. Conklin, Apr 6, 1995 diff --git a/include/ifaddrs.h b/include/ifaddrs.h index 5e1953639af6..08a4a695b89f 100644 --- a/include/ifaddrs.h +++ b/include/ifaddrs.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-1-Clause diff --git a/include/libgen.h b/include/libgen.h index 615d1dd6202e..036362ebcb9a 100644 --- a/include/libgen.h +++ b/include/libgen.h @@ -1,5 +1,4 @@ /* $OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $ */ -/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/netconfig.h b/include/netconfig.h index c4aec6a3e791..6185d6890dfa 100644 --- a/include/netconfig.h +++ b/include/netconfig.h @@ -1,5 +1,4 @@ /* $NetBSD: netconfig.h,v 1.6 2008/04/28 20:22:54 martin Exp $ */ -/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause diff --git a/include/nsswitch.h b/include/nsswitch.h index e44a9e4a44a3..b94ffdcab291 100644 --- a/include/nsswitch.h +++ b/include/nsswitch.h @@ -1,5 +1,4 @@ /* $NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $ */ -/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause diff --git a/include/readpassphrase.h b/include/readpassphrase.h index fd54642da21b..9dfef0bc9f25 100644 --- a/include/readpassphrase.h +++ b/include/readpassphrase.h @@ -1,5 +1,4 @@ /* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */ -/* $FreeBSD$ */ /*- * SPDX-License-Identifier: ISC diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h index 3b860d8c7ac3..d395dbf49a46 100644 --- a/include/rpc/auth_des.h +++ b/include/rpc/auth_des.h @@ -1,5 +1,4 @@ /* @(#)auth_des.h 2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI */ -/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-3-Clause * diff --git a/include/rpc/auth_kerb.h b/include/rpc/auth_kerb.h index 29b09d507006..726741f91ddb 100644 --- a/include/rpc/auth_kerb.h +++ b/include/rpc/auth_kerb.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-3-Clause * diff --git a/include/rpc/clnt_soc.h b/include/rpc/clnt_soc.h index c16609bb6aac..e20edc4cca0a 100644 --- a/include/rpc/clnt_soc.h +++ b/include/rpc/clnt_soc.h @@ -1,5 +1,4 @@ /* $NetBSD: clnt_soc.h,v 1.1 2000/06/02 22:57:55 fvdl Exp $ */ -/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-3-Clause *** 7019 LINES SKIPPED *** From nobody Wed Aug 23 17:49: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 4RWDHm3WHwz4r96q; Wed, 23 Aug 2023 17:49: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 4RWDHm2d5Zz4Sv9; Wed, 23 Aug 2023 17:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zVgW+BunagleHfptX04l6xTWQHOm0RlJr/hLbajAEkQ=; b=JVMXysSvmYoaGZzkiOBvrcTsbWvag83nb1rldGlOl57lEtgTxQ97XYIjt/NvTrRdsV24wQ JRD3u8h3FelF9N1e3bGIlPbEWWddWu7hh9MuzR1/QuufRLKz2ZXPtcW6qa97P5f5AkjSc0 20fxer7+6o7ThupRTI1S/xOIKCOUPs5JfXqpcOnj2lvk4vW/XYZHyHWZ+vsUlXT7T+XBGL /SGeaWO2g+fq/gmT2VYhZbTKNJD3Jwv/WJkHJWoWQLr6l4U/cd7KkpezSv3pI3NZOhiDX6 4q2tZ1AKnTkZEGqE8QhYnu1rkzBtJaHxx8wh2Yl+kB2rFsd0RLA2unGmCSQ/aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zVgW+BunagleHfptX04l6xTWQHOm0RlJr/hLbajAEkQ=; b=Aud6Tddc7LNwV9psZyFfEVuZ8H/Ae657WHMfJ336Usc2P1k2S06YXuAWVT6GKT/3dBjoMI tdAn5N8BjI735B+GDCjxiot0mYkNs8G/dQR9pruuDYQyd7ttoyEZQFuwUBSJA4z4xyVBoN T0E6tZzEfJrqIvUYTOXFbk+X58rh29LZkgWPkyKymqxz0b+Roryo91oyhEfoVl1LX0PdA/ BEYkY2oQOoiXKIMzadqZzf2Vco22L60LYqXk+tcxlb6cLCFbJeT+507g7JigfhhHPp0oyk FDJGrHXwb/DdIXGP8cqONz1i4z2cQwyhlwvasNTi34JTHJhZpGJpF2wlqwWNbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812980; a=rsa-sha256; cv=none; b=rR6Wbc+wAjgAFz1duV6PeHfb2EhqQSuT4Y8BViajdbd7CN7wUHyzJSgCqwo9qr2qWfFA4V PRfusU7Nflk977vmkf6X8VuXE/BncZ+Tq7d0GJAMpeOSg7gHkOOs17bMkQVyvHc77C/eKt Ivry2NZLFpzqr3VOt6era+KpH9dORo6cRkq+HB7/VBYnJzV603N6yAYsBSQU0ZyAFFi32H KrVqXotbSrdCyl3yiuLTi0Im/5YRZY4l1JynCkKmWumLM0chCiqaBNDeAADzgNGKmKSyJJ pGhvPG2OyDp601+WMNUd+4JOQqk6DEyA2/Muh1CKac3oKZO1s7Tkxf1qwwGGOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHm1kMzzvL4; Wed, 23 Aug 2023 17:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHne8X040791; Wed, 23 Aug 2023 17:49:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHne32040788; Wed, 23 Aug 2023 17:49:40 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:40 GMT Message-Id: <202308231749.37NHne32040788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: ecf688348bd2 - stable/13 - sys: Remove $FreeBSD$: two-line .c pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ecf688348bd2c1e292b64a1a37b1d0f545aaa11e Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ecf688348bd2c1e292b64a1a37b1d0f545aaa11e commit ecf688348bd2c1e292b64a1a37b1d0f545aaa11e Author: Warner Losh AuthorDate: 2023-08-22 01:31:20 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:23 +0000 sys: Remove $FreeBSD$: two-line .c pattern Remove /^#include\s+.*$\n\s+__FBSDID\("\$FreeBSD\$"\);\n/ Similar commit in current: (cherry picked from commit dfc016587a1e) --- sys/arm/broadcom/bcm2835/bcm2835_rng.c | 3 --- sys/arm/freescale/imx/imx6_ahci.c | 3 --- sys/dev/gpio/gpiopower.c | 3 --- sys/dev/videomode/vesagtf.c | 3 --- sys/fs/autofs/autofs_vfsops.c | 2 -- sys/fs/tmpfs/tmpfs_fifoops.c | 2 -- sys/net/rss_config.c | 3 --- sys/netinet/in_pcbgroup.c | 3 --- sys/netinet/in_rss.c | 3 --- sys/netinet6/in6_pcbgroup.c | 3 --- sys/netinet6/in6_rss.c | 3 --- 11 files changed, 31 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_rng.c b/sys/arm/broadcom/bcm2835/bcm2835_rng.c index c403bc3542e0..e7a4cfbabe91 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_rng.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_rng.c @@ -24,9 +24,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/arm/freescale/imx/imx6_ahci.c b/sys/arm/freescale/imx/imx6_ahci.c index 8b49c71c34a0..69c4af40f9c0 100644 --- a/sys/arm/freescale/imx/imx6_ahci.c +++ b/sys/arm/freescale/imx/imx6_ahci.c @@ -24,9 +24,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/dev/gpio/gpiopower.c b/sys/dev/gpio/gpiopower.c index 98b635e3fd2a..a3dd8b02622f 100644 --- a/sys/dev/gpio/gpiopower.c +++ b/sys/dev/gpio/gpiopower.c @@ -24,9 +24,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/dev/videomode/vesagtf.c b/sys/dev/videomode/vesagtf.c index c02c421c14ac..077cf7d1a0ea 100644 --- a/sys/dev/videomode/vesagtf.c +++ b/sys/dev/videomode/vesagtf.c @@ -150,9 +150,6 @@ */ #ifdef _KERNEL -#include - -__FBSDID("$FreeBSD$"); #include #include #include diff --git a/sys/fs/autofs/autofs_vfsops.c b/sys/fs/autofs/autofs_vfsops.c index 07bec01517c8..473a0b2280ac 100644 --- a/sys/fs/autofs/autofs_vfsops.c +++ b/sys/fs/autofs/autofs_vfsops.c @@ -29,8 +29,6 @@ * */ -#include - __FBSDID("$FreeBSD$"); #include #include diff --git a/sys/fs/tmpfs/tmpfs_fifoops.c b/sys/fs/tmpfs/tmpfs_fifoops.c index 75122b10eacc..fba24e02a71e 100644 --- a/sys/fs/tmpfs/tmpfs_fifoops.c +++ b/sys/fs/tmpfs/tmpfs_fifoops.c @@ -35,8 +35,6 @@ /* * tmpfs vnode interface for named pipes. */ -#include - __FBSDID("$FreeBSD$"); #include #include diff --git a/sys/net/rss_config.c b/sys/net/rss_config.c index 0b559307f1bb..9a636845d75a 100644 --- a/sys/net/rss_config.c +++ b/sys/net/rss_config.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_pcbgroup.h" diff --git a/sys/netinet/in_pcbgroup.c b/sys/netinet/in_pcbgroup.c index c48046b2acbc..0683f37a0e5f 100644 --- a/sys/netinet/in_pcbgroup.c +++ b/sys/netinet/in_pcbgroup.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_rss.h" diff --git a/sys/netinet/in_rss.c b/sys/netinet/in_rss.c index e73d2d236f92..72dfbf63f98c 100644 --- a/sys/netinet/in_rss.c +++ b/sys/netinet/in_rss.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_pcbgroup.h" diff --git a/sys/netinet6/in6_pcbgroup.c b/sys/netinet6/in6_pcbgroup.c index 7982c1edc646..3a72be553ca3 100644 --- a/sys/netinet6/in6_pcbgroup.c +++ b/sys/netinet6/in6_pcbgroup.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_rss.h" diff --git a/sys/netinet6/in6_rss.c b/sys/netinet6/in6_rss.c index 2b86d961515b..9308c758b5cc 100644 --- a/sys/netinet6/in6_rss.c +++ b/sys/netinet6/in6_rss.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_pcbgroup.h" From nobody Wed Aug 23 17: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 4RWDHp0Rjjz4r9XS; Wed, 23 Aug 2023 17:49: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 4RWDHn3903z4Sry; Wed, 23 Aug 2023 17:49:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GU5Ljth4ZGG0L0K/Z1YqgdKl0yW3z46rSJs/0KeDpEA=; b=LmpbdEzUi9FgjkPyIeFE6wIg6Q+t+Mtv9wEGZ69CpTD/luZtG6f7bdkbKyNj6QUjtcrZ6Q ayhtMQiIyKYXqQJm+Aa11SJ6F7aQKBs1uYsiSSWsjdmPOgXkXZ/DwBmuQenNUppRhl5yuJ h4C9kiwXzod6nKI5dheP9+iNbQpeQsZZ7a95c0oSmXZiVMqK/9OmJRWZoW2tBL8AxKzpGl qhL6YSqIx1ux25+D6MJWXa+y9LKCF381eAv4QJTOSGpSEhGui0hDiZ1bSEyFcIya/FYcLl Uja5aE1+DJxx7EP54BjVDPsHGc26BA0snng03GT3ID0dq3+pwHYXyVZpERHQ+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GU5Ljth4ZGG0L0K/Z1YqgdKl0yW3z46rSJs/0KeDpEA=; b=Mv3z90tE7Nv9e5nm1YEFOqanYIemJvwYOrxuuoJPj7CMJJvZWMdlDJJCw1IWnxyH0BunS+ ZwiI6tMPXTNFsyu5XDemSf0HGDEFMOvCmIbtBlWLr7fkwnDn9FwzX/vQ29R8i5XGtUNz+y qMbSifpBEhEuHYGSJHv+p1JnMAqgWbp55Bp9ZKUypUKFKtX+KNPJzbPfuvS0VJ22m2EzE9 XzxWFXNu2prGTTGMPf5rHCDzoFTcc4PPno9xlC6HMZ70tQTxSiATJ5tiFS+b9BbO+RjZxs 6KzI5fECHvajS9mOW5icj7EBd8CKwWL1h03eaElTgb5EuIffSB81tlugCvwqoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812981; a=rsa-sha256; cv=none; b=UpZlBgtbjIUd1ZZefb8x0uUTVIJPvd8MZplBKxFPC1fdRQAihsRMwPvPUk+YWPe8qx/6Rz g4MwsJu1Lmyt+mzxhQc6YR+fj6/9ndrUtnQfq8tbISVIRQALUMaCoJ/1aKeDvc5sL7NF8P oertlYIqIMEENCKeBM63gMaCa53s/yJ6L4STvewG4FtkowuGy7KSzPSB4GYBo2PVj3+ps9 qyhRS0pVj+OdJBiLVqNcvuFBJcsg7OHvyWkx3jTctic8amXMA2j0DZBVQV/YJcEsPuKwtv Gin1wKqS41Y98T5G8Q1joeiTAuaVbeKgEsVSN6eJgjL+TlldKI8IgXOU8jGeEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHn2FD1ztxP; Wed, 23 Aug 2023 17:49:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnfIr040833; Wed, 23 Aug 2023 17:49:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnfqa040831; Wed, 23 Aug 2023 17:49:41 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:41 GMT Message-Id: <202308231749.37NHnfqa040831@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 0d349c19beda - stable/13 - Remove $FreeBSD$: two-line .c pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0d349c19beda4185496f7a81330e0961a462512d Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0d349c19beda4185496f7a81330e0961a462512d commit 0d349c19beda4185496f7a81330e0961a462512d Author: Warner Losh AuthorDate: 2023-08-22 01:31:23 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:23 +0000 Remove $FreeBSD$: two-line .c pattern Remove /^#include\s+.*$\n\s+__FBSDID\("\$FreeBSD\$"\);\n/ Similar commit in main: (cherry picked from commit e5d258c9e599) --- usr.bin/netstat/netisr.c | 3 --- usr.bin/rup/rup.c | 3 --- usr.bin/rusers/rusers.c | 3 --- usr.bin/systat/cmds.c | 3 --- usr.bin/systat/cmdtab.c | 3 --- usr.bin/systat/devs.c | 3 --- usr.bin/systat/fetch.c | 3 --- usr.bin/systat/icmp.c | 3 --- usr.bin/systat/icmp6.c | 3 --- usr.bin/systat/iostat.c | 3 --- usr.bin/systat/ip.c | 3 --- usr.bin/systat/ip6.c | 3 --- usr.bin/systat/keyboard.c | 3 --- usr.bin/systat/main.c | 3 --- usr.bin/systat/mode.c | 3 --- usr.bin/systat/netcmds.c | 3 --- usr.bin/systat/netstat.c | 3 --- usr.bin/systat/swap.c | 3 --- usr.bin/systat/vmstat.c | 3 --- usr.bin/tail/forward.c | 3 --- usr.bin/tail/misc.c | 3 --- usr.bin/tail/read.c | 3 --- usr.bin/tail/tail.c | 3 --- usr.bin/talk/ctl.c | 3 --- usr.bin/talk/ctl_transact.c | 3 --- usr.bin/talk/display.c | 3 --- usr.bin/talk/get_addrs.c | 3 --- usr.bin/talk/get_iface.c | 3 --- usr.bin/talk/get_names.c | 3 --- usr.bin/talk/init_disp.c | 3 --- usr.bin/talk/invite.c | 3 --- usr.bin/talk/io.c | 3 --- usr.bin/talk/look_up.c | 3 --- usr.bin/talk/msgs.c | 3 --- usr.bin/talk/talk.c | 3 --- usr.bin/tcopy/tcopy.c | 3 --- usr.bin/touch/touch.c | 3 --- usr.bin/tput/tput.c | 3 --- usr.bin/tr/str.c | 3 --- usr.bin/tr/tr.c | 3 --- usr.bin/tset/map.c | 3 --- usr.bin/tset/misc.c | 3 --- usr.bin/tset/set.c | 3 --- usr.bin/tset/term.c | 3 --- usr.bin/tset/tset.c | 3 --- usr.bin/tset/wrterm.c | 3 --- usr.bin/uname/uname.c | 3 --- usr.bin/unexpand/unexpand.c | 3 --- usr.bin/vgrind/regexp.c | 3 --- usr.bin/vgrind/vfontedpr.c | 3 --- usr.bin/w/pr_time.c | 3 --- usr.bin/w/w.c | 3 --- usr.bin/wall/ttymsg.c | 3 --- usr.bin/wall/wall.c | 3 --- usr.bin/what/what.c | 3 --- usr.bin/which/which.c | 3 --- usr.bin/xstr/xstr.c | 3 --- usr.bin/ypcat/ypcat.c | 3 --- usr.bin/ypmatch/ypmatch.c | 3 --- 59 files changed, 177 deletions(-) diff --git a/usr.bin/netstat/netisr.c b/usr.bin/netstat/netisr.c index bcb9351353c5..a3eb976d84bf 100644 --- a/usr.bin/netstat/netisr.c +++ b/usr.bin/netstat/netisr.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c index aae3639b64d4..5f605f55b413 100644 --- a/usr.bin/rup/rup.c +++ b/usr.bin/rup/rup.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c index 838e231ca02a..413de53c304b 100644 --- a/usr.bin/rusers/rusers.c +++ b/usr.bin/rusers/rusers.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c index aa16167c96b5..5d20cd4175de 100644 --- a/usr.bin/systat/cmds.c +++ b/usr.bin/systat/cmds.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/29/95"; diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c index 52329948748b..d14084f60269 100644 --- a/usr.bin/systat/cmdtab.c +++ b/usr.bin/systat/cmdtab.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c index 87d04f989ea3..40a65708fe99 100644 --- a/usr.bin/systat/devs.c +++ b/usr.bin/systat/devs.c @@ -57,9 +57,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)disks.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c index e24d0b8ee6ee..1b7a884159bd 100644 --- a/usr.bin/systat/fetch.c +++ b/usr.bin/systat/fetch.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)fetch.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c index 4b3a56640267..a1c25e37ed2a 100644 --- a/usr.bin/systat/icmp.c +++ b/usr.bin/systat/icmp.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/icmp6.c b/usr.bin/systat/icmp6.c index 2853b90eff29..d7d612604475 100644 --- a/usr.bin/systat/icmp6.c +++ b/usr.bin/systat/icmp6.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c index 8767a046d81a..c6168b625c4e 100644 --- a/usr.bin/systat/iostat.c +++ b/usr.bin/systat/iostat.c @@ -56,9 +56,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)iostat.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c index f177a6cd0ff8..bc90ff557e20 100644 --- a/usr.bin/systat/ip.c +++ b/usr.bin/systat/ip.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/ip6.c b/usr.bin/systat/ip6.c index ac9063f48fce..c7d9d477ada9 100644 --- a/usr.bin/systat/ip6.c +++ b/usr.bin/systat/ip6.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/keyboard.c b/usr.bin/systat/keyboard.c index a3401506c5ce..aac7d1a2bb79 100644 --- a/usr.bin/systat/keyboard.c +++ b/usr.bin/systat/keyboard.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)keyboard.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index 7fdab312830e..e6fc79b7ba59 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c index a3fdf46c3b5d..28bc47a92351 100644 --- a/usr.bin/systat/mode.c +++ b/usr.bin/systat/mode.c @@ -56,9 +56,6 @@ * mode in the command line. */ -#include - -__FBSDID("$FreeBSD$"); #include diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c index 8d5e48fdeb52..6320dd21562d 100644 --- a/usr.bin/systat/netcmds.c +++ b/usr.bin/systat/netcmds.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)netcmds.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c index a9487c4dcc9d..fc8e05a6b107 100644 --- a/usr.bin/systat/netstat.c +++ b/usr.bin/systat/netstat.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c index 19374918ff68..5aa9e3fe0363 100644 --- a/usr.bin/systat/swap.c +++ b/usr.bin/systat/swap.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)swap.c 8.3 (Berkeley) 4/29/95"; diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c index cfc88f83a5bd..9bdb27291529 100644 --- a/usr.bin/systat/vmstat.c +++ b/usr.bin/systat/vmstat.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94"; diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c index 878cb5a4550b..48516a730a50 100644 --- a/usr.bin/tail/forward.c +++ b/usr.bin/tail/forward.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)forward.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c index 537cf00ccfe3..21d0db8b5d40 100644 --- a/usr.bin/tail/misc.c +++ b/usr.bin/tail/misc.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c index 1e757c86195c..ff025b31d64c 100644 --- a/usr.bin/tail/read.c +++ b/usr.bin/tail/read.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c index 8a65683bef7e..9e63353f9b40 100644 --- a/usr.bin/tail/tail.c +++ b/usr.bin/tail/tail.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c index abfd5e6b30ed..c9bd6f77fb81 100644 --- a/usr.bin/talk/ctl.c +++ b/usr.bin/talk/ctl.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)ctl.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c index 650134da6ca6..c51bbed28437 100644 --- a/usr.bin/talk/ctl_transact.c +++ b/usr.bin/talk/ctl_transact.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)ctl_transact.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c index 9987194fcbb9..5f29cfd600d9 100644 --- a/usr.bin/talk/display.c +++ b/usr.bin/talk/display.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c index 53b841cee2ca..678fabce9aa2 100644 --- a/usr.bin/talk/get_addrs.c +++ b/usr.bin/talk/get_addrs.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)get_addrs.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c index 96d3d6edabb5..5c69046c680e 100644 --- a/usr.bin/talk/get_iface.c +++ b/usr.bin/talk/get_iface.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); /* * From: diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c index 3ca362ad9bff..78b025144328 100644 --- a/usr.bin/talk/get_names.c +++ b/usr.bin/talk/get_names.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)get_names.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c index a3f125792254..936b9799a22c 100644 --- a/usr.bin/talk/init_disp.c +++ b/usr.bin/talk/init_disp.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)init_disp.c 8.2 (Berkeley) 2/16/94"; diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c index e000e54b0c35..78f92ed9cdbf 100644 --- a/usr.bin/talk/invite.c +++ b/usr.bin/talk/invite.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)invite.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c index 9cf7ad8346eb..c47bf928712b 100644 --- a/usr.bin/talk/io.c +++ b/usr.bin/talk/io.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c index 3c676b9c1ea2..3fb6cbb43037 100644 --- a/usr.bin/talk/look_up.c +++ b/usr.bin/talk/look_up.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)look_up.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c index e0886e9477f7..a40df7ff17e9 100644 --- a/usr.bin/talk/msgs.c +++ b/usr.bin/talk/msgs.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)msgs.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c index 4b7e748e2f09..04c8572a04b4 100644 --- a/usr.bin/talk/talk.c +++ b/usr.bin/talk/talk.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)talk.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c index 24dcc969a9af..3db554fb1f49 100644 --- a/usr.bin/tcopy/tcopy.c +++ b/usr.bin/tcopy/tcopy.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index 1594eacb67d0..91abcfd447ea 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c index 8f678f61b1a0..c6308b4180df 100644 --- a/usr.bin/tput/tput.c +++ b/usr.bin/tput/tput.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c index 2cd811ce5d6b..bd02eafbdff5 100644 --- a/usr.bin/tr/str.c +++ b/usr.bin/tr/str.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)str.c 8.2 (Berkeley) 4/28/95"; diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index 2d1baad2ac09..4bd52fae1a08 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c index 4fa6d859f055..a546267397fa 100644 --- a/usr.bin/tset/map.c +++ b/usr.bin/tset/map.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/9/93"; diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c index 737fde9dc130..8e7cde12e798 100644 --- a/usr.bin/tset/misc.c +++ b/usr.bin/tset/misc.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/9/93"; diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c index df204cebeebe..34bdc44431b0 100644 --- a/usr.bin/tset/set.c +++ b/usr.bin/tset/set.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)set.c 8.2 (Berkeley) 2/28/94"; diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c index 1c0196b1473c..08715fa268cd 100644 --- a/usr.bin/tset/term.c +++ b/usr.bin/tset/term.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)term.c 8.1 (Berkeley) 6/9/93"; diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c index be6fbf3abd2d..56cff3ca741b 100644 --- a/usr.bin/tset/tset.c +++ b/usr.bin/tset/tset.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c index cd98558f20a9..44fd55dfd989 100644 --- a/usr.bin/tset/wrterm.c +++ b/usr.bin/tset/wrterm.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)wrterm.c 8.1 (Berkeley) 6/9/93"; diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c index 109505e4b9da..981d08a7a7c0 100644 --- a/usr.bin/uname/uname.c +++ b/usr.bin/uname/uname.c @@ -34,9 +34,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c index 08ba8ffe1dc4..116c4e02af4c 100644 --- a/usr.bin/unexpand/unexpand.c +++ b/usr.bin/unexpand/unexpand.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c index 572f44d2aeed..97e5ef68cb9f 100644 --- a/usr.bin/vgrind/regexp.c +++ b/usr.bin/vgrind/regexp.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c index 235073094296..dab2a3699008 100644 --- a/usr.bin/vgrind/vfontedpr.c +++ b/usr.bin/vgrind/vfontedpr.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c index 20b75704c309..7be11b777e79 100644 --- a/usr.bin/w/pr_time.c +++ b/usr.bin/w/pr_time.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)pr_time.c 8.2 (Berkeley) 4/4/94"; diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index 5ba9f49cdd35..7c67a851ca99 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c index beae788a9ba2..dc149db84885 100644 --- a/usr.bin/wall/ttymsg.c +++ b/usr.bin/wall/ttymsg.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)ttymsg.c 8.2 (Berkeley) 11/16/93"; diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c index a02f103cb80f..992bc9f77b22 100644 --- a/usr.bin/wall/wall.c +++ b/usr.bin/wall/wall.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c index 6d59f70cb589..5cd6a85f35bf 100644 --- a/usr.bin/what/what.c +++ b/usr.bin/what/what.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c index abc23c876b2e..f6ee25f60cce 100644 --- a/usr.bin/which/which.c +++ b/usr.bin/which/which.c @@ -26,9 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c index da96581c3f2b..b1a5bf58ae01 100644 --- a/usr.bin/xstr/xstr.c +++ b/usr.bin/xstr/xstr.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c index 3d927ba0e839..0b3b1c9879c8 100644 --- a/usr.bin/ypcat/ypcat.c +++ b/usr.bin/ypcat/ypcat.c @@ -28,9 +28,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c index a110abaeafe5..24af4b8c8993 100644 --- a/usr.bin/ypmatch/ypmatch.c +++ b/usr.bin/ypmatch/ypmatch.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include From nobody Wed Aug 23 17:49: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 4RWDHt0HShz4r9cG; Wed, 23 Aug 2023 17:49: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 4RWDHs6BKHz4THy; Wed, 23 Aug 2023 17:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SqBQQ6DSgNoMAfaSVmqD1vRskruHf7ICLR0mCxRtN/Q=; b=pkw9o/1597zsJgHo/XRIiunIaOE4J6QZPYj213h8bPG3t+ZIMaYiD0P8vA/5u4mNC7tHK4 h9mC/YGlNA5XWRtzydsSE/n6tkhfF/r8xO5ApJqF3JAyoa/OmcHEu4+wgJJWOrnWiuVktZ WS6bE7S0s6SpLv0pU2cQUm74jESsMX/Kn0gXRq40di+jL6465IcdggrEcSB8iigxPDS47c Tt1DYdSi3YRCE36610UYgZjjMh1r3+gMEEypLwmgoTKndZZGW8b9o41OWuLg8ZywUJ1ERI BbMwEWqJ2tQgZBi+ukCFqQ/upOdL9uXZZFHMNt9R+K97srcAEFefdJCdUP7CeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SqBQQ6DSgNoMAfaSVmqD1vRskruHf7ICLR0mCxRtN/Q=; b=yBgWkmOeE7gKwfniOb3bc4Efdu6SidhDtAk+13FftK+u7nPTET+o/+cYOIz0lBhtsq0Y4S leldM63xxjzie0+1mF+yPJw7hTsLp57ZVlIRZyZXinF0RnP3RGNn6zzQH0Q8P796J3cQE3 rOUJyT6nv5VOEOmN8UoLufXVzg4qUT/6eI0ehyxE6Xug439kBz86mVv288Royeudaw2bgt lbojdy/rw2d95CJwSHAniMnim/fhcSatiIM2Unumnx3homy+WfGSlvLzOe7R0jcmRlSV/w cVGi85zl16LPRvBeiIImBOFXf4J+WAIwrSh8AA6En203iBGfQwuExdYP2r01YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812985; a=rsa-sha256; cv=none; b=ip4I1JQrtlA+i/0fbfuwIKYq3T6MaIYrSf1Akq+5LuX9e0alkyo6xFnAb/JbRDOOVVO6vq 48Utf51v+Wc6/PGU8jPPWm78QvN+dBxyk6izld8pkZp8xh/VZ6o74Z9b/o6svMaUGp2MNl Rs75xn55golT98AbhLEOz6q9YsCQ2cq+JAdFFt3SVkC8qydmqsnYkiX+PFdBLituaYOI3X 1PTtyDi8w9j9PqXVrmvTHDjf0dBUxMhqJP4RbfgDHGxhDXw6HffBObK5p0nddqwcjZLjJ8 zlOe6pF2j9H2iWR0wuHaApPhq6iNC/yMNGZtLtRX9i8p+htK4A4MIYLJlNxffg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHs5GWcztsW; Wed, 23 Aug 2023 17:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnjbd040891; Wed, 23 Aug 2023 17:49:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHngCP040875; Wed, 23 Aug 2023 17:49:42 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:42 GMT Message-Id: <202308231749.37NHngCP040875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 3bc80996974a - stable/13 - sys: Remove $FreeBSD$: one-line .c pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3bc80996974a61a4223eae4c1ccd47b6ee32a48a Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3bc80996974a61a4223eae4c1ccd47b6ee32a48a commit 3bc80996974a61a4223eae4c1ccd47b6ee32a48a Author: Warner Losh AuthorDate: 2023-08-22 01:31:27 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:25 +0000 sys: Remove $FreeBSD$: one-line .c pattern Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/ Similar commit in current: (cherry picked from commit 685dc743dc3b) --- sys/amd64/acpica/acpi_machdep.c | 2 -- sys/amd64/acpica/acpi_wakeup.c | 2 -- sys/amd64/amd64/bios.c | 2 -- sys/amd64/amd64/bpf_jit_machdep.c | 2 -- sys/amd64/amd64/copyout.c | 2 -- sys/amd64/amd64/db_disasm.c | 2 -- sys/amd64/amd64/db_interface.c | 2 -- sys/amd64/amd64/db_trace.c | 2 -- sys/amd64/amd64/efirt_machdep.c | 2 -- sys/amd64/amd64/elf_machdep.c | 2 -- sys/amd64/amd64/exec_machdep.c | 2 -- sys/amd64/amd64/fpu.c | 2 -- sys/amd64/amd64/gdb_machdep.c | 2 -- sys/amd64/amd64/genassym.c | 2 -- sys/amd64/amd64/initcpu.c | 2 -- sys/amd64/amd64/io.c | 2 -- sys/amd64/amd64/machdep.c | 2 -- sys/amd64/amd64/mem.c | 2 -- sys/amd64/amd64/minidump_machdep.c | 2 -- sys/amd64/amd64/mp_machdep.c | 2 -- sys/amd64/amd64/pmap.c | 2 -- sys/amd64/amd64/prof_machdep.c | 2 -- sys/amd64/amd64/ptrace_machdep.c | 2 -- sys/amd64/amd64/sys_machdep.c | 2 -- sys/amd64/amd64/trap.c | 2 -- sys/amd64/amd64/uio_machdep.c | 2 -- sys/amd64/amd64/uma_machdep.c | 2 -- sys/amd64/amd64/vm_machdep.c | 2 -- sys/amd64/cloudabi32/cloudabi32_sysvec.c | 2 -- sys/amd64/cloudabi64/cloudabi64_sysvec.c | 2 -- sys/amd64/ia32/ia32_misc.c | 2 -- sys/amd64/ia32/ia32_reg.c | 2 -- sys/amd64/ia32/ia32_signal.c | 2 -- sys/amd64/ia32/ia32_syscall.c | 2 -- sys/amd64/linux/linux_dummy_machdep.c | 2 -- sys/amd64/linux/linux_genassym.c | 2 -- sys/amd64/linux/linux_machdep.c | 2 -- sys/amd64/linux/linux_sysvec.c | 2 -- sys/amd64/linux/linux_vdso_gtod.c | 2 -- sys/amd64/linux32/linux32_dummy_machdep.c | 2 -- sys/amd64/linux32/linux32_genassym.c | 2 -- sys/amd64/linux32/linux32_machdep.c | 2 -- sys/amd64/linux32/linux32_sysvec.c | 2 -- sys/amd64/linux32/linux32_vdso_gtod.c | 2 -- sys/amd64/pci/pci_cfgreg.c | 2 -- sys/amd64/sgx/sgx.c | 2 -- sys/amd64/sgx/sgx_linux.c | 2 -- sys/amd64/vmm/amd/amdiommu.c | 2 -- sys/amd64/vmm/amd/amdv.c | 2 -- sys/amd64/vmm/amd/amdvi_hw.c | 2 -- sys/amd64/vmm/amd/ivrs_drv.c | 2 -- sys/amd64/vmm/amd/npt.c | 2 -- sys/amd64/vmm/amd/svm.c | 2 -- sys/amd64/vmm/amd/svm_genassym.c | 2 -- sys/amd64/vmm/amd/svm_msr.c | 2 -- sys/amd64/vmm/amd/vmcb.c | 2 -- sys/amd64/vmm/intel/ept.c | 2 -- sys/amd64/vmm/intel/vmcs.c | 2 -- sys/amd64/vmm/intel/vmx.c | 2 -- sys/amd64/vmm/intel/vmx_genassym.c | 2 -- sys/amd64/vmm/intel/vmx_msr.c | 2 -- sys/amd64/vmm/intel/vtd.c | 2 -- sys/amd64/vmm/io/iommu.c | 2 -- sys/amd64/vmm/io/ppt.c | 2 -- sys/amd64/vmm/io/vatpic.c | 2 -- sys/amd64/vmm/io/vatpit.c | 2 -- sys/amd64/vmm/io/vhpet.c | 2 -- sys/amd64/vmm/io/vioapic.c | 2 -- sys/amd64/vmm/io/vlapic.c | 2 -- sys/amd64/vmm/io/vpmtmr.c | 2 -- sys/amd64/vmm/io/vrtc.c | 2 -- sys/amd64/vmm/vmm.c | 2 -- sys/amd64/vmm/vmm_dev.c | 2 -- sys/amd64/vmm/vmm_host.c | 2 -- sys/amd64/vmm/vmm_instruction_emul.c | 2 -- sys/amd64/vmm/vmm_ioport.c | 2 -- sys/amd64/vmm/vmm_lapic.c | 2 -- sys/amd64/vmm/vmm_mem.c | 2 -- sys/amd64/vmm/vmm_snapshot.c | 2 -- sys/amd64/vmm/vmm_stat.c | 2 -- sys/amd64/vmm/vmm_util.c | 2 -- sys/amd64/vmm/x86.c | 2 -- sys/arm/allwinner/a10/a10_intc.c | 2 -- sys/arm/allwinner/a10/a10_padconf.c | 2 -- sys/arm/allwinner/a10_ahci.c | 2 -- sys/arm/allwinner/a10_codec.c | 2 -- sys/arm/allwinner/a10_dmac.c | 2 -- sys/arm/allwinner/a10_fb.c | 2 -- sys/arm/allwinner/a10_hdmi.c | 2 -- sys/arm/allwinner/a10_hdmiaudio.c | 2 -- sys/arm/allwinner/a10_sramc.c | 2 -- sys/arm/allwinner/a10_timer.c | 2 -- sys/arm/allwinner/a13/a13_padconf.c | 2 -- sys/arm/allwinner/a20/a20_cpu_cfg.c | 2 -- sys/arm/allwinner/a20/a20_padconf.c | 2 -- sys/arm/allwinner/a31/a31_padconf.c | 2 -- sys/arm/allwinner/a31/a31_r_padconf.c | 2 -- sys/arm/allwinner/a31/a31s_padconf.c | 2 -- sys/arm/allwinner/a31_dmac.c | 2 -- sys/arm/allwinner/a33/a33_padconf.c | 2 -- sys/arm/allwinner/a64/a64_padconf.c | 2 -- sys/arm/allwinner/a64/a64_r_padconf.c | 2 -- sys/arm/allwinner/a83t/a83t_padconf.c | 2 -- sys/arm/allwinner/a83t/a83t_r_padconf.c | 2 -- sys/arm/allwinner/aw_ccu.c | 2 -- sys/arm/allwinner/aw_cir.c | 2 -- sys/arm/allwinner/aw_dwc3.c | 2 -- sys/arm/allwinner/aw_gmacclk.c | 2 -- sys/arm/allwinner/aw_gpio.c | 2 -- sys/arm/allwinner/aw_if_dwc.c | 2 -- sys/arm/allwinner/aw_machdep.c | 2 -- sys/arm/allwinner/aw_mmc.c | 2 -- sys/arm/allwinner/aw_mp.c | 2 -- sys/arm/allwinner/aw_nmi.c | 2 -- sys/arm/allwinner/aw_pwm.c | 2 -- sys/arm/allwinner/aw_r_intc.c | 2 -- sys/arm/allwinner/aw_reset.c | 2 -- sys/arm/allwinner/aw_rsb.c | 2 -- sys/arm/allwinner/aw_rtc.c | 2 -- sys/arm/allwinner/aw_sid.c | 2 -- sys/arm/allwinner/aw_spi.c | 2 -- sys/arm/allwinner/aw_syscon.c | 2 -- sys/arm/allwinner/aw_thermal.c | 2 -- sys/arm/allwinner/aw_ts.c | 2 -- sys/arm/allwinner/aw_usb3phy.c | 1 - sys/arm/allwinner/aw_usbphy.c | 2 -- sys/arm/allwinner/aw_wdog.c | 2 -- sys/arm/allwinner/axp209.c | 2 -- sys/arm/allwinner/axp81x.c | 2 -- sys/arm/allwinner/clkng/aw_ccung.c | 2 -- sys/arm/allwinner/clkng/aw_clk_frac.c | 2 -- sys/arm/allwinner/clkng/aw_clk_m.c | 2 -- sys/arm/allwinner/clkng/aw_clk_mipi.c | 2 -- sys/arm/allwinner/clkng/aw_clk_nkmp.c | 2 -- sys/arm/allwinner/clkng/aw_clk_nm.c | 2 -- sys/arm/allwinner/clkng/aw_clk_nmm.c | 2 -- sys/arm/allwinner/clkng/aw_clk_np.c | 2 -- sys/arm/allwinner/clkng/aw_clk_prediv_mux.c | 2 -- sys/arm/allwinner/clkng/ccu_a10.c | 2 -- sys/arm/allwinner/clkng/ccu_a13.c | 2 -- sys/arm/allwinner/clkng/ccu_a31.c | 2 -- sys/arm/allwinner/clkng/ccu_a64.c | 2 -- sys/arm/allwinner/clkng/ccu_a83t.c | 2 -- sys/arm/allwinner/clkng/ccu_de2.c | 2 -- sys/arm/allwinner/clkng/ccu_h3.c | 2 -- sys/arm/allwinner/clkng/ccu_h6.c | 2 -- sys/arm/allwinner/clkng/ccu_h6_r.c | 2 -- sys/arm/allwinner/clkng/ccu_sun8i_r.c | 2 -- sys/arm/allwinner/h3/h3_padconf.c | 2 -- sys/arm/allwinner/h3/h3_r_padconf.c | 2 -- sys/arm/allwinner/h6/h6_padconf.c | 2 -- sys/arm/allwinner/h6/h6_r_padconf.c | 2 -- sys/arm/allwinner/if_awg.c | 2 -- sys/arm/allwinner/if_emac.c | 2 -- sys/arm/altera/socfpga/socfpga_a10_manager.c | 2 -- sys/arm/altera/socfpga/socfpga_common.c | 2 -- sys/arm/altera/socfpga/socfpga_machdep.c | 2 -- sys/arm/altera/socfpga/socfpga_manager.c | 2 -- sys/arm/altera/socfpga/socfpga_mp.c | 1 - sys/arm/altera/socfpga/socfpga_rstmgr.c | 2 -- sys/arm/annapurna/alpine/alpine_ccu.c | 2 -- sys/arm/annapurna/alpine/alpine_machdep.c | 2 -- sys/arm/annapurna/alpine/alpine_machdep_mp.c | 1 - sys/arm/annapurna/alpine/alpine_nb_service.c | 2 -- sys/arm/annapurna/alpine/alpine_pci.c | 2 -- sys/arm/annapurna/alpine/alpine_pci_msix.c | 2 -- sys/arm/annapurna/alpine/alpine_serdes.c | 2 -- sys/arm/arm/autoconf.c | 2 -- sys/arm/arm/bcopy_page.S | 3 --- sys/arm/arm/bcopyinout.S | 2 -- sys/arm/arm/bcopyinout_xscale.S | 2 -- sys/arm/arm/blockio.S | 3 --- sys/arm/arm/bus_space_asm_generic.S | 2 -- sys/arm/arm/bus_space_base.c | 2 -- sys/arm/arm/bus_space_generic.c | 2 -- sys/arm/arm/busdma_machdep.c | 2 -- sys/arm/arm/copystr.S | 2 -- sys/arm/arm/cpufunc.c | 2 -- sys/arm/arm/cpufunc_asm.S | 2 -- sys/arm/arm/cpufunc_asm_arm11x6.S | 2 -- sys/arm/arm/cpufunc_asm_armv7.S | 2 -- sys/arm/arm/cpufunc_asm_pj4b.S | 2 -- sys/arm/arm/cpuinfo.c | 2 -- sys/arm/arm/db_disasm.c | 1 - sys/arm/arm/db_interface.c | 1 - sys/arm/arm/db_trace.c | 1 - sys/arm/arm/debug_monitor.c | 2 -- sys/arm/arm/disassem.c | 1 - sys/arm/arm/dump_machdep.c | 2 -- sys/arm/arm/elf_machdep.c | 2 -- sys/arm/arm/elf_note.S | 2 -- sys/arm/arm/exception.S | 3 --- sys/arm/arm/exec_machdep.c | 2 -- sys/arm/arm/fiq.c | 2 -- sys/arm/arm/fiq_subr.S | 2 -- sys/arm/arm/fusu.S | 2 -- sys/arm/arm/gdb_machdep.c | 2 -- sys/arm/arm/genassym.c | 1 - sys/arm/arm/generic_timer.c | 2 -- sys/arm/arm/gic.c | 2 -- sys/arm/arm/gic_acpi.c | 2 -- sys/arm/arm/gic_fdt.c | 2 -- sys/arm/arm/hypervisor-stub.S | 3 --- sys/arm/arm/identcpu-v6.c | 1 - sys/arm/arm/in_cksum_arm.S | 2 -- sys/arm/arm/in_cksum_machdep.c | 2 -- sys/arm/arm/locore-v6.S | 3 --- sys/arm/arm/machdep.c | 2 -- sys/arm/arm/machdep_boot.c | 2 -- sys/arm/arm/machdep_intr.c | 2 -- sys/arm/arm/machdep_kdb.c | 2 -- sys/arm/arm/machdep_ptrace.c | 2 -- sys/arm/arm/mem.c | 2 -- sys/arm/arm/minidump_machdep.c | 2 -- sys/arm/arm/mp_machdep.c | 1 - sys/arm/arm/mpcore_timer.c | 2 -- sys/arm/arm/nexus.c | 2 -- sys/arm/arm/ofw_machdep.c | 2 -- sys/arm/arm/pl190.c | 2 -- sys/arm/arm/pl310.c | 1 - sys/arm/arm/platform.c | 2 -- sys/arm/arm/pmap-v6.c | 2 -- sys/arm/arm/pmu.c | 2 -- sys/arm/arm/pmu_fdt.c | 2 -- sys/arm/arm/ptrace_machdep.c | 2 -- sys/arm/arm/sc_machdep.c | 2 -- sys/arm/arm/setcpsr.S | 2 -- sys/arm/arm/setstack.s | 2 -- sys/arm/arm/stack_machdep.c | 2 -- sys/arm/arm/stdatomic.c | 2 -- sys/arm/arm/support.S | 2 -- sys/arm/arm/swtch-v6.S | 3 --- sys/arm/arm/swtch.S | 3 --- sys/arm/arm/sys_machdep.c | 2 -- sys/arm/arm/syscall.c | 2 -- sys/arm/arm/trap-v6.c | 2 -- sys/arm/arm/uio_machdep.c | 2 -- sys/arm/arm/undefined.c | 2 -- sys/arm/arm/unwind.c | 2 -- sys/arm/arm/vfp.c | 2 -- sys/arm/arm/vm_machdep.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_bsc.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_clkman.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_dma.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_fb.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_fbd.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_firmware.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_ft5406.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_gpio.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_intr.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_machdep.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_mbox.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_pwm.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_sdhci.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_sdhost.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_spi.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_systimer.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_vcbus.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_vcio.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_wdog.c | 2 -- sys/arm/broadcom/bcm2835/bcm2836.c | 2 -- sys/arm/broadcom/bcm2835/bcm2836_mp.c | 2 -- sys/arm/broadcom/bcm2835/bcm2838_pci.c | 2 -- sys/arm/broadcom/bcm2835/bcm2838_xhci.c | 2 -- sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c | 2 -- sys/arm/broadcom/bcm2835/raspberrypi_gpio.c | 2 -- sys/arm/cloudabi32/cloudabi32_sysvec.c | 2 -- sys/arm/freescale/fsl_ocotp.c | 2 -- sys/arm/freescale/imx/imx51_ccm.c | 2 -- sys/arm/freescale/imx/imx51_ipuv3.c | 2 -- sys/arm/freescale/imx/imx51_ipuv3_fbd.c | 2 -- sys/arm/freescale/imx/imx51_machdep.c | 2 -- sys/arm/freescale/imx/imx53_machdep.c | 2 -- sys/arm/freescale/imx/imx6_anatop.c | 2 -- sys/arm/freescale/imx/imx6_audmux.c | 2 -- sys/arm/freescale/imx/imx6_ccm.c | 2 -- sys/arm/freescale/imx/imx6_hdmi.c | 2 -- sys/arm/freescale/imx/imx6_ipu.c | 2 -- sys/arm/freescale/imx/imx6_machdep.c | 2 -- sys/arm/freescale/imx/imx6_mp.c | 1 - sys/arm/freescale/imx/imx6_pl310.c | 2 -- sys/arm/freescale/imx/imx6_sdma.c | 2 -- sys/arm/freescale/imx/imx6_snvs.c | 2 -- sys/arm/freescale/imx/imx6_src.c | 2 -- sys/arm/freescale/imx/imx6_ssi.c | 2 -- sys/arm/freescale/imx/imx6_usbphy.c | 2 -- sys/arm/freescale/imx/imx_console.c | 2 -- sys/arm/freescale/imx/imx_epit.c | 2 -- sys/arm/freescale/imx/imx_gpio.c | 2 -- sys/arm/freescale/imx/imx_gpt.c | 2 -- sys/arm/freescale/imx/imx_i2c.c | 2 -- sys/arm/freescale/imx/imx_machdep.c | 2 -- sys/arm/freescale/imx/imx_nop_usbphy.c | 2 -- sys/arm/freescale/imx/imx_spi.c | 2 -- sys/arm/freescale/imx/imx_wdog.c | 2 -- sys/arm/freescale/imx/tzic.c | 2 -- sys/arm/freescale/vybrid/vf_adc.c | 2 -- sys/arm/freescale/vybrid/vf_anadig.c | 2 -- sys/arm/freescale/vybrid/vf_ccm.c | 2 -- sys/arm/freescale/vybrid/vf_dcu4.c | 2 -- sys/arm/freescale/vybrid/vf_dmamux.c | 2 -- sys/arm/freescale/vybrid/vf_edma.c | 2 -- sys/arm/freescale/vybrid/vf_ehci.c | 2 -- sys/arm/freescale/vybrid/vf_gpio.c | 2 -- sys/arm/freescale/vybrid/vf_i2c.c | 2 -- sys/arm/freescale/vybrid/vf_iomuxc.c | 2 -- sys/arm/freescale/vybrid/vf_machdep.c | 2 -- sys/arm/freescale/vybrid/vf_mscm.c | 2 -- sys/arm/freescale/vybrid/vf_port.c | 2 -- sys/arm/freescale/vybrid/vf_sai.c | 2 -- sys/arm/freescale/vybrid/vf_spi.c | 2 -- sys/arm/freescale/vybrid/vf_src.c | 2 -- sys/arm/freescale/vybrid/vf_tcon.c | 2 -- sys/arm/freescale/vybrid/vf_uart.c | 2 -- sys/arm/mv/a37x0_gpio.c | 2 -- sys/arm/mv/a37x0_iic.c | 2 -- sys/arm/mv/a37x0_spi.c | 2 -- sys/arm/mv/armada/thermal.c | 2 -- sys/arm/mv/armada/wdt.c | 2 -- sys/arm/mv/armada38x/armada38x.c | 2 -- sys/arm/mv/armada38x/armada38x_mp.c | 2 -- sys/arm/mv/armada38x/armada38x_pl310.c | 2 -- sys/arm/mv/armada38x/armada38x_rtc.c | 2 -- sys/arm/mv/armada38x/pmsu.c | 2 -- sys/arm/mv/armadaxp/armadaxp.c | 2 -- sys/arm/mv/armadaxp/mptramp.S | 3 --- sys/arm/mv/gpio.c | 2 -- sys/arm/mv/ic.c | 2 -- sys/arm/mv/mpic.c | 2 -- sys/arm/mv/mv_ap806_clock.c | 2 -- sys/arm/mv/mv_ap806_gicp.c | 2 -- sys/arm/mv/mv_ap806_sei.c | 2 -- sys/arm/mv/mv_armv7_machdep.c | 2 -- sys/arm/mv/mv_common.c | 2 -- sys/arm/mv/mv_cp110_clock.c | 2 -- sys/arm/mv/mv_cp110_icu.c | 2 -- sys/arm/mv/mv_cp110_icu_bus.c | 2 -- sys/arm/mv/mv_localbus.c | 2 -- sys/arm/mv/mv_pci.c | 2 -- sys/arm/mv/mv_pci_ctrl.c | 2 -- sys/arm/mv/mv_spi.c | 2 -- sys/arm/mv/mv_thermal.c | 2 -- sys/arm/mv/mv_ts.c | 2 -- sys/arm/mv/mvebu_gpio.c | 2 -- sys/arm/mv/mvebu_pinctrl.c | 2 -- sys/arm/mv/rtc.c | 1 - sys/arm/mv/timer.c | 2 -- sys/arm/nvidia/as3722.c | 2 -- sys/arm/nvidia/as3722_gpio.c | 2 -- sys/arm/nvidia/as3722_regulators.c | 2 -- sys/arm/nvidia/as3722_rtc.c | 2 -- sys/arm/nvidia/drm2/hdmi.c | 2 -- sys/arm/nvidia/drm2/tegra_bo.c | 2 -- sys/arm/nvidia/drm2/tegra_dc.c | 2 -- sys/arm/nvidia/drm2/tegra_drm_subr.c | 2 -- sys/arm/nvidia/drm2/tegra_fb.c | 2 -- sys/arm/nvidia/drm2/tegra_hdmi.c | 2 -- sys/arm/nvidia/drm2/tegra_host1x.c | 2 -- sys/arm/nvidia/tegra124/tegra124_car.c | 2 -- sys/arm/nvidia/tegra124/tegra124_clk_per.c | 2 -- sys/arm/nvidia/tegra124/tegra124_clk_pll.c | 2 -- sys/arm/nvidia/tegra124/tegra124_clk_super.c | 2 -- sys/arm/nvidia/tegra124/tegra124_coretemp.c | 2 -- sys/arm/nvidia/tegra124/tegra124_cpufreq.c | 2 -- sys/arm/nvidia/tegra124/tegra124_machdep.c | 2 -- sys/arm/nvidia/tegra124/tegra124_mp.c | 2 -- sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c | 2 -- sys/arm/nvidia/tegra_abpmisc.c | 2 -- sys/arm/nvidia/tegra_ahci.c | 2 -- sys/arm/nvidia/tegra_efuse.c | 2 -- sys/arm/nvidia/tegra_ehci.c | 2 -- sys/arm/nvidia/tegra_gpio.c | 2 -- sys/arm/nvidia/tegra_i2c.c | 2 -- sys/arm/nvidia/tegra_lic.c | 2 -- sys/arm/nvidia/tegra_mc.c | 2 -- sys/arm/nvidia/tegra_pcie.c | 2 -- sys/arm/nvidia/tegra_pinmux.c | 2 -- sys/arm/nvidia/tegra_rtc.c | 2 -- sys/arm/nvidia/tegra_sdhci.c | 2 -- sys/arm/nvidia/tegra_soctherm.c | 2 -- sys/arm/nvidia/tegra_uart.c | 2 -- sys/arm/nvidia/tegra_usbphy.c | 2 -- sys/arm/nvidia/tegra_xhci.c | 2 -- sys/arm/qemu/virt_machdep.c | 2 -- sys/arm/qemu/virt_mp.c | 2 -- sys/arm/rockchip/rk32xx_machdep.c | 2 -- sys/arm/rockchip/rk32xx_mp.c | 2 -- sys/arm/ti/aintc.c | 2 -- sys/arm/ti/am335x/am3359_cppi41.c | 2 -- sys/arm/ti/am335x/am335x_dmtimer.c | 2 -- sys/arm/ti/am335x/am335x_dmtpps.c | 2 -- sys/arm/ti/am335x/am335x_ecap.c | 2 -- sys/arm/ti/am335x/am335x_ehrpwm.c | 2 -- sys/arm/ti/am335x/am335x_gpio.c | 2 -- sys/arm/ti/am335x/am335x_lcd.c | 2 -- sys/arm/ti/am335x/am335x_lcd_syscons.c | 2 -- sys/arm/ti/am335x/am335x_musb.c | 2 -- sys/arm/ti/am335x/am335x_pmic.c | 1 - sys/arm/ti/am335x/am335x_pwmss.c | 2 -- sys/arm/ti/am335x/am335x_rtc.c | 2 -- sys/arm/ti/am335x/am335x_scm.c | 2 -- sys/arm/ti/am335x/am335x_scm_padconf.c | 2 -- sys/arm/ti/am335x/am335x_usb_phy.c | 2 -- sys/arm/ti/am335x/tda19988.c | 1 - sys/arm/ti/clk/clock_common.c | 2 -- sys/arm/ti/clk/clock_common.h | 2 -- sys/arm/ti/clk/ti_clk_clkctrl.c | 2 -- sys/arm/ti/clk/ti_clk_dpll.c | 2 -- sys/arm/ti/clk/ti_clkctrl.c | 2 -- sys/arm/ti/clk/ti_divider_clock.c | 2 -- sys/arm/ti/clk/ti_dpll_clock.c | 2 -- sys/arm/ti/clk/ti_gate_clock.c | 2 -- sys/arm/ti/clk/ti_mux_clock.c | 2 -- sys/arm/ti/cpsw/if_cpsw.c | 2 -- sys/arm/ti/omap4/omap4_gpio.c | 2 -- sys/arm/ti/omap4/omap4_l2cache.c | 1 - sys/arm/ti/omap4/omap4_mp.c | 1 - sys/arm/ti/omap4/omap4_prcm_clks.c | 2 -- sys/arm/ti/omap4/omap4_scm_padconf.c | 2 -- sys/arm/ti/omap4/omap4_wugen.c | 2 -- sys/arm/ti/omap4/pandaboard/pandaboard.c | 2 -- sys/arm/ti/ti_adc.c | 2 -- sys/arm/ti/ti_cpuid.c | 2 -- sys/arm/ti/ti_edma3.c | 2 -- sys/arm/ti/ti_gpio.c | 2 -- sys/arm/ti/ti_i2c.c | 2 -- sys/arm/ti/ti_machdep.c | 2 -- sys/arm/ti/ti_mbox.c | 2 -- sys/arm/ti/ti_omap4_cm.c | 2 -- sys/arm/ti/ti_pinmux.c | 2 -- sys/arm/ti/ti_prcm.c | 2 -- sys/arm/ti/ti_prm.c | 2 -- sys/arm/ti/ti_pruss.c | 2 -- sys/arm/ti/ti_scm.c | 2 -- sys/arm/ti/ti_scm_syscon.c | 2 -- sys/arm/ti/ti_sdhci.c | 2 -- sys/arm/ti/ti_sdma.c | 2 -- sys/arm/ti/ti_smc.S | 2 -- sys/arm/ti/ti_spi.c | 2 -- sys/arm/ti/ti_sysc.c | 2 -- sys/arm/ti/ti_wdt.c | 2 -- sys/arm/ti/twl/twl.c | 2 -- sys/arm/ti/twl/twl_clks.c | 2 -- sys/arm/ti/twl/twl_vreg.c | 2 -- sys/arm/ti/usb/omap_ehci.c | 2 -- sys/arm/ti/usb/omap_host.c | 2 -- sys/arm/ti/usb/omap_tll.c | 2 -- sys/arm/versatile/pl050.c | 2 -- sys/arm/versatile/sp804.c | 2 -- sys/arm/versatile/versatile_clcd.c | 2 -- sys/arm/versatile/versatile_machdep.c | 2 -- sys/arm/versatile/versatile_pci.c | 2 -- sys/arm/versatile/versatile_scm.c | 2 -- sys/arm/versatile/versatile_sic.c | 2 -- sys/arm/xilinx/uart_dev_cdnc.c | 2 -- sys/arm/xilinx/zy7_devcfg.c | 2 -- sys/arm/xilinx/zy7_ehci.c | 2 -- sys/arm/xilinx/zy7_gpio.c | 2 -- sys/arm/xilinx/zy7_l2cache.c | 2 -- sys/arm/xilinx/zy7_machdep.c | 2 -- sys/arm/xilinx/zy7_mp.c | 1 - sys/arm/xilinx/zy7_qspi.c | 2 -- sys/arm/xilinx/zy7_slcr.c | 2 -- sys/arm/xilinx/zy7_spi.c | 2 -- sys/arm64/acpica/OsdEnvironment.c | 2 -- sys/arm64/acpica/acpi_iort.c | 2 -- sys/arm64/acpica/acpi_machdep.c | 2 -- sys/arm64/acpica/acpi_wakeup.c | 2 -- sys/arm64/acpica/pci_cfgreg.c | 2 -- sys/arm64/arm64/autoconf.c | 2 -- sys/arm64/arm64/bus_machdep.c | 2 -- sys/arm64/arm64/bus_space_asm.S | 2 -- sys/arm64/arm64/busdma_bounce.c | 2 -- sys/arm64/arm64/busdma_machdep.c | 2 -- sys/arm64/arm64/bzero.S | 3 --- sys/arm64/arm64/clock.c | 2 -- sys/arm64/arm64/copyinout.S | 2 -- sys/arm64/arm64/cpu_errata.c | 2 -- sys/arm64/arm64/cpufunc_asm.S | 3 --- sys/arm64/arm64/db_disasm.c | 1 - sys/arm64/arm64/db_interface.c | 1 - sys/arm64/arm64/db_trace.c | 1 - sys/arm64/arm64/debug_monitor.c | 2 -- sys/arm64/arm64/disassem.c | 2 -- sys/arm64/arm64/dump_machdep.c | 2 -- sys/arm64/arm64/efirt_machdep.c | 2 -- sys/arm64/arm64/elf32_machdep.c | 2 -- sys/arm64/arm64/elf_machdep.c | 2 -- sys/arm64/arm64/exception.S | 2 -- sys/arm64/arm64/exec_machdep.c | 2 -- sys/arm64/arm64/freebsd32_machdep.c | 2 -- sys/arm64/arm64/genassym.c | 1 - sys/arm64/arm64/gic_v3.c | 2 -- sys/arm64/arm64/gic_v3_acpi.c | 2 -- sys/arm64/arm64/gic_v3_fdt.c | 2 -- sys/arm64/arm64/gicv3_its.c | 2 -- sys/arm64/arm64/identcpu.c | 2 -- sys/arm64/arm64/machdep.c | 2 -- sys/arm64/arm64/machdep_boot.c | 2 -- sys/arm64/arm64/mem.c | 2 -- sys/arm64/arm64/minidump_machdep.c | 2 -- sys/arm64/arm64/mp_machdep.c | 2 -- sys/arm64/arm64/nexus.c | 2 -- sys/arm64/arm64/ofw_machdep.c | 2 -- sys/arm64/arm64/pmap.c | 2 -- sys/arm64/arm64/ptrace_machdep.c | 2 -- sys/arm64/arm64/stack_machdep.c | 2 -- sys/arm64/arm64/support.S | 2 -- sys/arm64/arm64/swtch.S | 3 --- sys/arm64/arm64/sys_machdep.c | 2 -- sys/arm64/arm64/trap.c | 2 -- sys/arm64/arm64/uio_machdep.c | 2 -- sys/arm64/arm64/uma_machdep.c | 2 -- sys/arm64/arm64/undefined.c | 2 -- sys/arm64/arm64/unwind.c | 1 - sys/arm64/arm64/vfp.c | 2 -- sys/arm64/arm64/vm_machdep.c | 2 -- sys/arm64/broadcom/brcmmdio/mdio_mux_iproc.c | 2 -- sys/arm64/broadcom/brcmmdio/mdio_nexus_iproc.c | 2 -- sys/arm64/broadcom/brcmmdio/mdio_ns2_pcie_phy.c | 2 -- sys/arm64/broadcom/genet/if_genet.c | 2 -- sys/arm64/cavium/thunder_pcie_common.c | 2 -- sys/arm64/cavium/thunder_pcie_fdt.c | 2 -- sys/arm64/cavium/thunder_pcie_pem.c | 2 -- sys/arm64/cavium/thunder_pcie_pem_fdt.c | 2 -- sys/arm64/cloudabi32/cloudabi32_sysvec.c | 2 -- sys/arm64/cloudabi64/cloudabi64_sysvec.c | 2 -- sys/arm64/coresight/coresight.c | 2 -- sys/arm64/coresight/coresight_acpi.c | 2 -- sys/arm64/coresight/coresight_cmd.c | 2 -- sys/arm64/coresight/coresight_cpu_debug.c | 2 -- sys/arm64/coresight/coresight_etm4x.c | 2 -- sys/arm64/coresight/coresight_etm4x_acpi.c | 2 -- sys/arm64/coresight/coresight_etm4x_fdt.c | 2 -- sys/arm64/coresight/coresight_fdt.c | 2 -- sys/arm64/coresight/coresight_funnel.c | 2 -- sys/arm64/coresight/coresight_funnel_acpi.c | 2 -- sys/arm64/coresight/coresight_funnel_fdt.c | 2 -- sys/arm64/coresight/coresight_replicator.c | 2 -- sys/arm64/coresight/coresight_replicator_acpi.c | 2 -- sys/arm64/coresight/coresight_replicator_fdt.c | 2 -- sys/arm64/coresight/coresight_tmc.c | 2 -- sys/arm64/coresight/coresight_tmc_acpi.c | 2 -- sys/arm64/coresight/coresight_tmc_fdt.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_composite.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_gate.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_mux.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c | 2 -- sys/arm64/freescale/imx/imx7gpc.c | 2 -- sys/arm64/freescale/imx/imx8mq_ccm.c | 2 -- sys/arm64/intel/firmware.c | 2 -- sys/arm64/intel/stratix10-soc-fpga-mgr.c | 2 -- sys/arm64/intel/stratix10-svc.c | 2 -- sys/arm64/iommu/iommu.c | 2 -- sys/arm64/iommu/smmu.c | 2 -- sys/arm64/iommu/smmu_acpi.c | 2 -- sys/arm64/iommu/smmu_quirks.c | 2 -- sys/arm64/linux/linux_dummy_machdep.c | 2 -- sys/arm64/linux/linux_genassym.c | 1 - sys/arm64/linux/linux_machdep.c | 2 -- sys/arm64/linux/linux_support.s | 2 -- sys/arm64/linux/linux_sysvec.c | 2 -- sys/arm64/linux/linux_vdso_gtod.c | 2 -- sys/arm64/nvidia/tegra210/max77620.c | 2 -- sys/arm64/nvidia/tegra210/max77620_gpio.c | 2 -- sys/arm64/nvidia/tegra210/max77620_regulators.c | 2 -- sys/arm64/nvidia/tegra210/max77620_rtc.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_car.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_clk_per.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_clk_pll.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_clk_super.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_coretemp.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_cpufreq.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_pinmux.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_pmc.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c | 2 -- sys/arm64/qoriq/clk/ls1046a_clkgen.c | 2 -- sys/arm64/qoriq/clk/ls1088a_clkgen.c | 2 -- sys/arm64/qoriq/clk/lx2160a_clkgen.c | 2 -- sys/arm64/qoriq/clk/qoriq_clk_pll.c | 2 -- sys/arm64/qoriq/clk/qoriq_clkgen.c | 2 -- sys/arm64/qoriq/ls1046_gpio.c | 2 -- sys/arm64/qoriq/qoriq_dw_pci.c | 3 --- sys/arm64/qoriq/qoriq_therm.c | 2 -- sys/arm64/qualcomm/qcom_gcc.c | 2 -- sys/arm64/rockchip/clk/rk3288_cru.c | 2 -- sys/arm64/rockchip/clk/rk3328_cru.c | 2 -- sys/arm64/rockchip/clk/rk3399_cru.c | 2 -- sys/arm64/rockchip/clk/rk3399_pmucru.c | 2 -- sys/arm64/rockchip/clk/rk_clk_armclk.c | 2 -- sys/arm64/rockchip/clk/rk_clk_composite.c | 2 -- sys/arm64/rockchip/clk/rk_clk_fract.c | 2 -- sys/arm64/rockchip/clk/rk_clk_gate.c | 2 -- sys/arm64/rockchip/clk/rk_clk_mux.c | 2 -- sys/arm64/rockchip/clk/rk_clk_pll.c | 2 -- sys/arm64/rockchip/clk/rk_cru.c | 2 -- sys/arm64/rockchip/if_dwc_rk.c | 2 -- sys/arm64/rockchip/rk3399_emmcphy.c | 2 -- sys/arm64/rockchip/rk805.c | 2 -- sys/arm64/rockchip/rk_dwc3.c | 2 -- sys/arm64/rockchip/rk_gpio.c | 2 -- sys/arm64/rockchip/rk_grf.c | 2 -- sys/arm64/rockchip/rk_i2c.c | 2 -- sys/arm64/rockchip/rk_iodomain.c | 2 -- sys/arm64/rockchip/rk_pcie.c | 2 -- sys/arm64/rockchip/rk_pcie_phy.c | 2 -- sys/arm64/rockchip/rk_pinctrl.c | 2 -- sys/arm64/rockchip/rk_pmu.c | 2 -- sys/arm64/rockchip/rk_pwm.c | 2 -- sys/arm64/rockchip/rk_spi.c | 2 -- sys/arm64/rockchip/rk_tsadc.c | 2 -- sys/arm64/rockchip/rk_typec_phy.c | 2 -- sys/arm64/rockchip/rk_usb2phy.c | 2 -- sys/arm64/rockchip/rk_usbphy.c | 2 -- sys/cam/ata/ata_all.c | 2 -- sys/cam/ata/ata_da.c | 2 -- sys/cam/ata/ata_pmp.c | 2 -- sys/cam/ata/ata_xpt.c | 2 -- sys/cam/cam.c | 2 -- sys/cam/cam_compat.c | 2 -- sys/cam/cam_iosched.c | 2 -- sys/cam/cam_periph.c | 2 -- sys/cam/cam_queue.c | 2 -- sys/cam/cam_sim.c | 2 -- sys/cam/cam_xpt.c | 2 -- sys/cam/ctl/ctl.c | 2 -- sys/cam/ctl/ctl_backend.c | 2 -- sys/cam/ctl/ctl_backend_block.c | 2 -- sys/cam/ctl/ctl_backend_ramdisk.c | 2 -- sys/cam/ctl/ctl_error.c | 2 -- sys/cam/ctl/ctl_frontend.c | 2 -- sys/cam/ctl/ctl_frontend_cam_sim.c | 2 -- sys/cam/ctl/ctl_frontend_ioctl.c | 2 -- sys/cam/ctl/ctl_frontend_iscsi.c | 2 -- sys/cam/ctl/ctl_ha.c | 2 -- sys/cam/ctl/ctl_scsi_all.c | 3 --- sys/cam/ctl/ctl_scsi_all.h | 3 --- sys/cam/ctl/ctl_tpc.c | 2 -- sys/cam/ctl/ctl_tpc_local.c | 2 -- sys/cam/ctl/ctl_util.c | 2 -- sys/cam/ctl/scsi_ctl.c | 2 -- sys/cam/mmc/mmc_da.c | 2 -- sys/cam/mmc/mmc_sim.c | 2 -- sys/cam/mmc/mmc_xpt.c | 2 -- sys/cam/nvme/nvme_all.c | 2 -- sys/cam/nvme/nvme_da.c | 2 -- sys/cam/nvme/nvme_xpt.c | 2 -- sys/cam/scsi/scsi_all.c | 2 -- sys/cam/scsi/scsi_cd.c | 2 -- sys/cam/scsi/scsi_ch.c | 2 -- sys/cam/scsi/scsi_da.c | 2 -- sys/cam/scsi/scsi_enc.c | 2 -- sys/cam/scsi/scsi_enc_safte.c | 2 -- sys/cam/scsi/scsi_enc_ses.c | 2 -- sys/cam/scsi/scsi_pass.c | 2 -- sys/cam/scsi/scsi_pt.c | 2 -- sys/cam/scsi/scsi_sa.c | 2 -- sys/cam/scsi/scsi_sg.c | 2 -- sys/cam/scsi/scsi_targ_bh.c | 2 -- sys/cam/scsi/scsi_target.c | 2 -- sys/cam/scsi/scsi_xpt.c | 2 -- sys/cam/scsi/smp_all.c | 2 -- sys/cddl/boot/zfs/zfssubr.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_acl.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_proc.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_vm.c | 2 -- sys/cddl/dev/systrace/systrace.c | 2 -- sys/compat/cloudabi/cloudabi_clock.c | 2 -- sys/compat/cloudabi/cloudabi_errno.c | 2 -- sys/compat/cloudabi/cloudabi_fd.c | 2 -- sys/compat/cloudabi/cloudabi_file.c | 2 -- sys/compat/cloudabi/cloudabi_futex.c | 2 -- sys/compat/cloudabi/cloudabi_mem.c | 2 -- sys/compat/cloudabi/cloudabi_proc.c | 2 -- sys/compat/cloudabi/cloudabi_random.c | 2 -- sys/compat/cloudabi/cloudabi_sock.c | 2 -- sys/compat/cloudabi/cloudabi_thread.c | 2 -- sys/compat/cloudabi/cloudabi_vdso.c | 2 -- sys/compat/cloudabi32/cloudabi32_fd.c | 2 -- sys/compat/cloudabi32/cloudabi32_module.c | 2 -- sys/compat/cloudabi32/cloudabi32_poll.c | 2 -- sys/compat/cloudabi32/cloudabi32_sock.c | 2 -- sys/compat/cloudabi32/cloudabi32_thread.c | 2 -- sys/compat/cloudabi64/cloudabi64_fd.c | 2 -- sys/compat/cloudabi64/cloudabi64_module.c | 2 -- sys/compat/cloudabi64/cloudabi64_poll.c | 2 -- sys/compat/cloudabi64/cloudabi64_sock.c | 2 -- sys/compat/cloudabi64/cloudabi64_thread.c | 2 -- sys/compat/freebsd32/freebsd32_capability.c | 2 -- sys/compat/freebsd32/freebsd32_ioctl.c | 2 -- sys/compat/freebsd32/freebsd32_misc.c | 2 -- sys/compat/ia32/ia32_genassym.c | 2 -- sys/compat/ia32/ia32_sysvec.c | 2 -- sys/compat/lindebugfs/lindebugfs.c | 2 -- sys/compat/linprocfs/linprocfs.c | 2 -- sys/compat/linsysfs/linsysfs.c | 2 -- sys/compat/linux/linux.c | 2 -- sys/compat/linux/linux_common.c | 2 -- sys/compat/linux/linux_dummy.c | 2 -- sys/compat/linux/linux_elf.c | 2 -- sys/compat/linux/linux_elf32.c | 2 -- sys/compat/linux/linux_elf64.c | 2 -- sys/compat/linux/linux_emul.c | 2 -- sys/compat/linux/linux_errno.c | 2 -- sys/compat/linux/linux_event.c | 2 -- sys/compat/linux/linux_file.c | 2 -- sys/compat/linux/linux_fork.c | 2 -- sys/compat/linux/linux_futex.c | 2 -- sys/compat/linux/linux_getcwd.c | 2 -- sys/compat/linux/linux_ioctl.c | 2 -- sys/compat/linux/linux_ipc.c | 2 -- sys/compat/linux/linux_mib.c | 2 -- sys/compat/linux/linux_misc.c | 2 -- sys/compat/linux/linux_mmap.c | 2 -- sys/compat/linux/linux_netlink.c | 2 -- sys/compat/linux/linux_ptrace.c | 2 -- sys/compat/linux/linux_rseq.c | 2 -- sys/compat/linux/linux_signal.c | 2 -- sys/compat/linux/linux_socket.c | 2 -- sys/compat/linux/linux_stats.c | 2 -- sys/compat/linux/linux_sysctl.c | 2 -- sys/compat/linux/linux_time.c | 1 - sys/compat/linux/linux_timer.c | 2 -- sys/compat/linux/linux_uid16.c | 2 -- sys/compat/linux/linux_util.c | 2 -- sys/compat/linux/linux_vdso.c | 2 -- sys/compat/linuxkpi/common/src/linux_80211.c | 2 -- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 2 -- sys/compat/linuxkpi/common/src/linux_compat.c | 2 -- sys/compat/linuxkpi/common/src/linux_current.c | 2 -- sys/compat/linuxkpi/common/src/linux_devres.c | 2 -- sys/compat/linuxkpi/common/src/linux_domain.c | 2 -- sys/compat/linuxkpi/common/src/linux_hrtimer.c | 2 -- sys/compat/linuxkpi/common/src/linux_i2c.c | 2 -- sys/compat/linuxkpi/common/src/linux_i2cbb.c | 2 -- sys/compat/linuxkpi/common/src/linux_idr.c | 2 -- sys/compat/linuxkpi/common/src/linux_kmod.c | 2 -- sys/compat/linuxkpi/common/src/linux_kthread.c | 2 -- sys/compat/linuxkpi/common/src/linux_mhi.c | 2 -- sys/compat/linuxkpi/common/src/linux_netdev.c | 2 -- sys/compat/linuxkpi/common/src/linux_page.c | 2 -- sys/compat/linuxkpi/common/src/linux_pci.c | 2 -- sys/compat/linuxkpi/common/src/linux_radix.c | 2 -- sys/compat/linuxkpi/common/src/linux_rcu.c | 2 -- sys/compat/linuxkpi/common/src/linux_schedule.c | 2 -- sys/compat/linuxkpi/common/src/linux_seq_file.c | 2 -- sys/compat/linuxkpi/common/src/linux_shmemfs.c | 2 -- sys/compat/linuxkpi/common/src/linux_shrinker.c | 2 -- sys/compat/linuxkpi/common/src/linux_simple_attr.c | 2 -- sys/compat/linuxkpi/common/src/linux_skbuff.c | 2 -- sys/compat/linuxkpi/common/src/linux_slab.c | 2 -- sys/compat/linuxkpi/common/src/linux_tasklet.c | 2 -- sys/compat/linuxkpi/common/src/linux_work.c | 2 -- sys/compat/linuxkpi/common/src/linux_xarray.c | 2 -- sys/compat/ndis/kern_ndis.c | 2 -- sys/compat/ndis/kern_windrv.c | 2 -- sys/compat/ndis/subr_hal.c | 2 -- sys/compat/ndis/subr_ndis.c | 2 -- sys/compat/ndis/subr_ntoskrnl.c | 2 -- sys/compat/ndis/subr_pe.c | 2 -- sys/compat/ndis/subr_usbd.c | 2 -- sys/compat/x86bios/x86bios.c | 2 -- sys/crypto/aesni/aesni.c | 2 -- sys/crypto/aesni/aesni_wrap.c | 2 -- sys/crypto/aesni/intel_sha1.c | 2 -- sys/crypto/aesni/intel_sha256.c | 2 -- sys/crypto/armv8/armv8_crypto.c | 2 -- sys/crypto/armv8/armv8_crypto_wrap.c | 2 -- sys/crypto/blake2/blake2-sw.c | 2 -- sys/crypto/blake2/blake2_cryptodev.c | 2 -- sys/crypto/ccp/ccp.c | 2 -- sys/crypto/ccp/ccp_hardware.c | 2 -- sys/crypto/ccp/ccp_lsb.c | 2 -- sys/crypto/chacha20/chacha-sw.c | 2 -- sys/crypto/chacha20/chacha.c | 2 -- sys/crypto/des/des_ecb.c | 2 -- sys/crypto/des/des_enc.c | 2 -- sys/crypto/des/des_setkey.c | 2 -- sys/crypto/libsodium/randombytes.c | 1 - sys/crypto/libsodium/utils.c | 1 - sys/crypto/openssl/ossl.c | 2 -- sys/crypto/openssl/ossl_sha1.c | 2 -- sys/crypto/openssl/ossl_sha256.c | 2 -- sys/crypto/openssl/ossl_sha512.c | 2 -- sys/crypto/rc4/rc4.c | 2 -- sys/crypto/rijndael/rijndael-alg-fst.c | 2 -- sys/crypto/rijndael/rijndael-api-fst.c | 2 -- sys/crypto/rijndael/rijndael-api.c | 2 -- sys/crypto/sha1.c | 2 -- sys/crypto/sha2/sha256c.c | 2 -- sys/crypto/sha2/sha256c_arm64.c | 2 -- sys/crypto/sha2/sha512c.c | 2 -- sys/crypto/sha2/sha512c_arm64.c | 2 -- sys/crypto/siphash/siphash.c | 2 -- sys/crypto/siphash/siphash_test.c | 2 -- sys/crypto/skein/skein.c | 2 -- sys/crypto/skein/skein_block.c | 2 -- sys/crypto/via/padlock.c | 2 -- sys/crypto/via/padlock_cipher.c | 2 -- sys/crypto/via/padlock_hash.c | 2 -- sys/ddb/db_access.c | 2 -- sys/ddb/db_break.c | 2 -- sys/ddb/db_capture.c | 2 -- sys/ddb/db_command.c | 2 -- sys/ddb/db_examine.c | 2 -- sys/ddb/db_expr.c | 2 -- sys/ddb/db_input.c | 2 -- sys/ddb/db_lex.c | 2 -- sys/ddb/db_main.c | 2 -- sys/ddb/db_output.c | 2 -- sys/ddb/db_print.c | 2 -- sys/ddb/db_ps.c | 2 -- sys/ddb/db_run.c | 2 -- sys/ddb/db_script.c | 2 -- sys/ddb/db_sym.c | 2 -- sys/ddb/db_textdump.c | 2 -- sys/ddb/db_thread.c | 2 -- sys/ddb/db_variables.c | 2 -- sys/ddb/db_watch.c | 2 -- sys/ddb/db_write_cmd.c | 2 -- sys/dev/aac/aac.c | 2 -- sys/dev/aac/aac_cam.c | 2 -- sys/dev/aac/aac_debug.c | 2 -- sys/dev/aac/aac_disk.c | 2 -- sys/dev/aac/aac_linux.c | 2 -- sys/dev/aac/aac_pci.c | 2 -- sys/dev/aacraid/aacraid.c | 2 -- sys/dev/aacraid/aacraid_cam.c | 2 -- sys/dev/aacraid/aacraid_debug.c | 2 -- sys/dev/aacraid/aacraid_endian.c | 2 -- sys/dev/aacraid/aacraid_linux.c | 2 -- sys/dev/aacraid/aacraid_pci.c | 2 -- sys/dev/acpi_support/acpi_asus.c | 2 -- sys/dev/acpi_support/acpi_asus_wmi.c | 2 -- sys/dev/acpi_support/acpi_fujitsu.c | 2 -- sys/dev/acpi_support/acpi_hp.c | 2 -- sys/dev/acpi_support/acpi_ibm.c | 2 -- sys/dev/acpi_support/acpi_panasonic.c | 2 -- sys/dev/acpi_support/acpi_rapidstart.c | 2 -- sys/dev/acpi_support/acpi_sony.c | 2 -- sys/dev/acpi_support/acpi_toshiba.c | 2 -- sys/dev/acpi_support/acpi_wmi.c | 2 -- sys/dev/acpi_support/atk0110.c | 2 -- sys/dev/acpica/Osd/OsdDebug.c | 2 -- sys/dev/acpica/Osd/OsdHardware.c | 2 -- sys/dev/acpica/Osd/OsdInterrupt.c | 2 -- sys/dev/acpica/Osd/OsdMemory.c | 2 -- sys/dev/acpica/Osd/OsdSchedule.c | 2 -- sys/dev/acpica/Osd/OsdStream.c | 2 -- sys/dev/acpica/Osd/OsdSynch.c | 2 -- sys/dev/acpica/Osd/OsdTable.c | 2 -- sys/dev/acpica/acpi.c | 2 -- sys/dev/acpica/acpi_acad.c | 2 -- sys/dev/acpica/acpi_apei.c | 2 -- sys/dev/acpica/acpi_battery.c | 2 -- sys/dev/acpica/acpi_button.c | 2 -- sys/dev/acpica/acpi_cmbat.c | 2 -- sys/dev/acpica/acpi_container.c | 2 -- sys/dev/acpica/acpi_cpu.c | 2 -- sys/dev/acpica/acpi_ec.c | 2 -- sys/dev/acpica/acpi_ged.c | 2 -- sys/dev/acpica/acpi_hpet.c | 2 -- sys/dev/acpica/acpi_isab.c | 2 -- sys/dev/acpica/acpi_lid.c | 2 -- sys/dev/acpica/acpi_package.c | 2 -- sys/dev/acpica/acpi_pci.c | 2 -- sys/dev/acpica/acpi_pci_link.c | 2 -- sys/dev/acpica/acpi_pcib.c | 2 -- sys/dev/acpica/acpi_pcib_acpi.c | 2 -- sys/dev/acpica/acpi_pcib_pci.c | 2 -- sys/dev/acpica/acpi_perf.c | 2 -- sys/dev/acpica/acpi_powerres.c | 2 -- sys/dev/acpica/acpi_pxm.c | 2 -- sys/dev/acpica/acpi_quirk.c | 2 -- sys/dev/acpica/acpi_resource.c | 2 -- sys/dev/acpica/acpi_smbat.c | 2 -- sys/dev/acpica/acpi_thermal.c | 2 -- sys/dev/acpica/acpi_throttle.c | 2 -- sys/dev/acpica/acpi_timer.c | 2 -- sys/dev/acpica/acpi_video.c | 2 -- sys/dev/adlink/adlink.c | 2 -- sys/dev/ae/if_ae.c | 2 -- sys/dev/age/if_age.c | 2 -- sys/dev/agp/agp.c | 2 -- sys/dev/agp/agp_ali.c | 2 -- sys/dev/agp/agp_amd.c | 2 -- sys/dev/agp/agp_amd64.c | 2 -- sys/dev/agp/agp_apple.c | 2 -- sys/dev/agp/agp_ati.c | 2 -- sys/dev/agp/agp_i810.c | 2 -- sys/dev/agp/agp_intel.c | 2 -- sys/dev/agp/agp_nvidia.c | 2 -- sys/dev/agp/agp_sis.c | 2 -- sys/dev/agp/agp_via.c | 2 -- sys/dev/ahci/ahci.c | 2 -- sys/dev/ahci/ahci_fsl_fdt.c | 2 -- sys/dev/ahci/ahci_generic.c | 2 -- sys/dev/ahci/ahci_mv_fdt.c | 2 -- sys/dev/ahci/ahci_pci.c | 2 -- sys/dev/ahci/ahciem.c | 2 -- sys/dev/aic7xxx/ahc_isa.c | 2 -- sys/dev/aic7xxx/ahc_pci.c | 2 -- sys/dev/aic7xxx/ahd_pci.c | 2 -- sys/dev/aic7xxx/aic7770.c | 1 - sys/dev/aic7xxx/aic79xx.c | 1 - sys/dev/aic7xxx/aic79xx_osm.c | 2 -- sys/dev/aic7xxx/aic79xx_pci.c | 1 - sys/dev/aic7xxx/aic79xx_reg_print.c | 1 - sys/dev/aic7xxx/aic7xxx.c | 1 - sys/dev/aic7xxx/aic7xxx_93cx6.c | 1 - sys/dev/aic7xxx/aic7xxx_osm.c | 2 -- sys/dev/aic7xxx/aic7xxx_pci.c | 1 - sys/dev/aic7xxx/aic7xxx_reg_print.c | 1 - sys/dev/aic7xxx/aic_osm_lib.c | 2 -- sys/dev/al_eth/al_eth.c | 2 -- sys/dev/al_eth/al_init_eth_kr.c | 2 -- sys/dev/al_eth/al_init_eth_lm.c | 2 -- sys/dev/alc/if_alc.c | 2 -- sys/dev/ale/if_ale.c | 2 -- sys/dev/alpm/alpm.c | 2 -- sys/dev/altera/atse/if_atse.c | 2 -- sys/dev/altera/atse/if_atse_fdt.c | 2 -- sys/dev/altera/atse/if_atse_nexus.c | 2 -- sys/dev/altera/avgen/altera_avgen.c | 2 -- sys/dev/altera/avgen/altera_avgen_fdt.c | 2 -- sys/dev/altera/avgen/altera_avgen_nexus.c | 2 -- sys/dev/altera/dwc/if_dwc_socfpga.c | 2 -- sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c | 2 -- sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c | 2 -- sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c | 2 -- sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c | 2 -- sys/dev/altera/msgdma/msgdma.c | 2 -- sys/dev/altera/pio/pio.c | 2 -- sys/dev/altera/sdcard/altera_sdcard.c | 2 -- sys/dev/altera/sdcard/altera_sdcard_disk.c | 2 -- sys/dev/altera/sdcard/altera_sdcard_fdt.c | 2 -- sys/dev/altera/sdcard/altera_sdcard_io.c | 2 -- sys/dev/altera/sdcard/altera_sdcard_nexus.c | 2 -- sys/dev/altera/softdma/softdma.c | 2 -- sys/dev/amdgpio/amdgpio.c | 2 -- sys/dev/amdpm/amdpm.c | 2 -- sys/dev/amdsbwd/amdsbwd.c | 2 -- sys/dev/amdsmb/amdsmb.c | 2 -- sys/dev/amdsmn/amdsmn.c | 2 -- sys/dev/amdtemp/amdtemp.c | 2 -- sys/dev/amr/amr.c | 2 -- sys/dev/amr/amr_cam.c | 2 -- sys/dev/amr/amr_disk.c | 2 -- sys/dev/amr/amr_linux.c | 2 -- sys/dev/amr/amr_pci.c | 2 -- sys/dev/an/if_an.c | 2 -- sys/dev/an/if_an_isa.c | 2 -- sys/dev/an/if_an_pci.c | 2 -- sys/dev/arcmsr/arcmsr.c | 2 -- sys/dev/asmc/asmc.c | 2 -- sys/dev/ata/ata-all.c | 2 -- sys/dev/ata/ata-dma.c | 2 -- sys/dev/ata/ata-isa.c | 2 -- sys/dev/ata/ata-lowlevel.c | 2 -- sys/dev/ata/ata-pci.c | 2 -- sys/dev/ata/ata-sata.c | 2 -- sys/dev/ata/chipsets/ata-acard.c | 2 -- sys/dev/ata/chipsets/ata-acerlabs.c | 2 -- sys/dev/ata/chipsets/ata-amd.c | 2 -- *** 55364 LINES SKIPPED *** From nobody Wed Aug 23 17:49: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 4RWDHw024mz4r9RP; Wed, 23 Aug 2023 17:49: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 4RWDHv6rHnz4TLv; Wed, 23 Aug 2023 17:49:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ir1ATHYtfhFmFexfw2OqhAwB6w1QcRgEnSjTxA1ioWg=; b=bocWvjkPRQ5DCkQngUfhOGO7C1gX4EdQ3rMKuL4pIi/DrA63QRYsfxm5ZXmPOuKkzFuFW5 rbaED4dtuYOCOBpTVD1E7DCtkH/s1ibZW2NrngisqvURXeSoNUEKFLrME5c90VUQ3Ip/m6 Tqjc/N8Ry2ek4FmxBW+Ed3UEK4s8pcrTfossr5qr/mFOcA5xJ9MTikv5oDCgCz8EoO+NUz nFfzWC2ikAIj2++3bl0ZORI5hWN1QnmlZLZE6Id7br6zoAV2ObpO+1QqCMLoM9cSgWn7cT Bj865bflFhaPjm5i8H9cP5bz+QVLLTErzPI3Jpog0k75KcnH/gC05wzymI+/6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ir1ATHYtfhFmFexfw2OqhAwB6w1QcRgEnSjTxA1ioWg=; b=bZEPBg43G8hRYYKYUxpTu/sgIZX82nm7BX+bixKCnCLyJHXuS8GL1lpZIDrggMy+37867R d+1bAs2Lxk9ltbRObNvvX9Nwpl71pg+4Attngliq7i9CXtGYNYinSPjXhX+xZhnFlax9fD I1uPgW/hLgdqNVU1yBUDdUrWvHsT2A9dJB/PFTbDYRZKCAKxEZwDQxqS0B3+an9ccdgPpU 71vXFG4667NjN9bsN24Kn3HLG5dwshSTsiLYUc+Zt5lJ0jCcegu+UmCP1XyfwFobWIq7rd ssuKm9B4kdg2ek5y0a5GPMESrOfFFZwRU8P0UWPNT6+ERUHPBA2+Cr8vWa/GLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812987; a=rsa-sha256; cv=none; b=OnPBzOhtpnyAc6voBXmplbe4WhnS6DmkDljzHdPuRghveTpgnepHwCtrpTWmlOl4TKKayW hUDhlIR2ob27Awx5QOHgNNUyBTToSlARDKUVQdD75tguageB5BBD4mgx0+rY1xpKHej6Gr N3M4Pjo88aWlas3OIFFfrFWFTWScPNalVE0cHXn8LMon0u6DUNRNMP5HGPiRg+CPQ/Ptf5 ipojZF5fNjqPd4QslOVDgvTOmPIU5BChOVHC44o8Ac9KiKqat7wGLPBjIINkTHzP+7Xs5o lUZ186s7G+wCfMu7k3CmkxEMyYejXuVOBgvrcpvf2nj2sVC1bjByARjCtw+Itg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHv5qnpzvL5; Wed, 23 Aug 2023 17:49:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnlng040937; Wed, 23 Aug 2023 17:49:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnkW8040930; Wed, 23 Aug 2023 17:49:46 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:46 GMT Message-Id: <202308231749.37NHnkW8040930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 3d497e17ebd3 - stable/13 - Remove $FreeBSD$: one-line .c pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3d497e17ebd33fe0f58d773e35ab994d750258d6 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3d497e17ebd33fe0f58d773e35ab994d750258d6 commit 3d497e17ebd33fe0f58d773e35ab994d750258d6 Author: Warner Losh AuthorDate: 2023-08-22 01:31:41 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:26 +0000 Remove $FreeBSD$: one-line .c pattern Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/ Similar commit in main: (cherry picked from commit 1d386b48a555) --- bin/cat/cat.c | 2 -- bin/chflags/chflags.c | 2 -- bin/chio/chio.c | 2 -- bin/chmod/chmod.c | 2 -- bin/cp/cp.c | 2 -- bin/cp/utils.c | 2 -- bin/date/date.c | 2 -- bin/date/vary.c | 2 -- bin/dd/args.c | 2 -- bin/dd/conv.c | 2 -- bin/dd/conv_tab.c | 2 -- bin/dd/dd.c | 2 -- bin/dd/misc.c | 2 -- bin/dd/position.c | 2 -- bin/df/df.c | 2 -- bin/domainname/domainname.c | 2 -- bin/echo/echo.c | 2 -- bin/ed/buf.c | 2 -- bin/ed/glbl.c | 2 -- bin/ed/io.c | 2 -- bin/ed/main.c | 2 -- bin/ed/re.c | 2 -- bin/ed/sub.c | 2 -- bin/ed/undo.c | 2 -- bin/getfacl/getfacl.c | 2 -- bin/hostname/hostname.c | 2 -- bin/kenv/kenv.c | 2 -- bin/kill/kill.c | 2 -- bin/ln/ln.c | 2 -- bin/ls/cmp.c | 3 --- bin/ls/ls.c | 2 -- bin/ls/print.c | 2 -- bin/ls/util.c | 2 -- bin/mkdir/mkdir.c | 2 -- bin/mv/mv.c | 2 -- bin/pax/ar_io.c | 2 -- bin/pax/ar_subs.c | 2 -- bin/pax/buf_subs.c | 2 -- bin/pax/cache.c | 2 -- bin/pax/cpio.c | 2 -- bin/pax/file_subs.c | 2 -- bin/pax/ftree.c | 2 -- bin/pax/gen_subs.c | 2 -- bin/pax/getoldopt.c | 2 -- bin/pax/options.c | 2 -- bin/pax/pat_rep.c | 2 -- bin/pax/pax.c | 2 -- bin/pax/sel_subs.c | 2 -- bin/pax/tables.c | 2 -- bin/pax/tar.c | 2 -- bin/pax/tty_subs.c | 2 -- bin/pkill/pkill.c | 2 -- bin/ps/fmt.c | 2 -- bin/ps/keyword.c | 2 -- bin/ps/nlist.c | 2 -- bin/ps/print.c | 2 -- bin/ps/ps.c | 2 -- bin/pwait/pwait.c | 2 -- bin/pwd/pwd.c | 2 -- bin/realpath/realpath.c | 2 -- bin/rm/rm.c | 2 -- bin/rmdir/rmdir.c | 2 -- bin/setfacl/file.c | 2 -- bin/setfacl/mask.c | 2 -- bin/setfacl/merge.c | 2 -- bin/setfacl/remove.c | 2 -- bin/setfacl/setfacl.c | 2 -- bin/setfacl/util.c | 2 -- bin/sh/alias.c | 2 -- bin/sh/arith_yacc.c | 2 -- bin/sh/arith_yylex.c | 2 -- bin/sh/bltin/echo.c | 2 -- bin/sh/cd.c | 2 -- bin/sh/error.c | 2 -- bin/sh/eval.c | 2 -- bin/sh/exec.c | 2 -- bin/sh/expand.c | 2 -- bin/sh/histedit.c | 2 -- bin/sh/input.c | 2 -- bin/sh/jobs.c | 2 -- bin/sh/mail.c | 2 -- bin/sh/main.c | 2 -- bin/sh/memalloc.c | 2 -- bin/sh/miscbltin.c | 2 -- bin/sh/mknodes.c | 2 -- bin/sh/mksyntax.c | 2 -- bin/sh/mystring.c | 2 -- bin/sh/options.c | 2 -- bin/sh/output.c | 2 -- bin/sh/parser.c | 2 -- bin/sh/redir.c | 2 -- bin/sh/show.c | 2 -- bin/sh/trap.c | 2 -- bin/sh/var.c | 2 -- bin/sleep/sleep.c | 2 -- bin/stty/cchar.c | 2 -- bin/stty/gfmt.c | 2 -- bin/stty/key.c | 2 -- bin/stty/modes.c | 2 -- bin/stty/print.c | 2 -- bin/stty/stty.c | 2 -- bin/stty/util.c | 2 -- bin/sync/sync.c | 2 -- bin/test/test.c | 2 -- bin/timeout/timeout.c | 2 -- bin/uuidgen/uuidgen.c | 2 -- cddl/usr.sbin/zfsd/case_file.cc | 3 --- cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc | 3 --- cddl/usr.sbin/zfsd/vdev.cc | 2 -- cddl/usr.sbin/zfsd/zfsd.cc | 3 --- cddl/usr.sbin/zfsd/zfsd_event.cc | 2 -- cddl/usr.sbin/zfsd/zfsd_exception.cc | 2 -- cddl/usr.sbin/zfsd/zfsd_main.cc | 3 --- lib/csu/aarch64/crt1_c.c | 2 -- lib/csu/aarch64/crt1_s.S | 2 -- lib/csu/aarch64/crti.S | 2 -- lib/csu/aarch64/crtn.S | 2 -- lib/csu/aarch64/reloc.c | 2 -- lib/csu/amd64/crt1_c.c | 2 -- lib/csu/amd64/crti.S | 2 -- lib/csu/amd64/crtn.S | 2 -- lib/csu/amd64/reloc.c | 2 -- lib/csu/arm/crt1_c.c | 2 -- lib/csu/arm/crt1_s.S | 2 -- lib/csu/arm/crti.S | 2 -- lib/csu/arm/crtn.S | 2 -- lib/csu/common/crtbegin.c | 2 -- lib/csu/common/crtbrand.S | 2 -- lib/csu/common/crtend.c | 2 -- lib/csu/common/feature_note.S | 2 -- lib/csu/common/ignore_init.c | 2 -- lib/csu/common/ignore_init_note.S | 2 -- lib/csu/i386/crt1_c.c | 2 -- lib/csu/i386/crt1_s.S | 2 -- lib/csu/i386/crti.S | 2 -- lib/csu/i386/crtn.S | 2 -- lib/csu/i386/reloc.c | 2 -- lib/csu/mips/crt1_c.c | 2 -- lib/csu/mips/crti.S | 2 -- lib/csu/mips/crtn.S | 2 -- lib/csu/powerpc/crt1_c.c | 2 -- lib/csu/powerpc/crti.S | 2 -- lib/csu/powerpc/crtn.S | 2 -- lib/csu/powerpc/crtsavres.S | 2 -- lib/csu/powerpc64/crt1_c.c | 2 -- lib/csu/powerpc64/crti.S | 2 -- lib/csu/powerpc64/crtn.S | 2 -- lib/csu/powerpc64/reloc.c | 2 -- lib/csu/riscv/crt1_c.c | 2 -- lib/csu/riscv/crt1_s.S | 2 -- lib/csu/riscv/crti.S | 2 -- lib/csu/riscv/crtn.S | 2 -- lib/csu/tests/cxx_constructors.cc | 2 -- lib/csu/tests/fini_test.c | 2 -- lib/csu/tests/init_test.c | 2 -- lib/flua/libjail/lua_jail.c | 2 -- lib/geom/cache/geom_cache.c | 2 -- lib/geom/concat/geom_concat.c | 2 -- lib/geom/eli/geom_eli.c | 2 -- lib/geom/journal/geom_journal.c | 2 -- lib/geom/journal/geom_journal_ufs.c | 2 -- lib/geom/label/geom_label.c | 2 -- lib/geom/mirror/geom_mirror.c | 2 -- lib/geom/mountver/geom_mountver.c | 2 -- lib/geom/multipath/geom_multipath.c | 1 - lib/geom/nop/geom_nop.c | 2 -- lib/geom/part/geom_part.c | 2 -- lib/geom/raid/geom_raid.c | 2 -- lib/geom/raid3/geom_raid3.c | 2 -- lib/geom/shsec/geom_shsec.c | 2 -- lib/geom/stripe/geom_stripe.c | 2 -- lib/geom/virstor/geom_virstor.c | 2 -- lib/libbe/be.c | 2 -- lib/libbe/be_access.c | 2 -- lib/libbe/be_error.c | 2 -- lib/libbe/be_info.c | 2 -- lib/libbe/tests/target_prog.c | 2 -- lib/libc/aarch64/gen/_ctx_start.S | 2 -- lib/libc/aarch64/gen/_get_tp.c | 2 -- lib/libc/aarch64/gen/_set_tp.c | 2 -- lib/libc/aarch64/gen/_setjmp.S | 2 -- lib/libc/aarch64/gen/fabs.S | 2 -- lib/libc/aarch64/gen/flt_rounds.c | 2 -- lib/libc/aarch64/gen/fpgetmask.c | 2 -- lib/libc/aarch64/gen/fpsetmask.c | 2 -- lib/libc/aarch64/gen/infinity.c | 2 -- lib/libc/aarch64/gen/makecontext.c | 2 -- lib/libc/aarch64/gen/setjmp.S | 2 -- lib/libc/aarch64/gen/sigsetjmp.S | 2 -- lib/libc/aarch64/sys/__vdso_gettc.c | 2 -- lib/libc/aarch64/sys/cerror.S | 2 -- lib/libc/aarch64/sys/syscall.S | 2 -- lib/libc/aarch64/sys/vfork.S | 1 - lib/libc/amd64/gen/_get_tp.c | 2 -- lib/libc/amd64/gen/_setjmp.S | 2 -- lib/libc/amd64/gen/fabs.S | 2 -- lib/libc/amd64/gen/flt_rounds.c | 2 -- lib/libc/amd64/gen/infinity.c | 2 -- lib/libc/amd64/gen/makecontext.c | 2 -- lib/libc/amd64/gen/rfork_thread.S | 2 -- lib/libc/amd64/gen/setjmp.S | 2 -- lib/libc/amd64/gen/signalcontext.c | 2 -- lib/libc/amd64/gen/sigsetjmp.S | 2 -- lib/libc/amd64/stdlib/div.S | 2 -- lib/libc/amd64/stdlib/ldiv.S | 2 -- lib/libc/amd64/stdlib/lldiv.S | 2 -- lib/libc/amd64/string/bcopy.c | 2 -- lib/libc/amd64/string/bzero.c | 2 -- lib/libc/amd64/string/memcmp.S | 2 -- lib/libc/amd64/string/memmove.S | 2 -- lib/libc/amd64/string/memset.S | 2 -- lib/libc/amd64/string/stpcpy.S | 2 -- lib/libc/amd64/string/strcat.S | 2 -- lib/libc/amd64/string/strcmp.S | 2 -- lib/libc/amd64/string/strcpy.c | 2 -- lib/libc/amd64/string/strlen.S | 2 -- lib/libc/amd64/sys/amd64_get_fsbase.c | 2 -- lib/libc/amd64/sys/amd64_get_gsbase.c | 2 -- lib/libc/amd64/sys/amd64_set_fsbase.c | 2 -- lib/libc/amd64/sys/amd64_set_gsbase.c | 2 -- lib/libc/amd64/sys/cerror.S | 2 -- lib/libc/amd64/sys/getcontext.S | 2 -- lib/libc/amd64/sys/vfork.S | 2 -- lib/libc/arm/aeabi/aeabi_asm_double.S | 2 -- lib/libc/arm/aeabi/aeabi_asm_float.S | 2 -- lib/libc/arm/aeabi/aeabi_atexit.c | 2 -- lib/libc/arm/aeabi/aeabi_double.c | 2 -- lib/libc/arm/aeabi/aeabi_float.c | 2 -- lib/libc/arm/aeabi/aeabi_int_div.S | 2 -- lib/libc/arm/aeabi/aeabi_unwind_cpp.c | 2 -- lib/libc/arm/aeabi/aeabi_unwind_exidx.c | 2 -- lib/libc/arm/aeabi/aeabi_vfp_double.S | 2 -- lib/libc/arm/aeabi/aeabi_vfp_float.S | 2 -- lib/libc/arm/gen/__aeabi_read_tp.S | 2 -- lib/libc/arm/gen/_get_tp.c | 2 -- lib/libc/arm/gen/_setjmp.S | 3 --- lib/libc/arm/gen/alloca.S | 2 -- lib/libc/arm/gen/arm_drain_writebuf.c | 2 -- lib/libc/arm/gen/arm_initfini.c | 2 -- lib/libc/arm/gen/arm_sync_icache.c | 2 -- lib/libc/arm/gen/divsi3.S | 2 -- lib/libc/arm/gen/fabs.c | 2 -- lib/libc/arm/gen/flt_rounds.c | 2 -- lib/libc/arm/gen/fpgetmask_vfp.c | 2 -- lib/libc/arm/gen/fpgetround_vfp.c | 2 -- lib/libc/arm/gen/fpgetsticky_vfp.c | 2 -- lib/libc/arm/gen/fpsetmask_vfp.c | 2 -- lib/libc/arm/gen/fpsetround_vfp.c | 2 -- lib/libc/arm/gen/fpsetsticky_vfp.c | 2 -- lib/libc/arm/gen/getcontextx.c | 2 -- lib/libc/arm/gen/infinity.c | 2 -- lib/libc/arm/gen/makecontext.c | 2 -- lib/libc/arm/gen/setjmp.S | 3 --- lib/libc/arm/gen/signalcontext.c | 2 -- lib/libc/arm/gen/sigsetjmp.S | 2 -- lib/libc/arm/string/bcopy.S | 1 - lib/libc/arm/string/bzero.S | 3 --- lib/libc/arm/string/memcmp.S | 3 --- lib/libc/arm/string/memcpy.S | 1 - lib/libc/arm/string/memcpy_arm.S | 2 -- lib/libc/arm/string/memcpy_xscale.S | 2 -- lib/libc/arm/string/memmove.S | 2 -- lib/libc/arm/string/memset.S | 2 -- lib/libc/arm/string/strcmp.S | 3 --- lib/libc/arm/string/strlen.S | 2 -- lib/libc/arm/string/strncmp.S | 3 --- lib/libc/arm/sys/Ovfork.S | 1 - lib/libc/arm/sys/__vdso_gettc.c | 2 -- lib/libc/arm/sys/cerror.S | 1 - lib/libc/arm/sys/syscall.S | 1 - lib/libc/compat-43/creat.c | 2 -- lib/libc/compat-43/gethostid.c | 2 -- lib/libc/compat-43/getwd.c | 2 -- lib/libc/compat-43/killpg.c | 2 -- lib/libc/compat-43/sethostid.c | 2 -- lib/libc/compat-43/setpgrp.c | 2 -- lib/libc/compat-43/setrgid.c | 2 -- lib/libc/compat-43/setruid.c | 2 -- lib/libc/compat-43/sigcompat.c | 2 -- lib/libc/csu/aarch64/reloc.c | 2 -- lib/libc/csu/amd64/reloc.c | 2 -- lib/libc/csu/i386/reloc.c | 2 -- lib/libc/csu/powerpc64/reloc.c | 2 -- lib/libc/db/btree/bt_close.c | 2 -- lib/libc/db/btree/bt_conv.c | 2 -- lib/libc/db/btree/bt_debug.c | 2 -- lib/libc/db/btree/bt_delete.c | 2 -- lib/libc/db/btree/bt_get.c | 2 -- lib/libc/db/btree/bt_open.c | 2 -- lib/libc/db/btree/bt_overflow.c | 2 -- lib/libc/db/btree/bt_page.c | 2 -- lib/libc/db/btree/bt_put.c | 2 -- lib/libc/db/btree/bt_search.c | 2 -- lib/libc/db/btree/bt_seq.c | 2 -- lib/libc/db/btree/bt_split.c | 2 -- lib/libc/db/btree/bt_utils.c | 2 -- lib/libc/db/db/db.c | 2 -- lib/libc/db/hash/hash.c | 2 -- lib/libc/db/hash/hash_bigkey.c | 2 -- lib/libc/db/hash/hash_buf.c | 2 -- lib/libc/db/hash/hash_func.c | 2 -- lib/libc/db/hash/hash_log2.c | 2 -- lib/libc/db/hash/hash_page.c | 2 -- lib/libc/db/hash/ndbm.c | 2 -- lib/libc/db/mpool/mpool-compat.c | 2 -- lib/libc/db/mpool/mpool.c | 2 -- lib/libc/db/recno/rec_close.c | 2 -- lib/libc/db/recno/rec_delete.c | 2 -- lib/libc/db/recno/rec_get.c | 2 -- lib/libc/db/recno/rec_open.c | 2 -- lib/libc/db/recno/rec_put.c | 2 -- lib/libc/db/recno/rec_search.c | 2 -- lib/libc/db/recno/rec_seq.c | 2 -- lib/libc/db/recno/rec_utils.c | 2 -- lib/libc/db/test/btree.tests/main.c | 2 -- lib/libc/db/test/dbtest.c | 2 -- lib/libc/db/test/hash.tests/driver2.c | 2 -- lib/libc/db/test/hash.tests/tcreat3.c | 2 -- lib/libc/db/test/hash.tests/tdel.c | 2 -- lib/libc/db/test/hash.tests/thash4.c | 2 -- lib/libc/db/test/hash.tests/tread2.c | 2 -- lib/libc/db/test/hash.tests/tseq.c | 2 -- lib/libc/db/test/hash.tests/tverify.c | 2 -- lib/libc/gdtoa/_hdtoa.c | 2 -- lib/libc/gdtoa/_hldtoa.c | 2 -- lib/libc/gdtoa/_ldtoa.c | 2 -- lib/libc/gdtoa/machdep_ldisQ.c | 2 -- lib/libc/gdtoa/machdep_ldisd.c | 2 -- lib/libc/gdtoa/machdep_ldisx.c | 2 -- lib/libc/gen/__getosreldate.c | 2 -- lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c | 2 -- lib/libc/gen/__xuname.c | 2 -- lib/libc/gen/_once_stub.c | 2 -- lib/libc/gen/_pthread_stubs.c | 2 -- lib/libc/gen/_rand48.c | 2 -- lib/libc/gen/_spinlock_stub.c | 2 -- lib/libc/gen/_thread_init.c | 2 -- lib/libc/gen/alarm.c | 2 -- lib/libc/gen/arc4random-compat.c | 2 -- lib/libc/gen/arc4random.c | 2 -- lib/libc/gen/assert.c | 2 -- lib/libc/gen/auxv.c | 2 -- lib/libc/gen/basename.c | 2 -- lib/libc/gen/basename_compat.c | 2 -- lib/libc/gen/cap_sandboxed.c | 2 -- lib/libc/gen/check_utility_compat.c | 2 -- lib/libc/gen/clock.c | 2 -- lib/libc/gen/clock_getcpuclockid.c | 2 -- lib/libc/gen/closedir.c | 2 -- lib/libc/gen/confstr.c | 2 -- lib/libc/gen/crypt.c | 2 -- lib/libc/gen/ctermid.c | 2 -- lib/libc/gen/daemon.c | 2 -- lib/libc/gen/devname-compat11.c | 2 -- lib/libc/gen/devname.c | 2 -- lib/libc/gen/dirfd.c | 2 -- lib/libc/gen/dirname.c | 2 -- lib/libc/gen/dirname_compat.c | 2 -- lib/libc/gen/disklabel.c | 2 -- lib/libc/gen/dlfcn.c | 2 -- lib/libc/gen/drand48.c | 2 -- lib/libc/gen/dup3.c | 2 -- lib/libc/gen/erand48.c | 2 -- lib/libc/gen/err.c | 2 -- lib/libc/gen/errlst.c | 2 -- lib/libc/gen/errno.c | 2 -- lib/libc/gen/eventfd.c | 2 -- lib/libc/gen/exec.c | 2 -- lib/libc/gen/exect.c | 2 -- lib/libc/gen/fdevname.c | 2 -- lib/libc/gen/feature_present.c | 2 -- lib/libc/gen/fmtcheck.c | 2 -- lib/libc/gen/fmtmsg.c | 2 -- lib/libc/gen/fnmatch.c | 2 -- lib/libc/gen/fstab.c | 2 -- lib/libc/gen/ftok.c | 2 -- lib/libc/gen/fts-compat.c | 2 -- lib/libc/gen/fts-compat11.c | 2 -- lib/libc/gen/fts.c | 2 -- lib/libc/gen/ftw-compat11.c | 2 -- lib/libc/gen/ftw.c | 2 -- lib/libc/gen/getbootfile.c | 2 -- lib/libc/gen/getbsize.c | 2 -- lib/libc/gen/getcap.c | 2 -- lib/libc/gen/getcwd.c | 2 -- lib/libc/gen/getdomainname.c | 2 -- lib/libc/gen/getentropy.c | 2 -- lib/libc/gen/getgrent.c | 2 -- lib/libc/gen/getgrouplist.c | 2 -- lib/libc/gen/gethostname.c | 2 -- lib/libc/gen/getloadavg.c | 2 -- lib/libc/gen/getlogin.c | 2 -- lib/libc/gen/getmntinfo-compat11.c | 2 -- lib/libc/gen/getmntinfo.c | 2 -- lib/libc/gen/getnetgrent.c | 2 -- lib/libc/gen/getosreldate.c | 2 -- lib/libc/gen/getpagesize.c | 2 -- lib/libc/gen/getpagesizes.c | 2 -- lib/libc/gen/getpeereid.c | 2 -- lib/libc/gen/getprogname.c | 2 -- lib/libc/gen/getpwent.c | 2 -- lib/libc/gen/getttyent.c | 2 -- lib/libc/gen/getusershell.c | 2 -- lib/libc/gen/getutxent.c | 2 -- lib/libc/gen/getvfsbyname.c | 2 -- lib/libc/gen/glob-compat11.c | 2 -- lib/libc/gen/glob.c | 2 -- lib/libc/gen/initgroups.c | 2 -- lib/libc/gen/isatty.c | 2 -- lib/libc/gen/jrand48.c | 2 -- lib/libc/gen/lcong48.c | 2 -- lib/libc/gen/ldexp.c | 2 -- lib/libc/gen/libc_dlopen.c | 2 -- lib/libc/gen/lockf.c | 2 -- lib/libc/gen/lrand48.c | 2 -- lib/libc/gen/memalign.c | 2 -- lib/libc/gen/modf.c | 2 -- lib/libc/gen/mrand48.c | 2 -- lib/libc/gen/nftw-compat11.c | 2 -- lib/libc/gen/nftw.c | 2 -- lib/libc/gen/nice.c | 2 -- lib/libc/gen/nlist.c | 2 -- lib/libc/gen/nrand48.c | 2 -- lib/libc/gen/opendir.c | 2 -- lib/libc/gen/pause.c | 2 -- lib/libc/gen/pmadvise.c | 2 -- lib/libc/gen/popen.c | 2 -- lib/libc/gen/posix_spawn.c | 2 -- lib/libc/gen/psignal.c | 2 -- lib/libc/gen/pututxline.c | 2 -- lib/libc/gen/pw_scan.c | 2 -- lib/libc/gen/raise.c | 2 -- lib/libc/gen/readdir-compat11.c | 2 -- lib/libc/gen/readdir.c | 2 -- lib/libc/gen/readpassphrase.c | 2 -- lib/libc/gen/recvmmsg.c | 2 -- lib/libc/gen/rewinddir.c | 2 -- lib/libc/gen/scandir-compat11.c | 2 -- lib/libc/gen/scandir.c | 2 -- lib/libc/gen/seed48.c | 2 -- lib/libc/gen/seekdir.c | 2 -- lib/libc/gen/semctl.c | 2 -- lib/libc/gen/sendmmsg.c | 2 -- lib/libc/gen/setdomainname.c | 2 -- lib/libc/gen/sethostname.c | 2 -- lib/libc/gen/setjmperr.c | 2 -- lib/libc/gen/setmode.c | 2 -- lib/libc/gen/setproctitle.c | 2 -- lib/libc/gen/setprogname.c | 2 -- lib/libc/gen/siginterrupt.c | 2 -- lib/libc/gen/siglist.c | 2 -- lib/libc/gen/signal.c | 2 -- lib/libc/gen/sigsetops.c | 2 -- lib/libc/gen/sleep.c | 2 -- lib/libc/gen/statvfs.c | 2 -- lib/libc/gen/stringlist.c | 2 -- lib/libc/gen/strtofflags.c | 2 -- lib/libc/gen/sysconf.c | 2 -- lib/libc/gen/sysctl.c | 2 -- lib/libc/gen/sysctlbyname.c | 2 -- lib/libc/gen/sysctlnametomib.c | 2 -- lib/libc/gen/syslog.c | 2 -- lib/libc/gen/telldir.c | 2 -- lib/libc/gen/termios.c | 2 -- lib/libc/gen/time.c | 2 -- lib/libc/gen/times.c | 2 -- lib/libc/gen/timespec_get.c | 2 -- lib/libc/gen/timezone.c | 2 -- lib/libc/gen/trivial-getcontextx.c | 2 -- lib/libc/gen/ttyname.c | 2 -- lib/libc/gen/ttyslot.c | 2 -- lib/libc/gen/ualarm.c | 2 -- lib/libc/gen/uname.c | 2 -- lib/libc/gen/usleep.c | 2 -- lib/libc/gen/utime.c | 2 -- lib/libc/gen/utxdb.c | 2 -- lib/libc/gen/valloc.c | 2 -- lib/libc/gen/wait.c | 2 -- lib/libc/gen/wait3.c | 2 -- lib/libc/gen/waitid.c | 2 -- lib/libc/gen/waitpid.c | 2 -- lib/libc/gen/wordexp.c | 3 --- lib/libc/gmon/gmon.c | 2 -- lib/libc/gmon/mcount.c | 2 -- lib/libc/i386/gen/_ctx_start.S | 2 -- lib/libc/i386/gen/_get_tp.c | 2 -- lib/libc/i386/gen/_setjmp.S | 2 -- lib/libc/i386/gen/fabs.S | 2 -- lib/libc/i386/gen/flt_rounds.c | 2 -- lib/libc/i386/gen/infinity.c | 2 -- lib/libc/i386/gen/makecontext.c | 2 -- lib/libc/i386/gen/rfork_thread.S | 2 -- lib/libc/i386/gen/setjmp.S | 2 -- lib/libc/i386/gen/signalcontext.c | 2 -- lib/libc/i386/gen/sigsetjmp.S | 2 -- lib/libc/i386/stdlib/div.S | 2 -- lib/libc/i386/stdlib/ldiv.S | 2 -- lib/libc/i386/string/bcmp.S | 2 -- lib/libc/i386/string/bcopy.S | 2 -- lib/libc/i386/string/bzero.S | 2 -- lib/libc/i386/string/memcmp.S | 2 -- lib/libc/i386/string/memcpy.S | 2 -- lib/libc/i386/string/memmove.S | 2 -- lib/libc/i386/string/memset.S | 2 -- lib/libc/i386/string/strcat.S | 2 -- lib/libc/i386/string/strchr.S | 2 -- lib/libc/i386/string/strcmp.S | 2 -- lib/libc/i386/string/strcpy.S | 2 -- lib/libc/i386/string/strncmp.S | 2 -- lib/libc/i386/string/strrchr.S | 2 -- lib/libc/i386/string/swab.S | 2 -- lib/libc/i386/string/wcschr.S | 2 -- lib/libc/i386/string/wcscmp.S | 2 -- lib/libc/i386/string/wcslen.S | 2 -- lib/libc/i386/string/wmemchr.S | 2 -- lib/libc/i386/sys/Ovfork.S | 2 -- lib/libc/i386/sys/cerror.S | 2 -- lib/libc/i386/sys/getcontext.S | 2 -- lib/libc/i386/sys/i386_clr_watch.c | 2 -- lib/libc/i386/sys/i386_get_fsbase.c | 2 -- lib/libc/i386/sys/i386_get_gsbase.c | 2 -- lib/libc/i386/sys/i386_get_ioperm.c | 2 -- lib/libc/i386/sys/i386_get_ldt.c | 2 -- lib/libc/i386/sys/i386_set_fsbase.c | 2 -- lib/libc/i386/sys/i386_set_gsbase.c | 2 -- lib/libc/i386/sys/i386_set_ioperm.c | 2 -- lib/libc/i386/sys/i386_set_ldt.c | 2 -- lib/libc/i386/sys/i386_set_watch.c | 2 -- lib/libc/i386/sys/i386_vm86.c | 2 -- lib/libc/i386/sys/syscall.S | 2 -- lib/libc/inet/inet_addr.c | 2 -- lib/libc/inet/inet_cidr_ntop.c | 2 -- lib/libc/inet/inet_cidr_pton.c | 2 -- lib/libc/inet/inet_lnaof.c | 2 -- lib/libc/inet/inet_makeaddr.c | 2 -- lib/libc/inet/inet_net_ntop.c | 2 -- lib/libc/inet/inet_net_pton.c | 2 -- lib/libc/inet/inet_neta.c | 2 -- lib/libc/inet/inet_netof.c | 2 -- lib/libc/inet/inet_network.c | 2 -- lib/libc/inet/inet_ntoa.c | 2 -- lib/libc/inet/inet_ntop.c | 2 -- lib/libc/inet/inet_pton.c | 2 -- lib/libc/inet/nsap_addr.c | 2 -- lib/libc/isc/ev_streams.c | 2 -- lib/libc/isc/ev_timers.c | 2 -- lib/libc/locale/ascii.c | 2 -- lib/libc/locale/big5.c | 2 -- lib/libc/locale/btowc.c | 2 -- lib/libc/locale/c16rtomb.c | 2 -- lib/libc/locale/c32rtomb.c | 2 -- lib/libc/locale/cXXrtomb_iconv.h | 2 -- lib/libc/locale/collate.c | 2 -- lib/libc/locale/collcmp.c | 2 -- lib/libc/locale/euc.c | 2 -- lib/libc/locale/fix_grouping.c | 2 -- lib/libc/locale/gb18030.c | 2 -- lib/libc/locale/gb2312.c | 2 -- lib/libc/locale/gbk.c | 2 -- lib/libc/locale/isctype.c | 2 -- lib/libc/locale/iswctype.c | 2 -- lib/libc/locale/ldpart.c | 2 -- lib/libc/locale/lmessages.c | 2 -- lib/libc/locale/lmonetary.c | 2 -- lib/libc/locale/lnumeric.c | 2 -- lib/libc/locale/localeconv.c | 2 -- lib/libc/locale/mblen.c | 2 -- lib/libc/locale/mbrlen.c | 2 -- lib/libc/locale/mbrtoc16.c | 2 -- lib/libc/locale/mbrtoc32.c | 2 -- lib/libc/locale/mbrtocXX_iconv.h | 2 -- lib/libc/locale/mbrtowc.c | 2 -- lib/libc/locale/mbsinit.c | 2 -- lib/libc/locale/mbsnrtowcs.c | 2 -- lib/libc/locale/mbsrtowcs.c | 2 -- lib/libc/locale/mbstowcs.c | 2 -- lib/libc/locale/mbtowc.c | 2 -- lib/libc/locale/mskanji.c | 2 -- lib/libc/locale/nextwctype.c | 2 -- lib/libc/locale/nl_langinfo.c | 2 -- lib/libc/locale/nomacros.c | 2 -- lib/libc/locale/none.c | 2 -- lib/libc/locale/rpmatch.c | 2 -- lib/libc/locale/rune.c | 2 -- lib/libc/locale/runetype.c | 2 -- lib/libc/locale/setlocale.c | 2 -- lib/libc/locale/setrunelocale.c | 2 -- lib/libc/locale/table.c | 2 -- lib/libc/locale/tolower.c | 2 -- lib/libc/locale/toupper.c | 2 -- lib/libc/locale/utf8.c | 2 -- lib/libc/locale/wcrtomb.c | 2 -- lib/libc/locale/wcsftime.c | 2 -- lib/libc/locale/wcsnrtombs.c | 2 -- lib/libc/locale/wcsrtombs.c | 2 -- lib/libc/locale/wcstod.c | 2 -- lib/libc/locale/wcstof.c | 2 -- lib/libc/locale/wcstoimax.c | 2 -- lib/libc/locale/wcstol.c | 2 -- lib/libc/locale/wcstold.c | 2 -- lib/libc/locale/wcstoll.c | 2 -- lib/libc/locale/wcstombs.c | 2 -- lib/libc/locale/wcstoul.c | 2 -- lib/libc/locale/wcstoull.c | 2 -- lib/libc/locale/wcstoumax.c | 2 -- lib/libc/locale/wctob.c | 2 -- lib/libc/locale/wctomb.c | 2 -- lib/libc/locale/wctrans.c | 2 -- lib/libc/locale/wctype.c | 2 -- lib/libc/locale/wcwidth.c | 2 -- lib/libc/mips/gen/_ctx_start.S | 2 -- lib/libc/mips/gen/_get_tp.c | 2 -- lib/libc/mips/gen/_setjmp.S | 2 -- lib/libc/mips/gen/fabs.S | 2 -- lib/libc/mips/gen/fabs.c | 2 -- lib/libc/mips/gen/flt_rounds.c | 1 - lib/libc/mips/gen/hardfloat/fpgetmask.c | 1 - lib/libc/mips/gen/hardfloat/fpgetround.c | 1 - lib/libc/mips/gen/hardfloat/fpgetsticky.c | 1 - lib/libc/mips/gen/hardfloat/fpsetmask.c | 1 - lib/libc/mips/gen/hardfloat/fpsetround.c | 1 - lib/libc/mips/gen/hardfloat/fpsetsticky.c | 1 - lib/libc/mips/gen/infinity.c | 2 -- lib/libc/mips/gen/ldexp.S | 2 -- lib/libc/mips/gen/makecontext.c | 1 - lib/libc/mips/gen/setjmp.S | 2 -- lib/libc/mips/gen/signalcontext.c | 2 -- lib/libc/mips/gen/sigsetjmp.S | 1 - lib/libc/mips/net/htonl.S | 3 --- lib/libc/mips/net/htons.S | 3 --- lib/libc/mips/net/ntohl.S | 3 --- lib/libc/mips/net/ntohs.S | 2 -- lib/libc/mips/string/bcmp.S | 2 -- lib/libc/mips/string/bcopy.S | 2 -- lib/libc/mips/string/bzero.S | 2 -- lib/libc/mips/string/ffs.S | 2 -- lib/libc/mips/string/memcpy.S | 2 -- lib/libc/mips/string/memmove.S | 2 -- lib/libc/mips/string/strchr.S | 2 -- lib/libc/mips/string/strcmp.S | 2 -- lib/libc/mips/string/strlen.S | 2 -- lib/libc/mips/string/strrchr.S | 2 -- lib/libc/mips/sys/Ovfork.S | 1 - lib/libc/mips/sys/cerror.S | 1 - lib/libc/mips/sys/syscall.S | 1 - lib/libc/nameser/ns_name.c | 2 -- lib/libc/nameser/ns_netint.c | 2 -- lib/libc/nameser/ns_parse.c | 2 -- lib/libc/nameser/ns_print.c | 2 -- lib/libc/nameser/ns_samedomain.c | 2 -- lib/libc/nameser/ns_ttl.c | 2 -- lib/libc/net/base64.c | 2 -- lib/libc/net/ether_addr.c | 2 -- lib/libc/net/eui64.c | 2 -- lib/libc/net/gai_strerror.c | 2 -- lib/libc/net/getaddrinfo.c | 2 -- lib/libc/net/gethostbydns.c | 2 -- lib/libc/net/gethostbyht.c | 2 -- lib/libc/net/gethostbynis.c | 2 -- lib/libc/net/gethostnamadr.c | 2 -- lib/libc/net/getifaddrs.c | 2 -- lib/libc/net/getifmaddrs.c | 2 -- lib/libc/net/getnameinfo.c | 2 -- lib/libc/net/getnetbydns.c | 2 -- lib/libc/net/getnetbyht.c | 2 -- lib/libc/net/getnetbynis.c | 2 -- lib/libc/net/getnetnamadr.c | 2 -- lib/libc/net/getproto.c | 2 -- lib/libc/net/getprotoent.c | 2 -- lib/libc/net/getprotoname.c | 2 -- lib/libc/net/getservent.c | 2 -- lib/libc/net/hesiod.c | 2 -- lib/libc/net/if_indextoname.c | 2 -- lib/libc/net/if_nameindex.c | 2 -- lib/libc/net/if_nametoindex.c | 2 -- lib/libc/net/ip6opt.c | 2 -- lib/libc/net/linkaddr.c | 2 -- lib/libc/net/map_v4v6.c | 2 -- lib/libc/net/name6.c | 2 -- lib/libc/net/nscache.c | 2 -- lib/libc/net/nscachedcli.c | 2 -- lib/libc/net/nsdispatch.c | 2 -- lib/libc/net/nsparser.y | 2 -- lib/libc/net/nss_compat.c | 2 -- lib/libc/net/ntoh.c | 2 -- lib/libc/net/rcmd.c | 2 -- lib/libc/net/rcmdsh.c | 2 -- lib/libc/net/recv.c | 2 -- lib/libc/net/rthdr.c | 2 -- lib/libc/net/sctp_sys_calls.c | 2 -- lib/libc/net/send.c | 2 -- lib/libc/net/sourcefilter.c | 2 -- lib/libc/net/vars.c | 2 -- lib/libc/nls/msgcat.c | 2 -- lib/libc/posix1e/acl_branding.c | 2 -- lib/libc/posix1e/acl_calc_mask.c | 2 -- lib/libc/posix1e/acl_compat.c | 2 -- lib/libc/posix1e/acl_copy.c | 2 -- lib/libc/posix1e/acl_delete.c | 2 -- lib/libc/posix1e/acl_delete_entry.c | 2 -- lib/libc/posix1e/acl_entry.c | 2 -- lib/libc/posix1e/acl_flag.c | 2 -- lib/libc/posix1e/acl_free.c | 2 -- lib/libc/posix1e/acl_from_text.c | 2 -- lib/libc/posix1e/acl_from_text_nfs4.c | 2 -- lib/libc/posix1e/acl_get.c | 2 -- lib/libc/posix1e/acl_id_to_name.c | 2 -- lib/libc/posix1e/acl_init.c | 2 -- lib/libc/posix1e/acl_perm.c | 2 -- lib/libc/posix1e/acl_set.c | 2 -- lib/libc/posix1e/acl_strip.c | 2 -- lib/libc/posix1e/acl_support.c | 2 -- lib/libc/posix1e/acl_support_nfs4.c | 2 -- lib/libc/posix1e/acl_to_text.c | 2 -- lib/libc/posix1e/acl_to_text_nfs4.c | 2 -- lib/libc/posix1e/acl_valid.c | 2 -- lib/libc/posix1e/extattr.c | 2 -- lib/libc/posix1e/mac.c | 2 -- lib/libc/posix1e/mac_exec.c | 2 -- lib/libc/posix1e/mac_get.c | 2 -- lib/libc/posix1e/mac_set.c | 2 -- lib/libc/powerpc/gen/_ctx_start.S | 3 --- lib/libc/powerpc/gen/_get_tp.c | 2 -- lib/libc/powerpc/gen/_setjmp.S | 2 -- lib/libc/powerpc/gen/eabi.S | 2 -- lib/libc/powerpc/gen/fabs.S | 2 -- lib/libc/powerpc/gen/flt_rounds.c | 2 -- lib/libc/powerpc/gen/fpgetmask.c | 2 -- lib/libc/powerpc/gen/fpgetround.c | 2 -- lib/libc/powerpc/gen/fpsetmask.c | 2 -- lib/libc/powerpc/gen/fpsetround.c | 2 -- lib/libc/powerpc/gen/infinity.c | 2 -- lib/libc/powerpc/gen/makecontext.c | 2 -- lib/libc/powerpc/gen/setjmp.S | 2 -- lib/libc/powerpc/gen/signalcontext.c | 2 -- lib/libc/powerpc/gen/sigsetjmp.S | 2 -- lib/libc/powerpc/sys/__vdso_gettc.c | 2 -- lib/libc/powerpc/sys/cerror.S | 2 -- lib/libc/powerpc64/gen/_ctx_start.S | 3 --- lib/libc/powerpc64/gen/_get_tp.c | 2 -- lib/libc/powerpc64/gen/_setjmp.S | 2 -- lib/libc/powerpc64/gen/fabs.S | 2 -- lib/libc/powerpc64/gen/flt_rounds.c | 2 -- lib/libc/powerpc64/gen/fpgetmask.c | 2 -- lib/libc/powerpc64/gen/fpgetround.c | 2 -- lib/libc/powerpc64/gen/fpsetmask.c | 2 -- lib/libc/powerpc64/gen/fpsetround.c | 2 -- lib/libc/powerpc64/gen/infinity.c | 2 -- lib/libc/powerpc64/gen/makecontext.c | 2 -- lib/libc/powerpc64/gen/setjmp.S | 2 -- lib/libc/powerpc64/gen/signalcontext.c | 2 -- lib/libc/powerpc64/gen/sigsetjmp.S | 2 -- lib/libc/powerpc64/string/bcopy.S | 2 -- lib/libc/powerpc64/string/bcopy_resolver.c | 2 -- lib/libc/powerpc64/string/memcpy.S | 2 -- lib/libc/powerpc64/string/strcpy.c | 2 -- lib/libc/powerpc64/string/strcpy_arch_2_05.S | 2 -- lib/libc/powerpc64/string/strcpy_resolver.c | 2 -- lib/libc/powerpc64/string/strncpy.c | 2 -- lib/libc/powerpc64/string/strncpy_arch_2_05.S | 2 -- lib/libc/powerpc64/string/strncpy_resolver.c | 2 -- lib/libc/powerpc64/sys/__vdso_gettc.c | 2 -- lib/libc/powerpc64/sys/cerror.S | 2 -- lib/libc/powerpcspe/gen/_setjmp.S | 2 -- lib/libc/powerpcspe/gen/fabs.S | 2 -- lib/libc/powerpcspe/gen/flt_rounds.c | 2 -- lib/libc/powerpcspe/gen/fpgetmask.c | 2 -- lib/libc/powerpcspe/gen/fpgetround.c | 2 -- lib/libc/powerpcspe/gen/fpsetmask.c | 2 -- lib/libc/powerpcspe/gen/fpsetround.c | 2 -- lib/libc/powerpcspe/gen/setjmp.S | 2 -- lib/libc/powerpcspe/gen/sigsetjmp.S | 2 -- lib/libc/quad/TESTS/divrem.c | 2 -- lib/libc/quad/TESTS/mul.c | 2 -- lib/libc/quad/adddi3.c | 2 -- lib/libc/quad/anddi3.c | 2 -- lib/libc/quad/ashldi3.c | 2 -- lib/libc/quad/ashrdi3.c | 2 -- lib/libc/quad/cmpdi2.c | 2 -- lib/libc/quad/divdi3.c | 2 -- lib/libc/quad/fixdfdi.c | 2 -- lib/libc/quad/fixsfdi.c | 2 -- lib/libc/quad/fixunsdfdi.c | 2 -- lib/libc/quad/fixunssfdi.c | 2 -- lib/libc/quad/floatdidf.c | 2 -- lib/libc/quad/floatdisf.c | 2 -- lib/libc/quad/floatunsdidf.c | 2 -- lib/libc/quad/iordi3.c | 2 -- lib/libc/quad/lshldi3.c | 2 -- lib/libc/quad/lshrdi3.c | 2 -- lib/libc/quad/moddi3.c | 2 -- lib/libc/quad/muldi3.c | 2 -- lib/libc/quad/negdi2.c | 2 -- lib/libc/quad/notdi2.c | 2 -- lib/libc/quad/qdivrem.c | 2 -- lib/libc/quad/subdi3.c | 2 -- lib/libc/quad/ucmpdi2.c | 2 -- lib/libc/quad/udivdi3.c | 2 -- lib/libc/quad/umoddi3.c | 2 -- lib/libc/quad/xordi3.c | 2 -- lib/libc/regex/engine.c | 2 -- lib/libc/regex/grot/debug.c | 2 -- lib/libc/regex/grot/main.c | 2 -- lib/libc/regex/grot/split.c | 2 -- lib/libc/regex/regcomp.c | 2 -- lib/libc/regex/regerror.c | 2 -- lib/libc/regex/regexec.c | 2 -- lib/libc/regex/regfree.c | 2 -- lib/libc/resolv/herror.c | 2 -- lib/libc/resolv/mtctxres.c | 2 -- lib/libc/resolv/res_comp.c | 2 -- lib/libc/resolv/res_data.c | 2 -- lib/libc/resolv/res_debug.c | 2 -- lib/libc/resolv/res_findzonecut.c | 2 -- lib/libc/resolv/res_init.c | 2 -- lib/libc/resolv/res_mkquery.c | 2 -- lib/libc/resolv/res_mkupdate.c | 2 -- lib/libc/resolv/res_query.c | 2 -- lib/libc/resolv/res_send.c | 2 -- lib/libc/resolv/res_update.c | 2 -- lib/libc/riscv/gen/_ctx_start.S | 2 -- lib/libc/riscv/gen/_get_tp.c | 2 -- lib/libc/riscv/gen/_set_tp.c | 2 -- lib/libc/riscv/gen/_setjmp.S | 2 -- lib/libc/riscv/gen/fabs.S | 2 -- lib/libc/riscv/gen/flt_rounds.c | 2 -- lib/libc/riscv/gen/fpgetmask.c | 2 -- lib/libc/riscv/gen/fpsetmask.c | 2 -- lib/libc/riscv/gen/infinity.c | 2 -- lib/libc/riscv/gen/makecontext.c | 2 -- lib/libc/riscv/gen/setjmp.S | 2 -- lib/libc/riscv/gen/sigsetjmp.S | 2 -- lib/libc/riscv/sys/__vdso_gettc.c | 2 -- lib/libc/riscv/sys/cerror.S | 2 -- lib/libc/riscv/sys/syscall.S | 2 -- lib/libc/riscv/sys/vfork.S | 1 - lib/libc/rpc/auth_des.c | 2 -- lib/libc/rpc/auth_none.c | 2 -- lib/libc/rpc/auth_time.c | 2 -- lib/libc/rpc/auth_unix.c | 2 -- lib/libc/rpc/authdes_prot.c | 2 -- lib/libc/rpc/authunix_prot.c | 2 -- lib/libc/rpc/bindresvport.c | 2 -- lib/libc/rpc/clnt_bcast.c | 3 --- lib/libc/rpc/clnt_dg.c | 2 -- lib/libc/rpc/clnt_generic.c | 2 -- lib/libc/rpc/clnt_perror.c | 2 -- lib/libc/rpc/clnt_raw.c | 2 -- lib/libc/rpc/clnt_simple.c | 2 -- lib/libc/rpc/clnt_vc.c | 2 -- lib/libc/rpc/crypt_client.c | 2 -- lib/libc/rpc/des_crypt.c | 2 -- lib/libc/rpc/des_soft.c | 2 -- lib/libc/rpc/getnetconfig.c | 2 -- lib/libc/rpc/getnetpath.c | 2 -- lib/libc/rpc/getpublickey.c | 2 -- lib/libc/rpc/getrpcent.c | 2 -- lib/libc/rpc/getrpcport.c | 2 -- lib/libc/rpc/key_call.c | 2 -- lib/libc/rpc/key_prot_xdr.c | 2 -- lib/libc/rpc/mt_misc.c | 2 -- lib/libc/rpc/netname.c | 2 -- lib/libc/rpc/netnamer.c | 2 -- lib/libc/rpc/pmap_clnt.c | 2 -- lib/libc/rpc/pmap_getmaps.c | 2 -- lib/libc/rpc/pmap_getport.c | 2 -- lib/libc/rpc/pmap_prot.c | 2 -- lib/libc/rpc/pmap_prot2.c | 2 -- lib/libc/rpc/pmap_rmt.c | 2 -- lib/libc/rpc/rpc_callmsg.c | 2 -- lib/libc/rpc/rpc_commondata.c | 2 -- lib/libc/rpc/rpc_dtablesize.c | 2 -- lib/libc/rpc/rpc_generic.c | 2 -- lib/libc/rpc/rpc_prot.c | 2 -- lib/libc/rpc/rpc_soc.c | 2 -- lib/libc/rpc/rpcb_clnt.c | 2 -- lib/libc/rpc/rpcb_prot.c | 2 -- lib/libc/rpc/rpcb_st_xdr.c | 2 -- lib/libc/rpc/rpcdname.c | 2 -- lib/libc/rpc/rtime.c | 2 -- lib/libc/rpc/svc.c | 2 -- lib/libc/rpc/svc_auth.c | 2 -- lib/libc/rpc/svc_auth_des.c | 2 -- lib/libc/rpc/svc_auth_unix.c | 2 -- lib/libc/rpc/svc_dg.c | 2 -- lib/libc/rpc/svc_generic.c | 2 -- lib/libc/rpc/svc_raw.c | 2 -- lib/libc/rpc/svc_run.c | 2 -- lib/libc/rpc/svc_simple.c | 2 -- lib/libc/rpc/svc_vc.c | 2 -- lib/libc/secure/stack_protector.c | 2 -- lib/libc/secure/stack_protector_compat.c | 2 -- lib/libc/softfloat/bits32/softfloat.c | 2 -- lib/libc/softfloat/bits64/softfloat.c | 2 -- lib/libc/softfloat/eqdf2.c | 2 -- lib/libc/softfloat/eqsf2.c | 2 -- lib/libc/softfloat/eqtf2.c | 2 -- lib/libc/softfloat/fpgetmask.c | 2 -- lib/libc/softfloat/fpgetround.c | 2 -- lib/libc/softfloat/fpgetsticky.c | 2 -- lib/libc/softfloat/fpsetmask.c | 2 -- lib/libc/softfloat/fpsetround.c | 2 -- lib/libc/softfloat/fpsetsticky.c | 2 -- lib/libc/softfloat/gedf2.c | 2 -- lib/libc/softfloat/gesf2.c | 2 -- lib/libc/softfloat/getf2.c | 2 -- lib/libc/softfloat/gexf2.c | 2 -- lib/libc/softfloat/gtdf2.c | 2 -- lib/libc/softfloat/gtsf2.c | 2 -- lib/libc/softfloat/gttf2.c | 2 -- lib/libc/softfloat/gtxf2.c | 2 -- lib/libc/softfloat/ledf2.c | 2 -- lib/libc/softfloat/lesf2.c | 2 -- lib/libc/softfloat/letf2.c | 2 -- lib/libc/softfloat/ltdf2.c | 2 -- lib/libc/softfloat/ltsf2.c | 2 -- lib/libc/softfloat/lttf2.c | 2 -- lib/libc/softfloat/nedf2.c | 2 -- lib/libc/softfloat/negdf2.c | 2 -- lib/libc/softfloat/negsf2.c | 2 -- lib/libc/softfloat/negtf2.c | 2 -- lib/libc/softfloat/negxf2.c | 2 -- lib/libc/softfloat/nesf2.c | 2 -- lib/libc/softfloat/netf2.c | 2 -- lib/libc/softfloat/nexf2.c | 2 -- lib/libc/softfloat/timesoftfloat.c | 2 -- lib/libc/softfloat/unorddf2.c | 2 -- lib/libc/softfloat/unordsf2.c | 2 -- lib/libc/stdio/_flock_stub.c | 2 -- lib/libc/stdio/asprintf.c | 2 -- lib/libc/stdio/clrerr.c | 2 -- lib/libc/stdio/dprintf.c | 2 -- lib/libc/stdio/fclose.c | 2 -- lib/libc/stdio/fcloseall.c | 2 -- lib/libc/stdio/fdopen.c | 2 -- lib/libc/stdio/feof.c | 2 -- lib/libc/stdio/ferror.c | 2 -- lib/libc/stdio/fflush.c | 2 -- lib/libc/stdio/fgetc.c | 2 -- lib/libc/stdio/fgetln.c | 2 -- lib/libc/stdio/fgetpos.c | 2 -- lib/libc/stdio/fgets.c | 2 -- lib/libc/stdio/fgetwc.c | 2 -- lib/libc/stdio/fgetwln.c | 2 -- lib/libc/stdio/fgetws.c | 2 -- lib/libc/stdio/fileno.c | 2 -- lib/libc/stdio/findfp.c | 2 -- lib/libc/stdio/flags.c | 2 -- lib/libc/stdio/fmemopen.c | 2 -- lib/libc/stdio/fopen.c | 2 -- lib/libc/stdio/fopencookie.c | 2 -- lib/libc/stdio/fprintf.c | 2 -- lib/libc/stdio/fpurge.c | 2 -- lib/libc/stdio/fputc.c | 2 -- lib/libc/stdio/fputs.c | 2 -- lib/libc/stdio/fputwc.c | 2 -- lib/libc/stdio/fputws.c | 2 -- lib/libc/stdio/fread.c | 2 -- lib/libc/stdio/freopen.c | 2 -- lib/libc/stdio/fscanf.c | 2 -- lib/libc/stdio/fseek.c | 2 -- lib/libc/stdio/fsetpos.c | 2 -- lib/libc/stdio/ftell.c | 2 -- lib/libc/stdio/funopen.c | 2 -- lib/libc/stdio/fvwrite.c | 2 -- lib/libc/stdio/fwalk.c | 2 -- lib/libc/stdio/fwide.c | 2 -- lib/libc/stdio/fwprintf.c | 2 -- lib/libc/stdio/fwrite.c | 2 -- *** 46148 LINES SKIPPED *** From nobody Wed Aug 23 17:49: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 4RWDHx1DdTz4r9Xl; Wed, 23 Aug 2023 17:49: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 4RWDHx0Rqdz4TfW; Wed, 23 Aug 2023 17:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NwbG08nODne/W4HuRgz6on6DX3zjAhesZID5fKn5yyw=; b=ukqVCnHC4N3G1JNenq6eXTu0VZYmFDO2SbvclLO55wBBSSSLbggzGybkMR6UfAMmb3HR3R M1RhDdO2GvwVH4huouXs3vCZa0+qQISZKaNkRV4VXmEenKMDpDpHIEe56yDHUWWBckNAtg Eq1yIYIpAwWRf6xdMzEXqvQvoBc7nK/NGtUBBVOU/dDEPgBXsRDmOLL8XZZmonlxgbfYRE Dsg49xw5ZX0AqPdLEyf4D+rWe1S2UliZvvfbOOkFhZwi/nHyvdAtu3QeDf1gNINnkA84iv Ja7mcfrTvyfpPl9c6itTkqO0y0b5MPTj/pZuTzQiFjqXE6L6HPTu+wIG04fYHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NwbG08nODne/W4HuRgz6on6DX3zjAhesZID5fKn5yyw=; b=duv443BF6Z9wce2GpQqw82V1/jLNVQgSLbGcDndEJsVPCbCh1SRo2Re1Y+r8HLxo2zXakp ROImmL/X2Lv6EkuJZWRxm2nmRhH3G0vUG68Bui1SGvE8NFQ9ZR+dtwXRyPyaN5D9fWij4t ZGFNY8m9Y29WpxmdZyY/Ub3EDZAbnGQSrbfrlDjD1ertkX2LAURpqfWAw/8G6xb8hMWYRY Avtl/bKMiGIas/CLwtORuGb7xptEY1+EdOV1j2cz/EQzUESbXyip18Mfl7Jhpu1Ilh29ob 1HgDaM80W06AS1H41o9x+gLLK8q1w6CqDp+/H+aK0OPBzCrn1WzvZouWRwxMCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812989; a=rsa-sha256; cv=none; b=lb2e2/AoBphjrDkJa4jO/MNa8Ejd30Alhhr2KnMasvJSKRpqr4ZtcwKosEFoBjtSgNS3Ei rpUVpUcXVNmUW5aDNiq35CKmhDY863Hp6/KaI7xvYCHVAEM9aY9tiKkR42hu8xvXTV8/hT K475EwFeCAOP22luZsf9baXxIJK8szoEIHAiuJLNHc/mcH1SHRxdyFTC5nySW6C1aUzXlo fXvvx91GcpvddcY6hXA/tv0tgbCIzEIDw92d2UPynGoytjW/65JmUcfL+kqfUH3olC81Yc 2woU11OdJf+TqGqfvGFVfoWeNiQCZiAR6Kc653fNlmYENxfcxanly1tHVIseNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHw6f2DzvL6; Wed, 23 Aug 2023 17:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnmD3040982; Wed, 23 Aug 2023 17:49:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnmFp040979; Wed, 23 Aug 2023 17:49:48 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:48 GMT Message-Id: <202308231749.37NHnmFp040979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9a298a124729 - stable/13 - Remove $FreeBSD$: alt two-line .c pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9a298a124729d1113219aacaf473594ef39927bd Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9a298a124729d1113219aacaf473594ef39927bd commit 9a298a124729d1113219aacaf473594ef39927bd Author: Warner Losh AuthorDate: 2023-08-22 01:31:46 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:26 +0000 Remove $FreeBSD$: alt two-line .c pattern Remove /^\s*__RCSID\("\$FreeBSD\$"\);\n\n/ Similar commit in main: (cherry picked from commit da5432eda807) --- sbin/routed/if.c | 3 --- sbin/routed/input.c | 3 --- sbin/routed/main.c | 2 -- sbin/routed/output.c | 3 --- sbin/routed/parms.c | 3 --- sbin/routed/radix.c | 3 --- sbin/routed/rdisc.c | 3 --- sbin/routed/table.c | 3 --- sbin/routed/trace.c | 3 --- usr.bin/getconf/tests/arch_type.c | 2 -- usr.bin/procstat/tests/while1.c | 2 -- usr.sbin/mpsutil/mps_cmd.c | 2 -- usr.sbin/mpsutil/mps_debug.c | 2 -- usr.sbin/mpsutil/mps_flash.c | 2 -- usr.sbin/mpsutil/mps_set.c | 2 -- usr.sbin/mpsutil/mps_show.c | 2 -- usr.sbin/mpsutil/mps_slot.c | 2 -- usr.sbin/mpsutil/mpsutil.c | 2 -- usr.sbin/mptutil/mpt_cam.c | 2 -- usr.sbin/mptutil/mpt_cmd.c | 2 -- usr.sbin/mptutil/mpt_config.c | 2 -- usr.sbin/mptutil/mpt_drive.c | 2 -- usr.sbin/mptutil/mpt_evt.c | 2 -- usr.sbin/mptutil/mpt_show.c | 2 -- usr.sbin/mptutil/mpt_volume.c | 2 -- usr.sbin/mptutil/mptutil.c | 2 -- 26 files changed, 60 deletions(-) diff --git a/sbin/routed/if.c b/sbin/routed/if.c index 83d8fe503893..72894942fe05 100644 --- a/sbin/routed/if.c +++ b/sbin/routed/if.c @@ -33,9 +33,6 @@ #include "defs.h" #include "pathnames.h" - -__RCSID("$FreeBSD$"); - struct ifhead ifnet = LIST_HEAD_INITIALIZER(ifnet); /* all interfaces */ struct ifhead remote_if = LIST_HEAD_INITIALIZER(remote_if); /* remote interfaces */ diff --git a/sbin/routed/input.c b/sbin/routed/input.c index 854bfd8d9e66..238933d29e6b 100644 --- a/sbin/routed/input.c +++ b/sbin/routed/input.c @@ -30,9 +30,6 @@ */ #include "defs.h" - -__RCSID("$FreeBSD$"); - static void input(struct sockaddr_in *, struct interface *, struct interface *, struct rip *, int); static void input_route(naddr, naddr, struct rt_spare *, struct netinfo *); diff --git a/sbin/routed/main.c b/sbin/routed/main.c index cfc0c148971c..491a40026345 100644 --- a/sbin/routed/main.c +++ b/sbin/routed/main.c @@ -38,8 +38,6 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993 " "The Regents of the University of California." " All rights reserved."); -__RCSID("$FreeBSD$"); - pid_t mypid; naddr myaddr; /* system address */ diff --git a/sbin/routed/output.c b/sbin/routed/output.c index 2974f2a6f19e..726fab2c11b5 100644 --- a/sbin/routed/output.c +++ b/sbin/routed/output.c @@ -31,9 +31,6 @@ #include "defs.h" -__RCSID("$FreeBSD$"); - - u_int update_seqno; diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c index bd4fab045f84..59f141c76c66 100644 --- a/sbin/routed/parms.c +++ b/sbin/routed/parms.c @@ -33,9 +33,6 @@ #include "pathnames.h" #include -__RCSID("$FreeBSD$"); - - static struct parm *parms; struct intnet *intnets; struct r1net *r1nets; diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c index 36a404f9d043..c4a0e5de2c2c 100644 --- a/sbin/routed/radix.c +++ b/sbin/routed/radix.c @@ -36,9 +36,6 @@ */ #include "defs.h" - -__RCSID("$FreeBSD$"); - #define log(x, msg) syslog(x, msg) #define panic(s) {log(LOG_ERR,s); exit(1);} #define min(a,b) (((a)<(b))?(a):(b)) diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c index f72b1dd7fda7..2dfcc15768d8 100644 --- a/sbin/routed/rdisc.c +++ b/sbin/routed/rdisc.c @@ -33,9 +33,6 @@ #include #include #include - -__RCSID("$FreeBSD$"); - /* router advertisement ICMP packet */ struct icmp_ad { u_int8_t icmp_type; /* type of message */ diff --git a/sbin/routed/table.c b/sbin/routed/table.c index 7db9d784278b..b43c8bb873a5 100644 --- a/sbin/routed/table.c +++ b/sbin/routed/table.c @@ -30,9 +30,6 @@ */ #include "defs.h" - -__RCSID("$FreeBSD$"); - static struct rt_spare *rts_better(struct rt_entry *); static struct rt_spare rts_empty = {0,0,0,HOPCNT_INFINITY,0,0,0}; static void set_need_flash(void); diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c index 1166039499bd..59929b130b1a 100644 --- a/sbin/routed/trace.c +++ b/sbin/routed/trace.c @@ -36,9 +36,6 @@ #include #include -__RCSID("$FreeBSD$"); - - int tracelevel, new_tracelevel; FILE *ftrace; /* output trace file */ diff --git a/usr.bin/getconf/tests/arch_type.c b/usr.bin/getconf/tests/arch_type.c index 6cf7a2fb7f79..731ddae656bb 100644 --- a/usr.bin/getconf/tests/arch_type.c +++ b/usr.bin/getconf/tests/arch_type.c @@ -24,8 +24,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.bin/procstat/tests/while1.c b/usr.bin/procstat/tests/while1.c index cc201b712745..c81e8193e072 100644 --- a/usr.bin/procstat/tests/while1.c +++ b/usr.bin/procstat/tests/while1.c @@ -24,8 +24,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include diff --git a/usr.sbin/mpsutil/mps_cmd.c b/usr.sbin/mpsutil/mps_cmd.c index a9cb269abc5f..448e4cea602f 100644 --- a/usr.sbin/mpsutil/mps_cmd.c +++ b/usr.sbin/mpsutil/mps_cmd.c @@ -34,8 +34,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_debug.c b/usr.sbin/mpsutil/mps_debug.c index 83315090d730..a3297b4176cd 100644 --- a/usr.sbin/mpsutil/mps_debug.c +++ b/usr.sbin/mpsutil/mps_debug.c @@ -28,8 +28,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_flash.c b/usr.sbin/mpsutil/mps_flash.c index a0cc4a877b7d..98f476e3e234 100644 --- a/usr.sbin/mpsutil/mps_flash.c +++ b/usr.sbin/mpsutil/mps_flash.c @@ -24,8 +24,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_set.c b/usr.sbin/mpsutil/mps_set.c index 91e4d23ab78d..b75f327cb993 100644 --- a/usr.sbin/mpsutil/mps_set.c +++ b/usr.sbin/mpsutil/mps_set.c @@ -26,8 +26,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c index ef20cd942d86..7454bf15e06c 100644 --- a/usr.sbin/mpsutil/mps_show.c +++ b/usr.sbin/mpsutil/mps_show.c @@ -32,8 +32,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_slot.c b/usr.sbin/mpsutil/mps_slot.c index 396d5706cd5f..2c90668ec808 100644 --- a/usr.sbin/mpsutil/mps_slot.c +++ b/usr.sbin/mpsutil/mps_slot.c @@ -26,8 +26,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mpsutil.c b/usr.sbin/mpsutil/mpsutil.c index cb9563cefa60..0b6baa3aab93 100644 --- a/usr.sbin/mpsutil/mpsutil.c +++ b/usr.sbin/mpsutil/mpsutil.c @@ -32,8 +32,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_cam.c b/usr.sbin/mptutil/mpt_cam.c index 04c13f0c25fe..2e636fb6ce25 100644 --- a/usr.sbin/mptutil/mpt_cam.c +++ b/usr.sbin/mptutil/mpt_cam.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_cmd.c b/usr.sbin/mptutil/mpt_cmd.c index 79422c12dd89..8bcec08cd232 100644 --- a/usr.sbin/mptutil/mpt_cmd.c +++ b/usr.sbin/mptutil/mpt_cmd.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_config.c b/usr.sbin/mptutil/mpt_config.c index 58894fb5ecc9..36c3881969c9 100644 --- a/usr.sbin/mptutil/mpt_config.c +++ b/usr.sbin/mptutil/mpt_config.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_drive.c b/usr.sbin/mptutil/mpt_drive.c index 96004c7a3e74..bf5a52b0bfd7 100644 --- a/usr.sbin/mptutil/mpt_drive.c +++ b/usr.sbin/mptutil/mpt_drive.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_evt.c b/usr.sbin/mptutil/mpt_evt.c index b1c423f71031..6a077d4a906e 100644 --- a/usr.sbin/mptutil/mpt_evt.c +++ b/usr.sbin/mptutil/mpt_evt.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_show.c b/usr.sbin/mptutil/mpt_show.c index 4bc2c7569f53..a70a4dd90bc8 100644 --- a/usr.sbin/mptutil/mpt_show.c +++ b/usr.sbin/mptutil/mpt_show.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_volume.c b/usr.sbin/mptutil/mpt_volume.c index 9c160542f51c..aa28262e3709 100644 --- a/usr.sbin/mptutil/mpt_volume.c +++ b/usr.sbin/mptutil/mpt_volume.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mptutil.c b/usr.sbin/mptutil/mptutil.c index 0ec6620c8688..5e8b2eb71291 100644 --- a/usr.sbin/mptutil/mptutil.c +++ b/usr.sbin/mptutil/mptutil.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include From nobody Wed Aug 23 17:49: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 4RWDHy2L9Bz4r9RT; Wed, 23 Aug 2023 17:49: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 4RWDHy1hypz4TjP; Wed, 23 Aug 2023 17:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RxlwTyG3UeSbkhg2nt3A/jLGCMNjv1D91r4l7uC2CxI=; b=pHtqNHB1j7se7oSud/B5FKgTjHCldRi0OdTR91wWDXUoPw3Qps4DJhKfuqLUU3pQH2t2Ol rWp1QZlry3d4d36pn/yv8phzHWYFqjFxyDd9A1I7PrCo+IaCKh6dzMjwUCIWHBaODTk5fU I/ui5nOBrDKIP21KJSW+338J3aspQSvZ76w8yYid7m3FmyCwPSv25xOkuJGcr7cxnwGloh 1PhIG8KL9rGl8PemEYcnFIf7FZgncZowiHZY9QmRAvX0Fkdzsy8lAGmqcXAvnRJFI5ykja 8cy+7wADoMSmL61C+b6mbyp1J3ePe0AYFTplV4yKHq58Xf5uvUM3JFm/MYMzMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RxlwTyG3UeSbkhg2nt3A/jLGCMNjv1D91r4l7uC2CxI=; b=s6Y/5dprMJZ9+jP26mokfeQ53vvr/Va75MCmZGTXkh2AkzToOdJD8m8ZjdnDXCzLe4Qik+ PQ5mkPb9bxvtBK6YYWuPfKpjUVJvdT1dedMk13OqwbsTo7BBuHFVeRDDUg8XbJcUk2352I Qk1Wzh1tT4makn0gbszKZVJSmKvdztfJ/m26JJU1LiqV+HRgbleVSeckXOnRp77nhGksYa Y3Vwho4rQbGF5ezS3aHx6/8Edt8251aWw82QeJDgmVVLxuL0oXpK2tjWIwfkU2C3NkHAdX eXaWPL/vXpl3UoqBtUyaAtdsdzleyXv05VUQdjFz34E04R+lC5XlXTnnuOZ8IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812990; a=rsa-sha256; cv=none; b=xPgxON+7++NzkMz0hGR1GqJpKjqqjcZJjvqLpJAvWXYFKlRxxHawoq7GOFuVwcrJywxzSW JoDH++WQSgZbCiJbbsJYkHlMGJQmXsZsLAqAJvmfEn7HOPLpPawCeLoenJBvNxt46mWhgx nnnSpfHF4RSbVopUV7nAYDtY5kox0yf8ow3is3nuORoW7PDI5jQepmMQ2K0JSikEi/12Dk sZDUpfqdskIwqcYEOfcQ5rbeP0oLbXwtWXPb25WMWzX8MR5cr6naZ8xG0uCDa7CUvgrpzt pHJBDOY7SRArZp7obPkfWOqYIiXJcM0FVUzSCy1L05EoJTkuP9auhKJV58rhSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHy0TgszvFZ; Wed, 23 Aug 2023 17:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnow4041031; Wed, 23 Aug 2023 17:49:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnobJ041028; Wed, 23 Aug 2023 17:49:50 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:50 GMT Message-Id: <202308231749.37NHnobJ041028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e63c5c73c17e - stable/13 - Remove $FreeBSD$: alt one-line .c pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e63c5c73c17e6cf867f210860e4e602d9d3a462c Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e63c5c73c17e6cf867f210860e4e602d9d3a462c commit e63c5c73c17e6cf867f210860e4e602d9d3a462c Author: Warner Losh AuthorDate: 2023-08-22 01:31:50 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:26 +0000 Remove $FreeBSD$: alt one-line .c pattern Remove /^\s*__RCSID\("\$FreeBSD\$"\);\n/ Similar commit in main: (cherry picked from commit c8573564095b) --- sbin/routed/rtquery/rtquery.c | 1 - usr.bin/nl/nl.c | 1 - usr.sbin/lastlogin/lastlogin.c | 1 - 3 files changed, 3 deletions(-) diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c index 490962dd5172..2bd1f0aceaf7 100644 --- a/sbin/routed/rtquery/rtquery.c +++ b/sbin/routed/rtquery/rtquery.c @@ -62,7 +62,6 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n" #ifdef __NetBSD__ __RCSID("$NetBSD$"); #elif defined(__FreeBSD__) -__RCSID("$FreeBSD$"); #else __RCSID("$Revision: 2.26 $"); #ident "$Revision: 2.26 $" diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c index f0743074f30d..de4314155ff1 100644 --- a/usr.bin/nl/nl.c +++ b/usr.bin/nl/nl.c @@ -34,7 +34,6 @@ __COPYRIGHT( "@(#) Copyright (c) 1999\ The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$FreeBSD$"); #endif #include diff --git a/usr.sbin/lastlogin/lastlogin.c b/usr.sbin/lastlogin/lastlogin.c index 35aee1dcb2c5..a1dcde3f60bf 100644 --- a/usr.sbin/lastlogin/lastlogin.c +++ b/usr.sbin/lastlogin/lastlogin.c @@ -35,7 +35,6 @@ #include #ifndef lint -__RCSID("$FreeBSD$"); __RCSID("$NetBSD: lastlogin.c,v 1.4 1998/02/03 04:45:35 perry Exp $"); #endif From nobody Wed Aug 23 17:49: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 4RWDHz5KFqz4r9fm; Wed, 23 Aug 2023 17:49: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 4RWDHz2brPz4TZW; Wed, 23 Aug 2023 17:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5zrz9kTlVArv9boah+S3pmqfioUcoibovhh8CIHCeY=; b=ROWCkfUQKOTm7iPEJ+PB5/GwBfL+cMSwym7hLZejit/PCXVOlVryaPxZc/j8jy4S6ocFeV AlHCRTf+XfjUxbKpDKBZn168yl+2H6YkzsusyzxFFtbipJ1Ue4OgKT5p+GTZYPVnU+GF/0 E8Kk1V5veaSfKm8z05rdxmPMGCQB2BN+be1UR90igadACVi0aEjik+OiFzxSEMZAJ+jEhL 4kmmRsfyOffj6UdP0l7X8wg9tpqb03RfV/BW8AmN+FYLDdQ+CYupT24rt77Z7O2J2CtrRW USKHuVJWbohzURCzePRpUdLKAQX2+vuA9Dn9DTCJRPJmSA04pDabxmxaQaG/UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5zrz9kTlVArv9boah+S3pmqfioUcoibovhh8CIHCeY=; b=cVw9+lCuywGm5kw11W/vDc6m5HaEHdbiGbY0NGMXY9VzTD0LYPuEQkzPOpzKwU3pl+BqqQ pgRgYqiK31zeAspmmFoHxEYWynaIE9mD4zsctOOEyTxiTLvlXByPkCpONdfePxNXivrSA1 ivywtGyQUfkP98OurvZ+hPDg4qZVcW5wOZTdwO55lbPFKe0abzygMUXWaH2q1XDEKfnB6j 265XD+pdy0Nvz5K1bwRcZzfVkoecPcBM5saOxgtMCYygw5L1sW9PshEsdit0s0nBvbYUSn q5sc2fPDoKFoAvH0hczJZ8VSF1lmPXpOcwJY619jqFIgQ4jmJCH3XJkUPdms+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812991; a=rsa-sha256; cv=none; b=sLTfM4EX5uVlUT6M5OtWJWkhwspgmDEKg8E+MyNlA0cukw2+ezTIJOhgx5Bd0hJ6u0Sr4f IFm5FkCCkbR1X6yMuYCaSqr5l6W1ueAPz9QeEn7aIEsMSGsjv825cnhpjhKnIT3fmsY8a3 2JpiBXAUsy0+A/gkde+OpQKg5e+WqFle0fPYf+wm5NNb6cRrdwoacfruYyzIwgCQKCOBCA gl79V95OGDS6Q/r12mgOUAmeil/OQzXJ0JQCa4LOYksM4Un4t0sTqKsLk/W9D3hRm2/qpp Za1A6iemm8SlM9PHvDGcqaykju3HgsvFQQ2Rj3qgf26Frs1FH9z+4lPpJKyF5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHz1j7KztsX; Wed, 23 Aug 2023 17:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnpld041081; Wed, 23 Aug 2023 17:49:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnpb6041078; Wed, 23 Aug 2023 17:49:51 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:51 GMT Message-Id: <202308231749.37NHnpb6041078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 739874129195 - stable/13 - sys: Remove $FreeBSD$: one-line .S pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 739874129195e92d71d1b91620a488971ffc8a7f Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=739874129195e92d71d1b91620a488971ffc8a7f commit 739874129195e92d71d1b91620a488971ffc8a7f Author: Warner Losh AuthorDate: 2023-08-22 01:31:51 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:27 +0000 sys: Remove $FreeBSD$: one-line .S pattern Remove /^\s\.(asciz|ident)\s+\"\$FreeBSD\$\".*\n/ Similar commit in current: (cherry picked from commit d4bf8003ee42) --- sys/crypto/aesni/aeskeys_amd64.S | 1 - sys/crypto/aesni/aeskeys_i386.S | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/crypto/aesni/aeskeys_amd64.S b/sys/crypto/aesni/aeskeys_amd64.S index 9b3e98c8437e..83f704c9ae53 100644 --- a/sys/crypto/aesni/aeskeys_amd64.S +++ b/sys/crypto/aesni/aeskeys_amd64.S @@ -220,4 +220,3 @@ ENTRY(aesni_set_deckey) .cfi_endproc END(aesni_set_deckey) - .ident "$FreeBSD$" diff --git a/sys/crypto/aesni/aeskeys_i386.S b/sys/crypto/aesni/aeskeys_i386.S index f9be26d2197c..346014412640 100644 --- a/sys/crypto/aesni/aeskeys_i386.S +++ b/sys/crypto/aesni/aeskeys_i386.S @@ -270,4 +270,3 @@ ENTRY(aesni_set_deckey) .cfi_endproc END(aesni_set_deckey) - .ident "$FreeBSD$" From nobody Wed Aug 23 17:49: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 4RWDJ03yLsz4r9Xq; Wed, 23 Aug 2023 17:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWDJ03Skwz4Trl; Wed, 23 Aug 2023 17:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ExVl4uG6XGgAXCNLPBF+MQm4JDJk/Jro3SC0W7qLDjE=; b=KPA0YNCqwaQXxfR6QOscNzp1t0LaTjAkBhg9LwWM7PyYHecLXcHTkxdoPKoxRaJT3xLf1U 2oY8IVg2EVumGnr150R4xS1FYDah1mNy1W8T9VM6SXLSaaC+XOor+AlKPuQr8m5l0SxSmB euPs1yEG5+cCdXJSBchncvvK/0dmsjnIeEocIiVXNjHmuFnIYLULKi0f5YGZOc8jNLntYn kgBFxL1M+5sML22EcfjYdmbqSV5NIvrUA4OhVs/pEigiNsWv5qIRFPhvmoIThnT5f4XUqN 54jlxvyexrQVg6T2T/JSRFu+jesPC98q9TE/tpYhl7csRxLsWOGxdFdQIJcIdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ExVl4uG6XGgAXCNLPBF+MQm4JDJk/Jro3SC0W7qLDjE=; b=wPiXlpUxkpEZUHY8DD00lWEIpcumybESkvqGVLkSjmc/s3POYrirEPUxioW/jPWNogZuRD gthKdHz56vPeOQaR285WbyBDkY1rsCfQ+BXpAVrGff8G8HJhsaJSiMSkPLVu+HWJ8bQkFl iR6PTGL33ShSSUlBWeT34IKjEuWp9fJn3vJCqi5yYh7+kp72I0mMPa71ZXpUBY6+5nA66S t4cCIuNXF0chki2uSZHHUBXZyk8DNgD/JXL/3OS9CkKtH3LsuT6rPPWWieRNPpfZgE3+2c Ilf1hWCIirMfAeiCdYc/IxMgdxDNJASK5joNJ8DGdOEJByNlv3JaQGLQJEUp8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812992; a=rsa-sha256; cv=none; b=DUBfetTZIfKGNAgEEKgpXs/VbkKJ/y9Lq3+FIwL2rEcefoqUErSE+4DtarpeVE8YJ/DiHP 4GXm6TcKqW9oSIJMQLnRqyQnbLP9owzspkFxPJk+Mzc2Dq9q1KfQbwgC6NTw7BaqfCSUM0 yGHrWMBFN6LRGuPeV2H9SAKfHJ84I20yydSmV30xfOEoPaT8GS+9oUWpAI4P/LfK35KcY9 XLP/xFGyx/o+HRyHXsqzp8SefEvXNZTTH+DoeU2XWkqIc6DNLFxafyHE7zc/dbtLmRdOuR ZZ92h9EubDdt+gMmlWmPsoViERLuRE0TqbEZEPE/YXlwL/8XrMkNXIdux+P4BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJ02W7TztsY; Wed, 23 Aug 2023 17:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnq1B041123; Wed, 23 Aug 2023 17:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnqw6041120; Wed, 23 Aug 2023 17:49:52 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:52 GMT Message-Id: <202308231749.37NHnqw6041120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: d10370254169 - stable/13 - Remove $FreeBSD$: one-line .S pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d10370254169a65d32acd43557214015acbec0d4 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d10370254169a65d32acd43557214015acbec0d4 commit d10370254169a65d32acd43557214015acbec0d4 Author: Warner Losh AuthorDate: 2023-08-22 01:31:54 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:27 +0000 Remove $FreeBSD$: one-line .S pattern Remove /^\s\.(asciz|ident)\s+\"\$FreeBSD\$\".*\n/ Similar commit in main: (cherry picked from commit b1cfcffa89e6) --- lib/libc/arm/gen/_ctx_start.S | 2 -- stand/libsa/i386/_setjmp.S | 1 - 2 files changed, 3 deletions(-) diff --git a/lib/libc/arm/gen/_ctx_start.S b/lib/libc/arm/gen/_ctx_start.S index faedfb5c6443..39c282bf30c7 100644 --- a/lib/libc/arm/gen/_ctx_start.S +++ b/lib/libc/arm/gen/_ctx_start.S @@ -1,6 +1,4 @@ #include - -.ident "$FreeBSD$" ENTRY(_ctx_start) mov lr, pc mov pc, r4 diff --git a/stand/libsa/i386/_setjmp.S b/stand/libsa/i386/_setjmp.S index 5766b25816ae..a1bd8d55834b 100644 --- a/stand/libsa/i386/_setjmp.S +++ b/stand/libsa/i386/_setjmp.S @@ -32,7 +32,6 @@ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ /* From nobody Wed Aug 23 17:49: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 4RWDJ16lQBz4r9fq; Wed, 23 Aug 2023 17:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWDJ15g5Fz4Tpn; Wed, 23 Aug 2023 17:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gHmyYVJIC2HGUV6LJ31v9cE1mtpVB/y1COoVsiIjer4=; b=azUR50qOEPbQVdf1K0gEYJesk2neM6hhgrfvHMOZyalbDPJd3uYrPsWj0D3YdyXEhXDfgh Z/d+r/P9gZ+JKwXMYh3XbORkClwYZtLczVzq8uSAnK0IyppYX1VtixPUy4po5QAvnRv14v JCMNBGMOCE3gkSz1hmWg/C/JMZve6bi/bAE9t+TNC9Ks84tOL/C8koZl7ypBkJLXtiz6Ty TmGbKWAnGznoIXVajk+9wvFLx6s/D1YqFpTz+HdM8Mq2FXLLpgZ5Hrb1bPpBiPPR0QB9A6 AAXrvOqHl/9rAhVXKlVAVqCcCOmtT0WFISBvayGXxU+UR89eY7GQX5D64/pjhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gHmyYVJIC2HGUV6LJ31v9cE1mtpVB/y1COoVsiIjer4=; b=X02cYTm1RI3ADbN0jN4eSBgzt4lD8+99GGtbMc8tdH+tZEjSb+kIGMu/eSLKr5ui1/TQjV r8U0NrV8tyQfKLzrEq9Ta23XtpHJx53B6PXJlNz1VzRORNeb0yu7w0/qnJEYieFuOmvD1x LtPlvg+UyIloQT3JRiFAdq+N0u0/PmI4K0JJcKXvMscru16Kvq1HqpTeDaY0AKrEBbdEMi tlI9APhpKb2BEf/99e9uKOqANodwsotR+k7M9OcR0a9plsZix+5YAUQuTdWuOCOtpKd1RQ ABwyX+DEZSnGoDFE40YRaMQ3RzIUWAJ4+saXz0akCasT866S+Kw/81XgJ5rYtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812993; a=rsa-sha256; cv=none; b=xQJkUCRXH5Nv71POvbJwz7kkmsCsxsmgDsq6R9A4LM+SKH/UY5JcSvvBYKipdLUCoCgr7z qsA0STUlXgRDmbPL6ClrhfRIlGnHHGmRXrPnG+pKF9HaTiVEixd2vE2uKlM3W3zI+o2UwG OA8+uqn7qvcJiUvU2+5AfBKDeb86hI64hoa/ZfAWxVCIx9KAnPyZwUCILVh3kJtH1sR7eB wdc45ypEPNFs4hWcrKFAvs61IGUuApvYWpUgYxQse0k/ZTiI/jvMQBY+HS2F5USgutOOnQ FxpGCAlwcRUansbsoMvRz01+7UOlgDGYP84hyZD9gXflvTySG+iCijpp0fIuYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJ14m8HzvFb; Wed, 23 Aug 2023 17:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnrQD041168; Wed, 23 Aug 2023 17:49:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnr1c041165; Wed, 23 Aug 2023 17:49:53 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:53 GMT Message-Id: <202308231749.37NHnr1c041165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5510f79042fb - stable/13 - sys: Remove $FreeBSD$: one-line sh pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5510f79042fbd543de55807d0da7f8a2b8be2f89 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5510f79042fbd543de55807d0da7f8a2b8be2f89 commit 5510f79042fbd543de55807d0da7f8a2b8be2f89 Author: Warner Losh AuthorDate: 2023-08-22 01:31:56 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:27 +0000 sys: Remove $FreeBSD$: one-line sh pattern Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ Similar commit in current: (cherry picked from commit 031beb4e239b) --- sys/Makefile | 1 - sys/amd64/Makefile | 1 - sys/amd64/conf/DEFAULTS | 1 - sys/amd64/conf/GENERIC | 1 - sys/amd64/conf/GENERIC-KASAN | 1 - sys/amd64/conf/GENERIC-KCSAN | 1 - sys/amd64/conf/GENERIC-MMCCAM | 1 - sys/amd64/conf/GENERIC.hints | 1 - sys/amd64/conf/LINT | 1 - sys/amd64/conf/LINT-NOINET | 1 - sys/amd64/conf/LINT-NOINET6 | 1 - sys/amd64/conf/LINT-NOIP | 1 - sys/amd64/conf/MINIMAL | 1 - sys/amd64/conf/NOTES | 1 - sys/amd64/linux/Makefile | 1 - sys/amd64/linux/syscalls.conf | 1 - sys/amd64/linux32/Makefile | 1 - sys/amd64/linux32/syscalls.conf | 1 - sys/amd64/vmm/amd/ivhd_if.m | 1 - sys/arm/allwinner/a10/files.a10 | 1 - sys/arm/allwinner/a13/files.a13 | 1 - sys/arm/allwinner/a20/files.a20 | 1 - sys/arm/allwinner/a31/files.a31 | 1 - sys/arm/allwinner/a33/files.a33 | 1 - sys/arm/allwinner/a83t/files.a83t | 1 - sys/arm/allwinner/files.allwinner | 1 - sys/arm/allwinner/files.allwinner_up | 1 - sys/arm/allwinner/h3/files.h3 | 1 - sys/arm/allwinner/std.allwinner | 1 - sys/arm/allwinner/std.allwinner_up | 1 - sys/arm/allwinner/sunxi_dma_if.m | 1 - sys/arm/altera/socfpga/files.socfpga | 1 - sys/arm/altera/socfpga/std.socfpga | 1 - sys/arm/annapurna/alpine/files.alpine | 1 - sys/arm/annapurna/alpine/std.alpine | 1 - sys/arm/arm/platform_if.m | 1 - sys/arm/arm/platform_pl310_if.m | 1 - sys/arm/broadcom/bcm2835/files.bcm2835 | 1 - sys/arm/broadcom/bcm2835/files.bcm2836 | 1 - sys/arm/broadcom/bcm2835/files.bcm283x | 1 - sys/arm/broadcom/bcm2835/std.bcm2835 | 1 - sys/arm/broadcom/bcm2835/std.bcm2836 | 1 - sys/arm/broadcom/bcm2835/std.rpi | 1 - sys/arm/conf/ALPINE | 1 - sys/arm/conf/APALIS-IMX6 | 1 - sys/arm/conf/ARMADA38X | 1 - sys/arm/conf/ARMADAXP | 1 - sys/arm/conf/COLIBRI-VF50 | 1 - sys/arm/conf/COSMIC | 1 - sys/arm/conf/DEFAULTS | 1 - sys/arm/conf/EFIKA_MX | 1 - sys/arm/conf/GENERIC | 1 - sys/arm/conf/GENERIC-MMCCAM | 1 - sys/arm/conf/IMX53 | 1 - sys/arm/conf/IMX6 | 1 - sys/arm/conf/JETSON-TK1 | 1 - sys/arm/conf/LINT | 1 - sys/arm/conf/NOTES | 1 - sys/arm/conf/QUARTZ | 1 - sys/arm/conf/RPI-B | 1 - sys/arm/conf/SOCDK | 1 - sys/arm/conf/SOCFPGA | 1 - sys/arm/conf/SOCKIT | 1 - sys/arm/conf/SOCKIT-BERI | 1 - sys/arm/conf/TEGRA124 | 1 - sys/arm/conf/VERSATILEPB | 1 - sys/arm/conf/VYBRID | 1 - sys/arm/conf/ZEDBOARD | 1 - sys/arm/conf/std.armv6 | 1 - sys/arm/conf/std.armv7 | 1 - sys/arm/freescale/imx/files.imx5 | 1 - sys/arm/freescale/imx/files.imx6 | 1 - sys/arm/freescale/imx/std.imx51 | 1 - sys/arm/freescale/imx/std.imx53 | 1 - sys/arm/freescale/imx/std.imx6 | 1 - sys/arm/freescale/vybrid/files.vybrid | 1 - sys/arm/freescale/vybrid/std.vybrid | 1 - sys/arm/linux/Makefile | 1 - sys/arm/linux/syscalls.conf | 1 - sys/arm/mv/armada38x/files.armada38x | 1 - sys/arm/mv/armada38x/std.armada38x | 1 - sys/arm/mv/armadaxp/files.armadaxp | 1 - sys/arm/mv/armadaxp/std.armadaxp | 1 - sys/arm/mv/armadaxp/std.mv78x60 | 1 - sys/arm/mv/files.arm7 | 1 - sys/arm/mv/std-pj4b.mv | 1 - sys/arm/nvidia/drm2/tegra_dc_if.m | 1 - sys/arm/nvidia/drm2/tegra_drm_if.m | 1 - sys/arm/nvidia/tegra124/files.tegra124 | 1 - sys/arm/nvidia/tegra124/std.tegra124 | 1 - sys/arm/nvidia/tegra_soctherm_if.m | 1 - sys/arm/qemu/files.qemu | 1 - sys/arm/qemu/std.virt | 1 - sys/arm/rockchip/files.rk32xx | 1 - sys/arm/rockchip/std.rk32xx | 1 - sys/arm/ti/am335x/files.am335x | 1 - sys/arm/ti/am335x/std.am335x | 1 - sys/arm/ti/files.ti | 1 - sys/arm/ti/omap4/files.omap4 | 1 - sys/arm/ti/omap4/std.omap4 | 1 - sys/arm/ti/std.ti | 1 - sys/arm/ti/ti_gpio_if.m | 1 - sys/arm/versatile/files.versatile | 1 - sys/arm/xilinx/files.zynq7 | 1 - sys/arm/xilinx/std.zynq7 | 1 - sys/arm64/conf/DEFAULTS | 1 - sys/arm64/conf/GENERIC | 1 - sys/arm64/conf/GENERIC-MMCCAM | 1 - sys/arm64/conf/GENERIC-UP | 1 - sys/arm64/conf/LINT | 1 - sys/arm64/conf/NOTES | 1 - sys/arm64/coresight/coresight_if.m | 1 - sys/arm64/iommu/iommu_if.m | 1 - sys/arm64/linux/Makefile | 1 - sys/arm64/linux/syscalls.conf | 1 - sys/arm64/qoriq/qoriq_therm_if.m | 1 - sys/arm64/rockchip/rk_tsadc_if.m | 1 - sys/cam/mmc/mmc_sim_if.m | 1 - sys/compat/cloudabi32/Makefile | 1 - sys/compat/cloudabi32/syscalls.conf | 1 - sys/compat/cloudabi64/Makefile | 1 - sys/compat/cloudabi64/syscalls.conf | 1 - sys/compat/freebsd32/Makefile | 1 - sys/compat/freebsd32/syscalls.conf | 1 - sys/conf/Makefile.amd64 | 1 - sys/conf/Makefile.arm | 1 - sys/conf/Makefile.arm64 | 1 - sys/conf/Makefile.i386 | 1 - sys/conf/Makefile.mips | 1 - sys/conf/Makefile.powerpc | 1 - sys/conf/Makefile.riscv | 1 - sys/conf/NOTES | 1 - sys/conf/WITHOUT_SOURCELESS | 1 - sys/conf/WITHOUT_SOURCELESS_HOST | 1 - sys/conf/WITHOUT_SOURCELESS_UCODE | 1 - sys/conf/config.mk | 1 - sys/conf/dtb.build.mk | 1 - sys/conf/dtb.mk | 1 - sys/conf/files | 1 - sys/conf/files.amd64 | 1 - sys/conf/files.arm | 1 - sys/conf/files.arm64 | 1 - sys/conf/files.i386 | 1 - sys/conf/files.mips | 1 - sys/conf/files.powerpc | 1 - sys/conf/files.riscv | 1 - sys/conf/files.x86 | 1 - sys/conf/kern.mk | 1 - sys/conf/kern.opts.mk | 1 - sys/conf/kern.post.mk | 1 - sys/conf/kern.pre.mk | 1 - sys/conf/kmod.mk | 1 - sys/conf/kmod.opts.mk | 1 - sys/conf/kmod_syms.awk | 1 - sys/conf/kmod_syms_prefix.awk | 1 - sys/conf/newvers.sh | 1 - sys/conf/options | 1 - sys/conf/options.amd64 | 1 - sys/conf/options.arm | 1 - sys/conf/options.arm64 | 1 - sys/conf/options.i386 | 1 - sys/conf/options.mips | 1 - sys/conf/options.powerpc | 1 - sys/conf/options.riscv | 1 - sys/conf/sysent.mk | 1 - sys/conf/systags.sh | 1 - sys/crypto/rijndael/Makefile | 1 - sys/crypto/skein/amd64/skein_block_asm.S | 1 - sys/dev/acpi_support/acpi_wmi_if.m | 1 - sys/dev/acpica/acpi_bus_if.m | 1 - sys/dev/acpica/acpi_if.m | 1 - sys/dev/acpica/acpi_quirks | 1 - sys/dev/adb/adb_hb_if.m | 1 - sys/dev/adb/adb_if.m | 1 - sys/dev/agp/agp_if.m | 1 - sys/dev/aic7xxx/aicasm/Makefile | 1 - sys/dev/altera/pio/pio_if.m | 1 - sys/dev/ata/ata_if.m | 1 - sys/dev/backlight/backlight_if.m | 1 - sys/dev/bhnd/bhnd_bus_if.m | 1 - sys/dev/bhnd/bhnd_erom_if.m | 1 - sys/dev/bhnd/bhndb/bhndb_bus_if.m | 1 - sys/dev/bhnd/bhndb/bhndb_if.m | 1 - sys/dev/bhnd/cores/chipc/bhnd_chipc_if.m | 1 - sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_hostb_if.m | 1 - sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_if.m | 1 - sys/dev/bhnd/cores/pmu/bhnd_pmu_if.m | 1 - sys/dev/bhnd/nvram/bhnd_nvram_if.m | 1 - sys/dev/bhnd/nvram/nvram_map | 1 - sys/dev/bhnd/tools/bus_macro.sh | 1 - sys/dev/bhnd/tools/nvram_map_gen.awk | 1 - sys/dev/bhnd/tools/nvram_map_gen.sh | 2 -- sys/dev/bnxt/convert_hsi.pl | 1 - sys/dev/cardbus/power_if.m | 1 - sys/dev/cxgb/bin2h.pl | 2 -- sys/dev/cxgbe/firmware/t4fw_cfg.txt | 1 - sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt | 1 - sys/dev/cxgbe/firmware/t5fw_cfg.txt | 1 - sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt | 1 - sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt | 1 - sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt | 1 - sys/dev/cxgbe/firmware/t6fw_cfg.txt | 1 - sys/dev/cxgbe/firmware/t6fw_cfg_fpga.txt | 1 - sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt | 1 - sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt | 1 - sys/dev/cxgbe/t4_if.m | 1 - sys/dev/dpaa2/memac_mdio_if.m | 1 - sys/dev/dwc/if_dwc_if.m | 1 - sys/dev/etherswitch/etherswitch_if.m | 1 - sys/dev/extres/clk/clkdev_if.m | 1 - sys/dev/extres/clk/clknode_if.m | 1 - sys/dev/extres/hwreset/hwreset_if.m | 1 - sys/dev/extres/nvmem/nvmem_if.m | 1 - sys/dev/extres/phy/phydev_if.m | 1 - sys/dev/extres/phy/phynode_if.m | 1 - sys/dev/extres/phy/phynode_usb_if.m | 1 - sys/dev/extres/regulator/regdev_if.m | 1 - sys/dev/extres/regulator/regnode_if.m | 1 - sys/dev/extres/syscon/syscon_if.m | 1 - sys/dev/fdt/fdt_clock_if.m | 1 - sys/dev/fdt/fdt_pinctrl_if.m | 1 - sys/dev/flash/qspi_if.m | 1 - sys/dev/gpio/dwgpio/dwgpio_if.m | 1 - sys/dev/gpio/gpio_if.m | 1 - sys/dev/gpio/gpiobus_if.m | 1 - sys/dev/hdmi/hdmi_if.m | 1 - sys/dev/hid/hid_if.m | 1 - sys/dev/hyperv/vmbus/vmbus_if.m | 1 - sys/dev/ice/irdma_di_if.m | 1 - sys/dev/ice/irdma_if.m | 1 - sys/dev/iicbus/iicbb_if.m | 1 - sys/dev/iicbus/iicbus_if.m | 1 - sys/dev/iicbus/mux/iicmux_if.m | 1 - sys/dev/iscsi/icl_conn_if.m | 1 - sys/dev/mbox/mbox_if.m | 1 - sys/dev/mdio/mdio_if.m | 1 - sys/dev/mii/miibus_if.m | 1 - sys/dev/mmc/mmc_pwrseq_if.m | 1 - sys/dev/mmc/mmcbr_if.m | 1 - sys/dev/mmc/mmcbus_if.m | 1 - sys/dev/mvs/mvs_if.m | 1 - sys/dev/ntb/ntb_if.m | 1 - sys/dev/ofw/ofw_bus_if.m | 1 - sys/dev/ofw/ofw_if.m | 1 - sys/dev/ow/owll_if.m | 1 - sys/dev/ow/own_if.m | 1 - sys/dev/pccard/card_if.m | 1 - sys/dev/pci/pci_dw_if.m | 1 - sys/dev/pci/pci_if.m | 1 - sys/dev/pci/pci_iov_if.m | 1 - sys/dev/pci/pcib_if.m | 1 - sys/dev/ppbus/ppbus_if.m | 1 - sys/dev/pwm/pwmbus_if.m | 1 - sys/dev/qlxgb/README.txt | 1 - sys/dev/qlxgbe/README.txt | 1 - sys/dev/qlxge/README.txt | 1 - sys/dev/random/build.sh | 1 - sys/dev/scc/scc_if.m | 1 - sys/dev/sdhci/sdhci_if.m | 1 - sys/dev/sdio/sdio_if.m | 1 - sys/dev/smbus/smbus_if.m | 1 - sys/dev/sound/midi/mpu_if.m | 1 - sys/dev/sound/midi/mpufoi_if.m | 1 - sys/dev/sound/midi/synth_if.m | 1 - sys/dev/sound/pci/hda/hdac_if.m | 1 - sys/dev/sound/pcm/ac97_if.m | 1 - sys/dev/sound/pcm/channel_if.m | 1 - sys/dev/sound/pcm/feeder_if.m | 1 - sys/dev/sound/pcm/mixer_if.m | 1 - sys/dev/spibus/spibus_if.m | 1 - sys/dev/syscons/fonts/cursor.awk | 1 - sys/dev/uart/uart_if.m | 1 - sys/dev/usb/controller/generic_usb_if.m | 1 - sys/dev/usb/usb_if.m | 1 - sys/dev/videomode/Makefile.ediddevs | 1 - sys/dev/videomode/Makefile.videomode | 1 - sys/dev/videomode/devlist2h.awk | 1 - sys/dev/videomode/modelines2c.awk | 1 - sys/dev/virtio/mmio/virtio_mmio_if.m | 1 - sys/dev/virtio/pci/virtio_pci_if.m | 1 - sys/dev/virtio/virtio_bus_if.m | 1 - sys/dev/virtio/virtio_if.m | 1 - sys/dev/vnic/lmac_if.m | 1 - sys/dev/xdma/xdma_if.m | 1 - sys/dts/Makefile | 1 - sys/dts/Makefile.inc | 1 - sys/dts/arm/Makefile | 1 - sys/dts/arm/Makefile.inc | 1 - sys/dts/arm/overlays/Makefile | 1 - sys/dts/arm64/Makefile | 1 - sys/dts/arm64/Makefile.inc | 1 - sys/dts/arm64/overlays/Makefile | 1 - sys/dts/mips/Makefile | 1 - sys/dts/powerpc/Makefile | 1 - sys/fs/cd9660/TODO | 1 - sys/geom/part/g_part_if.m | 1 - sys/geom/raid/g_raid_md_if.m | 1 - sys/geom/raid/g_raid_tr_if.m | 1 - sys/i386/Makefile | 1 - sys/i386/conf/DEFAULTS | 1 - sys/i386/conf/GENERIC | 1 - sys/i386/conf/GENERIC.hints | 1 - sys/i386/conf/LINT | 1 - sys/i386/conf/LINT-NOINET | 1 - sys/i386/conf/LINT-NOINET6 | 1 - sys/i386/conf/LINT-NOIP | 1 - sys/i386/conf/MINIMAL | 1 - sys/i386/conf/NOTES | 1 - sys/i386/conf/PAE | 1 - sys/i386/linux/Makefile | 1 - sys/i386/linux/syscalls.conf | 1 - sys/isa/isa_if.m | 1 - sys/kern/Make.tags.inc | 1 - sys/kern/Makefile | 1 - sys/kern/bus_if.m | 1 - sys/kern/capabilities.conf | 1 - sys/kern/clock_if.m | 1 - sys/kern/cpufreq_if.m | 1 - sys/kern/device_if.m | 1 - sys/kern/genassym.sh | 1 - sys/kern/genoffset.sh | 1 - sys/kern/linker_if.m | 1 - sys/kern/msi_if.m | 1 - sys/kern/pic_if.m | 1 - sys/kern/serdev_if.m | 1 - sys/kern/vnode_if.src | 1 - sys/kgssapi/kgss_if.m | 1 - sys/libkern/iconv_converter_if.m | 1 - sys/mips/atheros/ar531x/files.ar5315 | 1 - sys/mips/atheros/files.ar71xx | 1 - sys/mips/atheros/std.ar71xx | 1 - sys/mips/beri/files.beri | 1 - sys/mips/beri/std.beri | 1 - sys/mips/broadcom/files.broadcom | 1 - sys/mips/broadcom/std.broadcom | 1 - sys/mips/cavium/files.octeon1 | 1 - sys/mips/cavium/std.octeon1 | 1 - sys/mips/conf/ALFA_HORNET_UB | 1 - sys/mips/conf/ALFA_HORNET_UB.hints | 1 - sys/mips/conf/AP121 | 1 - sys/mips/conf/AP121.hints | 1 - sys/mips/conf/AP135 | 1 - sys/mips/conf/AP135.hints | 2 -- sys/mips/conf/AP143 | 1 - sys/mips/conf/AP143.hints | 1 - sys/mips/conf/AP91 | 2 -- sys/mips/conf/AP91.hints | 1 - sys/mips/conf/AP93 | 2 -- sys/mips/conf/AP93.hints | 1 - sys/mips/conf/AP94 | 2 -- sys/mips/conf/AP94.hints | 1 - sys/mips/conf/AP96 | 2 -- sys/mips/conf/AP96.hints | 1 - sys/mips/conf/AR5312_BASE.hints | 1 - sys/mips/conf/AR5315_BASE.hints | 1 - sys/mips/conf/AR71XX_BASE | 1 - sys/mips/conf/AR71XX_BASE.hints | 1 - sys/mips/conf/AR724X_BASE.hints | 1 - sys/mips/conf/AR91XX_BASE.hints | 2 -- sys/mips/conf/AR933X_BASE.hints | 2 -- sys/mips/conf/AR934X_BASE.hints | 2 -- sys/mips/conf/BCM | 1 - sys/mips/conf/BCM.hints | 1 - sys/mips/conf/BERI_DE4.hints | 1 - sys/mips/conf/BERI_DE4_BASE | 1 - sys/mips/conf/BERI_DE4_MDROOT | 1 - sys/mips/conf/BERI_DE4_SDROOT | 1 - sys/mips/conf/BERI_NETFPGA_MDROOT | 1 - sys/mips/conf/BERI_SIM_BASE | 1 - sys/mips/conf/BERI_SIM_MDROOT | 1 - sys/mips/conf/BERI_SIM_SDROOT | 1 - sys/mips/conf/BERI_SIM_VIRTIO | 1 - sys/mips/conf/BERI_SOCKIT | 1 - sys/mips/conf/BERI_TPAD.hints | 1 - sys/mips/conf/CANNA | 1 - sys/mips/conf/CARAMBOLA2 | 1 - sys/mips/conf/CARAMBOLA2.hints | 1 - sys/mips/conf/CI20 | 1 - sys/mips/conf/DB120 | 1 - sys/mips/conf/DB120.hints | 1 - sys/mips/conf/DEFAULTS | 1 - sys/mips/conf/DIR-655A1 | 1 - sys/mips/conf/DIR-655A1.hints | 2 -- sys/mips/conf/DIR-825B1 | 2 -- sys/mips/conf/DIR-825B1.hints | 1 - sys/mips/conf/DIR-825C1 | 1 - sys/mips/conf/DIR-825C1.hints | 1 - sys/mips/conf/ENH200 | 2 -- sys/mips/conf/ENH200.hints | 1 - sys/mips/conf/ERL | 1 - sys/mips/conf/JZ4780 | 1 - sys/mips/conf/JZ4780.hints | 1 - sys/mips/conf/MALTA | 1 - sys/mips/conf/MALTA.hints | 1 - sys/mips/conf/MALTA64 | 1 - sys/mips/conf/MALTA64EL | 1 - sys/mips/conf/MALTAEL | 1 - sys/mips/conf/MT7620.hints | 1 - sys/mips/conf/MT7620A_FDT | 1 - sys/mips/conf/MT7620N_FDT | 1 - sys/mips/conf/MT7621_FDT | 1 - sys/mips/conf/MT7628_FDT | 1 - sys/mips/conf/OCTEON1 | 1 - sys/mips/conf/OCTEON1.hints | 1 - sys/mips/conf/ONIONOMEGA | 1 - sys/mips/conf/ONIONOMEGA.hints | 1 - sys/mips/conf/PB47 | 1 - sys/mips/conf/PB47.hints | 2 -- sys/mips/conf/PB92 | 1 - sys/mips/conf/PB92.hints | 1 - sys/mips/conf/PICOSTATION_M2HP | 2 -- sys/mips/conf/PICOSTATION_M2HP.hints | 1 - sys/mips/conf/QCA953X_BASE | 1 - sys/mips/conf/QCA953X_BASE.hints | 2 -- sys/mips/conf/QCA955X_BASE.hints | 2 -- sys/mips/conf/ROCKET_M2HP | 2 -- sys/mips/conf/ROCKET_M2HP.hints | 1 - sys/mips/conf/ROUTERSTATION | 1 - sys/mips/conf/ROUTERSTATION.hints | 1 - sys/mips/conf/ROUTERSTATION_MFS | 1 - sys/mips/conf/RSPRO | 1 - sys/mips/conf/RSPRO.hints | 1 - sys/mips/conf/RSPRO_MFS | 1 - sys/mips/conf/RSPRO_STANDALONE | 1 - sys/mips/conf/RT2880_FDT | 1 - sys/mips/conf/RT3050_FDT | 1 - sys/mips/conf/RT305X.hints | 1 - sys/mips/conf/RT3352_FDT | 1 - sys/mips/conf/RT3883_FDT | 1 - sys/mips/conf/RT5350.hints | 1 - sys/mips/conf/RT5350_FDT | 1 - sys/mips/conf/TL-ARCHERC7V2 | 1 - sys/mips/conf/TL-ARCHERC7V2.hints | 2 -- sys/mips/conf/TL-WDR4300 | 1 - sys/mips/conf/TL-WDR4300.hints | 1 - sys/mips/conf/TL-WR1043NDv2 | 1 - sys/mips/conf/TL-WR1043NDv2.hints | 2 -- sys/mips/conf/TL-WR740Nv4 | 1 - sys/mips/conf/TL-WR740Nv4.hints | 1 - sys/mips/conf/TP-MR3020 | 1 - sys/mips/conf/TP-MR3020.hints | 1 - sys/mips/conf/TP-MR3040 | 2 -- sys/mips/conf/TP-MR3040.hints | 1 - sys/mips/conf/TP-WN1043ND | 1 - sys/mips/conf/TP-WN1043ND.hints | 1 - sys/mips/conf/WZR-300HP | 2 -- sys/mips/conf/WZR-300HP.hints | 1 - sys/mips/conf/WZR-HPAG300H | 2 -- sys/mips/conf/WZR-HPAG300H.hints | 1 - sys/mips/conf/X1000 | 1 - sys/mips/conf/X1000.hints | 1 - sys/mips/conf/XLP.hints | 1 - sys/mips/conf/XLP64 | 1 - sys/mips/conf/XLPN32 | 1 - sys/mips/conf/std.AR5312 | 1 - sys/mips/conf/std.AR5315 | 1 - sys/mips/conf/std.AR724X | 1 - sys/mips/conf/std.AR91XX | 1 - sys/mips/conf/std.AR933X | 1 - sys/mips/conf/std.AR934X | 1 - sys/mips/conf/std.AR_MIPS_BASE | 1 - sys/mips/conf/std.BERI | 1 - sys/mips/conf/std.MALTA | 1 - sys/mips/conf/std.QCA955X | 1 - sys/mips/conf/std.XLP | 1 - sys/mips/ingenic/files.jz4780 | 1 - sys/mips/ingenic/files.x1000 | 1 - sys/mips/ingenic/jz4780_gpio_if.m | 1 - sys/mips/malta/files.malta | 1 - sys/mips/malta/std.malta | 1 - sys/mips/mediatek/fdt_reset_if.m | 1 - sys/mips/mediatek/files.mediatek | 1 - sys/mips/mediatek/std.mediatek | 1 - sys/mips/mediatek/std.rt2880 | 1 - sys/mips/nlm/files.xlp | 1 - sys/mips/nlm/std.xlp | 1 - sys/modules/3dfx/Makefile | 1 - sys/modules/3dfx_linux/Makefile | 1 - sys/modules/Makefile | 1 - sys/modules/Makefile.inc | 1 - sys/modules/aac/Makefile | 1 - sys/modules/aac/Makefile.inc | 1 - sys/modules/aac/aac_linux/Makefile | 1 - sys/modules/aacraid/Makefile | 1 - sys/modules/aacraid/Makefile.inc | 1 - sys/modules/aacraid/aacraid_linux/Makefile | 1 - sys/modules/accf_data/Makefile | 1 - sys/modules/accf_dns/Makefile | 1 - sys/modules/accf_http/Makefile | 1 - sys/modules/acl_nfs4/Makefile | 1 - sys/modules/acl_posix1e/Makefile | 1 - sys/modules/acpi/Makefile | 1 - sys/modules/acpi/Makefile.inc | 1 - sys/modules/acpi/acpi_asus/Makefile | 1 - sys/modules/acpi/acpi_asus_wmi/Makefile | 1 - sys/modules/acpi/acpi_dock/Makefile | 1 - sys/modules/acpi/acpi_fujitsu/Makefile | 1 - sys/modules/acpi/acpi_ged/Makefile | 1 - sys/modules/acpi/acpi_hp/Makefile | 1 - sys/modules/acpi/acpi_ibm/Makefile | 1 - sys/modules/acpi/acpi_panasonic/Makefile | 1 - sys/modules/acpi/acpi_rapidstart/Makefile | 1 - sys/modules/acpi/acpi_sony/Makefile | 1 - sys/modules/acpi/acpi_toshiba/Makefile | 1 - sys/modules/acpi/acpi_video/Makefile | 1 - sys/modules/acpi/acpi_wmi/Makefile | 1 - sys/modules/acpi/aibs/Makefile | 1 - sys/modules/adlink/Makefile | 1 - sys/modules/ae/Makefile | 1 - sys/modules/aesni/Makefile | 1 - sys/modules/age/Makefile | 1 - sys/modules/agp/Makefile | 1 - sys/modules/ahci/Makefile | 1 - sys/modules/aic7xxx/Makefile | 2 -- sys/modules/aic7xxx/Makefile.inc | 1 - sys/modules/aic7xxx/ahc/Makefile | 2 -- sys/modules/aic7xxx/ahc/Makefile.inc | 1 - sys/modules/aic7xxx/ahc/ahc_isa/Makefile | 2 -- sys/modules/aic7xxx/ahc/ahc_pci/Makefile | 2 -- sys/modules/aic7xxx/ahd/Makefile | 2 -- sys/modules/aic7xxx/aicasm/Makefile | 1 - sys/modules/alc/Makefile | 1 - sys/modules/ale/Makefile | 1 - sys/modules/allwinner/Makefile | 1 - sys/modules/allwinner/aw_mmc/Makefile | 1 - sys/modules/allwinner/aw_pwm/Makefile | 1 - sys/modules/allwinner/aw_rsb/Makefile | 1 - sys/modules/allwinner/aw_rtc/Makefile | 1 - sys/modules/allwinner/aw_sid/Makefile | 1 - sys/modules/allwinner/aw_spi/Makefile | 1 - sys/modules/allwinner/aw_thermal/Makefile | 1 - sys/modules/allwinner/axp81x/Makefile | 1 - sys/modules/allwinner/if_awg/Makefile | 1 - sys/modules/alq/Makefile | 1 - sys/modules/am335x_dmtpps/Makefile | 1 - sys/modules/amd_ecc_inject/Makefile | 1 - sys/modules/amdgpio/Makefile | 1 - sys/modules/amdsbwd/Makefile | 1 - sys/modules/amdsmb/Makefile | 1 - sys/modules/amdsmn/Makefile | 1 - sys/modules/amdtemp/Makefile | 1 - sys/modules/amr/Makefile | 1 - sys/modules/amr/amr_cam/Makefile | 1 - sys/modules/amr/amr_linux/Makefile | 1 - sys/modules/an/Makefile | 1 - sys/modules/aout/Makefile | 1 - sys/modules/ar71xx/Makefile | 1 - sys/modules/ar71xx/ar71xx_ehci/Makefile | 1 - sys/modules/ar71xx/ar71xx_ohci/Makefile | 1 - sys/modules/arcmsr/Makefile | 1 - sys/modules/arm_ti/Makefile | 1 - sys/modules/arm_ti/am335x_ehrpwm/Makefile | 1 - sys/modules/arm_ti/ti_i2c/Makefile | 1 - sys/modules/armv8crypto/Makefile | 1 - sys/modules/asmc/Makefile | 1 - sys/modules/ata/Makefile | 1 - sys/modules/ata/Makefile.inc | 1 - sys/modules/ata/atacore/Makefile | 1 - sys/modules/ata/ataisa/Makefile | 1 - sys/modules/ata/atapci/Makefile | 1 - sys/modules/ata/atapci/Makefile.inc | 1 - sys/modules/ata/atapci/chipsets/Makefile | 1 - sys/modules/ata/atapci/chipsets/Makefile.inc | 1 - sys/modules/ata/atapci/chipsets/ataacard/Makefile | 1 - sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile | 1 - sys/modules/ata/atapci/chipsets/ataamd/Makefile | 1 - sys/modules/ata/atapci/chipsets/ataati/Makefile | 1 - sys/modules/ata/atapci/chipsets/atacenatek/Makefile | 1 - sys/modules/ata/atapci/chipsets/atacypress/Makefile | 1 - sys/modules/ata/atapci/chipsets/atacyrix/Makefile | 1 - sys/modules/ata/atapci/chipsets/atahighpoint/Makefile | 1 - sys/modules/ata/atapci/chipsets/ataintel/Makefile | 1 - sys/modules/ata/atapci/chipsets/ataite/Makefile | 1 - sys/modules/ata/atapci/chipsets/atajmicron/Makefile | 1 - sys/modules/ata/atapci/chipsets/atamarvell/Makefile | 1 - sys/modules/ata/atapci/chipsets/atamicron/Makefile | 1 - sys/modules/ata/atapci/chipsets/atanational/Makefile | 1 - sys/modules/ata/atapci/chipsets/atanetcell/Makefile | 1 - sys/modules/ata/atapci/chipsets/atanvidia/Makefile | 1 - sys/modules/ata/atapci/chipsets/atapromise/Makefile | 1 - sys/modules/ata/atapci/chipsets/ataserverworks/Makefile | 1 - sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile | 1 - sys/modules/ata/atapci/chipsets/atasis/Makefile | 1 - sys/modules/ata/atapci/chipsets/atavia/Makefile | 1 - sys/modules/ath/Makefile | 1 - sys/modules/ath_ahb/Makefile | 1 - sys/modules/ath_dfs/Makefile | 1 - sys/modules/ath_hal/Makefile | 1 - sys/modules/ath_hal_ar5210/Makefile | 1 - sys/modules/ath_hal_ar5211/Makefile | 1 - sys/modules/ath_hal_ar5212/Makefile | 1 - sys/modules/ath_hal_ar5416/Makefile | 1 - sys/modules/ath_hal_ar9300/Makefile | 1 - sys/modules/ath_main/Makefile | 1 - sys/modules/ath_pci/Makefile | 1 - sys/modules/ath_rate/Makefile | 1 - sys/modules/autofs/Makefile | 1 - sys/modules/axgbe/Makefile | 1 - sys/modules/axgbe/if_axa/Makefile | 1 - sys/modules/axgbe/if_axp/Makefile | 1 - sys/modules/backlight/Makefile | 1 - sys/modules/bce/Makefile | 1 - sys/modules/bcm283x_clkman/Makefile | 1 - sys/modules/bcm283x_pwm/Makefile | 1 - sys/modules/bfe/Makefile | 1 - sys/modules/bge/Makefile | 1 - sys/modules/bhnd/Makefile | 1 - sys/modules/bhnd/bcma/Makefile | 1 - sys/modules/bhnd/bcma_bhndb/Makefile | 1 - sys/modules/bhnd/bhndb/Makefile | 1 - sys/modules/bhnd/bhndb_pci/Makefile | 1 - sys/modules/bhnd/cores/Makefile | 1 - sys/modules/bhnd/cores/bhnd_pci/Makefile | 1 - sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile | 1 - sys/modules/bhnd/cores/bhnd_pcib/Makefile | 1 - sys/modules/bhnd/siba/Makefile | 1 - sys/modules/bhnd/siba_bhndb/Makefile | 1 - sys/modules/bios/Makefile | 1 - sys/modules/bios/smapi/Makefile | 1 - sys/modules/bios/smbios/Makefile | 1 - sys/modules/bios/vpd/Makefile | 1 - sys/modules/blake2/Makefile | 1 - sys/modules/bnxt/Makefile | 1 - sys/modules/bridgestp/Makefile | 1 - sys/modules/bwi/Makefile | 1 - sys/modules/bwn/Makefile | 1 - sys/modules/bxe/Makefile | 1 - sys/modules/bytgpio/Makefile | 1 - sys/modules/cam/Makefile | 1 - sys/modules/cardbus/Makefile | 1 - sys/modules/carp/Makefile | 1 - sys/modules/cas/Makefile | 1 - sys/modules/cbb/Makefile | 1 - sys/modules/cc/Makefile | 1 - sys/modules/cc/cc_cdg/Makefile | 1 - sys/modules/cc/cc_chd/Makefile | 1 - sys/modules/cc/cc_cubic/Makefile | 1 - sys/modules/cc/cc_dctcp/Makefile | 1 - sys/modules/cc/cc_hd/Makefile | 1 - sys/modules/cc/cc_htcp/Makefile | 1 - sys/modules/cc/cc_vegas/Makefile | 1 - sys/modules/ccp/Makefile | 1 - sys/modules/cd9660/Makefile | 1 - sys/modules/cd9660_iconv/Makefile | 1 - sys/modules/ce/Makefile | 1 - sys/modules/cfi/Makefile | 1 - sys/modules/cfiscsi/Makefile | 1 - sys/modules/chromebook_platform/Makefile | 1 - sys/modules/chvgpio/Makefile | 1 - sys/modules/ciss/Makefile | 1 - sys/modules/cloudabi/Makefile | 1 - sys/modules/cloudabi32/Makefile | 1 - sys/modules/cloudabi64/Makefile | 1 - sys/modules/coretemp/Makefile | 1 - sys/modules/cp/Makefile | 1 - sys/modules/cpsw/Makefile | 1 - sys/modules/cpuctl/Makefile | 1 - sys/modules/cpufreq/Makefile | 1 - sys/modules/crypto/Makefile | 1 - sys/modules/cryptodev/Makefile | 1 - sys/modules/ctl/Makefile | 1 - sys/modules/cuse/Makefile | 1 - sys/modules/cxgb/Makefile | 1 - sys/modules/cxgb/cxgb/Makefile | 1 - sys/modules/cxgb/cxgb_t3fw/Makefile | 1 - sys/modules/cxgbe/Makefile | 1 - sys/modules/cxgbe/ccr/Makefile | 1 - sys/modules/cxgbe/cxgbei/Makefile | 1 - sys/modules/cxgbe/if_cc/Makefile | 1 - sys/modules/cxgbe/if_ccv/Makefile | 1 - sys/modules/cxgbe/if_cxgbe/Makefile | 1 - sys/modules/cxgbe/if_cxgbev/Makefile | 1 - sys/modules/cxgbe/if_cxl/Makefile | 1 - sys/modules/cxgbe/if_cxlv/Makefile | 1 - sys/modules/cxgbe/iw_cxgbe/Makefile | 1 - sys/modules/cxgbe/t4_firmware/Makefile | 1 - sys/modules/cxgbe/t5_firmware/Makefile | 1 - sys/modules/cxgbe/t6_firmware/Makefile | 1 - sys/modules/cxgbe/tom/Makefile | 1 - sys/modules/dc/Makefile | 1 - sys/modules/dcons/Makefile | 1 - sys/modules/dcons_crom/Makefile | 1 - sys/modules/dpdk_lpm4/Makefile | 1 - sys/modules/dpdk_lpm6/Makefile | 1 - sys/modules/dpms/Makefile | 1 - sys/modules/dtb/allwinner/Makefile | 1 - sys/modules/dtb/am335x/Makefile | 1 - sys/modules/dtb/freescale/Makefile | 1 - sys/modules/dtb/imx5/Makefile | 1 - sys/modules/dtb/imx6/Makefile | 1 - sys/modules/dtb/imx8/Makefile | 1 - sys/modules/dtb/mv/Makefile | 1 - sys/modules/dtb/nvidia/Makefile | 1 - sys/modules/dtb/omap4/Makefile | 1 - sys/modules/dtb/rockchip/Makefile | 1 - sys/modules/dtb/rpi/Makefile | 1 - sys/modules/dtb/sifive/Makefile | 1 - sys/modules/dtb/zynq/Makefile | 1 - sys/modules/dtrace/Makefile | 1 - sys/modules/dtrace/Makefile.inc | 1 - sys/modules/dtrace/dtaudit/Makefile | 1 - sys/modules/dtrace/dtmalloc/Makefile | 1 - sys/modules/dtrace/dtnfscl/Makefile | 1 - sys/modules/dtrace/dtrace/Makefile | 1 - sys/modules/dtrace/dtrace_test/Makefile | 1 - sys/modules/dtrace/dtraceall/Makefile | 1 - sys/modules/dtrace/fasttrap/Makefile | 1 - sys/modules/dtrace/fbt/Makefile | 1 - sys/modules/dtrace/profile/Makefile | 1 - sys/modules/dtrace/prototype/Makefile | 1 - sys/modules/dtrace/sdt/Makefile | 1 - sys/modules/dtrace/systrace/Makefile | 1 - sys/modules/dtrace/systrace_freebsd32/Makefile | 1 - sys/modules/dtrace/systrace_linux/Makefile | 1 - sys/modules/dtrace/systrace_linux32/Makefile | 1 - sys/modules/dummynet/Makefile | 1 - sys/modules/efirt/Makefile | 1 - sys/modules/em/Makefile | 2 -- sys/modules/ena/Makefile | 1 - sys/modules/epoch_test/Makefile | 1 - sys/modules/esp/Makefile | 1 - sys/modules/et/Makefile | 1 - sys/modules/evdev/Makefile | 1 - sys/modules/exca/Makefile | 1 - sys/modules/ext2fs/Makefile | 1 - sys/modules/fdc/Makefile | 1 - sys/modules/fdescfs/Makefile | 1 - sys/modules/fdt/Makefile | 1 - sys/modules/fdt/fdt_slicer/Makefile | 1 - sys/modules/ffec/Makefile | 1 - sys/modules/fib_dxr/Makefile | 1 - sys/modules/filemon/Makefile | 1 - sys/modules/filemon/Makefile.depend | 1 - sys/modules/firewire/Makefile | 1 - sys/modules/firewire/Makefile.inc | 1 - sys/modules/firewire/firewire/Makefile | 1 - sys/modules/firewire/fwe/Makefile | 1 - sys/modules/firewire/fwip/Makefile | 1 - sys/modules/firewire/sbp/Makefile | 1 - sys/modules/firewire/sbp_targ/Makefile | 1 - sys/modules/firmware/Makefile | 1 - sys/modules/ftwd/Makefile | 1 - sys/modules/fusefs/Makefile | 1 - sys/modules/fxp/Makefile | 1 - sys/modules/gem/Makefile | 1 - sys/modules/geom/Makefile | 1 - sys/modules/geom/Makefile.inc | 1 - sys/modules/geom/geom_bde/Makefile | 1 - sys/modules/geom/geom_cache/Makefile | 1 - sys/modules/geom/geom_ccd/Makefile | 1 - sys/modules/geom/geom_concat/Makefile | 1 - sys/modules/geom/geom_eli/Makefile | 1 - sys/modules/geom/geom_flashmap/Makefile | 1 - sys/modules/geom/geom_gate/Makefile | 1 - sys/modules/geom/geom_journal/Makefile | 1 - sys/modules/geom/geom_label/Makefile | 1 - sys/modules/geom/geom_linux_lvm/Makefile | 1 - sys/modules/geom/geom_map/Makefile | 1 - sys/modules/geom/geom_mirror/Makefile | 1 - sys/modules/geom/geom_mountver/Makefile | 1 - sys/modules/geom/geom_multipath/Makefile | 1 - sys/modules/geom/geom_nop/Makefile | 1 - sys/modules/geom/geom_part/Makefile | 1 - sys/modules/geom/geom_part/geom_part_apm/Makefile | 1 - sys/modules/geom/geom_part/geom_part_bsd/Makefile | 1 - sys/modules/geom/geom_part/geom_part_bsd64/Makefile | 1 - sys/modules/geom/geom_part/geom_part_ebr/Makefile | 1 - sys/modules/geom/geom_part/geom_part_gpt/Makefile | 1 - sys/modules/geom/geom_part/geom_part_ldm/Makefile | 1 - sys/modules/geom/geom_part/geom_part_mbr/Makefile | 1 - sys/modules/geom/geom_raid/Makefile | 1 - sys/modules/geom/geom_raid3/Makefile | 1 - sys/modules/geom/geom_shsec/Makefile | 1 - sys/modules/geom/geom_stripe/Makefile | 1 - sys/modules/geom/geom_uzip/Makefile | 1 - sys/modules/geom/geom_vinum/Makefile | 1 - sys/modules/geom/geom_virstor/Makefile | 1 - sys/modules/geom/geom_zero/Makefile | 1 - sys/modules/glxiic/Makefile | 1 - sys/modules/glxsb/Makefile | 1 - sys/modules/gpio/Makefile | 1 - sys/modules/gpio/gpiobus/Makefile | 1 - sys/modules/gpio/gpioiic/Makefile | 1 - sys/modules/gpio/gpiokeys/Makefile | 1 - sys/modules/gpio/gpioled/Makefile | 1 - sys/modules/gpio/gpiopps/Makefile | 1 - sys/modules/gpio/gpiospi/Makefile | 1 - sys/modules/gpio/gpioths/Makefile | 1 - sys/modules/hid/Makefile | 1 - sys/modules/hid/bcm5974/Makefile | 1 - sys/modules/hid/hconf/Makefile | 1 - sys/modules/hid/hcons/Makefile | 1 - sys/modules/hid/hgame/Makefile | 1 - sys/modules/hid/hid/Makefile | 1 - sys/modules/hid/hidbus/Makefile | 1 - sys/modules/hid/hidmap/Makefile | 1 - sys/modules/hid/hidquirk/Makefile | 1 - sys/modules/hid/hidraw/Makefile | 1 - sys/modules/hid/hkbd/Makefile | 1 - sys/modules/hid/hms/Makefile | 1 - sys/modules/hid/hmt/Makefile | 1 - sys/modules/hid/hpen/Makefile | 1 - sys/modules/hid/hsctrl/Makefile | 1 - sys/modules/hid/ietp/Makefile | 1 - sys/modules/hid/ps4dshock/Makefile | 1 - sys/modules/hid/xb360gp/Makefile | 1 - sys/modules/hifn/Makefile | 1 - sys/modules/hpt27xx/Makefile | 1 - sys/modules/hptiop/Makefile | 1 - sys/modules/hptmv/Makefile | 1 - sys/modules/hptnr/Makefile | 1 - sys/modules/hptrr/Makefile | 1 - sys/modules/hwpmc/Makefile | 1 - sys/modules/hwpmc_mips24k/Makefile | 1 - sys/modules/hwpmc_mips74k/Makefile | 1 - sys/modules/hyperv/Makefile | 1 - sys/modules/hyperv/hid/Makefile | 1 - sys/modules/hyperv/hvsock/Makefile | 1 - sys/modules/hyperv/netvsc/Makefile | 1 - sys/modules/hyperv/pcib/Makefile | 1 - sys/modules/hyperv/storvsc/Makefile | 1 - sys/modules/hyperv/utilities/Makefile | 1 - sys/modules/hyperv/vmbus/Makefile | 1 - sys/modules/i2c/Makefile | 1 - sys/modules/i2c/Makefile.inc | 1 - sys/modules/i2c/ads111x/Makefile | 1 - sys/modules/i2c/controllers/Makefile | 1 - sys/modules/i2c/controllers/Makefile.inc | 1 - sys/modules/i2c/controllers/alpm/Makefile | 1 - sys/modules/i2c/controllers/amdpm/Makefile | 1 - sys/modules/i2c/controllers/amdsmb/Makefile | 1 - sys/modules/i2c/controllers/ichiic/Makefile | 1 - sys/modules/i2c/controllers/ichsmb/Makefile | 1 - sys/modules/i2c/controllers/imcsmb/Makefile | 1 - sys/modules/i2c/controllers/intpm/Makefile | 1 - sys/modules/i2c/controllers/ismt/Makefile | 1 - sys/modules/i2c/controllers/lpbb/Makefile | 1 - sys/modules/i2c/controllers/nfsmb/Makefile | 1 - sys/modules/i2c/controllers/pcf/Makefile | 1 - sys/modules/i2c/controllers/viapm/Makefile | 1 - sys/modules/i2c/cyapa/Makefile | 1 - sys/modules/i2c/ds1307/Makefile | 1 - sys/modules/i2c/ds13rtc/Makefile | 1 - sys/modules/i2c/ds1672/Makefile | 1 - sys/modules/i2c/ds3231/Makefile | 1 - sys/modules/i2c/htu21/Makefile | 1 - sys/modules/i2c/icee/Makefile | 1 - sys/modules/i2c/if_ic/Makefile | 1 - sys/modules/i2c/iic/Makefile | 1 - sys/modules/i2c/iicbb/Makefile | 1 - sys/modules/i2c/iicbus/Makefile | 1 - sys/modules/i2c/iichid/Makefile | 1 - sys/modules/i2c/iicsmb/Makefile | 1 - sys/modules/i2c/isl/Makefile | 1 - sys/modules/i2c/isl12xx/Makefile | 1 - sys/modules/i2c/jedec_dimm/Makefile | 1 - sys/modules/i2c/max44009/Makefile | 1 - sys/modules/i2c/mux/Makefile | 1 - sys/modules/i2c/mux/iic_gpiomux/Makefile | 1 - sys/modules/i2c/mux/iicmux/Makefile | 1 - sys/modules/i2c/mux/ltc430x/Makefile | 1 - sys/modules/i2c/mux/pca954x/Makefile | 1 - sys/modules/i2c/nxprtc/Makefile | 1 - sys/modules/i2c/pcf8574/Makefile | 1 - sys/modules/i2c/pcf8591/Makefile | 1 - sys/modules/i2c/rtc8583/Makefile | 1 - sys/modules/i2c/rx8803/Makefile | 1 - sys/modules/i2c/s35390a/Makefile | 1 - sys/modules/i2c/smb/Makefile | 1 - sys/modules/i2c/smbus/Makefile | 1 - sys/modules/i2c/tca6416/Makefile | 1 - sys/modules/iavf/Makefile | 1 - sys/modules/ibcore/Makefile | 1 - sys/modules/ice/Makefile | 1 - sys/modules/ice_ddp/Makefile | 1 - sys/modules/ichwd/Makefile | 1 - sys/modules/ida/Makefile | 1 - sys/modules/if_bridge/Makefile | 1 - sys/modules/if_disc/Makefile | 1 - sys/modules/if_edsc/Makefile | 1 - sys/modules/if_enc/Makefile | 1 - sys/modules/if_epair/Makefile | 1 - sys/modules/if_gif/Makefile | 1 - sys/modules/if_gre/Makefile | 1 - sys/modules/if_infiniband/Makefile | 1 - sys/modules/if_lagg/Makefile | 1 - sys/modules/if_me/Makefile | 1 - sys/modules/if_ndis/Makefile | 1 - sys/modules/if_stf/Makefile | 1 - sys/modules/if_tuntap/Makefile | 1 - sys/modules/if_vlan/Makefile | 1 - sys/modules/if_vxlan/Makefile | 1 - sys/modules/iflib/Makefile | 1 - sys/modules/igc/Makefile | 1 - sys/modules/iir/Makefile | 1 - sys/modules/imgact_binmisc/Makefile | 1 - sys/modules/imx/Makefile | 1 - sys/modules/imx/imx6_ahci/Makefile | 1 - sys/modules/imx/imx6_snvs/Makefile | 1 - sys/modules/imx/imx_i2c/Makefile | 1 - sys/modules/imx/imx_spi/Makefile | 1 - sys/modules/imx/imx_wdog/Makefile | 1 - sys/modules/intelspi/Makefile | 1 - sys/modules/io/Makefile | 1 - sys/modules/ioat/Makefile | 1 - sys/modules/ip6_mroute_mod/Makefile | 1 - sys/modules/ip_mroute_mod/Makefile | 1 - sys/modules/ipdivert/Makefile | 1 - sys/modules/ipfilter/Makefile | 1 - sys/modules/ipfw/Makefile | 1 - sys/modules/ipfw_nat/Makefile | 1 - sys/modules/ipfw_nat64/Makefile | 1 - sys/modules/ipfw_nptv6/Makefile | 1 - sys/modules/ipfw_pmod/Makefile | 1 - sys/modules/ipmi/Makefile | 1 - sys/modules/ipmi/ipmi_linux/Makefile | 1 - sys/modules/ipoib/Makefile | 1 - sys/modules/ips/Makefile | 1 - sys/modules/ipsec/Makefile | 1 - sys/modules/ipw/Makefile | 1 - sys/modules/ipwfw/Makefile | 1 - sys/modules/ipwfw/ipw_bss/Makefile | 1 - sys/modules/ipwfw/ipw_ibss/Makefile | 1 - sys/modules/ipwfw/ipw_monitor/Makefile | 1 - sys/modules/isci/Makefile | 1 - sys/modules/iscsi/Makefile | 1 - sys/modules/iscsi_initiator/Makefile | 1 - sys/modules/iser/Makefile | 1 - sys/modules/isp/Makefile | 1 - sys/modules/ispfw/Makefile | 2 -- sys/modules/ispfw/isp_2400/Makefile | 2 -- sys/modules/ispfw/isp_2500/Makefile | 1 - sys/modules/ispfw/ispfw/Makefile | 2 -- sys/modules/itwd/Makefile | 1 - sys/modules/iwi/Makefile | 1 - sys/modules/iwifw/Makefile | 1 - sys/modules/iwifw/iwi_bss/Makefile | 1 - sys/modules/iwifw/iwi_ibss/Makefile | 1 - sys/modules/iwifw/iwi_monitor/Makefile | 1 - sys/modules/iwlwifi/Makefile | 1 - sys/modules/iwlwififw/Makefile | 1 - sys/modules/iwlwififw/Makefile.inc | 1 - sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile | 1 - sys/modules/iwm/Makefile | 1 - sys/modules/iwmfw/Makefile | 1 - sys/modules/iwmfw/Makefile.inc | 1 - *** 16391 LINES SKIPPED *** From nobody Wed Aug 23 17:49: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 4RWDJ51nNmz4r96y; Wed, 23 Aug 2023 17:49: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 4RWDJ44W2Sz4TwY; Wed, 23 Aug 2023 17:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7DoBvysVc83x7A48RIVpXalUZvvFCvWPDaoxBaB+Vo0=; b=NdIgOLerlrjfEd7ICjAKT/oF6w/yzbzUSZKTwJrf/5uIsKWTfq90+eZIU8WENvES7y41rX cqaTjq96MhomoqKqf4l94f4dUPSIpmNmOvuNdEXmYRgmj5CLP2W0dvNd/TiLLtuLoSifCQ S7+/lb363Bvq8uUbTnNxJTa0hgYb3LVZ7p1lqYmZqc9VqfExQTSqxpElyOVBi8YbeRSUJa ePTyyO8RLZ+cLmZMmZ1cLmLalDNkBKXhjNLNZh3Oto8buIK/o06w5t0PPkcHH9N+abrXTM XiAEmzoyj9pJeOehW0N6xXPz/OXJXkJ3riG/Qna4au/BX2V07SYCSrJE8IEW9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7DoBvysVc83x7A48RIVpXalUZvvFCvWPDaoxBaB+Vo0=; b=DD0R3azctp2Ld+LaVxw0AJys+KqzCAaC5x2fhQ2fkqqJjkptfoqv5Hedq3+Jdg4+q3tz3n UcG5wKhFhGTgViSK+r0Wj0sTCUiQSyXS85Q/QYCgUKVhZK9JupfTnf8uNGsFgbDvLNjOnx 44Ux90e3PT4pJS25BpszF73Aye9itPRdI4itRheNDNzZQMvqHI/9ErTcAillgxKFJIUsD+ tzcXshPtz6GAQNLpypmOtymI2DECnffQ/dA8j69av+ngSpysXc4ABRby4xEhXEtdCQqiXq ryV442o0pxH38VkuZrNs30/wmT6+aZxbCNFNwFiqe5bPU828WDaof0VFVhrVtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812996; a=rsa-sha256; cv=none; b=CyCUY3+zgScuDvQ7ZzCjYk9/atPxH6k4OwYHHXOxGnO9uvHh/ZQ8jTpw6b6/YbwrFX5hs/ bGhvfHTKCfCyvNCc20BU+0mFQsrTi7QNazWHPE6mjWs1bWS93uUU+PCxWzEPv/HAd/ELYd sRI0CGm8ZQj5LTNWcsBo1C7C5ovghPvBMuCd0tPtUu0Uq6Onw3x24w1WjJTb1maPVyikUP pOdLXlt4KqDLYv7cr2tshRht2VaZaxbx0I9pK5cJuUf6i+WZR+ZrXiUeJiej0g0exNjIyo V2TbiuGmqoAFqoGIPlGt/tC8kqwbT5wo1MhcTp0GxzTa4n5rD40hw+vGrCBDpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJ43ZbBzvN7; Wed, 23 Aug 2023 17:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnusx041225; Wed, 23 Aug 2023 17:49:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnsMo041216; Wed, 23 Aug 2023 17:49:54 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:54 GMT Message-Id: <202308231749.37NHnsMo041216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 023fc80ee38a - stable/13 - Remove $FreeBSD$: one-line sh pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 023fc80ee38a117fa65b2ccb2abf8bdc7dbd6fd9 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=023fc80ee38a117fa65b2ccb2abf8bdc7dbd6fd9 commit 023fc80ee38a117fa65b2ccb2abf8bdc7dbd6fd9 Author: Warner Losh AuthorDate: 2023-08-22 01:32:01 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:30 +0000 Remove $FreeBSD$: one-line sh pattern Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ Similar commit in main: (cherry picked from commit d0b2dbfa0ecf) --- .cirrus.yml | 1 - .clang-format | 1 - Makefile | 1 - Makefile.inc1 | 1 - Makefile.libcompat | 1 - Makefile.sys.inc | 1 - ObsoleteFiles.inc | 1 - bin/Makefile | 1 - bin/Makefile.inc | 1 - bin/cat/Makefile | 1 - bin/cat/Makefile.depend | 1 - bin/cat/tests/Makefile | 1 - bin/cat/tests/Makefile.depend | 1 - bin/chflags/Makefile | 1 - bin/chflags/Makefile.depend | 1 - bin/chflags/tests/Makefile | 1 - bin/chflags/tests/Makefile.depend | 1 - bin/chflags/tests/chflags_test.sh | 1 - bin/chio/Makefile | 1 - bin/chio/Makefile.depend | 1 - bin/chmod/Makefile | 1 - bin/chmod/Makefile.depend | 1 - bin/chmod/tests/Makefile | 1 - bin/chmod/tests/Makefile.depend | 1 - bin/chmod/tests/chmod_test.sh | 1 - bin/cp/Makefile | 1 - bin/cp/Makefile.depend | 1 - bin/cp/tests/Makefile | 1 - bin/cp/tests/cp_test.sh | 1 - bin/csh/Makefile | 1 - bin/csh/Makefile.depend | 1 - bin/csh/csh.cshrc | 1 - bin/csh/csh.login | 1 - bin/csh/csh.logout | 1 - bin/csh/dot.cshrc | 1 - bin/csh/dot.login | 1 - bin/date/Makefile | 1 - bin/date/Makefile.depend | 1 - bin/date/tests/Makefile | 1 - bin/date/tests/Makefile.depend | 1 - bin/date/tests/format_string_test.sh | 1 - bin/dd/Makefile | 1 - bin/dd/Makefile.depend | 1 - bin/dd/tests/Makefile | 1 - bin/dd/tests/Makefile.depend | 1 - bin/dd/tests/dd2_test.sh | 1 - bin/df/Makefile | 1 - bin/df/Makefile.depend | 1 - bin/domainname/Makefile | 1 - bin/domainname/Makefile.depend | 1 - bin/echo/Makefile | 1 - bin/echo/Makefile.depend | 1 - bin/echo/tests/Makefile | 1 - bin/echo/tests/Makefile.depend | 1 - bin/echo/tests/echo_test.sh | 1 - bin/ed/Makefile | 1 - bin/ed/Makefile.depend | 1 - bin/ed/test/Makefile | 1 - bin/ed/test/README | 1 - bin/ed/test/ckscripts.sh | 1 - bin/ed/test/mkscripts.sh | 1 - bin/expr/Makefile | 1 - bin/expr/Makefile.depend | 1 - bin/expr/tests/Makefile | 1 - bin/expr/tests/Makefile.depend | 1 - bin/freebsd-version/Makefile | 1 - bin/freebsd-version/Makefile.depend | 1 - bin/freebsd-version/freebsd-version.sh.in | 1 - bin/getfacl/Makefile | 1 - bin/getfacl/Makefile.depend | 1 - bin/hostname/Makefile | 1 - bin/hostname/Makefile.depend | 1 - bin/kenv/Makefile | 1 - bin/kenv/Makefile.depend | 1 - bin/kill/Makefile | 1 - bin/kill/Makefile.depend | 1 - bin/ln/Makefile | 1 - bin/ln/Makefile.depend | 1 - bin/ln/tests/Makefile | 1 - bin/ln/tests/Makefile.depend | 1 - bin/ln/tests/ln_test.sh | 1 - bin/ls/Makefile | 1 - bin/ls/Makefile.depend | 1 - bin/ls/Makefile.depend.options | 1 - bin/ls/tests/Makefile | 1 - bin/ls/tests/Makefile.depend | 1 - bin/ls/tests/ls_tests.sh | 1 - bin/mkdir/Makefile | 1 - bin/mkdir/Makefile.depend | 1 - bin/mkdir/tests/Makefile | 1 - bin/mkdir/tests/Makefile.depend | 1 - bin/mkdir/tests/mkdir_test.sh | 1 - bin/mv/Makefile | 1 - bin/mv/Makefile.depend | 1 - bin/mv/tests/Makefile | 1 - bin/mv/tests/Makefile.depend | 1 - bin/mv/tests/legacy_test.sh | 1 - bin/pax/Makefile | 1 - bin/pax/Makefile.depend | 1 - bin/pax/tests/Makefile | 1 - bin/pax/tests/Makefile.depend | 1 - bin/pax/tests/legacy_test.pl | 1 - bin/pkill/Makefile | 1 - bin/pkill/Makefile.depend | 1 - bin/pkill/tests/Makefile | 1 - bin/pkill/tests/Makefile.depend | 1 - bin/pkill/tests/pgrep-_f_test.sh | 1 - bin/pkill/tests/pgrep-_g_test.sh | 1 - bin/pkill/tests/pgrep-_lf_test.sh | 1 - bin/pkill/tests/pgrep-_p_test.sh | 1 - bin/pkill/tests/pgrep-_s_test.sh | 1 - bin/pkill/tests/pgrep-_u_test.sh | 1 - bin/pkill/tests/pgrep-f_test.sh | 1 - bin/pkill/tests/pgrep-g_test.sh | 1 - bin/pkill/tests/pgrep-i_test.sh | 1 - bin/pkill/tests/pgrep-j_test.sh | 1 - bin/pkill/tests/pgrep-l_test.sh | 1 - bin/pkill/tests/pgrep-n_test.sh | 1 - bin/pkill/tests/pgrep-o_test.sh | 1 - bin/pkill/tests/pgrep-q_test.sh | 1 - bin/pkill/tests/pgrep-s_test.sh | 1 - bin/pkill/tests/pgrep-t_test.sh | 1 - bin/pkill/tests/pgrep-v_test.sh | 1 - bin/pkill/tests/pgrep-x_test.sh | 1 - bin/pkill/tests/pkill-_f_test.sh | 1 - bin/pkill/tests/pkill-_g_test.sh | 1 - bin/pkill/tests/pkill-_lf_test.sh | 1 - bin/pkill/tests/pkill-_p_test.sh | 1 - bin/pkill/tests/pkill-_u_test.sh | 1 - bin/pkill/tests/pkill-g_test.sh | 1 - bin/pkill/tests/pkill-i_test.sh | 1 - bin/pkill/tests/pkill-j_test.sh | 1 - bin/pkill/tests/pkill-s_test.sh | 1 - bin/pkill/tests/pkill-t_test.sh | 1 - bin/pkill/tests/pkill-x_test.sh | 1 - bin/ps/Makefile | 1 - bin/ps/Makefile.depend | 1 - bin/pwait/Makefile | 1 - bin/pwait/Makefile.depend | 1 - bin/pwait/tests/Makefile | 1 - bin/pwait/tests/Makefile.depend | 1 - bin/pwait/tests/pwait_test.sh | 1 - bin/pwd/Makefile | 1 - bin/pwd/Makefile.depend | 1 - bin/realpath/Makefile | 1 - bin/realpath/Makefile.depend | 1 - bin/rm/Makefile | 1 - bin/rm/Makefile.depend | 1 - bin/rm/tests/Makefile | 1 - bin/rm/tests/Makefile.depend | 1 - bin/rm/tests/rm_test.sh | 1 - bin/rmail/Makefile | 1 - bin/rmail/Makefile.depend | 1 - bin/rmdir/Makefile | 1 - bin/rmdir/Makefile.depend | 1 - bin/rmdir/tests/Makefile | 1 - bin/rmdir/tests/Makefile.depend | 1 - bin/rmdir/tests/rmdir_test.sh | 1 - bin/setfacl/Makefile | 1 - bin/setfacl/Makefile.depend | 1 - bin/sh/Makefile | 1 - bin/sh/Makefile.depend | 1 - bin/sh/TOUR | 1 - bin/sh/builtins.def | 1 - bin/sh/dot.profile | 1 - bin/sh/dot.shrc | 1 - bin/sh/funcs/cmv | 1 - bin/sh/funcs/dirs | 1 - bin/sh/funcs/login | 1 - bin/sh/funcs/newgrp | 1 - bin/sh/funcs/popd | 1 - bin/sh/funcs/pushd | 1 - bin/sh/funcs/suspend | 1 - bin/sh/mkbuiltins | 1 - bin/sh/mktokens | 1 - bin/sh/nodetypes | 1 - bin/sh/profile | 1 - bin/sh/tests/Makefile | 1 - bin/sh/tests/Makefile.depend | 1 - bin/sh/tests/builtins/Makefile | 1 - bin/sh/tests/builtins/Makefile.depend | 1 - bin/sh/tests/builtins/alias.0 | 1 - bin/sh/tests/builtins/alias.1 | 1 - bin/sh/tests/builtins/alias3.0 | 1 - bin/sh/tests/builtins/alias4.0 | 1 - bin/sh/tests/builtins/break1.0 | 1 - bin/sh/tests/builtins/break2.0 | 1 - bin/sh/tests/builtins/break3.0 | 1 - bin/sh/tests/builtins/break4.4 | 1 - bin/sh/tests/builtins/break5.4 | 1 - bin/sh/tests/builtins/break6.0 | 1 - bin/sh/tests/builtins/builtin1.0 | 1 - bin/sh/tests/builtins/case1.0 | 1 - bin/sh/tests/builtins/case10.0 | 1 - bin/sh/tests/builtins/case11.0 | 1 - bin/sh/tests/builtins/case12.0 | 1 - bin/sh/tests/builtins/case13.0 | 1 - bin/sh/tests/builtins/case14.0 | 1 - bin/sh/tests/builtins/case15.0 | 1 - bin/sh/tests/builtins/case16.0 | 1 - bin/sh/tests/builtins/case17.0 | 1 - bin/sh/tests/builtins/case18.0 | 1 - bin/sh/tests/builtins/case19.0 | 1 - bin/sh/tests/builtins/case2.0 | 1 - bin/sh/tests/builtins/case20.0 | 1 - bin/sh/tests/builtins/case21.0 | 1 - bin/sh/tests/builtins/case22.0 | 1 - bin/sh/tests/builtins/case23.0 | 1 - bin/sh/tests/builtins/case3.0 | 1 - bin/sh/tests/builtins/case4.0 | 1 - bin/sh/tests/builtins/case5.0 | 1 - bin/sh/tests/builtins/case6.0 | 1 - bin/sh/tests/builtins/case7.0 | 1 - bin/sh/tests/builtins/case8.0 | 1 - bin/sh/tests/builtins/case9.0 | 1 - bin/sh/tests/builtins/cd1.0 | 1 - bin/sh/tests/builtins/cd10.0 | 1 - bin/sh/tests/builtins/cd11.0 | 1 - bin/sh/tests/builtins/cd2.0 | 1 - bin/sh/tests/builtins/cd3.0 | 1 - bin/sh/tests/builtins/cd4.0 | 1 - bin/sh/tests/builtins/cd5.0 | 1 - bin/sh/tests/builtins/cd6.0 | 1 - bin/sh/tests/builtins/cd7.0 | 1 - bin/sh/tests/builtins/cd8.0 | 1 - bin/sh/tests/builtins/cd9.0 | 1 - bin/sh/tests/builtins/command1.0 | 1 - bin/sh/tests/builtins/command10.0 | 1 - bin/sh/tests/builtins/command11.0 | 1 - bin/sh/tests/builtins/command12.0 | 1 - bin/sh/tests/builtins/command13.0 | 1 - bin/sh/tests/builtins/command14.0 | 1 - bin/sh/tests/builtins/command2.0 | 1 - bin/sh/tests/builtins/command3.0 | 1 - bin/sh/tests/builtins/command4.0 | 1 - bin/sh/tests/builtins/command5.0 | 1 - bin/sh/tests/builtins/command6.0 | 1 - bin/sh/tests/builtins/command7.0 | 1 - bin/sh/tests/builtins/command8.0 | 1 - bin/sh/tests/builtins/command9.0 | 1 - bin/sh/tests/builtins/dot1.0 | 1 - bin/sh/tests/builtins/dot2.0 | 1 - bin/sh/tests/builtins/dot3.0 | 1 - bin/sh/tests/builtins/dot4.0 | 1 - bin/sh/tests/builtins/echo1.0 | 1 - bin/sh/tests/builtins/echo2.0 | 1 - bin/sh/tests/builtins/echo3.0 | 1 - bin/sh/tests/builtins/eval1.0 | 1 - bin/sh/tests/builtins/eval2.0 | 1 - bin/sh/tests/builtins/eval3.0 | 1 - bin/sh/tests/builtins/eval4.0 | 1 - bin/sh/tests/builtins/eval5.0 | 1 - bin/sh/tests/builtins/eval6.0 | 1 - bin/sh/tests/builtins/eval7.0 | 1 - bin/sh/tests/builtins/eval8.7 | 1 - bin/sh/tests/builtins/exec1.0 | 1 - bin/sh/tests/builtins/exec2.0 | 1 - bin/sh/tests/builtins/exit1.0 | 1 - bin/sh/tests/builtins/exit2.8 | 1 - bin/sh/tests/builtins/exit3.0 | 1 - bin/sh/tests/builtins/export1.0 | 1 - bin/sh/tests/builtins/fc1.0 | 1 - bin/sh/tests/builtins/fc2.0 | 1 - bin/sh/tests/builtins/for1.0 | 1 - bin/sh/tests/builtins/for2.0 | 1 - bin/sh/tests/builtins/for3.0 | 1 - bin/sh/tests/builtins/getopts1.0 | 1 - bin/sh/tests/builtins/getopts10.0 | 1 - bin/sh/tests/builtins/getopts2.0 | 1 - bin/sh/tests/builtins/getopts3.0 | 1 - bin/sh/tests/builtins/getopts4.0 | 1 - bin/sh/tests/builtins/getopts5.0 | 1 - bin/sh/tests/builtins/getopts6.0 | 1 - bin/sh/tests/builtins/getopts7.0 | 1 - bin/sh/tests/builtins/getopts8.0 | 1 - bin/sh/tests/builtins/getopts9.0 | 1 - bin/sh/tests/builtins/hash1.0 | 1 - bin/sh/tests/builtins/hash2.0 | 1 - bin/sh/tests/builtins/hash3.0 | 1 - bin/sh/tests/builtins/hash4.0 | 1 - bin/sh/tests/builtins/jobid1.0 | 1 - bin/sh/tests/builtins/jobid2.0 | 1 - bin/sh/tests/builtins/kill1.0 | 1 - bin/sh/tests/builtins/kill2.0 | 1 - bin/sh/tests/builtins/lineno.0 | 1 - bin/sh/tests/builtins/lineno2.0 | 1 - bin/sh/tests/builtins/lineno3.0 | 1 - bin/sh/tests/builtins/local1.0 | 1 - bin/sh/tests/builtins/local2.0 | 1 - bin/sh/tests/builtins/local3.0 | 1 - bin/sh/tests/builtins/local4.0 | 1 - bin/sh/tests/builtins/local5.0 | 1 - bin/sh/tests/builtins/local6.0 | 1 - bin/sh/tests/builtins/local7.0 | 1 - bin/sh/tests/builtins/locale1.0 | 1 - bin/sh/tests/builtins/locale2.0 | 1 - bin/sh/tests/builtins/printf1.0 | 1 - bin/sh/tests/builtins/printf2.0 | 1 - bin/sh/tests/builtins/printf3.0 | 1 - bin/sh/tests/builtins/printf4.0 | 1 - bin/sh/tests/builtins/read1.0 | 1 - bin/sh/tests/builtins/read2.0 | 1 - bin/sh/tests/builtins/read3.0 | 1 - bin/sh/tests/builtins/read4.0 | 1 - bin/sh/tests/builtins/read5.0 | 1 - bin/sh/tests/builtins/read6.0 | 1 - bin/sh/tests/builtins/read7.0 | 1 - bin/sh/tests/builtins/read8.0 | 1 - bin/sh/tests/builtins/read9.0 | 1 - bin/sh/tests/builtins/return1.0 | 1 - bin/sh/tests/builtins/return2.1 | 1 - bin/sh/tests/builtins/return3.1 | 1 - bin/sh/tests/builtins/return4.0 | 1 - bin/sh/tests/builtins/return5.0 | 1 - bin/sh/tests/builtins/return6.4 | 1 - bin/sh/tests/builtins/return7.4 | 1 - bin/sh/tests/builtins/return8.0 | 1 - bin/sh/tests/builtins/set1.0 | 1 - bin/sh/tests/builtins/set2.0 | 1 - bin/sh/tests/builtins/set3.0 | 1 - bin/sh/tests/builtins/trap1.0 | 1 - bin/sh/tests/builtins/trap10.0 | 1 - bin/sh/tests/builtins/trap11.0 | 1 - bin/sh/tests/builtins/trap12.0 | 1 - bin/sh/tests/builtins/trap13.0 | 1 - bin/sh/tests/builtins/trap14.0 | 1 - bin/sh/tests/builtins/trap15.0 | 1 - bin/sh/tests/builtins/trap16.0 | 1 - bin/sh/tests/builtins/trap17.0 | 1 - bin/sh/tests/builtins/trap2.0 | 1 - bin/sh/tests/builtins/trap3.0 | 1 - bin/sh/tests/builtins/trap4.0 | 1 - bin/sh/tests/builtins/trap5.0 | 1 - bin/sh/tests/builtins/trap6.0 | 1 - bin/sh/tests/builtins/trap7.0 | 1 - bin/sh/tests/builtins/trap8.0 | 1 - bin/sh/tests/builtins/trap9.0 | 1 - bin/sh/tests/builtins/type1.0 | 1 - bin/sh/tests/builtins/type2.0 | 1 - bin/sh/tests/builtins/type3.0 | 1 - bin/sh/tests/builtins/type4.0 | 1 - bin/sh/tests/builtins/unalias.0 | 1 - bin/sh/tests/builtins/var-assign.0 | 1 - bin/sh/tests/builtins/var-assign2.0 | 1 - bin/sh/tests/builtins/wait1.0 | 1 - bin/sh/tests/builtins/wait10.0 | 1 - bin/sh/tests/builtins/wait2.0 | 1 - bin/sh/tests/builtins/wait3.0 | 1 - bin/sh/tests/builtins/wait4.0 | 1 - bin/sh/tests/builtins/wait5.0 | 1 - bin/sh/tests/builtins/wait6.0 | 1 - bin/sh/tests/builtins/wait7.0 | 1 - bin/sh/tests/builtins/wait8.0 | 1 - bin/sh/tests/builtins/wait9.127 | 1 - bin/sh/tests/errors/Makefile | 1 - bin/sh/tests/errors/Makefile.depend | 1 - bin/sh/tests/errors/assignment-error1.0 | 1 - bin/sh/tests/errors/assignment-error2.0 | 1 - bin/sh/tests/errors/backquote-error1.0 | 1 - bin/sh/tests/errors/backquote-error2.0 | 1 - bin/sh/tests/errors/bad-binary1.126 | 1 - bin/sh/tests/errors/bad-keyword1.0 | 1 - bin/sh/tests/errors/bad-parm-exp1.0 | 1 - bin/sh/tests/errors/bad-parm-exp2.2 | 1 - bin/sh/tests/errors/bad-parm-exp3.2 | 1 - bin/sh/tests/errors/bad-parm-exp4.2 | 1 - bin/sh/tests/errors/bad-parm-exp5.2 | 1 - bin/sh/tests/errors/bad-parm-exp6.2 | 1 - bin/sh/tests/errors/bad-parm-exp7.0 | 1 - bin/sh/tests/errors/bad-parm-exp8.0 | 1 - bin/sh/tests/errors/option-error.0 | 1 - bin/sh/tests/errors/redirection-error.0 | 1 - bin/sh/tests/errors/redirection-error2.2 | 1 - bin/sh/tests/errors/redirection-error3.0 | 1 - bin/sh/tests/errors/redirection-error4.0 | 1 - bin/sh/tests/errors/redirection-error5.0 | 1 - bin/sh/tests/errors/redirection-error6.0 | 1 - bin/sh/tests/errors/redirection-error7.0 | 1 - bin/sh/tests/errors/redirection-error8.0 | 1 - bin/sh/tests/errors/script-error1.0 | 1 - bin/sh/tests/errors/write-error1.0 | 1 - bin/sh/tests/execution/Makefile | 1 - bin/sh/tests/execution/Makefile.depend | 1 - bin/sh/tests/execution/bg1.0 | 1 - bin/sh/tests/execution/bg10.0 | 1 - bin/sh/tests/execution/bg11.0 | 1 - bin/sh/tests/execution/bg12.0 | 1 - bin/sh/tests/execution/bg13.0 | 1 - bin/sh/tests/execution/bg2.0 | 1 - bin/sh/tests/execution/bg3.0 | 1 - bin/sh/tests/execution/bg4.0 | 1 - bin/sh/tests/execution/bg5.0 | 1 - bin/sh/tests/execution/bg6.0 | 1 - bin/sh/tests/execution/bg7.0 | 1 - bin/sh/tests/execution/bg8.0 | 1 - bin/sh/tests/execution/bg9.0 | 1 - bin/sh/tests/execution/env1.0 | 1 - bin/sh/tests/execution/fork1.0 | 1 - bin/sh/tests/execution/fork2.0 | 1 - bin/sh/tests/execution/fork3.0 | 1 - bin/sh/tests/execution/func1.0 | 1 - bin/sh/tests/execution/func2.0 | 1 - bin/sh/tests/execution/func3.0 | 1 - bin/sh/tests/execution/hash1.0 | 1 - bin/sh/tests/execution/int-cmd1.0 | 1 - bin/sh/tests/execution/killed1.0 | 1 - bin/sh/tests/execution/killed2.0 | 1 - bin/sh/tests/execution/not1.0 | 1 - bin/sh/tests/execution/not2.0 | 1 - bin/sh/tests/execution/path1.0 | 1 - bin/sh/tests/execution/pipefail1.0 | 1 - bin/sh/tests/execution/pipefail2.42 | 1 - bin/sh/tests/execution/pipefail3.42 | 1 - bin/sh/tests/execution/pipefail4.42 | 1 - bin/sh/tests/execution/pipefail5.42 | 1 - bin/sh/tests/execution/pipefail6.42 | 1 - bin/sh/tests/execution/pipefail7.0 | 1 - bin/sh/tests/execution/redir1.0 | 1 - bin/sh/tests/execution/redir2.0 | 1 - bin/sh/tests/execution/redir3.0 | 1 - bin/sh/tests/execution/redir4.0 | 1 - bin/sh/tests/execution/redir5.0 | 1 - bin/sh/tests/execution/redir6.0 | 1 - bin/sh/tests/execution/redir7.0 | 1 - bin/sh/tests/execution/set-C1.0 | 1 - bin/sh/tests/execution/set-n1.0 | 1 - bin/sh/tests/execution/set-n2.0 | 1 - bin/sh/tests/execution/set-n3.0 | 1 - bin/sh/tests/execution/set-n4.0 | 1 - bin/sh/tests/execution/set-x1.0 | 1 - bin/sh/tests/execution/set-x2.0 | 1 - bin/sh/tests/execution/set-x3.0 | 1 - bin/sh/tests/execution/set-x4.0 | 1 - bin/sh/tests/execution/shellproc1.0 | 1 - bin/sh/tests/execution/shellproc2.0 | 1 - bin/sh/tests/execution/shellproc3.0 | 1 - bin/sh/tests/execution/shellproc4.0 | 1 - bin/sh/tests/execution/shellproc5.0 | 1 - bin/sh/tests/execution/shellproc6.0 | 1 - bin/sh/tests/execution/shellproc7.0 | 1 - bin/sh/tests/execution/subshell1.0 | 1 - bin/sh/tests/execution/subshell2.0 | 1 - bin/sh/tests/execution/subshell3.0 | 1 - bin/sh/tests/execution/subshell4.0 | 1 - bin/sh/tests/execution/unknown1.0 | 1 - bin/sh/tests/execution/unknown2.0 | 1 - bin/sh/tests/execution/var-assign1.0 | 1 - bin/sh/tests/expansion/Makefile | 1 - bin/sh/tests/expansion/Makefile.depend | 1 - bin/sh/tests/expansion/arith1.0 | 1 - bin/sh/tests/expansion/arith10.0 | 1 - bin/sh/tests/expansion/arith11.0 | 1 - bin/sh/tests/expansion/arith12.0 | 1 - bin/sh/tests/expansion/arith13.0 | 1 - bin/sh/tests/expansion/arith14.0 | 1 - bin/sh/tests/expansion/arith15.0 | 1 - bin/sh/tests/expansion/arith16.0 | 1 - bin/sh/tests/expansion/arith17.0 | 1 - bin/sh/tests/expansion/arith2.0 | 1 - bin/sh/tests/expansion/arith3.0 | 1 - bin/sh/tests/expansion/arith4.0 | 1 - bin/sh/tests/expansion/arith5.0 | 1 - bin/sh/tests/expansion/arith6.0 | 1 - bin/sh/tests/expansion/arith7.0 | 1 - bin/sh/tests/expansion/arith8.0 | 1 - bin/sh/tests/expansion/arith9.0 | 1 - bin/sh/tests/expansion/assign1.0 | 1 - bin/sh/tests/expansion/cmdsubst1.0 | 1 - bin/sh/tests/expansion/cmdsubst10.0 | 1 - bin/sh/tests/expansion/cmdsubst11.0 | 1 - bin/sh/tests/expansion/cmdsubst12.0 | 1 - bin/sh/tests/expansion/cmdsubst13.0 | 1 - bin/sh/tests/expansion/cmdsubst14.0 | 1 - bin/sh/tests/expansion/cmdsubst15.0 | 1 - bin/sh/tests/expansion/cmdsubst16.0 | 1 - bin/sh/tests/expansion/cmdsubst17.0 | 1 - bin/sh/tests/expansion/cmdsubst18.0 | 1 - bin/sh/tests/expansion/cmdsubst19.0 | 1 - bin/sh/tests/expansion/cmdsubst2.0 | 1 - bin/sh/tests/expansion/cmdsubst20.0 | 1 - bin/sh/tests/expansion/cmdsubst21.0 | 1 - bin/sh/tests/expansion/cmdsubst22.0 | 1 - bin/sh/tests/expansion/cmdsubst23.0 | 1 - bin/sh/tests/expansion/cmdsubst24.0 | 1 - bin/sh/tests/expansion/cmdsubst25.0 | 1 - bin/sh/tests/expansion/cmdsubst26.0 | 1 - bin/sh/tests/expansion/cmdsubst3.0 | 1 - bin/sh/tests/expansion/cmdsubst4.0 | 1 - bin/sh/tests/expansion/cmdsubst5.0 | 1 - bin/sh/tests/expansion/cmdsubst6.0 | 1 - bin/sh/tests/expansion/cmdsubst7.0 | 1 - bin/sh/tests/expansion/cmdsubst8.0 | 1 - bin/sh/tests/expansion/cmdsubst9.0 | 1 - bin/sh/tests/expansion/export1.0 | 1 - bin/sh/tests/expansion/export2.0 | 1 - bin/sh/tests/expansion/export3.0 | 1 - bin/sh/tests/expansion/heredoc1.0 | 1 - bin/sh/tests/expansion/heredoc2.0 | 1 - bin/sh/tests/expansion/ifs1.0 | 1 - bin/sh/tests/expansion/ifs2.0 | 1 - bin/sh/tests/expansion/ifs3.0 | 1 - bin/sh/tests/expansion/ifs4.0 | 1 - bin/sh/tests/expansion/ifs5.0 | 1 - bin/sh/tests/expansion/ifs6.0 | 1 - bin/sh/tests/expansion/ifs7.0 | 1 - bin/sh/tests/expansion/length1.0 | 1 - bin/sh/tests/expansion/length2.0 | 1 - bin/sh/tests/expansion/length3.0 | 1 - bin/sh/tests/expansion/length4.0 | 1 - bin/sh/tests/expansion/length5.0 | 1 - bin/sh/tests/expansion/length6.0 | 1 - bin/sh/tests/expansion/length7.0 | 1 - bin/sh/tests/expansion/length8.0 | 1 - bin/sh/tests/expansion/local1.0 | 1 - bin/sh/tests/expansion/local2.0 | 1 - bin/sh/tests/expansion/pathname1.0 | 1 - bin/sh/tests/expansion/pathname2.0 | 1 - bin/sh/tests/expansion/pathname3.0 | 1 - bin/sh/tests/expansion/pathname4.0 | 1 - bin/sh/tests/expansion/pathname5.0 | 1 - bin/sh/tests/expansion/pathname6.0 | 1 - bin/sh/tests/expansion/plus-minus1.0 | 1 - bin/sh/tests/expansion/plus-minus2.0 | 1 - bin/sh/tests/expansion/plus-minus3.0 | 1 - bin/sh/tests/expansion/plus-minus4.0 | 1 - bin/sh/tests/expansion/plus-minus5.0 | 1 - bin/sh/tests/expansion/plus-minus6.0 | 1 - bin/sh/tests/expansion/plus-minus7.0 | 1 - bin/sh/tests/expansion/plus-minus8.0 | 1 - bin/sh/tests/expansion/plus-minus9.0 | 1 - bin/sh/tests/expansion/question1.0 | 1 - bin/sh/tests/expansion/question2.0 | 1 - bin/sh/tests/expansion/readonly1.0 | 1 - bin/sh/tests/expansion/redir1.0 | 1 - bin/sh/tests/expansion/set-u1.0 | 1 - bin/sh/tests/expansion/set-u2.0 | 1 - bin/sh/tests/expansion/set-u3.0 | 1 - bin/sh/tests/expansion/tilde1.0 | 1 - bin/sh/tests/expansion/tilde2.0 | 1 - bin/sh/tests/expansion/trim1.0 | 1 - bin/sh/tests/expansion/trim10.0 | 1 - bin/sh/tests/expansion/trim11.0 | 1 - bin/sh/tests/expansion/trim2.0 | 1 - bin/sh/tests/expansion/trim3.0 | 1 - bin/sh/tests/expansion/trim4.0 | 1 - bin/sh/tests/expansion/trim5.0 | 1 - bin/sh/tests/expansion/trim6.0 | 1 - bin/sh/tests/expansion/trim7.0 | 1 - bin/sh/tests/expansion/trim8.0 | 1 - bin/sh/tests/expansion/trim9.0 | 1 - bin/sh/tests/functional_test.sh | 1 - bin/sh/tests/invocation/Makefile | 1 - bin/sh/tests/invocation/Makefile.depend | 1 - bin/sh/tests/invocation/sh-ac1.0 | 1 - bin/sh/tests/invocation/sh-c-missing1.0 | 1 - bin/sh/tests/invocation/sh-c1.0 | 1 - bin/sh/tests/invocation/sh-ca1.0 | 1 - bin/sh/tests/invocation/sh-fca1.0 | 1 - bin/sh/tests/parameters/Makefile | 1 - bin/sh/tests/parameters/Makefile.depend | 1 - bin/sh/tests/parameters/env1.0 | 1 - bin/sh/tests/parameters/exitstatus1.0 | 1 - bin/sh/tests/parameters/ifs1.0 | 1 - bin/sh/tests/parameters/mail1.0 | 1 - bin/sh/tests/parameters/mail2.0 | 1 - bin/sh/tests/parameters/optind1.0 | 1 - bin/sh/tests/parameters/optind2.0 | 1 - bin/sh/tests/parameters/positional1.0 | 1 - bin/sh/tests/parameters/positional2.0 | 1 - bin/sh/tests/parameters/positional3.0 | 1 - bin/sh/tests/parameters/positional4.0 | 1 - bin/sh/tests/parameters/positional5.0 | 1 - bin/sh/tests/parameters/positional6.0 | 1 - bin/sh/tests/parameters/positional7.0 | 1 - bin/sh/tests/parameters/positional8.0 | 1 - bin/sh/tests/parameters/positional9.0 | 1 - bin/sh/tests/parameters/pwd1.0 | 1 - bin/sh/tests/parameters/pwd2.0 | 1 - bin/sh/tests/parser/Makefile | 1 - bin/sh/tests/parser/Makefile.depend | 1 - bin/sh/tests/parser/alias1.0 | 1 - bin/sh/tests/parser/alias10.0 | 1 - bin/sh/tests/parser/alias11.0 | 1 - bin/sh/tests/parser/alias12.0 | 1 - bin/sh/tests/parser/alias13.0 | 1 - bin/sh/tests/parser/alias14.0 | 1 - bin/sh/tests/parser/alias15.0 | 1 - bin/sh/tests/parser/alias16.0 | 1 - bin/sh/tests/parser/alias17.0 | 1 - bin/sh/tests/parser/alias18.0 | 1 - bin/sh/tests/parser/alias19.0 | 1 - bin/sh/tests/parser/alias2.0 | 1 - bin/sh/tests/parser/alias20.0 | 1 - bin/sh/tests/parser/alias3.0 | 1 - bin/sh/tests/parser/alias4.0 | 1 - bin/sh/tests/parser/alias5.0 | 1 - bin/sh/tests/parser/alias6.0 | 1 - bin/sh/tests/parser/alias7.0 | 1 - bin/sh/tests/parser/alias8.0 | 1 - bin/sh/tests/parser/alias9.0 | 1 - bin/sh/tests/parser/and-pipe-not.0 | 1 - bin/sh/tests/parser/case1.0 | 1 - bin/sh/tests/parser/case2.0 | 1 - bin/sh/tests/parser/comment1.0 | 1 - bin/sh/tests/parser/comment2.42 | 1 - bin/sh/tests/parser/dollar-quote1.0 | 1 - bin/sh/tests/parser/dollar-quote10.0 | 1 - bin/sh/tests/parser/dollar-quote11.0 | 1 - bin/sh/tests/parser/dollar-quote12.0 | 1 - bin/sh/tests/parser/dollar-quote13.0 | 1 - bin/sh/tests/parser/dollar-quote2.0 | 1 - bin/sh/tests/parser/dollar-quote3.0 | 1 - bin/sh/tests/parser/dollar-quote4.0 | 1 - bin/sh/tests/parser/dollar-quote5.0 | 1 - bin/sh/tests/parser/dollar-quote6.0 | 1 - bin/sh/tests/parser/dollar-quote7.0 | 1 - bin/sh/tests/parser/dollar-quote8.0 | 1 - bin/sh/tests/parser/dollar-quote9.0 | 1 - bin/sh/tests/parser/empty-braces1.0 | 1 - bin/sh/tests/parser/empty-cmd1.0 | 1 - bin/sh/tests/parser/for1.0 | 1 - bin/sh/tests/parser/for2.0 | 1 - bin/sh/tests/parser/func1.0 | 1 - bin/sh/tests/parser/func2.0 | 1 - bin/sh/tests/parser/func3.0 | 1 - bin/sh/tests/parser/heredoc1.0 | 1 - bin/sh/tests/parser/heredoc10.0 | 1 - bin/sh/tests/parser/heredoc11.0 | 1 - bin/sh/tests/parser/heredoc12.0 | 1 - bin/sh/tests/parser/heredoc13.0 | 1 - bin/sh/tests/parser/heredoc2.0 | 1 - bin/sh/tests/parser/heredoc3.0 | 1 - bin/sh/tests/parser/heredoc4.0 | 1 - bin/sh/tests/parser/heredoc5.0 | 1 - bin/sh/tests/parser/heredoc6.0 | 1 - bin/sh/tests/parser/heredoc7.0 | 1 - bin/sh/tests/parser/heredoc8.0 | 1 - bin/sh/tests/parser/heredoc9.0 | 1 - bin/sh/tests/parser/line-cont1.0 | 1 - bin/sh/tests/parser/line-cont10.0 | 1 - bin/sh/tests/parser/line-cont11.0 | 1 - bin/sh/tests/parser/line-cont12.0 | 1 - bin/sh/tests/parser/line-cont2.0 | 1 - bin/sh/tests/parser/line-cont3.0 | 1 - bin/sh/tests/parser/line-cont4.0 | 1 - bin/sh/tests/parser/line-cont5.0 | 1 - bin/sh/tests/parser/line-cont6.0 | 1 - bin/sh/tests/parser/line-cont7.0 | 1 - bin/sh/tests/parser/line-cont8.0 | 1 - bin/sh/tests/parser/line-cont9.0 | 1 - bin/sh/tests/parser/no-space1.0 | 1 - bin/sh/tests/parser/no-space2.0 | 1 - bin/sh/tests/parser/nul1.0 | 1 - bin/sh/tests/parser/only-redir1.0 | 1 - bin/sh/tests/parser/only-redir2.0 | 1 - bin/sh/tests/parser/only-redir3.0 | 1 - bin/sh/tests/parser/only-redir4.0 | 1 - bin/sh/tests/parser/pipe-not1.0 | 1 - bin/sh/tests/parser/set-v1.0 | 1 - bin/sh/tests/parser/var-assign1.0 | 1 - bin/sh/tests/set-e/Makefile | 1 - bin/sh/tests/set-e/Makefile.depend | 1 - bin/sh/tests/set-e/and1.0 | 1 - bin/sh/tests/set-e/and2.1 | 1 - bin/sh/tests/set-e/and3.0 | 1 - bin/sh/tests/set-e/and4.0 | 1 - bin/sh/tests/set-e/background1.0 | 1 - bin/sh/tests/set-e/cmd1.0 | 1 - bin/sh/tests/set-e/cmd2.1 | 1 - bin/sh/tests/set-e/elif1.0 | 1 - bin/sh/tests/set-e/elif2.0 | 1 - bin/sh/tests/set-e/eval1.0 | 1 - bin/sh/tests/set-e/eval2.1 | 1 - bin/sh/tests/set-e/for1.0 | 1 - bin/sh/tests/set-e/func1.0 | 1 - bin/sh/tests/set-e/func2.1 | 1 - bin/sh/tests/set-e/if1.0 | 1 - bin/sh/tests/set-e/if2.0 | 1 - bin/sh/tests/set-e/if3.0 | 1 - bin/sh/tests/set-e/not1.0 | 1 - bin/sh/tests/set-e/not2.0 | 1 - bin/sh/tests/set-e/or1.0 | 1 - bin/sh/tests/set-e/or2.0 | 1 - bin/sh/tests/set-e/or3.1 | 1 - bin/sh/tests/set-e/pipe1.1 | 1 - bin/sh/tests/set-e/pipe2.0 | 1 - bin/sh/tests/set-e/return1.0 | 1 - bin/sh/tests/set-e/semi1.1 | 1 - bin/sh/tests/set-e/semi2.1 | 1 - bin/sh/tests/set-e/subshell1.0 | 1 - bin/sh/tests/set-e/subshell2.1 | 1 - bin/sh/tests/set-e/until1.0 | 1 - bin/sh/tests/set-e/until2.0 | 1 - bin/sh/tests/set-e/until3.0 | 1 - bin/sh/tests/set-e/while1.0 | 1 - bin/sh/tests/set-e/while2.0 | 1 - bin/sh/tests/set-e/while3.0 | 1 - bin/sleep/Makefile | 1 - bin/sleep/Makefile.depend | 1 - bin/sleep/tests/Makefile | 1 - bin/sleep/tests/Makefile.depend | 1 - bin/stty/Makefile | 1 - bin/stty/Makefile.depend | 1 - bin/sync/Makefile | 1 - bin/sync/Makefile.depend | 1 - bin/test/Makefile | 1 - bin/test/Makefile.depend | 1 - bin/test/tests/Makefile | 1 - bin/test/tests/Makefile.depend | 1 - bin/test/tests/legacy_test.sh | 1 - bin/tests/Makefile | 1 - bin/tests/Makefile.depend | 1 - bin/timeout/Makefile | 1 - bin/timeout/Makefile.depend | 1 - bin/timeout/tests/Makefile | 1 - bin/timeout/tests/Makefile.depend | 1 - bin/timeout/tests/timeout_test.sh | 1 - bin/uuidgen/Makefile | 1 - bin/uuidgen/Makefile.depend | 1 - cddl/Makefile | 1 - cddl/Makefile.inc | 1 - cddl/lib/Makefile | 1 - cddl/lib/Makefile.inc | 1 - cddl/lib/drti/Makefile | 1 - cddl/lib/drti/Makefile.depend | 1 - cddl/lib/libavl/Makefile | 1 - cddl/lib/libavl/Makefile.depend | 1 - cddl/lib/libctf/Makefile | 1 - cddl/lib/libctf/Makefile.depend | 1 - cddl/lib/libdtrace/Makefile | 1 - cddl/lib/libdtrace/Makefile.depend | 1 - cddl/lib/libicp/Makefile | 1 - cddl/lib/libicp_rescue/Makefile | 1 - cddl/lib/libnvpair/Makefile | 1 - cddl/lib/libnvpair/Makefile.depend | 1 - cddl/lib/libspl/Makefile | 1 - cddl/lib/libtpool/Makefile | 1 - cddl/lib/libumem/Makefile | 1 - cddl/lib/libumem/Makefile.depend | 1 - cddl/lib/libuutil/Makefile | 1 - cddl/lib/libuutil/Makefile.depend | 1 - cddl/lib/libzfs/Makefile | 1 - cddl/lib/libzfs/Makefile.depend | 1 - cddl/lib/libzfs_core/Makefile | 1 - cddl/lib/libzfs_core/Makefile.depend | 1 - cddl/lib/libzfsbootenv/Makefile | 1 - cddl/lib/libzpool/Makefile | 1 - cddl/lib/libzpool/Makefile.depend | 1 - cddl/lib/libzutil/Makefile | 1 - cddl/lib/tests/Makefile | 1 - cddl/lib/tests/Makefile.depend | 1 - cddl/sbin/Makefile | 1 - cddl/sbin/Makefile.inc | 1 - cddl/sbin/tests/Makefile | 1 - cddl/sbin/tests/Makefile.depend | 1 - cddl/sbin/zfs/Makefile | 1 - cddl/sbin/zfs/Makefile.depend | 1 - cddl/sbin/zpool/Makefile | 1 - cddl/sbin/zpool/Makefile.depend | 1 - cddl/share/Makefile | 1 - cddl/share/zfs/Makefile | 1 - cddl/share/zfs/compatibility.d/Makefile | 1 - cddl/tests/Makefile | 1 - cddl/tests/Makefile.depend | 1 - cddl/usr.bin/Makefile | 1 - cddl/usr.bin/Makefile.inc | 1 - cddl/usr.bin/ctfconvert/Makefile | 1 - cddl/usr.bin/ctfconvert/Makefile.depend | 1 - cddl/usr.bin/ctfconvert/tests/Makefile | 1 - cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh | 1 - cddl/usr.bin/ctfdump/Makefile | 1 - cddl/usr.bin/ctfdump/Makefile.depend | 1 - cddl/usr.bin/ctfmerge/Makefile | 1 - cddl/usr.bin/ctfmerge/Makefile.depend | 1 - cddl/usr.bin/tests/Makefile | 1 - cddl/usr.bin/tests/Makefile.depend | 1 - cddl/usr.bin/zinject/Makefile | 1 - cddl/usr.bin/zinject/Makefile.depend | 1 - cddl/usr.bin/zstream/Makefile | 1 - cddl/usr.bin/ztest/Makefile | 1 - cddl/usr.bin/ztest/Makefile.depend | 1 - cddl/usr.bin/ztest/tests/Makefile | 1 - cddl/usr.bin/ztest/tests/ztest.sh | 1 - cddl/usr.libexec/Makefile | 1 - cddl/usr.libexec/zpool_influxdb/Makefile | 1 - cddl/usr.libexec/zpool_influxdb/Makefile.depend | 1 - cddl/usr.sbin/Makefile | 1 - cddl/usr.sbin/Makefile.inc | 1 - cddl/usr.sbin/dtrace/Makefile | 1 - cddl/usr.sbin/dtrace/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/Makefile | 1 - cddl/usr.sbin/dtrace/tests/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/amd64/Makefile | 1 - cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/aggs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/aggs/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/arrays/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/arrays/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/assocs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/assocs/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/begin/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/begin/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/buffering/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/buffering/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/cg/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/cg/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/clauses/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/clauses/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/cpc/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/cpc/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/decls/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/decls/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/drops/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/drops/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/end/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/end/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/enum/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/enum/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/env/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/error/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/error/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/exit/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/exit/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/funcs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/funcs/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/grammar/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/grammar/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/include/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/include/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/inline/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/inline/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/io/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/io/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/ip/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/ip/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/java_api/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/java_api/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/json/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/json/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/lexer/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/lexer/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/mdb/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/mdb/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/mib/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/mib/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/misc/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/misc/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/nfs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/operators/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/operators/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/pid/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/pid/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/pointers/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/pointers/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/pragma/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/pragma/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/predicates/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/predicates/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/print/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/print/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/printa/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/printa/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/printf/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/printf/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/privs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/privs/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/probes/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/probes/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/proc/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/proc/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/providers/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/providers/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/raise/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/raise/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/rates/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/rates/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/safety/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/safety/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/scalars/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/scalars/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/sched/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sched/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/scripting/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/scripting/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/sdt/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sdt/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/speculation/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/speculation/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/stability/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/stability/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/stack/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/stack/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/stop/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/stop/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/strlen/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/strlen/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/struct/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/struct/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/sugar/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sugar/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/syscall/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/syscall/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/trace/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/trace/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/translators/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/translators/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/typedef/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/typedef/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/types/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/types/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/uctf/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/uctf/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/union/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/union/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/usdt/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/usdt/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/ustack/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/ustack/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/vars/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/vars/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/version/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/version/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/dtrace.test.mk | 1 - cddl/usr.sbin/dtrace/tests/i386/Makefile | 1 - cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile | 1 - cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/i386/pid/Makefile | 1 - cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile | 1 - cddl/usr.sbin/dtrace/tests/tools/dtest.sh | 2 -- cddl/usr.sbin/dtrace/tests/tools/exclude.sh | 1 - cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh | 1 - cddl/usr.sbin/dtrace/tests/tools/gentest.sh | 1 - *** 105261 LINES SKIPPED *** From nobody Wed Aug 23 17:49: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 4RWDJ55vCQz4r9Rj; Wed, 23 Aug 2023 17:49: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 4RWDJ555ybz4VBx; Wed, 23 Aug 2023 17:49:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oUa8U/Y4TLfhxT7kT/LqAuo5bwWcwfVHnQwVMxZhPTc=; b=qLfVpZ4bZn4BK7kCCH4H7FZgn1zJ3Z9sWsTIq+RNd4uq6T8MH9Ixndja6TSZmulPCPEZuu iuBep1tK1WKwjAy3Lc9iBvVTpPs4e3btXSEjYUq9j3KjuCzAxuj/cbBZqI8erpe7TY0a2P aK8qFCfRMWXBHfMMFECwXozIVf56AOW8Vj3d7rCtJ+uDf+PZoRtDALmc3sHlOhfSCwP0Yu RHnFdN0rZ1cRTw6PHaqqeWiDe07DV41lcaBnboUylDVw7ftiP/0KO/FIRzPGsQL12LW9Q1 mgTDNwIIPapWFyiGtCwhwtRkV+2OE05LKUlcirk1hqQU3E9ycXxr5lN/YrkOFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oUa8U/Y4TLfhxT7kT/LqAuo5bwWcwfVHnQwVMxZhPTc=; b=oL/YLLGoT14JDa125JbomBpLRjHniWy46Z4+ckY6qvmN3ELYMcoBIQAfpaETwBIPjYGPSu zS/pkiDGD2BzKVgD26bZ2MICpJT80GYV6fUzzUxPBJiShq+Tj6QuxohI/jld/N2XGBodB0 dPNxO9O87QaHklqJCxCe8rmpmt/xObjWJWB7EyvS7HS/Q1JV8Fj1SBt85LuEJ/nmf2EDeP stHZkuZSUtLrF/cWfLQJ1N1tS65m0AeiSA/twvYkCPASo47QWoKKnCllKJh7DjEO2jIh/q k7Tea/6Ko5rEdmm9M8vxJ3kOXVIjyYCQm8xHo5aiPc0AKzkDUF26OkBCwuJeqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812997; a=rsa-sha256; cv=none; b=yrzQ6XWtD9XqKUypXdXPZ44Dk4zibjkP0l5lwmPEWr6/970WDSgpOUkHljUXQfzOpX7uAi Wmgcxz1keN0BYub/lHT3BXyfb8+pPWC2WK7CjEGoWSzIQDzcURKBkONFgym9b5lAY2mDxb GcjaagbE1b3VtA7Kwcz/lXEDSINE9SRVewRbyn4yGBqF0sU9kio5G4V7UbCXyZzUVWBptd L68QVOaLu5Snr+WtkKyrsTAMNsp10urStZGy34dPt9Ztsu9qYbzOgBmdMSgqinecEi2vuh watVfrzSPRi5H01UDG0jSTNnLlvrnsonZ+qBQs8QfXQRqAqdnm1wGCfw0HHmrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJ547cszv66; Wed, 23 Aug 2023 17:49:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnvJ6041270; Wed, 23 Aug 2023 17:49:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnvKG041267; Wed, 23 Aug 2023 17:49:57 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:57 GMT Message-Id: <202308231749.37NHnvKG041267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 74c1a7c66add - stable/13 - sys: Remove $FreeBSD$: two-line nroff pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 74c1a7c66addbc7aeeb489d60fc1f76c2c398110 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=74c1a7c66addbc7aeeb489d60fc1f76c2c398110 commit 74c1a7c66addbc7aeeb489d60fc1f76c2c398110 Author: Warner Losh AuthorDate: 2023-08-22 01:32:04 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:30 +0000 sys: Remove $FreeBSD$: two-line nroff pattern Remove /^\.\\"\n\.\\"\s*\$FreeBSD\$$\n/ Similar commit in current: (cherry picked from commit 9e7892125655) --- sys/netinet/libalias/libalias.3 | 2 -- sys/teken/libteken/teken.3 | 2 -- 2 files changed, 4 deletions(-) diff --git a/sys/netinet/libalias/libalias.3 b/sys/netinet/libalias/libalias.3 index 85ebe55f527c..b4d123682f0b 100644 --- a/sys/netinet/libalias/libalias.3 +++ b/sys/netinet/libalias/libalias.3 @@ -23,8 +23,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ -.\" .Dd May 31, 2021 .Dt LIBALIAS 3 .Os diff --git a/sys/teken/libteken/teken.3 b/sys/teken/libteken/teken.3 index 2f4a0d8eaf75..5a7f5cd18e73 100644 --- a/sys/teken/libteken/teken.3 +++ b/sys/teken/libteken/teken.3 @@ -22,8 +22,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ -.\" .Dd Mar 13, 2017 .Dt TEKEN 3 .Os From nobody Wed Aug 23 17:49: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 4RWDJ73SYsz4r9g0; Wed, 23 Aug 2023 17:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWDJ72b6gz4V0Q; Wed, 23 Aug 2023 17:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ubTbdl9k6+v5uoDTJOd0TnxUlkYH+ZmSdLgxKtptqO0=; b=q1tb1ljwKAtW7ItpeapAvma9+leSiwY4GVbar9okKEc8KIMggRzxP4KEKoIbYKHV3W4PNF YBr/xRn0x2JlfQ6nhc7avhkRqfICZo/GUc3GZS+m41Rerk25cVbAu/3hx0wr2E14ktMcAX luTyeFrL7f5R2kPuV9BZ+MrGXdjuVsURonFKIA8o7SO0kNo59G7L7EptMq/OiLEIi7ZXFA KpT2YQKBdaf+HCj6PzRYVnUvfnpaO49vOlB9X4tYioxu0aD0O0jcRgUWON1K3Z3SuzUfW7 +iDpf1XurPCApUAlxLe/mMxsNet5IQrGTY8vwsQ3yWUZxr4HQGtcrQ0a4VO8DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ubTbdl9k6+v5uoDTJOd0TnxUlkYH+ZmSdLgxKtptqO0=; b=i08c73H2ZGc3Fv9tt/FlbLe2vnMP+WHbhuQ94Zr9utJ59/Jr8euWfaEkN76xS/05j/0ed6 3nUoI51FcLcLKgFt18G+unS/VT+sqcMyCSqI/3BKDcQnGwnCdysNbKVO6Yq5eZUIfI/KYS yna+c+MbC/pVO1gskj3VCn5tLYxkxpU6B9f01I00bsXGSg6y8nNG3KAKoD6L9L4AHLYJyK FLn/RNkP1rtU/hc7PT1VwtpNpTD78aQCrSrmby0ymjwnb1cWyd1aBbs/WnJVR/tN6Kank/ 7cZr+9h8RLJyJ5y4tmy4DBBwOTu0YqYAuRCQ7qNCCPs4lhbj0ujUvTxHnL2npw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812999; a=rsa-sha256; cv=none; b=hNotJUZQuAv3nksNl/JPjwaC7BNc3eWY/3t9T07BZ2SBjvolN7FPVImCDlVwQiUIyM3Hm3 cnha0XABjejH2shkN5VBEaIXK9uA3K8JWjhM9Jjw6uC7cZD+wVfoBI7hzV9qwWrLtGLkML 80+9eK5d4H6RT96gJLq0N3L6JPDKeTzD/ZAHBTQKnHA8hU/xAXetjOR7ijIvB/DMZICIzX XBakGhVLgxxcPAcemuA5G2iAELH39snzoPd8bAzkQvtQBVv0PXbF3DfEMMUPfIRKId7FVm 4rCsW2ku3dTGg8ySkESMLees1CwAr1N+HGvWPaptOySah/MFv+zEHW1O3CkEKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJ71gQBzvFc; Wed, 23 Aug 2023 17:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnxuB041312; Wed, 23 Aug 2023 17:49:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnwtP041309; Wed, 23 Aug 2023 17:49:58 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:58 GMT Message-Id: <202308231749.37NHnwtP041309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: b144e70a3325 - stable/13 - Remove $FreeBSD$: two-line nroff pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b144e70a3325e033163aa4e6e15d0446e245702d Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b144e70a3325e033163aa4e6e15d0446e245702d commit b144e70a3325e033163aa4e6e15d0446e245702d Author: Warner Losh AuthorDate: 2023-08-22 01:32:08 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:31 +0000 Remove $FreeBSD$: two-line nroff pattern Remove /^\.\\"\n\.\\"\s*\$FreeBSD\$$\n/ Similar commit in main: (cherry picked from commit fa9896e082a1) --- bin/chio/chio.1 | 2 -- bin/expr/expr.1 | 2 -- bin/freebsd-version/freebsd-version.1 | 2 -- bin/getfacl/getfacl.1 | 2 -- bin/kenv/kenv.1 | 2 -- bin/pkill/pkill.1 | 2 -- bin/pwait/pwait.1 | 2 -- bin/setfacl/setfacl.1 | 2 -- bin/timeout/timeout.1 | 2 -- bin/uuidgen/uuidgen.1 | 2 -- cddl/usr.bin/ctfconvert/ctfconvert.1 | 2 -- cddl/usr.bin/ctfdump/ctfdump.1 | 2 -- cddl/usr.bin/ctfmerge/ctfmerge.1 | 2 -- cddl/usr.sbin/dwatch/dwatch.1 | 2 -- cddl/usr.sbin/plockstat/plockstat.1 | 2 -- cddl/usr.sbin/zfsd/zfsd.8 | 2 -- lib/flua/libjail/jail.3lua | 2 -- lib/geom/cache/gcache.8 | 2 -- lib/geom/concat/gconcat.8 | 2 -- lib/geom/eli/geli.8 | 2 -- lib/geom/journal/gjournal.8 | 2 -- lib/geom/label/glabel.8 | 2 -- lib/geom/mirror/gmirror.8 | 2 -- lib/geom/mountver/gmountver.8 | 2 -- lib/geom/multipath/gmultipath.8 | 2 -- lib/geom/nop/gnop.8 | 2 -- lib/geom/part/gpart.8 | 2 -- lib/geom/raid/graid.8 | 2 -- lib/geom/raid3/graid3.8 | 2 -- lib/geom/shsec/gshsec.8 | 2 -- lib/geom/stripe/gstripe.8 | 2 -- lib/geom/virstor/gvirstor.8 | 2 -- lib/lib80211/lib80211.3 | 2 -- lib/libbe/libbe.3 | 2 -- lib/libc/arm/gen/arm_drain_writebuf.2 | 2 -- lib/libc/arm/gen/arm_sync_icache.2 | 2 -- lib/libc/capability/cap_rights_init.3 | 2 -- lib/libc/db/man/dbm.3 | 2 -- lib/libc/gen/auxv.3 | 2 -- lib/libc/gen/basename.3 | 2 -- lib/libc/gen/cap_rights_get.3 | 2 -- lib/libc/gen/cap_sandboxed.3 | 2 -- lib/libc/gen/check_utility_compat.3 | 2 -- lib/libc/gen/clock_getcpuclockid.3 | 2 -- lib/libc/gen/dirname.3 | 2 -- lib/libc/gen/dladdr.3 | 2 -- lib/libc/gen/dlinfo.3 | 2 -- lib/libc/gen/dllockinit.3 | 2 -- lib/libc/gen/dup3.3 | 2 -- lib/libc/gen/feature_present.3 | 2 -- lib/libc/gen/fmtcheck.3 | 2 -- lib/libc/gen/fmtmsg.3 | 2 -- lib/libc/gen/fpclassify.3 | 2 -- lib/libc/gen/ftok.3 | 2 -- lib/libc/gen/ftw.3 | 2 -- lib/libc/gen/getcontext.3 | 2 -- lib/libc/gen/getentropy.3 | 2 -- lib/libc/gen/getosreldate.3 | 2 -- lib/libc/gen/getpagesizes.3 | 2 -- lib/libc/gen/getpeereid.3 | 2 -- lib/libc/gen/getprogname.3 | 2 -- lib/libc/gen/getutxent.3 | 2 -- lib/libc/gen/isgreater.3 | 2 -- lib/libc/gen/lockf.3 | 2 -- lib/libc/gen/makecontext.3 | 2 -- lib/libc/gen/posix_spawn.3 | 2 -- lib/libc/gen/posix_spawn_file_actions_addopen.3 | 2 -- lib/libc/gen/posix_spawn_file_actions_init.3 | 2 -- lib/libc/gen/posix_spawnattr_getflags.3 | 2 -- lib/libc/gen/posix_spawnattr_getpgroup.3 | 2 -- lib/libc/gen/posix_spawnattr_getschedparam.3 | 2 -- lib/libc/gen/posix_spawnattr_getschedpolicy.3 | 2 -- lib/libc/gen/posix_spawnattr_getsigdefault.3 | 2 -- lib/libc/gen/posix_spawnattr_getsigmask.3 | 2 -- lib/libc/gen/posix_spawnattr_init.3 | 2 -- lib/libc/gen/readpassphrase.3 | 2 -- lib/libc/gen/rfork_thread.3 | 2 -- lib/libc/gen/sem_destroy.3 | 2 -- lib/libc/gen/sem_getvalue.3 | 2 -- lib/libc/gen/sem_init.3 | 2 -- lib/libc/gen/sem_open.3 | 2 -- lib/libc/gen/sem_post.3 | 2 -- lib/libc/gen/sem_timedwait.3 | 2 -- lib/libc/gen/sem_wait.3 | 2 -- lib/libc/gen/setproctitle.3 | 2 -- lib/libc/gen/statvfs.3 | 2 -- lib/libc/gen/stringlist.3 | 2 -- lib/libc/gen/tcgetsid.3 | 2 -- lib/libc/gen/tcgetwinsize.3 | 2 -- lib/libc/gen/tcsetsid.3 | 2 -- lib/libc/gen/timespec_get.3 | 2 -- lib/libc/gen/ucontext.3 | 2 -- lib/libc/gen/ulimit.3 | 2 -- lib/libc/gen/wordexp.3 | 2 -- lib/libc/i386/sys/i386_get_ioperm.2 | 2 -- lib/libc/i386/sys/i386_set_watch.3 | 2 -- lib/libc/i386/sys/i386_vm86.2 | 2 -- lib/libc/iconv/__iconv_get_list.3 | 2 -- lib/libc/iconv/iconv_canonicalize.3 | 2 -- lib/libc/iconv/iconvctl.3 | 2 -- lib/libc/iconv/iconvlist.3 | 2 -- lib/libc/locale/big5.5 | 2 -- lib/libc/locale/btowc.3 | 2 -- lib/libc/locale/ctype_l.3 | 2 -- lib/libc/locale/duplocale.3 | 2 -- lib/libc/locale/freelocale.3 | 2 -- lib/libc/locale/gb18030.5 | 2 -- lib/libc/locale/gb2312.5 | 2 -- lib/libc/locale/gbk.5 | 2 -- lib/libc/locale/isideogram.3 | 2 -- lib/libc/locale/isphonogram.3 | 2 -- lib/libc/locale/isrune.3 | 2 -- lib/libc/locale/isspecial.3 | 2 -- lib/libc/locale/iswalnum_l.3 | 2 -- lib/libc/locale/mbrlen.3 | 2 -- lib/libc/locale/mbrtowc.3 | 2 -- lib/libc/locale/mbsinit.3 | 2 -- lib/libc/locale/mbsrtowcs.3 | 2 -- lib/libc/locale/mskanji.5 | 2 -- lib/libc/locale/newlocale.3 | 2 -- lib/libc/locale/nextwctype.3 | 2 -- lib/libc/locale/nl_langinfo.3 | 2 -- lib/libc/locale/querylocale.3 | 2 -- lib/libc/locale/rpmatch.3 | 2 -- lib/libc/locale/uselocale.3 | 2 -- lib/libc/locale/wcrtomb.3 | 2 -- lib/libc/locale/wcsftime.3 | 2 -- lib/libc/locale/wcsrtombs.3 | 2 -- lib/libc/locale/wcstod.3 | 2 -- lib/libc/locale/wcstol.3 | 2 -- lib/libc/locale/wctrans.3 | 2 -- lib/libc/locale/wctype.3 | 2 -- lib/libc/locale/wcwidth.3 | 2 -- lib/libc/locale/xlocale.3 | 2 -- lib/libc/net/ethers.3 | 2 -- lib/libc/net/eui64.3 | 2 -- lib/libc/net/gai_strerror.3 | 2 -- lib/libc/net/getaddrinfo.3 | 2 -- lib/libc/net/getifaddrs.3 | 2 -- lib/libc/net/getifmaddrs.3 | 2 -- lib/libc/net/getnameinfo.3 | 2 -- lib/libc/net/hesiod.3 | 2 -- lib/libc/net/if_indextoname.3 | 2 -- lib/libc/net/inet6_opt_init.3 | 2 -- lib/libc/net/inet6_option_space.3 | 2 -- lib/libc/net/inet6_rth_space.3 | 2 -- lib/libc/net/inet6_rthdr_space.3 | 2 -- lib/libc/net/inet_net.3 | 2 -- lib/libc/net/nsdispatch.3 | 2 -- lib/libc/net/rcmdsh.3 | 2 -- lib/libc/net/sctp_connectx.3 | 2 -- lib/libc/net/sctp_getassocid.3 | 2 -- lib/libc/net/sctp_recvmsg.3 | 2 -- lib/libc/net/sctp_send.3 | 2 -- lib/libc/net/sockatmark.3 | 2 -- lib/libc/net/sourcefilter.3 | 2 -- lib/libc/nls/catclose.3 | 2 -- lib/libc/nls/catgets.3 | 2 -- lib/libc/nls/catopen.3 | 2 -- lib/libc/posix1e/acl.3 | 2 -- lib/libc/posix1e/acl_add_flag_np.3 | 2 -- lib/libc/posix1e/acl_add_perm.3 | 2 -- lib/libc/posix1e/acl_calc_mask.3 | 2 -- lib/libc/posix1e/acl_clear_flags_np.3 | 2 -- lib/libc/posix1e/acl_clear_perms.3 | 2 -- lib/libc/posix1e/acl_copy_entry.3 | 2 -- lib/libc/posix1e/acl_create_entry.3 | 2 -- lib/libc/posix1e/acl_delete.3 | 2 -- lib/libc/posix1e/acl_delete_entry.3 | 2 -- lib/libc/posix1e/acl_delete_flag_np.3 | 2 -- lib/libc/posix1e/acl_delete_perm.3 | 2 -- lib/libc/posix1e/acl_dup.3 | 2 -- lib/libc/posix1e/acl_free.3 | 2 -- lib/libc/posix1e/acl_from_text.3 | 2 -- lib/libc/posix1e/acl_get.3 | 2 -- lib/libc/posix1e/acl_get_brand_np.3 | 2 -- lib/libc/posix1e/acl_get_entry.3 | 2 -- lib/libc/posix1e/acl_get_entry_type_np.3 | 2 -- lib/libc/posix1e/acl_get_flag_np.3 | 2 -- lib/libc/posix1e/acl_get_flagset_np.3 | 2 -- lib/libc/posix1e/acl_get_perm_np.3 | 2 -- lib/libc/posix1e/acl_get_permset.3 | 2 -- lib/libc/posix1e/acl_get_qualifier.3 | 2 -- lib/libc/posix1e/acl_get_tag_type.3 | 2 -- lib/libc/posix1e/acl_init.3 | 2 -- lib/libc/posix1e/acl_is_trivial_np.3 | 2 -- lib/libc/posix1e/acl_set.3 | 2 -- lib/libc/posix1e/acl_set_entry_type_np.3 | 2 -- lib/libc/posix1e/acl_set_flagset_np.3 | 2 -- lib/libc/posix1e/acl_set_permset.3 | 2 -- lib/libc/posix1e/acl_set_qualifier.3 | 2 -- lib/libc/posix1e/acl_set_tag_type.3 | 2 -- lib/libc/posix1e/acl_strip_np.3 | 2 -- lib/libc/posix1e/acl_to_text.3 | 2 -- lib/libc/posix1e/acl_valid.3 | 2 -- lib/libc/posix1e/extattr.3 | 2 -- lib/libc/posix1e/mac.3 | 2 -- lib/libc/posix1e/mac.conf.5 | 2 -- lib/libc/posix1e/mac_free.3 | 2 -- lib/libc/posix1e/mac_get.3 | 2 -- lib/libc/posix1e/mac_is_present.3 | 2 -- lib/libc/posix1e/mac_prepare.3 | 2 -- lib/libc/posix1e/mac_set.3 | 2 -- lib/libc/posix1e/mac_text.3 | 2 -- lib/libc/posix1e/posix1e.3 | 2 -- lib/libc/stdio/flockfile.3 | 2 -- lib/libc/stdio/fopencookie.3 | 2 -- lib/libc/stdio/getline.3 | 2 -- lib/libc/stdio/open_memstream.3 | 2 -- lib/libc/stdio/printf_l.3 | 2 -- lib/libc/stdio/scanf_l.3 | 2 -- lib/libc/stdlib/a64l.3 | 2 -- lib/libc/stdlib/at_quick_exit.3 | 2 -- lib/libc/stdlib/hcreate.3 | 2 -- lib/libc/stdlib/imaxabs.3 | 2 -- lib/libc/stdlib/imaxdiv.3 | 2 -- lib/libc/stdlib/insque.3 | 2 -- lib/libc/stdlib/llabs.3 | 2 -- lib/libc/stdlib/lldiv.3 | 2 -- lib/libc/stdlib/lsearch.3 | 2 -- lib/libc/stdlib/ptsname.3 | 2 -- lib/libc/stdlib/quick_exit.3 | 2 -- lib/libc/stdlib/reallocarray.3 | 2 -- lib/libc/stdlib/set_constraint_handler_s.3 | 2 -- lib/libc/stdlib/strfmon.3 | 2 -- lib/libc/stdtime/strptime.3 | 2 -- lib/libc/string/memmem.3 | 2 -- lib/libc/string/strlcpy.3 | 2 -- lib/libc/string/timingsafe_bcmp.3 | 2 -- lib/libc/string/wcstok.3 | 2 -- lib/libc/string/wcswidth.3 | 2 -- lib/libc/string/wmemchr.3 | 2 -- lib/libc/sys/_umtx_op.2 | 2 -- lib/libc/sys/abort2.2 | 2 -- lib/libc/sys/aio_cancel.2 | 2 -- lib/libc/sys/aio_error.2 | 2 -- lib/libc/sys/aio_fsync.2 | 2 -- lib/libc/sys/aio_mlock.2 | 2 -- lib/libc/sys/aio_read.2 | 2 -- lib/libc/sys/aio_return.2 | 2 -- lib/libc/sys/aio_suspend.2 | 2 -- lib/libc/sys/aio_waitcomplete.2 | 2 -- lib/libc/sys/aio_write.2 | 2 -- lib/libc/sys/bindat.2 | 2 -- lib/libc/sys/cap_enter.2 | 2 -- lib/libc/sys/cap_fcntls_limit.2 | 2 -- lib/libc/sys/cap_ioctls_limit.2 | 2 -- lib/libc/sys/cap_rights_limit.2 | 2 -- lib/libc/sys/clock_gettime.2 | 2 -- lib/libc/sys/closefrom.2 | 2 -- lib/libc/sys/connectat.2 | 2 -- lib/libc/sys/copy_file_range.2 | 2 -- lib/libc/sys/cpuset.2 | 2 -- lib/libc/sys/cpuset_getaffinity.2 | 2 -- lib/libc/sys/cpuset_getdomain.2 | 2 -- lib/libc/sys/eventfd.2 | 2 -- lib/libc/sys/extattr_get_file.2 | 2 -- lib/libc/sys/ffclock.2 | 2 -- lib/libc/sys/fhlink.2 | 2 -- lib/libc/sys/fhopen.2 | 2 -- lib/libc/sys/fhreadlink.2 | 2 -- lib/libc/sys/getloginclass.2 | 2 -- lib/libc/sys/getrandom.2 | 2 -- lib/libc/sys/getsid.2 | 2 -- lib/libc/sys/ioctl.2 | 2 -- lib/libc/sys/issetugid.2 | 2 -- lib/libc/sys/jail.2 | 2 -- lib/libc/sys/kenv.2 | 2 -- lib/libc/sys/kldfind.2 | 2 -- lib/libc/sys/kldfirstmod.2 | 2 -- lib/libc/sys/kldload.2 | 2 -- lib/libc/sys/kldnext.2 | 2 -- lib/libc/sys/kldstat.2 | 2 -- lib/libc/sys/kldsym.2 | 2 -- lib/libc/sys/kldunload.2 | 2 -- lib/libc/sys/kqueue.2 | 2 -- lib/libc/sys/lio_listio.2 | 2 -- lib/libc/sys/mlockall.2 | 2 -- lib/libc/sys/modfind.2 | 2 -- lib/libc/sys/modnext.2 | 2 -- lib/libc/sys/modstat.2 | 2 -- lib/libc/sys/mq_close.2 | 2 -- lib/libc/sys/mq_getattr.2 | 2 -- lib/libc/sys/mq_notify.2 | 2 -- lib/libc/sys/mq_open.2 | 2 -- lib/libc/sys/mq_receive.2 | 2 -- lib/libc/sys/mq_send.2 | 2 -- lib/libc/sys/mq_setattr.2 | 2 -- lib/libc/sys/msgctl.2 | 2 -- lib/libc/sys/msgsnd.2 | 2 -- lib/libc/sys/ntp_adjtime.2 | 2 -- lib/libc/sys/pdfork.2 | 2 -- lib/libc/sys/posix_openpt.2 | 2 -- lib/libc/sys/procctl.2 | 2 -- lib/libc/sys/pselect.2 | 2 -- lib/libc/sys/rctl_add_rule.2 | 2 -- lib/libc/sys/rfork.2 | 2 -- lib/libc/sys/rtprio.2 | 2 -- lib/libc/sys/sched_get_priority_max.2 | 2 -- lib/libc/sys/sctp_generic_recvmsg.2 | 2 -- lib/libc/sys/sctp_generic_sendmsg.2 | 2 -- lib/libc/sys/sctp_peeloff.2 | 2 -- lib/libc/sys/semctl.2 | 2 -- lib/libc/sys/semget.2 | 2 -- lib/libc/sys/semop.2 | 2 -- lib/libc/sys/sendfile.2 | 2 -- lib/libc/sys/setfib.2 | 2 -- lib/libc/sys/setresuid.2 | 2 -- lib/libc/sys/shm_open.2 | 2 -- lib/libc/sys/shmat.2 | 2 -- lib/libc/sys/shmctl.2 | 2 -- lib/libc/sys/shmget.2 | 2 -- lib/libc/sys/sigfastblock.2 | 2 -- lib/libc/sys/sigqueue.2 | 2 -- lib/libc/sys/sigwait.2 | 2 -- lib/libc/sys/sigwaitinfo.2 | 2 -- lib/libc/sys/thr_exit.2 | 2 -- lib/libc/sys/thr_kill.2 | 2 -- lib/libc/sys/thr_new.2 | 2 -- lib/libc/sys/thr_self.2 | 2 -- lib/libc/sys/thr_set_name.2 | 2 -- lib/libc/sys/thr_suspend.2 | 2 -- lib/libc/sys/thr_wake.2 | 2 -- lib/libc/sys/timer_create.2 | 2 -- lib/libc/sys/timer_delete.2 | 2 -- lib/libc/sys/timer_settime.2 | 2 -- lib/libc/sys/utrace.2 | 2 -- lib/libc/sys/uuidgen.2 | 2 -- lib/libc/uuid/uuid.3 | 2 -- lib/libc/x86/sys/pkru.3 | 2 -- lib/libcalendar/calendar.3 | 2 -- lib/libcam/cam.3 | 2 -- lib/libcam/cam_cdbparse.3 | 2 -- lib/libcapsicum/capsicum_helpers.3 | 2 -- lib/libcasper/libcasper/libcasper.3 | 2 -- lib/libcasper/libcasper/libcasper_service.3 | 2 -- lib/libcasper/services/cap_dns/cap_dns.3 | 2 -- lib/libcasper/services/cap_fileargs/cap_fileargs.3 | 2 -- lib/libcasper/services/cap_grp/cap_grp.3 | 2 -- lib/libcasper/services/cap_net/cap_net.3 | 2 -- lib/libcasper/services/cap_pwd/cap_pwd.3 | 2 -- lib/libcasper/services/cap_sysctl/cap_sysctl.3 | 2 -- lib/libcasper/services/cap_syslog/cap_syslog.3 | 2 -- lib/libcompat/4.4/cuserid.3 | 2 -- lib/libcrypt/crypt.3 | 2 -- lib/libdevctl/devctl.3 | 2 -- lib/libdevinfo/devinfo.3 | 2 -- lib/libdevstat/devstat.3 | 2 -- lib/libdpv/dpv.3 | 2 -- lib/libefivar/efivar.3 | 2 -- lib/libexpat/libbsdxml.3 | 2 -- lib/libfetch/fetch.3 | 2 -- lib/libfigpar/figpar.3 | 2 -- lib/libgeom/libgeom.3 | 2 -- lib/libgpio/gpio.3 | 2 -- lib/libgssapi/gss_accept_sec_context.3 | 2 -- lib/libgssapi/gss_acquire_cred.3 | 2 -- lib/libgssapi/gss_add_cred.3 | 2 -- lib/libgssapi/gss_add_oid_set_member.3 | 2 -- lib/libgssapi/gss_canonicalize_name.3 | 2 -- lib/libgssapi/gss_compare_name.3 | 2 -- lib/libgssapi/gss_context_time.3 | 2 -- lib/libgssapi/gss_create_empty_oid_set.3 | 2 -- lib/libgssapi/gss_delete_sec_context.3 | 2 -- lib/libgssapi/gss_display_name.3 | 2 -- lib/libgssapi/gss_display_status.3 | 2 -- lib/libgssapi/gss_duplicate_name.3 | 2 -- lib/libgssapi/gss_export_name.3 | 2 -- lib/libgssapi/gss_export_sec_context.3 | 2 -- lib/libgssapi/gss_get_mic.3 | 2 -- lib/libgssapi/gss_import_name.3 | 2 -- lib/libgssapi/gss_import_sec_context.3 | 2 -- lib/libgssapi/gss_indicate_mechs.3 | 2 -- lib/libgssapi/gss_init_sec_context.3 | 2 -- lib/libgssapi/gss_inquire_context.3 | 2 -- lib/libgssapi/gss_inquire_cred.3 | 2 -- lib/libgssapi/gss_inquire_cred_by_mech.3 | 2 -- lib/libgssapi/gss_inquire_mechs_for_name.3 | 2 -- lib/libgssapi/gss_inquire_names_for_mech.3 | 2 -- lib/libgssapi/gss_process_context_token.3 | 2 -- lib/libgssapi/gss_release_buffer.3 | 2 -- lib/libgssapi/gss_release_cred.3 | 2 -- lib/libgssapi/gss_release_name.3 | 2 -- lib/libgssapi/gss_release_oid_set.3 | 2 -- lib/libgssapi/gss_test_oid_set_member.3 | 2 -- lib/libgssapi/gss_unwrap.3 | 2 -- lib/libgssapi/gss_verify_mic.3 | 2 -- lib/libgssapi/gss_wrap.3 | 2 -- lib/libgssapi/gss_wrap_size_limit.3 | 2 -- lib/libgssapi/gssapi.3 | 2 -- lib/libgssapi/mech.5 | 2 -- lib/libipsec/ipsec_set_policy.3 | 2 -- lib/libipsec/ipsec_strerror.3 | 2 -- lib/libjail/jail.3 | 2 -- lib/libkiconv/kiconv.3 | 2 -- lib/libkvm/kvm_getcptime.3 | 2 -- lib/libkvm/kvm_getpcpu.3 | 2 -- lib/libkvm/kvm_getswapinfo.3 | 2 -- lib/libkvm/kvm_kerndisp.3 | 2 -- lib/libkvm/kvm_native.3 | 2 -- lib/libmd/mdX.3 | 2 -- lib/libmd/skein.3 | 2 -- lib/libmemstat/libmemstat.3 | 2 -- lib/libmp/libmp.3 | 2 -- lib/libmt/mt.3 | 2 -- lib/libnetgraph/netgraph.3 | 2 -- lib/libopenbsd/imsg_init.3 | 2 -- lib/libopenbsd/ohash_init.3 | 2 -- lib/libopenbsd/ohash_interval.3 | 2 -- lib/libpam/modules/pam_chroot/pam_chroot.8 | 2 -- lib/libpam/modules/pam_deny/pam_deny.8 | 2 -- lib/libpam/modules/pam_echo/pam_echo.8 | 2 -- lib/libpam/modules/pam_exec/pam_exec.8 | 2 -- lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 | 2 -- lib/libpam/modules/pam_group/pam_group.8 | 2 -- lib/libpam/modules/pam_guest/pam_guest.8 | 2 -- lib/libpam/modules/pam_ksu/pam_ksu.8 | 2 -- lib/libpam/modules/pam_lastlog/pam_lastlog.8 | 2 -- lib/libpam/modules/pam_login_access/login.access.5 | 2 -- lib/libpam/modules/pam_login_access/pam_login_access.8 | 2 -- lib/libpam/modules/pam_nologin/pam_nologin.8 | 2 -- lib/libpam/modules/pam_opie/pam_opie.8 | 2 -- lib/libpam/modules/pam_opieaccess/pam_opieaccess.8 | 2 -- lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 | 2 -- lib/libpam/modules/pam_permit/pam_permit.8 | 2 -- lib/libpam/modules/pam_radius/pam_radius.8 | 2 -- lib/libpam/modules/pam_rhosts/pam_rhosts.8 | 2 -- lib/libpam/modules/pam_rootok/pam_rootok.8 | 2 -- lib/libpam/modules/pam_securetty/pam_securetty.8 | 2 -- lib/libpam/modules/pam_self/pam_self.8 | 2 -- lib/libpam/modules/pam_ssh/pam_ssh.8 | 2 -- lib/libpam/modules/pam_tacplus/pam_tacplus.8 | 2 -- lib/libpam/modules/pam_unix/pam_unix.8 | 2 -- lib/libpathconv/abs2rel.3 | 2 -- lib/libpathconv/rel2abs.3 | 2 -- lib/libpmc/pmc.3 | 2 -- lib/libpmc/pmc.atom.3 | 2 -- lib/libpmc/pmc.atomsilvermont.3 | 2 -- lib/libpmc/pmc.core.3 | 2 -- lib/libpmc/pmc.core2.3 | 2 -- lib/libpmc/pmc.corei7.3 | 2 -- lib/libpmc/pmc.corei7uc.3 | 2 -- lib/libpmc/pmc.haswell.3 | 2 -- lib/libpmc/pmc.haswelluc.3 | 2 -- lib/libpmc/pmc.haswellxeon.3 | 2 -- lib/libpmc/pmc.iaf.3 | 2 -- lib/libpmc/pmc.ivybridge.3 | 2 -- lib/libpmc/pmc.ivybridgexeon.3 | 2 -- lib/libpmc/pmc.k7.3 | 2 -- lib/libpmc/pmc.k8.3 | 2 -- lib/libpmc/pmc.mips24k.3 | 2 -- lib/libpmc/pmc.octeon.3 | 2 -- lib/libpmc/pmc.sandybridge.3 | 2 -- lib/libpmc/pmc.sandybridgeuc.3 | 2 -- lib/libpmc/pmc.sandybridgexeon.3 | 2 -- lib/libpmc/pmc.soft.3 | 2 -- lib/libpmc/pmc.tsc.3 | 2 -- lib/libpmc/pmc.ucf.3 | 2 -- lib/libpmc/pmc.westmere.3 | 2 -- lib/libpmc/pmc.westmereuc.3 | 2 -- lib/libpmc/pmc_allocate.3 | 2 -- lib/libpmc/pmc_attach.3 | 2 -- lib/libpmc/pmc_capabilities.3 | 2 -- lib/libpmc/pmc_configure_logfile.3 | 2 -- lib/libpmc/pmc_disable.3 | 2 -- lib/libpmc/pmc_event_names_of_class.3 | 2 -- lib/libpmc/pmc_get_driver_stats.3 | 2 -- lib/libpmc/pmc_get_msr.3 | 2 -- lib/libpmc/pmc_init.3 | 2 -- lib/libpmc/pmc_name_of_capability.3 | 2 -- lib/libpmc/pmc_read.3 | 2 -- lib/libpmc/pmc_set.3 | 2 -- lib/libpmc/pmc_start.3 | 2 -- lib/libpmc/pmclog.3 | 2 -- lib/libprocstat/libprocstat.3 | 2 -- lib/libradius/libradius.3 | 2 -- lib/libradius/radius.conf.5 | 2 -- lib/librpcsec_gss/rpc_gss_get_error.3 | 2 -- lib/librpcsec_gss/rpc_gss_get_mech_info.3 | 2 -- lib/librpcsec_gss/rpc_gss_get_mechanisms.3 | 2 -- lib/librpcsec_gss/rpc_gss_get_principal_name.3 | 2 -- lib/librpcsec_gss/rpc_gss_get_versions.3 | 2 -- lib/librpcsec_gss/rpc_gss_getcred.3 | 2 -- lib/librpcsec_gss/rpc_gss_is_installed.3 | 2 -- lib/librpcsec_gss/rpc_gss_max_data_length.3 | 2 -- lib/librpcsec_gss/rpc_gss_mech_to_oid.3 | 2 -- lib/librpcsec_gss/rpc_gss_oid_to_mech.3 | 2 -- lib/librpcsec_gss/rpc_gss_qop_to_num.3 | 2 -- lib/librpcsec_gss/rpc_gss_seccreate.3 | 2 -- lib/librpcsec_gss/rpc_gss_set_callback.3 | 2 -- lib/librpcsec_gss/rpc_gss_set_defaults.3 | 2 -- lib/librpcsec_gss/rpc_gss_set_svc_name.3 | 2 -- lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 | 2 -- lib/librpcsec_gss/rpcsec_gss.3 | 2 -- lib/librtld_db/librtld_db.3 | 2 -- lib/libstdbuf/libstdbuf.3 | 2 -- lib/libstdthreads/thrd_create.3 | 2 -- lib/libsysdecode/sysdecode.3 | 2 -- lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3 | 2 -- lib/libsysdecode/sysdecode_cap_rights.3 | 2 -- lib/libsysdecode/sysdecode_cmsg_type.3 | 2 -- lib/libsysdecode/sysdecode_enum.3 | 2 -- lib/libsysdecode/sysdecode_fcntl_arg.3 | 2 -- lib/libsysdecode/sysdecode_ioctlname.3 | 2 -- lib/libsysdecode/sysdecode_kevent.3 | 2 -- lib/libsysdecode/sysdecode_mask.3 | 2 -- lib/libsysdecode/sysdecode_quotactl_cmd.3 | 2 -- lib/libsysdecode/sysdecode_sctp_sinfo_flags.3 | 2 -- lib/libsysdecode/sysdecode_sigcode.3 | 2 -- lib/libsysdecode/sysdecode_socket_protocol.3 | 2 -- lib/libsysdecode/sysdecode_sockopt_name.3 | 2 -- lib/libsysdecode/sysdecode_syscallnames.3 | 2 -- lib/libsysdecode/sysdecode_utrace.3 | 2 -- lib/libtacplus/libtacplus.3 | 2 -- lib/libtacplus/tacplus.conf.5 | 2 -- lib/libthr/libthr.3 | 2 -- lib/libufs/bread.3 | 2 -- lib/libufs/cgread.3 | 2 -- lib/libufs/getinode.3 | 2 -- lib/libufs/libufs.3 | 2 -- lib/libufs/sbread.3 | 2 -- lib/libufs/ufs_disk_close.3 | 2 -- lib/libugidfw/bsde_get_rule.3 | 2 -- lib/libugidfw/bsde_get_rule_count.3 | 2 -- lib/libugidfw/bsde_parse_rule.3 | 2 -- lib/libugidfw/bsde_rule_to_string.3 | 2 -- lib/libugidfw/libugidfw.3 | 2 -- lib/libulog/ulog_login.3 | 2 -- lib/libulog/utempter_add_record.3 | 2 -- lib/libusb/libusb.3 | 2 -- lib/libusb/libusb20.3 | 2 -- lib/libusbhid/usbhid.3 | 2 -- lib/libutil/_secure_path.3 | 2 -- lib/libutil/expand_number.3 | 2 -- lib/libutil/flopen.3 | 2 -- lib/libutil/getlocalbase.3 | 2 -- lib/libutil/hexdump.3 | 2 -- lib/libutil/kinfo_getallproc.3 | 2 -- lib/libutil/kinfo_getfile.3 | 2 -- lib/libutil/kinfo_getproc.3 | 2 -- lib/libutil/kinfo_getvmmap.3 | 2 -- lib/libutil/kinfo_getvmobject.3 | 2 -- lib/libutil/kld.3 | 2 -- lib/libutil/login.conf.5 | 2 -- lib/libutil/login_auth.3 | 2 -- lib/libutil/login_cap.3 | 2 -- lib/libutil/login_class.3 | 2 -- lib/libutil/login_ok.3 | 2 -- lib/libutil/login_times.3 | 2 -- lib/libutil/login_tty.3 | 2 -- lib/libutil/pidfile.3 | 2 -- lib/libutil/property.3 | 2 -- lib/libutil/pty.3 | 2 -- lib/libutil/pw_util.3 | 2 -- lib/libutil/quotafile.3 | 2 -- lib/libutil/realhostname.3 | 2 -- lib/libutil/realhostname_sa.3 | 2 -- lib/libutil/trimdomain.3 | 2 -- lib/libutil/uucplock.3 | 2 -- lib/libveriexec/veriexec.3 | 2 -- lib/libvgl/vgl.3 | 2 -- lib/libz/zopen.3 | 2 -- lib/msun/man/cacos.3 | 2 -- lib/msun/man/ccos.3 | 2 -- lib/msun/man/ccosh.3 | 2 -- lib/msun/man/cexp.3 | 2 -- lib/msun/man/cimag.3 | 2 -- lib/msun/man/clog.3 | 2 -- lib/msun/man/complex.3 | 2 -- lib/msun/man/cospi.3 | 2 -- lib/msun/man/csqrt.3 | 2 -- lib/msun/man/fdim.3 | 2 -- lib/msun/man/feclearexcept.3 | 2 -- lib/msun/man/feenableexcept.3 | 2 -- lib/msun/man/fegetenv.3 | 2 -- lib/msun/man/fegetround.3 | 2 -- lib/msun/man/fenv.3 | 2 -- lib/msun/man/fma.3 | 2 -- lib/msun/man/fmax.3 | 2 -- lib/msun/man/log.3 | 2 -- lib/msun/man/lrint.3 | 2 -- lib/msun/man/lround.3 | 2 -- lib/msun/man/nan.3 | 2 -- lib/msun/man/round.3 | 2 -- lib/msun/man/signbit.3 | 2 -- lib/msun/man/sincos.3 | 2 -- lib/msun/man/sinpi.3 | 2 -- lib/msun/man/tanpi.3 | 2 -- lib/msun/man/trunc.3 | 2 -- libexec/bootpd/bootpd.8 | 2 -- libexec/bootpd/bootptab.5 | 2 -- libexec/ftpd/ftpchroot.5 | 2 -- libexec/makewhatis.local/makewhatis.local.8 | 2 -- libexec/mknetid/mknetid.8 | 2 -- libexec/mknetid/netid.5 | 2 -- libexec/phttpget/phttpget.8 | 2 -- libexec/pppoed/pppoed.8 | 2 -- libexec/revnetgroup/revnetgroup.8 | 2 -- libexec/rpc.rquotad/rpc.rquotad.8 | 2 -- libexec/rpc.rstatd/rpc.rstatd.8 | 2 -- libexec/rpc.rusersd/rpc.rusersd.8 | 2 -- libexec/rpc.rwalld/rpc.rwalld.8 | 2 -- libexec/rpc.sprayd/rpc.sprayd.8 | 2 -- libexec/rtld-elf/rtld.1 | 2 -- libexec/ypxfr/ypxfr.8 | 2 -- sbin/adjkerntz/adjkerntz.8 | 2 -- sbin/bectl/bectl.8 | 2 -- sbin/camcontrol/camcontrol.8 | 2 -- sbin/conscontrol/conscontrol.8 | 2 -- sbin/ddb/ddb.8 | 2 -- sbin/decryptcore/decryptcore.8 | 2 -- sbin/devd/devd.8 | 2 -- sbin/devd/devd.conf.5 | 2 -- sbin/devfs/devfs.8 | 2 -- sbin/devmatch/devmatch.8 | 2 -- sbin/dhclient/dhclient-script.8 | 2 -- sbin/dhclient/dhclient.8 | 2 -- sbin/dhclient/dhclient.conf.5 | 2 -- sbin/dhclient/dhclient.leases.5 | 2 -- sbin/dhclient/dhcp-options.5 | 2 -- sbin/etherswitchcfg/etherswitchcfg.8 | 2 -- sbin/fsck/fsck.8 | 2 -- sbin/fsck_msdosfs/fsck_msdosfs.8 | 2 -- sbin/fsdb/fsdb.8 | 2 -- sbin/gbde/gbde.8 | 2 -- sbin/geom/core/geom.8 | 2 -- sbin/ggate/ggatec/ggatec.8 | 2 -- sbin/ggate/ggated/ggated.8 | 2 -- sbin/ggate/ggatel/ggatel.8 | 2 -- sbin/gvinum/gvinum.8 | 2 -- sbin/hastctl/hastctl.8 | 2 -- sbin/hastd/hast.conf.5 | 2 -- sbin/hastd/hastd.8 | 2 -- sbin/ipfw/ipfw.8 | 2 -- sbin/iscontrol/iscontrol.8 | 2 -- sbin/kldconfig/kldconfig.8 | 2 -- sbin/kldload/kldload.8 | 2 -- sbin/kldstat/kldstat.8 | 2 -- sbin/kldunload/kldunload.8 | 2 -- sbin/ldconfig/ldconfig.8 | 2 -- sbin/mdconfig/mdconfig.8 | 2 -- sbin/mdmfs/mdmfs.8 | 2 -- sbin/mount_fusefs/mount_fusefs.8 | 2 -- sbin/mount_msdosfs/mount_msdosfs.8 | 2 -- sbin/mount_udf/mount_udf.8 | 2 -- sbin/newfs_msdos/newfs_msdos.8 | 2 -- sbin/nos-tun/nos-tun.8 | 2 -- sbin/nvmecontrol/nvmecontrol.8 | 2 -- sbin/pfctl/pfctl.8 | 2 -- sbin/pfilctl/pfilctl.8 | 2 -- sbin/rcorder/rcorder.8 | 2 -- sbin/reboot/boot_i386.8 | 2 -- sbin/reboot/nextboot.8 | 2 -- sbin/recoverdisk/recoverdisk.1 | 2 -- sbin/sconfig/sconfig.8 | 2 -- sbin/setkey/setkey.8 | 2 -- sbin/spppcontrol/spppcontrol.8 | 2 -- sbin/veriexec/veriexec.8 | 2 -- sbin/zfsbootcfg/zfsbootcfg.8 | 2 -- share/doc/papers/bufbio/bio.ms | 2 -- share/doc/papers/contents/contents.ms | 2 -- share/doc/papers/diskperf/motivation.ms | 2 -- share/doc/papers/jail/future.ms | 2 -- share/doc/papers/jail/implementation.ms | 2 -- share/doc/papers/jail/mgt.ms | 2 -- share/doc/papers/jail/paper.ms | 2 -- share/doc/papers/malloc/abs.ms | 2 -- share/doc/papers/malloc/alternatives.ms | 2 -- share/doc/papers/malloc/conclusion.ms | 2 -- share/doc/papers/malloc/implementation.ms | 2 -- share/doc/papers/malloc/intro.ms | 2 -- share/doc/papers/malloc/kernel.ms | 2 -- share/doc/papers/malloc/malloc.ms | 2 -- share/doc/papers/malloc/performance.ms | 2 -- share/doc/papers/malloc/problems.ms | 2 -- share/doc/papers/sysperf/4.t | 2 -- share/doc/papers/sysperf/5.t | 2 -- share/doc/papers/timecounter/timecounter.ms | 2 -- share/doc/psd/01.cacm/p.mac | 2 -- share/doc/psd/01.cacm/p1 | 2 -- share/doc/psd/01.cacm/p2 | 2 -- share/doc/psd/01.cacm/p3 | 2 -- share/doc/psd/01.cacm/p4 | 2 -- share/doc/psd/01.cacm/p5 | 2 -- share/doc/psd/01.cacm/p6 | 2 -- share/doc/psd/02.implement/fig1.pic | 2 -- share/doc/psd/02.implement/fig2.pic | 2 -- share/doc/psd/02.implement/implement | 2 -- share/doc/psd/03.iosys/iosys | 2 -- share/doc/psd/06.Clang/Clang.ms | 2 -- share/doc/psd/15.yacc/ss0 | 2 -- share/doc/psd/15.yacc/ss1 | 2 -- share/doc/psd/15.yacc/ss10 | 2 -- share/doc/psd/15.yacc/ss11 | 2 -- share/doc/psd/15.yacc/ss2 | 2 -- share/doc/psd/15.yacc/ss3 | 2 -- share/doc/psd/15.yacc/ss4 | 2 -- share/doc/psd/15.yacc/ss5 | 2 -- share/doc/psd/15.yacc/ss6 | 2 -- share/doc/psd/15.yacc/ss7 | 2 -- share/doc/psd/15.yacc/ss8 | 2 -- share/doc/psd/15.yacc/ss9 | 2 -- share/doc/psd/15.yacc/ss_ | 2 -- share/doc/psd/15.yacc/ssa | 2 -- share/doc/psd/15.yacc/ssb | 2 -- share/doc/psd/15.yacc/ssc | 2 -- share/doc/psd/15.yacc/ssd | 2 -- share/doc/psd/16.lex/lex.ms | 2 -- share/doc/psd/17.m4/m4.ms | 2 -- share/doc/psd/21.ipc/3.t | 2 -- share/doc/smm/01.setup/3.t | 2 -- share/doc/smm/03.fsck/0.t | 2 -- share/doc/smm/03.fsck/1.t | 2 -- share/doc/smm/03.fsck/2.t | 2 -- share/doc/smm/03.fsck/3.t | 2 -- share/doc/smm/03.fsck/4.t | 2 -- share/doc/smm/05.fastfs/3.t | 2 -- share/doc/smm/06.nfs/1.t | 2 -- share/doc/smm/06.nfs/2.t | 2 -- share/doc/smm/18.net/7.t | 2 -- share/doc/usd/07.mail/mail0.nr | 2 -- share/doc/usd/13.viref/vi.ref | 2 -- share/doc/usd/18.msdiffs/ms.diffs | 2 -- share/doc/usd/21.troff/m.mac | 2 -- share/doc/usd/21.troff/m0 | 2 -- share/doc/usd/21.troff/m0a | 2 -- share/doc/usd/21.troff/m1 | 2 -- share/doc/usd/21.troff/m2 | 2 -- share/doc/usd/21.troff/m3 | 2 -- share/doc/usd/21.troff/m4 | 2 -- share/doc/usd/21.troff/m5 | 2 -- share/doc/usd/21.troff/table1 | 2 -- share/doc/usd/21.troff/table2 | 2 -- share/doc/usd/22.trofftut/tt04 | 2 -- share/examples/mdoc/POSIX-copyright | 2 -- share/examples/scsi_target/scsi_target.8 | 2 -- share/examples/ses/getencstat/getencstat.0 | 2 -- share/examples/ses/sesd/sesd.0 | 2 -- share/examples/ses/setencstat/setencstat.0 | 2 -- share/examples/ses/setobjstat/setobjstat.0 | 2 -- share/man/man1/builtin.1 | 2 -- share/man/man3/ATOMIC_VAR_INIT.3 | 2 -- share/man/man3/CMSG_DATA.3 | 2 -- share/man/man3/Q_FRAWMASK.3 | 2 -- share/man/man3/Q_IFRAWMASK.3 | 2 -- share/man/man3/Q_INI.3 | 2 -- share/man/man3/Q_IRAWMASK.3 | 2 -- share/man/man3/Q_QABS.3 | 2 -- share/man/man3/Q_QADDI.3 | 2 -- share/man/man3/Q_QADDQ.3 | 2 -- share/man/man3/Q_SIGNED.3 | 2 -- share/man/man3/Q_SIGNSHFT.3 | 2 -- share/man/man3/arb.3 | 2 -- share/man/man3/makedev.3 | 2 -- share/man/man3/offsetof.3 | 2 -- share/man/man3/pthread.3 | 2 -- share/man/man3/pthread_affinity_np.3 | 2 -- share/man/man3/pthread_atfork.3 | 2 -- share/man/man3/pthread_attr.3 | 2 -- share/man/man3/pthread_attr_affinity_np.3 | 2 -- share/man/man3/pthread_attr_get_np.3 | 2 -- share/man/man3/pthread_attr_setcreatesuspend_np.3 | 2 -- share/man/man3/pthread_barrier_destroy.3 | 2 -- share/man/man3/pthread_barrierattr.3 | 2 -- share/man/man3/pthread_cleanup_pop.3 | 2 -- share/man/man3/pthread_cleanup_push.3 | 2 -- share/man/man3/pthread_cond_broadcast.3 | 2 -- share/man/man3/pthread_cond_destroy.3 | 2 -- share/man/man3/pthread_cond_init.3 | 2 -- share/man/man3/pthread_cond_signal.3 | 2 -- share/man/man3/pthread_cond_timedwait.3 | 2 -- share/man/man3/pthread_cond_wait.3 | 2 -- share/man/man3/pthread_condattr.3 | 2 -- share/man/man3/pthread_create.3 | 2 -- share/man/man3/pthread_detach.3 | 2 -- share/man/man3/pthread_equal.3 | 2 -- share/man/man3/pthread_exit.3 | 2 -- share/man/man3/pthread_getconcurrency.3 | 2 -- share/man/man3/pthread_getcpuclockid.3 | 2 -- share/man/man3/pthread_getspecific.3 | 2 -- share/man/man3/pthread_getthreadid_np.3 | 2 -- share/man/man3/pthread_join.3 | 2 -- share/man/man3/pthread_key_create.3 | 2 -- share/man/man3/pthread_key_delete.3 | 2 -- share/man/man3/pthread_kill.3 | 2 -- share/man/man3/pthread_main_np.3 | 2 -- share/man/man3/pthread_multi_np.3 | 2 -- share/man/man3/pthread_mutex_consistent.3 | 2 -- share/man/man3/pthread_mutex_destroy.3 | 2 -- share/man/man3/pthread_mutex_init.3 | 2 -- share/man/man3/pthread_mutex_lock.3 | 2 -- share/man/man3/pthread_mutex_timedlock.3 | 2 -- share/man/man3/pthread_mutex_trylock.3 | 2 -- share/man/man3/pthread_mutex_unlock.3 | 2 -- share/man/man3/pthread_mutexattr.3 | 2 -- share/man/man3/pthread_mutexattr_getkind_np.3 | 2 -- share/man/man3/pthread_once.3 | 2 -- share/man/man3/pthread_resume_all_np.3 | 2 -- share/man/man3/pthread_resume_np.3 | 2 -- share/man/man3/pthread_rwlock_destroy.3 | 2 -- share/man/man3/pthread_rwlock_init.3 | 2 -- share/man/man3/pthread_rwlock_rdlock.3 | 2 -- share/man/man3/pthread_rwlock_timedrdlock.3 | 2 -- share/man/man3/pthread_rwlock_timedwrlock.3 | 2 -- share/man/man3/pthread_rwlock_unlock.3 | 2 -- share/man/man3/pthread_rwlock_wrlock.3 | 2 -- share/man/man3/pthread_rwlockattr_destroy.3 | 2 -- share/man/man3/pthread_rwlockattr_getpshared.3 | 2 -- share/man/man3/pthread_rwlockattr_init.3 | 2 -- share/man/man3/pthread_rwlockattr_setpshared.3 | 2 -- share/man/man3/pthread_schedparam.3 | 2 -- share/man/man3/pthread_self.3 | 2 -- share/man/man3/pthread_set_name_np.3 | 2 -- share/man/man3/pthread_setspecific.3 | 2 -- share/man/man3/pthread_sigmask.3 | 2 -- share/man/man3/pthread_spin_init.3 | 2 -- share/man/man3/pthread_spin_lock.3 | 2 -- share/man/man3/pthread_suspend_all_np.3 | 2 -- share/man/man3/pthread_suspend_np.3 | 2 -- share/man/man3/pthread_switch_add_np.3 | 2 -- share/man/man3/pthread_yield.3 | 2 -- share/man/man3/qmath.3 | 2 -- share/man/man3/sigevent.3 | 2 -- share/man/man3/siginfo.3 | 2 -- share/man/man3/snl.3 | 2 -- share/man/man3/stats.3 | 2 -- share/man/man3/sysexits.3 | 2 -- share/man/man3/tgmath.3 | 2 -- share/man/man3/timeradd.3 | 2 -- share/man/man3/tree.3 | 2 -- share/man/man3lua/intro.3lua | 2 -- share/man/man4/aac.4 | 2 -- share/man/man4/aacraid.4 | 2 -- share/man/man4/acpi.4 | 2 -- share/man/man4/acpi_asus.4 | 2 -- share/man/man4/acpi_asus_wmi.4 | 2 -- share/man/man4/acpi_battery.4 | 2 -- share/man/man4/acpi_dock.4 | 2 -- share/man/man4/acpi_fujitsu.4 | 2 -- share/man/man4/acpi_ged.4 | 2 -- share/man/man4/acpi_hp.4 | 2 -- share/man/man4/acpi_ibm.4 | 2 -- share/man/man4/acpi_panasonic.4 | 2 -- share/man/man4/acpi_rapidstart.4 | 2 -- share/man/man4/acpi_sony.4 | 2 -- share/man/man4/acpi_thermal.4 | 2 -- share/man/man4/acpi_toshiba.4 | 2 -- share/man/man4/acpi_video.4 | 2 -- share/man/man4/acpi_wmi.4 | 2 -- share/man/man4/ada.4 | 2 -- share/man/man4/adm6996fc.4 | 2 -- share/man/man4/ads111x.4 | 2 -- share/man/man4/ae.4 | 2 -- share/man/man4/aesni.4 | 2 -- share/man/man4/age.4 | 2 -- share/man/man4/agp.4 | 2 -- share/man/man4/ahc.4 | 2 -- share/man/man4/ahci.4 | 2 -- share/man/man4/ahd.4 | 2 -- share/man/man4/aio.4 | 2 -- share/man/man4/alc.4 | 2 -- share/man/man4/ale.4 | 2 -- share/man/man4/alpm.4 | 2 -- share/man/man4/altera_atse.4 | 2 -- share/man/man4/altera_avgen.4 | 2 -- share/man/man4/altera_jtag_uart.4 | 2 -- share/man/man4/altera_sdcard.4 | 2 -- share/man/man4/altq.4 | 2 -- share/man/man4/amdpm.4 | 2 -- share/man/man4/amdsbwd.4 | 2 -- share/man/man4/amdsmb.4 | 2 -- share/man/man4/amdsmn.4 | 2 -- share/man/man4/amdtemp.4 | 2 -- share/man/man4/amr.4 | 2 -- share/man/man4/an.4 | 2 -- share/man/man4/aout.4 | 2 -- share/man/man4/apic.4 | 2 -- share/man/man4/arcmsr.4 | 2 -- share/man/man4/asmc.4 | 2 -- share/man/man4/at45d.4 | 2 -- share/man/man4/ata.4 | 2 -- share/man/man4/ath.4 | 2 -- share/man/man4/ath_ahb.4 | 2 -- share/man/man4/ath_hal.4 | 2 -- share/man/man4/ath_pci.4 | 2 -- share/man/man4/atkbd.4 | 2 -- share/man/man4/atkbdc.4 | 2 -- share/man/man4/atp.4 | 2 -- share/man/man4/atrtc.4 | 2 -- share/man/man4/attimer.4 | 2 -- share/man/man4/audit.4 | 2 -- share/man/man4/auditpipe.4 | 2 -- share/man/man4/aue.4 | 2 -- share/man/man4/axe.4 | 2 -- share/man/man4/axge.4 | 2 -- share/man/man4/bce.4 | 2 -- share/man/man4/bcm5974.4 | 2 -- share/man/man4/bcma.4 | 2 -- share/man/man4/bfe.4 | 2 -- share/man/man4/bge.4 | 2 -- share/man/man4/bhnd.4 | 2 -- share/man/man4/bhnd_chipc.4 | 2 -- share/man/man4/bhnd_pmu.4 | 2 -- share/man/man4/bhndb.4 | 2 -- share/man/man4/bhndb_pci.4 | 2 -- share/man/man4/bhyve.4 | 2 -- share/man/man4/blackhole.4 | 2 -- share/man/man4/bnxt.4 | 2 -- share/man/man4/bpf.4 | 2 -- share/man/man4/bridge.4 | 2 -- share/man/man4/bwi.4 | 2 -- share/man/man4/bwn.4 | 2 -- share/man/man4/bxe.4 | 2 -- share/man/man4/bytgpio.4 | 2 -- share/man/man4/capsicum.4 | 2 -- share/man/man4/cardbus.4 | 2 -- share/man/man4/carp.4 | 2 -- share/man/man4/cas.4 | 2 -- share/man/man4/cc_cdg.4 | 2 -- share/man/man4/cc_chd.4 | 2 -- share/man/man4/cc_cubic.4 | 2 -- share/man/man4/cc_dctcp.4 | 2 -- share/man/man4/cc_hd.4 | 2 -- share/man/man4/cc_htcp.4 | 2 -- share/man/man4/cc_newreno.4 | 2 -- share/man/man4/cc_vegas.4 | 2 -- share/man/man4/ccd.4 | 2 -- share/man/man4/ccr.4 | 2 -- share/man/man4/cd.4 | 2 -- share/man/man4/cdceem.4 | 2 -- share/man/man4/cfi.4 | 2 -- share/man/man4/cfiscsi.4 | 2 -- share/man/man4/cfumass.4 | 2 -- share/man/man4/cgem.4 | 2 -- share/man/man4/chromebook_platform.4 | 2 -- share/man/man4/chvgpio.4 | 2 -- share/man/man4/cloudabi.4 | 2 -- share/man/man4/coretemp.4 | 2 -- share/man/man4/cp2112.4 | 2 -- share/man/man4/cpuctl.4 | 2 -- share/man/man4/cpufreq.4 | 2 -- share/man/man4/crypto.4 | 2 -- share/man/man4/ctl.4 | 2 -- share/man/man4/cue.4 | 2 -- share/man/man4/cxgb.4 | 2 -- share/man/man4/cxgbe.4 | 2 -- share/man/man4/cxgbev.4 | 2 -- share/man/man4/cyapa.4 | 2 -- share/man/man4/da.4 | 2 -- share/man/man4/dc.4 | 2 -- share/man/man4/dcons.4 | 2 -- share/man/man4/dcons_crom.4 | 2 -- share/man/man4/ddb.4 | 2 -- share/man/man4/devctl.4 | 2 -- share/man/man4/disk.4 | 2 -- share/man/man4/dpms.4 | 2 -- share/man/man4/ds1307.4 | 2 -- share/man/man4/ds3231.4 | 2 -- share/man/man4/dtrace_audit.4 | 2 -- share/man/man4/dtrace_io.4 | 2 -- share/man/man4/dtrace_ip.4 | 2 -- share/man/man4/dtrace_lockstat.4 | 2 -- share/man/man4/dtrace_proc.4 | 2 -- share/man/man4/dtrace_sched.4 | 2 -- share/man/man4/dtrace_sctp.4 | 2 -- share/man/man4/dtrace_tcp.4 | 2 -- share/man/man4/dtrace_udp.4 | 2 -- share/man/man4/dtrace_udplite.4 | 2 -- share/man/man4/dummynet.4 | 2 -- *** 32098 LINES SKIPPED *** From nobody Wed Aug 23 17:50: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 4RWDJ90Chkz4r9Tn; Wed, 23 Aug 2023 17:50: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 4RWDJ85Rgvz4VJQ; Wed, 23 Aug 2023 17:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JY6CUU/7DaTV0J20rRBwLaJHZyY0hgeKns3Vh4pA07Y=; b=gfxAByleNVtIkaI+N/zyWNs9Bzv+h2f/C/4cy2ytFe8WmavPOP02P5YDrTNPGeGGodoUtO MbvwdEHTMvlD4edaYD7sqGzh+fzGV2df5flOzXc5zQ8KKVbudd90mv6+CajxNZoKFGyaPC Sy6150o20vfEtmSGzhuxp8q42XhoQ22D1tEnfeNimUJCTrsBBAE2FFSGzu62sQh7bspBrn 2I7J4dEkB0Uww934UtvAPgDgWZGce9qOqEDeC+6qHmTLQs2BH+10mF1pPJqSXfd2nDrLd8 203wFZQhACQpKzNRBkJta9vFUsT0UvNKyNYkgMzUxQ+fLlls5vanQxNfHwrKvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JY6CUU/7DaTV0J20rRBwLaJHZyY0hgeKns3Vh4pA07Y=; b=gTqo/lwjccShB4gcf390zVEhSx5E25/7lC2Am2M+a18ioQrPRfCMv9KagwnpRG8Hf78OqW LVr167D+iejI2qP1dFLGv4SVcCb2W8ONl5BOWMNjfNNAH4uawno+uy6pRlf40lAKLxyXXM m/dWII2pLZnoC4pu/Lt/RsDk6WrQ9yXM3AfCOMSlQGorZStpWOJOXwJSYkrMCOmMngC3Zl RZCcRIMqOxDLBc6Uh39wR7wVAB5WP97yHaN6jcLDC45o3ohgs4fCRc6uUO7jbMhCCvE1S9 ewnB7EIFhGWX5X7PIFKfpZHEITS6vtwzDn9T60Chohn0HBytS5SSWuToTSPg3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813000; a=rsa-sha256; cv=none; b=kgVYauXENzeFASTuk6qqNcu5IMW27M+6XkqAGwfgd1TN9hwr867+dKzBjL+NlQZCiXW9Bz qcqalqGFxj7XZNGptQ85ObhdkHa7CId2GS3wS5yB31ttuMIgbKIlY2SZ4R/Zq3FeDSpZhA fVlR+pS6nGZW7W2h+6/770DebQ9QBhGBcB8NzpmZR//TEWaoLcRk4z9MT1vG3RBLaYbhn1 BwofiqNDzHgXUW+Jd6IOGbP1Mh5vjwrtguEIHsHqKqJTWrUNK+Nnvb/3LefknwD6jTCWd9 87Si9mfkS825gl1oAZL4D4I5dv36mmJQyAsOGvisR4avxc8I7kcDTGqZyfOAYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJ84St1zvN8; Wed, 23 Aug 2023 17:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHo0NE042162; Wed, 23 Aug 2023 17:50:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHo08g041452; Wed, 23 Aug 2023 17:50:00 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:00 GMT Message-Id: <202308231750.37NHo08g041452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 24115b70d6d6 - stable/13 - Remove $FreeBSD$: one-line nroff pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 24115b70d6d614ed7ac5cfc4f51fa9d6cfe8b1b2 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=24115b70d6d614ed7ac5cfc4f51fa9d6cfe8b1b2 commit 24115b70d6d614ed7ac5cfc4f51fa9d6cfe8b1b2 Author: Warner Losh AuthorDate: 2023-08-22 01:32:13 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:32 +0000 Remove $FreeBSD$: one-line nroff pattern Remove /^\.\\"\s*\$FreeBSD\$$\n/ Similar commit in main: (cherry picked from commit b2c76c41be32) --- bin/cat/cat.1 | 1 - bin/chflags/chflags.1 | 1 - bin/chmod/chmod.1 | 1 - bin/cp/cp.1 | 1 - bin/date/date.1 | 1 - bin/dd/dd.1 | 1 - bin/df/df.1 | 1 - bin/domainname/domainname.1 | 1 - bin/echo/echo.1 | 1 - bin/ed/ed.1 | 1 - bin/hostname/hostname.1 | 1 - bin/kill/kill.1 | 1 - bin/ln/ln.1 | 1 - bin/ln/symlink.7 | 1 - bin/ls/ls.1 | 1 - bin/mkdir/mkdir.1 | 1 - bin/mv/mv.1 | 1 - bin/pax/pax.1 | 1 - bin/ps/ps.1 | 1 - bin/pwd/pwd.1 | 1 - bin/realpath/realpath.1 | 1 - bin/rm/rm.1 | 1 - bin/rmdir/rmdir.1 | 1 - bin/sh/sh.1 | 1 - bin/sleep/sleep.1 | 1 - bin/stty/stty.1 | 1 - bin/sync/sync.8 | 1 - bin/test/test.1 | 1 - lib/libbluetooth/bluetooth.3 | 1 - lib/libc/compat-43/creat.2 | 1 - lib/libc/compat-43/gethostid.3 | 1 - lib/libc/compat-43/killpg.2 | 1 - lib/libc/compat-43/setruid.3 | 1 - lib/libc/compat-43/sigpause.2 | 1 - lib/libc/compat-43/sigsetmask.2 | 1 - lib/libc/compat-43/sigvec.2 | 1 - lib/libc/db/man/btree.3 | 1 - lib/libc/db/man/dbopen.3 | 1 - lib/libc/db/man/hash.3 | 1 - lib/libc/db/man/mpool.3 | 1 - lib/libc/db/man/recno.3 | 1 - lib/libc/gen/alarm.3 | 1 - lib/libc/gen/arc4random.3 | 1 - lib/libc/gen/clock.3 | 1 - lib/libc/gen/confstr.3 | 1 - lib/libc/gen/ctermid.3 | 1 - lib/libc/gen/daemon.3 | 1 - lib/libc/gen/devname.3 | 1 - lib/libc/gen/directory.3 | 1 - lib/libc/gen/dl_iterate_phdr.3 | 1 - lib/libc/gen/dlopen.3 | 1 - lib/libc/gen/err.3 | 1 - lib/libc/gen/exec.3 | 1 - lib/libc/gen/fnmatch.3 | 1 - lib/libc/gen/frexp.3 | 1 - lib/libc/gen/fts.3 | 1 - lib/libc/gen/getbootfile.3 | 1 - lib/libc/gen/getbsize.3 | 1 - lib/libc/gen/getcap.3 | 1 - lib/libc/gen/getcwd.3 | 1 - lib/libc/gen/getdiskbyname.3 | 1 - lib/libc/gen/getdomainname.3 | 1 - lib/libc/gen/getfsent.3 | 1 - lib/libc/gen/getgrent.3 | 1 - lib/libc/gen/getgrouplist.3 | 1 - lib/libc/gen/gethostname.3 | 1 - lib/libc/gen/getloadavg.3 | 1 - lib/libc/gen/getmntinfo.3 | 1 - lib/libc/gen/getnetgrent.3 | 1 - lib/libc/gen/getpagesize.3 | 1 - lib/libc/gen/getpass.3 | 1 - lib/libc/gen/getpwent.3 | 1 - lib/libc/gen/getttyent.3 | 1 - lib/libc/gen/getusershell.3 | 1 - lib/libc/gen/getvfsbyname.3 | 1 - lib/libc/gen/glob.3 | 1 - lib/libc/gen/initgroups.3 | 1 - lib/libc/gen/ldexp.3 | 1 - lib/libc/gen/modf.3 | 1 - lib/libc/gen/nice.3 | 1 - lib/libc/gen/nlist.3 | 1 - lib/libc/gen/pause.3 | 1 - lib/libc/gen/popen.3 | 1 - lib/libc/gen/psignal.3 | 1 - lib/libc/gen/raise.3 | 1 - lib/libc/gen/rand48.3 | 1 - lib/libc/gen/scandir.3 | 1 - lib/libc/gen/setjmp.3 | 1 - lib/libc/gen/setmode.3 | 1 - lib/libc/gen/siginterrupt.3 | 1 - lib/libc/gen/signal.3 | 1 - lib/libc/gen/sigsetops.3 | 1 - lib/libc/gen/sleep.3 | 1 - lib/libc/gen/strtofflags.3 | 1 - lib/libc/gen/sysconf.3 | 1 - lib/libc/gen/sysctl.3 | 1 - lib/libc/gen/syslog.3 | 1 - lib/libc/gen/tcgetpgrp.3 | 1 - lib/libc/gen/tcsendbreak.3 | 1 - lib/libc/gen/tcsetattr.3 | 1 - lib/libc/gen/tcsetpgrp.3 | 1 - lib/libc/gen/time.3 | 1 - lib/libc/gen/times.3 | 1 - lib/libc/gen/timezone.3 | 1 - lib/libc/gen/ttyname.3 | 1 - lib/libc/gen/tzset.3 | 1 - lib/libc/gen/ualarm.3 | 1 - lib/libc/gen/uname.3 | 1 - lib/libc/gen/usleep.3 | 1 - lib/libc/gen/utime.3 | 1 - lib/libc/gen/valloc.3 | 1 - lib/libc/gmon/moncontrol.3 | 1 - lib/libc/i386/sys/i386_get_ldt.2 | 1 - lib/libc/iconv/iconv.3 | 1 - lib/libc/locale/ctype.3 | 1 - lib/libc/locale/digittoint.3 | 1 - lib/libc/locale/euc.5 | 1 - lib/libc/locale/isalnum.3 | 1 - lib/libc/locale/isalpha.3 | 1 - lib/libc/locale/isascii.3 | 1 - lib/libc/locale/isblank.3 | 1 - lib/libc/locale/iscntrl.3 | 1 - lib/libc/locale/isdigit.3 | 1 - lib/libc/locale/isgraph.3 | 1 - lib/libc/locale/islower.3 | 1 - lib/libc/locale/isprint.3 | 1 - lib/libc/locale/ispunct.3 | 1 - lib/libc/locale/isspace.3 | 1 - lib/libc/locale/isupper.3 | 1 - lib/libc/locale/iswalnum.3 | 1 - lib/libc/locale/isxdigit.3 | 1 - lib/libc/locale/localeconv.3 | 1 - lib/libc/locale/mblen.3 | 1 - lib/libc/locale/mbstowcs.3 | 1 - lib/libc/locale/mbtowc.3 | 1 - lib/libc/locale/multibyte.3 | 1 - lib/libc/locale/setlocale.3 | 1 - lib/libc/locale/toascii.3 | 1 - lib/libc/locale/tolower.3 | 1 - lib/libc/locale/toupper.3 | 1 - lib/libc/locale/towlower.3 | 1 - lib/libc/locale/towupper.3 | 1 - lib/libc/locale/utf8.5 | 1 - lib/libc/locale/wcstombs.3 | 1 - lib/libc/locale/wctomb.3 | 1 - lib/libc/net/byteorder.3 | 1 - lib/libc/net/gethostbyname.3 | 1 - lib/libc/net/getipnodebyname.3 | 1 - lib/libc/net/getnetent.3 | 1 - lib/libc/net/getprotoent.3 | 1 - lib/libc/net/getservent.3 | 1 - lib/libc/net/inet.3 | 1 - lib/libc/net/linkaddr.3 | 1 - lib/libc/net/rcmd.3 | 1 - lib/libc/net/resolver.3 | 1 - lib/libc/net/sctp_bindx.3 | 1 - lib/libc/net/sctp_freepaddrs.3 | 1 - lib/libc/net/sctp_getaddrlen.3 | 1 - lib/libc/net/sctp_getpaddrs.3 | 1 - lib/libc/net/sctp_opt_info.3 | 1 - lib/libc/net/sctp_sendmsg.3 | 1 - lib/libc/regex/re_format.7 | 1 - lib/libc/regex/regex.3 | 1 - lib/libc/rpc/bindresvport.3 | 1 - lib/libc/rpc/des_crypt.3 | 1 - lib/libc/rpc/getnetconfig.3 | 1 - lib/libc/rpc/getnetpath.3 | 1 - lib/libc/rpc/getrpcent.3 | 1 - lib/libc/rpc/getrpcport.3 | 1 - lib/libc/rpc/netconfig.5 | 1 - lib/libc/rpc/publickey.3 | 1 - lib/libc/rpc/publickey.5 | 1 - lib/libc/rpc/rpc.3 | 1 - lib/libc/rpc/rpc.5 | 1 - lib/libc/rpc/rpc_clnt_auth.3 | 1 - lib/libc/rpc/rpc_clnt_calls.3 | 1 - lib/libc/rpc/rpc_clnt_create.3 | 1 - lib/libc/rpc/rpc_secure.3 | 1 - lib/libc/rpc/rpc_soc.3 | 1 - lib/libc/rpc/rpc_svc_calls.3 | 1 - lib/libc/rpc/rpc_svc_create.3 | 1 - lib/libc/rpc/rpc_svc_err.3 | 1 - lib/libc/rpc/rpc_svc_reg.3 | 1 - lib/libc/rpc/rpc_xdr.3 | 1 - lib/libc/rpc/rpcbind.3 | 1 - lib/libc/rpc/rtime.3 | 1 - lib/libc/stdio/fclose.3 | 1 - lib/libc/stdio/ferror.3 | 1 - lib/libc/stdio/fflush.3 | 1 - lib/libc/stdio/fgetln.3 | 1 - lib/libc/stdio/fgets.3 | 1 - lib/libc/stdio/fgetwln.3 | 1 - lib/libc/stdio/fgetws.3 | 1 - lib/libc/stdio/fopen.3 | 1 - lib/libc/stdio/fputs.3 | 1 - lib/libc/stdio/fputws.3 | 1 - lib/libc/stdio/fread.3 | 1 - lib/libc/stdio/fseek.3 | 1 - lib/libc/stdio/funopen.3 | 1 - lib/libc/stdio/fwide.3 | 1 - lib/libc/stdio/getc.3 | 1 - lib/libc/stdio/getwc.3 | 1 - lib/libc/stdio/mktemp.3 | 1 - lib/libc/stdio/printf.3 | 1 - lib/libc/stdio/putc.3 | 1 - lib/libc/stdio/putwc.3 | 1 - lib/libc/stdio/remove.3 | 1 - lib/libc/stdio/scanf.3 | 1 - lib/libc/stdio/setbuf.3 | 1 - lib/libc/stdio/stdio.3 | 1 - lib/libc/stdio/tmpnam.3 | 1 - lib/libc/stdio/ungetc.3 | 1 - lib/libc/stdio/ungetwc.3 | 1 - lib/libc/stdio/wprintf.3 | 1 - lib/libc/stdio/wscanf.3 | 1 - lib/libc/stdlib/abort.3 | 1 - lib/libc/stdlib/abs.3 | 1 - lib/libc/stdlib/alloca.3 | 1 - lib/libc/stdlib/atexit.3 | 1 - lib/libc/stdlib/atof.3 | 1 - lib/libc/stdlib/atoi.3 | 1 - lib/libc/stdlib/atol.3 | 1 - lib/libc/stdlib/bsearch.3 | 1 - lib/libc/stdlib/div.3 | 1 - lib/libc/stdlib/exit.3 | 1 - lib/libc/stdlib/getenv.3 | 1 - lib/libc/stdlib/getopt.3 | 1 - lib/libc/stdlib/getopt_long.3 | 1 - lib/libc/stdlib/getsubopt.3 | 1 - lib/libc/stdlib/labs.3 | 1 - lib/libc/stdlib/ldiv.3 | 1 - lib/libc/stdlib/memory.3 | 1 - lib/libc/stdlib/qsort.3 | 1 - lib/libc/stdlib/radixsort.3 | 1 - lib/libc/stdlib/rand.3 | 1 - lib/libc/stdlib/random.3 | 1 - lib/libc/stdlib/reallocf.3 | 1 - lib/libc/stdlib/realpath.3 | 1 - lib/libc/stdlib/strtod.3 | 1 - lib/libc/stdlib/strtol.3 | 1 - lib/libc/stdlib/strtonum.3 | 1 - lib/libc/stdlib/strtoul.3 | 1 - lib/libc/stdlib/system.3 | 1 - lib/libc/stdlib/tsearch.3 | 1 - lib/libc/stdtime/ctime.3 | 1 - lib/libc/stdtime/strftime.3 | 1 - lib/libc/string/bcmp.3 | 1 - lib/libc/string/bcopy.3 | 1 - lib/libc/string/bstring.3 | 1 - lib/libc/string/bzero.3 | 1 - lib/libc/string/ffs.3 | 1 - lib/libc/string/index.3 | 1 - lib/libc/string/memccpy.3 | 1 - lib/libc/string/memchr.3 | 1 - lib/libc/string/memcmp.3 | 1 - lib/libc/string/memcpy.3 | 1 - lib/libc/string/memmove.3 | 1 - lib/libc/string/memset.3 | 1 - lib/libc/string/strcasecmp.3 | 1 - lib/libc/string/strcat.3 | 1 - lib/libc/string/strchr.3 | 1 - lib/libc/string/strcmp.3 | 1 - lib/libc/string/strcoll.3 | 1 - lib/libc/string/strcpy.3 | 1 - lib/libc/string/strdup.3 | 1 - lib/libc/string/strerror.3 | 1 - lib/libc/string/string.3 | 1 - lib/libc/string/strlen.3 | 1 - lib/libc/string/strmode.3 | 1 - lib/libc/string/strpbrk.3 | 1 - lib/libc/string/strsep.3 | 1 - lib/libc/string/strspn.3 | 1 - lib/libc/string/strstr.3 | 1 - lib/libc/string/strtok.3 | 1 - lib/libc/string/strxfrm.3 | 1 - lib/libc/string/swab.3 | 1 - lib/libc/string/wcscoll.3 | 1 - lib/libc/string/wcsxfrm.3 | 1 - lib/libc/sys/_exit.2 | 1 - lib/libc/sys/accept.2 | 1 - lib/libc/sys/access.2 | 1 - lib/libc/sys/acct.2 | 1 - lib/libc/sys/adjtime.2 | 1 - lib/libc/sys/bind.2 | 1 - lib/libc/sys/brk.2 | 1 - lib/libc/sys/chdir.2 | 1 - lib/libc/sys/chflags.2 | 1 - lib/libc/sys/chmod.2 | 1 - lib/libc/sys/chown.2 | 1 - lib/libc/sys/chroot.2 | 1 - lib/libc/sys/close.2 | 1 - lib/libc/sys/connect.2 | 1 - lib/libc/sys/dup.2 | 1 - lib/libc/sys/execve.2 | 1 - lib/libc/sys/fcntl.2 | 1 - lib/libc/sys/flock.2 | 1 - lib/libc/sys/fork.2 | 1 - lib/libc/sys/fsync.2 | 1 - lib/libc/sys/getdirentries.2 | 1 - lib/libc/sys/getdtablesize.2 | 1 - lib/libc/sys/getfh.2 | 1 - lib/libc/sys/getfsstat.2 | 1 - lib/libc/sys/getgid.2 | 1 - lib/libc/sys/getgroups.2 | 1 - lib/libc/sys/getitimer.2 | 1 - lib/libc/sys/getlogin.2 | 1 - lib/libc/sys/getpeername.2 | 1 - lib/libc/sys/getpgrp.2 | 1 - lib/libc/sys/getpid.2 | 1 - lib/libc/sys/getpriority.2 | 1 - lib/libc/sys/getrlimit.2 | 1 - lib/libc/sys/getrusage.2 | 1 - lib/libc/sys/getsockname.2 | 1 - lib/libc/sys/getsockopt.2 | 1 - lib/libc/sys/gettimeofday.2 | 1 - lib/libc/sys/getuid.2 | 1 - lib/libc/sys/intro.2 | 1 - lib/libc/sys/kill.2 | 1 - lib/libc/sys/ktrace.2 | 1 - lib/libc/sys/link.2 | 1 - lib/libc/sys/listen.2 | 1 - lib/libc/sys/lseek.2 | 1 - lib/libc/sys/madvise.2 | 1 - lib/libc/sys/mincore.2 | 1 - lib/libc/sys/minherit.2 | 1 - lib/libc/sys/mkdir.2 | 1 - lib/libc/sys/mkfifo.2 | 1 - lib/libc/sys/mknod.2 | 1 - lib/libc/sys/mlock.2 | 1 - lib/libc/sys/mmap.2 | 1 - lib/libc/sys/mount.2 | 1 - lib/libc/sys/mprotect.2 | 1 - lib/libc/sys/msgget.2 | 1 - lib/libc/sys/msgrcv.2 | 1 - lib/libc/sys/msync.2 | 1 - lib/libc/sys/munmap.2 | 1 - lib/libc/sys/nanosleep.2 | 1 - lib/libc/sys/nfssvc.2 | 1 - lib/libc/sys/open.2 | 1 - lib/libc/sys/pathconf.2 | 1 - lib/libc/sys/pipe.2 | 1 - lib/libc/sys/poll.2 | 1 - lib/libc/sys/posix_fadvise.2 | 1 - lib/libc/sys/posix_fallocate.2 | 1 - lib/libc/sys/profil.2 | 1 - lib/libc/sys/ptrace.2 | 1 - lib/libc/sys/quotactl.2 | 1 - lib/libc/sys/read.2 | 1 - lib/libc/sys/readlink.2 | 1 - lib/libc/sys/reboot.2 | 1 - lib/libc/sys/recv.2 | 1 - lib/libc/sys/rename.2 | 1 - lib/libc/sys/revoke.2 | 1 - lib/libc/sys/rmdir.2 | 1 - lib/libc/sys/sched_setparam.2 | 1 - lib/libc/sys/sched_setscheduler.2 | 1 - lib/libc/sys/sched_yield.2 | 1 - lib/libc/sys/select.2 | 1 - lib/libc/sys/send.2 | 1 - lib/libc/sys/setgroups.2 | 1 - lib/libc/sys/setpgid.2 | 1 - lib/libc/sys/setregid.2 | 1 - lib/libc/sys/setreuid.2 | 1 - lib/libc/sys/setsid.2 | 1 - lib/libc/sys/setuid.2 | 1 - lib/libc/sys/shutdown.2 | 1 - lib/libc/sys/sigaction.2 | 1 - lib/libc/sys/sigaltstack.2 | 1 - lib/libc/sys/sigpending.2 | 1 - lib/libc/sys/sigprocmask.2 | 1 - lib/libc/sys/sigreturn.2 | 1 - lib/libc/sys/sigstack.2 | 1 - lib/libc/sys/sigsuspend.2 | 1 - lib/libc/sys/socket.2 | 1 - lib/libc/sys/socketpair.2 | 1 - lib/libc/sys/stat.2 | 1 - lib/libc/sys/statfs.2 | 1 - lib/libc/sys/swapon.2 | 1 - lib/libc/sys/symlink.2 | 1 - lib/libc/sys/sync.2 | 1 - lib/libc/sys/sysarch.2 | 1 - lib/libc/sys/syscall.2 | 1 - lib/libc/sys/truncate.2 | 1 - lib/libc/sys/umask.2 | 1 - lib/libc/sys/undelete.2 | 1 - lib/libc/sys/unlink.2 | 1 - lib/libc/sys/utimensat.2 | 1 - lib/libc/sys/utimes.2 | 1 - lib/libc/sys/vfork.2 | 1 - lib/libc/sys/wait.2 | 1 - lib/libc/sys/write.2 | 1 - lib/libc/xdr/xdr.3 | 1 - lib/libcompat/4.1/ftime.3 | 1 - lib/libcompat/4.3/re_comp.3 | 1 - lib/libcompat/4.3/rexec.3 | 1 - lib/libcuse/cuse.3 | 1 - lib/libkvm/kvm.3 | 1 - lib/libkvm/kvm_geterr.3 | 1 - lib/libkvm/kvm_getloadavg.3 | 1 - lib/libkvm/kvm_getprocs.3 | 1 - lib/libkvm/kvm_nlist.3 | 1 - lib/libkvm/kvm_open.3 | 1 - lib/libkvm/kvm_read.3 | 1 - lib/libmd/md4.copyright | 1 - lib/libmd/md5.copyright | 1 - lib/libmd/ripemd.3 | 1 - lib/libmd/sha.3 | 1 - lib/libmd/sha256.3 | 1 - lib/libmd/sha512.3 | 1 - lib/libpam/modules/pam_krb5/pam_krb5.8 | 1 - lib/librss/librss.3 | 1 - lib/libsdp/sdp.3 | 1 - lib/libutil/fparseln.3 | 1 - lib/libutil/humanize_number.3 | 1 - lib/libxo/add.man | 1 - lib/msun/man/acos.3 | 1 - lib/msun/man/acosh.3 | 1 - lib/msun/man/asin.3 | 1 - lib/msun/man/asinh.3 | 1 - lib/msun/man/atan.3 | 1 - lib/msun/man/atan2.3 | 1 - lib/msun/man/atanh.3 | 1 - lib/msun/man/ceil.3 | 1 - lib/msun/man/copysign.3 | 1 - lib/msun/man/cos.3 | 1 - lib/msun/man/cosh.3 | 1 - lib/msun/man/cpow.3 | 1 - lib/msun/man/erf.3 | 1 - lib/msun/man/exp.3 | 1 - lib/msun/man/fabs.3 | 1 - lib/msun/man/floor.3 | 1 - lib/msun/man/fmod.3 | 1 - lib/msun/man/hypot.3 | 1 - lib/msun/man/ieee.3 | 1 - lib/msun/man/ieee_test.3 | 1 - lib/msun/man/ilogb.3 | 1 - lib/msun/man/j0.3 | 1 - lib/msun/man/lgamma.3 | 1 - lib/msun/man/math.3 | 1 - lib/msun/man/nextafter.3 | 1 - lib/msun/man/remainder.3 | 1 - lib/msun/man/rint.3 | 1 - lib/msun/man/scalbn.3 | 1 - lib/msun/man/sin.3 | 1 - lib/msun/man/sinh.3 | 1 - lib/msun/man/sqrt.3 | 1 - lib/msun/man/tan.3 | 1 - lib/msun/man/tanh.3 | 1 - libexec/atrun/atrun.man | 1 - libexec/bootpd/tools/bootpef/bootpef.8 | 1 - libexec/bootpd/tools/bootptest/bootptest.8 | 1 - libexec/comsat/comsat.8 | 1 - libexec/fingerd/fingerd.8 | 1 - libexec/ftpd/ftpd.8 | 1 - libexec/getty/getty.8 | 1 - libexec/getty/gettytab.5 | 1 - libexec/getty/ttys.5 | 1 - libexec/rbootd/rbootd.8 | 1 - libexec/talkd/talkd.8 | 1 - libexec/tftpd/tftpd.8 | 1 - sbin/bsdlabel/bsdlabel.8 | 1 - sbin/ccdconfig/ccdconfig.8 | 1 - sbin/clri/clri.8 | 1 - sbin/comcontrol/comcontrol.8 | 1 - sbin/dmesg/dmesg.8 | 1 - sbin/dump/dump.8 | 1 - sbin/dumpfs/dumpfs.8 | 1 - sbin/dumpon/dumpon.8 | 1 - sbin/fdisk/fdisk.8 | 1 - sbin/ffsinfo/ffsinfo.8 | 1 - sbin/fsck_ffs/fsck_ffs.8 | 1 - sbin/fsirand/fsirand.8 | 1 - sbin/growfs/growfs.8 | 1 - sbin/ifconfig/ifconfig.8 | 1 - sbin/init/init.8 | 1 - sbin/ipf/ipf/ipf.4 | 1 - sbin/ipf/ipf/ipf.5 | 1 - sbin/ipf/ipf/ipf.8 | 1 - sbin/ipf/ipf/ipfilter.4 | 1 - sbin/ipf/ipf/ipfilter.5 | 1 - sbin/ipf/ipf/ipl.4 | 1 - sbin/ipf/ipfs/ipfs.8 | 1 - sbin/ipf/ipfstat/ipfstat.8 | 1 - sbin/ipf/ipftest/ipftest.1 | 1 - sbin/ipf/ipmon/ipmon.5 | 1 - sbin/ipf/ipmon/ipmon.8 | 1 - sbin/ipf/ipnat/ipnat.4 | 1 - sbin/ipf/ipnat/ipnat.5 | 1 - sbin/ipf/ipnat/ipnat.8 | 1 - sbin/ipf/ippool/ippool.5 | 1 - sbin/ipf/ippool/ippool.8 | 1 - sbin/ipf/ipscan/ipscan.5 | 1 - sbin/ipf/ipscan/ipscan.8 | 1 - sbin/ipf/ipsend/ipresend.1 | 1 - sbin/ipf/ipsend/ipsend.1 | 1 - sbin/ipf/ipsend/ipsend.5 | 1 - sbin/ipf/ipsend/iptest.1 | 1 - sbin/md5/md5.1 | 1 - sbin/mknod/mknod.8 | 1 - sbin/mount/mount.8 | 1 - sbin/mount_cd9660/mount_cd9660.8 | 1 - sbin/mount_nfs/mount_nfs.8 | 1 - sbin/mount_nullfs/mount_nullfs.8 | 1 - sbin/mount_unionfs/mount_unionfs.8 | 1 - sbin/natd/natd.8 | 1 - sbin/newfs/newfs.8 | 1 - sbin/nfsiod/nfsiod.8 | 1 - sbin/ping/ping.8 | 1 - sbin/quotacheck/quotacheck.8 | 1 - sbin/reboot/reboot.8 | 1 - sbin/restore/restore.8 | 1 - sbin/route/route.8 | 1 - sbin/routed/routed.8 | 1 - sbin/routed/rtquery/rtquery.8 | 1 - sbin/savecore/savecore.8 | 1 - sbin/shutdown/shutdown.8 | 1 - sbin/swapon/swapon.8 | 1 - sbin/sysctl/sysctl.8 | 1 - sbin/tunefs/tunefs.8 | 1 - sbin/umount/umount.8 | 1 - share/doc/papers/beyond4.3/beyond43.ms | 1 - share/doc/papers/devfs/paper.me | 1 - share/doc/papers/diskperf/conclusions.ms | 1 - share/doc/papers/diskperf/tests.ms | 1 - share/doc/papers/fsinterface/fsinterface.ms | 1 - share/doc/papers/kernmalloc/appendix.ms | 1 - share/doc/papers/kernmalloc/kernmalloc.t | 1 - share/doc/papers/kerntune/1.t | 1 - share/doc/papers/newvm/1.t | 1 - share/doc/papers/newvm/a.t | 1 - share/doc/papers/relengr/0.t | 1 - share/doc/papers/sysperf/appendix.ms | 2 -- share/doc/papers/timecounter/tmac.usenix | 1 - share/doc/psd/04.uprog/p.mac | 1 - share/doc/psd/04.uprog/p0 | 1 - share/doc/psd/04.uprog/p1 | 1 - share/doc/psd/04.uprog/p2 | 1 - share/doc/psd/04.uprog/p3 | 1 - share/doc/psd/04.uprog/p4 | 1 - share/doc/psd/04.uprog/p5 | 1 - share/doc/psd/04.uprog/p6 | 1 - share/doc/psd/04.uprog/p8 | 1 - share/doc/psd/04.uprog/p9 | 1 - share/doc/psd/05.sysman/1.1.t | 1 - share/doc/psd/05.sysman/1.2.t | 1 - share/doc/psd/05.sysman/2.3.t | 1 - share/doc/psd/12.make/stubs | 1 - share/doc/psd/12.make/tutorial.ms | 1 - share/doc/psd/21.ipc/4.t | 1 - share/doc/psd/21.ipc/5.t | 1 - share/doc/psd/22.rpcgen/rpcgen.ms | 1 - share/doc/psd/22.rpcgen/stubs | 1 - share/doc/psd/23.rpc/rpc.prog.ms | 1 - share/doc/psd/23.rpc/stubs | 1 - share/doc/psd/24.xdr/stubs | 1 - share/doc/psd/24.xdr/xdr.nts.ms | 1 - share/doc/psd/25.xdrrfc/stubs | 1 - share/doc/psd/25.xdrrfc/xdr.rfc.ms | 1 - share/doc/psd/26.rpcrfc/rpc.rfc.ms | 1 - share/doc/psd/26.rpcrfc/stubs | 1 - share/doc/psd/27.nfsrpc/nfs.rfc.ms | 1 - share/doc/psd/27.nfsrpc/stubs | 1 - share/doc/psd/contents/contents.ms | 1 - share/doc/psd/title/Title | 1 - share/doc/smm/01.setup/0.t | 1 - share/doc/smm/01.setup/2.t | 1 - share/doc/smm/01.setup/4.t | 1 - share/doc/smm/01.setup/5.t | 1 - share/doc/smm/01.setup/stubs | 1 - share/doc/smm/02.config/6.t | 1 - share/doc/smm/12.timed/timed.ms | 1 - share/doc/smm/contents/contents.ms | 1 - share/doc/smm/title/Title | 1 - share/doc/usd/04.csh/csh.1 | 1 - share/doc/usd/04.csh/csh.2 | 1 - share/doc/usd/04.csh/csh.3 | 1 - share/doc/usd/04.csh/csh.4 | 1 - share/doc/usd/04.csh/csh.a | 1 - share/doc/usd/04.csh/csh.g | 1 - share/doc/usd/04.csh/tabs | 1 - share/doc/usd/05.dc/dc | 1 - share/doc/usd/06.bc/bc | 1 - share/doc/usd/07.mail/mail5.nr | 1 - share/doc/usd/10.exref/exref/ex.rm | 1 - share/doc/usd/22.trofftut/tt.mac | 1 - share/doc/usd/22.trofftut/tt00 | 1 - share/doc/usd/22.trofftut/tt01 | 1 - share/doc/usd/22.trofftut/tt02 | 1 - share/doc/usd/22.trofftut/tt03 | 1 - share/doc/usd/22.trofftut/tt05 | 1 - share/doc/usd/22.trofftut/tt06 | 1 - share/doc/usd/22.trofftut/tt07 | 1 - share/doc/usd/22.trofftut/tt08 | 1 - share/doc/usd/22.trofftut/tt09 | 1 - share/doc/usd/22.trofftut/tt10 | 1 - share/doc/usd/22.trofftut/tt11 | 1 - share/doc/usd/22.trofftut/tt12 | 1 - share/doc/usd/22.trofftut/tt13 | 1 - share/doc/usd/22.trofftut/tt14 | 1 - share/doc/usd/22.trofftut/ttack | 1 - share/doc/usd/22.trofftut/ttcharset | 1 - share/doc/usd/22.trofftut/ttindex | 1 - share/doc/usd/contents/contents.ms | 1 - share/doc/usd/title/Title | 1 - share/examples/ipfilter/mkfilters.1 | 1 - share/man/man1/intro.1 | 1 - share/man/man3/assert.3 | 1 - share/man/man3/bitstring.3 | 1 - share/man/man3/end.3 | 1 - share/man/man3/fpgetround.3 | 1 - share/man/man3/intro.3 | 1 - share/man/man3/pthread_cancel.3 | 1 - share/man/man3/pthread_testcancel.3 | 1 - share/man/man3/queue.3 | 1 - share/man/man3/stdarg.3 | 1 - share/man/man4/aibs.4 | 1 - share/man/man4/cdce.4 | 1 - share/man/man4/ch.4 | 1 - share/man/man4/ciss.4 | 1 - share/man/man4/disc.4 | 1 - share/man/man4/divert.4 | 1 - share/man/man4/edsc.4 | 1 - share/man/man4/fd.4 | 1 - share/man/man4/hv_kvp.4 | 1 - share/man/man4/hv_netvsc.4 | 1 - share/man/man4/hv_storvsc.4 | 1 - share/man/man4/hv_utils.4 | 1 - share/man/man4/hv_vmbus.4 | 1 - share/man/man4/icmp.4 | 1 - share/man/man4/ida.4 | 1 - share/man/man4/iflib.4 | 1 - share/man/man4/iir.4 | 1 - share/man/man4/inet.4 | 1 - share/man/man4/ip.4 | 1 - share/man/man4/kbdmux.4 | 1 - share/man/man4/le.4 | 1 - share/man/man4/liquidio.4 | 1 - share/man/man4/lo.4 | 1 - share/man/man4/lp.4 | 1 - share/man/man4/man4.i386/cp.4 | 1 - share/man/man4/man4.i386/npx.4 | 1 - share/man/man4/man4.powerpc/ofw_console.4 | 1 - share/man/man4/mem.4 | 1 - share/man/man4/mpr.4 | 1 - share/man/man4/mps.4 | 1 - share/man/man4/mtio.4 | 1 - share/man/man4/netgraph.4 | 1 - share/man/man4/netintro.4 | 1 - share/man/man4/ng_bluetooth.4 | 1 - share/man/man4/ng_btsocket.4 | 1 - share/man/man4/ng_h4.4 | 1 - share/man/man4/ng_hci.4 | 1 - share/man/man4/ng_l2cap.4 | 1 - share/man/man4/ng_mppc.4 | 1 - share/man/man4/ng_source.4 | 1 - share/man/man4/ng_sppp.4 | 1 - share/man/man4/ng_ubt.4 | 1 - share/man/man4/null.4 | 1 - share/man/man4/otus.4 | 1 - share/man/man4/otusfw.4 | 1 - share/man/man4/pts.4 | 1 - share/man/man4/route.4 | 1 - share/man/man4/rsu.4 | 1 - share/man/man4/rsufw.4 | 1 - share/man/man4/tap.4 | 1 - share/man/man4/tcp.4 | 1 - share/man/man4/termios.4 | 1 - share/man/man4/tty.4 | 1 - share/man/man4/tun.4 | 1 - share/man/man4/ubtbcmfw.4 | 1 - share/man/man4/udl.4 | 1 - share/man/man4/udp.4 | 1 - share/man/man4/unix.4 | 1 - share/man/man4/upgt.4 | 1 - share/man/man4/usb_template.4 | 1 - share/man/man4/vkbd.4 | 1 - share/man/man4/zyd.4 | 1 - share/man/man5/a.out.5 | 1 - share/man/man5/acct.5 | 1 - share/man/man5/bluetooth.hosts.5 | 1 - share/man/man5/bluetooth.protocols.5 | 1 - share/man/man5/core.5 | 1 - share/man/man5/dir.5 | 1 - share/man/man5/disktab.5 | 1 - share/man/man5/fs.5 | 1 - share/man/man5/fstab.5 | 1 - share/man/man5/group.5 | 1 - share/man/man5/hosts.5 | 1 - share/man/man5/linprocfs.5 | 1 - share/man/man5/motd.5 | 1 - share/man/man5/msdosfs.5 | 1 - share/man/man5/networks.5 | 1 - share/man/man5/passwd.5 | 1 - share/man/man5/pf.conf.5 | 1 - share/man/man5/phones.5 | 1 - share/man/man5/procfs.5 | 1 - share/man/man5/protocols.5 | 1 - share/man/man5/remote.5 | 1 - share/man/man5/resolver.5 | 1 - share/man/man5/services.5 | 1 - share/man/man5/shells.5 | 1 - share/man/man5/src.conf.5 | 1 - share/man/man5/stab.5 | 1 - share/man/man7/ascii.7 | 1 - share/man/man7/environ.7 | 1 - share/man/man7/hier.7 | 1 - share/man/man7/hostname.7 | 1 - share/man/man7/intro.7 | 1 - share/man/man7/operator.7 | 1 - share/man/man7/sdoc.7 | 1 - share/man/man7/sticky.7 | 1 - share/man/man7/tests.7 | 1 - share/man/man8/intro.8 | 1 - share/man/man8/rc.8 | 1 - share/man/man8/yp.8 | 1 - share/man/man9/EVENTHANDLER.9 | 1 - share/man/man9/bios.9 | 1 - share/man/man9/bus_get_resource.9 | 1 - share/man/man9/hash.9 | 1 - share/man/man9/iflib.9 | 1 - share/man/man9/iflibdd.9 | 1 - share/man/man9/iflibdi.9 | 1 - share/man/man9/iflibtxrx.9 | 1 - share/man/man9/malloc.9 | 1 - share/man/man9/mutex.9 | 1 - share/man/man9/psignal.9 | 1 - share/man/man9/securelevel_gt.9 | 1 - share/man/man9/style.9 | 1 - share/misc/mdoc.template | 1 - tools/build/options/WITHOUT_ACCT | 1 - tools/build/options/WITHOUT_ACPI | 1 - tools/build/options/WITHOUT_APM | 1 - tools/build/options/WITHOUT_ASSERT_DEBUG | 1 - tools/build/options/WITHOUT_AT | 1 - tools/build/options/WITHOUT_ATM | 1 - tools/build/options/WITHOUT_AUDIT | 1 - tools/build/options/WITHOUT_AUTHPF | 1 - tools/build/options/WITHOUT_AUTOFS | 1 - tools/build/options/WITHOUT_AUTO_OBJ | 1 - tools/build/options/WITHOUT_BHYVE | 1 - tools/build/options/WITHOUT_BIND_NOW | 1 - tools/build/options/WITHOUT_BLACKLIST | 1 - tools/build/options/WITHOUT_BLACKLIST_SUPPORT | 1 - tools/build/options/WITHOUT_BLUETOOTH | 1 - tools/build/options/WITHOUT_BOOT | 1 - tools/build/options/WITHOUT_BOOTPARAMD | 1 - tools/build/options/WITHOUT_BOOTPD | 1 - tools/build/options/WITHOUT_BSDINSTALL | 1 - tools/build/options/WITHOUT_BSD_CPIO | 1 - tools/build/options/WITHOUT_BSNMP | 1 - tools/build/options/WITHOUT_BZIP2 | 1 - tools/build/options/WITHOUT_BZIP2_SUPPORT | 1 - tools/build/options/WITHOUT_CALENDAR | 1 - tools/build/options/WITHOUT_CAPSICUM | 1 - tools/build/options/WITHOUT_CAROOT | 1 - tools/build/options/WITHOUT_CASPER | 1 - tools/build/options/WITHOUT_CCD | 1 - tools/build/options/WITHOUT_CDDL | 1 - tools/build/options/WITHOUT_CLANG | 1 - tools/build/options/WITHOUT_CLANG_BOOTSTRAP | 1 - tools/build/options/WITHOUT_CLANG_FULL | 1 - tools/build/options/WITHOUT_CLANG_IS_CC | 1 - tools/build/options/WITHOUT_CLEAN | 1 - tools/build/options/WITHOUT_CPP | 1 - tools/build/options/WITHOUT_CROSS_COMPILER | 1 - tools/build/options/WITHOUT_CRYPT | 1 - tools/build/options/WITHOUT_CUSE | 1 - tools/build/options/WITHOUT_CXGBETOOL | 1 - tools/build/options/WITHOUT_CXX | 1 - tools/build/options/WITHOUT_DEBUG_FILES | 1 - tools/build/options/WITHOUT_DIALOG | 1 - tools/build/options/WITHOUT_DICT | 1 - tools/build/options/WITHOUT_DMAGENT | 1 - tools/build/options/WITHOUT_DOCCOMPRESS | 1 - tools/build/options/WITHOUT_DYNAMICROOT | 1 - tools/build/options/WITHOUT_EE | 1 - tools/build/options/WITHOUT_EFI | 1 - tools/build/options/WITHOUT_ELFTOOLCHAIN_BOOTSTRAP | 1 - tools/build/options/WITHOUT_EXAMPLES | 1 - tools/build/options/WITHOUT_FDT | 1 - tools/build/options/WITHOUT_FILE | 1 - tools/build/options/WITHOUT_FINGER | 1 - tools/build/options/WITHOUT_FLOPPY | 1 - tools/build/options/WITHOUT_FMTREE | 1 - tools/build/options/WITHOUT_FORMAT_EXTENSIONS | 1 - tools/build/options/WITHOUT_FORTH | 1 - tools/build/options/WITHOUT_FP_LIBC | 1 - tools/build/options/WITHOUT_FREEBSD_UPDATE | 1 - tools/build/options/WITHOUT_FTP | 1 - tools/build/options/WITHOUT_GAMES | 1 - tools/build/options/WITHOUT_GCC | 1 - tools/build/options/WITHOUT_GCC_BOOTSTRAP | 1 - tools/build/options/WITHOUT_GCOV | 1 - tools/build/options/WITHOUT_GDB | 1 - tools/build/options/WITHOUT_GH_BC | 1 - tools/build/options/WITHOUT_GNU_DIFF | 1 - tools/build/options/WITHOUT_GOOGLETEST | 1 - tools/build/options/WITHOUT_GPIO | 1 - tools/build/options/WITHOUT_GSSAPI | 1 - tools/build/options/WITHOUT_HAST | 1 - tools/build/options/WITHOUT_HTML | 1 - tools/build/options/WITHOUT_HYPERV | 1 - tools/build/options/WITHOUT_ICONV | 1 - tools/build/options/WITHOUT_INCLUDES | 1 - tools/build/options/WITHOUT_INET | 1 - tools/build/options/WITHOUT_INET6 | 1 - tools/build/options/WITHOUT_INET6_SUPPORT | 1 - tools/build/options/WITHOUT_INETD | 1 - tools/build/options/WITHOUT_INET_SUPPORT | 1 - tools/build/options/WITHOUT_INFO | 1 - tools/build/options/WITHOUT_INSTALLLIB | 1 - tools/build/options/WITHOUT_IPFILTER | 1 - tools/build/options/WITHOUT_IPFW | 1 - tools/build/options/WITHOUT_IPSEC_SUPPORT | 1 - tools/build/options/WITHOUT_ISCSI | 1 - tools/build/options/WITHOUT_JAIL | 1 - tools/build/options/WITHOUT_KDUMP | 1 - tools/build/options/WITHOUT_KERBEROS | 1 - tools/build/options/WITHOUT_KERBEROS_SUPPORT | 1 - tools/build/options/WITHOUT_KERNEL_RETPOLINE | 1 - tools/build/options/WITHOUT_KERNEL_SYMBOLS | 1 - tools/build/options/WITHOUT_KVM | 1 - tools/build/options/WITHOUT_KVM_SUPPORT | 1 - tools/build/options/WITHOUT_LDNS | 1 - tools/build/options/WITHOUT_LDNS_UTILS | 1 - tools/build/options/WITHOUT_LEGACY_CONSOLE | 1 - tools/build/options/WITHOUT_LIB32 | 1 - tools/build/options/WITHOUT_LLD | 1 - tools/build/options/WITHOUT_LLDB | 1 - tools/build/options/WITHOUT_LLD_BOOTSTRAP | 1 - tools/build/options/WITHOUT_LLD_IS_LD | 1 - tools/build/options/WITHOUT_LLVM_ASSERTIONS | 1 - tools/build/options/WITHOUT_LLVM_COV | 1 - tools/build/options/WITHOUT_LLVM_CXXFILT | 1 - tools/build/options/WITHOUT_LLVM_TARGET_AARCH64 | 1 - tools/build/options/WITHOUT_LLVM_TARGET_ALL | 1 - tools/build/options/WITHOUT_LLVM_TARGET_ARM | 1 - tools/build/options/WITHOUT_LLVM_TARGET_MIPS | 1 - tools/build/options/WITHOUT_LLVM_TARGET_POWERPC | 1 - tools/build/options/WITHOUT_LLVM_TARGET_RISCV | 1 - tools/build/options/WITHOUT_LLVM_TARGET_SPARC | 1 - tools/build/options/WITHOUT_LLVM_TARGET_X86 | 1 - tools/build/options/WITHOUT_LOADER_GELI | 1 - tools/build/options/WITHOUT_LOADER_LUA | 1 - tools/build/options/WITHOUT_LOADER_OFW | 1 - tools/build/options/WITHOUT_LOADER_UBOOT | 1 - tools/build/options/WITHOUT_LOADER_ZFS | 1 - tools/build/options/WITHOUT_LOCALES | 1 - tools/build/options/WITHOUT_LOCATE | 1 - tools/build/options/WITHOUT_LPR | 1 - tools/build/options/WITHOUT_LS_COLORS | 1 - tools/build/options/WITHOUT_MAIL | 1 - tools/build/options/WITHOUT_MAILWRAPPER | 1 - tools/build/options/WITHOUT_MAKE | 1 - tools/build/options/WITHOUT_MAKE_CHECK_USE_SANDBOX | 1 - tools/build/options/WITHOUT_MALLOC_PRODUCTION | 1 - tools/build/options/WITHOUT_MAN | 1 - tools/build/options/WITHOUT_MANCOMPRESS | 1 - tools/build/options/WITHOUT_MAN_UTILS | 1 - tools/build/options/WITHOUT_MLX5TOOL | 1 - tools/build/options/WITHOUT_MODULE_DRM | 1 - tools/build/options/WITHOUT_MODULE_DRM2 | 1 - tools/build/options/WITHOUT_NAND | 1 - tools/build/options/WITHOUT_NCP | 1 - tools/build/options/WITHOUT_NDIS | 1 - tools/build/options/WITHOUT_NETCAT | 1 - tools/build/options/WITHOUT_NETGRAPH | 1 - tools/build/options/WITHOUT_NETGRAPH_SUPPORT | 1 - tools/build/options/WITHOUT_NIS | 1 - tools/build/options/WITHOUT_NLS | 1 - tools/build/options/WITHOUT_NLS_CATALOGS | 1 - tools/build/options/WITHOUT_NS_CACHING | 1 - tools/build/options/WITHOUT_NTP | 1 - tools/build/options/WITHOUT_NVME | 1 - tools/build/options/WITHOUT_OFED | 1 - tools/build/options/WITHOUT_OPENMP | 1 - tools/build/options/WITHOUT_OPENSSH | 1 - tools/build/options/WITHOUT_OPENSSL | 1 - tools/build/options/WITHOUT_PAM | 1 - tools/build/options/WITHOUT_PAM_SUPPORT | 1 - tools/build/options/WITHOUT_PF | 1 - tools/build/options/WITHOUT_PIE | 1 - tools/build/options/WITHOUT_PKGBOOTSTRAP | 1 - tools/build/options/WITHOUT_PMC | 1 - tools/build/options/WITHOUT_PORTSNAP | 1 - tools/build/options/WITHOUT_PPP | 1 - tools/build/options/WITHOUT_PROFILE | 1 - tools/build/options/WITHOUT_QUOTAS | 1 - tools/build/options/WITHOUT_RADIUS_SUPPORT | 1 - tools/build/options/WITHOUT_RBOOTD | 1 - tools/build/options/WITHOUT_REPRODUCIBLE_BUILD | 1 - tools/build/options/WITHOUT_RESCUE | 1 - tools/build/options/WITHOUT_RETPOLINE | 1 - tools/build/options/WITHOUT_ROUTED | 1 - tools/build/options/WITHOUT_SENDMAIL | 1 - tools/build/options/WITHOUT_SERVICESDB | 1 - tools/build/options/WITHOUT_SETUID_LOGIN | 1 - tools/build/options/WITHOUT_SHAREDOCS | 1 - tools/build/options/WITHOUT_SHARED_TOOLCHAIN | 1 - tools/build/options/WITHOUT_SOURCELESS | 1 - tools/build/options/WITHOUT_SOURCELESS_HOST | 1 - tools/build/options/WITHOUT_SOURCELESS_UCODE | 1 - tools/build/options/WITHOUT_SSP | 1 - tools/build/options/WITHOUT_STATS | 1 - tools/build/options/WITHOUT_SVNLITE | 1 - tools/build/options/WITHOUT_SYSCONS | 1 - tools/build/options/WITHOUT_SYSTEM_COMPILER | 1 - tools/build/options/WITHOUT_SYSTEM_LINKER | 1 - tools/build/options/WITHOUT_TALK | 1 - tools/build/options/WITHOUT_TCP_WRAPPERS | 1 - tools/build/options/WITHOUT_TCSH | 1 - tools/build/options/WITHOUT_TELNET | 1 - tools/build/options/WITHOUT_TESTS | 1 - tools/build/options/WITHOUT_TESTS_SUPPORT | 1 - tools/build/options/WITHOUT_TEXTPROC | 1 - tools/build/options/WITHOUT_TFTP | 1 - tools/build/options/WITHOUT_TOOLCHAIN | 1 - tools/build/options/WITHOUT_UNBOUND | 1 - tools/build/options/WITHOUT_UNIFIED_OBJDIR | 1 - tools/build/options/WITHOUT_USB | 1 - tools/build/options/WITHOUT_USB_GADGET_EXAMPLES | 1 - tools/build/options/WITHOUT_UTMPX | 1 - tools/build/options/WITHOUT_VI | 1 - tools/build/options/WITHOUT_VT | 1 - tools/build/options/WITHOUT_WARNS | 1 - tools/build/options/WITHOUT_WERROR | 1 - tools/build/options/WITHOUT_WIRELESS | 1 - tools/build/options/WITHOUT_WIRELESS_SUPPORT | 1 - tools/build/options/WITHOUT_WPA_SUPPLICANT_EAPOL | 1 - tools/build/options/WITHOUT_ZFS | 1 - tools/build/options/WITHOUT_ZONEINFO | 1 - tools/build/options/WITH_AUTO_OBJ | 1 - tools/build/options/WITH_BEARSSL | 1 - tools/build/options/WITH_BHYVE_SNAPSHOT | 1 - tools/build/options/WITH_BIND_NOW | 1 - tools/build/options/WITH_CCACHE_BUILD | 1 - tools/build/options/WITH_CLANG | 1 - tools/build/options/WITH_CLANG_BOOTSTRAP | 1 - tools/build/options/WITH_CLANG_EXTRAS | 1 - tools/build/options/WITH_CLANG_FORMAT | 1 - tools/build/options/WITH_CLANG_FULL | 1 - tools/build/options/WITH_CLANG_IS_CC | 1 - tools/build/options/WITH_CTF | 1 - tools/build/options/WITH_CXGBETOOL | 1 - tools/build/options/WITH_CXX | 1 - tools/build/options/WITH_DEBUG_FILES | 1 - tools/build/options/WITH_DETECT_TZ_CHANGES | 1 - tools/build/options/WITH_DIRDEPS_BUILD | 1 - tools/build/options/WITH_DIRDEPS_CACHE | 1 - tools/build/options/WITH_DTRACE_TESTS | 1 - tools/build/options/WITH_EFI | 1 - tools/build/options/WITH_EXPERIMENTAL | 1 - tools/build/options/WITH_EXTRA_TCP_STACKS | 1 - tools/build/options/WITH_FDT | 1 - tools/build/options/WITH_GCC | 1 - tools/build/options/WITH_GCC_BOOTSTRAP | 1 - tools/build/options/WITH_GCOV | 1 - tools/build/options/WITH_GDB | 1 - tools/build/options/WITH_GH_BC | 1 - tools/build/options/WITH_GNU_DIFF | 1 - tools/build/options/WITH_GOOGLETEST | 1 - tools/build/options/WITH_HESIOD | 1 - tools/build/options/WITH_HYPERV | 1 - tools/build/options/WITH_INIT_ALL_PATTERN | 1 - tools/build/options/WITH_INIT_ALL_ZERO | 1 - tools/build/options/WITH_INSTALL_AS_USER | 1 - tools/build/options/WITH_KERNEL_RETPOLINE | 1 - tools/build/options/WITH_LIBSOFT | 1 - tools/build/options/WITH_LLD | 1 - *** 13918 LINES SKIPPED *** From nobody Wed Aug 23 17:50: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 4RWDJB0ZJdz4r9Rp; Wed, 23 Aug 2023 17:50: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 4RWDJ96MM7z4V7w; Wed, 23 Aug 2023 17:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x8jtkrUVzNNRZL0LOHiU7uiztUkR6B/T+fkex5vir0Q=; b=yEbI8zqG7aOyJfCcNRkkcpBIB6ltFZlwCWOXdn5+ao+6Itz5j+EIY5I+PAGEToyQbbauEL cIwedSFO8Yt6xR7RCOK/S/cBcHDb3VF56mtMkZ9dStznjiFiyRvpZdWSpom+/NLXa0F0C5 HrVghe9IlaBpacbmjTrvYWOB2lxpeaSxe8H++7SMN7kKXc0cFCWtfpv5ksqNif89LvTptJ EQkrv3CfPEqslyJK0C6aOXbUKNkko4oDRG53WCf5U5J5h0QuSlP+IAxnDFJO//iR21Hr+E SpnJhCD/THVnpwwsxpVDMfgBbBPgHwnKuYZ4EmZhpEAFNfeEf3YitW6IiYk/2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x8jtkrUVzNNRZL0LOHiU7uiztUkR6B/T+fkex5vir0Q=; b=VVv07tHcLkYgAXu6V0E5ZAUFXAwpJqES/jEnbXWkjchFwuXqcQMlFlQKQqrbpyoMUAnzRS i4ptxI0r8pEw7ezCSUhu1Vhxtb3lWfwSaK+Hp9B4lSy+N9ziIyAE7XjI0V8XGSfAP34QgF HjJJCWfvlWmRfoDIkYFCZyTjpZQjAY2nkShjSdserYDG1ZJm/h4rykScpvC3APw4aGw/6W rLhm1CRdS8jJG3fjlV4IvkTk26SnPyPoDy74MgnhLAFNob2MQmwdEb+BAi/+g9dJ1NZnzg orQcsbX4wIrpoHztZ7UCNLJuiWBIAtmjXfSsNJYKWBdW4b5yXdNfDd2QEsrpaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813001; a=rsa-sha256; cv=none; b=xUI/gd3HK8bjaT7JF+Bzvjo9T5+qnhPa0+hgBep4mJC9azHUfO7bQSRXgq9dNZ8jy5rR1O dnUcagsVeSaBtvsnkM/L1PlKcDTBVvRdSrp2cGTJi4bVfOGvkWAT+0gLmjS48ij5KrVjFI fhoBNhdxuT8Lu60aet+4zbfxx0REgppsKN/nkA4QxpA2/hkk67c04QpqvBRzEt60PPzooY L1cKgOTUqGgR2vt+lDJchd1O9iOyLJC7WP2ZcL0lup6Hqws2hevAFbo2l50l5PBtH97b3P 5537IgdoZgbGTby0Lbj3DyVndpNIeTggOVLROdS3BW/cXOPBfskqnm7vTIwCog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJ95MJfzv8F; Wed, 23 Aug 2023 17:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHo1oM043302; Wed, 23 Aug 2023 17:50:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHo1IB043283; Wed, 23 Aug 2023 17:50:01 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:01 GMT Message-Id: <202308231750.37NHo1IB043283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 27096e41f03f - stable/13 - sys: Remove $FreeBSD$: one-line bare tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 27096e41f03f81fd6622e45ec3a91268f0eacdc8 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=27096e41f03f81fd6622e45ec3a91268f0eacdc8 commit 27096e41f03f81fd6622e45ec3a91268f0eacdc8 Author: Warner Losh AuthorDate: 2023-08-22 01:32:14 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:32 +0000 sys: Remove $FreeBSD$: one-line bare tag Remove /^\s*\$FreeBSD\$$\n/ Similar commit in current: (cherry picked from commit 78d146160dc5) --- sys/amd64/linux/syscalls.master | 1 - sys/amd64/linux32/syscalls.master | 1 - sys/arm/linux/syscalls.master | 1 - sys/arm64/linux/syscalls.master | 1 - sys/cddl/boot/zfs/README | 1 - sys/compat/freebsd32/syscalls.master | 1 - sys/crypto/chacha20/chacha.h | 2 -- sys/dev/cxgb/common/cxgb_common.h | 2 -- sys/dev/cxgb/common/cxgb_firmware_exports.h | 2 -- sys/dev/cxgb/common/cxgb_regs.h | 2 -- sys/dev/cxgb/common/cxgb_sge_defs.h | 2 -- sys/dev/cxgb/common/cxgb_t3_cpl.h | 2 -- sys/dev/cxgb/common/cxgb_tcb.h | 2 -- sys/dev/cxgb/cxgb_adapter.h | 2 -- sys/dev/cxgb/cxgb_ioctl.h | 2 -- sys/dev/cxgb/cxgb_offload.h | 2 -- sys/dev/cxgb/cxgb_osdep.h | 3 --- sys/dev/cxgb/cxgb_t3fw.h | 3 --- sys/dev/cxgb/t3b_protocol_sram.h | 3 --- sys/dev/cxgb/t3b_tp_eeprom.h | 3 --- sys/dev/cxgb/t3c_protocol_sram.h | 3 --- sys/dev/cxgb/t3c_tp_eeprom.h | 3 --- sys/dev/cxgbe/cudbg/fastlz.h | 2 -- sys/dev/e1000/LICENSE | 1 - sys/dev/e1000/README | 1 - sys/dev/firewire/00README | 1 - sys/dev/hpt27xx/README | 2 -- sys/dev/hptmv/readme.txt | 1 - sys/dev/hptnr/README | 2 -- sys/dev/mii/miidevs | 1 - sys/dev/mxge/eth_z8e.h | 2 -- sys/dev/mxge/ethp_z8e.h | 2 -- sys/dev/mxge/if_mxge_var.h | 2 -- sys/dev/mxge/mcp_gen_header.h | 2 -- sys/dev/mxge/mxge_mcp.h | 2 -- sys/dev/mxge/rss_eth_z8e.h | 2 -- sys/dev/mxge/rss_ethp_z8e.h | 2 -- sys/dev/ow/README.txt | 2 -- sys/dev/pccard/pccarddevs | 1 - sys/dev/sdio/sdiodevs | 1 - sys/dev/usb/usbdevs | 1 - sys/dev/videomode/ediddevs | 1 - sys/dev/vmware/pvscsi/LICENSE | 1 - sys/dev/vmware/vmci/LICENSE | 1 - sys/dts/bindings-gpio.txt | 1 - sys/dts/bindings-localbus.txt | 1 - sys/dts/bindings-mpp.txt | 1 - sys/fs/cd9660/TODO.hibler | 1 - sys/geom/notes | 1 - sys/i386/linux/syscalls.master | 1 - sys/kern/syscalls.master | 1 - sys/netgraph/NOTES | 1 - sys/netgraph/bluetooth/drivers/h4/TODO | 1 - sys/netgraph/bluetooth/hci/TODO | 1 - sys/netgraph/bluetooth/l2cap/TODO | 1 - sys/netgraph/bluetooth/socket/TODO | 1 - sys/netinet/libalias/HISTORY | 1 - sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE | 1 - sys/ufs/ufs/README.acls | 1 - sys/ufs/ufs/README.extattr | 1 - 60 files changed, 93 deletions(-) diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index d4e7212c5ba6..aa6d7cb1cd4a 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -1,4 +1,3 @@ - $FreeBSD$ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 097c1ca4a86c..6dd3a5b6575f 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -1,4 +1,3 @@ - $FreeBSD$ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). diff --git a/sys/arm/linux/syscalls.master b/sys/arm/linux/syscalls.master index 3221aaa6bd6d..451477a243d1 100644 --- a/sys/arm/linux/syscalls.master +++ b/sys/arm/linux/syscalls.master @@ -1,4 +1,3 @@ - $FreeBSD$ ; Linux ABI system call name/number map, based on Linux file ; arch/arm/kernel/calls.S diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master index 19ec0ee6c590..30d30c4d6890 100644 --- a/sys/arm64/linux/syscalls.master +++ b/sys/arm64/linux/syscalls.master @@ -1,4 +1,3 @@ - $FreeBSD$ ; Linux ABI system call generic name/number map, based on Linux file ; include/uapi/asm-generic/unistd.h diff --git a/sys/cddl/boot/zfs/README b/sys/cddl/boot/zfs/README index 5f16d5cddf26..f91915eecd80 100644 --- a/sys/cddl/boot/zfs/README +++ b/sys/cddl/boot/zfs/README @@ -1,4 +1,3 @@ -$FreeBSD$ This directory contains various files derived from CDDL sources that are used by the ZFS bootstrap: diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master index e5b86c1f066f..06216bc4cca7 100644 --- a/sys/compat/freebsd32/syscalls.master +++ b/sys/compat/freebsd32/syscalls.master @@ -1,4 +1,3 @@ - $FreeBSD$ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; diff --git a/sys/crypto/chacha20/chacha.h b/sys/crypto/chacha20/chacha.h index 32262b04d568..f6d409db0992 100644 --- a/sys/crypto/chacha20/chacha.h +++ b/sys/crypto/chacha20/chacha.h @@ -4,8 +4,6 @@ chacha-merged.c version 20080118 D. J. Bernstein Public domain. - - $FreeBSD$ */ #ifndef CHACHA_H diff --git a/sys/dev/cxgb/common/cxgb_common.h b/sys/dev/cxgb/common/cxgb_common.h index 4b08553f587f..4603794099c2 100644 --- a/sys/dev/cxgb/common/cxgb_common.h +++ b/sys/dev/cxgb/common/cxgb_common.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ #ifndef __CHELSIO_COMMON_H #define __CHELSIO_COMMON_H diff --git a/sys/dev/cxgb/common/cxgb_firmware_exports.h b/sys/dev/cxgb/common/cxgb_firmware_exports.h index 207787d59186..47c75ff586c6 100644 --- a/sys/dev/cxgb/common/cxgb_firmware_exports.h +++ b/sys/dev/cxgb/common/cxgb_firmware_exports.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ #ifndef _FIRMWARE_EXPORTS_H_ #define _FIRMWARE_EXPORTS_H_ diff --git a/sys/dev/cxgb/common/cxgb_regs.h b/sys/dev/cxgb/common/cxgb_regs.h index 1941efbaa08b..6e242f11277c 100644 --- a/sys/dev/cxgb/common/cxgb_regs.h +++ b/sys/dev/cxgb/common/cxgb_regs.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ /* This file is automatically generated --- do not edit */ diff --git a/sys/dev/cxgb/common/cxgb_sge_defs.h b/sys/dev/cxgb/common/cxgb_sge_defs.h index 6b8781586f17..1ff63bf9b437 100644 --- a/sys/dev/cxgb/common/cxgb_sge_defs.h +++ b/sys/dev/cxgb/common/cxgb_sge_defs.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ /* * This file is automatically generated --- any changes will be lost. diff --git a/sys/dev/cxgb/common/cxgb_t3_cpl.h b/sys/dev/cxgb/common/cxgb_t3_cpl.h index 4e2f4452efd0..c30d7d2d57b5 100644 --- a/sys/dev/cxgb/common/cxgb_t3_cpl.h +++ b/sys/dev/cxgb/common/cxgb_t3_cpl.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ #ifndef T3_CPL_H #define T3_CPL_H diff --git a/sys/dev/cxgb/common/cxgb_tcb.h b/sys/dev/cxgb/common/cxgb_tcb.h index 196708b0ea6d..28f96dd8cd06 100644 --- a/sys/dev/cxgb/common/cxgb_tcb.h +++ b/sys/dev/cxgb/common/cxgb_tcb.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ /* This file is automatically generated --- do not edit */ diff --git a/sys/dev/cxgb/cxgb_adapter.h b/sys/dev/cxgb/cxgb_adapter.h index f5949e2bc0dc..1d263fc86573 100644 --- a/sys/dev/cxgb/cxgb_adapter.h +++ b/sys/dev/cxgb/cxgb_adapter.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ diff --git a/sys/dev/cxgb/cxgb_ioctl.h b/sys/dev/cxgb/cxgb_ioctl.h index 68b936f69916..608eb77d2a8f 100644 --- a/sys/dev/cxgb/cxgb_ioctl.h +++ b/sys/dev/cxgb/cxgb_ioctl.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ #ifndef __CHIOCTL_H__ #define __CHIOCTL_H__ diff --git a/sys/dev/cxgb/cxgb_offload.h b/sys/dev/cxgb/cxgb_offload.h index 548065b56d60..fe9b31ab7101 100644 --- a/sys/dev/cxgb/cxgb_offload.h +++ b/sys/dev/cxgb/cxgb_offload.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ #ifndef _CXGB_OFFLOAD_H diff --git a/sys/dev/cxgb/cxgb_osdep.h b/sys/dev/cxgb/cxgb_osdep.h index 0f0e56cef1c0..a05fc4c1c93b 100644 --- a/sys/dev/cxgb/cxgb_osdep.h +++ b/sys/dev/cxgb/cxgb_osdep.h @@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ - ***************************************************************************/ #include diff --git a/sys/dev/cxgb/cxgb_t3fw.h b/sys/dev/cxgb/cxgb_t3fw.h index 5a4c036605db..100e67c0f197 100644 --- a/sys/dev/cxgb/cxgb_t3fw.h +++ b/sys/dev/cxgb/cxgb_t3fw.h @@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ - ***************************************************************************/ #define U (unsigned char) diff --git a/sys/dev/cxgb/t3b_protocol_sram.h b/sys/dev/cxgb/t3b_protocol_sram.h index 1db209e0137e..18f9ec4aff1e 100644 --- a/sys/dev/cxgb/t3b_protocol_sram.h +++ b/sys/dev/cxgb/t3b_protocol_sram.h @@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ - ***************************************************************************/ #define U (unsigned char) diff --git a/sys/dev/cxgb/t3b_tp_eeprom.h b/sys/dev/cxgb/t3b_tp_eeprom.h index 8b68c80f4d92..e6c4045da6ff 100644 --- a/sys/dev/cxgb/t3b_tp_eeprom.h +++ b/sys/dev/cxgb/t3b_tp_eeprom.h @@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ - ***************************************************************************/ #define U (unsigned char) diff --git a/sys/dev/cxgb/t3c_protocol_sram.h b/sys/dev/cxgb/t3c_protocol_sram.h index 542fc22b3e5a..afb2d1b5482c 100644 --- a/sys/dev/cxgb/t3c_protocol_sram.h +++ b/sys/dev/cxgb/t3c_protocol_sram.h @@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ - ***************************************************************************/ #define U (unsigned char) diff --git a/sys/dev/cxgb/t3c_tp_eeprom.h b/sys/dev/cxgb/t3c_tp_eeprom.h index c0224f850c7d..d6daead7acf2 100644 --- a/sys/dev/cxgb/t3c_tp_eeprom.h +++ b/sys/dev/cxgb/t3c_tp_eeprom.h @@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ - ***************************************************************************/ #define U (unsigned char) diff --git a/sys/dev/cxgbe/cudbg/fastlz.h b/sys/dev/cxgbe/cudbg/fastlz.h index 5aa474fa5a87..5a3d73e3735e 100644 --- a/sys/dev/cxgbe/cudbg/fastlz.h +++ b/sys/dev/cxgbe/cudbg/fastlz.h @@ -22,8 +22,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - $FreeBSD$ */ #ifndef FASTLZ_H #define FASTLZ_H diff --git a/sys/dev/e1000/LICENSE b/sys/dev/e1000/LICENSE index 51a32a819633..9deb4b1db9e6 100644 --- a/sys/dev/e1000/LICENSE +++ b/sys/dev/e1000/LICENSE @@ -1,4 +1,3 @@ -$FreeBSD$ Copyright (c) 2001-2020, Intel Corporation All rights reserved. diff --git a/sys/dev/e1000/README b/sys/dev/e1000/README index d734be75e758..4a61e0669122 100644 --- a/sys/dev/e1000/README +++ b/sys/dev/e1000/README @@ -1,4 +1,3 @@ -$FreeBSD$ FreeBSD* Driver for Intel(R) Ethernet ===================================== diff --git a/sys/dev/firewire/00README b/sys/dev/firewire/00README index 17f5c5d119d3..d7879c505f80 100644 --- a/sys/dev/firewire/00README +++ b/sys/dev/firewire/00README @@ -1,4 +1,3 @@ -$FreeBSD$ IEEE 1394 support for FreeBSD-5.X and 4.X. diff --git a/sys/dev/hpt27xx/README b/sys/dev/hpt27xx/README index aad14945d2d8..244016ea391f 100644 --- a/sys/dev/hpt27xx/README +++ b/sys/dev/hpt27xx/README @@ -216,5 +216,3 @@ Technical support and service NOTE: Before you send an e-mail, please visit our Web Site (http://www.highpoint-tech.com) to check if there is a new or updated device driver for your system. - -$FreeBSD$ diff --git a/sys/dev/hptmv/readme.txt b/sys/dev/hptmv/readme.txt index 177f9f94e168..ce2b9f5884f0 100644 --- a/sys/dev/hptmv/readme.txt +++ b/sys/dev/hptmv/readme.txt @@ -1,6 +1,5 @@ RocketRAID 18xx Driver for FreeBSD Copyright (C) 2007-2008 HighPoint Technologies, Inc. All rights reserved. -$FreeBSD$ ############################################################################# Revision History: diff --git a/sys/dev/hptnr/README b/sys/dev/hptnr/README index f48071c25320..afa67700fe5c 100644 --- a/sys/dev/hptnr/README +++ b/sys/dev/hptnr/README @@ -219,5 +219,3 @@ Technical support and service NOTE: Before you send an e-mail, please visit our Web Site (http://www.highpoint-tech.com) to check if there is a new or updated device driver for your system. - -$FreeBSD$ diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs index 259718303ee5..c41417e9a97a 100644 --- a/sys/dev/mii/miidevs +++ b/sys/dev/mii/miidevs @@ -1,4 +1,3 @@ -$FreeBSD$ /*$NetBSD: miidevs,v 1.105 2011/11/25 23:28:14 jakllsch Exp $*/ /*- diff --git a/sys/dev/mxge/eth_z8e.h b/sys/dev/mxge/eth_z8e.h index c553aaf59f44..9905923c7360 100644 --- a/sys/dev/mxge/eth_z8e.h +++ b/sys/dev/mxge/eth_z8e.h @@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ ***************************************************************************/ static unsigned int eth_z8e_uncompressed_length = 377284 ; diff --git a/sys/dev/mxge/ethp_z8e.h b/sys/dev/mxge/ethp_z8e.h index 355854520a0e..6fda4ae978f2 100644 --- a/sys/dev/mxge/ethp_z8e.h +++ b/sys/dev/mxge/ethp_z8e.h @@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ ***************************************************************************/ static unsigned int ethp_z8e_uncompressed_length = 387604 ; diff --git a/sys/dev/mxge/if_mxge_var.h b/sys/dev/mxge/if_mxge_var.h index 5a7f5caa05ef..5ebd12a6533e 100644 --- a/sys/dev/mxge/if_mxge_var.h +++ b/sys/dev/mxge/if_mxge_var.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ #define MXGE_ETH_STOPPED 0 diff --git a/sys/dev/mxge/mcp_gen_header.h b/sys/dev/mxge/mcp_gen_header.h index 07c3f83bf2d2..59fb111bd47e 100644 --- a/sys/dev/mxge/mcp_gen_header.h +++ b/sys/dev/mxge/mcp_gen_header.h @@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ ***************************************************************************/ #ifndef _mcp_gen_header_h diff --git a/sys/dev/mxge/mxge_mcp.h b/sys/dev/mxge/mxge_mcp.h index 9f7ae28f2afd..09e8e7ace4c3 100644 --- a/sys/dev/mxge/mxge_mcp.h +++ b/sys/dev/mxge/mxge_mcp.h @@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ ***************************************************************************/ #ifndef _myri10ge_mcp_h diff --git a/sys/dev/mxge/rss_eth_z8e.h b/sys/dev/mxge/rss_eth_z8e.h index c04e9f6dbbfb..9c3a791b0f7d 100644 --- a/sys/dev/mxge/rss_eth_z8e.h +++ b/sys/dev/mxge/rss_eth_z8e.h @@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ ***************************************************************************/ static unsigned int rss_eth_z8e_uncompressed_length = 534724 ; diff --git a/sys/dev/mxge/rss_ethp_z8e.h b/sys/dev/mxge/rss_ethp_z8e.h index 4c5d86270c9c..459dd165fe37 100644 --- a/sys/dev/mxge/rss_ethp_z8e.h +++ b/sys/dev/mxge/rss_ethp_z8e.h @@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ ***************************************************************************/ static unsigned int rss_ethp_z8e_uncompressed_length = 544468 ; diff --git a/sys/dev/ow/README.txt b/sys/dev/ow/README.txt index 5263710964a8..d40ec3545dcb 100644 --- a/sys/dev/ow/README.txt +++ b/sys/dev/ow/README.txt @@ -15,5 +15,3 @@ responsibility of the client device drivers to implement. Client drivers may only call the own(9) interface. The ow(4) driver calls the owll(9) interface and implements the own(9). - -$FreeBSD$ diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs index 13b647a8f23c..b72abff49faf 100644 --- a/sys/dev/pccard/pccarddevs +++ b/sys/dev/pccard/pccarddevs @@ -1,4 +1,3 @@ -$FreeBSD$ /* $NetBSD: pcmciadevs,v 1.226 2008/06/19 18:20:33 imp Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ diff --git a/sys/dev/sdio/sdiodevs b/sys/dev/sdio/sdiodevs index 2fe01f111ffb..194ef8e5d901 100644 --- a/sys/dev/sdio/sdiodevs +++ b/sys/dev/sdio/sdiodevs @@ -1,4 +1,3 @@ -$FreeBSD$ /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 41386c7b2665..8297d14233f2 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1,4 +1,3 @@ -$FreeBSD$ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- diff --git a/sys/dev/videomode/ediddevs b/sys/dev/videomode/ediddevs index 0029704edf48..fc60fe3a0c82 100644 --- a/sys/dev/videomode/ediddevs +++ b/sys/dev/videomode/ediddevs @@ -1,5 +1,4 @@ $NetBSD: ediddevs,v 1.2 2007/03/07 18:47:13 macallan Exp $ -$FreeBSD$ /*- * Copyright (c) 2006 Itronix Inc. diff --git a/sys/dev/vmware/pvscsi/LICENSE b/sys/dev/vmware/pvscsi/LICENSE index a736cc1324a7..f22d3b36cff6 100644 --- a/sys/dev/vmware/pvscsi/LICENSE +++ b/sys/dev/vmware/pvscsi/LICENSE @@ -1,4 +1,3 @@ -$FreeBSD$ These files are provided under a dual BSD-2 Clause/GPLv2 license. When using or redistributing this file, you may do so under either license. diff --git a/sys/dev/vmware/vmci/LICENSE b/sys/dev/vmware/vmci/LICENSE index a736cc1324a7..f22d3b36cff6 100644 --- a/sys/dev/vmware/vmci/LICENSE +++ b/sys/dev/vmware/vmci/LICENSE @@ -1,4 +1,3 @@ -$FreeBSD$ These files are provided under a dual BSD-2 Clause/GPLv2 license. When using or redistributing this file, you may do so under either license. diff --git a/sys/dts/bindings-gpio.txt b/sys/dts/bindings-gpio.txt index 89e6fc0b9311..5057167405c5 100644 --- a/sys/dts/bindings-gpio.txt +++ b/sys/dts/bindings-gpio.txt @@ -1,4 +1,3 @@ -$FreeBSD$ GPIO configuration. =================== diff --git a/sys/dts/bindings-localbus.txt b/sys/dts/bindings-localbus.txt index d960fefcf75d..a4d800dc8a1a 100644 --- a/sys/dts/bindings-localbus.txt +++ b/sys/dts/bindings-localbus.txt @@ -1,4 +1,3 @@ -$FreeBSD$ Marvell Device bus (localbus) configuration. ============================================ diff --git a/sys/dts/bindings-mpp.txt b/sys/dts/bindings-mpp.txt index 5da776e43cfc..6feefd4360e2 100644 --- a/sys/dts/bindings-mpp.txt +++ b/sys/dts/bindings-mpp.txt @@ -1,4 +1,3 @@ -$FreeBSD$ * Multi purpose pin (MPP) configuration. diff --git a/sys/fs/cd9660/TODO.hibler b/sys/fs/cd9660/TODO.hibler index e0842da82d5a..ac04c266345b 100644 --- a/sys/fs/cd9660/TODO.hibler +++ b/sys/fs/cd9660/TODO.hibler @@ -1,4 +1,3 @@ -$FreeBSD$ 1. Investiate making ISOFS another UFS shared filesystem (ala FFS/MFS/LFS). Since it was modelled after the inode code, we might be able to merge diff --git a/sys/geom/notes b/sys/geom/notes index 4fcacaefbc40..016614f7dce6 100644 --- a/sys/geom/notes +++ b/sys/geom/notes @@ -1,4 +1,3 @@ -$FreeBSD$ For the lack of a better place to put them, this file will contain notes on some of the more intricate details of geom. diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index 655c44da2fb8..bf5a98306d9e 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -1,4 +1,3 @@ - $FreeBSD$ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index f4e8e071b42a..d383a50ce3d1 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1,4 +1,3 @@ - $FreeBSD$ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. diff --git a/sys/netgraph/NOTES b/sys/netgraph/NOTES index eb3a54c56145..8a1a2ff28048 100644 --- a/sys/netgraph/NOTES +++ b/sys/netgraph/NOTES @@ -1,4 +1,3 @@ -$FreeBSD$ Development ideas.. Archie's suggestions... :-) diff --git a/sys/netgraph/bluetooth/drivers/h4/TODO b/sys/netgraph/bluetooth/drivers/h4/TODO index 0862688c19d9..5dce863dc5e6 100644 --- a/sys/netgraph/bluetooth/drivers/h4/TODO +++ b/sys/netgraph/bluetooth/drivers/h4/TODO @@ -1,5 +1,4 @@ $Id: TODO,v 1.2 2004/08/23 18:08:15 max Exp $ -$FreeBSD$ FIXME/TODO list diff --git a/sys/netgraph/bluetooth/hci/TODO b/sys/netgraph/bluetooth/hci/TODO index 6f66d7b84d0f..4fb50a956b37 100644 --- a/sys/netgraph/bluetooth/hci/TODO +++ b/sys/netgraph/bluetooth/hci/TODO @@ -1,5 +1,4 @@ $Id: TODO,v 1.2 2003/04/26 22:36:29 max Exp $ -$FreeBSD$ FIXME/TODO list diff --git a/sys/netgraph/bluetooth/l2cap/TODO b/sys/netgraph/bluetooth/l2cap/TODO index 7c7bb27c59aa..8a5c6d1f3431 100644 --- a/sys/netgraph/bluetooth/l2cap/TODO +++ b/sys/netgraph/bluetooth/l2cap/TODO @@ -1,5 +1,4 @@ $Id: TODO,v 1.1 2002/11/24 19:47:06 max Exp $ -$FreeBSD$ FIXME/TODO list diff --git a/sys/netgraph/bluetooth/socket/TODO b/sys/netgraph/bluetooth/socket/TODO index c1aa3b2d476d..a0135e141a10 100644 --- a/sys/netgraph/bluetooth/socket/TODO +++ b/sys/netgraph/bluetooth/socket/TODO @@ -1,5 +1,4 @@ $Id: TODO,v 1.1 2002/11/24 19:47:07 max Exp $ -$FreeBSD$ FIXME/TODO list diff --git a/sys/netinet/libalias/HISTORY b/sys/netinet/libalias/HISTORY index 87d5b6f8ed76..34feba25edc4 100644 --- a/sys/netinet/libalias/HISTORY +++ b/sys/netinet/libalias/HISTORY @@ -1,4 +1,3 @@ -$FreeBSD$ Version 1.0: August 11, 1996 (cjm) diff --git a/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE b/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE index 1ee473da33f1..628a24ad8baa 100644 --- a/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE +++ b/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE @@ -1,4 +1,3 @@ -$FreeBSD$ Copyright (C) 1993-2002 by Darren Reed. diff --git a/sys/ufs/ufs/README.acls b/sys/ufs/ufs/README.acls index 28a9d4f59d87..ad3bb951bf40 100644 --- a/sys/ufs/ufs/README.acls +++ b/sys/ufs/ufs/README.acls @@ -1,4 +1,3 @@ -$FreeBSD$ UFS Access Control Lists Copyright diff --git a/sys/ufs/ufs/README.extattr b/sys/ufs/ufs/README.extattr index a3be6e6a45dc..368fdd704ce9 100644 --- a/sys/ufs/ufs/README.extattr +++ b/sys/ufs/ufs/README.extattr @@ -1,4 +1,3 @@ -$FreeBSD$ UFS Extended Attributes Copyright From nobody Wed Aug 23 17:50: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 4RWDJC4V7mz4r9cX; Wed, 23 Aug 2023 17:50: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 4RWDJC3ZMwz4VHP; Wed, 23 Aug 2023 17:50:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=es+Z+tXB6nwhd3/Oa0ewsmr+5MrSTVxjEfWlUgR0qZo=; b=gkk99IT+ZaV0u8i7V6rfZoQqOJ0LMyo7RrC5cWSWn2xPyybezPQ78bf4K0gxPHgMcs78QF v6+mtSv+CXMp8mwv005ZYAnsgdxfV8q1sbH+ZceLr6X67b0Kr7Hlc6n9OVQaHBo6Ce5AV0 c9mfgMPRGFs3RdOxXxDRdpp8p0P+X+8enaQ72nRa3geGO6D9IuVqih3xqxjkBKlbr73RIQ B+7QhEPE1GLEggaCb+Vyx1KzhxXI7lr6q1atnOFoGxKD6VFl90vx2LVVfg/ppR3PMUC5Gz kSx8hKPBWmDDQHk3WXZMWbduTMf2u9mh5b5oG30ze+fbkV2e7qLCsicK3ORQBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=es+Z+tXB6nwhd3/Oa0ewsmr+5MrSTVxjEfWlUgR0qZo=; b=UF7oHqich9IhHXbxwSGyuIdM89VYCrnwUKBdYHiN108wDLNwXbWDZ/gLKnmZk0B0ZGk8zt 1qcj0iR9993T0HT5Vtt4T83xY7A9lIrMiPQcObj4rr/dxH73OB3BOhBLghdDs78wWBvWfu slR7xae5KsmQe3SBQv3MgTG7RSRorV+u56cC+pEND3QxzFIKnQ2BbRJR3UsFv+hKeIlIeX Lc8e5XFTkOQvsmRbg/eXuAXdyrws8n+V6g0Eh0brZ8ccQfChUsJZV6b1nWZNCpEE2JREgh VQJd5GIDTiQK1nNVX+ng0Bo3pLwkIJmBjA+KrVDN7od5j1IVBNtbHiVpXlB8hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813003; a=rsa-sha256; cv=none; b=Hb+kZs3Yk4B3rmxElj4NJ0ewiqsES0eyPehkwNFzcCLvZBhd4Cox2VXReAzZ9suy0f64aw rJEmefqdi1yW5lPNXfd7RJfoZBU9IbwDW2n6O6oSLbuBkFesFr42y2vGTFrXfs9rMPz6Tt 0RfKLtivyalh/0YL6yDhRTLftO0M+WSKA689GnQEZ1F35sR9dBUZtGL5+VSnE4hj9uY5bL XwqCrCuSBc5NmACjzuzHQ+vFRSqm6DbMp/3amybC+5a0dA2LlPihGClMo/45bO2FgeaNxh 2jcbRG2lruNXRAZzUJmnVeov1nGbDS8zy24SSOJDFX7SNQEjZF5ppqADfOGEoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJC2YZjzv8G; Wed, 23 Aug 2023 17:50:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHo36v043697; Wed, 23 Aug 2023 17:50:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHo2fV043571; Wed, 23 Aug 2023 17:50:02 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:02 GMT Message-Id: <202308231750.37NHo2fV043571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 350f9ac5b362 - stable/13 - Remove $FreeBSD$: one-line bare tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 350f9ac5b362558a39f447dea99d102b831ee0c8 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=350f9ac5b362558a39f447dea99d102b831ee0c8 commit 350f9ac5b362558a39f447dea99d102b831ee0c8 Author: Warner Losh AuthorDate: 2023-08-22 01:32:18 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:33 +0000 Remove $FreeBSD$: one-line bare tag Remove /^\s*\$FreeBSD\$$\n/ Similar commit in main: (cherry picked from commit 05248206f720) --- LOCKS | 1 - MAINTAINERS | 1 - RELNOTES | 2 -- UPDATING | 2 -- bin/dd/ref.ascii | 1 - bin/dd/ref.ebcdic | 1 - bin/dd/ref.ibm | 1 - bin/dd/ref.lcase | 1 - bin/dd/ref.obs_zeroes | 1 - bin/dd/ref.oldascii | 1 - bin/dd/ref.oldebcdic | 1 - bin/dd/ref.oldibm | 1 - bin/dd/ref.pareven | 1 - bin/dd/ref.parnone | 1 - bin/dd/ref.parodd | 1 - bin/dd/ref.parset | 1 - bin/dd/ref.swab | 1 - bin/dd/ref.ucase | 1 - bin/ed/POSIX | 1 - bin/ed/README | 1 - etc/mtree/README | 1 - lib/lib80211/regdomain.xml | 2 -- lib/libc/locale/DESIGN.xlocale | 1 - lib/libc/rpc/README | 1 - lib/libc/softfloat/README.NetBSD | 1 - lib/libc/softfloat/README.txt | 1 - lib/libc/softfloat/softfloat-history.txt | 1 - lib/libc/softfloat/softfloat-source.txt | 1 - lib/libc/softfloat/softfloat.txt | 1 - lib/libc/softfloat/timesoftfloat.txt | 1 - lib/libefivar/FreeBSD-update | 1 - lib/libnetbsd/README | 1 - lib/libopenbsd/README | 1 - lib/libpam/pam.d/README | 2 -- lib/libsecureboot/README.rst | 1 - lib/libz/FREEBSD-upgrade | 1 - libexec/bootpd/hash.c | 2 -- libexec/bootpd/readfile.c | 2 -- libexec/bootpd/tools/bootpef/bootpef.c | 2 -- release/powerpc/boot.tbxi | 1 - release/powerpc/hfs-boot.bz2.uu | 1 - rescue/README | 2 -- sbin/gbde/image.uu | 1 - share/dict/freebsd | 1 - share/doc/IPv6/IMPLEMENTATION | 1 - share/dtrace/README | 1 - share/examples/IPv6/USAGE | 1 - share/examples/bootforth/README | 2 -- share/examples/drivers/README | 1 - share/examples/etc/README.examples | 1 - share/examples/ipfilter/examples.txt | 1 - share/examples/ipfilter/ipf-howto.txt | 1 - share/examples/kld/dyn_sysctl/README | 2 -- share/examples/kld/firmware/README | 1 - share/examples/kld/firmware/fwimage/firmware.img.uu | 1 - share/examples/kld/khelp/README | 1 - share/examples/perfmon/README | 2 -- share/examples/tests/README | 1 - share/examples/ypldap/ypldap.conf | 1 - share/misc/bsd-family-tree | 2 -- share/misc/operator | 2 -- share/mk/meta2deps.py | 1 - stand/efi/loader/version | 1 - stand/fdt/help.fdt | 1 - stand/i386/loader/version | 1 - stand/powerpc/boot1.chrp/hfs.tmpl.bz2.uu | 1 - stand/powerpc/ofw/version | 1 - stand/uboot/help.uboot | 1 - stand/uboot/version | 1 - stand/userboot/userboot/version | 1 - tests/README | 1 - tests/sys/mac/portacl/LICENSE | 1 - tests/sys/opencrypto/blake2-kat.h | 2 -- tools/README | 1 - tools/bsdbox/README | 1 - tools/debugscripts/README | 1 - tools/diag/README | 1 - tools/kerneldoc/subsys/README | 1 - tools/regression/README | 1 - tools/regression/TODO | 1 - tools/regression/atm/README | 1 - tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0 | 1 - tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4 | 1 - tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0 | 1 - tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2 | 1 - tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4 | 1 - tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0 | 1 - tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4 | 1 - tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0 | 1 - tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2 | 1 - tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4 | 1 - tools/regression/doat/README | 1 - tools/regression/geom/Data/disk.beast.da0.xml | 1 - tools/regression/geom/Data/disk.critter.ad0.xml | 1 - tools/regression/geom/Data/disk.empty.flp.xml | 1 - tools/regression/geom/Data/disk.far.ad0.xml | 1 - tools/regression/geom/Data/disk.flat.da1.xml | 1 - tools/regression/geom/Data/disk.kern.flp.xml | 1 - tools/regression/geom/Data/disk.msdos.ext.xml | 1 - tools/regression/geom/Data/disk.msdos.flp.xml | 1 - tools/regression/geom/Data/disk.typo.ad0.xml | 1 - tools/regression/geom/Ref/disk.apple.xml | 1 - tools/regression/geom/Ref/disk.beast.da0.xml | 1 - tools/regression/geom/Ref/disk.critter.ad0.xml | 1 - tools/regression/geom/Ref/disk.empty.flp.xml | 1 - tools/regression/geom/Ref/disk.far.ad0.xml | 1 - tools/regression/geom/Ref/disk.flat.da1.xml | 1 - tools/regression/geom/Ref/disk.kern.flp.xml | 1 - tools/regression/geom/Ref/disk.msdos.ext.xml | 1 - tools/regression/geom/Ref/disk.msdos.flp.xml | 1 - tools/regression/geom/Ref/disk.typo.ad0.xml | 1 - tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c | 2 -- tools/regression/netinet/tcpstream/README | 2 -- tools/regression/nfsmmap/README | 1 - tools/regression/p1003_1b/README | 1 - tools/regression/poll/Readme | 1 - tools/regression/redzone9/README | 1 - tools/regression/security/proc_to_proc/README | 1 - tools/regression/sockets/unix_cmsg/README | 1 - tools/regression/sysvmsg/README | 1 - tools/regression/sysvsem/README | 1 - tools/regression/sysvshm/README | 1 - tools/regression/zfs/LICENSE | 1 - tools/test/README | 1 - tools/test/iconv/ref/ARMSCII-8 | 1 - tools/test/iconv/ref/ARMSCII-8-rev | 1 - tools/test/iconv/ref/ASCII | 1 - tools/test/iconv/ref/ASCII-rev | 1 - tools/test/iconv/ref/ATARIST | 1 - tools/test/iconv/ref/ATARIST-rev | 1 - tools/test/iconv/ref/BIG5 | 1 - tools/test/iconv/ref/BIG5-2003 | 1 - tools/test/iconv/ref/BIG5-2003-rev | 1 - tools/test/iconv/ref/BIG5-HKSCS | 1 - tools/test/iconv/ref/BIG5-HKSCS-rev | 1 - tools/test/iconv/ref/BIG5-rev | 1 - tools/test/iconv/ref/BIG5HKSCS | 1 - tools/test/iconv/ref/BIG5HKSCS-rev | 1 - tools/test/iconv/ref/C99 | 1 - tools/test/iconv/ref/C99-rev | 1 - tools/test/iconv/ref/CP1046 | 1 - tools/test/iconv/ref/CP1046-rev | 1 - tools/test/iconv/ref/CP1124 | 1 - tools/test/iconv/ref/CP1124-rev | 1 - tools/test/iconv/ref/CP1125 | 1 - tools/test/iconv/ref/CP1125-rev | 1 - tools/test/iconv/ref/CP1129 | 1 - tools/test/iconv/ref/CP1129-rev | 1 - tools/test/iconv/ref/CP1131 | 1 - tools/test/iconv/ref/CP1131-rev | 1 - tools/test/iconv/ref/CP1133 | 1 - tools/test/iconv/ref/CP1133-rev | 1 - tools/test/iconv/ref/CP1161 | 1 - tools/test/iconv/ref/CP1161-rev | 1 - tools/test/iconv/ref/CP1162 | 1 - tools/test/iconv/ref/CP1162-rev | 1 - tools/test/iconv/ref/CP1163 | 1 - tools/test/iconv/ref/CP1163-rev | 1 - tools/test/iconv/ref/CP1250 | 1 - tools/test/iconv/ref/CP1250-rev | 1 - tools/test/iconv/ref/CP1251 | 1 - tools/test/iconv/ref/CP1251-rev | 1 - tools/test/iconv/ref/CP1252 | 1 - tools/test/iconv/ref/CP1252-rev | 1 - tools/test/iconv/ref/CP1253 | 1 - tools/test/iconv/ref/CP1253-rev | 1 - tools/test/iconv/ref/CP1254 | 1 - tools/test/iconv/ref/CP1254-rev | 1 - tools/test/iconv/ref/CP1255 | 1 - tools/test/iconv/ref/CP1255-rev | 1 - tools/test/iconv/ref/CP1256 | 1 - tools/test/iconv/ref/CP1256-rev | 1 - tools/test/iconv/ref/CP1257 | 1 - tools/test/iconv/ref/CP1257-rev | 1 - tools/test/iconv/ref/CP1258 | 1 - tools/test/iconv/ref/CP1258-rev | 1 - tools/test/iconv/ref/CP437 | 1 - tools/test/iconv/ref/CP437-rev | 1 - tools/test/iconv/ref/CP737 | 1 - tools/test/iconv/ref/CP737-rev | 1 - tools/test/iconv/ref/CP775 | 1 - tools/test/iconv/ref/CP775-rev | 1 - tools/test/iconv/ref/CP850 | 1 - tools/test/iconv/ref/CP850-rev | 1 - tools/test/iconv/ref/CP852 | 1 - tools/test/iconv/ref/CP852-rev | 1 - tools/test/iconv/ref/CP853 | 1 - tools/test/iconv/ref/CP853-rev | 1 - tools/test/iconv/ref/CP855 | 1 - tools/test/iconv/ref/CP855-rev | 1 - tools/test/iconv/ref/CP856 | 1 - tools/test/iconv/ref/CP856-rev | 1 - tools/test/iconv/ref/CP857 | 1 - tools/test/iconv/ref/CP857-rev | 1 - tools/test/iconv/ref/CP858 | 1 - tools/test/iconv/ref/CP858-rev | 1 - tools/test/iconv/ref/CP860 | 1 - tools/test/iconv/ref/CP860-rev | 1 - tools/test/iconv/ref/CP861 | 1 - tools/test/iconv/ref/CP861-rev | 1 - tools/test/iconv/ref/CP862 | 1 - tools/test/iconv/ref/CP862-rev | 1 - tools/test/iconv/ref/CP863 | 1 - tools/test/iconv/ref/CP863-rev | 1 - tools/test/iconv/ref/CP864 | 1 - tools/test/iconv/ref/CP864-rev | 1 - tools/test/iconv/ref/CP865 | 1 - tools/test/iconv/ref/CP865-rev | 1 - tools/test/iconv/ref/CP866 | 1 - tools/test/iconv/ref/CP866-rev | 1 - tools/test/iconv/ref/CP869 | 1 - tools/test/iconv/ref/CP869-rev | 1 - tools/test/iconv/ref/CP874 | 1 - tools/test/iconv/ref/CP874-rev | 1 - tools/test/iconv/ref/CP922 | 1 - tools/test/iconv/ref/CP922-rev | 1 - tools/test/iconv/ref/CP932 | 1 - tools/test/iconv/ref/CP932-rev | 1 - tools/test/iconv/ref/CP936 | 1 - tools/test/iconv/ref/CP936-rev | 1 - tools/test/iconv/ref/CP943 | 1 - tools/test/iconv/ref/CP943-rev | 1 - tools/test/iconv/ref/CP949 | 1 - tools/test/iconv/ref/CP949-rev | 1 - tools/test/iconv/ref/CP950 | 1 - tools/test/iconv/ref/CP950-rev | 1 - tools/test/iconv/ref/DEC-HANYU | 1 - tools/test/iconv/ref/DEC-HANYU-rev | 1 - tools/test/iconv/ref/EUC-CN | 1 - tools/test/iconv/ref/EUC-CN-rev | 1 - tools/test/iconv/ref/EUC-JIS-2004 | 1 - tools/test/iconv/ref/EUC-JIS-2004-rev | 1 - tools/test/iconv/ref/EUC-JP | 1 - tools/test/iconv/ref/EUC-JP-rev | 1 - tools/test/iconv/ref/EUC-KR | 1 - tools/test/iconv/ref/EUC-KR-rev | 1 - tools/test/iconv/ref/EUC-TW | 1 - tools/test/iconv/ref/EUC-TW-rev | 1 - tools/test/iconv/ref/GB18030 | 1 - tools/test/iconv/ref/GB18030-rev | 1 - tools/test/iconv/ref/GB2312 | 1 - tools/test/iconv/ref/GB2312-rev | 1 - tools/test/iconv/ref/GBK | 1 - tools/test/iconv/ref/GBK-rev | 1 - tools/test/iconv/ref/GEORGIAN-ACADEMY | 1 - tools/test/iconv/ref/GEORGIAN-ACADEMY-rev | 1 - tools/test/iconv/ref/GEORGIAN-PS | 1 - tools/test/iconv/ref/GEORGIAN-PS-rev | 1 - tools/test/iconv/ref/HP-ROMAN8 | 1 - tools/test/iconv/ref/HP-ROMAN8-rev | 1 - tools/test/iconv/ref/HZ | 1 - tools/test/iconv/ref/HZ-rev | 1 - tools/test/iconv/ref/ISO-2022-CN | 1 - tools/test/iconv/ref/ISO-2022-CN-EXT | 1 - tools/test/iconv/ref/ISO-2022-CN-EXT-rev | 1 - tools/test/iconv/ref/ISO-2022-CN-rev | 1 - tools/test/iconv/ref/ISO-2022-JP | 1 - tools/test/iconv/ref/ISO-2022-JP-1 | 1 - tools/test/iconv/ref/ISO-2022-JP-1-rev | 1 - tools/test/iconv/ref/ISO-2022-JP-2 | 1 - tools/test/iconv/ref/ISO-2022-JP-2-rev | 1 - tools/test/iconv/ref/ISO-2022-JP-2004 | 1 - tools/test/iconv/ref/ISO-2022-JP-2004-rev | 1 - tools/test/iconv/ref/ISO-2022-JP-rev | 1 - tools/test/iconv/ref/ISO-2022-KR | 1 - tools/test/iconv/ref/ISO-2022-KR-rev | 1 - tools/test/iconv/ref/ISO-IR-14 | 1 - tools/test/iconv/ref/ISO-IR-14-rev | 1 - tools/test/iconv/ref/ISO-IR-165 | 1 - tools/test/iconv/ref/ISO-IR-165-rev | 1 - tools/test/iconv/ref/ISO-IR-57 | 1 - tools/test/iconv/ref/ISO-IR-57-rev | 1 - tools/test/iconv/ref/ISO8859-1 | 1 - tools/test/iconv/ref/ISO8859-1-rev | 1 - tools/test/iconv/ref/ISO8859-10 | 1 - tools/test/iconv/ref/ISO8859-10-rev | 1 - tools/test/iconv/ref/ISO8859-11 | 1 - tools/test/iconv/ref/ISO8859-11-rev | 1 - tools/test/iconv/ref/ISO8859-13 | 1 - tools/test/iconv/ref/ISO8859-13-rev | 1 - tools/test/iconv/ref/ISO8859-14 | 1 - tools/test/iconv/ref/ISO8859-14-rev | 1 - tools/test/iconv/ref/ISO8859-15 | 1 - tools/test/iconv/ref/ISO8859-15-rev | 1 - tools/test/iconv/ref/ISO8859-16 | 1 - tools/test/iconv/ref/ISO8859-16-rev | 1 - tools/test/iconv/ref/ISO8859-2 | 1 - tools/test/iconv/ref/ISO8859-2-rev | 1 - tools/test/iconv/ref/ISO8859-3 | 1 - tools/test/iconv/ref/ISO8859-3-rev | 1 - tools/test/iconv/ref/ISO8859-4 | 1 - tools/test/iconv/ref/ISO8859-4-rev | 1 - tools/test/iconv/ref/ISO8859-5 | 1 - tools/test/iconv/ref/ISO8859-5-rev | 1 - tools/test/iconv/ref/ISO8859-6 | 1 - tools/test/iconv/ref/ISO8859-6-rev | 1 - tools/test/iconv/ref/ISO8859-7 | 1 - tools/test/iconv/ref/ISO8859-7-rev | 1 - tools/test/iconv/ref/ISO8859-8 | 1 - tools/test/iconv/ref/ISO8859-8-rev | 1 - tools/test/iconv/ref/ISO8859-9 | 1 - tools/test/iconv/ref/ISO8859-9-rev | 1 - tools/test/iconv/ref/JAVA | 1 - tools/test/iconv/ref/JAVA-rev | 1 - tools/test/iconv/ref/JIS_X0201 | 1 - tools/test/iconv/ref/JIS_X0201-rev | 1 - tools/test/iconv/ref/JIS_X0208-1990 | 1 - tools/test/iconv/ref/JIS_X0208-1990-rev | 1 - tools/test/iconv/ref/JOHAB | 1 - tools/test/iconv/ref/JOHAB-rev | 1 - tools/test/iconv/ref/KOI8-R | 1 - tools/test/iconv/ref/KOI8-R-rev | 1 - tools/test/iconv/ref/KOI8-RU | 1 - tools/test/iconv/ref/KOI8-RU-rev | 1 - tools/test/iconv/ref/KOI8-T | 1 - tools/test/iconv/ref/KOI8-T-rev | 1 - tools/test/iconv/ref/KOI8-U | 1 - tools/test/iconv/ref/KOI8-U-rev | 1 - tools/test/iconv/ref/KZ-1048 | 1 - tools/test/iconv/ref/KZ-1048-rev | 1 - tools/test/iconv/ref/MACARABIC | 1 - tools/test/iconv/ref/MACARABIC-rev | 1 - tools/test/iconv/ref/MACCENTRALEUROPE | 1 - tools/test/iconv/ref/MACCENTRALEUROPE-rev | 1 - tools/test/iconv/ref/MACCROATIAN | 1 - tools/test/iconv/ref/MACCROATIAN-rev | 1 - tools/test/iconv/ref/MACCYRILLIC | 1 - tools/test/iconv/ref/MACCYRILLIC-rev | 1 - tools/test/iconv/ref/MACGREEK | 1 - tools/test/iconv/ref/MACGREEK-rev | 1 - tools/test/iconv/ref/MACHEBREW | 1 - tools/test/iconv/ref/MACHEBREW-rev | 1 - tools/test/iconv/ref/MACICELAND | 1 - tools/test/iconv/ref/MACICELAND-rev | 1 - tools/test/iconv/ref/MACROMAN | 1 - tools/test/iconv/ref/MACROMAN-rev | 1 - tools/test/iconv/ref/MACROMANIA | 1 - tools/test/iconv/ref/MACROMANIA-rev | 1 - tools/test/iconv/ref/MACTHAI | 1 - tools/test/iconv/ref/MACTHAI-rev | 1 - tools/test/iconv/ref/MACTURKISH | 1 - tools/test/iconv/ref/MACTURKISH-rev | 1 - tools/test/iconv/ref/MACUKRAINE | 1 - tools/test/iconv/ref/MACUKRAINE-rev | 1 - tools/test/iconv/ref/MULELAO-1 | 1 - tools/test/iconv/ref/MULELAO-1-rev | 1 - tools/test/iconv/ref/NEXTSTEP | 1 - tools/test/iconv/ref/NEXTSTEP-rev | 1 - tools/test/iconv/ref/PT154 | 1 - tools/test/iconv/ref/PT154-rev | 1 - tools/test/iconv/ref/RISCOS-LATIN1 | 1 - tools/test/iconv/ref/RISCOS-LATIN1-rev | 1 - tools/test/iconv/ref/SHIFT_JIS | 1 - tools/test/iconv/ref/SHIFT_JIS-rev | 1 - tools/test/iconv/ref/TCVN5712-1 | 1 - tools/test/iconv/ref/TCVN5712-1-rev | 1 - tools/test/iconv/ref/TDS565 | 1 - tools/test/iconv/ref/TDS565-rev | 1 - tools/test/iconv/ref/UTF-16BE | 1 - tools/test/iconv/ref/UTF-16BE-rev | 1 - tools/test/iconv/ref/UTF-16LE | 1 - tools/test/iconv/ref/UTF-16LE-rev | 1 - tools/test/iconv/ref/UTF-32BE | 1 - tools/test/iconv/ref/UTF-32BE-rev | 1 - tools/test/iconv/ref/UTF-32LE | 1 - tools/test/iconv/ref/UTF-32LE-rev | 1 - tools/test/iconv/ref/UTF-7 | 1 - tools/test/iconv/ref/UTF-7-rev | 1 - tools/test/iconv/ref/UTF-8 | 1 - tools/test/iconv/ref/UTF-8-rev | 1 - tools/test/iconv/ref/VISCII | 1 - tools/test/iconv/ref/VISCII-rev | 1 - tools/tools/crypto/README | 1 - tools/tools/find-sb/README | 1 - tools/tools/kttcp/README | 1 - tools/tools/locale/etc/charmaps/charmaps.txt | 1 - tools/tools/man/README | 2 -- tools/tools/nanobsd/dhcpd/README | 1 - tools/tools/nanobsd/embedded/README | 1 - tools/tools/net80211/README | 1 - tools/tools/net80211/w00t/README | 1 - tools/tools/net80211/wesside/README | 1 - tools/tools/net80211/wlaninject/README | 1 - tools/tools/netmap/README | 1 - tools/tools/netrate/README | 2 -- tools/tools/netrate/tcpp/README | 3 --- tools/tools/sortbench/README | 1 - tools/tools/sortbench/bench.py | 2 -- tools/tools/sysbuild/README | 1 - tools/tools/vhba/README | 1 - usr.bin/bmake/tests/README | 1 - usr.bin/compress/doc/NOTES | 2 -- usr.bin/compress/doc/README | 1 - usr.bin/dtc/HACKING | 1 - usr.bin/fortune/datfiles/freebsd-tips | 1 - usr.bin/indent/README | 2 -- usr.bin/lastcomm/tests/README | 1 - usr.bin/login/README | 2 -- usr.bin/m4/tests/ff_after_dnl.m4.uu | 1 - usr.bin/m4/tests/strangequotes.m4.uu | 1 - usr.bin/ministat/README | 1 - usr.sbin/apmd/README | 2 -- usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt | 1 - usr.sbin/bluetooth/bcmfw/README | 1 - usr.sbin/bootparamd/bootparamd/README | 1 - usr.sbin/cron/doc/CHANGES | 1 - usr.sbin/cron/doc/CONVERSION | 1 - usr.sbin/cron/doc/FEATURES | 1 - usr.sbin/cron/doc/INSTALL | 2 -- usr.sbin/cron/doc/MAIL | 2 -- usr.sbin/cron/doc/README | 2 -- usr.sbin/kbdmap/TODO | 1 - usr.sbin/kldxref/fileformat | 1 - usr.sbin/newsyslog/pathnames.h | 2 -- usr.sbin/ppp/README.changes | 2 -- usr.sbin/ppp/README.nat | 2 -- usr.sbin/pw/README | 2 -- 425 files changed, 457 deletions(-) diff --git a/LOCKS b/LOCKS index 1e2effdfca34..ceebb8e131df 100644 --- a/LOCKS +++ b/LOCKS @@ -1,4 +1,3 @@ -$FreeBSD$ This file documents formal review/approval requirements that have been approved by core. diff --git a/MAINTAINERS b/MAINTAINERS index 09ee157eb128..1445e3d96a89 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,4 +1,3 @@ -$FreeBSD$ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements diff --git a/RELNOTES b/RELNOTES index cf6ed985f608..2ed706bc716e 100644 --- a/RELNOTES +++ b/RELNOTES @@ -420,5 +420,3 @@ r347532: wirings (e.g., by mlock(2)). Kernel wirings no long count towards the global limit, which is renamed to vm.max_user_wired. bhyve -S allocates user-wired memory and is now subject to that limit. - -$FreeBSD$ diff --git a/UPDATING b/UPDATING index 796f2b751b95..67809e8fc4dc 100644 --- a/UPDATING +++ b/UPDATING @@ -2579,5 +2579,3 @@ POSSIBILITY OF SUCH DAMAGE. Contact Warner Losh if you have any questions about your use of this document. - -$FreeBSD$ diff --git a/bin/dd/ref.ascii b/bin/dd/ref.ascii index 7ff13e5a80ed..a8299b6cb056 100644 --- a/bin/dd/ref.ascii +++ b/bin/dd/ref.ascii @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 9c 09 86 7f 97 8d 8e 0b 0c 0d 0e 0f |................| 00000010 10 11 12 13 9d 85 08 87 18 19 92 8f 1c 1d 1e 1f |................| 00000020 80 81 82 83 84 0a 17 1b 88 89 8a 8b 8c 05 06 07 |................| diff --git a/bin/dd/ref.ebcdic b/bin/dd/ref.ebcdic index 605716552cab..b2428c8517ce 100644 --- a/bin/dd/ref.ebcdic +++ b/bin/dd/ref.ebcdic @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 37 2d 2e 2f 16 05 25 0b 0c 0d 0e 0f |....7-./..%.....| 00000010 10 11 12 13 3c 3d 32 26 18 19 3f 27 1c 1d 1e 1f |....<=2&..?'....| 00000020 40 5a 7f 7b 5b 6c 50 7d 4d 5d 5c 4e 6b 60 4b 61 |@Z.{[lP}M]\Nk`Ka| diff --git a/bin/dd/ref.ibm b/bin/dd/ref.ibm index 4836baf221aa..3d05cf9a9ef0 100644 --- a/bin/dd/ref.ibm +++ b/bin/dd/ref.ibm @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 37 2d 2e 2f 16 05 25 0b 0c 0d 0e 0f |....7-./..%.....| 00000010 10 11 12 13 3c 3d 32 26 18 19 3f 27 1c 1d 1e 1f |....<=2&..?'....| 00000020 40 5a 7f 7b 5b 6c 50 7d 4d 5d 5c 4e 6b 60 4b 61 |@Z.{[lP}M]\Nk`Ka| diff --git a/bin/dd/ref.lcase b/bin/dd/ref.lcase index 9f9567296468..a653527f8c63 100644 --- a/bin/dd/ref.lcase +++ b/bin/dd/ref.lcase @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f |................| 00000010 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f |................| 00000020 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f | !"#$%&'()*+,-./| diff --git a/bin/dd/ref.obs_zeroes b/bin/dd/ref.obs_zeroes index 473ff7cc4108..e26380a1e7d3 100644 --- a/bin/dd/ref.obs_zeroes +++ b/bin/dd/ref.obs_zeroes @@ -1,3 +1,2 @@ -$FreeBSD$ 00000000 41 42 43 44 45 46 47 48 00 00 00 00 00 00 00 00 |ABCDEFGH........| 00000010 diff --git a/bin/dd/ref.oldascii b/bin/dd/ref.oldascii index bb1ad0a7242b..a748a9d6361f 100644 --- a/bin/dd/ref.oldascii +++ b/bin/dd/ref.oldascii @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 9c 09 86 7f 97 8d 8e 0b 0c 0d 0e 0f |................| 00000010 10 11 12 13 9d 85 08 87 18 19 92 8f 1c 1d 1e 1f |................| 00000020 80 81 82 83 84 0a 17 1b 88 89 8a 8b 8c 05 06 07 |................| diff --git a/bin/dd/ref.oldebcdic b/bin/dd/ref.oldebcdic index 4a7fde7e65b6..122f463b5cf4 100644 --- a/bin/dd/ref.oldebcdic +++ b/bin/dd/ref.oldebcdic @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 37 2d 2e 2f 16 05 25 0b 0c 0d 0e 0f |....7-./..%.....| 00000010 10 11 12 13 3c 3d 32 26 18 19 3f 27 1c 1d 1e 1f |....<=2&..?'....| 00000020 40 4f 7f 7b 5b 6c 50 7d 4d 5d 5c 4e 6b 60 4b 61 |@O.{[lP}M]\Nk`Ka| diff --git a/bin/dd/ref.oldibm b/bin/dd/ref.oldibm index 4836baf221aa..3d05cf9a9ef0 100644 --- a/bin/dd/ref.oldibm +++ b/bin/dd/ref.oldibm @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 37 2d 2e 2f 16 05 25 0b 0c 0d 0e 0f |....7-./..%.....| 00000010 10 11 12 13 3c 3d 32 26 18 19 3f 27 1c 1d 1e 1f |....<=2&..?'....| 00000020 40 5a 7f 7b 5b 6c 50 7d 4d 5d 5c 4e 6b 60 4b 61 |@Z.{[lP}M]\Nk`Ka| diff --git a/bin/dd/ref.pareven b/bin/dd/ref.pareven index c64e63e30660..3c7c240d6f2f 100644 --- a/bin/dd/ref.pareven +++ b/bin/dd/ref.pareven @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 81 82 03 84 05 06 87 88 09 0a 8b 0c 8d 8e 0f |................| 00000010 90 11 12 93 14 95 96 17 18 99 9a 1b 9c 1d 1e 9f |................| 00000020 a0 21 22 a3 24 a5 a6 27 28 a9 aa 2b ac 2d 2e af |.!".$..'(..+.-..| diff --git a/bin/dd/ref.parnone b/bin/dd/ref.parnone index fba31c142448..c6e394f59d8c 100644 --- a/bin/dd/ref.parnone +++ b/bin/dd/ref.parnone @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f |................| 00000010 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f |................| 00000020 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f | !"#$%&'()*+,-./| diff --git a/bin/dd/ref.parodd b/bin/dd/ref.parodd index f0bc449e3648..ada582f87265 100644 --- a/bin/dd/ref.parodd +++ b/bin/dd/ref.parodd @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 80 01 02 83 04 85 86 07 08 89 8a 0b 8c 0d 0e 8f |................| 00000010 10 91 92 13 94 15 16 97 98 19 1a 9b 1c 9d 9e 1f |................| 00000020 20 a1 a2 23 a4 25 26 a7 a8 29 2a ab 2c ad ae 2f | ..#.%&..)*.,../| diff --git a/bin/dd/ref.parset b/bin/dd/ref.parset index baa1c57163a2..742ed22642d8 100644 --- a/bin/dd/ref.parset +++ b/bin/dd/ref.parset @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f |................| 00000010 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f |................| 00000020 a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af |................| diff --git a/bin/dd/ref.swab b/bin/dd/ref.swab index 79e57b79b738..07cf9ffafa8f 100644 --- a/bin/dd/ref.swab +++ b/bin/dd/ref.swab @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 01 00 03 02 05 04 07 06 09 08 0b 0a 0d 0c 0f 0e |................| 00000010 11 10 13 12 15 14 17 16 19 18 1b 1a 1d 1c 1f 1e |................| 00000020 21 20 23 22 25 24 27 26 29 28 2b 2a 2d 2c 2f 2e |! #"%$'&)(+*-,/.| diff --git a/bin/dd/ref.ucase b/bin/dd/ref.ucase index 70d8a903c354..a761c99431f5 100644 --- a/bin/dd/ref.ucase +++ b/bin/dd/ref.ucase @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f |................| 00000010 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f |................| 00000020 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f | !"#$%&'()*+,-./| diff --git a/bin/ed/POSIX b/bin/ed/POSIX index 53d6b5328ca5..1c8ac2b3b212 100644 --- a/bin/ed/POSIX +++ b/bin/ed/POSIX @@ -1,4 +1,3 @@ -$FreeBSD$ This version of ed(1) is not strictly POSIX compliant, as described in the POSIX 1003.2 document. The following is a summary of the omissions, diff --git a/bin/ed/README b/bin/ed/README index da11f9b0f32a..8f5234179119 100644 --- a/bin/ed/README +++ b/bin/ed/README @@ -1,4 +1,3 @@ -$FreeBSD$ ed is an 8-bit-clean, POSIX-compliant line editor. It should work with any regular expression package that conforms to the POSIX interface diff --git a/etc/mtree/README b/etc/mtree/README index 1b2b0d4bd5e1..fd4a062552d9 100644 --- a/etc/mtree/README +++ b/etc/mtree/README @@ -1,4 +1,3 @@ -$FreeBSD$ Note: If you modify these files, please keep hier(7) updated! diff --git a/lib/lib80211/regdomain.xml b/lib/lib80211/regdomain.xml index 38ef48fa3b69..5a432f39ccf6 100644 --- a/lib/lib80211/regdomain.xml +++ b/lib/lib80211/regdomain.xml @@ -21,8 +21,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - $FreeBSD$ --> diff --git a/lib/libc/locale/DESIGN.xlocale b/lib/libc/locale/DESIGN.xlocale index 5d998d32314d..03e065d82d73 100644 --- a/lib/libc/locale/DESIGN.xlocale +++ b/lib/libc/locale/DESIGN.xlocale @@ -1,4 +1,3 @@ -$FreeBSD$ Design of xlocale ================= diff --git a/lib/libc/rpc/README b/lib/libc/rpc/README index 129fe0082d6d..60e9f2649bba 100644 --- a/lib/libc/rpc/README +++ b/lib/libc/rpc/README @@ -1,4 +1,3 @@ -$FreeBSD$ PLEASE READ THE DISCLAIMER FILE. DO NOT CALL THE SUN MICROSYSTEMS SUPPORT LINE WITH QUESTIONS ON THIS RELEASE. THEY CANNOT ANSWER QUESTIONS ABOUT THIS diff --git a/lib/libc/softfloat/README.NetBSD b/lib/libc/softfloat/README.NetBSD index c6ca7a8753cc..e486eba748d0 100644 --- a/lib/libc/softfloat/README.NetBSD +++ b/lib/libc/softfloat/README.NetBSD @@ -1,5 +1,4 @@ $NetBSD: README.NetBSD,v 1.2 2002/05/21 23:51:05 bjh21 Exp $ -$FreeBSD$ This is a modified version of part of John Hauser's SoftFloat 2a package. This version has been heavily modified to support its use with GCC to diff --git a/lib/libc/softfloat/README.txt b/lib/libc/softfloat/README.txt index fe28ccc294fb..b771b8c8e118 100644 --- a/lib/libc/softfloat/README.txt +++ b/lib/libc/softfloat/README.txt @@ -1,5 +1,4 @@ $NetBSD: README.txt,v 1.1 2000/06/06 08:15:02 bjh21 Exp $ -$FreeBSD$ Package Overview for SoftFloat Release 2a diff --git a/lib/libc/softfloat/softfloat-history.txt b/lib/libc/softfloat/softfloat-history.txt index d8c98db56ed4..14fe06687950 100644 --- a/lib/libc/softfloat/softfloat-history.txt +++ b/lib/libc/softfloat/softfloat-history.txt @@ -1,5 +1,4 @@ $NetBSD: softfloat-history.txt,v 1.1 2000/06/06 08:15:08 bjh21 Exp $ -$FreeBSD$ History of Major Changes to SoftFloat, up to Release 2a diff --git a/lib/libc/softfloat/softfloat-source.txt b/lib/libc/softfloat/softfloat-source.txt index 2a15f2add95b..49de2e021f0c 100644 --- a/lib/libc/softfloat/softfloat-source.txt +++ b/lib/libc/softfloat/softfloat-source.txt @@ -1,5 +1,4 @@ $NetBSD: softfloat-source.txt,v 1.2 2006/11/24 19:46:58 christos Exp $ -$FreeBSD$ SoftFloat Release 2a Source Documentation diff --git a/lib/libc/softfloat/softfloat.txt b/lib/libc/softfloat/softfloat.txt index 414506f7fef2..a3ad43e20401 100644 --- a/lib/libc/softfloat/softfloat.txt +++ b/lib/libc/softfloat/softfloat.txt @@ -1,5 +1,4 @@ $NetBSD: softfloat.txt,v 1.2 2006/11/24 19:46:58 christos Exp $ -$FreeBSD$ SoftFloat Release 2a General Documentation diff --git a/lib/libc/softfloat/timesoftfloat.txt b/lib/libc/softfloat/timesoftfloat.txt index addc64740c6d..c1763f9723c8 100644 --- a/lib/libc/softfloat/timesoftfloat.txt +++ b/lib/libc/softfloat/timesoftfloat.txt @@ -1,5 +1,4 @@ $NetBSD: timesoftfloat.txt,v 1.1 2000/06/06 08:15:11 bjh21 Exp $ -$FreeBSD$ Documentation for the `timesoftfloat' Program of SoftFloat Release 2a diff --git a/lib/libefivar/FreeBSD-update b/lib/libefivar/FreeBSD-update index 8b45dce8c3a0..17c61d5f2a6b 100644 --- a/lib/libefivar/FreeBSD-update +++ b/lib/libefivar/FreeBSD-update @@ -1,4 +1,3 @@ -$FreeBSD$ For the printing and parsing functionalit, we use the Tianocore routines directly. diff --git a/lib/libnetbsd/README b/lib/libnetbsd/README index 49afa0b436bf..0eccbe8616d9 100644 --- a/lib/libnetbsd/README +++ b/lib/libnetbsd/README @@ -1,4 +1,3 @@ -$FreeBSD$ libnetbsd is a thin compatibility layer intended to allow a limited set of NetBSD software to compile as part of the FreeBSD build with diff --git a/lib/libopenbsd/README b/lib/libopenbsd/README index e9f6d70b5fc5..f3ffe54a5797 100644 --- a/lib/libopenbsd/README +++ b/lib/libopenbsd/README @@ -1,4 +1,3 @@ -$FreeBSD$ libopenbsd is a thin compatibility layer intended to allow a limited set of OpenBSD software to compile as part of the FreeBSD build with diff --git a/lib/libpam/pam.d/README b/lib/libpam/pam.d/README index 2824c054fe85..c7a5e65ebcef 100644 --- a/lib/libpam/pam.d/README +++ b/lib/libpam/pam.d/README @@ -58,5 +58,3 @@ Note that having a "sufficient" module as the last entry for a particular service and module type may result in surprising behaviour. To get the intended semantics, add a "required" entry listing the pam_deny module at the end of the chain. - -$FreeBSD$ diff --git a/lib/libsecureboot/README.rst b/lib/libsecureboot/README.rst index 8e6f7580faaf..85b949db58cc 100644 --- a/lib/libsecureboot/README.rst +++ b/lib/libsecureboot/README.rst @@ -131,4 +131,3 @@ from the relevant chain - which is sure to be a valid certificate signed by the corresponding trust anchor. -------------------- -$FreeBSD$ diff --git a/lib/libz/FREEBSD-upgrade b/lib/libz/FREEBSD-upgrade index 203ae5c220c2..c8bad6c27a7b 100644 --- a/lib/libz/FREEBSD-upgrade +++ b/lib/libz/FREEBSD-upgrade @@ -1,4 +1,3 @@ -$FreeBSD$ Original distribution from http://zlib.net/. Currently, only trivial changes were made to support build of libstand and to suppress certain diff --git a/libexec/bootpd/hash.c b/libexec/bootpd/hash.c index 1641a8a092cd..7426e4e68cda 100644 --- a/libexec/bootpd/hash.c +++ b/libexec/bootpd/hash.c @@ -19,8 +19,6 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - $FreeBSD$ - ************************************************************************/ /* diff --git a/libexec/bootpd/readfile.c b/libexec/bootpd/readfile.c index c09639300310..0cf7f513cf2a 100644 --- a/libexec/bootpd/readfile.c +++ b/libexec/bootpd/readfile.c @@ -19,8 +19,6 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - $FreeBSD$ - ************************************************************************/ /* diff --git a/libexec/bootpd/tools/bootpef/bootpef.c b/libexec/bootpd/tools/bootpef/bootpef.c index 7ed3786d892e..ae0b8bafd8a5 100644 --- a/libexec/bootpd/tools/bootpef/bootpef.c +++ b/libexec/bootpd/tools/bootpef/bootpef.c @@ -19,8 +19,6 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - $FreeBSD$ - ************************************************************************/ /* diff --git a/release/powerpc/boot.tbxi b/release/powerpc/boot.tbxi index 70897866bec8..adf76e1c6e07 100644 --- a/release/powerpc/boot.tbxi +++ b/release/powerpc/boot.tbxi @@ -1,6 +1,5 @@ -$FreeBSD$ MacRISC MacRISC3 MacRISC4 diff --git a/release/powerpc/hfs-boot.bz2.uu b/release/powerpc/hfs-boot.bz2.uu index dccd3fa4906e..fbae44dcb432 100644 --- a/release/powerpc/hfs-boot.bz2.uu +++ b/release/powerpc/hfs-boot.bz2.uu @@ -1,6 +1,5 @@ HFS boot filesystem created by generate-hfs.sh DO NOT EDIT -$FreeBSD$ begin 644 hfs-boot.bz2 M0EIH.3%!62936=IZTD$``"__]__O_G)7!_Y]OV??5']UW\1$0`$$0```P&`@ M`$A`3,`"L#DRUJM"4E,32>D\*>4\HS2-`:`#0````>IH`>H!H-`$B23)H"8% diff --git a/rescue/README b/rescue/README index 496575e1a323..4603aec98477 100644 --- a/rescue/README +++ b/rescue/README @@ -39,5 +39,3 @@ To compile: Note that rebuilds don't always work correctly; if you run into trouble, try 'make clean' before recompiling. - -$FreeBSD$ diff --git a/sbin/gbde/image.uu b/sbin/gbde/image.uu index 82e6f2e47489..1c06d84f1e45 100644 --- a/sbin/gbde/image.uu +++ b/sbin/gbde/image.uu @@ -1,4 +1,3 @@ -$FreeBSD$ begin 644 gbde.image.bz2 M0EIH.3%!629364"&9H\`Y1=_____________________________________ diff --git a/share/dict/freebsd b/share/dict/freebsd index 2321038fa384..8033e9abf529 100644 --- a/share/dict/freebsd +++ b/share/dict/freebsd @@ -1,4 +1,3 @@ -$FreeBSD$ ABI ACL ACPI diff --git a/share/doc/IPv6/IMPLEMENTATION b/share/doc/IPv6/IMPLEMENTATION index b9665ad9ab7b..9d07013a5cba 100644 --- a/share/doc/IPv6/IMPLEMENTATION +++ b/share/doc/IPv6/IMPLEMENTATION @@ -3,7 +3,6 @@ KAME Project http://www.kame.net/ $KAME: IMPLEMENTATION,v 1.216 2001/05/25 07:43:01 jinmei Exp $ - $FreeBSD$ NOTE: The document tries to describe behaviors/implementation choices of the latest KAME/*BSD stack. The description here may not be diff --git a/share/dtrace/README b/share/dtrace/README index 6855c6aee721..fd07a00587c7 100644 --- a/share/dtrace/README +++ b/share/dtrace/README @@ -1,4 +1,3 @@ -$FreeBSD$ This directory contains scripts for use with the DTrace system. These files and directories contain code generated by the FreeBSD diff --git a/share/examples/IPv6/USAGE b/share/examples/IPv6/USAGE index 7e40f76bcb53..2d9ee60f5c9e 100644 --- a/share/examples/IPv6/USAGE +++ b/share/examples/IPv6/USAGE @@ -1,7 +1,6 @@ USAGE KAME Project $KAME: USAGE,v 1.33 2000/11/22 10:22:57 itojun Exp $ - $FreeBSD$ This is an introduction of how to use the commands provided in the KAME kit. For more information, please refer to each man page. diff --git a/share/examples/bootforth/README b/share/examples/bootforth/README index 1ac13420c9ee..69db86ee8806 100644 --- a/share/examples/bootforth/README +++ b/share/examples/bootforth/README @@ -31,5 +31,3 @@ configuration to distinguish one from the other. Daniel C. Sobral - -$FreeBSD$ diff --git a/share/examples/drivers/README b/share/examples/drivers/README index 6f7e9dc2b091..8628029a62f8 100644 --- a/share/examples/drivers/README +++ b/share/examples/drivers/README @@ -1,4 +1,3 @@ -$FreeBSD$ Author: Julian Elischer diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples index f7bf4ceb8cfb..8ae6fd8158ed 100644 --- a/share/examples/etc/README.examples +++ b/share/examples/etc/README.examples @@ -1,4 +1,3 @@ -$FreeBSD$ The /usr/share/examples/etc directory contains the original distribution versions of the files which are shipped in /etc. This is diff --git a/share/examples/ipfilter/examples.txt b/share/examples/ipfilter/examples.txt index a323a8457752..2faf50a16a0b 100644 --- a/share/examples/ipfilter/examples.txt +++ b/share/examples/ipfilter/examples.txt @@ -512,4 +512,3 @@ pass in quick proto tcp from any to any port = WWW keep state group 100 ------------------------------------------------------------------------ Return to the IP Filter home page -$FreeBSD$ diff --git a/share/examples/ipfilter/ipf-howto.txt b/share/examples/ipfilter/ipf-howto.txt index ca14538f1b67..66f67bd96bf1 100644 --- a/share/examples/ipfilter/ipf-howto.txt +++ b/share/examples/ipfilter/ipf-howto.txt @@ -8,7 +8,6 @@ Brendan Conoboy Erik Fichtner - $FreeBSD$ Fri Apr 20 09:31:14 EDT 2001 diff --git a/share/examples/kld/dyn_sysctl/README b/share/examples/kld/dyn_sysctl/README index 4dfa3c6bdfbd..054a6e2328f7 100644 --- a/share/examples/kld/dyn_sysctl/README +++ b/share/examples/kld/dyn_sysctl/README @@ -4,5 +4,3 @@ wrong place, i.e. to a dynamic oid that could belong to someone else. The framework should deal with this case gracefully. Andrzej Bialecki - -$FreeBSD$ diff --git a/share/examples/kld/firmware/README b/share/examples/kld/firmware/README index 075c5e5723b5..473245a8e2ae 100644 --- a/share/examples/kld/firmware/README +++ b/share/examples/kld/firmware/README @@ -1,4 +1,3 @@ -$FreeBSD$ This is a simple example of the firmware(9) system. It consists of two parts: diff --git a/share/examples/kld/firmware/fwimage/firmware.img.uu b/share/examples/kld/firmware/fwimage/firmware.img.uu index 889fa7ebd4b1..075877e0bcb3 100644 --- a/share/examples/kld/firmware/fwimage/firmware.img.uu +++ b/share/examples/kld/firmware/fwimage/firmware.img.uu @@ -1,4 +1,3 @@ -$FreeBSD$ begin 644 firmware.img M("`@("`@("`@("`@("`L("`@("`@("`L"B`@("`@("`@("`@("`O*"`@("`@ M("`@*0H@("`@("`@("`@("`@7"!<7U]?("`@+R!\"B`@("`@("`@("`@("`O diff --git a/share/examples/kld/khelp/README b/share/examples/kld/khelp/README index 89a2a333fb6e..af201809864c 100644 --- a/share/examples/kld/khelp/README +++ b/share/examples/kld/khelp/README @@ -1,4 +1,3 @@ -$FreeBSD$ *** 3396 LINES SKIPPED *** From nobody Wed Aug 23 17:50: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 4RWDJD4sJzz4r9Ty; Wed, 23 Aug 2023 17:50: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 4RWDJD42VLz4VQB; Wed, 23 Aug 2023 17:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=prMlVm0RLoqHPOLEwnkPmMmVt/ltmSnWV0y2amCZpd4=; b=TLqqSmTfLyqQjhPE9HRi59D4ltxUc44Z7sxVqvQNZ0W/V67BaLApIW1NsKnNV/FE9XiD2D mGPjW/W+RpHA+9O+sqP74ZOFyxdQVLmV3UjqYYBB4uggodyQOiqmrcexIsKgpV8HRVl3I2 ne7PD7vwmCe8y6WnVHzYIWgksFA6GaGFnIV0iWXATFhNus1pCrJKGqQQ3Rc5/668OJ8SPc p9VOWFMU9I7wMpelgIXiO3dNf+0D3TgqTUF2BbwCHUGjPfNEq+rMXRIkIx23qkKzprupX4 Hescz+BaVzlsB7zX8wZWeSzGcKkQf5oq8EPp5fwUTTh1HWDzYJ9nK88zFK6YuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=prMlVm0RLoqHPOLEwnkPmMmVt/ltmSnWV0y2amCZpd4=; b=Hly9ocFty+Kbczu2TBFOeNagcPv2qcqJlOVHd6yI85n2/qX1gC6/ox+SFsJaQq/qrix3Vg 0EgQzeBNwNLpNRIAB69zxfkXZHvxusAeZQ60uB3TymrJA+uZ1AK4b2TmowxF6a0tG467dF S58kI5C0ajAMkc7iAzS+t3Vqr6oN3uK8cu6uCNWG2ddALvOQeA/nn0vjZ9MLuNgyAGs+aM 17nzVhkIwjEuInwV5FItRxLCrPleMPS+r24R9+Kfn2ytYf8i1xstGzTRRTU8brvOfIiGkN Y4bR1pNL9/UYdruhoTpPCG7QHc2aZysknGqteRtiulvNlpyhcmCJQNOUN3Sc5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813004; a=rsa-sha256; cv=none; b=Y/WtTutVtMDs0mO56nhZY/R0NYZlUH/2mS1qBaLU4Ckg5e0w0obPlEiJmYevGwXla3hwQW Bvi/HCKeJxAhUltAYJ/3/Huy5O0RrxWzGr6BrMf/TNFxFBwTdNbFh8G64EooCFmB8z6f1m SaFlrYmM9s3tuYV1AEGbXR6RIepBXkiqvXDroCTtu1YqDltCChxsIwW0R4lKlcZ8N5Pv9y azlZ5Tk0edniHIJlWpRrIQHjXigfcACrtUbWJUgPmVMxPeN5DlY8dbbDWgzua5hozJOGl6 FVfUFwyWXi9/QmM6S7BVpaddZzHfI52u7lUaLInKVNGEx6/0ZbDFHwaZ0+lbTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJD35c1zvQV; Wed, 23 Aug 2023 17:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHo4bR043967; Wed, 23 Aug 2023 17:50:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHo4hM043962; Wed, 23 Aug 2023 17:50:04 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:04 GMT Message-Id: <202308231750.37NHo4hM043962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c1ff431ce583 - stable/13 - sys: Remove $FreeBSD$: one-line catalog List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c1ff431ce583a321707a171631e2c27c809208ba Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c1ff431ce583a321707a171631e2c27c809208ba commit c1ff431ce583a321707a171631e2c27c809208ba Author: Warner Losh AuthorDate: 2023-08-22 01:32:19 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:33 +0000 sys: Remove $FreeBSD$: one-line catalog Remove /^\s*\$\s*\$FreeBSD\$$\n/ Similar commit in current: (cherry picked from commit 2063df147163) --- sys/cddl/compat/opensolaris/sys/policy.h | 1 - sys/cddl/compat/opensolaris/sys/refstr.h | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/cddl/compat/opensolaris/sys/policy.h b/sys/cddl/compat/opensolaris/sys/policy.h index 0b968aead205..ea7aec50e149 100644 --- a/sys/cddl/compat/opensolaris/sys/policy.h +++ b/sys/cddl/compat/opensolaris/sys/policy.h @@ -23,7 +23,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - $ $FreeBSD$ */ #ifndef _OPENSOLARIS_SYS_POLICY_H_ diff --git a/sys/cddl/compat/opensolaris/sys/refstr.h b/sys/cddl/compat/opensolaris/sys/refstr.h index e4e177bf435c..ef0f483d51e6 100644 --- a/sys/cddl/compat/opensolaris/sys/refstr.h +++ b/sys/cddl/compat/opensolaris/sys/refstr.h @@ -23,7 +23,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - $ $FreeBSD$ */ #ifndef _OPENSOLARIS_SYS_REFSTR_H_ From nobody Wed Aug 23 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 4RWDJG1yr4z4r9Y7; Wed, 23 Aug 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 4RWDJF5Vl3z4VY5; Wed, 23 Aug 2023 17:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yQXMxfgdjF9Y/eYLYSjG3w4usgqR4tqOYKPGxFifZf8=; b=vtse1J24Fl/CUo+5i8+b+mzDbc+QTBaaQX/3AAwR1V7TmRIF2gjwZS7jwrblKh/CHK0X9m 69Yoaur6002Rr9dSaJiGr8M9KEqiPGG1GipsMNymnV5JEysf4GUdIr3gdqoXp1VoSbD41v hSy3qPVtMe7EEno7D+jhHXsepsyJv1+0g2kZf1Q3kYbzrtA78KmQgvUAYxHCNTJJbD6/7S HhL7kvg7c65rWrbWddg5MlsJMtb9sPJI5kvuRNFNYNZgUQtjE9wZHZLJ/nXjB2txrpG6sI 2WoZ+mAPVak+b9CtoX8kHccDS4PD6ylhNjrJBBkttwQ1IXnA7/CmauMIx/Y9+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yQXMxfgdjF9Y/eYLYSjG3w4usgqR4tqOYKPGxFifZf8=; b=hpJvzDLXfTLgkyMihEiLo6OhwUPLonGQUB5T8gzd9shYhkzLk2n61P7n2LQV3aViaLRoZT FMb0KaczyS0FjDDGEhY5l6Mssnn97lxuwosSprSYqOfb+HmPNp4HHFLAlVY+4YUEoX05Wy ZsAUBMjbjg8iX+LecJnvALTHG6s38JcVQ3pN9rzLNjSHC6r0o8SqSEaPefhG7jgAMBB8WK 6V5DX95ufKlRb282IqfJi/XkdkB7biZg7v9TYVQFozrLtEsOtDj0f+2S5zkKr2LEJfncDN P6hyvl/4yuXfGg3vJlG3Q4sAPhJPQ20sR9P+7dHMScm6vq4CQLJkPuzGtZXymQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813005; a=rsa-sha256; cv=none; b=CxQTZF8oY1sKtsftbQZfIowu39qu7zSfg2s9NYHJ4BFbueSrZtCjYE0/6OOljjW+2iJemW esHl/jLRAsnFUo69MTuR5v6hEQbOww0tN/ObUzR1mw/We2Qi0pXonj5o1ALPrAHKrQ0LpV JtdI1BJx1lJcMyDxJribRQ4ss1bs3yLSvE6IyEa4NjTA1SPAKh+WYaxknBr6pKqm5lKApW ZxxDc02evKdi9L21rFGXAgIc/jtFNnT5cLN71ww2IiXEw2kLKJRHstscgHHnQrJBTKiIR9 glJXd3K4lawCBYzbAYw6Osc6u1S3WqpfnRXj+nz12HU0bZhvNysmied/gQMBOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJF3T46zv8H; Wed, 23 Aug 2023 17:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHo5su044243; Wed, 23 Aug 2023 17:50:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHo5JV044238; Wed, 23 Aug 2023 17:50:05 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:05 GMT Message-Id: <202308231750.37NHo5JV044238@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 384705193b36 - stable/13 - Remove $FreeBSD$: one-line catalog List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 384705193b360acbae4ffbe86a072a4c92cf81ee Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=384705193b360acbae4ffbe86a072a4c92cf81ee commit 384705193b360acbae4ffbe86a072a4c92cf81ee Author: Warner Losh AuthorDate: 2023-08-22 01:32:22 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:33 +0000 Remove $FreeBSD$: one-line catalog Remove /^\s*\$\s*\$FreeBSD\$$\n/ Similar commit in main: (cherry picked from commit ae992a336e8d) --- lib/libc/nls/C.msg | 1 - lib/libc/nls/be_BY.UTF-8.msg | 1 - lib/libc/nls/ca_ES.ISO8859-1.msg | 1 - lib/libc/nls/de_DE.ISO8859-1.msg | 1 - lib/libc/nls/el_GR.ISO8859-7.msg | 1 - lib/libc/nls/es_ES.ISO8859-1.msg | 1 - lib/libc/nls/fi_FI.ISO8859-1.msg | 1 - lib/libc/nls/fr_FR.ISO8859-1.msg | 1 - lib/libc/nls/gl_ES.ISO8859-1.msg | 1 - lib/libc/nls/hu_HU.ISO8859-2.msg | 1 - lib/libc/nls/it_IT.ISO8859-15.msg | 1 - lib/libc/nls/ja_JP.UTF-8.msg | 1 - lib/libc/nls/ja_JP.eucJP.msg | 1 - lib/libc/nls/ko_KR.UTF-8.msg | 1 - lib/libc/nls/ko_KR.eucKR.msg | 1 - lib/libc/nls/mn_MN.UTF-8.msg | 1 - lib/libc/nls/nl_NL.ISO8859-1.msg | 1 - lib/libc/nls/no_NO.ISO8859-1.msg | 1 - lib/libc/nls/pl_PL.ISO8859-2.msg | 1 - lib/libc/nls/pt_BR.ISO8859-1.msg | 1 - lib/libc/nls/ru_RU.KOI8-R.msg | 1 - lib/libc/nls/sk_SK.ISO8859-2.msg | 1 - lib/libc/nls/sv_SE.ISO8859-1.msg | 1 - lib/libc/nls/uk_UA.UTF-8.msg | 1 - lib/libc/nls/zh_CN.GB18030.msg | 1 - lib/libc/nls/zh_CN.GB2312.msg | 1 - lib/libc/nls/zh_CN.UTF-8.msg | 1 - usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg | 1 - usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg | 1 - usr.bin/ee/nls/hu_HU.ISO8859-2/ee.msg | 1 - usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg | 1 - usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg | 1 - usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg | 1 - usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg | 1 - usr.bin/sort/nls/C.msg | 1 - usr.bin/sort/nls/hu_HU.ISO8859-2.msg | 1 - 36 files changed, 36 deletions(-) diff --git a/lib/libc/nls/C.msg b/lib/libc/nls/C.msg index 4004011d260f..7feea372ed86 100644 --- a/lib/libc/nls/C.msg +++ b/lib/libc/nls/C.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for C locale (template) $ diff --git a/lib/libc/nls/be_BY.UTF-8.msg b/lib/libc/nls/be_BY.UTF-8.msg index 56bd038aca48..5498580e19a4 100644 --- a/lib/libc/nls/be_BY.UTF-8.msg +++ b/lib/libc/nls/be_BY.UTF-8.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for be_BY.UTF-8 locale $ diff --git a/lib/libc/nls/ca_ES.ISO8859-1.msg b/lib/libc/nls/ca_ES.ISO8859-1.msg index e786c29c6b26..5d7556f1b15e 100644 --- a/lib/libc/nls/ca_ES.ISO8859-1.msg +++ b/lib/libc/nls/ca_ES.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for ca_ES.ISO8859-1 locale $ diff --git a/lib/libc/nls/de_DE.ISO8859-1.msg b/lib/libc/nls/de_DE.ISO8859-1.msg index 1bb4a3b45334..d2af2c51a807 100644 --- a/lib/libc/nls/de_DE.ISO8859-1.msg +++ b/lib/libc/nls/de_DE.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for de_DE.ISO8859-1 locale $ diff --git a/lib/libc/nls/el_GR.ISO8859-7.msg b/lib/libc/nls/el_GR.ISO8859-7.msg index ca84929b9eed..b8de3f70b84d 100644 --- a/lib/libc/nls/el_GR.ISO8859-7.msg +++ b/lib/libc/nls/el_GR.ISO8859-7.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for C locale (template) $ diff --git a/lib/libc/nls/es_ES.ISO8859-1.msg b/lib/libc/nls/es_ES.ISO8859-1.msg index 2687c177fd57..01182d7c6e44 100644 --- a/lib/libc/nls/es_ES.ISO8859-1.msg +++ b/lib/libc/nls/es_ES.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for es_ES.ISO8859-1 locale $ diff --git a/lib/libc/nls/fi_FI.ISO8859-1.msg b/lib/libc/nls/fi_FI.ISO8859-1.msg index 491f9a13ab6e..8325f762776c 100644 --- a/lib/libc/nls/fi_FI.ISO8859-1.msg +++ b/lib/libc/nls/fi_FI.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for fi_FI.ISO8859-1 locale $ diff --git a/lib/libc/nls/fr_FR.ISO8859-1.msg b/lib/libc/nls/fr_FR.ISO8859-1.msg index ebc1739ea28c..758e1106ee99 100644 --- a/lib/libc/nls/fr_FR.ISO8859-1.msg +++ b/lib/libc/nls/fr_FR.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for fr_FR.ISO8859-1 locale $ diff --git a/lib/libc/nls/gl_ES.ISO8859-1.msg b/lib/libc/nls/gl_ES.ISO8859-1.msg index 4255dc8a959a..b5b208d99f66 100644 --- a/lib/libc/nls/gl_ES.ISO8859-1.msg +++ b/lib/libc/nls/gl_ES.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for gl_ES.ISO8859-1 locale $ diff --git a/lib/libc/nls/hu_HU.ISO8859-2.msg b/lib/libc/nls/hu_HU.ISO8859-2.msg index 330d486a7b8e..a131eea163c5 100644 --- a/lib/libc/nls/hu_HU.ISO8859-2.msg +++ b/lib/libc/nls/hu_HU.ISO8859-2.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for hu_HU.ISO8859-2 locale $ diff --git a/lib/libc/nls/it_IT.ISO8859-15.msg b/lib/libc/nls/it_IT.ISO8859-15.msg index da3734d04d50..df376bf7ac6b 100644 --- a/lib/libc/nls/it_IT.ISO8859-15.msg +++ b/lib/libc/nls/it_IT.ISO8859-15.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for it_IT.ISO8859-15 locale $ diff --git a/lib/libc/nls/ja_JP.UTF-8.msg b/lib/libc/nls/ja_JP.UTF-8.msg index 6be65fbb5c0a..e22f834b6669 100644 --- a/lib/libc/nls/ja_JP.UTF-8.msg +++ b/lib/libc/nls/ja_JP.UTF-8.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for ja_JP.UTF-8 locale $ diff --git a/lib/libc/nls/ja_JP.eucJP.msg b/lib/libc/nls/ja_JP.eucJP.msg index e3fac48c6a13..51fb8e22a389 100644 --- a/lib/libc/nls/ja_JP.eucJP.msg +++ b/lib/libc/nls/ja_JP.eucJP.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for ja_JP.eucJP locale $ diff --git a/lib/libc/nls/ko_KR.UTF-8.msg b/lib/libc/nls/ko_KR.UTF-8.msg index 60e8a121dfe4..20d368a226b0 100644 --- a/lib/libc/nls/ko_KR.UTF-8.msg +++ b/lib/libc/nls/ko_KR.UTF-8.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for ko_KR.UTF-8 locale $ diff --git a/lib/libc/nls/ko_KR.eucKR.msg b/lib/libc/nls/ko_KR.eucKR.msg index bb1fa300b164..7cdaddd01f51 100644 --- a/lib/libc/nls/ko_KR.eucKR.msg +++ b/lib/libc/nls/ko_KR.eucKR.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for ko_KR.eucKR locale $ diff --git a/lib/libc/nls/mn_MN.UTF-8.msg b/lib/libc/nls/mn_MN.UTF-8.msg index 29ab4c15f50d..429757367ee0 100644 --- a/lib/libc/nls/mn_MN.UTF-8.msg +++ b/lib/libc/nls/mn_MN.UTF-8.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for mn_MN.UTF-8 locale $ diff --git a/lib/libc/nls/nl_NL.ISO8859-1.msg b/lib/libc/nls/nl_NL.ISO8859-1.msg index 2939116fc97c..0048a2ff35cb 100644 --- a/lib/libc/nls/nl_NL.ISO8859-1.msg +++ b/lib/libc/nls/nl_NL.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for nl_NL.ISO8859-1 locale $ diff --git a/lib/libc/nls/no_NO.ISO8859-1.msg b/lib/libc/nls/no_NO.ISO8859-1.msg index 2598f4d9357e..415a01dedfbf 100644 --- a/lib/libc/nls/no_NO.ISO8859-1.msg +++ b/lib/libc/nls/no_NO.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for no_NO.ISO8859-1 locale $ diff --git a/lib/libc/nls/pl_PL.ISO8859-2.msg b/lib/libc/nls/pl_PL.ISO8859-2.msg index 1c184b30997d..ea8951aed15c 100644 --- a/lib/libc/nls/pl_PL.ISO8859-2.msg +++ b/lib/libc/nls/pl_PL.ISO8859-2.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for pl_PL.ISO8859-2 locale $ diff --git a/lib/libc/nls/pt_BR.ISO8859-1.msg b/lib/libc/nls/pt_BR.ISO8859-1.msg index fb1c10056ccf..8e15c82916b8 100644 --- a/lib/libc/nls/pt_BR.ISO8859-1.msg +++ b/lib/libc/nls/pt_BR.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for pt_BR.ISO8859-1 locale $ diff --git a/lib/libc/nls/ru_RU.KOI8-R.msg b/lib/libc/nls/ru_RU.KOI8-R.msg index 48bc1d400150..0fcd0e9b1225 100644 --- a/lib/libc/nls/ru_RU.KOI8-R.msg +++ b/lib/libc/nls/ru_RU.KOI8-R.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for ru_RU.KOI8-R locale $ diff --git a/lib/libc/nls/sk_SK.ISO8859-2.msg b/lib/libc/nls/sk_SK.ISO8859-2.msg index 8efa17d754a1..ba657382f66d 100644 --- a/lib/libc/nls/sk_SK.ISO8859-2.msg +++ b/lib/libc/nls/sk_SK.ISO8859-2.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for sk_SK.ISO8859-2 locale $ diff --git a/lib/libc/nls/sv_SE.ISO8859-1.msg b/lib/libc/nls/sv_SE.ISO8859-1.msg index 13cdd23f87f7..a1aa781dda7d 100644 --- a/lib/libc/nls/sv_SE.ISO8859-1.msg +++ b/lib/libc/nls/sv_SE.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for sv_SE.ISO8859-1 locale $ diff --git a/lib/libc/nls/uk_UA.UTF-8.msg b/lib/libc/nls/uk_UA.UTF-8.msg index af871d942766..f6e4b1781ede 100644 --- a/lib/libc/nls/uk_UA.UTF-8.msg +++ b/lib/libc/nls/uk_UA.UTF-8.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for uk_UA.UTF-8 locale $ diff --git a/lib/libc/nls/zh_CN.GB18030.msg b/lib/libc/nls/zh_CN.GB18030.msg index 0e35d7e9eb73..dbaedd5d0a52 100644 --- a/lib/libc/nls/zh_CN.GB18030.msg +++ b/lib/libc/nls/zh_CN.GB18030.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for zh_CN.GB18030 locale $ diff --git a/lib/libc/nls/zh_CN.GB2312.msg b/lib/libc/nls/zh_CN.GB2312.msg index 46ebb422ff84..27f07d98e3e2 100644 --- a/lib/libc/nls/zh_CN.GB2312.msg +++ b/lib/libc/nls/zh_CN.GB2312.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for zh_CN.GB2312 locale $ diff --git a/lib/libc/nls/zh_CN.UTF-8.msg b/lib/libc/nls/zh_CN.UTF-8.msg index 9475ea8e82da..46e26d6824f5 100644 --- a/lib/libc/nls/zh_CN.UTF-8.msg +++ b/lib/libc/nls/zh_CN.UTF-8.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for zh_CN.UTF-8 locale $ diff --git a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg index 73aa620183c3..5574a2fcab89 100644 --- a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg +++ b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg @@ -3,7 +3,6 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg index 31bfe6ebc39b..8bd0e3eb5f11 100644 --- a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg +++ b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg @@ -3,7 +3,6 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/ee/nls/hu_HU.ISO8859-2/ee.msg b/usr.bin/ee/nls/hu_HU.ISO8859-2/ee.msg index ca6253e9235e..f313ba3a629d 100644 --- a/usr.bin/ee/nls/hu_HU.ISO8859-2/ee.msg +++ b/usr.bin/ee/nls/hu_HU.ISO8859-2/ee.msg @@ -3,7 +3,6 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg b/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg index 94a1eabc414b..13f5cc0e2095 100644 --- a/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg +++ b/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg @@ -3,7 +3,6 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg b/usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg index 592ea171bc52..80adc64e1b38 100644 --- a/usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg +++ b/usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg @@ -4,7 +4,6 @@ $ $ For ee patchlevel 3 $ $ $Header: /home/hugh/sources/old_ae/RCS/ee.msg,v 1.8 1996/11/30 03:23:40 hugh Exp $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg b/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg index bfced0f57204..21f787b989b0 100644 --- a/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg +++ b/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg @@ -5,7 +5,6 @@ $ Based on uk_UA.KOI8-U translation by Olexander Kunytsa $ $ For ee patchlevel 3 $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg b/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg index a9d7fcf1a962..c97de5faf239 100644 --- a/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg +++ b/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg @@ -3,7 +3,6 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/sort/nls/C.msg b/usr.bin/sort/nls/C.msg index 541d1d889647..0e77ef11a04d 100644 --- a/usr.bin/sort/nls/C.msg +++ b/usr.bin/sort/nls/C.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $set 1 $quote " diff --git a/usr.bin/sort/nls/hu_HU.ISO8859-2.msg b/usr.bin/sort/nls/hu_HU.ISO8859-2.msg index 054acc6ad612..3b9f1e14a0c2 100644 --- a/usr.bin/sort/nls/hu_HU.ISO8859-2.msg +++ b/usr.bin/sort/nls/hu_HU.ISO8859-2.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $set 1 $quote " From nobody Wed Aug 23 17:50: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 4RWDJH0gr7z4r9Rv; Wed, 23 Aug 2023 17:50: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 4RWDJG58kcz4VSf; Wed, 23 Aug 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=1692813006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SaBt122HSvBFbTK+R3zVvE15D1MNlmSFDr3+6jXHvjg=; b=h6l4vyeY9OmQmy6NbCDblYjiyssCfW61IhUB1C8Eiyp51qPnGRKvsgISa4FKbOVZqA+e4U mr5y9LNv0l7otJDE2zkh7anl7UnaZFhj2QfZyeYY9BcRo+UEAVSsDxRYdsx+X9OwCjwc8I ZSW4AXfuqUToVmp2QLRdIfRwsrhHDW1gfUlNgStC1RGGvLZ8wk6CZpsnVlSniTqEQ1779r aTmuSauubZf4VuhoTH1jHOUXyE5czPMUHrlYtz7JGQbg0qb2gR+CvFR/j9HtAiwVAVI5/J FR5w8uMJOXGoB4Ux9MttFM+eEphIp7TISGwUextoNZPMgeqUOXEp0E6iWl15YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SaBt122HSvBFbTK+R3zVvE15D1MNlmSFDr3+6jXHvjg=; b=Gh3+mXh0gEAjpCg5E27jCaxVWnEk5pnBNMkvRVDwVpMuBzyAk8T7ctsb2BQawtsh6wWquT J1KNhym6ZLJ6jNODgZd6hOVB5NoQmtZqYJKhyzOXQi6X2MBs8MNZyxv5rtWuoFyaqRjeb/ 9qRJDBZ5g+wCz413Y76p3HYKCFRRmTbWWmkr3Rgp1ptKAQTggE5DKbHJ3eIKBzntearE31 +uUlLwyPpCZfBIJ2fw/+rNBLOgo5KYYc1YMNFyrl2wResjm5tRi5X5motgcj5gcC2TCT+g auJtK12cxesYD7Bh+YEGeyKZq65G94RipgmgsSypyHDXDOBDWb4Ujy7GLPN46g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813006; a=rsa-sha256; cv=none; b=kTQwCvaikxR87+BftIyt848ZJtvWcjn4XiVwQGypRk7l7/jvoM+4CMBfsiyzhyfnJbxSni /JZmxWLKpbsH/SoBhvPb9CmcVxvUGWzev4QuHGMRmpTmFhAcTUd769O/3z1+HuCIxseW+V eWrqYTbOkaVjcMhlR227pZxa5FzYZ8+Tm+HGAHiD+s52RqQThf1CgEq8jmh5ZXonTDh6P+ zMU2vaXnv9Sglv99WKTf7s3i5T8mjkG828SLjg3pkVu14euvHPc0A/Y0edFbhtTVcSZ9/J Ns3iK64sTx2uMO8OHt65ok40ISAmB+HSLAp7TkHbdfSqL8Zkz3CbivvOpttwIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJG4F8DzvL7; Wed, 23 Aug 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.17.1/8.17.1) with ESMTP id 37NHo6vf044522; Wed, 23 Aug 2023 17:50:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHo6pO044517; Wed, 23 Aug 2023 17:50:06 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:06 GMT Message-Id: <202308231750.37NHo6pO044517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 911f99722cfa - stable/13 - sys: Remove $FreeBSD$: two-line lua tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 911f99722cfa214920818bd7a28e75018c314502 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=911f99722cfa214920818bd7a28e75018c314502 commit 911f99722cfa214920818bd7a28e75018c314502 Author: Warner Losh AuthorDate: 2023-08-22 01:32:23 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:33 +0000 sys: Remove $FreeBSD$: two-line lua tag Remove /^--\n--\s*\$FreeBSD\$.*$\n/ Similar commit in current: (cherry picked from commit 8c99d94c900f) --- sys/tools/makesyscalls.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index 67a51c946d4e..9efda5db52d1 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- -- We generally assume that this script will be run by flua, however we've From nobody Wed Aug 23 17:50: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 4RWDJJ0lRkz4r9ls; Wed, 23 Aug 2023 17:50: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 4RWDJH6hNSz4VKw; Wed, 23 Aug 2023 17:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pSn8LmtlRHnqFCboz0ztZqn832TlvwMJ2mgEcMktkrE=; b=yFt23f5ZNOnu9g87iq7DNuf7hK5apr1ns/zbUXNzKSrluTsEc73nrCdH3brsxsMxzNj1mW vlHQs0DkJbRNsWg1R/qZqSga/By0EtbOrbECaUULYys2qi8uG3M4iBH7hrK+8EZMj+9cR0 0/Z34bfuMtPf98vCjij5y2+eJanppHhX5Oae+3NXbRCD4OLM7pfxAa7tb2id1yCxwqSfk9 SFn9a0HagGR+qgbZcuBU6v8XQlj6hTdti2HRTp3D/VSL6H0Na/UdMarQTYlyM4fkL2/8Mo LdE8xvnI7zC77rikB7fIAvxLmmGeJFJ341apww7h5JPCLbaXizq56qRkld3tcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pSn8LmtlRHnqFCboz0ztZqn832TlvwMJ2mgEcMktkrE=; b=w1WxBep+eaTvol+/CvJjbj1Qzyafg0trZkgdw8o+efGXpBdqmetvDNMq377m15uLId/InF XgwRljFaS1Yiu3aYsK+MD8fxuM+rGmtQHRoJt26MLYaCDzKP4Dspyi+AvmLcge6s0+KvoK wNWtgwHQys5c2hua66jg0HI2xZY3bEwvFpwaRlqTICuk6hkAk3eo0Kh+7MlfLXpROp5gFc qS154VR1QoHTfMGLTIxUzQ2tIUaFRGEMydHTO8hFD8PcWgFViilLbI0a3F49PpaOkX3YRj NnmNFzS4MoXBhOkzarvtqGkhPrS8iF29+wv9B9/YaTDTQDtLPvCJYG2XaE2DDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813008; a=rsa-sha256; cv=none; b=OTsg2BrRuH/s3LEQlylNDLcu5v9W+yvz6sdHAPl8Me2Edq/0biyiSkULMMYMTZexKJMF8B L6/rbsWjEeexBbwfS8gliJ9wLGTZoZA+su7s6z0sTowzDLyYRp+Jjfw8MPE6BjTfp2Sjup LClffhNCwb/VgPNntFOOXBINRMjZ39YdRxCjQoM7UkHYP2Cj6BKe5wM0LOM+3ofyGXeIYI nto2wIzaAY89kkUyDIbKbJqetLhcmNgBuf/Dhvs24eKmgvPTRFVB2TE74ZtnHDQejIQLq/ L2Ubo2O56Fd305cFo8Pvk1EkQi8kt1Xtp6kppF9UfOWJ7UOyJdkvFchMPIMikQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJH4qKNztsZ; Wed, 23 Aug 2023 17:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHo7g2044803; Wed, 23 Aug 2023 17:50:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHo7M7044797; Wed, 23 Aug 2023 17:50:07 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:07 GMT Message-Id: <202308231750.37NHo7M7044797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: a7385d2a904a - stable/13 - Remove $FreeBSD$: two-line lua tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a7385d2a904a5e7d8cde296faf9f0b399f318cdb Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a7385d2a904a5e7d8cde296faf9f0b399f318cdb commit a7385d2a904a5e7d8cde296faf9f0b399f318cdb Author: Warner Losh AuthorDate: 2023-08-22 01:32:26 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:33 +0000 Remove $FreeBSD$: two-line lua tag Remove /^--\n--\s*\$FreeBSD\$.*$\n/ Similar commit in main: (cherry picked from commit 9636a14538f5) --- share/snmp/mibs/FREEBSD-MIB.txt | 2 -- stand/lua/cli.lua | 2 -- stand/lua/color.lua | 2 -- stand/lua/config.lua | 2 -- stand/lua/core.lua | 2 -- stand/lua/drawer.lua | 2 -- stand/lua/gfx-beastie.lua | 2 -- stand/lua/gfx-beastiebw.lua | 2 -- stand/lua/gfx-fbsdbw.lua | 2 -- stand/lua/gfx-orb.lua | 2 -- stand/lua/gfx-orbbw.lua | 2 -- stand/lua/hook.lua | 2 -- stand/lua/loader.lua | 2 -- stand/lua/menu.lua | 2 -- stand/lua/password.lua | 2 -- stand/lua/screen.lua | 2 -- usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt | 2 -- 25 files changed, 50 deletions(-) diff --git a/share/snmp/mibs/FREEBSD-MIB.txt b/share/snmp/mibs/FREEBSD-MIB.txt index 0a745c3a3754..71cf67b23f78 100644 --- a/share/snmp/mibs/FREEBSD-MIB.txt +++ b/share/snmp/mibs/FREEBSD-MIB.txt @@ -3,8 +3,6 @@ -- -- FreeBSD SMI { enterprises 2238 } -- --- $FreeBSD$ --- -- ***************************************************************** FREEBSD-MIB DEFINITIONS ::= BEGIN diff --git a/stand/lua/cli.lua b/stand/lua/cli.lua index 11f3b41a7fed..6832da0a31a5 100644 --- a/stand/lua/cli.lua +++ b/stand/lua/cli.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local config = require("config") local core = require("core") diff --git a/stand/lua/color.lua b/stand/lua/color.lua index 72024e241d10..bdb29e6de670 100644 --- a/stand/lua/color.lua +++ b/stand/lua/color.lua @@ -25,8 +25,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local core = require("core") local hook = require("hook") diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 3adad0016bf8..2f66d715016e 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local hook = require("hook") diff --git a/stand/lua/core.lua b/stand/lua/core.lua index 83a522febffe..8a481ee0b782 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local config = require("config") local hook = require("hook") diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua index 24f2f0ddb3b3..2dcf7d5de0f8 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local color = require("color") local config = require("config") diff --git a/stand/lua/gfx-beastie.lua b/stand/lua/gfx-beastie.lua index c806cdb86fa1..443f0fd888ba 100644 --- a/stand/lua/gfx-beastie.lua +++ b/stand/lua/gfx-beastie.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- return { logo = { diff --git a/stand/lua/gfx-beastiebw.lua b/stand/lua/gfx-beastiebw.lua index ffda4c114447..c71e53a9c4e3 100644 --- a/stand/lua/gfx-beastiebw.lua +++ b/stand/lua/gfx-beastiebw.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- return { logo = { diff --git a/stand/lua/gfx-fbsdbw.lua b/stand/lua/gfx-fbsdbw.lua index 7062a0a61e0d..470af71a07b5 100644 --- a/stand/lua/gfx-fbsdbw.lua +++ b/stand/lua/gfx-fbsdbw.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- return { logo = { diff --git a/stand/lua/gfx-orb.lua b/stand/lua/gfx-orb.lua index c313fc1617b7..00f4aeb3bceb 100644 --- a/stand/lua/gfx-orb.lua +++ b/stand/lua/gfx-orb.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- return { logo = { diff --git a/stand/lua/gfx-orbbw.lua b/stand/lua/gfx-orbbw.lua index 641c7eef268a..93ffd2366196 100644 --- a/stand/lua/gfx-orbbw.lua +++ b/stand/lua/gfx-orbbw.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- return { logo = { diff --git a/stand/lua/hook.lua b/stand/lua/hook.lua index 848e47567797..41fde094c228 100644 --- a/stand/lua/hook.lua +++ b/stand/lua/hook.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local hook = {} diff --git a/stand/lua/loader.lua b/stand/lua/loader.lua index 8910af4673f9..454cd7e6332f 100644 --- a/stand/lua/loader.lua +++ b/stand/lua/loader.lua @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- -- The cli module should be included first here. Some of the functions that it -- defines are necessary for the Lua-based loader to operate in general. diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 5fa8c23f0e67..7da03ad9e673 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local cli = require("cli") local core = require("core") diff --git a/stand/lua/password.lua b/stand/lua/password.lua index a47a617944d7..3d3060f5cab3 100644 --- a/stand/lua/password.lua +++ b/stand/lua/password.lua @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local core = require("core") local screen = require("screen") diff --git a/stand/lua/screen.lua b/stand/lua/screen.lua index 34c78ca28725..4437a34f95f1 100644 --- a/stand/lua/screen.lua +++ b/stand/lua/screen.lua @@ -25,8 +25,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local color = require("color") local core = require("core") diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt index bde89b6ee73b..77de04446a54 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt @@ -23,8 +23,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- BEGEMOT-BRIDGE-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt index 9f87b6557c0a..345117db2e39 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt @@ -13,8 +13,6 @@ -- INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED -- WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -- --- $FreeBSD$ --- BRIDGE-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt index ea6648e031b2..b0a44858ff32 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt @@ -13,8 +13,6 @@ -- INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED -- WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -- --- $FreeBSD$ --- RSTP-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt index 0f330c171aaf..44ada542a69d 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt @@ -23,8 +23,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- BEGEMOT-HAST-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt index 3c15e090e1fd..f05ae47f081d 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- -- Additional stuff for the HOST-RESOURCES MIB. -- BEGEMOT-HOSTRES-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt index f8f52a639be0..c4cf536e5043 100644 --- a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt @@ -23,8 +23,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- BEGEMOT-LM75-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt b/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt index b4f0e2a3f993..572fe1820e0c 100644 --- a/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt +++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt @@ -27,8 +27,6 @@ -- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- --- $FreeBSD$ --- -- Private MIB for netgraph part of Begemot SNMP daemon. -- BEGEMOT-NETGRAPH-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt index d92b6ac7d0c6..13a4a646a669 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt @@ -6,8 +6,6 @@ -- this stuff is worth it, you can buy me a beer in return. -Philip Paeps -- ---------------------------------------------------------------------------- -- --- $FreeBSD$ --- BEGEMOT-PF-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt index 69873eddf33d..a377b7b6988d 100644 --- a/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt @@ -25,8 +25,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- BEGEMOT-WIRELESS-MIB DEFINITIONS ::= BEGIN From nobody Wed Aug 23 17:50: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 4RWDJJ75VVz4r9jJ; Wed, 23 Aug 2023 17:50: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 4RWDJJ6NDwz4VYn; Wed, 23 Aug 2023 17:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BweYX/gYXxkYojK9EJgET7bZ9MUxZ0xVSn5sXxRqVJM=; b=u6V20juvOP3OSqT53EZmFzzZIB4uOrpLJ+mMftoYca1SQAKyrkJzP7zzTf/gQ8s5KOOjZl XUeRuEideFPbNvSd2pTANIjEmY3+floi0EduWMdfCRE6YjOMWFi8b0JP9GeCaxwgqFfmec XwX/6ynBUEUR0ruc9T4s4lxZUbXPbqIMG8jUW17UvF8uu76TpOmdZgUN1J1L3IlwcQ9N1a 4tkAFbGdOvJP//WdEPSH1NhF6dM5Y3gjgg13o/cabMzrXX1zug2KQ06q82CvHHIG0qWtnH QlXor8H804CWuupIGAyijEO2LDUSPEjoGeIuwftss8vCw4R9SCEMLviz3uAyBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BweYX/gYXxkYojK9EJgET7bZ9MUxZ0xVSn5sXxRqVJM=; b=GhQh1dJlj8HCfD7AisLyMpF5290nIL1zus2Sp9FyA3NXonrwpPDKxJEmMMSs8i5ixRZsyT X+JudQQO+2g4SqwqUrm77OGa3yj3NmBXH1CssFUkTUzEDY+ZP7Gu08FWQzfuDuCYM9vqCb +q/FDqpiJ2pbXjM3jQnxmxfYZSTQfHYQ5ip1zoNqzXMz29TOXcvtAmOUfuc89rSlnWni9U Db+vSSjzX9Uv0ZEOvb/XSVwrCKO0JGoi6AnLDu9Njay5VDIlwCFr3qQNJvXZbUa59SCUa8 ZvZLvfV/Xfk+9j5ouYuYkrtV+aTtMOVF2RoPM4l2yKDKoTn5nMg87+cibAkgTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813008; a=rsa-sha256; cv=none; b=QeC9xS8OTsN762ahsXTQ9QBq5l26S8Ke5rMRY5608eP56fPssDPuVbcPVd7jk6j32Vy1ko vF40wulHtXDaXW9z1sFPGHVm/vR5U7Y71iFStTTx+8sNcFJNcG4lsi6+XRo0Av7hoH+lT8 oS6qAKw1JZWd04NA+prAhOAcvwFyfsU+cAvu9q0O9ySUT49pAOs6itcpUDHMQwNGDWiv0J TSB9QMMuihv605AGl9U4Jk4ZTkVJsmeb5gbpy5tfTTstbRqJjIi6RQu023a9dgeM8Ay8uc Qk6jo/SdcJaf9jdp5UT2d1jfcqYr9Kqz1DbDFq/QOvXmt6RVmNo6v1yoLYbe2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJJ5PM0ztsb; Wed, 23 Aug 2023 17:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHo84e045079; Wed, 23 Aug 2023 17:50:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHo8uq045075; Wed, 23 Aug 2023 17:50:08 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:08 GMT Message-Id: <202308231750.37NHo8uq045075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 238e32b60663 - stable/13 - Remove $FreeBSD$: one-line lua tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 238e32b6066383c928f5f1450291902ec3c429ae Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=238e32b6066383c928f5f1450291902ec3c429ae commit 238e32b6066383c928f5f1450291902ec3c429ae Author: Warner Losh AuthorDate: 2023-08-22 01:32:30 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:34 +0000 Remove $FreeBSD$: one-line lua tag Remove /^--\s*\$FreeBSD\$.*$\n/ Similar commit in main: (cherry picked from commit 6ef644f5889a) --- share/examples/tests/tests/atf/Kyuafile | 1 - share/examples/tests/tests/plain/Kyuafile | 1 - share/examples/tests/tests/tap/Kyuafile | 1 - share/man/man9/style.lua.9 | 1 - tests/Kyuafile | 1 - tools/lua/template.lua | 1 - tools/pkgbase/metalog_reader.lua | 1 - usr.bin/kyua/kyua.conf-default | 1 - 8 files changed, 8 deletions(-) diff --git a/share/examples/tests/tests/atf/Kyuafile b/share/examples/tests/tests/atf/Kyuafile index 8c60947d1082..ef2407d0f11c 100644 --- a/share/examples/tests/tests/atf/Kyuafile +++ b/share/examples/tests/tests/atf/Kyuafile @@ -1,4 +1,3 @@ --- $FreeBSD$ -- -- Copyright 2013 Google Inc. -- All rights reserved. diff --git a/share/examples/tests/tests/plain/Kyuafile b/share/examples/tests/tests/plain/Kyuafile index c9301b0ef97e..c427a6045e95 100644 --- a/share/examples/tests/tests/plain/Kyuafile +++ b/share/examples/tests/tests/plain/Kyuafile @@ -1,4 +1,3 @@ --- $FreeBSD$ -- -- Copyright 2013 Google Inc. -- All rights reserved. diff --git a/share/examples/tests/tests/tap/Kyuafile b/share/examples/tests/tests/tap/Kyuafile index 032d9a91d8da..64339c54c012 100644 --- a/share/examples/tests/tests/tap/Kyuafile +++ b/share/examples/tests/tests/tap/Kyuafile @@ -1,4 +1,3 @@ --- $FreeBSD$ -- -- Copyright 2013 Google Inc. -- All rights reserved. diff --git a/share/man/man9/style.lua.9 b/share/man/man9/style.lua.9 index d6067ddeb4df..0417efc83c45 100644 --- a/share/man/man9/style.lua.9 +++ b/share/man/man9/style.lua.9 @@ -52,7 +52,6 @@ The preferred method of including other files and modules is with .Fn require name , such as: .Bd -literal --- $FreeBSD$ config = require("config"); menu = require("menu"); diff --git a/tests/Kyuafile b/tests/Kyuafile index 10cf039ae041..3e97c4ce5cde 100644 --- a/tests/Kyuafile +++ b/tests/Kyuafile @@ -1,4 +1,3 @@ --- $FreeBSD$ -- -- Copyright 2011 Google Inc. -- All rights reserved. diff --git a/tools/lua/template.lua b/tools/lua/template.lua index 3662953b0f2e..6c7d33c8ab0f 100644 --- a/tools/lua/template.lua +++ b/tools/lua/template.lua @@ -28,7 +28,6 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ]]-- --- $FreeBSD$ local setmetatable = setmetatable local loadstring = loadstring diff --git a/tools/pkgbase/metalog_reader.lua b/tools/pkgbase/metalog_reader.lua index 518fa46938a0..fc4fa60ac611 100644 --- a/tools/pkgbase/metalog_reader.lua +++ b/tools/pkgbase/metalog_reader.lua @@ -25,7 +25,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. --- $FreeBSD$ function main(args) if #args == 0 then usage() end diff --git a/usr.bin/kyua/kyua.conf-default b/usr.bin/kyua/kyua.conf-default index 9c1e8286eb53..e2e73c66515c 100644 --- a/usr.bin/kyua/kyua.conf-default +++ b/usr.bin/kyua/kyua.conf-default @@ -1,4 +1,3 @@ --- $FreeBSD$ -- -- System-wide configuration file for kyua(1). See kyua.conf(5) for details -- on the syntax. From nobody Wed Aug 23 17:50: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 4RWDJL1CNhz4r9cj; Wed, 23 Aug 2023 17:50: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 4RWDJK6gPnz4VRL; Wed, 23 Aug 2023 17:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SMEG8ZMaHpAKQGUCDwxmAxvXk8/HQiWWg87ti4mjgOU=; b=rRlBGkNX1GFtHyhX+a9kbbFPr2uUomndoJL5QEPBQcSYJBSTXBr7oIWEwjb8CKJ1FMVh7C 73HULaXzDQUyK7lbgjNwdFt0DojoQs36oN33P0ghAZ73mM68D7Y+66u+s1SNuUMjJt8eT7 8A4wc4tzJ4qUGSetDvBfik5GPgbpyy+pv5i3KVdyIlrNSQYrqQ8NoWzmFAz3LZ0iIRHeTm avAnD/pHN81TfFvRrOmWoD2YQIPNUAvw3jeeTIbh08jAEDpn/+d6Sdga0Ig5Dwe+jcCebX DjiNPieT9afjvz/dTKwq61DWho0YF4NrTG064UvYLrCWHTZ7Ix/ZBgpALGCQuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SMEG8ZMaHpAKQGUCDwxmAxvXk8/HQiWWg87ti4mjgOU=; b=pupyy/hU/oW4cRTVlT7O10cVDd4yDox/mOvWS4ajq833MWg69xx2bdK73Luh5GAob1Rjx1 bPnSPyO4p5/gXUMAxXrDcAF43OY9jpE9E/ho/ocA7/t3B3AKOjxtx0Q/5Fe3nJHzU4Ai4h dRuQYUD2uvMht+JqTkjjt0ikRmwrlDcdbO40eE08GTJMuebrS965d5YGWpFTJCh/nfBti9 P9hN96p6wUmN36Gi7y2KkIqb7Dzway54GGAucJTdgSDrbGMHVeCGXv/eRzOfgOllAz8OTt TCsCILieRGndsW2wk4mUSFLFNnh6eEYHf+OMlbHs84WEMYPVrK08aLzaWuB/Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813010; a=rsa-sha256; cv=none; b=nOnydwbRnTvru31U+CadacH0VSvRWXVK5u6heQGrjo+o5hu3g2+6j+pbqrDXhmosaDMVPg NvkIVyz6Utu6256sZnM8TZfhGHcO+cuaKOWOULad6FFQLQ1SDU7tLB9JljPOkFUs5qUURn DXEcKUoHcms7QgkjTwZjwTtTCxmNaJNWWDw1JVwGZAMBwM+beYLtbFz1FvAMgqR7bOSbcI hfytGkGyomT/OE8DLnG+3DjohnAB8EX8YhEyQ+PlSQ/rHRMvFQNlTfuFBNKOTp8/D8D2Qj U2pDl0FbLCp+7ClH9PsMwB4JDEhMoA6ZtUUPOPYUvpk3ZV3rvUK9PWoOUR/tsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJK5mHGzv67; Wed, 23 Aug 2023 17:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHo9Hj045653; Wed, 23 Aug 2023 17:50:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHo9Hv045639; Wed, 23 Aug 2023 17:50:09 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:09 GMT Message-Id: <202308231750.37NHo9Hv045639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 8c86db53ce05 - stable/13 - Remove $FreeBSD$: one-line ps tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8c86db53ce05fd81e42753d04413785ce45c54bd Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8c86db53ce05fd81e42753d04413785ce45c54bd commit 8c86db53ce05fd81e42753d04413785ce45c54bd Author: Warner Losh AuthorDate: 2023-08-22 01:32:34 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:34 +0000 Remove $FreeBSD$: one-line ps tag Remove /^%\s*RCSID:\s*\$FreeBSD\$.*$\n/ Similar commit in main: (cherry picked from commit 401ab69cff8f) --- lib/libc/db/docs/hash.usenix.ps | 1 - lib/libc/db/docs/libtp.usenix.ps | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/libc/db/docs/hash.usenix.ps b/lib/libc/db/docs/hash.usenix.ps index 3a0cf444b1ac..e050cdeba59f 100644 --- a/lib/libc/db/docs/hash.usenix.ps +++ b/lib/libc/db/docs/hash.usenix.ps @@ -7,7 +7,6 @@ % lib/psdit.pro -- prolog for psdit (ditroff) files % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved. % last edit: shore Sat Nov 23 20:28:03 1985 -% RCSID: $FreeBSD$ % Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics, % 17 Feb, 87. diff --git a/lib/libc/db/docs/libtp.usenix.ps b/lib/libc/db/docs/libtp.usenix.ps index b7e441a5755e..57df42730902 100644 --- a/lib/libc/db/docs/libtp.usenix.ps +++ b/lib/libc/db/docs/libtp.usenix.ps @@ -7,7 +7,6 @@ % lib/psdit.pro -- prolog for psdit (ditroff) files % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved. % last edit: shore Sat Nov 23 20:28:03 1985 -% RCSID: $FreeBSD$ % Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics, % 17 Feb, 87. From nobody Wed Aug 23 17:50: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 4RWDJM2797z4r9ZR; Wed, 23 Aug 2023 17:50: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 4RWDJM08XVz4Vkb; Wed, 23 Aug 2023 17:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MX4J8aNMeBkzPVDHkdh2tm0h92dnt68u7KKZHyThvA8=; b=lUqtM0YUY/fAXkmIJM5rfc+QUNpXN5kemSXgUH08c5SzDSIDEGIP6McgjkXCY0ocWCvh46 kanFRgXd/b7yuIDSnfWHcxaywngLg1KzrisJ70HhGVEq2xRe5hT3UlQB7NefcM9lmXqew4 j2BOlK7bCGAis9EmFAu7TpluCq+cZt7Wj+sunb+DV25MvfFz13+F+ls0qafkSgsm/iLCJV tQexLRSrJDfS+A5fikmJ18uMNq8eIdl2+J8s0m0H9udEflUUFZqAN9SBJKi35mpFCoAyN1 V70yM1Ns0s0Fdf1ypZagnuiukkj981FWX1ukavLx9Pu4v/IcEX54yl9PrNH64w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MX4J8aNMeBkzPVDHkdh2tm0h92dnt68u7KKZHyThvA8=; b=WqTg+Rea+rDjvzVP/miVnlz+PAqeVvNxZPdxxhIfvCxCQvlifiCSLHFsccwf9+MgGhJKix hZ9CfG0sHw2gNv+xmlLEWprJQO6/xzexCoCnynx2o9MzIDWS9Y0NPGpNAQXOeEnXw4bgu1 GOawgqCRMjVdhUugG0pYtEJg160eC887cT5L4nhjQIVUHXNNaNJWch2ZvwEpOLIPvyDWUO 4TX2zv79jgAVt1Ha578AFTEhG+2w+sIgbt1PH/1Ms4FO1LhOb30xccQcEcrDTnpuUQyr4U hEASniE/CddKvWxfF7nDzDNEjEC76/28zxJmL7eEWHdhW3gWpibNOz2QMwafSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813011; a=rsa-sha256; cv=none; b=elo+/MhDK6zPeQT23ukO4icSB5x9q6pbJhdqRFiGW42XsBHNKC46T0UZmzO1hS0LmkA1OC XgbrvgqIDqF2dli1k6dukv1xDSNBs2vVkGoG13RwHUyROBSTnDLybvXm2Zwgoz6KxPfVTY QMHTWZ9/c7syHj3YThVYGchJL0WNhKb2b2FmJ/d7HBK9N72M9zE45ZXw5qJBdAnGtm90iw poAwmyOj87xtQuB2HmdJAQi+pgX+OaAz6YW7DU5pR4R9IkyeQ8iL5012PPxCOlbVsA0qfZ xs3NABBinJ8k+BK2wXumf3PmIGBbR4jd0PLjhSSKAUmFr2J3+Eo6j/z0vrOm2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJL6McyzvN9; Wed, 23 Aug 2023 17:50:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHoAwt046324; Wed, 23 Aug 2023 17:50:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHoAb9046309; Wed, 23 Aug 2023 17:50:10 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:10 GMT Message-Id: <202308231750.37NHoAb9046309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 0f015abc4665 - stable/13 - Remove $FreeBSD$: one-line forth tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0f015abc4665a6d5f494800dae552bb92e81ac4e Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0f015abc4665a6d5f494800dae552bb92e81ac4e commit 0f015abc4665a6d5f494800dae552bb92e81ac4e Author: Warner Losh AuthorDate: 2023-08-22 01:32:37 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:34 +0000 Remove $FreeBSD$: one-line forth tag Remove /^\\[\s*]*\$FreeBSD\$.*$\n/ Similar commit in main: (cherry picked from commit 26a58599a09a) --- share/examples/bootforth/boot.4th | 1 - share/examples/bootforth/frames.4th | 1 - share/examples/bootforth/loader.rc | 1 - share/examples/bootforth/menu.4th | 1 - share/examples/bootforth/menuconf.4th | 1 - share/examples/bootforth/screen.4th | 1 - stand/ficl/softwords/classes.fr | 1 - stand/ficl/softwords/ficlclass.fr | 1 - stand/ficl/softwords/ficllocal.fr | 1 - stand/ficl/softwords/fileaccess.fr | 1 - stand/ficl/softwords/forml.fr | 1 - stand/ficl/softwords/freebsd.fr | 1 - stand/ficl/softwords/ifbrack.fr | 1 - stand/ficl/softwords/jhlocal.fr | 1 - stand/ficl/softwords/marker.fr | 1 - stand/ficl/softwords/oo.fr | 1 - stand/ficl/softwords/prefix.fr | 1 - stand/ficl/softwords/softcore.fr | 1 - stand/ficl/softwords/string.fr | 1 - stand/forth/beastie.4th | 1 - stand/forth/brand-fbsd.4th | 1 - stand/forth/brand.4th | 1 - stand/forth/check-password.4th | 1 - stand/forth/color.4th | 1 - stand/forth/delay.4th | 1 - stand/forth/efi.4th | 1 - stand/forth/frames.4th | 1 - stand/forth/loader.4th | 1 - stand/forth/loader.rc | 1 - stand/forth/logo-beastie.4th | 1 - stand/forth/logo-beastiebw.4th | 1 - stand/forth/logo-fbsdbw.4th | 1 - stand/forth/logo-orb.4th | 1 - stand/forth/logo-orbbw.4th | 1 - stand/forth/menu-commands.4th | 1 - stand/forth/menu.4th | 1 - stand/forth/menu.rc | 1 - stand/forth/menusets.4th | 1 - stand/forth/screen.4th | 1 - stand/forth/shortcuts.4th | 1 - stand/forth/support.4th | 1 - stand/forth/version.4th | 1 - stand/i386/loader/loader.rc | 1 - 43 files changed, 43 deletions(-) diff --git a/share/examples/bootforth/boot.4th b/share/examples/bootforth/boot.4th index 8f26e0d0a38d..3f75424e46c5 100644 --- a/share/examples/bootforth/boot.4th +++ b/share/examples/bootforth/boot.4th @@ -1,6 +1,5 @@ \ Example of the file which is automatically loaded by /boot/loader \ on startup. -\ $FreeBSD$ \ Load the screen manipulation words diff --git a/share/examples/bootforth/frames.4th b/share/examples/bootforth/frames.4th index 4f1f9b812a03..0adcf9ef648b 100644 --- a/share/examples/bootforth/frames.4th +++ b/share/examples/bootforth/frames.4th @@ -1,6 +1,5 @@ \ Words implementing frame drawing \ XXX Filled boxes are left as an exercise for the reader... ;-/ -\ $FreeBSD$ marker task-frames.4th diff --git a/share/examples/bootforth/loader.rc b/share/examples/bootforth/loader.rc index 617bc3db4104..e8aa549f5905 100644 --- a/share/examples/bootforth/loader.rc +++ b/share/examples/bootforth/loader.rc @@ -1,6 +1,5 @@ \ Example of the file which is automatically loaded by /boot/loader \ on startup. -\ $FreeBSD$ cr .( Loading Forth extensions:) diff --git a/share/examples/bootforth/menu.4th b/share/examples/bootforth/menu.4th index 5c5c3e98c74e..3462ea9fc5a9 100644 --- a/share/examples/bootforth/menu.4th +++ b/share/examples/bootforth/menu.4th @@ -1,7 +1,6 @@ \ Simple greeting screen, presenting basic options. \ XXX This is far too trivial - I don't have time now to think \ XXX about something more fancy... :-/ -\ $FreeBSD$ : title f_single diff --git a/share/examples/bootforth/menuconf.4th b/share/examples/bootforth/menuconf.4th index a769f77e3543..df53e812aabc 100644 --- a/share/examples/bootforth/menuconf.4th +++ b/share/examples/bootforth/menuconf.4th @@ -1,7 +1,6 @@ \ Simple greeting screen, presenting basic options. \ XXX This is far too trivial - I don't have time now to think \ XXX about something more fancy... :-/ -\ $FreeBSD$ : title f_single diff --git a/share/examples/bootforth/screen.4th b/share/examples/bootforth/screen.4th index 3ea79e453d80..8bd873f48884 100644 --- a/share/examples/bootforth/screen.4th +++ b/share/examples/bootforth/screen.4th @@ -1,5 +1,4 @@ \ Screen manipulation related words. -\ $FreeBSD$ marker task-screen.4th diff --git a/stand/ficl/softwords/classes.fr b/stand/ficl/softwords/classes.fr index b56da378e970..72524b0b9fa5 100644 --- a/stand/ficl/softwords/classes.fr +++ b/stand/ficl/softwords/classes.fr @@ -4,7 +4,6 @@ \ john sadler 1 sep 98 \ Needs oop.fr \ -\ $FreeBSD$ also oop definitions diff --git a/stand/ficl/softwords/ficlclass.fr b/stand/ficl/softwords/ficlclass.fr index 6d75efb0d3c5..471820c1ac8f 100644 --- a/stand/ficl/softwords/ficlclass.fr +++ b/stand/ficl/softwords/ficlclass.fr @@ -7,7 +7,6 @@ \ ** C - W O R D \ Models a FICL_WORD \ -\ $FreeBSD$ object subclass c-word c-word ref: .link diff --git a/stand/ficl/softwords/ficllocal.fr b/stand/ficl/softwords/ficllocal.fr index c916089696c1..86de6f9b6ea5 100644 --- a/stand/ficl/softwords/ficllocal.fr +++ b/stand/ficl/softwords/ficllocal.fr @@ -7,7 +7,6 @@ \ locstate: 0 = looking for -- or }} \ 1 = found -- \ -\ $FreeBSD$ hide 0 constant zero diff --git a/stand/ficl/softwords/fileaccess.fr b/stand/ficl/softwords/fileaccess.fr index 7297df681cf3..137058572f47 100644 --- a/stand/ficl/softwords/fileaccess.fr +++ b/stand/ficl/softwords/fileaccess.fr @@ -4,7 +4,6 @@ \ ** submitted by Larry Hastings, larry@hastings.org \ ** \ -\ $FreeBSD$ : r/o 1 ; : r/w 3 ; diff --git a/stand/ficl/softwords/forml.fr b/stand/ficl/softwords/forml.fr index 1144ef536792..3e7e56ca2ec1 100644 --- a/stand/ficl/softwords/forml.fr +++ b/stand/ficl/softwords/forml.fr @@ -1,7 +1,6 @@ \ examples from FORML conference paper Nov 98 \ sadler \ -\ $FreeBSD$ .( loading FORML examples ) cr object --> sub c-example diff --git a/stand/ficl/softwords/freebsd.fr b/stand/ficl/softwords/freebsd.fr index 96205c0808dd..948398b4e462 100644 --- a/stand/ficl/softwords/freebsd.fr +++ b/stand/ficl/softwords/freebsd.fr @@ -22,7 +22,6 @@ \ ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ ** SUCH DAMAGE. \ ** -\ ** $FreeBSD$ \ Words for use in scripts: \ % ignore errors here diff --git a/stand/ficl/softwords/ifbrack.fr b/stand/ficl/softwords/ifbrack.fr index a8c60626c4f8..b29b8fa08433 100644 --- a/stand/ficl/softwords/ifbrack.fr +++ b/stand/ficl/softwords/ifbrack.fr @@ -2,7 +2,6 @@ \ ** ANS conditional compile directives [if] [else] [then] \ ** Requires ficl 2.0 or greater... \ -\ $FreeBSD$ hide diff --git a/stand/ficl/softwords/jhlocal.fr b/stand/ficl/softwords/jhlocal.fr index 12ccb9fea753..3cbeb78ff9a1 100644 --- a/stand/ficl/softwords/jhlocal.fr +++ b/stand/ficl/softwords/jhlocal.fr @@ -14,7 +14,6 @@ \ \ revised 2 June 2000 - { | a -- } now works correctly \ -\ $FreeBSD$ hide diff --git a/stand/ficl/softwords/marker.fr b/stand/ficl/softwords/marker.fr index ee3c9bdf2f64..3b9e86acaaf0 100644 --- a/stand/ficl/softwords/marker.fr +++ b/stand/ficl/softwords/marker.fr @@ -3,7 +3,6 @@ \ John Sadler, 4 Oct 98 \ Requires ficl 2.02 FORGET-WID !! \ -\ $FreeBSD$ : marker ( "name" -- ) create diff --git a/stand/ficl/softwords/oo.fr b/stand/ficl/softwords/oo.fr index b1c8e214e5bd..0857cbe4b9fb 100644 --- a/stand/ficl/softwords/oo.fr +++ b/stand/ficl/softwords/oo.fr @@ -3,7 +3,6 @@ \ ** F I C L O - O E X T E N S I O N S \ ** john sadler aug 1998 \ -\ $FreeBSD$ 17 ficl-vocabulary oop also oop definitions diff --git a/stand/ficl/softwords/prefix.fr b/stand/ficl/softwords/prefix.fr index ae1727fc00bc..b1491a384425 100644 --- a/stand/ficl/softwords/prefix.fr +++ b/stand/ficl/softwords/prefix.fr @@ -5,7 +5,6 @@ \ (jws) To make a prefix, simply create a new definition in the \ wordlist. start-prefixes and end-prefixes handle the bookkeeping \ -\ $FreeBSD$ variable save-current diff --git a/stand/ficl/softwords/softcore.fr b/stand/ficl/softwords/softcore.fr index 3ec74d8cbece..1350f859f3a2 100644 --- a/stand/ficl/softwords/softcore.fr +++ b/stand/ficl/softwords/softcore.fr @@ -3,7 +3,6 @@ \ ** John Sadler (john_sadler@alum.mit.edu) \ ** September, 1998 \ -\ $FreeBSD$ \ ** Ficl USER variables \ ** See words.c for primitive def'n of USER diff --git a/stand/ficl/softwords/string.fr b/stand/ficl/softwords/string.fr index dabb3900892f..bf6c997c70a7 100644 --- a/stand/ficl/softwords/string.fr +++ b/stand/ficl/softwords/string.fr @@ -11,7 +11,6 @@ \ s" woof woof woof " str --> cat \ str --> type cr \ -\ $FreeBSD$ also oop definitions diff --git a/stand/forth/beastie.4th b/stand/forth/beastie.4th index f64cf9f8720b..8aab8214d37e 100644 --- a/stand/forth/beastie.4th +++ b/stand/forth/beastie.4th @@ -24,7 +24,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-beastie.4th diff --git a/stand/forth/brand-fbsd.4th b/stand/forth/brand-fbsd.4th index 84245ef232b6..ba84ae0d509a 100644 --- a/stand/forth/brand-fbsd.4th +++ b/stand/forth/brand-fbsd.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ 2 brandX ! 1 brandY ! \ Initialize brand placement defaults diff --git a/stand/forth/brand.4th b/stand/forth/brand.4th index 034e4eb40445..6c7cea584eba 100644 --- a/stand/forth/brand.4th +++ b/stand/forth/brand.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-brand.4th diff --git a/stand/forth/check-password.4th b/stand/forth/check-password.4th index e7996227c5f9..cb938625f4d0 100644 --- a/stand/forth/check-password.4th +++ b/stand/forth/check-password.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-check-password.4th diff --git a/stand/forth/color.4th b/stand/forth/color.4th index e73e8b725c31..d3371c17884a 100644 --- a/stand/forth/color.4th +++ b/stand/forth/color.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-color.4th diff --git a/stand/forth/delay.4th b/stand/forth/delay.4th index 28cfa5c26eb9..45c1c5064827 100644 --- a/stand/forth/delay.4th +++ b/stand/forth/delay.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-delay.4th diff --git a/stand/forth/efi.4th b/stand/forth/efi.4th index abcf12cffccd..5d4ed912281d 100644 --- a/stand/forth/efi.4th +++ b/stand/forth/efi.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ only forth definitions diff --git a/stand/forth/frames.4th b/stand/forth/frames.4th index 8d2421c758d9..9103f0f0aa3e 100644 --- a/stand/forth/frames.4th +++ b/stand/forth/frames.4th @@ -23,7 +23,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-frames.4th diff --git a/stand/forth/loader.4th b/stand/forth/loader.4th index 89ea9efc4171..574077ea5710 100644 --- a/stand/forth/loader.4th +++ b/stand/forth/loader.4th @@ -23,7 +23,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ only forth definitions diff --git a/stand/forth/loader.rc b/stand/forth/loader.rc index c15b0f5ce23b..06f2edbd787d 100644 --- a/stand/forth/loader.rc +++ b/stand/forth/loader.rc @@ -1,5 +1,4 @@ \ Loader.rc -\ $FreeBSD$ \ \ You should not edit this file! Put any overrides in loader.rc.local \ instead as this file can be replaced during system updates. diff --git a/stand/forth/logo-beastie.4th b/stand/forth/logo-beastie.4th index 671eb5e496b2..cd049089a44d 100644 --- a/stand/forth/logo-beastie.4th +++ b/stand/forth/logo-beastie.4th @@ -24,7 +24,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ 46 logoX ! 4 logoY ! \ Initialize logo placement defaults diff --git a/stand/forth/logo-beastiebw.4th b/stand/forth/logo-beastiebw.4th index 197099cda0bc..f465dd3d3aa9 100644 --- a/stand/forth/logo-beastiebw.4th +++ b/stand/forth/logo-beastiebw.4th @@ -23,7 +23,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ 46 logoX ! 4 logoY ! \ Initialize logo placement defaults diff --git a/stand/forth/logo-fbsdbw.4th b/stand/forth/logo-fbsdbw.4th index d4a532b78f4f..67c16930c750 100644 --- a/stand/forth/logo-fbsdbw.4th +++ b/stand/forth/logo-fbsdbw.4th @@ -23,7 +23,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ 52 logoX ! 9 logoY ! \ Initialize logo placement defaults diff --git a/stand/forth/logo-orb.4th b/stand/forth/logo-orb.4th index 289353a46926..51efdeaec826 100644 --- a/stand/forth/logo-orb.4th +++ b/stand/forth/logo-orb.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ 46 logoX ! 7 logoY ! \ Initialize logo placement defaults diff --git a/stand/forth/logo-orbbw.4th b/stand/forth/logo-orbbw.4th index 11dc11cabb77..9e49a979f911 100644 --- a/stand/forth/logo-orbbw.4th +++ b/stand/forth/logo-orbbw.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ 46 logoX ! 7 logoY ! \ Initialize logo placement defaults diff --git a/stand/forth/menu-commands.4th b/stand/forth/menu-commands.4th index 9adf30a46b66..decf3fdf6fa4 100644 --- a/stand/forth/menu-commands.4th +++ b/stand/forth/menu-commands.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-menu-commands.4th diff --git a/stand/forth/menu.4th b/stand/forth/menu.4th index 75e75e3e3654..87b4efb8c185 100644 --- a/stand/forth/menu.4th +++ b/stand/forth/menu.4th @@ -24,7 +24,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-menu.4th diff --git a/stand/forth/menu.rc b/stand/forth/menu.rc index d640e803e61f..da9ef49c84cd 100644 --- a/stand/forth/menu.rc +++ b/stand/forth/menu.rc @@ -1,5 +1,4 @@ \ Menu.rc -\ $FreeBSD$ \ \ You should not edit this file! Put any overrides in menu.rc.local \ instead as this file can be replaced during system updates. diff --git a/stand/forth/menusets.4th b/stand/forth/menusets.4th index 9335b80d511a..c3a4f8e8adb2 100644 --- a/stand/forth/menusets.4th +++ b/stand/forth/menusets.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-menusets.4th diff --git a/stand/forth/screen.4th b/stand/forth/screen.4th index e27482248b57..02eff4dd1b5b 100644 --- a/stand/forth/screen.4th +++ b/stand/forth/screen.4th @@ -23,7 +23,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-screen.4th diff --git a/stand/forth/shortcuts.4th b/stand/forth/shortcuts.4th index 33a1cf678988..6ea885102140 100644 --- a/stand/forth/shortcuts.4th +++ b/stand/forth/shortcuts.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ \ FICL words intended to be used as shortcuts for carrying out common tasks or \ producing common results. Generally, words defined here are simply groupings diff --git a/stand/forth/support.4th b/stand/forth/support.4th index 999ac5005f5d..49318e067678 100644 --- a/stand/forth/support.4th +++ b/stand/forth/support.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ \ Loader.rc support functions: \ diff --git a/stand/forth/version.4th b/stand/forth/version.4th index a5311b4442ac..e92d77b321c8 100644 --- a/stand/forth/version.4th +++ b/stand/forth/version.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-version.4th diff --git a/stand/i386/loader/loader.rc b/stand/i386/loader/loader.rc index 9f1ebe635971..4bac6ef6801d 100644 --- a/stand/i386/loader/loader.rc +++ b/stand/i386/loader/loader.rc @@ -1,5 +1,4 @@ \ Loader.rc -\ $FreeBSD$ \ \ Includes additional commands include /boot/loader.4th From nobody Wed Aug 23 17:50: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 4RWDJN2ndbz4r9S3; Wed, 23 Aug 2023 17:50: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 4RWDJN0yKhz4VcQ; Wed, 23 Aug 2023 17:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CPe5y3Dnnq+kVzEuGp65kpngmDPwUmiwdV2q3JnU76o=; b=W0OUdpMIZxw5Tc36xbfG5NsDhcAQuNv70r4Vk748T5F5tB2R6YNQU7Gjjmsy/Bc6ZmUokp jqJjZakIV7n3WYLZAD90TWydEtQIcBKf9F6WDHYRNTfXQStPBy549sYsqFgel/GQTOSDqq prI7ddtuVKV4UbzC3gnv8bbVFfgbk6FF+/Ofe2HZ1rFkzl5mjS9W0GBO92tjdNJUslR7TI NbQDYVF+D0wTt4j1FHFsu/g3brfyBgRaQ7vpqW1gmQIvNH15KacR6mOM63AdJOTS2xe6Oj e+Ixsdza+bR5l/zy25QPkq6+NmaRbKdBNtIyNJA2lWiDwef3nv/KL4u/5dURbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CPe5y3Dnnq+kVzEuGp65kpngmDPwUmiwdV2q3JnU76o=; b=JiRSwXM0wqRrSizkBxjSwqVyOgq5ESZfAK+iyY0cHSDzvC+9yDzv5/gmTRKtdMTIX+yUDQ oOkaIOssaycqHD3gtnbsjQwGdL3x3l85atDBB7RB5FXtKDBAV6KD/myBsAU/FEHiY393I1 /r0XReDPg3pafdHNtKqP6MarlV44ILLJYSrpSMFEiDVqNTaIycMpeHzURNkGp8fmG+4v30 Vthu9DbDauR+okCwn/oRy5sX9HBiufxV+5pH1IBiQXPcUIwCc/3r3E5+WfmtGmfmfBzvLW cG8304B0LCq0+ft6njHxuYYiBkQo3w/80vMacQBbT0diQ+mAhdHI07d35/l4BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813012; a=rsa-sha256; cv=none; b=jjJ7qvyKNzNg9jY8/WS5/JWn7GjVIboVA11mQRQSncbqqueHSYOdAqYgPTTLu0dFiDDEQr 7S17w0Y3BycTndxiIeETDZzxVrA0hDIQGe22JCwT8HHfGjNOFJT0EzsxC9MXZBY96o0Zx6 Tc29iMrTSnxhk1CRkQiybWFHGFYX+oUtFV9g2srQKGQO02dGq9kZYoQQEv/a/5HT+LN8yN 0rR8BLzPZTA+4d+pDW0saixfyR4FBjiOXLCCZ/j6hyoNT4Uaj9TGnRIlNMWF4JAFPf2U0q DmAkWfsaXGTUok/BJgShhBv4bRJgUIy7sXYO+RQvy7jsNLCwekokeLCf89Majg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJM6zF3zv68; Wed, 23 Aug 2023 17:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHoBEb046965; Wed, 23 Aug 2023 17:50:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHoBRO046954; Wed, 23 Aug 2023 17:50:11 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:11 GMT Message-Id: <202308231750.37NHoBRO046954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 636cb7f7b000 - stable/13 - Remove $FreeBSD$: one-line xdr pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 636cb7f7b00006e1919853899e2195949f7c084b Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=636cb7f7b00006e1919853899e2195949f7c084b commit 636cb7f7b00006e1919853899e2195949f7c084b Author: Warner Losh AuthorDate: 2023-08-22 01:32:41 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:34 +0000 Remove $FreeBSD$: one-line xdr pattern Remove /^\s*%\s*__FBSDID\("\$FreeBSD\$"\);?\s*\n/ Similar commit in main: (cherry picked from commit 9524e274b548) --- include/rpcsvc/bootparam_prot.x | 1 - include/rpcsvc/crypt.x | 1 - include/rpcsvc/key_prot.x | 1 - include/rpcsvc/klm_prot.x | 1 - include/rpcsvc/mount.x | 1 - include/rpcsvc/nfs_prot.x | 1 - include/rpcsvc/nis.x | 1 - include/rpcsvc/nis_cache.x | 1 - include/rpcsvc/nis_callback.x | 1 - include/rpcsvc/nlm_prot.x | 1 - include/rpcsvc/pmap_prot.x | 1 - include/rpcsvc/rex.x | 1 - include/rpcsvc/rnusers.x | 1 - include/rpcsvc/rquota.x | 1 - include/rpcsvc/rstat.x | 2 -- include/rpcsvc/sm_inter.x | 1 - include/rpcsvc/spray.x | 1 - include/rpcsvc/yp.x | 1 - include/rpcsvc/yppasswd.x | 1 - include/rpcsvc/ypupdate_prot.x | 1 - include/rpcsvc/ypxfrd.x | 1 - usr.sbin/rpc.yppasswdd/yppasswd_private.x | 1 - 22 files changed, 23 deletions(-) diff --git a/include/rpcsvc/bootparam_prot.x b/include/rpcsvc/bootparam_prot.x index 548d618755d7..6e47bdb218d3 100644 --- a/include/rpcsvc/bootparam_prot.x +++ b/include/rpcsvc/bootparam_prot.x @@ -51,7 +51,6 @@ %/*static char sccsid[] = "from: @(#)bootparam_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const MAX_MACHINE_NAME = 255; diff --git a/include/rpcsvc/crypt.x b/include/rpcsvc/crypt.x index 3b296c0ddf1d..7d6b94d96067 100644 --- a/include/rpcsvc/crypt.x +++ b/include/rpcsvc/crypt.x @@ -32,7 +32,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif /* diff --git a/include/rpcsvc/key_prot.x b/include/rpcsvc/key_prot.x index 1fccd957941d..09a20049832e 100644 --- a/include/rpcsvc/key_prot.x +++ b/include/rpcsvc/key_prot.x @@ -48,7 +48,6 @@ %/* From: #pragma ident "@(#)key_prot.x 1.7 94/04/29 SMI" */ %/* Copyright (c) 1990, 1991 Sun Microsystems, Inc. */ %#include -%__FBSDID("$FreeBSD$"); % %/* % * Compiled from key_prot.x using rpcgen. diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x index 5860f3251c17..b78dbfc20c3c 100644 --- a/include/rpcsvc/klm_prot.x +++ b/include/rpcsvc/klm_prot.x @@ -44,7 +44,6 @@ %/*static char sccsid[] = "from: @(#)klm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const LM_MAXSTRLEN = 1024; diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x index 9ebee835b273..e67cbc73d867 100644 --- a/include/rpcsvc/mount.x +++ b/include/rpcsvc/mount.x @@ -39,7 +39,6 @@ %/*static char sccsid[] = "from: @(#)mount.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const MNTPATHLEN = 1024; /* maximum bytes in a pathname argument */ diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x index 17791b6a18b2..9706c5a03bbd 100644 --- a/include/rpcsvc/nfs_prot.x +++ b/include/rpcsvc/nfs_prot.x @@ -35,7 +35,6 @@ %/*static char sccsid[] = "from: @(#)nfs_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const NFS_PORT = 2049; diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x index ee822d039b86..bd1e61828dec 100644 --- a/include/rpcsvc/nis.x +++ b/include/rpcsvc/nis.x @@ -31,7 +31,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif /* diff --git a/include/rpcsvc/nis_cache.x b/include/rpcsvc/nis_cache.x index 6edaea92c38b..e55173994c13 100644 --- a/include/rpcsvc/nis_cache.x +++ b/include/rpcsvc/nis_cache.x @@ -39,7 +39,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif #ifdef RPC_HDR diff --git a/include/rpcsvc/nis_callback.x b/include/rpcsvc/nis_callback.x index 74a555b4f16b..7b717e918dcc 100644 --- a/include/rpcsvc/nis_callback.x +++ b/include/rpcsvc/nis_callback.x @@ -40,7 +40,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif /* diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x index 87bf6c844359..f53d81996801 100644 --- a/include/rpcsvc/nlm_prot.x +++ b/include/rpcsvc/nlm_prot.x @@ -15,7 +15,6 @@ %/*static char sccsid[] = "from: * @(#)nlm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ %__RCSID("$NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $"); %#endif /* not lint */ -%__FBSDID("$FreeBSD$"); #endif /* diff --git a/include/rpcsvc/pmap_prot.x b/include/rpcsvc/pmap_prot.x index 19a4d8c5a2fd..fb8a3bbde044 100644 --- a/include/rpcsvc/pmap_prot.x +++ b/include/rpcsvc/pmap_prot.x @@ -36,7 +36,6 @@ % %#pragma ident "@(#)pmap_prot.x 1.6 94/04/29 SMI" %#include -%__FBSDID("$FreeBSD$"); % %#ifndef _KERNEL % diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x index 4d4bda65f283..20cce24e0ffa 100644 --- a/include/rpcsvc/rex.x +++ b/include/rpcsvc/rex.x @@ -39,7 +39,6 @@ %/*static char sccsid[] = "from: @(#)rex.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const STRINGSIZE = 1024; diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x index 421a515ac725..1b6dcada2ff1 100644 --- a/include/rpcsvc/rnusers.x +++ b/include/rpcsvc/rnusers.x @@ -39,7 +39,6 @@ %/*static char sccsid[] = "from: @(#)rnusers.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const MAXUSERS = 100; diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x index 8c8dfe452b54..b4ef0d3a6dda 100644 --- a/include/rpcsvc/rquota.x +++ b/include/rpcsvc/rquota.x @@ -8,7 +8,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif const RQ_PATHLEN = 1024; diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x index a34456082afa..1b62470777e8 100644 --- a/include/rpcsvc/rstat.x +++ b/include/rpcsvc/rstat.x @@ -51,8 +51,6 @@ %/*static char sccsid[] = "from: @(#)rstat.x 2.2 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); - #endif /* def RPC_HDR */ const RSTAT_CPUSTATES = 4; diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x index 42a00915e8f7..a9a69c8b24eb 100644 --- a/include/rpcsvc/sm_inter.x +++ b/include/rpcsvc/sm_inter.x @@ -40,7 +40,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif program SM_PROG { diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x index b6a5b849a079..406d318a4943 100644 --- a/include/rpcsvc/spray.x +++ b/include/rpcsvc/spray.x @@ -40,7 +40,6 @@ %/*static char sccsid[] = "from: @(#)spray.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const SPRAYMAX = 8845; /* max amount can spray */ diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x index 91614b20486f..d11902c4a279 100644 --- a/include/rpcsvc/yp.x +++ b/include/rpcsvc/yp.x @@ -37,7 +37,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif const YPMAXRECORD = 16777216; diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x index 1b39a632fa94..2ad2215689f3 100644 --- a/include/rpcsvc/yppasswd.x +++ b/include/rpcsvc/yppasswd.x @@ -40,7 +40,6 @@ %/*static char sccsid[] = "from: @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif program YPPASSWDPROG { diff --git a/include/rpcsvc/ypupdate_prot.x b/include/rpcsvc/ypupdate_prot.x index 90648a023e6e..328a07432f0d 100644 --- a/include/rpcsvc/ypupdate_prot.x +++ b/include/rpcsvc/ypupdate_prot.x @@ -35,7 +35,6 @@ %/* from @(#)ypupdate_prot.x 1.3 91/03/11 TIRPC 1.0 */ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif % %/* diff --git a/include/rpcsvc/ypxfrd.x b/include/rpcsvc/ypxfrd.x index e6ff902a1dfe..44ce886f64f5 100644 --- a/include/rpcsvc/ypxfrd.x +++ b/include/rpcsvc/ypxfrd.x @@ -66,7 +66,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif /* XXX cribbed from yp.x */ diff --git a/usr.sbin/rpc.yppasswdd/yppasswd_private.x b/usr.sbin/rpc.yppasswdd/yppasswd_private.x index a1d6be51f369..d1e32f8819b5 100644 --- a/usr.sbin/rpc.yppasswdd/yppasswd_private.x +++ b/usr.sbin/rpc.yppasswdd/yppasswd_private.x @@ -32,7 +32,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif #ifdef RPC_HDR From nobody Wed Aug 23 17:50: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 4RWDJP22R7z4r9cm; Wed, 23 Aug 2023 17:50: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 4RWDJP1LSwz4VX5; Wed, 23 Aug 2023 17:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SahuP4dz0J1flJWmiMp3sIgldFrQko1EoHFMfSipLjE=; b=Ln6Xh1D+58Bm0aH2/BCtC3UiQRHK0uf/d47Phlo87Y+HSIlwfRrzbg6OLepKSfED+n6PGB 60waNW99GHAK4/KPp2psuWgbE8+ew6LKcKtVEwzYSidMOIm3wjNxapDEcfH/HaNecxVpkm 8327OwTUaJok818SyN7lThW3dJrUz9AQff+xdNefIB9QNf6vjMmJ45/WM16gb7qw3TZLzh tSXMEPkBWx8jBmy/tU1HPZ5+ro4AN3FiU3deplkxJVLMlWMVtiO43lnTK9yYbq6s8Kgz4r rkQaY7AwEMghE2x8jW6xDkub/wNx3uBEvrevPTozrUtistQyEq/9kQdVgw7z8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SahuP4dz0J1flJWmiMp3sIgldFrQko1EoHFMfSipLjE=; b=PEPmhke7QWBWzNZ/9Bw8x+W/mXvAMMfy61OrVDjnljFIqzMzpbX6eyALvxhB1R+vHq79Uw ++r7w/moofw0lQ2BmpsJpAbsZOYBi9+n9XYVMalGWujS6olPYk8IamcWzHNNoPIlxTyEtx 3GwYuunv6uMnh7HqVJhexjZblzYQhV6ran09eLoyEnO6oW6p5ZS9ubRYgMAyrQSUaeuBYo yatpW9wIHkEjQkc7ZzMOZSC/m4/McF5bWoyRsqgsPazsfifjM+QvFGS0zWXlYL2Z1bG0QY Xi100UuBg1hAbDmmF8EAUowTYvJfMSkZQXJFUngHVsYCtTcAxEnCUU96pZ6uzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813013; a=rsa-sha256; cv=none; b=d+48HIKAxUMpUE22SE3J3TLUh9qwOfB3aWIACQrniPhbJhx+9qCLY+tByECUDFf15rE9jy FQRWxTF3qtn40G5dH4pCGIZqkPhGDKLmhHHLyhYqpssbhMsNc4cLGOMmr0/Fb4nagp7/Sy d41IewBcVS6AkT8RI86xpquwbpEtp0RpOelW86C8W2sqd3nLyD3S6GrZX+aZUF7OFAyYth Tayp9rpWgJp4Zm0eAWWhJD4UajeUxiDxuBWwFSLq7wHu5IvBN7Im/m0Njl4hilHdESQ4GT up7tlAFDEjYiQvz1YdpMxJMkX+s+il164vA164k8o1drwgVYXhZj/KCp5tqy1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJP0PGRzv69; Wed, 23 Aug 2023 17:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHoCVV047599; Wed, 23 Aug 2023 17:50:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHoCdS047591; Wed, 23 Aug 2023 17:50:12 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:12 GMT Message-Id: <202308231750.37NHoCdS047591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: bf9ded09cd98 - stable/13 - Delete trailing whitespace from $FreeBSD$ removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bf9ded09cd9856efa203b04fd48d62aa2fcd2dbe Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bf9ded09cd9856efa203b04fd48d62aa2fcd2dbe commit bf9ded09cd9856efa203b04fd48d62aa2fcd2dbe Author: Warner Losh AuthorDate: 2023-08-22 01:34:15 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:34 +0000 Delete trailing whitespace from $FreeBSD$ removal Fixes: d4bf8003ee42 Sponsored by: Netflix (cherry picked from commit 682d5a87e51966939710fb52cc4e8fbb7bff04b5) --- sys/crypto/aesni/aeskeys_amd64.S | 1 - sys/crypto/aesni/aeskeys_i386.S | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/crypto/aesni/aeskeys_amd64.S b/sys/crypto/aesni/aeskeys_amd64.S index 83f704c9ae53..667e64f441a5 100644 --- a/sys/crypto/aesni/aeskeys_amd64.S +++ b/sys/crypto/aesni/aeskeys_amd64.S @@ -219,4 +219,3 @@ ENTRY(aesni_set_deckey) retq .cfi_endproc END(aesni_set_deckey) - diff --git a/sys/crypto/aesni/aeskeys_i386.S b/sys/crypto/aesni/aeskeys_i386.S index 346014412640..770c21dbf938 100644 --- a/sys/crypto/aesni/aeskeys_i386.S +++ b/sys/crypto/aesni/aeskeys_i386.S @@ -269,4 +269,3 @@ ENTRY(aesni_set_deckey) retl .cfi_endproc END(aesni_set_deckey) - From nobody Wed Aug 23 17:50: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 4RWDJQ3BjNz4r9jf; Wed, 23 Aug 2023 17:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWDJQ2Tllz4Vj8; Wed, 23 Aug 2023 17:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HHoKJmYBANkowXh4bHoOv5m4H22T/pVk6SkqGGoghow=; b=RkqiP53g0aWjj5PgZ6Dwy3cJQrtwO/B6cAU9ZqkiXuHFr0l70AG8y2F5SPtoDs+EM8C5n/ iemf1SvQE+R14rdD01RrklxrJB4FoP66HAhLfEHpsSl2Mn7rMn+OihqokfxM60bVRLESF5 dN9cQEBnRV32zGFO5SQ1rjhHuiU7fgm6jyy0hVmc9ZEUJ8GfTAPsThDwhdIiS7YeSHfleE v9IUExJfTJ24bLN6y5lJUc6F3SrCON8C9eNEIAi17Mqyr4AhgXKrPk1TwVv/AdIuoyIWIk yF0dQ2xOsmPZeDTa4QxVaibbs9uwMpqzyCPdp8K1NexO0XvdxEqDSVxcT4cl5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HHoKJmYBANkowXh4bHoOv5m4H22T/pVk6SkqGGoghow=; b=SJX5hKB0cq+JqXo/WXsOH4JCpaRf36pIDE40R7CyFxEx3CtfU5UKsLjFAZHuBcwU0OhoYS jBayR10l0cGTWzQWBAAZ7fc5Hz2MjhM9v1jn0k63ggNiOIEcDRkbMFCBEKB6Qps41WluIJ CUNTOAuQQEpe/MBk298qdnaI4c/n++HQW6/28KqqW2oQxY74ksvqJG6f1dipiqG6+Z13Ve bIPM25od26Yo7C88IlqNbeGGjmuZTOTJ0c4+QYHrguN7BUb5kv9suNbVvTeqaUjgnDybXr nqRxy+caR5u8EkolaHreNBRI3FEe/8vzHAjDYa+KcbGifDdNZ+n3XJ1iRhEJTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813014; a=rsa-sha256; cv=none; b=pdlDGEPY3ZijiNb03LeLSlzxti2mL0AKgr2MnjxuiXZzhyB0UptdNyB7uu3QGIMJk1dhRP YS8U5wCIMp60DuvURHQQOBJyXQNOQBlwgXN6PBDQQj1YQHiO9YP+JL3onZ7Hx7+yT5qznd y2L36aJSE/cKSR9I8xQKyzVwltb+4+zCXcP507SlEVzsqfEP8jZsUY+Wm02NrsuPmo+7Bq vAWq3brPo6asZ0LxkNsv/Iv/KoNUfusm58UVFxf8sabDCxyEY8J2joIcu9RyIbC5aS+KpB Sb5z6NUzEFaBY71uAwoH3Yoyap2iQ3SOq0UKfl+hXp6R+a9QcJJCzt1kEsGyww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJQ10K1zv8J; Wed, 23 Aug 2023 17:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHoEcM048291; Wed, 23 Aug 2023 17:50:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHoEms048286; Wed, 23 Aug 2023 17:50:14 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:14 GMT Message-Id: <202308231750.37NHoEms048286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: fcd0bbbd4aa9 - stable/13 - makefs: clean up some leftovers after $FreeBSD$ tag removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fcd0bbbd4aa90e025bb2cc2a0a74b98d784e0ba1 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fcd0bbbd4aa90e025bb2cc2a0a74b98d784e0ba1 commit fcd0bbbd4aa90e025bb2cc2a0a74b98d784e0ba1 Author: Ed Maste AuthorDate: 2023-03-30 14:02:02 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:34 +0000 makefs: clean up some leftovers after $FreeBSD$ tag removal Fixes: 2a63c3be1582 (cherry picked from commit 90aad5d3e44d137ce80d2ec257de07c7c1367bd3) --- usr.sbin/makefs/cd9660/Makefile.inc | 2 -- usr.sbin/makefs/ffs/Makefile.inc | 2 -- usr.sbin/makefs/msdos.c | 3 --- usr.sbin/makefs/msdos/Makefile.inc | 2 -- usr.sbin/makefs/tests/makefs_cd9660_tests.sh | 2 -- usr.sbin/makefs/tests/makefs_ffs_tests.sh | 2 -- usr.sbin/makefs/tests/makefs_tests_common.sh | 2 -- 7 files changed, 15 deletions(-) diff --git a/usr.sbin/makefs/cd9660/Makefile.inc b/usr.sbin/makefs/cd9660/Makefile.inc index be08e8e34cd9..e596309a6243 100644 --- a/usr.sbin/makefs/cd9660/Makefile.inc +++ b/usr.sbin/makefs/cd9660/Makefile.inc @@ -1,5 +1,3 @@ -# - .PATH: ${SRCDIR}/cd9660 CFLAGS+=-I${SRCTOP}/sys/fs/cd9660/ diff --git a/usr.sbin/makefs/ffs/Makefile.inc b/usr.sbin/makefs/ffs/Makefile.inc index bf62ac8bf926..0db1750ab282 100644 --- a/usr.sbin/makefs/ffs/Makefile.inc +++ b/usr.sbin/makefs/ffs/Makefile.inc @@ -1,5 +1,3 @@ -# - .PATH: ${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs SRCS+= ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c SRCS+= buf.c mkfs.c diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c index 07238a9aed63..c310e24c4908 100644 --- a/usr.sbin/makefs/msdos.c +++ b/usr.sbin/makefs/msdos.c @@ -33,9 +33,6 @@ #endif #include -#if defined(__RCSID) && !defined(__lint) -#endif /* !__lint */ - #include #if !HAVE_NBTOOL_CONFIG_H diff --git a/usr.sbin/makefs/msdos/Makefile.inc b/usr.sbin/makefs/msdos/Makefile.inc index 3fb55c5394fc..78ddc7804b31 100644 --- a/usr.sbin/makefs/msdos/Makefile.inc +++ b/usr.sbin/makefs/msdos/Makefile.inc @@ -1,5 +1,3 @@ -# - MSDOS= ${SRCTOP}/sys/fs/msdosfs MSDOS_NEWFS= ${SRCTOP}/sbin/newfs_msdos diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh index 3f9b37abee4c..2fdf47f76a4c 100644 --- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh +++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh @@ -23,8 +23,6 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# # A note on specs: # - A copy of the ISO-9660 spec can be found here: diff --git a/usr.sbin/makefs/tests/makefs_ffs_tests.sh b/usr.sbin/makefs/tests/makefs_ffs_tests.sh index fafec4c885fb..2505b2e24d72 100644 --- a/usr.sbin/makefs/tests/makefs_ffs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_ffs_tests.sh @@ -23,8 +23,6 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# MAKEFS="makefs -t ffs" MOUNT="mount" diff --git a/usr.sbin/makefs/tests/makefs_tests_common.sh b/usr.sbin/makefs/tests/makefs_tests_common.sh index 08f687fa44a4..12c7c7c84fb7 100644 --- a/usr.sbin/makefs/tests/makefs_tests_common.sh +++ b/usr.sbin/makefs/tests/makefs_tests_common.sh @@ -23,8 +23,6 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# KB=1024 : ${TMPDIR=/tmp} From nobody Wed Aug 23 17:50: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 4RWDJR38hDz4r9SC; Wed, 23 Aug 2023 17:50: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 4RWDJR2RmPz4Vtd; Wed, 23 Aug 2023 17:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62xSbLXSMejuLq995JiN8kVXJcsSdvt2S9oAE6LY93s=; b=ErA4caIfQaNUsAO/b5FLFCF9DUqtAjc9/flJKZP0ZmOAc9fQTyNKSgpVwcp7aKG0Z8aCLm NeKHnW3pWoaDuX/YzZOBe099PwIX5DJBaXED18P/6qyYYu7AsHsf2dvTmj0HnYr2NHYR+0 Eie3pF15CP6dYo7YtaMTzgV5X4ahjNgllBlWPU/KH3MUtSZMHRvWA9v1JeG/I7T7Cg7470 BjT47ujmFeyX+QdPdjL38O2L4fcwtann1SHYFp3Sl3voAyL/d76aSRA0efHCSaWcVjlrM/ b3TAjpk/GruzvdQeXzZPHx2V7lANbh2NlxSoDILX9fUmdRagdJlfE1Ahgkj6Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62xSbLXSMejuLq995JiN8kVXJcsSdvt2S9oAE6LY93s=; b=HA0FaPPh8wMyfQNEAaeHNwra7o43+Pr6DKK5dHfPsHNZ71WdiS4tbwStGrWfia3TooiJa4 SUUzWaQLUean6l8LjbXDvBjCpuBHsMPTLS+l7KnOK7X/23WJh8Qg4QOaNQxDIdTA9a2zKy UWyQ4KzsS1DK3T/UJMPVbZtZaJ1M3Ke/x2dwCu6qx9W5DR9mprKlGFiYVPqfHeQPftS0u5 tcd+2FyZxnqv+4SFbbLvKjbZTza4G4HwcZxObLdeUUHoEs6yuCfJld/vsfWxxKvObpJnlf 0bwxM6xAmYs3nTTZ+eKhuc3sCNU+fjEQR6rz7HvJYsNTpUp0yMXJxJLHHrv2cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813015; a=rsa-sha256; cv=none; b=S9TByyUscOv3dh3yBFL0cKIcwsEPcgX6bPDCrZ33/gCXo9K2bMwrmTUOGlsZv7vLfpDlh+ bAQFsKyouILIJKNtR0M7PGgIXdbjjSABIGukCmPFxClCWfIfvk9pWvjlF028quI9q7E+1R /t/Ymtdsxb9p/TTbkS9u1osfUVFesCo0mwu3Ukd7mrTLAmJYCc2cWqAATRi9/d1WmhRYu/ CjXptErQUtYQtneZptunDzFqqFLn83VWxbTyO0W82+1tQitulGqV/wtZy5+G+tW5c+B9w6 GGU+9b5LB3VeCW+VASkEIEwxxviNBpAKDtO0Bi+ufnYhgM1nb/ybxjt+GG2BYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJR1YMTzv8K; Wed, 23 Aug 2023 17:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHoFRe048992; Wed, 23 Aug 2023 17:50:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHoF9r048985; Wed, 23 Aug 2023 17:50:15 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:15 GMT Message-Id: <202308231750.37NHoF9r048985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 50510a7a63b8 - stable/13 - share/examples/tests: fix comments after $FreeBSD$ removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 50510a7a63b80a5935416bc497802b69639d556d Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=50510a7a63b80a5935416bc497802b69639d556d commit 50510a7a63b80a5935416bc497802b69639d556d Author: Ed Maste AuthorDate: 2023-08-16 21:37:21 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:35 +0000 share/examples/tests: fix comments after $FreeBSD$ removal Fixes: 2a63c3be1582 ("Remove $FreeBSD$: one-line .c comment pattern") (cherry picked from commit d1d7a273707a50d4ad1691b2c4dbf645dfa253ea) --- share/examples/tests/tests/atf/printf_test.c | 2 +- share/examples/tests/tests/tap/printf_test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/examples/tests/tests/atf/printf_test.c b/share/examples/tests/tests/atf/printf_test.c index 90fe32b23a3a..d837c6b7686f 100644 --- a/share/examples/tests/tests/atf/printf_test.c +++ b/share/examples/tests/tests/atf/printf_test.c @@ -1,4 +1,4 @@ - * +/* * SPDX-License-Identifier: BSD-3-Clause * * Copyright 2013 Google Inc. diff --git a/share/examples/tests/tests/tap/printf_test.c b/share/examples/tests/tests/tap/printf_test.c index b3dd90fca3eb..62ab64722f8b 100644 --- a/share/examples/tests/tests/tap/printf_test.c +++ b/share/examples/tests/tests/tap/printf_test.c @@ -1,4 +1,4 @@ - * +/* * Copyright 2013 Google Inc. * All rights reserved. * From nobody Wed Aug 23 17: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 4RWDJS5fhJz4r9mD; Wed, 23 Aug 2023 17:50: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 4RWDJS39vbz4VlQ; Wed, 23 Aug 2023 17:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sh8QVdRYIIi3E6agidhh7phzTLeToiSdZQ47XrgIL4Q=; b=xdRuPs2Lz08lcErREenQjVHP5TtlZ6/BTZKZKJMrV/dJ2/XKuUvSn+HdN6YlTNZRQMfTb+ Ny+oVFidAutzvD75MhcI+9yqjBxbs7u5iHTp3b+OcNRvqn4hNE1TzE8QsRi8emNnGciRIL eX/V1q8TWVGa/K+YFeQNl5/Fw6d7uFkG9RI6k2iZUfXYIdaMuAz8I/S2L/wlTyOMGxkpLy riQD3yAP7bLEzQr3K3nbdaIcOGg+huOHrKIPBAhny9vKD563nLy2UZfs4483JyaXW0W2Uf HhDpPsQIkZlDOjGu7O403ftzG2QSahSRgWMrPeDdEJRrAFSPSi9DxkD86ZahoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sh8QVdRYIIi3E6agidhh7phzTLeToiSdZQ47XrgIL4Q=; b=s50JrD/eMTmjPODHO4jkDfGNZPkDH5qq9NIHvcbLM4X1B5rcCmIBy0cZLg+2qyZ7NyQkEb X2teuJ5ExRjjLZJtDmysPF/osrS4xtlCd98j5tnPs2QwT2zfe+dFRzPO35nIZ+MQXdNFiV 97jiCz6G0YaY7XqF37Tf1W4VioegQIw2nHxfVAYLbMiq1xsKkgl0z72kCMf1Wy7aiur5iM M67gyPjCW6ahD5J/EzdkcJBK8K8/jeqlNT1qZdkN5IwzP/j1heMwSxvOtz0UvTODzufIEp m69IAiytehhe1KsCL09OqPFfF6p+e1L+NgCg2BQkfctHydLK10DblJRbAOekIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813016; a=rsa-sha256; cv=none; b=vivgkQCN2KPmpio6lIdugCWk/phYdPc2kXEHUMRiCSoCYak6sD93yoegbTq0vji4C4mui3 Gtw2mXabRduOPkXiT6dE23ZQZ3F6Z46+HvVMntTlL2KEuzU5YYKnKGzhbecKylMSgywAcd sOoRrE9/jqttHxVI+oJ+Y4STyQrm+NYgxaeniGialqpZB+R1sysOkhFWG4RvOqzxoIWLqR 4WCUVUF2qwhFHQK9liKzOPKWcRACpeCDM8C2JHeeE+y9WFAi/DmtKtZwRZrD9GC5n+A+gt MFpJjG6ffzycvlarDsD5LfqKDhjT9y/e3xv9roNudAVtrk4GS/DCHw/bUwE0vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJS24FXzvNB; Wed, 23 Aug 2023 17:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHoGNw049636; Wed, 23 Aug 2023 17:50:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHoGVj049626; Wed, 23 Aug 2023 17:50:16 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:16 GMT Message-Id: <202308231750.37NHoGVj049626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 02f1e233d562 - stable/13 - Restore blank line after #include List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 02f1e233d562bb5e16cd4776840088b76b227648 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=02f1e233d562bb5e16cd4776840088b76b227648 commit 02f1e233d562bb5e16cd4776840088b76b227648 Author: John Baldwin AuthorDate: 2023-08-17 18:32:14 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:35 +0000 Restore blank line after #include (cherry picked from commit ece58eaf500974ba4ab1b56420414bf971a17ef7) --- lib/libc/arm/gen/_ctx_start.S | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libc/arm/gen/_ctx_start.S b/lib/libc/arm/gen/_ctx_start.S index 39c282bf30c7..cd8d25b9e583 100644 --- a/lib/libc/arm/gen/_ctx_start.S +++ b/lib/libc/arm/gen/_ctx_start.S @@ -1,4 +1,5 @@ #include + ENTRY(_ctx_start) mov lr, pc mov pc, r4 From nobody Wed Aug 23 17: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 4RWDJV1tbqz4r9jw; Wed, 23 Aug 2023 17: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 4RWDJT3TL0z4Vrw; Wed, 23 Aug 2023 17: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=1692813017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FUJAs0B16O90YAH8XYFRxqTboB9U6iQZA4A/geAsPkA=; b=nBHy1gksIQGhOAjOrty3Dw9g7z0JrEVVGBYNbmrGe462WCTqmMd24ydvG8wapEeH4l7CFv ysbXY1aKaEmpwJ2QhBthxM4c2jtyXeRVLfP8Sco0F/A4uFRpcCMKnYw4HyxErkjgEQCzyc uH3eCRqjkkkcMvikNkW0pPu/8OH7aTMM8J3lJVHzHRnTalXWeM7ZuIJS/N96hDhS6itMJl bNUgNPMItjQCS7FHPIPj5iV16s+ljE1KWDiD38U/DD8R0OV0tlt8VtOG8SU2kJd04cr+v1 HZclqk7mSIiPJAl/GXxvpigG3cy9FnW2QwxZx75Z6kxycLMsqs6PPPk1sXhP0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FUJAs0B16O90YAH8XYFRxqTboB9U6iQZA4A/geAsPkA=; b=sLD2/6/gWBI9tWisCHCHZnftuntkLi+lt2G5qY6LM4QfYRTHk8SpN9DcE7Bl3QGcwtsntg jf0oTnhgWP+FthI4gFWccF/yoMFD2m7Dq0QFRBc7CW0X9tYoreLTbmbV5GQ+08sKtL5nvE tmWGB/25U71iZVqAeTJYrLro59LZy8ZBCQbsYp3JqJQK2l35WlYnI8WqLSU3+4FpOwluoC o/XeDZpUvLHwVin8Ihpi+KDUqsksfVlZoXd27EIv2mLObhIZtkjNtTCByDrSTlXxw7gJNN vNbv3xzv1RZosvzbRuv0S9O0v1DogcyYtLe5HWDBRVx4sRnODLSCUoQ7CTIN8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813017; a=rsa-sha256; cv=none; b=Pwx/14izd12loCGAFcfkPalfDGhrJ69I5HhE8OC+/6leBFY7vtPkePYeOvZfJRyBKSlL6g QE5yrSWlzYE+Ra+P7AwNHl6aXCzzkkr/1G5rQ+xQwIud1vuaEVsIUDaaThzu4DJY4Ugv9z azQtxnJkF7QtbJRIJyvHC86YcE8xErCTonK3SJpp6p00wG4x66+9yOcxiuPuqbd9+DX3Y9 K4sUC1xgbLSTuVmjts85/HVFdw1MKCZRibS8KGvWvaU23BiUGnpLGgkyywglhosXautp9Z hs3UyE8TYmL8VcJoeaxcQnm3J8ecCFLEDQohqXjdSrELs5ifH1cW5R1i5IXf7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJT2TMnzv8L; Wed, 23 Aug 2023 17:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHoHZT050247; Wed, 23 Aug 2023 17:50:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHoH7v050239; Wed, 23 Aug 2023 17:50:17 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:17 GMT Message-Id: <202308231750.37NHoH7v050239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9b60059524b1 - stable/13 - Fix partially removed comment by removing the rest List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9b60059524b1c809ca5f51ce2259299f45fcfb9a Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9b60059524b1c809ca5f51ce2259299f45fcfb9a commit 9b60059524b1c809ca5f51ce2259299f45fcfb9a Author: Warner Losh AuthorDate: 2023-08-16 20:17:33 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:35 +0000 Fix partially removed comment by removing the rest Fixes: 2a63c3be1582 (cherry picked from commit ddb5480ec67a44a28316724397fd6609354c4558) --- libexec/bootpd/bptypes.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/libexec/bootpd/bptypes.h b/libexec/bootpd/bptypes.h index 13882d03eb29..3e5deaec8bd5 100644 --- a/libexec/bootpd/bptypes.h +++ b/libexec/bootpd/bptypes.h @@ -1,5 +1,3 @@ - */ - #ifndef BPTYPES_H #define BPTYPES_H From nobody Wed Aug 23 17: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 4RWDJV66Cyz4r9k1; Wed, 23 Aug 2023 17: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 4RWDJV4bRyz4VsQ; Wed, 23 Aug 2023 17: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=1692813018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qqDC+2MPWKp12T3DVXz0fa8CQt/PPR7zgQJp7fAruDk=; b=Dub08wZkTtx1/wlFJhHrFA+Lfur1K36HNTQ4LOdqM5kjj7EbEOjQqUwPKQRfea3yEM/B7q oNd4jeThOnPEItmCErMXwzCtxOYpGEtn2PpyM1SU5n+HPiIjEAvWIDazhWfdKFSLx85y4R 0YnwjeZbbH0zuHMNxyzgjW+A9uGliVN9l/1CnGDf4HoLMsfFNgWEWzgmQUj1YqsV3OOS2D BrAs/9mPD6LrI9lTs5en5rEw0druYaP3es5iA/Iu144avzbRlqQbZ/rgn+cyYJzMVNIAWl 42WHk/OWWoG/1777SDl8g1zXmaXOA0WZ6nrlJ2rHvUl3HMcMq9J8qbwjQn8f9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qqDC+2MPWKp12T3DVXz0fa8CQt/PPR7zgQJp7fAruDk=; b=cG/HINWtDw/SMdqxD4KGHkCdoRJa4Q0j+ZPV37jE3LWJosuzqmZEpna/6Vmu6LaQmNEgpv 6kgMPMEWdM0wh+Dz0sw14QRLDWo3NKcSfVx6VCa1cZ/3Hr/q9p0vEHQ0ySdb+5vH2Qc6+5 FvlXsGknYbpfMTXJOcMWSI1WD7+QoJaZoJMaTY9dRJhUpT862wTC4rwyRMQ7aSO+b96QPI UQFAa6WPLamF9LcJErq9QzfZIlhGZyaxa43621YSGxPfGnKShPKnlOS5q8SLcXkQRhU7br e1hDOyMWZXxnjzaPdcjCHwbHylBxAMdiUUoUv+qZMxBwJvbSwN7Owtj+AMlmJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813018; a=rsa-sha256; cv=none; b=i3MPCGsYzLTZut3ePwAAE65BaUXDIOk/RrrZmM+ND5xXP8qk2QOI10PBInZpBF/aWAdd5v Yi9qMI3wkZIvA6BDpN1y+O3BhqYsqLgLFJEjO8YcjtOi8b7gln2LWrreMBVLyytMOofU5i leqmogH5wvWubB0V9QGnWWeaQUhP3NYFJoq+99mty5IuOz92nEy9qkuwJq/I1WhTxvcZQi QQR0ZodgGZgVBUum3RV4az5VlxQp/hOjCNh2Ej4MNu9EhFyI8nVAod5Oeas2Hp3qdNdZXE DR1Jm+1iPYwwGWh4pJFMG9JWICN0rLxGV5A1UBtd52TWbTKnInZpr+gRKQZfGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJV3Sdzzv6B; Wed, 23 Aug 2023 17:50:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHoImi050562; Wed, 23 Aug 2023 17:50:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHoIod050559; Wed, 23 Aug 2023 17:50:18 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:18 GMT Message-Id: <202308231750.37NHoIod050559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 8f54a610e00d - stable/13 - libcrypto: Don't embed $FreeBSD$ in generated assembly 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8f54a610e00d946472a3c9b7acee6c0bd08e2f39 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8f54a610e00d946472a3c9b7acee6c0bd08e2f39 commit 8f54a610e00d946472a3c9b7acee6c0bd08e2f39 Author: John Baldwin AuthorDate: 2023-08-22 04:01:48 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:35 +0000 libcrypto: Don't embed $FreeBSD$ in generated assembly files Reviewed by: gallatin, ngie, emaste Differential Revision: https://reviews.freebsd.org/D41536 (With ppc assembler stuff removed, since that's no in stable/13 yet) (cherry picked from commit 7a56f5af71851c8b502720ca956629c302821430) --- secure/lib/libcrypto/Makefile.asm | 48 +++++++++++++-------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm index 3813adbbba4b..e19410673ecc 100644 --- a/secure/lib/libcrypto/Makefile.asm +++ b/secure/lib/libcrypto/Makefile.asm @@ -51,14 +51,12 @@ CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/} sha256-armv8.s sha256-armv8.S: sha512-armv8.pl env CC=cc perl ${.ALLSRC} linux64 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux64 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_amd64) @@ -131,8 +129,7 @@ CLEANFILES= ${ASM} ${SHA_ASM:S/$/.s/} .SUFFIXES: .pl .pl.S: - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ env CC=cc perl ${.IMPSRC} elf ) > ${.TARGET} ${SHA_TMP}: ${SHA_SRC} @@ -140,8 +137,7 @@ ${SHA_TMP}: ${SHA_SRC} .for s in ${SHA_ASM} ${s}.S: ${s}.s - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${SHA_SRC}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${SHA_SRC}. */' ;\ cat ${s}.s ) > ${.TARGET} .endfor @@ -190,14 +186,12 @@ CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/} .SUFFIXES: .pl aes-armv4.S: aes-armv4.pl - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ env CC=cc perl ${.ALLSRC} linux32 ) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_i386) @@ -285,8 +279,7 @@ CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/} .SUFFIXES: .pl .pl.S: - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ echo '#ifdef PIC' ;\ env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} -fpic -DPIC ${.IMPSRC:R:S/$/.s/} ;\ cat ${.IMPSRC:R:S/$/.s/} ;\ @@ -337,20 +330,17 @@ CLEANFILES= ${ASM} sha256-ppc.S: sha512-ppc.pl env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256p8-ppc.S: sha512p8-ppc.pl env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_powerpc64) @@ -402,20 +392,17 @@ CLEANFILES= ${ASM} sha256-ppc.S: sha512-ppc.pl env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256p8-ppc.S: sha512p8-ppc.pl env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_powerpc64le) @@ -467,20 +454,17 @@ CLEANFILES= ${ASM} sha256-ppc.S: sha512-ppc.pl env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256p8-ppc.S: sha512p8-ppc.pl env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* $$'FreeBSD'$$ */' ;\ - echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .endif From nobody Wed Aug 23 17:50: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 4RWDJW6Mm9z4r9pV; Wed, 23 Aug 2023 17: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 4RWDJW5LjRz4W3P; Wed, 23 Aug 2023 17:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2eKtB9W1paNC+f0yRakvyNTPa1NeOsCh1NlxYeLldzE=; b=vrNZ5B3VlJycF1Hg+lEW6jQQs6PDD0iq7IzQOiRl2FBQb12od2X/mJQPxMpZGGS+WYJYOt h7zqy0lXtuSeqHQVgbBYzdJBvkBd9eKVGFDLs0gNkIl1tlUq0CPIFDW4/FR86Ghf33qUKV JFDQnS4gU27dLhvuDBmVDwiASCF63jQ8NudqorOEiwDEfZoXU/RSWfWSlNXr2lzltMc85N CqLwk8BwOwXEPs4WVPzHOanoCRb3E7BUFdjJV9TS5Dyjj4HNQE9b9nF53PN9PZCChvHHkA fKvh0ghVGXWOZUpcvSMREo5yOOEbiQtyxOzlprUXEe51ZDUwurrg3IYU4cY6Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2eKtB9W1paNC+f0yRakvyNTPa1NeOsCh1NlxYeLldzE=; b=NS236dLkS6JL/rtWdNiMNup7YOHov69hAeTwIMubiVHJlFMwr7byd6AbB9ESh6Y9N3R8Ud w14HO6TmewkXnFTmOe36OBYsujJaou0QpCKJuoqiSQXrgpuAiW+RAVwYjLJfg6onC6mcvz MCplKKqQeJ3cQEn5nsIrTnl31kTgWcn18M8U1zQdvyBWg+kvNkZQTK8clmZzgq4WLpmqj9 Ez8G7fgv0SFt2kFZUcLxn+xkchxRgve9+lvYlJBHMGfkEBRLHjPINfsn6ezdcbo0368+dK wUKRyRKr82wU33LxW+aUp8depiyFMBtosX44VUmLhjHNeUROuJ/WncrYR62QoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813019; a=rsa-sha256; cv=none; b=wt83hsCE8ayuADENg7Shr95ZmWBU2cCzvoTEEMcuk6IkGRqbmHCST/4xiGeNNjGDehaHuV A9/jDBJtOsRofgB+AlmMXVXxPt0mvxjxM1ptlfBdhsaSgBhi4vfNGmfjsAEGfknLv6SLcx 3ynkGR/+IKjrMG/jbzobyWPGnuUX7/IGcGbqzd/prdHe9YYF/+tRe5cJRseuKznifG43eK g+dPjL3c2TFNrZ9ypJ6Ug/OHY50dvLW6vUrwGMWKwv4+LN5EunGgjsgG4lpwjAYjH4/rfG 79bv3v7JtVOF7OivtDhJ5NY3B+qAulZSYtUZO9OIJw75utoWVOR1pYEFxHl1Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJW498Nztsc; Wed, 23 Aug 2023 17:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHoJgi050615; Wed, 23 Aug 2023 17:50:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHoJ4t050612; Wed, 23 Aug 2023 17:50:19 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:19 GMT Message-Id: <202308231750.37NHoJ4t050612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c1c798f17481 - stable/13 - sh tests: Update $LINENO tests after $FreeBSD$ removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c1c798f174817b567f66379412c231ebfdcd7c8b Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c1c798f174817b567f66379412c231ebfdcd7c8b commit c1c798f174817b567f66379412c231ebfdcd7c8b Author: Mark Johnston AuthorDate: 2023-08-23 17:24:36 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:45:13 +0000 sh tests: Update $LINENO tests after $FreeBSD$ removal Fixes: d0b2dbfa0ecf ("Remove $FreeBSD$: one-line sh pattern") (cherry picked from commit c903f664780e2df7aff9ca84089d55dec5ff1dae) --- bin/sh/tests/builtins/lineno.0.stdout | 4 ++-- bin/sh/tests/builtins/lineno3.0.stdout | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/sh/tests/builtins/lineno.0.stdout b/bin/sh/tests/builtins/lineno.0.stdout index 82583a93c82e..ab5ad9cbef51 100644 --- a/bin/sh/tests/builtins/lineno.0.stdout +++ b/bin/sh/tests/builtins/lineno.0.stdout @@ -1,9 +1,9 @@ +1 2 -3 2 3 +11 12 -13 foo foo 2 diff --git a/bin/sh/tests/builtins/lineno3.0.stdout b/bin/sh/tests/builtins/lineno3.0.stdout index 6e0e4ac8ca57..f8b44636cb5d 100644 --- a/bin/sh/tests/builtins/lineno3.0.stdout +++ b/bin/sh/tests/builtins/lineno3.0.stdout @@ -1,2 +1,2 @@ -before: 3 -after: 6 +before: 2 +after: 5 From nobody Wed Aug 23 18:19: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 4RWDxw1Wtjz4rCDM; Wed, 23 Aug 2023 18:19: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 4RWDxv723Lz4jYZ; Wed, 23 Aug 2023 18:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692814756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v3d3UNIe6EsG+3CdQVHghBOgVz69quA+V/MMaLoLnbY=; b=Q8plM08IaNcZ37bpHdNNOH7ltPYLOMsxAh6w4Vav8AWWPV+0wKsIvE5S/UN5VGOtZkD7CS wP8oPiRtJYs5auZ1OfX9luRGQTvUpqokT1E2llkbJoVdmFI7lkd4bi5WT3GoX72oIGmoku ePRUFwdz2ZAB7HWMmOdb2iZ6M1+dmPAbSsFhBua+G1J65+KdY+RorIUSN88A+mXWZf4ENg xvW3YELYAqkdU73RzxvZfxUITlN8GlirlR/qrbNyjoNSw1C5ORVUKuPdPshu7R+5AJfIDn mt+f8FkoAip8q1YeVd+BbQavzpz3rgv4hDLgcJYmQWIeB3AXzeTM/brDaXbooA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692814756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v3d3UNIe6EsG+3CdQVHghBOgVz69quA+V/MMaLoLnbY=; b=szCdgfx2t8Hrs6Dle9LeKw0GYdk3LacwHVd2tJAvcRoHsvnZQVn6nkNjHHwIvupn3+bEqU ew0acuKR+AS9ujxBKJwIirrkvBtc+uWXDwiSTegsxvdeijdBC8Ekw1LhQa/ZnUnCha2BGz eauu2vuYSIxZLbTzr1BDbqZ4ERm6HbjzNDSAj/pY0VzajyAnVOe0S6/ftHOQz1xJk7X8fj /H7+kBR2c6hUKTzDMlI3nUmi/8C9pbJyaBvSoQWB8ZsPikxOxz832e47bZMHQ4BWwDel9Z UrxW/ZYT9jUfoOQprS5tZLyYsK/NPGNdIRFZ6rsJ2ZG2PBj+AIKKhqyCKkahfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692814756; a=rsa-sha256; cv=none; b=L/uMyPC6C2ldd/YtZvU7uGq8lVZ3FD4ob2uk1yP0hGUW3u3DlM9uL93Mu0z5qzn0vn6Vte KB54swkjWmP0kNe5oxACcSI2TMBLrETjpwnrahOHdutXno20CIucrYlqVldPGAQ0LXj0pw ld/IZ7y+AC1P0GruNDnRFGhTNR5/jcrXm9P3a+a/aWY8XAy2SQHVPaC5XglgGuBTxi+wgB MRKFKreA5ct5o16PWDSvURuzMivC1fBOlnt5zrKMzw3MrQQ6DM/6eyjY3oQPyrCj4lOTfK v7h2wSykOucfNFHE3yfEqqwaX5hjYWh34IAzAHhD6rhU6N6ICoJTU2TH//ruFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDxv64Qqzw8D; Wed, 23 Aug 2023 18:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NIJFWq092696; Wed, 23 Aug 2023 18:19:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NIJFHK092693; Wed, 23 Aug 2023 18:19:15 GMT (envelope-from git) Date: Wed, 23 Aug 2023 18:19:15 GMT Message-Id: <202308231819.37NIJFHK092693@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: 0fd310c83c6b - main - arm64: Remove duplicate fdt build 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fd310c83c6b9d178d1bb4009a55bffdb1bd85c0 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0fd310c83c6b9d178d1bb4009a55bffdb1bd85c0 commit 0fd310c83c6b9d178d1bb4009a55bffdb1bd85c0 Author: Emmanuel Vadot AuthorDate: 2023-08-23 18:18:38 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-23 18:18:38 +0000 arm64: Remove duplicate fdt build option Reported by: andrew Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/conf/files.arm64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 390d9e5db487..7b033c979c55 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -697,4 +697,4 @@ arm64/rockchip/clk/rk3568_pmucru.c optional fdt soc_rockchip_rk3568 # Xilinx arm/xilinx/uart_dev_cdnc.c optional uart soc_xilinx_zynq fdt arm/xilinx/zy7_gpio.c optional gpio soc_xilinx_zynq fdt -dev/usb/controller/xlnx_dwc3.c optional fdt xhci soc_xilinx_zynq fdt +dev/usb/controller/xlnx_dwc3.c optional xhci soc_xilinx_zynq fdt From nobody Wed Aug 23 18:47: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 4RWFZj2Ncqz4rFGj; Wed, 23 Aug 2023 18:47: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 4RWFZj1rkQz4mZC; Wed, 23 Aug 2023 18:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692816461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ssOT1OKJcxIvB0Tis1N3Z2RGUY2fJLbBqH9n+9Y8Ol4=; b=vCh4MRKO2B7qAjsfyZMtCi4szlkSaDgxTiKCNt+Xp3rpqq+h1b1dpTHcENAAH/2QFgI3Ns D0XmidZIx9CIcGiK6Zu24RCL20L/3hphzn6rTyxrOXTYYfA3h6I/yhzznbWrAb2mLmLvqx 1snspCrje6QFjaH2iHfbHLwUfsHUyxquLfwtI3mu2dOfGQQPnEuc0uKKHN6eIaswz5FwyL GSQIsOls/mowHpiTPjeMEWbLkosa4Al07wwWfHaOfWDW8o2sAoy14YaO49WnbKDti1m1op 7Icg5EPSKLoxulL7sYjqCL+cvHKPsEZ17XO2ON+aG/gB95HjAUgx+Y5NHTU/7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692816461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ssOT1OKJcxIvB0Tis1N3Z2RGUY2fJLbBqH9n+9Y8Ol4=; b=SAxOpFMUzkj8yUXavcaoniRZdi/abihVDhKB760PjygnCk5qUWyn/4F+eix3QFiEAyZN1M 74FuyMWsVVZwOSQlq3/nFi0gHJvgB5S4q7P0lUrrCShU0sxsZixNzxL+21f7f+svaGm/ef +/3AE0se3l8aT5L9AXVNIrod1RP3F0ZrpTZ81xNw1lla+8EoKZaoJPGIXDhCHsyJxHTBu5 doVd2Zf5yS1BGtzlpl0fEFRFyGKZpXVxZPGI5qYihrmhTcamTDp7tY0qf+cdpUWpuPnloy tQY9VgIaVSbgEeJrNzElncZIj2IVx7UkevKcB4FtQHduinKSGwkMxriDgrakmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692816461; a=rsa-sha256; cv=none; b=X57koqtA7WneGoOej1c/C53wYSSIupX7+WMzLsmr+ji700m9rIKmbXI6nxxfIKR9ivNwx2 r6qvFb9fez/aximXtvHtELJXYe3Jrp88V29QTrRmKKos+2aYIP0jMKSj0xhvgqXhAsuX4+ 8tP7ZtwfGWWXE+gaBpmW30j2LvYpz35Er/o9Cz1Tj4zeHIsFl6ykWqmEOS+y/RH80ZOION kZ1W6bP5umsk8xvIq86rXg9GrfYsZSbjp4l8cH+CNUscdtjIbgbx4L6tzitf6YILixmLAH Pt4oq/O7rpjGgEbBdiBkrbTDV1O1wr9uVM7oGYcvhUclIM2CwyQi9GPj5dQhkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWFZj0m4nzwNP; Wed, 23 Aug 2023 18:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NIlelE041817; Wed, 23 Aug 2023 18:47:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NIleQ1041814; Wed, 23 Aug 2023 18:47:40 GMT (envelope-from git) Date: Wed, 23 Aug 2023 18:47:40 GMT Message-Id: <202308231847.37NIleQ1041814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 760987ecd39b - main - bectl: make mount subcommand less verbose List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 760987ecd39b54374aef40783b2c232997f3ac04 Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=760987ecd39b54374aef40783b2c232997f3ac04 commit 760987ecd39b54374aef40783b2c232997f3ac04 Author: Robert Wing AuthorDate: 2023-08-23 18:39:13 +0000 Commit: Robert Wing CommitDate: 2023-08-23 18:45:01 +0000 bectl: make mount subcommand less verbose The mount subcommand currently produces output such as: # bectl mount Successfully mounted at This commit changes it to only print the mountpoint: # bectl mount This makes it easier to script the mount subcommand. If an error occurs while mounting, an error message is printed to stderr and bectl will exit with a non-zero value. PR: 273180 Reviewed by: kevans, asomers Differential Revision: https://reviews.freebsd.org/D41562 --- sbin/bectl/bectl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 287eeaf29fab..05ed8d6be5bd 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -440,7 +440,7 @@ bectl_cmd_mount(int argc, char *argv[]) switch (err) { case BE_ERR_SUCCESS: - printf("Successfully mounted %s at %s\n", bootenv, result_loc); + printf("%s\n", result_loc); break; default: fprintf(stderr, From nobody Wed Aug 23 19: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 4RWH401KFVz4rJlV; Wed, 23 Aug 2023 19:54: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 4RWH400Xypz4sxD; Wed, 23 Aug 2023 19:54:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692820480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wup7V/8YhnOSqU2AqYNk3m2UbGvDk26+ISKQVgl7yUo=; b=RLB0F/aMLVX2tUuMOtfyvJRxpUhShH/SzRK/Pczo2F9sZmjf56HntTwoUMbwPkXOni0Nnj mlm8lwszMV9VzC9hnhax25JHVt3cR++18thtjSM+K6abLyYhZD0zSSo4G6OoFqQtQaSJqs f0Gnx/hwh7UAxFMh6chpGoxwDabw3vLzh3VDMUXI1aycdHC6rLf2eqnvK2HGb4iqGjhD3/ fcvqTHoH5fd7IBzNWd02kq/5CL+TPOy9pfRifXHUQvuDX+TnJKEX3AHC2OY0EpNoj6EBur dHw26DYCkpH7hodfOjkSERdv0+FquF1bVYMJ5ssmDRM5zAYAAL3O1hRqlqF6Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692820480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wup7V/8YhnOSqU2AqYNk3m2UbGvDk26+ISKQVgl7yUo=; b=SO8hrKmbzzovqGA3lqrEeoHJwqMfz0tLwe+TJekYn9wdDWqweVqxbCehZm6mzd18zakfaZ ruhsP1JuuQ+6fVTnzvBsRLy99iNOGfjjsf34EI/TB2p7j+6lVX0GFDJUFk1RYEYThAlMdx ToxmuPcd2OFZaPh2D7h2TU+nGugwTz8fUOE4zgQT1oAA3zhqZ2GdMK+OGJaG/7Wm0ufGC7 Zz2C6VT8TPkh2tbYgn4m5tcLghOvob8qgMUJUNEazwaFPPX/ld2GyldFLRntRK4c+zI5Nj PkPAvYE87X5Vy3fR7uyN0Ndyte0KoIVtMaxTUbcScvQoI4aKHQ0GhwU8VYUAWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692820480; a=rsa-sha256; cv=none; b=rfUoXut00AFVFEBVuf9OnYx+fibxDp+xNkVkDwbVNn6rckuwKQ5Y99AW/YE13iQmqIvrZi jw8FZ0Ek5beHC/D/rI0fHddtU+uzORpIABX+8wOhzxfe/Ua49SBo+bdB+NqwhdYDHilzrU 9Bw44DBUfdat0tRgh3vQ68rV92WXHm0OWeljSAub2m/03BjOTcPPqfRqFY7E8f+ISrstFn ODm2AZOOl/xHKNxJu8/GlHdxV2blLTA33uAkP/TyxtaS9oU8fIODxQGVJFhIqWszhXELfX e21zi/6sryT+Oz+90eBI18mlwsw6Hi4psVpVw637PQBZtPqwsCNhs8u+iu/w9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWH3z6j4tzySZ; Wed, 23 Aug 2023 19:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NJsdEj056898; Wed, 23 Aug 2023 19:54:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NJsdro056895; Wed, 23 Aug 2023 19:54:39 GMT (envelope-from git) Date: Wed, 23 Aug 2023 19:54:39 GMT Message-Id: <202308231954.37NJsdro056895@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: d5b5497e10fd - main - m4 tests: Update tests after $FreeBSD$ removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5b5497e10fd11dfea350d229406fa63fd0ea70f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d5b5497e10fd11dfea350d229406fa63fd0ea70f commit d5b5497e10fd11dfea350d229406fa63fd0ea70f Author: Mark Johnston AuthorDate: 2023-08-23 19:43:33 +0000 Commit: Mark Johnston CommitDate: 2023-08-23 19:44:36 +0000 m4 tests: Update tests after $FreeBSD$ removal Fixes: d54a7d337331 ("Remove $FreeBSD$: one-line m4 tag") --- usr.bin/m4/tests/regress.gnusofterror.out | 2 +- usr.bin/m4/tests/regress.quotes.out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/m4/tests/regress.gnusofterror.out b/usr.bin/m4/tests/regress.gnusofterror.out index 322fa4c409fe..5c23eb237b6c 100644 --- a/usr.bin/m4/tests/regress.gnusofterror.out +++ b/usr.bin/m4/tests/regress.gnusofterror.out @@ -1,2 +1,2 @@ -m4: gnusofterror.m4 at line 3: include(hey I do not exit): No such file or directory +m4: gnusofterror.m4 at line 2: include(hey I do not exit): No such file or directory abc diff --git a/usr.bin/m4/tests/regress.quotes.out b/usr.bin/m4/tests/regress.quotes.out index fe5b8a4b45be..cf34ba42a8d0 100644 --- a/usr.bin/m4/tests/regress.quotes.out +++ b/usr.bin/m4/tests/regress.quotes.out @@ -1,5 +1,5 @@ m4: unclosed quote: - quotes.m4 at line 55 + quotes.m4 at line 54 1: normal quoted string [quoted STRING] From nobody Wed Aug 23 21:30: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 4RWKBW6tXnz4rNk7; Wed, 23 Aug 2023 21:30: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 4RWKBW5p5jz3JYQ; Wed, 23 Aug 2023 21:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692826227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bz2O1ewwGA85z133NHrAKomF1H9ZIuWRHUvAn8Px5PI=; b=ZeVVZGoaR+R0wFSKVmspgt7dnqLv1HKnpKDN+JWkyNUpsXoTZkLJb8Ird4yyP55z65PxTX SYlWs9i4R1NBK+gQf0XEpjchRKMl7W+EdU2UVs9zhHHgJYjokM2VGbSoNCDXpjYtmuVmYp otg9PA2K/p8CH/8Ggyopx7R5KiUJZL/ZZHiMXHZA4IRi2xi+aaQRK9n3WQzDuoeLHcygvU DbpvLnAS3kwGGcNeyFViHSI5i0DnhsY8PkDA+mBDVWyPyUwkrgRMlaOLQLwvPlT4Cj0p2q C+W2lZgeD75iqkhV0mnEH05iRowFq3qsbV7EkH5AST2SDUaK+upTim2tqzneGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692826227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bz2O1ewwGA85z133NHrAKomF1H9ZIuWRHUvAn8Px5PI=; b=EM3zrDGRBxlnFrSVp+31L8slrYz2Xq6+c7t9We/OWHLgfQZwgIaQfU4GQfriDZOAcINPPU Rzx/qLHIjNX8CdXRhT+Y0Cy36jpxYMaL45gwvGdhCIAAsxakP/TgfI63x5JSwcAZPJ0Qwh kqv7UafKLCboLTDgh9gzp5xH+rs5xQZb5HByvnb+KzMBjs5knrs9X19ruoNAqrtKou/c6n X/BQfcBSfHrEdOIgDc4dFCB1M09TZUIjAMu+OITKYwFA1A1SumutgXi2DmVLvFXnkNEdZb 31BjL74pO6RZSVh8GpKD2sSX13nemBX0fveZx1Bv3lCQddIYULnIJSV2IL8yXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692826227; a=rsa-sha256; cv=none; b=F4R3ic4cmz9UoWV84SI9acy0FQnEzepHqewDP8WITZIF45W1hUiVDpjdvQ7Dw+zH1PbhYg TPH1v877J9sCuglHUp4aFTryyc4t8l0m1wascmkCYXrrf41e0TLIFA5uz/d95DvzJnKRDT N4vttoxCiDcgvZpZMQBux+YPffGL86zNEO1KPQtZ7ij8D7WwOVlgoY1jra7zpv8y9LIVnV JwP0ScnTGlGvCYUNan9WbRGNyPe1WsxbqOoZv9iLl3xDvbQVNoLzmQVPbzK2Pczf7/5w56 K+yavP/jkXi7b2s+Otnh7JSrNYjcVydPxINUcJacmiL/w/XQ/2i68Bx4CBahsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWKBW4sB2z10fD; Wed, 23 Aug 2023 21:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NLUR6E015277; Wed, 23 Aug 2023 21:30:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NLUR1P015274; Wed, 23 Aug 2023 21:30:27 GMT (envelope-from git) Date: Wed, 23 Aug 2023 21:30:27 GMT Message-Id: <202308232130.37NLUR1P015274@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: 0677f5ccbb5b - main - cxgbe ddp: Trim stale function prototype List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0677f5ccbb5befcd535d200c45c5fa71f9082cbf Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0677f5ccbb5befcd535d200c45c5fa71f9082cbf commit 0677f5ccbb5befcd535d200c45c5fa71f9082cbf Author: John Baldwin AuthorDate: 2023-08-23 21:29:02 +0000 Commit: John Baldwin CommitDate: 2023-08-23 21:30:16 +0000 cxgbe ddp: Trim stale function prototype Sponsored by: Chelsio Communications --- sys/dev/cxgbe/tom/t4_tom.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tom.h b/sys/dev/cxgbe/tom/t4_tom.h index 700f136bead6..b492fe86ae3a 100644 --- a/sys/dev/cxgbe/tom/t4_tom.h +++ b/sys/dev/cxgbe/tom/t4_tom.h @@ -501,8 +501,6 @@ int t4_write_page_pods_for_buf(struct adapter *, struct toepcb *, int t4_write_page_pods_for_sgl(struct adapter *, struct toepcb *, struct ppod_reservation *, struct ctl_sg_entry *, int, int, struct mbufq *); void t4_free_page_pods(struct ppod_reservation *); -int t4_soreceive_ddp(struct socket *, struct sockaddr **, struct uio *, - struct mbuf **, struct mbuf **, int *); int t4_aio_queue_ddp(struct socket *, struct kaiocb *); void t4_ddp_mod_load(void); void t4_ddp_mod_unload(void); From nobody Thu Aug 24 04:37: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 4RWVgr0X0Mz4qZPc; Thu, 24 Aug 2023 04:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWVgr00cKz4P5n; Thu, 24 Aug 2023 04:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692851880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGm+igNuxlCtn9fpVzJEsAX4Veo2/wee3HTS2A7rIW4=; b=mIQhGPuEz2ec6QnR3N9SbYF0/of251iggs+vhEG/f62F8tRVgiDtghyqetF71e7P8k3ABD OxSDia5CFtcBsULTkJHXF/2L2ZzqqvZNCUmX73FBSuNAsjvjIYe5WTwtlxTyjIH3Gl4sOv f4qwZ0APtBCzBWa9FseUPPzI4Nch2RtPTHW/9EVOjg0Ud+tbtBfkfvsaSCB2NWD9l2HlFk R+VOzTfWq1GhmZPmJOm3mIOR9WCV0HH0h3JSQj1TKrxK1bLHZRNgTaTUUh0DkUv1ZN1md0 uwu/5DtKv2GU2h/wvEQBr/qp3RhRbJYMX6bTJ5YMZVhcrCANIYZAMb3E/E/K0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692851880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGm+igNuxlCtn9fpVzJEsAX4Veo2/wee3HTS2A7rIW4=; b=Ij6Ba2jCmhCSrdmvNjNPeOwOhs+iQvx0Q4+uZluQMzWfoBe64b0+FxoZUr5bs/dfajP5+L CWMb8lXVumk/2bwigasmkOSrBZXMc/Qqh1UK0ow+62DfcrKxFN+EPT2Hl7/ep4d8FDZUZK 4p69BXxnvz+WbG5Nlj89cfWS/QWa4l5Nl0bnQmIP/2CkQm90ORIo4JTazdW3JJAJ1kkKoY DylvicL8TUAbeJuIyDePYrZHOUsb4mN86xwLC3VSOXfP8YR0h6pMc2Lfvxa+y4nc9AaEM4 1+Ggbl1YtXOk84mNRulkH8fXgSnjOqXVkNfeK1TfSsLeyexWmyBIU2sBQMUo3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692851880; a=rsa-sha256; cv=none; b=rHVUnsimYP9797zHzNJt3NL9Ca9BLdl+lOCjeloMO40omTUt3hIAVo1SAFNZ4tkMyYusXd ssWXnP1qaWRLotehy0ltek22SgHhF4dfa22y82h2mBJsZc9IoixCVVf1ZRh+FWmBOnVVLs euuy4hth2hQWCdwqIeWxGErZvAjoi5+ycmbU9lP7eK+rQ7P/6JpQvwGDgvfHP5UQLsHjKp dSnQUP18irJGzGCkxhmNyXg0lCAvMO9jOvfgZh51Q1L8jQrC1FiWE8XOWRIevvDxErTuxb UHp/zeHHzTicsPemgJEJpZlkWZyf3kq455AmrdJ0N5acyoaSmYrSJmvL3MlJBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWVgq67G7z1CGY; Thu, 24 Aug 2023 04:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37O4bxsM018108; Thu, 24 Aug 2023 04:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37O4bxpo018106; Thu, 24 Aug 2023 04:37:59 GMT (envelope-from git) Date: Thu, 24 Aug 2023 04:37:59 GMT Message-Id: <202308240437.37O4bxpo018106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d9fee1d02178 - main - cam/scsi_da: Bump deprecation one release. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9fee1d02178ff76a5c7b3032adb3d00bfc4ab7a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d9fee1d02178ff76a5c7b3032adb3d00bfc4ab7a commit d9fee1d02178ff76a5c7b3032adb3d00bfc4ab7a Author: Warner Losh AuthorDate: 2023-08-24 04:34:41 +0000 Commit: Warner Losh CommitDate: 2023-08-24 04:34:41 +0000 cam/scsi_da: Bump deprecation one release. These are still used in a quick poll that I've done, so we can't remove them in 14. Reset the removal to FreeBSD 15. Sponsored by: Netflix --- sys/cam/scsi/scsi_da.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 7d441f44e945..7a063fce128b 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -2351,11 +2351,11 @@ dasysctlinit(void *context, int pending) SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "rotating", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)DA_FLAG_ROTATING, dabitsysctl, "I", - "Rotating media *DEPRECATED* gone in FreeBSD 14"); + "Rotating media *DEPRECATED* gone in FreeBSD 15"); SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "unmapped_io", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)DA_FLAG_UNMAPPEDIO, dabitsysctl, "I", - "Unmapped I/O support *DEPRECATED* gone in FreeBSD 14"); + "Unmapped I/O support *DEPRECATED* gone in FreeBSD 15"); #ifdef CAM_TEST_FAILURE SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), From nobody Thu Aug 24 06:17: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 4RWXv851Ybz4qgrF for ; Thu, 24 Aug 2023 06:17:56 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) (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 4RWXv83ng1z4WKS for ; Thu, 24 Aug 2023 06:17:56 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-68bed28cb22so411057b3a.2 for ; Wed, 23 Aug 2023 23:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; t=1692857875; x=1693462675; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=ohd+vLxALplnUfzMkIjBJRlvc3kUFdef5B6eak1qSY0=; b=gs8+hSn1gs1JMuCMOXxHa2tgdDRjUEbWhxoemCirU8H4GfIkLwcjos91x2RaVy9I5z w/p9U0yfZmOosh8zbg6uKC6aAtt/efQ9Pms/d/AEUp53yojshjfuzZIbI2+9Co77PUfF WMURjgLeUFsfG6Mi/9GTboGqkCqumjEztnRws= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692857875; x=1693462675; 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=ohd+vLxALplnUfzMkIjBJRlvc3kUFdef5B6eak1qSY0=; b=JvWhe4lcWQo4QydWTV/1RObLFYkGdto6Slr6WS84lJKYHP4RK0q9cYzsTrCQ8nXEMu ztYmzcE0QPAQyGVC8r9OFpUm/zxVhvgUBh5QC5xSP+SwrJjsVaH1v0zwysWLEq4UpIKd 2m3oUoTjga6s/5ssI3NDIaVrKOYVh3iA22p8z9hvKk50kXL0PgeoDs5qu1Jb5amkKY09 oZO2fIlnGXmHWyjfi9OVQybuIT/o8knz4UNlCRkJOag+814G7S8NkAYdDNRCfKgvQHDC NjmHCt7kk0RSPCQr6037WWb1HKPBHXop0G3lTxEyhVfJXy3utlVE1e5OJ9GxMZAGyq9N srng== X-Gm-Message-State: AOJu0Yz2y/OVyk5YYhHja1QDEPSYAlo2XFitMv+6VHK7Cn9Lba5WPbQx liSdgr40iVkPZV3XteazvuEsHuS3ayphxhwR6FfC4w== X-Google-Smtp-Source: AGHT+IEHxGXvduan6It0BdXqZxXGOPX/pqGe2vyvtMh04E8/NKBIVO/8xkgGiye7LSxLtiq0dbfz3phid3kdeac77yg= X-Received: by 2002:a05:6a00:22c1:b0:689:f13a:5eb5 with SMTP id f1-20020a056a0022c100b00689f13a5eb5mr14718147pfj.28.1692857874777; Wed, 23 Aug 2023 23:17:54 -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: <202211042255.2A4MtqVv032693@gitrepo.freebsd.org> <419530F4-DB8F-46EA-BF45-C130BCF8A3DE@FreeBSD.org> <05979953-C089-4D56-99E3-BBBF066FE277@FreeBSD.org> In-Reply-To: From: Kevin Bowling Date: Wed, 23 Aug 2023 23:17:43 -0700 Message-ID: Subject: Re: git: 91fcacc35597 - main - if_bnxt: Add support for VLAN on Thor To: Sumit Saxena Cc: Warner Losh , Kristof Provost , Warner Losh , "" , "" , src-committers , Chandrakanth Patil Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4RWXv83ng1z4WKS X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Kristof, Sumit, Chandrakanth, I have posted an update to https://reviews.freebsd.org/D41558 with more details about why this re-init was happening and changing the defaults to match the expected behavior when this driver was written. Note that this review does not address the initialization issues within bnxt (which MarkJ details in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D269133). It will reduce the impact of the bug in some common usages and is a necessary improvement. On Wed, Aug 23, 2023 at 12:18=E2=80=AFAM Sumit Saxena wrote: > > +Chandrakanth Patil > > Chandrakanth is working on this bug. > > -Sumit > > On Wed, Aug 23, 2023 at 6:01=E2=80=AFAM Warner Losh wrot= e: > > > > > > > > On Tue, Aug 22, 2023, 6:26 PM Warner Losh wrote: > >> > >> > >> > >> On Tue, Aug 22, 2023, 5:59 PM Kevin Bowling = wrote: > >>> > >>> On Tue, Aug 22, 2023 at 3:39=E2=80=AFPM Kevin Bowling wrote: > >>> > > >>> > > >>> > > >>> > On Tue, Aug 22, 2023 at 2:07 PM Kristof Provost wr= ote: > >>> >> > >>> >> On 27 Jun 2023, at 11:17, Kristof Provost wrote: > >>> >> > >>> >> On 4 Nov 2022, at 23:55, Warner Losh wrote: > >>> >> > >>> >> The branch main has been updated by imp: > >>> >> > >>> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D91fcacc355971f74aa2= 6fc7861020dc3a2a2d717 > >>> >> > >>> >> commit 91fcacc355971f74aa26fc7861020dc3a2a2d717 > >>> >> Author: Sumit Saxena > >>> >> AuthorDate: 2022-11-04 22:24:32 +0000 > >>> >> Commit: Warner Losh > >>> >> CommitDate: 2022-11-04 22:24:32 +0000 > >>> >> > >>> >> if_bnxt: Add support for VLAN on Thor > >>> >> > >>> >> Reviewed by: imp > >>> >> Differential Revision: https://reviews.freebsd.org/D36443 > >>> >> --- > >>> >> sys/dev/bnxt/bnxt.h | 3 +- > >>> >> sys/dev/bnxt/bnxt_hwrm.c | 110 ++++++++++++++++++++++++++++-------= ------------ > >>> >> sys/dev/bnxt/bnxt_hwrm.h | 7 ++- > >>> >> sys/dev/bnxt/if_bnxt.c | 7 ++- > >>> >> 4 files changed, 74 insertions(+), 53 deletions(-) > >>> >> > >>> >> This commit appears to have broken vlan on these interfaces. > >>> >> My hardware is a Broadcom BCM57416 NetXtreme-E 10GBase-T Ethernet,= (in a Dell T640, if that helps). > >>> >> > >>> >> A simple vlan creation on top of one: > >>> >> ifconfig vlan create > >>> >> ifconfig vlan0 vlan 201 vlandev bnxt0 > >>> >> > >>> >> Results in a loss of connectivity. The kernel logs this, which I a= ssume is related: > >>> >> > >>> >> `bnxt0: HWRM_CFA_L2_FILTER_ALLOC command returned INVALID_PARAMS e= rror.` > >>> >> > >>> >> After reverting this (and 72e9dbb58cad5262190cf2eae47f764021072128= ) I can create vlan interfaces on top of bnxt0 without losing connectivity. > >>> >> > >>> >> > >>> >> Should we revert this before 14.0? > >>> >> > >>> >> There=E2=80=99s also a report of what I think is the same issue in= https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D269133 > >>> >> > >>> >> There=E2=80=99s a proposed patch there, but it did not work for me= . > >>> > > >>> > > >>> > In markj=E2=80=99s analysis he mentions the issue of the reinit. > >>> > > >>> > It sounds like there are multiple bugs in this driver but one quick= band aid may be to mark the driver as not needing re-init for VLAN modific= ations.. that sounds unlikely and was probably an accident when the if rese= t functionality was added. You can check e1000 for that. > >>> > >>> Here's what I mean as a patch https://reviews.freebsd.org/D41558 > >>> > >>> > Note I don=E2=80=99t have this hw and haven=E2=80=99t audited the c= ode so this could be noise but it=E2=80=99s an easy thing to check. > >> > >> > >> Is there a good bug we can post that link to for someone to test? > > > > > > Duh.. posted to bug above and > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D222680 > > > > Warner > > > >> > >> Warner > >>> > >>> > > >>> >> Best regards, > >>> >> Kristof From nobody Thu Aug 24 13:08: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 4RWk0k6Bt2z4r87N; Thu, 24 Aug 2023 13:08: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 4RWk0k5j2sz3bYK; Thu, 24 Aug 2023 13:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692882502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jssGnlnZFdAZzbiQe/2uDuyBDS653dmz+z8tDe+dwq4=; b=JYPN8MOGxg5Pue1pGrwlu3y4xnSue9lsMqRVLr6x4VZanA1ILT8OZzemjPM6cCMZ/d8BnY 6EySVxwGOVhMcb6FIrqLPH8EukbOH0ijEvY55pJPsd/1Pov0tY/NQhbZSIrO73JSaLLpPV ryuqPlMtV2JnifshImPwfGdQT5oXqxu1mgy+6xZyaVKt0CjtUDqXJlCFUrUENIKDa6YbCB mL13w4lBaaMpb70xVnY3ASk9pBpldcULdIIVwO+bO1KURTXpG45Gl690UIwj2QmHfBb1Gi fMkVP9Fosc2vPANpxOFMD6NwTNNCBvEwKE/OkFx2O1hTaNxexJG+1BJYmfScGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692882502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jssGnlnZFdAZzbiQe/2uDuyBDS653dmz+z8tDe+dwq4=; b=Kij6axQ9oZYGPFwnqNRR3afhcEgaM+0UgJz/udgxvmdUVqEYYmPN0I7NFYtxlspr1mF1BL ii+109t481ZI+gcxJMPiFpuA8jSfcYTQnkwdJpMAy16TG7rN7R/WygtVLSD3ee3fvee/az cEavoW4cDSIW63KVgnRNTwXSyINbeODNt3xkdZs7gzZB93nXRRx9Rcywu0TFfPAxzLrhi9 xsK00xMgr5Q+tS+eTNOsOKYGThDusleJ0NZWPdd1mi9fMhmsEC2mWrzWjneLkewmvnaGeP IxYBsX9Ot3C6FlQfSHcwgFpK6uppAr++V/YPQNzqZmx/Rkt4DdHXe1Gj/q3eBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692882502; a=rsa-sha256; cv=none; b=ITk7czVOikm69DmFUy9/iVMMS7HlXeCXJ781lHR2P/aWMbC5uENna95oGZF/z6y+7DzBPe fp6GNhzpuqt9uIhmd2NpxDisEg+VX/Vg8jiHB3mS5gZbcKVYDSKzRLFGBBkh6G6ZoXJfhP ao9CoR3qrM2YCHY0xICkZk1FcPUSW8dr6OznFioBnY93LLpsK7YlxU+jVvbsVuWqZJ5NJb ioJqM+wCaIbFZKze+6sjg/3CccjoSVo9a0A/PqyYbNJe7tve5Grs+t5i0p7JGLMf8NzaiU sZ5EL2E4lk24TI62juNVICTilQZlfA6xy2MRS1MrObPBRipqo50XZfoc0XVGpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWk0k4mBHzD9b; Thu, 24 Aug 2023 13:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OD8Mba062641; Thu, 24 Aug 2023 13:08:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OD8MF7062637; Thu, 24 Aug 2023 13:08:22 GMT (envelope-from git) Date: Thu, 24 Aug 2023 13:08:22 GMT Message-Id: <202308241308.37OD8MF7062637@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: d10de21f2f7d - main - pf: Access r->rpool.cur->kif under mutex protection List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d10de21f2f7df59344f8611546989b36e4fd867c Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d10de21f2f7df59344f8611546989b36e4fd867c commit d10de21f2f7df59344f8611546989b36e4fd867c Author: Kajetan Staszkiewicz AuthorDate: 2023-08-24 11:05:33 +0000 Commit: Kristof Provost CommitDate: 2023-08-24 11:05:33 +0000 pf: Access r->rpool.cur->kif under mutex protection pf_route() sends traffic to a specified next hop over a specific interface. The next hop is obtained in pf_map_addr() but the interface is obtained directly via r->rpool.cur->kif` outside of the lock held in pf_map_addr() in multiple places around pf. The chosen interface is not stored in source node. Move the interface selection into pf_map_addr(), have the function return it together with the chosen IP address and ensure its stored in struct pf_ksrc_node, store it in the source node and use the stored value when needed. Sponsored by: InnoGames GmbH MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41570 --- sys/net/pfvar.h | 5 +++-- sys/netpfil/pf/pf.c | 31 +++++++++++++++++-------------- sys/netpfil/pf/pf_lb.c | 24 +++++++++++++++++++----- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 21ebca755b3d..f9cb45f696d3 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -873,7 +873,7 @@ struct pf_ksrc_node { struct pf_addr raddr; struct pf_krule_slist match_rules; union pf_krule_ptr rule; - struct pfi_kkif *kif; + struct pfi_kkif *rkif; counter_u64_t bytes[2]; counter_u64_t packets[2]; u_int32_t states; @@ -2474,7 +2474,8 @@ int pf_step_out_of_keth_anchor(struct pf_keth_anchor_stackframe *, u_short pf_map_addr(u_int8_t, struct pf_krule *, struct pf_addr *, struct pf_addr *, - struct pf_addr *, struct pf_ksrc_node **); + struct pfi_kkif **nkif, struct pf_addr *, + struct pf_ksrc_node **); struct pf_krule *pf_get_translation(struct pf_pdesc *, struct mbuf *, int, struct pfi_kkif *, struct pf_ksrc_node **, struct pf_state_key **, struct pf_state_key **, diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index c80553ba017d..a5d7c1ba0155 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4880,15 +4880,14 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, if (r->rt) { /* pf_map_addr increases the reason counters */ - if ((reason = pf_map_addr(pd->af, r, pd->src, &s->rt_addr, NULL, - &sn)) != 0) { + if ((reason = pf_map_addr(pd->af, r, pd->src, &s->rt_addr, + &s->rt_kif, NULL, &sn)) != 0) { pf_src_tree_remove_state(s); s->timeout = PFTM_UNLINKED; STATE_DEC_COUNTERS(s); pf_free_state(s); goto csfailed; } - s->rt_kif = r->rpool.cur->kif; s->rt = r->rt; } @@ -6700,6 +6699,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, struct mbuf *m0, *m1, *md; struct sockaddr_in dst; struct ip *ip; + struct pfi_kkif *nkif = NULL; struct ifnet *ifp = NULL; struct pf_addr naddr; struct pf_ksrc_node *sn = NULL; @@ -6784,21 +6784,22 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, goto bad_locked; } pf_map_addr(AF_INET, r, (struct pf_addr *)&ip->ip_src, - &naddr, NULL, &sn); + &naddr, &nkif, NULL, &sn); if (!PF_AZERO(&naddr, AF_INET)) dst.sin_addr.s_addr = naddr.v4.s_addr; - ifp = r->rpool.cur->kif ? - r->rpool.cur->kif->pfik_ifp : NULL; + ifp = nkif ? nkif->pfik_ifp : NULL; } else { if (!PF_AZERO(&s->rt_addr, AF_INET)) dst.sin_addr.s_addr = s->rt_addr.v4.s_addr; ifp = s->rt_kif ? s->rt_kif->pfik_ifp : NULL; + /* If pfsync'd */ + if (ifp == NULL) + ifp = r->rpool.cur->kif ? + r->rpool.cur->kif->pfik_ifp : NULL; PF_STATE_UNLOCK(s); } - /* If pfsync'd */ - if (ifp == NULL) - ifp = r->rpool.cur->kif ? r->rpool.cur->kif->pfik_ifp : NULL; + if (ifp == NULL) goto bad; @@ -6913,6 +6914,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, struct mbuf *m0, *md; struct sockaddr_in6 dst; struct ip6_hdr *ip6; + struct pfi_kkif *nkif = NULL; struct ifnet *ifp = NULL; struct pf_addr naddr; struct pf_ksrc_node *sn = NULL; @@ -6995,24 +6997,25 @@ pf_route6(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, goto bad_locked; } pf_map_addr(AF_INET6, r, (struct pf_addr *)&ip6->ip6_src, - &naddr, NULL, &sn); + &naddr, &nkif, NULL, &sn); if (!PF_AZERO(&naddr, AF_INET6)) PF_ACPY((struct pf_addr *)&dst.sin6_addr, &naddr, AF_INET6); - ifp = r->rpool.cur->kif ? r->rpool.cur->kif->pfik_ifp : NULL; + ifp = nkif ? nkif->pfik_ifp : NULL; } else { if (!PF_AZERO(&s->rt_addr, AF_INET6)) PF_ACPY((struct pf_addr *)&dst.sin6_addr, &s->rt_addr, AF_INET6); ifp = s->rt_kif ? s->rt_kif->pfik_ifp : NULL; + /* If pfsync'd */ + if (ifp == NULL) + ifp = r->rpool.cur->kif ? + r->rpool.cur->kif->pfik_ifp : NULL; } if (s) PF_STATE_UNLOCK(s); - /* If pfsync'd */ - if (ifp == NULL) - ifp = r->rpool.cur->kif ? r->rpool.cur->kif->pfik_ifp : NULL; if (ifp == NULL) goto bad; diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 09e5d6a7a97f..eb3d087e3df6 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -222,7 +222,7 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r, struct pf_addr init_addr; bzero(&init_addr, sizeof(init_addr)); - if (pf_map_addr(af, r, saddr, naddr, &init_addr, sn)) + if (pf_map_addr(af, r, saddr, naddr, NULL, &init_addr, sn)) return (1); bzero(&key, sizeof(key)); @@ -299,7 +299,7 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r, * pick a different source address since we're out * of free port choices for the current one. */ - if (pf_map_addr(af, r, saddr, naddr, &init_addr, sn)) + if (pf_map_addr(af, r, saddr, naddr, NULL, &init_addr, sn)) return (1); break; case PF_POOL_NONE: @@ -350,7 +350,8 @@ pf_get_mape_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r, u_short pf_map_addr(sa_family_t af, struct pf_krule *r, struct pf_addr *saddr, - struct pf_addr *naddr, struct pf_addr *init_addr, struct pf_ksrc_node **sn) + struct pf_addr *naddr, struct pfi_kkif **nkif, struct pf_addr *init_addr, + struct pf_ksrc_node **sn) { u_short reason = 0; struct pf_kpool *rpool = &r->rpool; @@ -377,11 +378,15 @@ pf_map_addr(sa_family_t af, struct pf_krule *r, struct pf_addr *saddr, } PF_ACPY(naddr, &(*sn)->raddr, af); + if (nkif) + *nkif = (*sn)->rkif; if (V_pf_status.debug >= PF_DEBUG_NOISY) { printf("pf_map_addr: src tracking maps "); pf_print_host(saddr, 0, af); printf(" to "); pf_print_host(naddr, 0, af); + if (nkif) + printf("@%s", (*nkif)->pfik_name); printf("\n"); } goto done; @@ -539,13 +544,22 @@ pf_map_addr(sa_family_t af, struct pf_krule *r, struct pf_addr *saddr, break; } } - if (*sn != NULL) + + if (nkif) + *nkif = rpool->cur->kif; + + if (*sn != NULL) { PF_ACPY(&(*sn)->raddr, naddr, af); + if (nkif) + (*sn)->rkif = *nkif; + } if (V_pf_status.debug >= PF_DEBUG_NOISY && (rpool->opts & PF_POOL_TYPEMASK) != PF_POOL_NONE) { printf("pf_map_addr: selected address "); pf_print_host(naddr, 0, af); + if (nkif) + printf("@%s", (*nkif)->pfik_name); printf("\n"); } @@ -711,7 +725,7 @@ pf_get_translation(struct pf_pdesc *pd, struct mbuf *m, int off, } break; case PF_RDR: { - if (pf_map_addr(pd->af, r, saddr, naddr, NULL, sn)) + if (pf_map_addr(pd->af, r, saddr, naddr, NULL, NULL, sn)) goto notrans; if ((r->rpool.opts & PF_POOL_TYPEMASK) == PF_POOL_BITMASK) PF_POOLMASK(naddr, naddr, &r->rpool.cur->addr.v.a.mask, From nobody Thu Aug 24 13:41: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 4RWkkX18KJz4rBDg; Thu, 24 Aug 2023 13:41: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 4RWkkX0dPhz3fmN; Thu, 24 Aug 2023 13:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692884468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPxHYPAwoc3LCcnHOQaAkb/eMVF+q8OxBGFoXD+Z0l8=; b=u0C9/YbveVV1z9UrA7sCQEvd3KBeWBbNR8WmfVrDu888hNwjQSGOhjb2EDPJzK099AYNWN LkIdZ3hmGzOi0g79f+jkwgemFXMkfYrz7wuj5bXZ9znLcW6imbjzbUqE2rg8vkLXaLfWSp VHpdTHWETMIGh9brb8M/Sga+ffg3aq4DGDRy40oob378aM/HaCAiU2URq0AwbjaL0ZjH8L 7X9k9FrD2vPvt80fWkOZcGMBK0SESDEg0qfmLe+6OpWnEhaJMDyZXQ6itf2qs2RvYKYVE1 ZvW/Df9wSeQJTK3EScOQjTiMZFBFAQxFLF46PkZPEBz7vI4XbSuAthrF0HPARQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692884468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPxHYPAwoc3LCcnHOQaAkb/eMVF+q8OxBGFoXD+Z0l8=; b=rOcJ8l96HDVWZUdXZRKUTiDpZHfGscQQ53C4Cu8WVdAGbcnncTxe56aQqBenlCQHQz2bkT OD02iubGxM/dzB0+wr6il6I5+Imzk/xATGW+7NBrENnW6JMPHq8ww+VgqUTEA2iG3Ql6lk t875i4I9BRvtILHo4ogHqp8WKLA1EyIf5SBmEQClOnEKGbA8aVcnb6uhmFzQvjamAKNJTa SIOKxF3wDuUGkwmfLCdbWC5Jd4u3RGAn7+ZxdEZ02/Oz3G03F2s61w/T6A+2R+bF26/qI6 xsw3jZcFq/ndIJMlgi8BIvuTlC3wujrW4Q1gvHPaThMRw78WJOPg5V+ik7zaqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692884468; a=rsa-sha256; cv=none; b=SDSe3cgQDkRCrXDaWEk2ClCjcmDtjRVZhHrxrLnGLPVPA+CqwsS/zS7Nc6Y7J9SdpiLzK5 gn7D85ZL6pLGwt/5QxJUQKK9WX8L4X9umaV1a/R3QkcBxZF1jEL7bX0D5vVWbSOScv1o5d JJLtd5b6TIEZZ3Fe2/k0H3vcW9ddhPrs0xqdyXm3WTGI0o764YpZfXAxZ0T/I+O+fhtAWK +97b2UzArQb6VmMCuRjQdAohilfM9OgtgsBDegiRD+fcSlU3ENVf3VONvfndV5L6+tp1FO XGZ2Mh/4rnifNXY9Ff0G5kMthpYJ9HxFjGrwYh07mmYTwQPZlra7BZq34IOleg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWkkW6qHXzTdK; Thu, 24 Aug 2023 13:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ODf7uM023574; Thu, 24 Aug 2023 13:41:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ODf7OT023571; Thu, 24 Aug 2023 13:41:07 GMT (envelope-from git) Date: Thu, 24 Aug 2023 13:41:07 GMT Message-Id: <202308241341.37ODf7OT023571@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: 045fc75ce490 - stable/13 - opencrypto: Respect alignment constraints in xor_and_encrypt() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 045fc75ce490cca0aec8f412dd28bc1031e0919d Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=045fc75ce490cca0aec8f412dd28bc1031e0919d commit 045fc75ce490cca0aec8f412dd28bc1031e0919d Author: Mark Johnston AuthorDate: 2023-07-27 19:44:52 +0000 Commit: Mark Johnston CommitDate: 2023-08-24 13:32:59 +0000 opencrypto: Respect alignment constraints in xor_and_encrypt() Copy operands to an aligned buffer before performing operations which require alignment. Otherwise it's possible for this code to trigger an alignment fault on armv7. Reviewed by: jhb MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D41211 (cherry picked from commit 96c2538121390c872f68ac48f97b35fb973c11dc) --- sys/opencrypto/cbc_mac.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sys/opencrypto/cbc_mac.c b/sys/opencrypto/cbc_mac.c index ed31dd946e48..ed9230beaf49 100644 --- a/sys/opencrypto/cbc_mac.c +++ b/sys/opencrypto/cbc_mac.c @@ -38,19 +38,16 @@ static void xor_and_encrypt(struct aes_cbc_mac_ctx *ctx, const uint8_t *src, uint8_t *dst) { - const uint64_t *b1; - uint64_t *b2; - uint64_t temp_block[CCM_CBC_BLOCK_LEN/sizeof(uint64_t)]; +#define NWORDS (CCM_CBC_BLOCK_LEN / sizeof(uint64_t)) + uint64_t b1[NWORDS], b2[NWORDS], temp[NWORDS]; - b1 = (const uint64_t*)src; - b2 = (uint64_t*)dst; + memcpy(b1, src, CCM_CBC_BLOCK_LEN); + memcpy(b2, dst, CCM_CBC_BLOCK_LEN); - for (size_t count = 0; - count < CCM_CBC_BLOCK_LEN/sizeof(uint64_t); - count++) { - temp_block[count] = b1[count] ^ b2[count]; - } - rijndaelEncrypt(ctx->keysched, ctx->rounds, (void*)temp_block, dst); + for (size_t count = 0; count < NWORDS; count++) + temp[count] = b1[count] ^ b2[count]; + rijndaelEncrypt(ctx->keysched, ctx->rounds, (void *)temp, dst); +#undef NWORDS } void From nobody Thu Aug 24 13:41: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 4RWkkY2qjkz4rB8V; Thu, 24 Aug 2023 13:41: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 4RWkkY2BVCz3gKn; Thu, 24 Aug 2023 13:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692884469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MJars+eqAXepOU6b+uB4/LfCI615HeRdeb+sfkJ+iWQ=; b=aymeyNPxk9xruzannATbwjGGh/7CdK7rdx6/jAxGkfP9BenoalfQ2NVLHN47rfBvNR3mlI wfzGE8gj/4TGjbHJVZU1Fj2D7+dDMo3mdbT8ZYY3EDyqHqOFLJz/f7vjpPhRP+C0GAwoCX ss4Lg9Y3KFoRC4BVHeD63gZzYRwRzYYtcydsSm8wr4lEao+MXxHFyTJT1Fn1wXoVCRsYBn gZNkpXnXkRDbSrfDcQXEMRKsIuyi3/8dvuo02j4m2MIxX9MEjjTTgOOdyhDWAy67w1ojEF w77MhhkmI33OkAs6gImEczGBE8iWZ0ISs9g5aZrRs5ZMSevgG0w1hRUUIb2dJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692884469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MJars+eqAXepOU6b+uB4/LfCI615HeRdeb+sfkJ+iWQ=; b=s6MjH5yWc6Nvpee1Kt6jhZgr+g0ARQBUCdYsPpweQgzjRO0m9wCgtUZZgFf+t9Je1j0rP7 5RWQd0GAp+jhqtkY85jVpLU2D1BuHy+5YBY2ba7UwwA4knBAXlZ52kKmM07BjMsjezw6Od Ow9sCE50OYd/qHmwfcjRnU3RzrHkwKUBQB/c/CKnTHqMWweppUbmjELrCzL5vefjYiXlfo RVT2Cf6JynabppD9kTLXGKfz8PkMhg1uPm+ogSlgXTF5+xRqIRpQLjMXz5It80xAsZr+kz gLWErPS4NxqtMKjF1M2VOOFviQ4d37PsE9nRKCS65kVNkQXPofjJ4bbXskUJfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692884469; a=rsa-sha256; cv=none; b=KaFGgUgh8EXoAu4tWeZmetkyd0oB/g7ludimnBoimeueTlzSucB2qTAkr4X86MMCYkDCYl OCXHX/LgAmxcK6Y8iYz1kvAoPIB6nwMPBSfYmZHUCMkNQCIFVSQKjgEyNhAKSOw+Y0Pymt Nnv8D5Rv5mYbuGBXNxFGGLAMptCalllhpvMoftSfP7FkfQsu87/GCcev4m0sFvNyrW1UGw HJGhxJyPzliHR6GxBWcKp7Gw3yVg4qFgWJynhbyCgOlku+OFW3bNO95dL8aRpOA3eYv2Me 8K987hOKHMpL/6fe1Y2UhUoGPluaYoXSByyde+FLbB4vv/3mlxTdN//4XIr+FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWkkY0lB6zTm8; Thu, 24 Aug 2023 13:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ODf9Iq023625; Thu, 24 Aug 2023 13:41:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ODf9Tn023622; Thu, 24 Aug 2023 13:41:09 GMT (envelope-from git) Date: Thu, 24 Aug 2023 13:41:09 GMT Message-Id: <202308241341.37ODf9Tn023622@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: d0434eff5786 - stable/13 - arm/unwind: Check stack pointer boundaries before dereferencing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d0434eff57861d0fbff6e31ea541c08979c99428 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d0434eff57861d0fbff6e31ea541c08979c99428 commit d0434eff57861d0fbff6e31ea541c08979c99428 Author: Mark Johnston AuthorDate: 2023-07-27 19:44:00 +0000 Commit: Mark Johnston CommitDate: 2023-08-24 13:33:00 +0000 arm/unwind: Check stack pointer boundaries before dereferencing If the unwinder somehow ends up with a stack pointer that lies outside the stack, then an attempt to dereference can lead to a fault, which causes the kernel to panic again and unwind the stack, which leads to a fault... Add kstack_contains() checks at points where we dereference the stack pointer. This avoids the aforementioned infinite loop in one case I hit where some OpenSSL assembly code apparently confuses the unwinder. Reviewed by: jhb MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D41210 (cherry picked from commit 1be56e0bb1e8bd8373e446ff9386bcdd764935aa) --- sys/arm/arm/unwind.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/arm/arm/unwind.c b/sys/arm/arm/unwind.c index 4a24d8f13fb1..cdc9ef225ee7 100644 --- a/sys/arm/arm/unwind.c +++ b/sys/arm/arm/unwind.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -368,6 +369,7 @@ unwind_exec_read_byte(struct unwind_state *state) static int unwind_exec_insn(struct unwind_state *state) { + struct thread *td = curthread; unsigned int insn; uint32_t *vsp = (uint32_t *)state->registers[SP]; int update_vsp = 0; @@ -402,6 +404,10 @@ unwind_exec_insn(struct unwind_state *state) /* Load the registers */ for (reg = 4; mask && reg < 16; mask >>= 1, reg++) { if (mask & 1) { + if (!kstack_contains(td, (uintptr_t)vsp, + sizeof(*vsp))) + return 1; + state->registers[reg] = *vsp++; state->update_mask |= 1 << reg; @@ -428,6 +434,9 @@ unwind_exec_insn(struct unwind_state *state) update_vsp = 1; /* Pop the registers */ + if (!kstack_contains(td, (uintptr_t)vsp, + sizeof(*vsp) * (4 + count))) + return 1; for (reg = 4; reg <= 4 + count; reg++) { state->registers[reg] = *vsp++; state->update_mask |= 1 << reg; @@ -435,6 +444,8 @@ unwind_exec_insn(struct unwind_state *state) /* Check if we are in the pop r14 version */ if ((insn & INSN_POP_TYPE_MASK) != 0) { + if (!kstack_contains(td, (uintptr_t)vsp, sizeof(*vsp))) + return 1; state->registers[14] = *vsp++; } @@ -455,6 +466,9 @@ unwind_exec_insn(struct unwind_state *state) /* Load the registers */ for (reg = 0; mask && reg < 4; mask >>= 1, reg++) { if (mask & 1) { + if (!kstack_contains(td, (uintptr_t)vsp, + sizeof(*vsp))) + return 1; state->registers[reg] = *vsp++; state->update_mask |= 1 << reg; } From nobody Thu Aug 24 13:41: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 4RWkkZ40V7z4rB8X; Thu, 24 Aug 2023 13:41: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 4RWkkZ2RX1z3gSl; Thu, 24 Aug 2023 13:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692884470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Db/ebM1U2BtmMk7fiEV6LVmZXzzvsgTvYZ11P2ELApM=; b=SsUCLDWOZVsFfb3CgxAEBFAMAgmTBFPXzrc0KjVNXjdK5R/BFVjK3IW8EitE0F4J+YRCv4 ONDCkgwYXxmUUnyKpabQogwaeXBBq4I27F/SIp2ShNIL+StlOpXuUXKON/Dhdh9EwBzH4I pSEQmlGLlqCuk9xiQtEd3x0Vqj9aJ1BkjKikNZYhdiLU5EgqH0uekp4hCqDxdVoSKfVRJY OUxxskORFhpoBe30YyKYiRcSkN1iHp85EpIagDlUCYiUFKkwcEZ8KSYG5EhgiXji49gPk7 rZSE4vEI7IfhPvQaQ4ScvBKAqdPxMRgXZy7ZQyZX3vXqrfbI08qZWhhjWzwiZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692884470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Db/ebM1U2BtmMk7fiEV6LVmZXzzvsgTvYZ11P2ELApM=; b=w/5ja77pS0mhlXDf4xq8D1GROOdbYRO0h9ZqvxlQPZFhyggDyWTn2H9QPxLNEBgnNONUfg ikv4c3ykwM2yDPp0r+qA97CwvdoO+G32bWbCm+sZp5BywAi1IFeaylst+dK81EzlY+YAUH IZES525OpElkamrfyiuDaICJOShhrMPftZ2zB/Qsrgm5g2nAIRwaF4lrXq7Iuc1G0ixMMG H9lmaEjlpRpSC+8V5cGgeRUa4IZK+dDOc7ogzMly1lfyzp+7Ovc5AXsZzxpvAgSJ4K0I2r MNnj13T8sq+0YxBh4pBoG2h8en4EpY4AtoHacpq98x6lNiqD+gJlQP+aD4XQNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692884470; a=rsa-sha256; cv=none; b=WUCbtSCPeK88gdeuatuEEa8MMHqzKGtRbV0j7SQWg6dj6l8rn2lFJJS242alCVoUsV5qZs yXjEiq+NsQ473Zt22BBkHNQogVUAoy3RMtc/ypQQeHrxrDmXY9WjVEo71aVShZU9O9W6G2 8LU08Q80RpbJHQzNlxppEMxAJGIr2MKvP2dGxcCuYddQTfBAX1Aoe6L+624zMy1oHoMozz K0WCMjO+kvY0i1Nq320knMrPUeVxXgEIahlvX1/2pHZkgs9eAIjwhxYZ2aw7ulK5WUiz85 rwL5x09hgK2fIIkSgPkfZrOOHBW1xdU0axpxrkiLxc7DJzaMu38MC+8h+4dkCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWkkZ1Xv7zTdM; Thu, 24 Aug 2023 13:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ODfAAL023670; Thu, 24 Aug 2023 13:41:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ODfAIY023667; Thu, 24 Aug 2023 13:41:10 GMT (envelope-from git) Date: Thu, 24 Aug 2023 13:41:10 GMT Message-Id: <202308241341.37ODfAIY023667@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: a4db69370ed5 - stable/13 - ossl: Add missing labels to bsaes-armv7.S List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a4db69370ed526e3d840e1b7ef223ba8dc403d18 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a4db69370ed526e3d840e1b7ef223ba8dc403d18 commit a4db69370ed526e3d840e1b7ef223ba8dc403d18 Author: Mark Johnston AuthorDate: 2023-08-07 14:17:16 +0000 Commit: Mark Johnston CommitDate: 2023-08-24 13:33:00 +0000 ossl: Add missing labels to bsaes-armv7.S There is a bug in the OpenSSL script which generates this file; the bug is in the process of being fixed upstream. Specifically, when generating the output, bsaes-armv7.pl strips some labels that are used when the output asm is compiled with __KERNEL__ defined, resulting in a build error. As a step towards adding armv7 support to ossl(4), manually patch the generated asm. The upstream fix will be imported later. Reviewed by: andrew, jhb, emaste MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D41303 (cherry picked from commit 454c425dbed1d341025c71a8645011a980e20ccd) --- sys/crypto/openssl/arm/bsaes-armv7.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/crypto/openssl/arm/bsaes-armv7.S b/sys/crypto/openssl/arm/bsaes-armv7.S index 55223764a03c..6f19a097768f 100644 --- a/sys/crypto/openssl/arm/bsaes-armv7.S +++ b/sys/crypto/openssl/arm/bsaes-armv7.S @@ -1129,7 +1129,7 @@ bsaes_cbc_encrypt: vstmia r4, {q7} .align 2 - +0: #endif vld1.8 {q15}, [r8] @ load IV @@ -1389,7 +1389,7 @@ bsaes_ctr32_encrypt_blocks: vstmia r12, {q7} @ save last round key .align 2 - add r12, r3, #248 +0: add r12, r3, #248 vld1.8 {q0}, [r8] @ load counter adrl r8, .LREVM0SR @ borrow r8 vldmia r12, {q4} @ load round0 key @@ -1624,7 +1624,7 @@ bsaes_xts_encrypt: vstmia r12, {q7} .align 2 - sub sp, #0x90 @ place for tweak[9] +0: sub sp, #0x90 @ place for tweak[9] #endif vld1.8 {q8}, [r0] @ initial tweak @@ -2110,7 +2110,7 @@ bsaes_xts_decrypt: vstmia r4, {q7} .align 2 - sub sp, #0x90 @ place for tweak[9] +0: sub sp, #0x90 @ place for tweak[9] #endif vld1.8 {q8}, [r0] @ initial tweak adr r2, .Lxts_magic From nobody Thu Aug 24 13:41: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 4RWkkb477fz4r9xV; Thu, 24 Aug 2023 13:41: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 4RWkkb3hxcz3gR4; Thu, 24 Aug 2023 13:41:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692884471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w05P+l4rp0AYUr4jDPTzE0iCMstLTwsIbhLzE3U38tg=; b=ZCs6TXVsoAxdZ5oZcSapjZqFECiICtR5MmisCsa9/R86g5SsCyYVBtsaJLkOQ3BU9Ac2WS 1RPIP2mh4LP2N/by7YBKcOYrxWZvROOjhSeDIP4FOS0t2sWkhT/kucjngEAI81zEr+uP3S kfyVYfnKP8H/Cot49j7VCqSRn1MqLlzbTa7IQhLz0pWDzhS+Q+UpApCVaMjhHWfN5Jc4K1 oIzT5rYfxEXtKsBqTdCgvvHXt4epl+UHiKgebzekBvSFxxuo/+J9ZYoGsNmRNQK29KSds+ YXQOVCi/8qzPl7DX7SfxrXRT2q6jtarT3RTJ1KrD627PvVYPIFvpGfSkc/6KbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692884471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w05P+l4rp0AYUr4jDPTzE0iCMstLTwsIbhLzE3U38tg=; b=iuzZMrbJanaW+4dzqBoJuKtwmDsk58rYB8csvOt59ZpZgsBVcuf6kV6HrjS8JptF+luD7X A0AyYm9sAqSZ4Tg+z1IYuSYTuQnkwWDNWGDLvlFwiBY+gD5p667uK/pNlUq5+PX7d1l3u2 zolMqlkURwiI1sN4WUiqUkZNKLfID5KRVMXgnFa6BwpoN5Ia6sDe5IFArqhK2fV1mkBBHU TZTHccJojX9+JmiZQ/IpySrWvYKlmOmvf8/NLbzHIs/p8brjAhLKu1UlbAV8foHzyEYv0e +qk3ucE4EU5kXJAWj2PVbwdUFe1HC8666F5Ic+nMHqR2cJHbJz9BrD/dld0u4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692884471; a=rsa-sha256; cv=none; b=DRNHcWu47L9AbIWFCH9BfsU4SaD0bnAe5PYQlXJIh0KHpDxFFhyIEQicY+fplmwDZBVYL+ PmPRULqrGYxz7IWkhUmAEGwoUac0NaCEzoKnGKJe/2OoeuM2bGjZBFryk5zL0TjUfYQWXv 1Tsvd6kXTdJ+wMLbaJsPEdhbxhh6Tp7CRlGMcqLycHb8V1Rt6sItsrcENSoU0ZmoCtHKtz ZaSB13cRclS67N31WZTcuCZ+jsZmS3kVITtIpGSlHT1VQ7Uac44WNSrZJkqxCdfwJdXBVK vghRRuxqpdnQJJ40bMAhIca8HFi+2VsqGOglBslBVOFv0Gs6J3u//xInnnGRpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWkkb2WCjzTdP; Thu, 24 Aug 2023 13:41:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ODfBvK023716; Thu, 24 Aug 2023 13:41:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ODfB3l023713; Thu, 24 Aug 2023 13:41:11 GMT (envelope-from git) Date: Thu, 24 Aug 2023 13:41:11 GMT Message-Id: <202308241341.37ODfB3l023713@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: 7756dcc46f3b - stable/13 - vmm: Fix VM_GET_CPUS compatibility List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7756dcc46f3b1059e68fdd0099ca26618d5d8d62 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7756dcc46f3b1059e68fdd0099ca26618d5d8d62 commit 7756dcc46f3b1059e68fdd0099ca26618d5d8d62 Author: Mark Johnston AuthorDate: 2023-08-17 18:49:54 +0000 Commit: Mark Johnston CommitDate: 2023-08-24 13:33:11 +0000 vmm: Fix VM_GET_CPUS compatibility bhyve in a 13.x jail fails to boot guests with more than one vCPU because they pass too small a buffer to VM_GET_CPUS, causing the ioctl handler to return ERANGE. Handle this the same way as cpuset system calls: make sure that the result can fit in the truncated space, and relax the check on the cpuset buffer. As a side effect, fix an insufficient bounds check on "size". The signed/unsigned comparison with sizeof(cpuset_t) fails to exclude negative values, so we can end up allocating impossibly large amounts of memory. Reviewed by: jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41496 --- sys/amd64/vmm/vmm_dev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c index 70434a44e5f4..46faccf9b7e3 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -878,11 +878,12 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, error = 0; vm_cpuset = (struct vm_cpuset *)data; size = vm_cpuset->cpusetsize; - if (size < sizeof(cpuset_t) || size > CPU_MAXSIZE / NBBY) { + if (size < 1 || size > CPU_MAXSIZE / NBBY) { error = ERANGE; break; } - cpuset = malloc(size, M_TEMP, M_WAITOK | M_ZERO); + cpuset = malloc(max(size, sizeof(cpuset_t)), M_TEMP, + M_WAITOK | M_ZERO); if (vm_cpuset->which == VM_ACTIVE_CPUS) *cpuset = vm_active_cpus(sc->vm); else if (vm_cpuset->which == VM_SUSPENDED_CPUS) @@ -891,6 +892,8 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, *cpuset = vm_debug_cpus(sc->vm); else error = EINVAL; + if (error == 0 && size < howmany(CPU_FLS(cpuset), NBBY)) + error = ERANGE; if (error == 0) error = copyout(cpuset, vm_cpuset->cpus, size); free(cpuset, M_TEMP); From nobody Thu Aug 24 13:57:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RWl593R6jz4rCHG; Thu, 24 Aug 2023 13:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWl592k1tz4F6l; Thu, 24 Aug 2023 13:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692885437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x6ifxJjvBXlUulYZt8LjbGsKwIA1abls5/9KGFTGtew=; b=UYXwBwtE32j1rkerJ+R19T0kIjhLugsM8XY1jPQLu0Ex6T3vtBZvzG3RprFz3EsSyTjSX4 HpkYN23FlKk+nTrJj6DstcTnJEXenZgQUlZWoBaGZjBFdvh9lQ6cHcwqKlWvfGQh+TJ2Uu kSZcvJ/RVUxc18VjGK6Z7VhNSIPa5AfrW0hWc1FZaAfgQ+VR+4h6XsnwzBFqUAVJnCqDeX 0ohvS3SLfGykJTNavbvGrts3LpffiLdnzfZ+P8C8FSungOvDebDb6SJnHQUtq+sD2MCSeP UKmraE9+yBEP72NsbROQ5vmPWJxWahR8eDEuFtWqbDYbEcNccZgIourW9+NXVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692885437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x6ifxJjvBXlUulYZt8LjbGsKwIA1abls5/9KGFTGtew=; b=Q5w15EcY6ybhs0lM8U6HOw412BCK24EDBZpUkSm7BE1pg0F1vfgG8lbaSukN4F+sPjKqbT K16ynAbjvQS+oEXz/gFQ2z0hKF40ndBQWqK3XaQqxVxUgEfYzV5OhPo/g/d5ZkuWcYbFBA qps5YR7rwaoNOJbKz3nS0qNkQ1OBmn8Q77KeBZm+thLc6rTBMAsZYR2X1D+EE4iMIzZuda L/JEpSOBR/58EMkNweUkZOjJ+mHdWbCvFG8ssCh0eOFb/+nagWTCOg4FVLA1+Z0yXmHehz 7kzFrB7s4tynD8zTilAhDl6Q72S+wA2AZHTjsHrVHvbTbuwrSbK+IenQ62tmKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692885437; a=rsa-sha256; cv=none; b=CwF1SaqBWzFiVcF0w9mZXLPGcd5K0zm2FBY1jQaMcC5udLd503Cfm5RZJJwTvO75y85yRA dGCagH1Cdd0+n05vPQ42kbzUiFUquEh+TPQKTiK5AvCheAixi25RXi+CCL6JeU0O/khrCd N6b9GGzbxNU1hLyGsq6LqGeEWaStDbOvEVOBUddKrpAKGDFY8sfpMRbkcsPbhNZ5M1pxKI QGR4n8ePWdTjPFi2agw2it/ue4cyBxrYfligUqzUktLJXexxq+/uVz5JcjfdPHw/R7RY2A 9YfZSPnXOwjWmL3HdMIcgPZpmvymaKPDQ/ZQwSvc2tkvpWDd96nlN+EwlNibMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWl591T3PzTnG; Thu, 24 Aug 2023 13:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ODvH9N045368; Thu, 24 Aug 2023 13:57:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ODvHPc045365; Thu, 24 Aug 2023 13:57:17 GMT (envelope-from git) Date: Thu, 24 Aug 2023 13:57:17 GMT Message-Id: <202308241357.37ODvHPc045365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 847fa61fad5e - main - sctp: improve handling of socket shutdown for reading List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 847fa61fad5ef118dc0591d876bf9449200aa818 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=847fa61fad5ef118dc0591d876bf9449200aa818 commit 847fa61fad5ef118dc0591d876bf9449200aa818 Author: Michael Tuexen AuthorDate: 2023-08-24 13:52:55 +0000 Commit: Michael Tuexen CommitDate: 2023-08-24 13:52:55 +0000 sctp: improve handling of socket shutdown for reading If a socket is marked as cannot read anymore, drop chunks which should be added to a control element in the receive queue. This is consistent with dropping control elements instead of adding them in the same situation. Reported by: syzbot+291f6581cecb77097b16@syzkaller.appspotmail.com MFC after: 1 week --- sys/netinet/sctp_indata.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index f7f0e3fdfe7f..c195cce96f39 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -1290,14 +1290,17 @@ sctp_add_chk_to_control(struct sctp_queued_to_read *control, * control and free up the chunk resources. */ uint32_t added = 0; - int i_locked = 0; + bool i_locked = false; - if (control->on_read_q && (hold_rlock == 0)) { - /* - * Its being pd-api'd so we must do some locks. - */ - SCTP_INP_READ_LOCK(stcb->sctp_ep); - i_locked = 1; + if (control->on_read_q) { + if (hold_rlock == 0) { + /* Its being pd-api'd so we must do some locks. */ + SCTP_INP_READ_LOCK(stcb->sctp_ep); + i_locked = true; + } + if (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_CANT_READ) { + goto out; + } } if (control->data == NULL) { control->data = chk->data; @@ -1346,6 +1349,7 @@ sctp_add_chk_to_control(struct sctp_queued_to_read *control, control->end_added = 1; control->last_frag_seen = 1; } +out: if (i_locked) { SCTP_INP_READ_UNLOCK(stcb->sctp_ep); } From nobody Thu Aug 24 16:19:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RWpFk2kgFz4rKvc; Thu, 24 Aug 2023 16:19:54 +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 4RWpFk2BDBz4QhN; Thu, 24 Aug 2023 16:19:54 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692893994; 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=2wKn5xtzYQwTFv4RpIM7aOg2zfY/npjxvkMzOjHfX+c=; b=l0P1mAQol8dDp3NyYG7s6mgACTwBwyUCiFBy+KQ+UqXYsJYNJLrWphjZ7jZZh6cMJj907g LWWbColIcHddCIjN5++lzYoj+/D0MZ1KAikrGJwRLtICU7OqpV+phvsshYoa4vta6yuKTk 9QXy0XMtzSV2WGPcn6hoEF6bTImZWSR2YATqYHuTgmkWZLi8iC0VbysoZ8oVVG6DDRnA3f 8EVjjH/mGWjIrhaGKQUF5Sv2xPQmx6vLW87if7CD3DX+bjlIpSe6PZBv0cPxKZ0itpUXSX HUK0luqzK7fJSEtFldFS33NMnSnVDim4gLGdkt45J/BrsDO7qat6OTqvrdbziA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692893994; 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=2wKn5xtzYQwTFv4RpIM7aOg2zfY/npjxvkMzOjHfX+c=; b=U0vOnF2iBKHTXZL7Wrj1JZPf1k2DC0hnqVKOHNuoa7e9AwSR+YHtpW9GkOdHbwudJMTPap xRF/86njcojeWOp2XycUE5Q/V9fq1ogWKe/wvxe2AWKz+EjkqVld7bjrssDwQfJMWztOhQ xmgKB5F8KkRAGW3+qVBX2Cw/Hs2gE5QNydltkqjgrhj8oWZKPjVHwxG8TaijUmUUt7Ykwc AgsYfVas9jWv+m3jjwrUeCMDGY1Oelg4D4PYgYD/vK1c8dC+ahL0SKRxsOTBdLLK8Q/hiR h//PikKz871YovVjtIkFIsrP0gI1taHIec+hxOvCdnGMfDX/j3S4qufhYJM1VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692893994; a=rsa-sha256; cv=none; b=ZSVGmJcOiWiDgABjwVmVgSbksSnsLepwWl0nnfDZZ0T4OUbx6/LrVuumCo04CK20/vHgAv RVO0IinE4TCAIkOSRTzMSYYPNBhZo6gVV3hfRMEM6a8V2Zqv5tXxQos7mLppLdOSFcbVeM aK0t1TnQ4CwDoKHqomMvkLdzimrnsdzjWt5tvll4WIeufStsrQTO39ZE7vXI2yO9p3dQPg XjxDAZO6AC7YBO32tOTyybqJCD7mg9waQ5uBHkv6EJxqIMhMTU8p7x4ZatGpKejH8/wZbr h2BB3jV4bQULXw3drilOIDzScheiUJFOsE6Gb96F50h/Y6ZhAZrLT3sjf/UQkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:648:8683:a9e0:f5a2:610:c984:621d] (unknown [IPv6:2601:648:8683:a9e0:f5a2:610:c984:621d]) (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 4RWpFj3lBRz12lm; Thu, 24 Aug 2023 16:19:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <747e34d5-8191-5fb9-deb4-c94d7f1693e0@FreeBSD.org> Date: Thu, 24 Aug 2023 09:19:51 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: git: 4a69fc16a583 - main - Add membarrier(2) Content-Language: en-US To: Warner Losh , Jessica Clarke Cc: Konstantin Belousov , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202308230007.37N07cOK082906@gitrepo.freebsd.org> <748B7A01-5011-44EE-BB04-282AE96F9B5B@freebsd.org> <0F3EA94D-6696-471C-ABF6-840B5E92967F@freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 8/23/23 6:01 AM, Warner Losh wrote: > On Tue, Aug 22, 2023 at 11:37 PM Jessica Clarke wrote: > >> >>> The addition does not change any existing code path in the kernel. >> >> No, but it commits us to a new syscall being stable just days before 14 >> branches and has its ABI frozen. >> > > I'd planned on committing timerfd later today. I didn't consider it an ABI > breakage, since it was just additive. It's one of the things that can be > MFC'd (we don't prohibit new system calls). (Not taking a side on the merits of the current membarrier(2) implementation) I think Jess's point here is not that a new syscall is not a valid ABI breakage, but more that once you add a new syscall that makes it into a release, now the ABI of that syscall is frozen and can't be changed. That said, syscall numbers are relatively "cheap", so if we had to renumber membarrier(2) because its ABI was found to be a problem that could be done, albeit at the cost of keeping the old one around under COMPAT_FREEBSD. -- John Baldwin From nobody Thu Aug 24 16:37: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 4RWpdd2jK9z4rLk6; Thu, 24 Aug 2023 16:37: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 4RWpdd257Vz4S0C; Thu, 24 Aug 2023 16:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692895029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NwKjSLgukKLKdCPcHFDPSWDPlpJmtWKcLL5XybTwF3Q=; b=WWxnOmFzUClSV6eV//cuHQ2Ct15mvgC8aSI4lTO7tO1pjMiB28za7ogXxzku6e04H19s/s iIIsaQu1frKsUMUw+Zj6ix7mArwEyxijQe3MYZbaQmYDrwLzuZY9H4tcLWeZ6RGP35SHox g+vX4A8F/19m4gN8HF8UzPPBUH9n1H8fcWueMniFPWgiXAhWxU612NANAMbzWuO1RaVg6M 28wRb+MBp8xgln55zN5SqYTVuiHNuYmDkzK5lwdFBSTkuXFjn3O0+bu/3cAxPEONzIAIZV 2bN8YlRYLVjxGX8xpWZ+cvn4o/AA3P80LkSJRJ5qLt8OjaiGhaPc14kE6hV8Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692895029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NwKjSLgukKLKdCPcHFDPSWDPlpJmtWKcLL5XybTwF3Q=; b=anQbb1ya50VTpnUW6jMn6Zkw8tGUZboesCnO5qIw0x5RC5MLeADnxyAdbA1ivpmhP7OnzZ o6SZF0aCtqDzkuJ1kY5PxosCHDcEsdVePUmcjpfe1buMg0yFrq0CYGOKscezkS3z05jzoW 22GmeMWUb7NGGX+hfQx5epvWCMvcmUUB0t99IC7rP0XU8CbEw0LIuETR8d/UCX8zGSh3Rt WJ2ggQMHX6xHR6koVcwZMr9fUBcY2EVRMfShK0W+PU0l04pVFqaomZxo+FJu1zK7T8vqA0 ONa96E6+FCbw1uiXCA9Jgra5S60jDtG9tIF+dxNrHp4+kE+5ePnOl0n3+qzZ3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692895029; a=rsa-sha256; cv=none; b=PDblLju1rVrSpyByG7jz/cGLpLRHccxG8RNN5WqsVVdpRKfQ8K5g5pgV9xVSvCL3aUFOjg 6wOyEcQmos0T7CVWMnJCDgFjwUADsorkG7f/05o1pi3qDtaG50WFMBTjqHuW5HYCRK9ZX/ 9dstsfSs4ELl7KbYLlXQuZsKr/XeEmu/G+77FheK/DJK64Z/m+u5eV57fUoLhM7cT/vMg6 jO5YgpVih/PPHtjigXwEhmL46RjA5nWaAfMc3CSyaPyoWYRICLBMTpKKhQf/6qHMkOsM/R /VtK1ENeyQB3B8+hOf48u00t1DbsADhA9afUCodoe4uSeheKZrhSusEc7gm2Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWpdd17m7zZKV; Thu, 24 Aug 2023 16:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OGb90H011103; Thu, 24 Aug 2023 16:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OGb95M011100; Thu, 24 Aug 2023 16:37:09 GMT (envelope-from git) Date: Thu, 24 Aug 2023 16:37:09 GMT Message-Id: <202308241637.37OGb95M011100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: f06e32e9b9e4 - main - Revert "ps: extend the non-standard option -d (tree view) to work with -p" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f06e32e9b9e4eef24df12db1b2d659893b02d4cd Auto-Submitted: auto-generated The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=f06e32e9b9e4eef24df12db1b2d659893b02d4cd commit f06e32e9b9e4eef24df12db1b2d659893b02d4cd Author: Piotr Pawel Stefaniak AuthorDate: 2023-07-29 16:16:35 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2023-08-24 16:35:50 +0000 Revert "ps: extend the non-standard option -d (tree view) to work with -p" This reverts commit ca8c0d5e811048ad67d0955642c5b486e9c0f3d2. By commiting ca8c0d5e8110 I was hoping that the existing option -d could just be extended to work with -p to implement a feature that was and I think is still needed, that is to show all descendant processes of a given process id or a set of process ids. After a complaint from -current which may represent a wider dissatisfaction with this change in the program's behavior, I think it will be better to revert ca8c0d5e8110 and reintroduce this feature using a separate option -D. --- bin/ps/ps.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/bin/ps/ps.c b/bin/ps/ps.c index e7781d1d9310..8554a2eaa0a2 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -502,7 +502,7 @@ main(int argc, char *argv[]) what = KERN_PROC_PGRP | showthreads; flag = *pgrplist.l.pids; nselectors = 0; - } else if (pidlist.count == 1 && !descendancy) { + } else if (pidlist.count == 1) { what = KERN_PROC_PID | showthreads; flag = *pidlist.l.pids; nselectors = 0; @@ -537,14 +537,6 @@ main(int argc, char *argv[]) if ((kp == NULL && errno != ESRCH) || (kp != NULL && nentries < 0)) xo_errx(1, "%s", kvm_geterr(kd)); nkept = 0; - if (descendancy) - for (elem = 0; elem < pidlist.count; elem++) - for (i = 0; i < nentries; i++) - if (kp[i].ki_ppid == pidlist.l.pids[elem]) { - if (pidlist.count >= pidlist.maxcount) - expand_list(&pidlist); - pidlist.l.pids[pidlist.count++] = kp[i].ki_pid; - } if (nentries > 0) { if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL) xo_errx(1, "malloc failed"); From nobody Thu Aug 24 16:37: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 4RWpdf3FrSz4rLY4; Thu, 24 Aug 2023 16:37: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 4RWpdf2hmzz4S4y; Thu, 24 Aug 2023 16:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692895030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0C3TXr8dWDIUjHs838+yfkwaYOaGdL56Hjsoo5dgLYY=; b=omR1eQHEDUgZ0cZjjUg4lOzbeYzvsBuZQShQFvh0JChnegFvDbdHyDqTwI/V/zl43Xo6dt 2DgcCdiuKFYY+jwRd6zeG98X7bnZq0/GqU+Rza1tLsGnjaBtMVAIT5BYrLQJD9o97JxzzM uSX+6HJ5Uxtqt6QWUzDVFK027ZvJ29HYsZ9x+FI7R/RiYRm7bVxl2MMdVUcmVh05L2awVo FqLFmeUf3FSpNYcwGjmzZLfSFGk+AMV/iqprq4chmvuvl+huak8QI1e/eTnAqxhM9uep+a Xmfxkl1VjeLOjLuMvVGke7Q7nJOeBj5Dw85lou+kfn+MgsuX357R+aZUuyVOxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692895030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0C3TXr8dWDIUjHs838+yfkwaYOaGdL56Hjsoo5dgLYY=; b=ug8wF62CqdKd+mc9WSNQPa2QjRslzccH+K7er8IySJCSVvxLom7CIuUJEE7PDrzMqNFJ/1 U+S4Crvoh8ZJI+XsWJVbvXw0OqnheuapHTF6rwp8hvYHCGZ4Kw7iFot+ELYkoBixuYEHu1 wnc4gyIdnL9AmhnkcqJG1xUQkN2YBrQig0tm9tWo8bJu52kcPo4OwphmpTzg+wbShLbG9H cxd/drgtwvlsiG1eaeeFOTpIjs/sOH3Of+yCzWlP8l4aMBRQgnc4fA6kP/4UuhJgvHgEM+ 3PSAI4WMzUklucm9OlrXtjBSuH6vIfRDVroG9uqVLom+M+zjUSZNgdyPQv6sEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692895030; a=rsa-sha256; cv=none; b=DDtPmkfciyiIcHqsMnvTgtAv4SDrZwuOwIiLoFAT+I+xzuhxwDYx+fkl6GU9EUFqeCYSm/ zd4sW2M783VxXFomkm2ht2I9cpVvb0RgHkvrwUjLV4p0cuG0Ml6df3UltLtEI+rnAhjiI6 RR9cLNwW89azfvNWrp++irK8tYTQ2Rk+OS2gE9lFP09XHBlEkDOggDdr3xu0YAK9428fD0 xpNiBlgWM6+53mSRazA7nAmJeVqAuFsV+UxerTu5G1aTO90ZGFMcIl6P8Y6jlNMSJEsY2F HVPECy1pXJtI3xod1+LCHmKFhH9Ze01K0Ks4euO4jmxp5Pr1/DWr/cIdoG8ncQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWpdf1lxvzZPv; Thu, 24 Aug 2023 16:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OGbAI5011168; Thu, 24 Aug 2023 16:37:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OGbAfl011165; Thu, 24 Aug 2023 16:37:10 GMT (envelope-from git) Date: Thu, 24 Aug 2023 16:37:10 GMT Message-Id: <202308241637.37OGbAfl011165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 5c0a1c15ff8c - main - ps: add a new option -D to reimplement tree traversal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c0a1c15ff8cb66128f4826ace8ba91e0a31486d Auto-Submitted: auto-generated The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=5c0a1c15ff8cb66128f4826ace8ba91e0a31486d commit 5c0a1c15ff8cb66128f4826ace8ba91e0a31486d Author: Piotr Pawel Stefaniak AuthorDate: 2023-08-24 16:29:46 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2023-08-24 16:35:56 +0000 ps: add a new option -D to reimplement tree traversal It takes a non-optional parameter string, one of "up", "down", or "both" that can request tree traversal in the chosen directions. This adds PIDs from the paths to the selection of PIDs and can be used together with -d to draw a subset of the process tree. Differential Revision: https://reviews.freebsd.org/D41231 --- bin/ps/ps.1 | 15 ++++++++++++++- bin/ps/ps.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 5fdecc4a3d4c..23868d8b3009 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -28,7 +28,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" -.Dd April 25, 2023 +.Dd August 24, 2023 .Dt PS 1 .Os .Sh NAME @@ -39,6 +39,7 @@ .Op Fl -libxo .Op Fl aCcdefHhjlmrSTuvwXxZ .Op Fl O Ar fmt | Fl o Ar fmt +.Op Fl D Ar up | down | both .Op Fl G Ar gid Ns Op , Ns Ar gid Ns Ar ... .Op Fl J Ar jid Ns Op , Ns Ar jid Ns Ar ... .Op Fl M Ar core @@ -146,6 +147,18 @@ relative to each other. Note that this option has no effect if the .Dq command column is not the last column displayed. +.It Fl D +Expand the list of selected processes based on the process tree. +.Dq UP +will add the ancestor processes, +.Dq DOWN +will add the descendant processes, and +.Dq BOTH +will add both the ancestor and the descendant processes. +.Fl D +does not imply +.Fl d , +but works well with it. .It Fl e Display the environment as well. .It Fl f diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 8554a2eaa0a2..3a7a0f54cca0 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -168,7 +168,7 @@ static char vfmt[] = "pid,state,time,sl,re,pagein,vsz,rss,lim,tsiz," "%cpu,%mem,command"; static char Zfmt[] = "label"; -#define PS_ARGS "AaCcde" OPT_LAZY_f "G:gHhjJ:LlM:mN:O:o:p:rSTt:U:uvwXxZ" +#define PS_ARGS "AaCcD:de" OPT_LAZY_f "G:gHhjJ:LlM:mN:O:o:p:rSTt:U:uvwXxZ" int main(int argc, char *argv[]) @@ -188,6 +188,8 @@ main(int argc, char *argv[]) int fwidthmin, fwidthmax; char errbuf[_POSIX2_LINE_MAX]; char fmtbuf[_POSIX2_LINE_MAX]; + enum { NONE = 0, UP = 1, DOWN = 2, BOTH = 1 | 2 } directions = NONE; + struct { int traversed; int initial; } pid_count; (void) setlocale(LC_ALL, ""); time(&now); /* Used by routines in print.c. */ @@ -262,6 +264,20 @@ main(int argc, char *argv[]) case 'c': cflag = 1; break; + case 'D': { + size_t len = strlen(optarg); + + if (len <= 2 && + strncasecmp(optarg, "up", len) == 0) + directions |= UP; + else if (len <= 4 && + strncasecmp(optarg, "down", len) == 0) + directions |= DOWN; + else if (len <= 4 && + strncasecmp(optarg, "both", len) == 0) + directions |= BOTH; + break; + } case 'd': descendancy = 1; break; @@ -502,7 +518,7 @@ main(int argc, char *argv[]) what = KERN_PROC_PGRP | showthreads; flag = *pgrplist.l.pids; nselectors = 0; - } else if (pidlist.count == 1) { + } else if (pidlist.count == 1 && directions == NONE) { what = KERN_PROC_PID | showthreads; flag = *pidlist.l.pids; nselectors = 0; @@ -537,6 +553,33 @@ main(int argc, char *argv[]) if ((kp == NULL && errno != ESRCH) || (kp != NULL && nentries < 0)) xo_errx(1, "%s", kvm_geterr(kd)); nkept = 0; + pid_count.initial = pidlist.count; + if (directions & DOWN) + for (elem = 0; elem < pidlist.count; elem++) + for (i = 0; i < nentries; i++) { + if (kp[i].ki_ppid == kp[i].ki_pid) + continue; + if (kp[i].ki_ppid == pidlist.l.pids[elem]) { + if (pidlist.count >= pidlist.maxcount) + expand_list(&pidlist); + pidlist.l.pids[pidlist.count++] = kp[i].ki_pid; + } + } + pid_count.traversed = pidlist.count; + if (directions & UP) + for (elem = 0; elem < pidlist.count; elem++) { + if (elem >= pid_count.initial && elem < pid_count.traversed) + continue; + for (i = 0; i < nentries; i++) { + if (kp[i].ki_ppid == kp[i].ki_pid) + continue; + if (kp[i].ki_pid == pidlist.l.pids[elem]) { + if (pidlist.count >= pidlist.maxcount) + expand_list(&pidlist); + pidlist.l.pids[pidlist.count++] = kp[i].ki_ppid; + } + } + } if (nentries > 0) { if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL) xo_errx(1, "malloc failed"); @@ -1448,10 +1491,11 @@ usage(void) { #define SINGLE_OPTS "[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]" - (void)xo_error("%s\n%s\n%s\n%s\n", + (void)xo_error("%s\n%s\n%s\n%s\n%s\n", "usage: ps [--libxo] " SINGLE_OPTS " [-O fmt | -o fmt]", " [-G gid[,gid...]] [-J jid[,jid...]] [-M core] [-N system]", " [-p pid[,pid...]] [-t tty[,tty...]] [-U user[,user...]]", + " [-D up | down | both]", " ps [--libxo] -L"); exit(1); } From nobody Thu Aug 24 18:03: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 4RWrXm2KSLz4rQYq; Thu, 24 Aug 2023 18:03: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 4RWrXm1mlgz4Z87; Thu, 24 Aug 2023 18:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692900184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TXcHbQvvsjop5aVm0zOHxW165G0I3HV1jptjgotV+Zg=; b=LAEb2WtQxUXW8J0VMSOEVCMlFosxeiSAG3KilP5zimlapSBjHY6tncIzwHAUBSXBtB4vPn h9DMl2lrBbzmgSSHHefvnxhcIDU1OV0Rsk1ckFYLPVgjFiB0GG9QjHFvguQp4nuaziATWv 7SqLjza+rap/wjzWuajv9bUmPam9R+OkX5jLs0BR2r99ieAyMaCsDJm8TMJHXKEd8ftIy8 8rHrOVRYo/eMgrRgtUZ7/shLWvnAdFMfApN7h6R/HHNfXGq12NHpCduHFhj4klGghG1q9O GN69xTfCadGCC7+AApuP/l2xkAyhW0PXcpzauBo6tAPreGnhQuk1Uzvm46vs6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692900184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TXcHbQvvsjop5aVm0zOHxW165G0I3HV1jptjgotV+Zg=; b=qD23eRTx9cXx8iCsmnDzg7DXbYHmVvcncm9BlcntYPeiTAZE1H6rQ8O/Z7OBgeiWDFj0yp iFNvkvFSzLbSDClTBAnWOwCfFmNF0aar4TlYpCYfCAIT7URGxtQwt5dHJgNYcMzpp4XzW7 KzkpUgwD4gMHOWKCGDfiU17O38ffW9FNVsaCMo4Q1sI7Rwowruh7dZIAdzq3qGQE3gtip6 01ylPmAaGxrcikOH94ZmmhZ9tYz3seloEDWeARk2h56YW/pZW8t4batBxPemmnensVs8Rt H36sxuIIbwzoXxnPpzCFM6Zlu++lfrPfNDmaNauVWOLZmrY1UVuig/LVwwQRAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692900184; a=rsa-sha256; cv=none; b=Zdeyx/iJDR4z/jnGn8THm+CIAJgKlfdGopGgvLoaTQsr5lFZixtU8Jo4cgIz1/21jSrHHh XZ4Zls4Wo+KADMb2PX1UMDtw6Na3EfV3T+o7rENcLHXcqiXjCarTnZ6szIBnKDVvz1kxUp hK1Cgzih7qUqOO/zKniQFBAFsynv7ywBHzyodBs8dYRY62zCkLFJMy0+FwmbGh6EXKoCb8 zXdUHYsYes9UhTtkVVYO2zuhn8dNnYwcSnAfV1clYWv6Z3pGX2enRchPve3alL3mh9v0ey UEzZoLPIUO0GqANe1+o1kYlRIRGNwtVOSEtUNyvKHgJXbOeZCRPO27k/WxLjLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWrXm0qK1zcrZ; Thu, 24 Aug 2023 18:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OI34bk059342; Thu, 24 Aug 2023 18:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OI34l4059339; Thu, 24 Aug 2023 18:03:04 GMT (envelope-from git) Date: Thu, 24 Aug 2023 18:03:04 GMT Message-Id: <202308241803.37OI34l4059339@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: f8bc606aad35 - main - tests: Handle SIGSEGV in the vm stack mprotect exec 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8bc606aad35daf9853e3198f14d4a7baba36fcb Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=f8bc606aad35daf9853e3198f14d4a7baba36fcb commit f8bc606aad35daf9853e3198f14d4a7baba36fcb Author: Dmitry Chagin AuthorDate: 2023-08-24 18:02:52 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-24 18:02:52 +0000 tests: Handle SIGSEGV in the vm stack mprotect exec test To exit gracefully handle SIGSEGV and mark the test as failed. MFC after: 3 days --- tests/sys/vm/stack/stack_mprotect_exec_test.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/sys/vm/stack/stack_mprotect_exec_test.c b/tests/sys/vm/stack/stack_mprotect_exec_test.c index d12d99ea39ee..ba5a1d5cb859 100644 --- a/tests/sys/vm/stack/stack_mprotect_exec_test.c +++ b/tests/sys/vm/stack/stack_mprotect_exec_test.c @@ -12,8 +12,15 @@ #include #include +#include #include +static void +sigsegv_handler(int sig __unused) +{ + + atf_tc_fail("Invalid stack protection mode after grows"); +} ATF_TC_WITHOUT_HEAD(mprotect_exec_test); ATF_TC_BODY(mprotect_exec_test, tc) @@ -22,6 +29,8 @@ ATF_TC_BODY(mprotect_exec_test, tc) char *addr, *guard; size_t alloc_size; + signal(SIGSEGV, sigsegv_handler); + pagesize = sysconf(_SC_PAGESIZE); ATF_REQUIRE(pagesize > 0); From nobody Thu Aug 24 19:29: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 4RWtSH5wBFz4rVW8 for ; Thu, 24 Aug 2023 19:29:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450: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 4RWtSG6gy1z3CTM for ; Thu, 24 Aug 2023 19:29:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-5007f3d3235so225197e87.2 for ; Thu, 24 Aug 2023 12:29:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692905357; x=1693510157; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=xAtRoBPI6o1brlauqNlyBhavbXTFoKd+7654kWRXewI=; b=bQWwFrsflR5zbSXiFXVMQ1FHZD4Sgs0qy1i+edvCAOMcscM3XoM5GcbwvQr/PA51vO wjfN62ChXE5e4P6MFsF7oshPIcVuweQWVgxrB1kIJT9ChqwhFt1JTQ9pwgE4OvsBsqAW mEbzp49bY7cNMpi0UpWb9w5SbWOPyi3cUFQmm8wAU7NFOmyCCeHG3BljVn9GWM1Nmzkb Na8eJt8VKdb4KbYDY1uBDs5qO8bEx+Fv9u5/b50K/+FjEry763G7KXR2Ds28K3Ra27mw zSvoiSMc7Os7k+PVsb6tuUhrCYfHFqrZufrkpjCKqx8fM81vFLlI4tJyOIOg0CvKDm0c zsmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692905357; x=1693510157; 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=xAtRoBPI6o1brlauqNlyBhavbXTFoKd+7654kWRXewI=; b=QCXccf8lXeJhOiW0RCgi1FhYSgSPQmqlziNf7mpAXCu17K8kFuzkjhbwQnynFAa9DE 1m0Kjb6HRhgbN2ZLoaz+dj8+Rcels9N/Wd49L8rebGYlNP6uBSEbd7OOalf3F5Mt0yj8 Cj1vZJmVqWdTZrAqMB6eOhZ5UnWciCCsKP4UG7K8aMkBg1ZYFrprjmALELJeKh30un4U vtgWDoJuIpPojB1ii09cUYq/Bl1BWZdqAbzBuGSwfSKcluUeZdk99Ewby6clLVGL89zB HCD5Xo62U9aVCo0qS6rWQJzoU3Teg/55tk8kKGM98dhqSbg2k06dElWD8VmYLegzLLae Ufpw== X-Gm-Message-State: AOJu0YyMWJNK2mSIq/kk0YEQaGuFMmN6ILtrFDQdxCCYZJSRLP96ZfcO xCfUMUWjaPFFU3kkppJWz3ELCeecVzjwwkaVBtfTTUrUMm9xGgpw X-Google-Smtp-Source: AGHT+IE+v9dsKWldHjZze7sylatTXcwRSYPFo/lOvpegnUdB+/l44dlhb/Ai9NRcr62GCjpbtXTFg6goQNVgr9gxNDw= X-Received: by 2002:ac2:562f:0:b0:4f8:4512:c844 with SMTP id b15-20020ac2562f000000b004f84512c844mr11215957lff.48.1692905357014; Thu, 24 Aug 2023 12:29:17 -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: <202308230007.37N07cOK082906@gitrepo.freebsd.org> <748B7A01-5011-44EE-BB04-282AE96F9B5B@freebsd.org> <0F3EA94D-6696-471C-ABF6-840B5E92967F@freebsd.org> <747e34d5-8191-5fb9-deb4-c94d7f1693e0@FreeBSD.org> In-Reply-To: <747e34d5-8191-5fb9-deb4-c94d7f1693e0@FreeBSD.org> From: Warner Losh Date: Thu, 24 Aug 2023 13:29:06 -0600 Message-ID: Subject: Re: git: 4a69fc16a583 - main - Add membarrier(2) To: John Baldwin Cc: Jessica Clarke , Konstantin Belousov , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="0000000000007190d10603b03e8c" X-Rspamd-Queue-Id: 4RWtSG6gy1z3CTM X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --0000000000007190d10603b03e8c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Aug 24, 2023 at 10:19=E2=80=AFAM John Baldwin wro= te: > On 8/23/23 6:01 AM, Warner Losh wrote: > > On Tue, Aug 22, 2023 at 11:37=E2=80=AFPM Jessica Clarke > wrote: > > > >> > >>> The addition does not change any existing code path in the kernel. > >> > >> No, but it commits us to a new syscall being stable just days before 1= 4 > >> branches and has its ABI frozen. > >> > > > > I'd planned on committing timerfd later today. I didn't consider it an > ABI > > breakage, since it was just additive. It's one of the things that can b= e > > MFC'd (we don't prohibit new system calls). > > (Not taking a side on the merits of the current membarrier(2) > implementation) > > I think Jess's point here is not that a new syscall is not a valid ABI > breakage, but more that once you add a new syscall that makes it into a > release, now the ABI of that syscall is frozen and can't be changed. Tha= t > said, syscall numbers are relatively "cheap", so if we had to renumber > membarrier(2) because its ABI was found to be a problem that could be don= e, > albeit at the cost of keeping the old one around under COMPAT_FREEBSD. > OK. I jumped to the wrong conclusion... Good points all around. Warner --0000000000007190d10603b03e8c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Aug 24, 2023 at 10:19=E2=80= =AFAM John Baldwin <jhb@freebsd.org> wrote:
On= 8/23/23 6:01 AM, Warner Losh wrote:
> On Tue, Aug 22, 2023 at 11:37=E2=80=AFPM Jessica Clarke <jrtc27@freebsd.org> wr= ote:
>
>>
>>> The addition does not change any existing code path in the ker= nel.
>>
>> No, but it commits us to a new syscall being stable just days befo= re 14
>> branches and has its ABI frozen.
>>
>
> I'd planned on committing timerfd later today. I didn't consid= er it an ABI
> breakage, since it was just additive. It's one of the things that = can be
> MFC'd (we don't prohibit new system calls).

(Not taking a side on the merits of the current membarrier(2) implementatio= n)

I think Jess's point here is not that a new syscall is not a valid ABI<= br> breakage, but more that once you add a new syscall that makes it into a
release, now the ABI of that syscall is frozen and can't be changed.=C2= =A0 That
said, syscall numbers are relatively "cheap", so if we had to ren= umber
membarrier(2) because its ABI was found to be a problem that could be done,=
albeit at the cost of keeping the old one around under COMPAT_FREEBSD<n&= gt;.

OK. I jumped to the wrong conclusi= on...=C2=A0 Good points all around.


Warner
--0000000000007190d10603b03e8c-- From nobody Thu Aug 24 20:29: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 4RWvp45KQ8z4rXhd; Thu, 24 Aug 2023 20:29: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 4RWvp451yPz3LgG; Thu, 24 Aug 2023 20:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692908988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P7Xbpx0o50eK6pZKBZv6f6BpbAWeyTqCMxDOEG0Njbc=; b=WMK8dk7m5htaQz9tMpy3DOwDGSwQG5hmbLS3jPICW+qph5VEvlT5079zR2a995VCQM+BkK GbaR6nxXLZptqSQTCBNELPF0qC4WoZXy2M7/CV+03o/L4cQ2mvWdAqCe0kzvBtdFAfVu1a FTpDuJLjmOLfxlRsv23wZO/cS7DIZXGKrRTvEKtFomLdaPyrIzMWmfdbWGQNT9pj1q26PX BEZDeMatvSqzBds9kJUgOwD0wFdGdDbjf3HWGMKdn+KcEvhoMuGJWp1+/DB8itRm8AGTJC XuvmL8FNPMLOCyTd1tN+poM5JLf6JPWXUvDTi2u8dE86gRyyE95thzsSIuQf1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692908988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P7Xbpx0o50eK6pZKBZv6f6BpbAWeyTqCMxDOEG0Njbc=; b=NeEUzzJs8SUmd7zmS26ydX99khQglJMlqzQp2q9BIgG9+D72GmvCxLCSexRFg7JoHgCsbP 8dLB++gkZcaCr+l5hZVM8aumSdVpSd4XpLQ4XL4sbB4t/doW2Q1iLwUzQn741MNcwndARw aBNgnaXOyXR4NbWbJsjz8ZPkfqzOpVUc9NPTrfESO3bsfCk3/9/kLHxYHIugPFJAPdfda8 OZvJrXpm3/qILyJ8fhM8e7NgW47HM8Lmv9RDap/l5XxI6Qp60zvfGM/Paw72iSvHSbkcnp 89gwD5kQUv8WeH6K/oVhwgftwH134cJL8R4OafYHlkk3CAgJlUZnBFcjoKuRpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692908988; a=rsa-sha256; cv=none; b=N9Bd9I9vHqqmVZJ+eKfuCKpYfq8FZUI+ifRokkfhap0QK8/Uo17H+StAfVa8JJ65Xo0uVe K5x7Agh3Fqe4D6nAMlHNjXP/zbdsGimlZwpWRFMcEu7pUlM1rjAA7P6KNZ1PVbRENAMU4e 3CWNoepOgr9v92vwoa38hthPw/fvb88vhIinKP48NyA5GhReYPMPwREV76pYHOQQ9LLZlV iOltjLomyLBf9cblHo0haOKPGYTAWrvy7DYq7N8npO8oiAsHmAPOtvUFaNBuRpPlT55bqV AtfWvfvH3R/C3+6BgdN1NvijZwrU+cEbvsXtMyb4Ml6vs6tI2TOLV1gwz+G3hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWvp43mXXzgmw; Thu, 24 Aug 2023 20:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OKTmLw091758; Thu, 24 Aug 2023 20:29:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKTmVs091755; Thu, 24 Aug 2023 20:29:48 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:29:48 GMT Message-Id: <202308242029.37OKTmVs091755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: af93fea71038 - main - timerfd: Move implementation from linux compat to sys/kern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af93fea710385b2b11f0cabd377e7ed6f3d97c34 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=af93fea710385b2b11f0cabd377e7ed6f3d97c34 commit af93fea710385b2b11f0cabd377e7ed6f3d97c34 Author: Jake Freeland AuthorDate: 2023-08-24 04:39:54 +0000 Commit: Warner Losh CommitDate: 2023-08-24 20:28:56 +0000 timerfd: Move implementation from linux compat to sys/kern Move the timerfd impelemntation from linux compat code to sys/kern. Use it to implement the new system calls for timerfd. Add a hook to kern_tc to allow timerfd to know when the system time has stepped. Add kqueue support to timerfd. Adjust a few names to be less Linux centric. RelNotes: YES Reviewed by: markj (on irc), imp, kib (with reservations), jhb (slack) Differential Revision: https://reviews.freebsd.org/D38459 --- lib/libc/sys/Symbol.map | 3 + sys/bsm/audit_kevents.h | 1 + sys/compat/freebsd32/freebsd32_proto.h | 14 + sys/compat/freebsd32/freebsd32_syscall.h | 5 +- sys/compat/freebsd32/freebsd32_syscalls.c | 3 + sys/compat/freebsd32/freebsd32_sysent.c | 3 + sys/compat/freebsd32/freebsd32_systrace_args.c | 86 ++++ sys/compat/linux/linux_event.c | 443 ++--------------- sys/compat/linux/linux_event.h | 11 - sys/conf/files | 1 + sys/kern/init_sysent.c | 3 + sys/kern/kern_descrip.c | 4 +- sys/kern/kern_tc.c | 2 + sys/kern/sys_timerfd.c | 632 +++++++++++++++++++++++++ sys/kern/syscalls.c | 3 + sys/kern/syscalls.master | 20 + sys/kern/systrace_args.c | 86 ++++ sys/sys/file.h | 2 +- sys/sys/syscall.h | 5 +- sys/sys/syscall.mk | 5 +- sys/sys/sysproto.h | 20 + sys/sys/timerfd.h | 66 +++ sys/sys/user.h | 6 + 23 files changed, 999 insertions(+), 425 deletions(-) diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index 9a07bb457eb8..7937661e3787 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -421,6 +421,9 @@ FBSD_1.7 { kqueuex; membarrier; swapoff; + timerfd_create; + timerfd_gettime; + timerfd_settime; }; FBSDprivate_1.0 { diff --git a/sys/bsm/audit_kevents.h b/sys/bsm/audit_kevents.h index a6b50a67ee6a..d06381837aad 100644 --- a/sys/bsm/audit_kevents.h +++ b/sys/bsm/audit_kevents.h @@ -661,6 +661,7 @@ #define AUE_AIO_WRITEV 43267 /* FreeBSD-specific. */ #define AUE_AIO_READV 43268 /* FreeBSD-specific. */ #define AUE_FSPACECTL 43269 /* FreeBSD-specific. */ +#define AUE_TIMERFD 43270 /* FreeBSD/Linux. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h index bb333e0321a0..50448b6dce16 100644 --- a/sys/compat/freebsd32/freebsd32_proto.h +++ b/sys/compat/freebsd32/freebsd32_proto.h @@ -684,6 +684,16 @@ struct freebsd32_aio_writev_args { struct freebsd32_aio_readv_args { char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; }; +struct freebsd32_timerfd_gettime_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char curr_value_l_[PADL_(struct itimerspec32 *)]; struct itimerspec32 * curr_value; char curr_value_r_[PADR_(struct itimerspec32 *)]; +}; +struct freebsd32_timerfd_settime_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; + char new_value_l_[PADL_(const struct itimerspec32 *)]; const struct itimerspec32 * new_value; char new_value_r_[PADR_(const struct itimerspec32 *)]; + char old_value_l_[PADL_(struct itimerspec32 *)]; struct itimerspec32 * old_value; char old_value_r_[PADR_(struct itimerspec32 *)]; +}; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); int freebsd32_ptrace(struct thread *, struct freebsd32_ptrace_args *); int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); @@ -799,6 +809,8 @@ int freebsd32_cpuset_setdomain(struct thread *, struct freebsd32_cpuset_setdomai int freebsd32___sysctlbyname(struct thread *, struct freebsd32___sysctlbyname_args *); int freebsd32_aio_writev(struct thread *, struct freebsd32_aio_writev_args *); int freebsd32_aio_readv(struct thread *, struct freebsd32_aio_readv_args *); +int freebsd32_timerfd_gettime(struct thread *, struct freebsd32_timerfd_gettime_args *); +int freebsd32_timerfd_settime(struct thread *, struct freebsd32_timerfd_settime_args *); #ifdef COMPAT_43 @@ -1292,6 +1304,8 @@ int freebsd11_freebsd32_fstatat(struct thread *, struct freebsd11_freebsd32_fsta #define FREEBSD32_SYS_AUE_freebsd32___sysctlbyname AUE_SYSCTL #define FREEBSD32_SYS_AUE_freebsd32_aio_writev AUE_AIO_WRITEV #define FREEBSD32_SYS_AUE_freebsd32_aio_readv AUE_AIO_READV +#define FREEBSD32_SYS_AUE_freebsd32_timerfd_gettime AUE_TIMERFD +#define FREEBSD32_SYS_AUE_freebsd32_timerfd_settime AUE_TIMERFD #undef PAD_ #undef PADL_ diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index c3d8617abf4b..e3777730be1c 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -502,4 +502,7 @@ #define FREEBSD32_SYS_swapoff 582 #define FREEBSD32_SYS_kqueuex 583 #define FREEBSD32_SYS_membarrier 584 -#define FREEBSD32_SYS_MAXSYSCALL 585 +#define FREEBSD32_SYS_timerfd_create 585 +#define FREEBSD32_SYS_freebsd32_timerfd_gettime 586 +#define FREEBSD32_SYS_freebsd32_timerfd_settime 587 +#define FREEBSD32_SYS_MAXSYSCALL 588 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 19d454743c55..ccc910ee5ca9 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -590,4 +590,7 @@ const char *freebsd32_syscallnames[] = { "swapoff", /* 582 = swapoff */ "kqueuex", /* 583 = kqueuex */ "membarrier", /* 584 = membarrier */ + "timerfd_create", /* 585 = timerfd_create */ + "freebsd32_timerfd_gettime", /* 586 = freebsd32_timerfd_gettime */ + "freebsd32_timerfd_settime", /* 587 = freebsd32_timerfd_settime */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 971f06a643c5..fec6f4a47bd6 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -646,4 +646,7 @@ struct sysent freebsd32_sysent[] = { { .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(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ { .sy_narg = AS(membarrier_args), .sy_call = (sy_call_t *)sys_membarrier, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 584 = membarrier */ + { .sy_narg = AS(timerfd_create_args), .sy_call = (sy_call_t *)sys_timerfd_create, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 585 = timerfd_create */ + { .sy_narg = AS(freebsd32_timerfd_gettime_args), .sy_call = (sy_call_t *)freebsd32_timerfd_gettime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 586 = freebsd32_timerfd_gettime */ + { .sy_narg = AS(freebsd32_timerfd_settime_args), .sy_call = (sy_call_t *)freebsd32_timerfd_settime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 587 = freebsd32_timerfd_settime */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 5dfc82c30b7b..2c26a0ddab2f 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3336,6 +3336,32 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } + /* timerfd_create */ + case 585: { + struct timerfd_create_args *p = params; + iarg[a++] = p->clockid; /* int */ + iarg[a++] = p->flags; /* int */ + *n_args = 2; + break; + } + /* freebsd32_timerfd_gettime */ + case 586: { + struct freebsd32_timerfd_gettime_args *p = params; + iarg[a++] = p->fd; /* int */ + uarg[a++] = (intptr_t)p->curr_value; /* struct itimerspec32 * */ + *n_args = 2; + break; + } + /* freebsd32_timerfd_settime */ + case 587: { + struct freebsd32_timerfd_settime_args *p = params; + iarg[a++] = p->fd; /* int */ + iarg[a++] = p->flags; /* int */ + uarg[a++] = (intptr_t)p->new_value; /* const struct itimerspec32 * */ + uarg[a++] = (intptr_t)p->old_value; /* struct itimerspec32 * */ + *n_args = 4; + break; + } default: *n_args = 0; break; @@ -9005,6 +9031,51 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* timerfd_create */ + case 585: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; + /* freebsd32_timerfd_gettime */ + case 586: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "userland struct itimerspec32 *"; + break; + default: + break; + }; + break; + /* freebsd32_timerfd_settime */ + case 587: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + case 2: + p = "userland const struct itimerspec32 *"; + break; + case 3: + p = "userland struct itimerspec32 *"; + break; + default: + break; + }; + break; default: break; }; @@ -10873,6 +10944,21 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* timerfd_create */ + case 585: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* freebsd32_timerfd_gettime */ + case 586: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* freebsd32_timerfd_settime */ + case 587: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index a7db8516e5f0..816c68a90f1d 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -99,55 +100,6 @@ struct epoll_copyout_args { int error; }; -/* timerfd */ -typedef uint64_t timerfd_t; - -static fo_rdwr_t timerfd_read; -static fo_ioctl_t timerfd_ioctl; -static fo_poll_t timerfd_poll; -static fo_kqfilter_t timerfd_kqfilter; -static fo_stat_t timerfd_stat; -static fo_close_t timerfd_close; -static fo_fill_kinfo_t timerfd_fill_kinfo; - -static struct fileops timerfdops = { - .fo_read = timerfd_read, - .fo_write = invfo_rdwr, - .fo_truncate = invfo_truncate, - .fo_ioctl = timerfd_ioctl, - .fo_poll = timerfd_poll, - .fo_kqfilter = timerfd_kqfilter, - .fo_stat = timerfd_stat, - .fo_close = timerfd_close, - .fo_chmod = invfo_chmod, - .fo_chown = invfo_chown, - .fo_sendfile = invfo_sendfile, - .fo_fill_kinfo = timerfd_fill_kinfo, - .fo_flags = DFLAG_PASSABLE -}; - -static void filt_timerfddetach(struct knote *kn); -static int filt_timerfdread(struct knote *kn, long hint); - -static struct filterops timerfd_rfiltops = { - .f_isfd = 1, - .f_detach = filt_timerfddetach, - .f_event = filt_timerfdread -}; - -struct timerfd { - clockid_t tfd_clockid; - struct itimerspec tfd_time; - struct callout tfd_callout; - timerfd_t tfd_count; - bool tfd_canceled; - struct selinfo tfd_sel; - struct mtx tfd_lock; -}; - -static void linux_timerfd_expire(void *); -static void linux_timerfd_curval(struct timerfd *, struct itimerspec *); - static int epoll_create_common(struct thread *td, int flags) { @@ -658,255 +610,14 @@ linux_eventfd2(struct thread *td, struct linux_eventfd2_args *args) int linux_timerfd_create(struct thread *td, struct linux_timerfd_create_args *args) { - struct timerfd *tfd; - struct file *fp; clockid_t clockid; - int fflags, fd, error; - - if ((args->flags & ~LINUX_TFD_CREATE_FLAGS) != 0) - return (EINVAL); - - error = linux_to_native_clockid(&clockid, args->clockid); - if (error != 0) - return (error); - if (clockid != CLOCK_REALTIME && clockid != CLOCK_MONOTONIC) - return (EINVAL); - - fflags = 0; - if ((args->flags & LINUX_TFD_CLOEXEC) != 0) - fflags |= O_CLOEXEC; - - error = falloc(td, &fp, &fd, fflags); - if (error != 0) - return (error); - - tfd = malloc(sizeof(*tfd), M_EPOLL, M_WAITOK | M_ZERO); - tfd->tfd_clockid = clockid; - mtx_init(&tfd->tfd_lock, "timerfd", NULL, MTX_DEF); - - callout_init_mtx(&tfd->tfd_callout, &tfd->tfd_lock, 0); - knlist_init_mtx(&tfd->tfd_sel.si_note, &tfd->tfd_lock); - - fflags = FREAD; - if ((args->flags & LINUX_O_NONBLOCK) != 0) - fflags |= FNONBLOCK; - - finit(fp, fflags, DTYPE_LINUXTFD, tfd, &timerfdops); - fdrop(fp, td); - - td->td_retval[0] = fd; - return (error); -} - -static int -timerfd_close(struct file *fp, struct thread *td) -{ - struct timerfd *tfd; - - tfd = fp->f_data; - if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) - return (EINVAL); - - timespecclear(&tfd->tfd_time.it_value); - timespecclear(&tfd->tfd_time.it_interval); - - callout_drain(&tfd->tfd_callout); - - seldrain(&tfd->tfd_sel); - knlist_destroy(&tfd->tfd_sel.si_note); - - fp->f_ops = &badfileops; - mtx_destroy(&tfd->tfd_lock); - free(tfd, M_EPOLL); - - return (0); -} - -static int -timerfd_read(struct file *fp, struct uio *uio, struct ucred *active_cred, - int flags, struct thread *td) -{ - struct timerfd *tfd; - timerfd_t count; - int error; - - tfd = fp->f_data; - if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) - return (EINVAL); - - if (uio->uio_resid < sizeof(timerfd_t)) - return (EINVAL); - - error = 0; - mtx_lock(&tfd->tfd_lock); -retry: - if (tfd->tfd_canceled) { - tfd->tfd_count = 0; - mtx_unlock(&tfd->tfd_lock); - return (ECANCELED); - } - if (tfd->tfd_count == 0) { - if ((fp->f_flag & FNONBLOCK) != 0) { - mtx_unlock(&tfd->tfd_lock); - return (EAGAIN); - } - error = mtx_sleep(&tfd->tfd_count, &tfd->tfd_lock, PCATCH, "ltfdrd", 0); - if (error == 0) - goto retry; - } - if (error == 0) { - count = tfd->tfd_count; - tfd->tfd_count = 0; - mtx_unlock(&tfd->tfd_lock); - error = uiomove(&count, sizeof(timerfd_t), uio); - } else - mtx_unlock(&tfd->tfd_lock); - - return (error); -} - -static int -timerfd_poll(struct file *fp, int events, struct ucred *active_cred, - struct thread *td) -{ - struct timerfd *tfd; - int revents = 0; - - tfd = fp->f_data; - if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) - return (POLLERR); - - mtx_lock(&tfd->tfd_lock); - if ((events & (POLLIN|POLLRDNORM)) && tfd->tfd_count > 0) - revents |= events & (POLLIN|POLLRDNORM); - if (revents == 0) - selrecord(td, &tfd->tfd_sel); - mtx_unlock(&tfd->tfd_lock); - - return (revents); -} - -static int -timerfd_kqfilter(struct file *fp, struct knote *kn) -{ - struct timerfd *tfd; - - tfd = fp->f_data; - if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) - return (EINVAL); - - if (kn->kn_filter == EVFILT_READ) - kn->kn_fop = &timerfd_rfiltops; - else - return (EINVAL); - - kn->kn_hook = tfd; - knlist_add(&tfd->tfd_sel.si_note, kn, 0); - - return (0); -} - -static void -filt_timerfddetach(struct knote *kn) -{ - struct timerfd *tfd = kn->kn_hook; - - mtx_lock(&tfd->tfd_lock); - knlist_remove(&tfd->tfd_sel.si_note, kn, 1); - mtx_unlock(&tfd->tfd_lock); -} - -static int -filt_timerfdread(struct knote *kn, long hint) -{ - struct timerfd *tfd = kn->kn_hook; - - return (tfd->tfd_count > 0); -} - -static int -timerfd_ioctl(struct file *fp, u_long cmd, void *data, - struct ucred *active_cred, struct thread *td) -{ - - if (fp->f_data == NULL || fp->f_type != DTYPE_LINUXTFD) - return (EINVAL); - - switch (cmd) { - case FIONBIO: - case FIOASYNC: - return (0); - } - - return (ENOTTY); -} - -static int -timerfd_stat(struct file *fp, struct stat *st, struct ucred *active_cred) -{ - - return (ENXIO); -} - -static int -timerfd_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) -{ - - kif->kf_type = KF_TYPE_UNKNOWN; - return (0); -} - -static void -linux_timerfd_clocktime(struct timerfd *tfd, struct timespec *ts) -{ - - if (tfd->tfd_clockid == CLOCK_REALTIME) - getnanotime(ts); - else /* CLOCK_MONOTONIC */ - getnanouptime(ts); -} - -static void -linux_timerfd_curval(struct timerfd *tfd, struct itimerspec *ots) -{ - struct timespec cts; - - linux_timerfd_clocktime(tfd, &cts); - *ots = tfd->tfd_time; - if (ots->it_value.tv_sec != 0 || ots->it_value.tv_nsec != 0) { - timespecsub(&ots->it_value, &cts, &ots->it_value); - if (ots->it_value.tv_sec < 0 || - (ots->it_value.tv_sec == 0 && - ots->it_value.tv_nsec == 0)) { - ots->it_value.tv_sec = 0; - ots->it_value.tv_nsec = 1; - } - } -} - -static int -linux_timerfd_gettime_common(struct thread *td, int fd, struct itimerspec *ots) -{ - struct timerfd *tfd; - struct file *fp; int error; - error = fget(td, fd, &cap_read_rights, &fp); + error = linux_to_native_clockid(&clockid, args->clockid); if (error != 0) return (error); - tfd = fp->f_data; - if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) { - error = EINVAL; - goto out; - } - - mtx_lock(&tfd->tfd_lock); - linux_timerfd_curval(tfd, ots); - mtx_unlock(&tfd->tfd_lock); -out: - fdrop(fp, td); - return (error); + return (kern_timerfd_create(td, clockid, args->flags)); } int @@ -916,84 +627,14 @@ linux_timerfd_gettime(struct thread *td, struct linux_timerfd_gettime_args *args struct itimerspec ots; int error; - error = linux_timerfd_gettime_common(td, args->fd, &ots); + error = kern_timerfd_gettime(td, args->fd, &ots); if (error != 0) return (error); - error = native_to_linux_itimerspec(&lots, &ots); - if (error == 0) - error = copyout(&lots, args->old_value, sizeof(lots)); - return (error); -} - -#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) -int -linux_timerfd_gettime64(struct thread *td, struct linux_timerfd_gettime64_args *args) -{ - struct l_itimerspec64 lots; - struct itimerspec ots; - int error; - error = linux_timerfd_gettime_common(td, args->fd, &ots); - if (error != 0) - return (error); - error = native_to_linux_itimerspec64(&lots, &ots); + error = native_to_linux_itimerspec(&lots, &ots); if (error == 0) error = copyout(&lots, args->old_value, sizeof(lots)); - return (error); -} -#endif - -static int -linux_timerfd_settime_common(struct thread *td, int fd, int flags, - struct itimerspec *nts, struct itimerspec *oval) -{ - struct timespec cts, ts; - struct timerfd *tfd; - struct timeval tv; - struct file *fp; - int error; - - if ((flags & ~LINUX_TFD_SETTIME_FLAGS) != 0) - return (EINVAL); - - error = fget(td, fd, &cap_write_rights, &fp); - if (error != 0) - return (error); - tfd = fp->f_data; - if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) { - error = EINVAL; - goto out; - } - - mtx_lock(&tfd->tfd_lock); - if (!timespecisset(&nts->it_value)) - timespecclear(&nts->it_interval); - if (oval != NULL) - linux_timerfd_curval(tfd, oval); - - bcopy(nts, &tfd->tfd_time, sizeof(*nts)); - tfd->tfd_count = 0; - if (timespecisset(&nts->it_value)) { - linux_timerfd_clocktime(tfd, &cts); - ts = nts->it_value; - if ((flags & LINUX_TFD_TIMER_ABSTIME) == 0) { - timespecadd(&tfd->tfd_time.it_value, &cts, - &tfd->tfd_time.it_value); - } else { - timespecsub(&ts, &cts, &ts); - } - TIMESPEC_TO_TIMEVAL(&tv, &ts); - callout_reset(&tfd->tfd_callout, tvtohz(&tv), - linux_timerfd_expire, tfd); - tfd->tfd_canceled = false; - } else { - tfd->tfd_canceled = true; - callout_stop(&tfd->tfd_callout); - } - mtx_unlock(&tfd->tfd_lock); -out: - fdrop(fp, td); return (error); } @@ -1001,7 +642,7 @@ int linux_timerfd_settime(struct thread *td, struct linux_timerfd_settime_args *args) { struct l_itimerspec lots; - struct itimerspec nts, ots, *pots; + struct itimerspec nts, ots; int error; error = copyin(args->new_value, &lots, sizeof(lots)); @@ -1010,23 +651,43 @@ linux_timerfd_settime(struct thread *td, struct linux_timerfd_settime_args *args error = linux_to_native_itimerspec(&nts, &lots); if (error != 0) return (error); - pots = (args->old_value != NULL ? &ots : NULL); - error = linux_timerfd_settime_common(td, args->fd, args->flags, - &nts, pots); + if (args->old_value == NULL) + error = kern_timerfd_settime(td, args->fd, args->flags, &nts, NULL); + else + error = kern_timerfd_settime(td, args->fd, args->flags, &nts, &ots); if (error == 0 && args->old_value != NULL) { error = native_to_linux_itimerspec(&lots, &ots); if (error == 0) error = copyout(&lots, args->old_value, sizeof(lots)); } + return (error); } #if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) +int +linux_timerfd_gettime64(struct thread *td, struct linux_timerfd_gettime64_args *args) +{ + struct l_itimerspec64 lots; + struct itimerspec ots; + int error; + + error = kern_timerfd_gettime(td, args->fd, &ots); + if (error != 0) + return (error); + + error = native_to_linux_itimerspec64(&lots, &ots); + if (error == 0) + error = copyout(&lots, args->old_value, sizeof(lots)); + + return (error); +} + int linux_timerfd_settime64(struct thread *td, struct linux_timerfd_settime64_args *args) { struct l_itimerspec64 lots; - struct itimerspec nts, ots, *pots; + struct itimerspec nts, ots; int error; error = copyin(args->new_value, &lots, sizeof(lots)); @@ -1035,50 +696,16 @@ linux_timerfd_settime64(struct thread *td, struct linux_timerfd_settime64_args * error = linux_to_native_itimerspec64(&nts, &lots); if (error != 0) return (error); - pots = (args->old_value != NULL ? &ots : NULL); - error = linux_timerfd_settime_common(td, args->fd, args->flags, - &nts, pots); + if (args->old_value == NULL) + error = kern_timerfd_settime(td, args->fd, args->flags, &nts, NULL); + else + error = kern_timerfd_settime(td, args->fd, args->flags, &nts, &ots); if (error == 0 && args->old_value != NULL) { error = native_to_linux_itimerspec64(&lots, &ots); if (error == 0) error = copyout(&lots, args->old_value, sizeof(lots)); } + return (error); } #endif - -static void -linux_timerfd_expire(void *arg) -{ - struct timespec cts, ts; - struct timeval tv; - struct timerfd *tfd; - - tfd = (struct timerfd *)arg; - - linux_timerfd_clocktime(tfd, &cts); - if (timespeccmp(&cts, &tfd->tfd_time.it_value, >=)) { - if (timespecisset(&tfd->tfd_time.it_interval)) - timespecadd(&tfd->tfd_time.it_value, - &tfd->tfd_time.it_interval, - &tfd->tfd_time.it_value); - else - /* single shot timer */ - timespecclear(&tfd->tfd_time.it_value); - if (timespecisset(&tfd->tfd_time.it_value)) { - timespecsub(&tfd->tfd_time.it_value, &cts, &ts); - TIMESPEC_TO_TIMEVAL(&tv, &ts); - callout_reset(&tfd->tfd_callout, tvtohz(&tv), - linux_timerfd_expire, tfd); - } - tfd->tfd_count++; - KNOTE_LOCKED(&tfd->tfd_sel.si_note, 0); - selwakeup(&tfd->tfd_sel); - wakeup(&tfd->tfd_count); - } else if (timespecisset(&tfd->tfd_time.it_value)) { - timespecsub(&tfd->tfd_time.it_value, &cts, &ts); - TIMESPEC_TO_TIMEVAL(&tv, &ts); - callout_reset(&tfd->tfd_callout, tvtohz(&tv), - linux_timerfd_expire, tfd); - } -} diff --git a/sys/compat/linux/linux_event.h b/sys/compat/linux/linux_event.h index 32269b0070bc..fa63371b5170 100644 --- a/sys/compat/linux/linux_event.h +++ b/sys/compat/linux/linux_event.h @@ -54,15 +54,4 @@ #define LINUX_EFD_SEMAPHORE (1 << 0) -#define LINUX_TFD_TIMER_ABSTIME (1 << 0) -#define LINUX_TFD_TIMER_CANCEL_ON_SET (1 << 1) -#define LINUX_TFD_CLOEXEC LINUX_O_CLOEXEC -#define LINUX_TFD_NONBLOCK LINUX_O_NONBLOCK - -#define LINUX_TFD_SHARED_FCNTL_FLAGS (LINUX_TFD_CLOEXEC \ - |LINUX_TFD_NONBLOCK) -#define LINUX_TFD_CREATE_FLAGS LINUX_TFD_SHARED_FCNTL_FLAGS -#define LINUX_TFD_SETTIME_FLAGS (LINUX_TFD_TIMER_ABSTIME \ - |LINUX_TFD_TIMER_CANCEL_ON_SET) - #endif /* !_LINUX_EVENT_H_ */ diff --git a/sys/conf/files b/sys/conf/files index 3f79ce752c80..8d38b9cc8a2e 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3908,6 +3908,7 @@ kern/sys_pipe.c standard kern/sys_procdesc.c standard kern/sys_process.c standard kern/sys_socket.c standard +kern/sys_timerfd.c standard kern/syscalls.c standard kern/sysv_ipc.c standard kern/sysv_msg.c optional sysvmsg diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 1e62c46b8be0..d44fec54fcd7 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -645,4 +645,7 @@ struct sysent sysent[] = { { .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(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ { .sy_narg = AS(membarrier_args), .sy_call = (sy_call_t *)sys_membarrier, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 584 = membarrier */ + { .sy_narg = AS(timerfd_create_args), .sy_call = (sy_call_t *)sys_timerfd_create, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 585 = timerfd_create */ + { .sy_narg = AS(timerfd_gettime_args), .sy_call = (sy_call_t *)sys_timerfd_gettime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 586 = timerfd_gettime */ + { .sy_narg = AS(timerfd_settime_args), .sy_call = (sy_call_t *)sys_timerfd_settime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 587 = timerfd_settime */ }; diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index c5226288afc5..35046c856d54 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -5001,8 +5001,8 @@ file_type_to_name(short type) return ("proc"); case DTYPE_EVENTFD: return ("eventfd"); - case DTYPE_LINUXTFD: - return ("ltimer"); + case DTYPE_TIMERFD: + return ("timerfd"); default: return ("unkn"); } diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 170f35830923..26f09cb60260 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -1305,6 +1306,7 @@ tc_setclock(struct timespec *ts) /* Avoid rtc_generation == 0, since td_rtcgen == 0 is special. */ atomic_add_rel_int(&rtc_generation, 2); + timerfd_jumped(); sleepq_chains_remove_matching(sleeping_on_old_rtc); if (timestepwarnings) { nanotime(&taft); diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c new file mode 100644 index 000000000000..6948fa059b8c --- /dev/null +++ b/sys/kern/sys_timerfd.c @@ -0,0 +1,632 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2014 Dmitry Chagin + * Copyright (c) 2023 Jake Freeland + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#ifdef COMPAT_FREEBSD32 +#include +#include +#endif + +static MALLOC_DEFINE(M_TIMERFD, "timerfd", "timerfd structures"); +static LIST_HEAD(, timerfd) timerfd_head; +static struct unrhdr64 tfdino_unr; + +#define TFD_NOJUMP 0 /* Realtime clock has not jumped. */ +#define TFD_READ 1 /* Jumped, tfd has been read since. */ +#define TFD_ZREAD 2 /* Jumped backwards, CANCEL_ON_SET=false. */ +#define TFD_CANCELED 4 /* Jumped, CANCEL_ON_SET=true. */ +#define TFD_JUMPED (TFD_ZREAD | TFD_CANCELED) + +struct timerfd { + /* User specified. */ + struct itimerspec tfd_time; /* tfd timer */ + clockid_t tfd_clockid; /* timing base */ + int tfd_flags; /* creation flags */ + int tfd_timflags; /* timer flags */ + + /* Used internally. */ + timerfd_t tfd_count; /* expiration count since last read */ + bool tfd_expired; /* true upon initial expiration */ + struct mtx tfd_lock; /* mtx lock */ + struct callout tfd_callout; /* expiration notification */ + struct selinfo tfd_sel; /* I/O alerts */ + struct timespec tfd_boottim; /* cached boottime */ + int tfd_jumped; /* timer jump status */ + LIST_ENTRY(timerfd) entry; /* entry in list */ + + /* For stat(2). */ + ino_t tfd_ino; /* inode number */ + struct timespec tfd_atim; /* time of last read */ + struct timespec tfd_mtim; /* time of last settime */ + struct timespec tfd_birthtim; /* creation time */ +}; + +static void +timerfd_init(void *data) +{ + new_unrhdr64(&tfdino_unr, 1); +} + +SYSINIT(timerfd, SI_SUB_VFS, SI_ORDER_ANY, timerfd_init, NULL); + +static inline void +timerfd_getboottime(struct timespec *ts) +{ + struct timeval tv; + getboottime(&tv); + TIMEVAL_TO_TIMESPEC(&tv, ts); +} + +/* + * Call when a discontinuous jump has occured in CLOCK_REALTIME and + * update timerfd's cached boottime. A jump can be triggered using + * functions like clock_settime(2) or settimeofday(2). + * + * Timer is marked TFD_CANCELED if TFD_TIMER_CANCEL_ON_SET is set *** 850 LINES SKIPPED *** From nobody Thu Aug 24 20:29: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 4RWvp60XDdz4rY05; Thu, 24 Aug 2023 20:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWvp56lfGz3M5w; Thu, 24 Aug 2023 20:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692908990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bluWO9DD4FBsr8xKOISvH8nmEz30Q9SXe4Ifa2oTyko=; b=CQEXhfHxlgMiNEbQUprpE1WP6lzhWvzEf5g4Rp/kfkzPIaO1MrwOAADVLe3zmGCxthFHjt yUnLp/s15ZejuN+OFX7FSfZ8TK63AXTHltDsbDZf2J4CwoIEVMbx0xFGA1ZEfEzlXleWP4 HTIXp7nRLa/adOdD6FCI0TwgHl/tfMNfVsB1u4k1t6nhj3Y0sQoyUzKyyXB+N5Q87jYl1G KLYskmkm0Z2X+mXVt0xF6krYVYo4whvFB+Ls0fMiVE25x6UAuGu53E4Bh6K5hIliAJuWc+ vNUgywNOHFKuAp5mHhF778p2Ys1oXj2JkQ95oDtjahYX5/DMcqyHL+KHuO74ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692908990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bluWO9DD4FBsr8xKOISvH8nmEz30Q9SXe4Ifa2oTyko=; b=nZS6bSFhISWyIcTjSvF8dxBdkP9dq5keionJsoSvqldaUfJs5hIrJaRX8J7zEQFJTUNPoA jXaO7F2/82Njr0X3w0ox2dvLGYkjbnL/e4XIRa7TpVtWn45ztBU8lKJvOXio4eyMkG8ZT2 OPramdnJFqytkaw5p8t4vxMedcisiKS1j9eSsGa5UNf9p99gRIXWeE2q9QtPWH5BZs9YW4 cjiUPpW2LMDXPxu2TJ6DF0sFPqD0uy6h5+Urvqt76y86Ajcw92cfv2KBNkxQvSu4XRu9CK JKGkD1ZxpsH+8T4U8xQBhziKFOwDmeRbvTjrkK8nCclN5pKmjMpWn3gElfeHcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692908990; a=rsa-sha256; cv=none; b=yAD5oG5m8xMPyDj62ngAA4sSCrlpUzYuRiHxbJQZveCUQqOO4TDrTV3WVZWGUZkpVHCu9O +n6gTTUFF1xEwwBg0qpf9ikkaHlC32EmG9igyt9kKtlyH6wX+C/Kx6PPM8LEIBMop1LbNJ Tj48kjC8PrFjZuGY0TWIFhqWS+4tbOIRyJMPFAKwUuw/uXO9usYUq7TUOoNfayC8ZnOsW2 w3AD5YZbAWnCBM705W3CaB6j8A8y4WjjT4JaTpB6OseBdMliWdYB5JBCH2wzDFietgaaDg sUfjKTJMJ51g4Mu5EGthpJEYPo0RxplcsBn/FDQ2aZ3QNtX4LsHA1odwNnp3OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWvp54l7tzh1y; Thu, 24 Aug 2023 20:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OKTn9j091797; Thu, 24 Aug 2023 20:29:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKTnBU091794; Thu, 24 Aug 2023 20:29:49 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:29:49 GMT Message-Id: <202308242029.37OKTnBU091794@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8544651dc509 - main - timerfd: Add 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8544651dc509dadb8b20d1aeb41b3be4efbdf6dd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8544651dc509dadb8b20d1aeb41b3be4efbdf6dd commit 8544651dc509dadb8b20d1aeb41b3be4efbdf6dd Author: Jake Freeland AuthorDate: 2023-08-24 19:59:20 +0000 Commit: Warner Losh CommitDate: 2023-08-24 20:29:06 +0000 timerfd: Add manual page. This manual page accompanies the timerfd system calls. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D40218 --- lib/libc/sys/Makefile.inc | 4 + lib/libc/sys/timerfd.2 | 340 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 344 insertions(+) diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 0fdcbbf04b07..480002f9875e 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -345,6 +345,7 @@ MAN+= abort2.2 \ timer_create.2 \ timer_delete.2 \ timer_settime.2 \ + timerfd.2 \ truncate.2 \ umask.2 \ undelete.2 \ @@ -496,6 +497,9 @@ MLINKS+=symlink.2 symlinkat.2 MLINKS+=syscall.2 __syscall.2 MLINKS+=timer_settime.2 timer_getoverrun.2 \ timer_settime.2 timer_gettime.2 +MLINKS+=timerfd.2 timerfd_create.2 \ + timerfd.2 timerfd_gettime.2 \ + timerfd.2 timerfd_settime.2 MLINKS+=thr_kill.2 thr_kill2.2 MLINKS+=truncate.2 ftruncate.2 MLINKS+=unlink.2 unlinkat.2 diff --git a/lib/libc/sys/timerfd.2 b/lib/libc/sys/timerfd.2 new file mode 100644 index 000000000000..e5dab05821bd --- /dev/null +++ b/lib/libc/sys/timerfd.2 @@ -0,0 +1,340 @@ +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2023 Jake Freeland +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd May 21, 2023 +.Dt TIMERFD 2 +.Os +.Sh NAME +.Nm timerfd , +.Nm timerfd_create , +.Nm timerfd_gettime , +.Nm timerfd_settime +.Nd timers with file descriptor semantics +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In sys/timerfd.h +.Ft int +.Fo timerfd_create +.Fa "int clockid" +.Fa "int flags" +.Fc +.Ft int +.Fo timerfd_gettime +.Fa "int fd" +.Fa "struct itimerspec *curr_value" +.Fc +.Ft int +.Fo timerfd_settime +.Fa "int fd" +.Fa "int flags" +.Fa "const struct itimerspec *new_value" +.Fa "struct itimerspec *old_value" +.Fc +.Sh DESCRIPTION +The +.Nm +system calls operate on timers, identified by special +.Nm +file descriptors. +These calls are analogous to +.Fn timer_create , +.Fn timer_gettime , +and +.Fn timer_settime +per-process timer functions, but use a +.Nm +descriptor in place of +.Fa timerid . +.Pp +All +.Nm +descriptors possess traditional file descriptor semantics; they may be passed +to other processes, preserved across +.Xr fork 2 , +and monitored via +.Xr kevent 2 , +.Xr poll 2 , +or +.Xr select 2 . +When a +.Nm +descriptor is no longer needed, it may be disposed of using +.Xr close 2 . +.Bl -tag -width "Fn timerfd_settime" +.It Fn timerfd_create +Initialize a +.Nm +object and return its file descriptor. +The +.Fa clockid +argument specifies the clock used as a timing base and may be: +.Pp +.Bl -tag -width "Dv CLOCK_MONOTONIC" -compact +.It Dv CLOCK_REALTIME +Increments as a wall clock should. +.It Dv CLOCK_MONOTONIC +Increments monotonically in SI seconds. +.El +.Pp +The +.Fa flags +argument may contain the result of +.Em or Ns 'ing +the following values: +.Pp +.Bl -tag -width "Dv TFD_NONBLOCK" -compact +.It Dv TFD_CLOEXEC +The newly generated file descriptor will close-on-exec. +.It Dv TFD_NONBLOCK +Do not block on read/write operations. +.El +.It Fn timerfd_gettime +Retrieve the current state of the timer denoted by +.Fa fd . +The result is stored in +.Fa curr_value +as a +.Dv struct itimerspec . +The +.Fa it_value +and +.Fa it_interval +members of +.Fa curr_value +represent the relative time until the next expiration and the interval +reload value last set by +.Fn timerfd_settime , +respectively. +.It Fn timerfd_settime +Update the timer denoted by +.Fa fd +with the +.Dv struct itimerspec +in +.Fa new_value . +The +.Fa it_value +member of +.Fa new_value +should contain the amount of time before the timer expires, or zero if the +timer should be disarmed. +The +.Fa it_interval +member should contain the reload time if an interval timer is desired. +.Pp +The previous timer state will be stored in +.Fa old_value +given +.Fa old_value +is not +.Dv NULL . +.Pp +The +.Fa flags +argument may contain the result of +.Em or Ns 'ing +the following values: +.Pp +.Bl -tag -width TFD_TIMER_CANCEL_ON_SET -compact +.It Dv TFD_TIMER_ABSTIME +Expiration will occur at the absolute time provided in +.Fa new_value . +Normally, +.Fa new_value +represents a relative time compared to the timer's +.Fa clockid +clock. +.It Dv TFD_TIMER_CANCEL_ON_SET +If +.Fa clockid +has been set to +.Dv CLOCK_REALTIME +and the realtime clock has experienced a discontinuous jump, +then the timer will be canceled and the next +.Xr read 2 +will fail with +.Dv ECANCELED . +.El +.El +.Pp +File operations have the following semantics: +.Bl -tag -width ioctl +.It Xr read 2 +Transfer the number of timer expirations that have occurred since the last +successful +.Xr read 2 +or +.Fn timerfd_settime +into the output buffer of size +.Vt uint64_t . +If the expiration counter is zero, +.Xr read 2 +blocks until a timer expiration occurs unless +.Dv TFD_NONBLOCK +is set, where +.Dv EAGAIN +is returned. +.It Xr poll 2 +The file descriptor is readable when its timer expiration counter is greater +than zero. +.It Xr ioctl 2 +.Bl -tag -width FIONREAD +.It Dv FIOASYNC int +A non-zero input will set the FASYNC flag. +A zero input will clear the FASYNC flag. +.It Dv FIONBIO int +A non-zero input will set the FNONBLOCK flag. +A zero input will clear the FNONBLOCK flag. +.El +.El +.Sh RETURN VALUES +The +.Fn timerfd_create +system call creates a +.Nm +object and returns its file descriptor. +If an error occurs, -1 is returned and the global variable +.Fa errno +is set to indicate the error. +.Pp +The +.Fn timerfd_gettime +and +.Fn timerfd_settime +system calls return 0 on success. +If an error occurs, -1 is returned and the global variable +.Fa errno +is set to indicate the error. +.Sh ERRORS +The +.Fn timerfd_create +system call fails if: +.Bl -tag -width Er +.It Bq Er EINVAL +The specified +.Fa clockid +is not supported. +.It Bq Er EINVAL +The provided +.Fa flags +are invalid. +.It Bq Er EMFILE +The per-process descriptor table is full. +.It Bq Er ENFILE +The system file table is full. +.It Bq Er ENOMEM +The kernel failed to allocate enough memory for the timer. +.El +.Pp +Both +.Fn timerfd_gettime +and +.Fn timerfd_settime +system calls fail if: +.Bl -tag -width Er +.It Bq Er EBADF +The provided +.Fa fd +is invalid. +.It Bq Er EFAULT +The addresses provided by +.Fa curr_value , +.Fa new_value , +or +.Fa old_value +are invalid. +.It Bq Er EINVAL +The provided +.Fa fd +is valid, but was not generated by +.Fn timerfd_create . +.El +.Pp +The following errors only apply to +.Fn timerfd_settime : +.Bl -tag -width Er +.It Bq Er EINVAL +The provided +.Fa flags +are invalid. +.It Bq Er EINVAL +A nanosecond field in the +.Fa new_value +argument specified a value less than zero, or greater than or equal to 10^9. +.It Bq Er ECANCELED +The timer was created with the clock ID +.Dv CLOCK_REALTIME , +was configured with the +.Dv TFD_TIMER_CANCEL_ON_SET +flag, and the system realtime clock experienced a discontinuous change without +being read. +.El +.Pp +A read from a +.Nm +object fails if: +.Bl -tag -width Er +.It Bq Er EAGAIN +The timer's expiration counter is zero and the +.Nm +object is is set for non-blocking I/O. +.It Bq Er ECANCELED +The timer was created with the clock ID +.Dv CLOCK_REALTIME , +was configured with the +.Dv TFD_TIMER_CANCEL_ON_SET +flag, and the system realtime clock experienced a discontinuous change. +.It Bq Er EINVAL +The size of the read buffer is not large enough to hold the +.Vt uint64_t +sized timer expiration counter. +.El +.Sh SEE ALSO +.Xr eventfd 2 , +.Xr kqueue 2 , +.Xr poll 2 , +.Xr read 2 , +.Xr timer_create 2 , +.Xr timer_gettime 2 , +.Xr timer_settime 2 +.Sh STANDARDS +The +.Nm +system calls originated from Linux and are non-standard. +.Sh HISTORY +.An -nosplit +The +.Nm +facility was originally ported to +.Fx Ns 's +Linux compatibility layer by +.An Dmitry Chagin Aq Mt dchagin@FreeBSD.org +in +.Fx 12.0 . +It was revised and adapted to be native by +.An Jake Freeland Aq Mt jfree@FreeBSD.org +in +.Fx 14.0 . From nobody Thu Aug 24 20:51: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 4RWwHc4G4vz4rYtq; Thu, 24 Aug 2023 20:51: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 4RWwHc3mSSz3PfZ; Thu, 24 Aug 2023 20:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vKHnIfIL6xACQ1ubifzr7RY7XDQHbXraeZVAh6ukOVk=; b=SYMnlvA0wUsveWs7p+sDsX51x8KAgq20Jc9WlTEV+L/n3AtRoaR91zyrECxsAlEP75Nx7D F2ScpklW79lhEShQ/+IgeNacEhST96dJTRHNB/3ppladSlYATdY7Frmc6lJVLY2ZarjJKe o1mb37hTtfA70Mfbva/oR9lWYiqiwT8wmRX4WsOMTTgNM3nFJFrMRgQBPdtWgIyNJWdAXI 9I4dHhIEKIRjC3NaMqvmKPlgOAP8Tl+PUjygDVwFq6j1/bN6DwXdQOM2RLNWvsDpvimm1w cg6J5KX4uzzuiMqXpFkPzOcXJF0Vfi/JVPflxg3JnDVCqO3CoSnuUIvP/GPOEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vKHnIfIL6xACQ1ubifzr7RY7XDQHbXraeZVAh6ukOVk=; b=SFcb1DLj+em1EIcR5A4tVVl4hNJRbKVh4ztXKy5QchRjGHS5/Uz2jr0dbjBa1vbVV6ftB9 8Aw7rWcn9oClN5fjxVFG4DQ4lCjlVzPt8Xha+VuDoDR5NxRCf4TuyIE/A12ftHqvfxzhge Dcq902SH217OLUCUDUis9E33chVH2i9MTPAF+SGkFPkvxNmHe8Tun3DIVCzS1uSHxVy/cc CeBZ7H5fzm13vF9PK4YkdYNN8CslohjbvypDy1iSjC0YB8pbJKYL5DtarAIhpR90S1D7ZS 4FlIdElv3NDBQ7WMo56Al4TMP57OipAJI0v0GgE8YooLPrSxEACyWmFGGgF6ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692910316; a=rsa-sha256; cv=none; b=dfUgBWAn9+o8OsGEbEvHq9csfmmyfIv385aIvntSxc1uwPJx5/mNUfHVcdZCv0jfWJHY5T zQGrSk6/PaM61SDVlSe7Lw2YM5UdAlHkSD35hI/SEjN5a+w3O5fQvZr1r3zR9au/uFGU6e z5SdxjGEIhIQQK6s1EZ9M93r8EYrtteasJGm9Y3pBAck+4O9zU53mLHfBmXKxtOn0hL7rT hoAF8bTQgDTThnUhaq6TiY2AARt+b4QmtSQHxHnN+ORtq7U2TjpFn7mAdn7O+4D8JqptnM 1jy9UjpK2H2N2aYz6Urj8g7NZkRQL5cqmrdlFT8dqZCbug0Mx2VOWhnaDv9muA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWwHc2qKXzh5l; Thu, 24 Aug 2023 20:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OKpuXv039366; Thu, 24 Aug 2023 20:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKpuDm039363; Thu, 24 Aug 2023 20:51:56 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:51:56 GMT Message-Id: <202308242051.37OKpuDm039363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: bce864d1c274 - main - bnxt: Don't restart on VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bce864d1c274faeb6678028aad1e07e91fe430ac Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=bce864d1c274faeb6678028aad1e07e91fe430ac commit bce864d1c274faeb6678028aad1e07e91fe430ac Author: Kevin Bowling AuthorDate: 2023-08-24 20:16:24 +0000 Commit: Kevin Bowling CommitDate: 2023-08-24 20:46:56 +0000 bnxt: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This is unintentional for bnxt(4) and is causing another bug in its VLAN initialization code to affect the common case of adding and removing VLANs on an existing interface. PR: 269133 Tested by: kp MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 --- sys/dev/bnxt/if_bnxt.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 2796eed94e11..25715756ce29 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -224,6 +224,7 @@ static uint8_t get_phy_type(struct bnxt_softc *softc); static uint64_t bnxt_get_baudrate(struct bnxt_link_info *link); static void bnxt_get_wol_settings(struct bnxt_softc *softc); static int bnxt_wol_config(if_ctx_t ctx); +static bool bnxt_if_needs_restart(if_ctx_t, enum iflib_restart_event); /* * Device Interface Declaration @@ -288,6 +289,8 @@ static device_method_t bnxt_iflib_methods[] = { DEVMETHOD(ifdi_shutdown, bnxt_shutdown), DEVMETHOD(ifdi_resume, bnxt_resume), + DEVMETHOD(ifdi_needs_restart, bnxt_if_needs_restart), + DEVMETHOD_END }; @@ -2497,6 +2500,16 @@ bnxt_wol_config(if_ctx_t ctx) return 0; } +static bool +bnxt_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + default: + return (false); + } +} + static int bnxt_shutdown(if_ctx_t ctx) { From nobody Thu Aug 24 20:51: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 4RWwHd5qB6z4rYxx; Thu, 24 Aug 2023 20:51: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 4RWwHd4z5bz3PjV; Thu, 24 Aug 2023 20:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5dwfJimSqRmMDlKD34GA0cvQq7oK2V+yiXYNNDsjC4=; b=jMe5SP/Wv7KGrlWpU9wifGcRI3BE5hlrK8cr4MVbit7ALi3DTYwCFGWgh9InBtc2iT+smm f0gV7zmwnGuevQEHxdxl5IxgaIDJuJ3PUU7WQRw7BMT0o0jYF03eUxraQDqn1GA7TIiZdB KAq8rSpxHSKgcoVE+K3BaV96H/TbWYAM0DgoKQq5us61fQbjLPTJdHI21k7xQW+9x1AyAA k2WJhL9KdaXB5UWo6LxpjRx2ZQqt6bBt+Gr6Z7NU+2m/j78Sn5S2TzQYFl/RetzZ/xMJNJ m+iRvk96NtISUCx9IFI4EqaMaXp0KLroWJi02MD/hWnO4AKhXgFzou3rb1/dEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5dwfJimSqRmMDlKD34GA0cvQq7oK2V+yiXYNNDsjC4=; b=EahmQU91KPfKwnKkVUCHl0QuKbldEmAP0iDjgg23iq3mhP40P7971uRm8EqRdqCtiyCJew j+EjePN2zHrVSRRrTnGhiCvIKxJOc/vJyBBoqDMWExKSppqyNx0r8m5eMpYDSDW/YI5ew1 JgQzd5tmgeE2EmvvAjZ+6c2jfV4PiVBLkMXpt0gYX+lpu7XOvxZ3ocVIXRbEcUzPl7dXs8 69RePaLGUZOCFVnTPe+M5c/522iPTTWzsqiaY85IoFjjWRmAmTflYF4MAJAUmdLs/A8fqI fEf0EZ0U9e19+ycmVdyYvH5q7OZCIOExZfZbjEhFzyiOqeTwxDkM0qyK3z4bhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692910317; a=rsa-sha256; cv=none; b=uQQn7bRcdmmEJyBWgb6vmbgRFR1zt0LHaqEIuT1WDuxWij7fy0seerY+2ZosQz7vYze0dr FhzFTiH6pqX/4ZLAt8ofBF20hqMeR4lbG20ZAuRtCu+U6p+1PIW2lrxDeUlazTqjkgF+pK yOg/U13NKVqaC5xPiiDWxeNgt048GDjVkCLCzM6Db+VLwXnZWnoWQmCEKI4+Mx8vBFZzNx 7EKUjC5cNf7Fbzqiup3lxOAhz7zK11KxAHD69qc2QRT2ucTqfiWA61ID3bRH1YM+yflz4T Q4X+SOvgwXhLhIWg5ESEpG0ZcciojB7G67y42lp+gXh2DXaQsXetj52lWnCtDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWwHd3rzRzhwx; Thu, 24 Aug 2023 20:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OKpv9N039411; Thu, 24 Aug 2023 20:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKpvg2039408; Thu, 24 Aug 2023 20:51:57 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:51:57 GMT Message-Id: <202308242051.37OKpvg2039408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: f9e0a790ae44 - main - enetc: Don't restart on VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9e0a790ae441f649cc9ff2538dc3a2b2a0a0cb4 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=f9e0a790ae441f649cc9ff2538dc3a2b2a0a0cb4 commit f9e0a790ae441f649cc9ff2538dc3a2b2a0a0cb4 Author: Kevin Bowling AuthorDate: 2023-08-24 20:24:48 +0000 Commit: Kevin Bowling CommitDate: 2023-08-24 20:46:56 +0000 enetc: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This re-init is unintentional for enetc(4). MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 --- sys/dev/enetc/if_enetc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/dev/enetc/if_enetc.c b/sys/dev/enetc/if_enetc.c index 04171698cd38..ec703c09ba77 100644 --- a/sys/dev/enetc/if_enetc.c +++ b/sys/dev/enetc/if_enetc.c @@ -96,6 +96,7 @@ static int enetc_mtu_set(if_ctx_t, uint32_t); static void enetc_setup_multicast(if_ctx_t); static void enetc_timer(if_ctx_t, uint16_t); static void enetc_update_admin_status(if_ctx_t); +static bool enetc_if_needs_restart(if_ctx_t, enum iflib_restart_event); static miibus_readreg_t enetc_miibus_readreg; static miibus_writereg_t enetc_miibus_writereg; @@ -202,6 +203,8 @@ static device_method_t enetc_iflib_methods[] = { DEVMETHOD(ifdi_timer, enetc_timer), DEVMETHOD(ifdi_update_admin_status, enetc_update_admin_status), + DEVMETHOD(ifdi_needs_restart, enetc_if_needs_restart), + DEVMETHOD_END }; @@ -1410,6 +1413,16 @@ enetc_update_admin_status(if_ctx_t ctx) } } +static bool +enetc_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + default: + return (false); + } +} + static int enetc_miibus_readreg(device_t dev, int phy, int reg) { From nobody Thu Aug 24 20:51: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 4RWwHf6xBLz4rYw5; Thu, 24 Aug 2023 20:51: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 4RWwHf6D44z3Pk4; Thu, 24 Aug 2023 20:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b3zFnHlwYRW78GwGDiCtp1tkbNEZZqXl3uJ/igidhOQ=; b=pq88FsWlaURYeH1lhroK9ipTuG3aaht6Ro/ogyKKAjzhqJpVmz/QANz/mlEvx0lIjkF71K Pq95TKjE0jeu6Lt5cR6CXprTifTXWePe24oID2kOGX1AUWannEvkiO1SWkxbMnLKsfA3w+ acMABp6A25/HUFQPY7dLz/GOIOH1qPuV2DpsnDJnCfmJ39ph99HC4UiLsHurxy/U2/9K42 YnUPY79FZQ5md3UNZn6uZMd1RmuOPWi7o6EVquRUhPyOz6pOVHl9zEFpGTmeiJ5BLfKMZP gBzeiKonkOI35QaxLlmpft7LkMI6Y9l2si3tAii/eGnJ8UhgA6tEWCLK61ie2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b3zFnHlwYRW78GwGDiCtp1tkbNEZZqXl3uJ/igidhOQ=; b=PSX90yzNQ3LsVG/sjhV4K44mzH3jBbOD6hALhH8fiza1vxlP5fFcJK6uIEpou3FyZR1vm/ jswyCs++zyHwRRF66Bm6LVrM0AzTuewaYzhxuvfQGXkhYxZwSqZ0FprW/3xdk5sOs6/vPD OYR69063i4jadfoR78Fmv62c2L1FVhMARpFFoH5Q8GtAtGCJvlqs+KXgQY/SBV7SC1ojK1 GfXREfEk++Y+ibHSC60uVdBKmEMuilDwYRd15lt1FSUYsgS+htzTUBQoGYfe/LQXbMEO4s FGBjSU2hiICFVuCIC1drO2GNoX7h/wuDaSzIAdhR/Y0bCB1/m/ANJ8hvAU5EZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692910318; a=rsa-sha256; cv=none; b=SB21fIEoXwhbAMXbjorA1m+DGwnMCBq8WaOhubmbAQdhr9Y38kbMPRA1Lom6+x1VxXMIN6 K+vv5aXguHVrgSu/JONZbaax4zRiG/k3/4yAY7eYT9ywbfy8jxV16ux2wheiOI98geDYWC gER6gNtxoxkabM0qR8/iFM1vUfiZDwNyTFyAzp3MdkepOI0Nio6L90VvCVMa9meWkvQ5g6 y2LMBAjWGih0nH2wIbZiYdi8hEI5kYoTDo4I11Gs2pAgM3ihajrEhqG6NdTqIZYAhzuKfw QCQ0Y5XU50a+dQWJaxKZ3NRcIzURYYMsVKKQq3Qjx5dGFk0FzqaJ8rRS+wjvLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWwHf4pvwzhwy; Thu, 24 Aug 2023 20:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OKpwd1039465; Thu, 24 Aug 2023 20:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKpwUA039462; Thu, 24 Aug 2023 20:51:58 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:51:58 GMT Message-Id: <202308242051.37OKpwUA039462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: b6b75424c57d - main - vmxnet3: Don't restart on VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6b75424c57d6da49967fef39f69080ce6939207 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b6b75424c57d6da49967fef39f69080ce6939207 commit b6b75424c57d6da49967fef39f69080ce6939207 Author: Kevin Bowling AuthorDate: 2023-08-24 20:25:21 +0000 Commit: Kevin Bowling CommitDate: 2023-08-24 20:46:56 +0000 vmxnet3: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This re-init is unintentional for vmxnet3(4). MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 --- sys/dev/vmware/vmxnet3/if_vmx.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c index 99e84e744d57..2c3530a217f3 100644 --- a/sys/dev/vmware/vmxnet3/if_vmx.c +++ b/sys/dev/vmware/vmxnet3/if_vmx.c @@ -180,6 +180,7 @@ static void vmxnet3_enable_intr(struct vmxnet3_softc *, int); static void vmxnet3_disable_intr(struct vmxnet3_softc *, int); static void vmxnet3_intr_enable_all(if_ctx_t); static void vmxnet3_intr_disable_all(if_ctx_t); +static bool vmxnet3_if_needs_restart(if_ctx_t, enum iflib_restart_event); typedef enum { VMXNET3_BARRIER_RD, @@ -247,6 +248,8 @@ static device_method_t vmxnet3_iflib_methods[] = { DEVMETHOD(ifdi_suspend, vmxnet3_suspend), DEVMETHOD(ifdi_resume, vmxnet3_resume), + DEVMETHOD(ifdi_needs_restart, vmxnet3_if_needs_restart), + DEVMETHOD_END }; @@ -2505,6 +2508,16 @@ vmxnet3_intr_disable_all(if_ctx_t ctx) vmxnet3_disable_intr(sc, i); } +static bool +vmxnet3_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + default: + return (false); + } +} + /* * Since this is a purely paravirtualized device, we do not have * to worry about DMA coherency. But at times, we must make sure From nobody Thu Aug 24 20:51: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 4RWwHg7062z4rYvF; Thu, 24 Aug 2023 20:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWwHg6Ty1z3QGv; Thu, 24 Aug 2023 20:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CCu2qwUifx0kAtM1j5qS7Mvxr20ZLUi05zoVH24ZQPM=; b=CHA7B9JpNV17eQJf3RCe1VKHX4E27VLhumjTccRr03g7RS6uXYjWuPl8WQ5whdX1+qqEPx tF+DksHF3m7xW0D2SytZ1lL82CFbn0USaauiG35/DKpdmrcGdTbiI6xSGmAgNmU9CMck95 JMYW5dtGqVpGL+HE1ZQvFFmAD2+pgM2yZ1USMrosDo9oPJoTqrdUupI4OuMet0AVD9E5f3 5lcC4w8mKbO6Wwe2c26X9luiv7//rbPx/Eu84ap8t+zwfvaOgaZfFlABBE9YKim5djzv+n INFs8TvHMPXGO3oBQwr9zhIR0TnvbSmQY/ZhQPcT1hWNxjwQUZf1djuo3FbiuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CCu2qwUifx0kAtM1j5qS7Mvxr20ZLUi05zoVH24ZQPM=; b=uzr1flht37TxSo3TbcE/48sYra2TbcIE3L9tjYItHHYR8QzTS7b5jvapzU+Eysz1Gcx09t xOm1TDu2S8bgw61u4/HiL25UwPnAMwu0CwOYWoKwxlLA17ej74qUty/L0dyGr7nqUgOSsf augLcRRFo1DU3mLNlTJ9X9U+LsWpDrnpqrqjY0fyux1L8X7WYDLK0r/vYySLC5Q8Szgp9D 5/OX5RfXWkiI6nFp1ZWXIp+oQ4IGsgJ+7Jl1A4hMe6ohCfrMSUObvqh+n3NAeqKInytmXB 1v5rjKAnaxG3LcYswJCWHwUgc6x6NvsZc7cyXG6hWNef/45/696rvEIBTP88zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692910319; a=rsa-sha256; cv=none; b=hP9sJ9DbswTf4vQ0MbMrlJ7NVA2unqFTqp+LwSjdhUJb45QrdyBg4gof6zLnU9AJWrmbxU yRK+oqbW3nt0ZYcVIf2jtbjagZpGid2JR+5CPdAtG66a8byx6CwubPX9CAXV293vAcu+1I H8rSVXJGY+dEzCk+5BCt6sApl9obS6Cb8d/V5qmi+mojr5xZgH+pTI/Ml7GiXUB5E+OaHk YxD05g+enYndQjfz1ghJAI5h/EQFhqGYQBQi6M+z5HKpUzLnoNUobonn/djtgga5ADF62E gJhutq6E7HIbXJSEUe5DTJb2LXU1NqazJ1wlbXZqwMMhqV4z0Git9rr6bJUeMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWwHg5V0Zzhx1; Thu, 24 Aug 2023 20:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OKpxL7039511; Thu, 24 Aug 2023 20:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKpxYX039508; Thu, 24 Aug 2023 20:51:59 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:51:59 GMT Message-Id: <202308242051.37OKpxYX039508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: fe6c4e214d76 - main - enic: Don't restart on VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe6c4e214d76b0e856e5a050abb5420de4f5020b Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=fe6c4e214d76b0e856e5a050abb5420de4f5020b commit fe6c4e214d76b0e856e5a050abb5420de4f5020b Author: Kevin Bowling AuthorDate: 2023-08-24 20:29:10 +0000 Commit: Kevin Bowling CommitDate: 2023-08-24 20:46:56 +0000 enic: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This re-init is unintentional for vmxnet3(4). MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 --- sys/dev/enic/if_enic.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/dev/enic/if_enic.c b/sys/dev/enic/if_enic.c index b2fc3af56006..154eedfd0a19 100644 --- a/sys/dev/enic/if_enic.c +++ b/sys/dev/enic/if_enic.c @@ -117,6 +117,7 @@ static int enic_dev_wait(struct vnic_dev *, int (*) (struct vnic_dev *, int), int (*) (struct vnic_dev *, int *), int arg); static int enic_map_bar(struct enic_softc *, struct enic_bar_info *, int, bool); static void enic_update_packet_filter(struct enic *enic); +static bool enic_if_needs_restart(if_ctx_t, enum iflib_restart_event); typedef enum { ENIC_BARRIER_RD, @@ -174,6 +175,8 @@ static device_method_t enic_iflib_methods[] = { DEVMETHOD(ifdi_intr_disable, enic_intr_disable_all), DEVMETHOD(ifdi_msix_intr_assign, enic_msix_intr_assign), + DEVMETHOD(ifdi_needs_restart, enic_if_needs_restart), + DEVMETHOD_END }; @@ -1564,6 +1567,16 @@ enic_update_packet_filter(struct enic *enic) ENIC_UNLOCK(softc); } +static bool +enic_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + default: + return (false); + } +} + int enic_setup_finish(struct enic *enic) { From nobody Thu Aug 24 20:52: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 4RWwHj2nPRz4rZHl; Thu, 24 Aug 2023 20:52: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 4RWwHj0TFmz3QKT; Thu, 24 Aug 2023 20:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rRCKUhylPibFJqVAJh6H+/UqlA6SUfNmWqT/aFAHXa8=; b=vJHSwKxmUDurRw/bchgkCZz8qOUumb9JvhPHIjnMMDxnUPNN328V/g883Oj4yyW2GPw5n9 at47VMHdokUCo/KcQ24iqvYFSPGnK5wZXb9eZYFY74r7DV395NIt8CJ+Dttl5DWsc6OHuI yABGEDjbJKegPX1mP4qhfy6tebemN95N6sEOIXoNSQ+VNLagwGPXwwaH8LhT+cOU4m4IdZ 2lOhyKvKB+UFxjX00KIA10UxEPsSraq6rr+ggoiW2b1QibRuJRxEeqLCnZzlZ311/IE+Yc f9+qYbNE/pi4vnLcOIJzRyZfb9j3sUIG15gg/Px6u5X157nwQ9sX/cZVj45CrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rRCKUhylPibFJqVAJh6H+/UqlA6SUfNmWqT/aFAHXa8=; b=lASO1X8CNHANbKYnLcC28c5cVCyDI+95xVEqzo22Y8Z5R4TZ4i7ufyEN1hMZjZ2mXVNnwE jNOjO1zx0a/bvpRL3XUZ+zYeB9VfJJAENbeaH4C6RSjdaUDnEXo2scU8k2eJg4BsXmCFaF tAoTQl5OmiIdLCASSZc90ThriQxP2F9cK2IuhPOyOpG4+LWeOCVyX4ivlNbTjqNjJDbI15 oijiUmLmY9l5zjXUowuA/FzRW5do5LDkNcQEuq7oHQckyF1T7Z516hQ1KSWU0zqooTlTKi kk6gtbZIrINRo5zdamD1ZokBSPs4pQty13yKZY4jhD9JTrSxJyieJbYuu1KckQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692910321; a=rsa-sha256; cv=none; b=mS8SphdNeqg5t4ypG05RwkX+Z2vsUS10tIrvRknmIHjLXjb3qoZALxIjKS7CprSzxHjRpI G2Ng/TLH1TGQ1skVnIb9c4Bb+dqWiRJ5x6OjvYp4H19MCnPgFwgeXfAUQGhSeimzRx+da/ o6PZLkZfGJuFfBF4dc+uRiqWdrdezpxlP+60slXZXfp0XaIpAXVoq1fCNJlYmhzzBlgJHG sVZVK1nGboD08jo7yBQ0a0w4ZX2eAVVxK7i8vsTDcAHrNWUQwJQN8ic+IOAtYlYvVMPRmI HdLLcKltRXlZeZQXfCukDN6mKdRKe9pAUZw9kcrvYHl2gJqY/kKmU9/A2M+3qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWwHh6BNBzhjC; Thu, 24 Aug 2023 20:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OKq0PR039566; Thu, 24 Aug 2023 20:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKq0r5039563; Thu, 24 Aug 2023 20:52:00 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:52:00 GMT Message-Id: <202308242052.37OKq0r5039563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 1d6c12c511ae - main - iavf: Add explicit ifdi_needs_reset for VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d6c12c511ae2a394d3ca1998a10f3d3bd25d313 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=1d6c12c511ae2a394d3ca1998a10f3d3bd25d313 commit 1d6c12c511ae2a394d3ca1998a10f3d3bd25d313 Author: Kevin Bowling AuthorDate: 2023-08-24 20:36:00 +0000 Commit: Kevin Bowling CommitDate: 2023-08-24 20:46:56 +0000 iavf: Add explicit ifdi_needs_reset for VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. iavf(4) was the original need for this, because VLAN filter changes currently have negative interactions with Malicious Driver Detection. Add iavf_if_needs_restart and explicitly enable VLAN re-init. MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 --- sys/dev/iavf/if_iavf_iflib.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sys/dev/iavf/if_iavf_iflib.c b/sys/dev/iavf/if_iavf_iflib.c index b2531b797941..714d34eeebe5 100644 --- a/sys/dev/iavf/if_iavf_iflib.c +++ b/sys/dev/iavf/if_iavf_iflib.c @@ -74,6 +74,7 @@ static void iavf_if_vlan_unregister(if_ctx_t ctx, u16 vtag); static uint64_t iavf_if_get_counter(if_ctx_t ctx, ift_counter cnt); static void iavf_if_init(if_ctx_t ctx); static void iavf_if_stop(if_ctx_t ctx); +static bool iavf_if_needs_restart(if_ctx_t, enum iflib_restart_event); static int iavf_allocate_pci_resources(struct iavf_sc *); static void iavf_free_pci_resources(struct iavf_sc *); @@ -169,6 +170,7 @@ static device_method_t iavf_if_methods[] = { DEVMETHOD(ifdi_vlan_register, iavf_if_vlan_register), DEVMETHOD(ifdi_vlan_unregister, iavf_if_vlan_unregister), DEVMETHOD(ifdi_get_counter, iavf_if_get_counter), + DEVMETHOD(ifdi_needs_restart, iavf_if_needs_restart), DEVMETHOD_END }; @@ -1497,6 +1499,25 @@ iavf_if_get_counter(if_ctx_t ctx, ift_counter cnt) } } +/* iavf_if_needs_restart - Tell iflib when the driver needs to be reinitialized + * @ctx: iflib context + * @event: event code to check + * + * Defaults to returning false for unknown events. + * + * @returns true if iflib needs to reinit the interface + */ +static bool +iavf_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + return (true); + default: + return (false); + } +} + /** * iavf_free_pci_resources - Free PCI resources * @sc: device softc From nobody Thu Aug 24 20:52: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 4RWwHk3842z4rYwC; Thu, 24 Aug 2023 20:52: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 4RWwHk1068z3QKv; Thu, 24 Aug 2023 20:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LaBsRpLCHTPPtdjkux1JCY9Uo+oUITENjl0VrXx+1kc=; b=vHzwB8y1yRbvmP2BVMfsl7sMQXVofKwd92l7Pp4zY74wvW95axx3RadylGuNC9tSTgdgpY wcFkPHRARrtM1t180H5jWKOdOM/4atTgEvmhmYL7LmUoMoPGINdN3oLs87qCUZbviVnY3F EjpKS1UVKGzksWJ0VyJ4YZIk0xeSNgHKWsVrWE6DROQ4d1KwFH+GoozTGj3s7L7eWuxj/m tcaTvGxf6FUiaFiPNGTdCPJCzTwZN5SNz7W0ZqlroRc1r0dGi1kVvtLPQteHlsLSS8T0EZ TK6ttBk/anhjICNjvieDYlxWa7SpfajDr6sc9mjSDi41Kp6ycj4wNCD8j9Y+Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LaBsRpLCHTPPtdjkux1JCY9Uo+oUITENjl0VrXx+1kc=; b=E5Gl11ihntqbmdfmtpv7vhxBuXgv6BN1UVOaJeKxK2wdzFiyMLSe41gaceMUlq2Fwuz96K D10z9PZim0hMhurNtxDx7n7FpelaCdt7MW2+n0ARMdJkTf3Z3r17Nn2TXW96nGNJVpMInR ccuBeSdt5/50RCWq5WNTH+vlNaXI7nbTGaP/WtxqtH3jqPNWmQuH92fwX60KxMPKbLD4SF EiN01pNvoad+DLAC2Dq19jDsrNyy2KFPss6mmMcdculODh6fD3B8Rw0kJnzBTvg9Kj3LBj H/GZAgqXN/EjX3BTxiS+4mBxWtz6vHDAMKaLqZXyLo1q5ao8NjB4oMC4yMcsng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692910322; a=rsa-sha256; cv=none; b=EsZdIzMgKAkEVYzSoKJ00Gc45UOfCQn6+3sfcgqMYgRKYw+vliQ262QRDZmHq+bR70nH6Y 7p9uINovJjVUc1Mefjq33i6WuRN/yzV6OKvKANwGk+dXh7EB+kxQnnFcrmsijHZiVGPoJx XJwtOeooUyCu+lfo3oG8ldwLGiT2WHed43aH5L0YIp1XJz7T+4QWvXn6nKGbWaC1xX6joN mYagjd9uqDww5zouSF48v+BJaUe6AV2UTdPYnR9/BL1QwmWmHzD340x4LxXs+41vk1l1L6 nEo2VK98NGWDbk3rZL6Y9hi3cd8xbnfxwWz7kFz2MtPr5pRKeoICjr4f1LUM+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWwHk055TzhjF; Thu, 24 Aug 2023 20:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OKq1FZ039616; Thu, 24 Aug 2023 20:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKq1oe039613; Thu, 24 Aug 2023 20:52:01 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:52:01 GMT Message-Id: <202308242052.37OKq1oe039613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 14a14e36aee2 - main - ice: Don't restart on VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14a14e36aee2e6b848c239ac29090ad4cb66fbf7 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=14a14e36aee2e6b848c239ac29090ad4cb66fbf7 commit 14a14e36aee2e6b848c239ac29090ad4cb66fbf7 Author: Kevin Bowling AuthorDate: 2023-08-24 20:40:35 +0000 Commit: Kevin Bowling CommitDate: 2023-08-24 20:46:57 +0000 ice: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This re-init is unnecessary for ice(4). MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 --- sys/dev/ice/if_ice_iflib.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c index 2397fce11596..8d03bdfd23fb 100644 --- a/sys/dev/ice/if_ice_iflib.c +++ b/sys/dev/ice/if_ice_iflib.c @@ -83,6 +83,7 @@ static int ice_if_priv_ioctl(if_ctx_t ctx, u_long command, caddr_t data); static int ice_if_i2c_req(if_ctx_t ctx, struct ifi2creq *req); static int ice_if_suspend(if_ctx_t ctx); static int ice_if_resume(if_ctx_t ctx); +static bool ice_if_needs_restart(if_ctx_t, enum iflib_restart_event); static int ice_msix_que(void *arg); static int ice_msix_admin(void *arg); @@ -170,6 +171,7 @@ static device_method_t ice_iflib_methods[] = { DEVMETHOD(ifdi_i2c_req, ice_if_i2c_req), DEVMETHOD(ifdi_suspend, ice_if_suspend), DEVMETHOD(ifdi_resume, ice_if_resume), + DEVMETHOD(ifdi_needs_restart, ice_if_needs_restart), DEVMETHOD_END }; @@ -3076,3 +3078,21 @@ ice_if_resume(if_ctx_t ctx) return (0); } +/* ice_if_needs_restart - Tell iflib when the driver needs to be reinitialized + * @ctx: iflib context + * @event: event code to check + * + * Defaults to returning false for unknown events. + * + * @returns true if iflib needs to reinit the interface + */ +static bool +ice_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + default: + return (false); + } +} + From nobody Thu Aug 24 20:52: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 4RWwHl2s3Cz4rZHr; Thu, 24 Aug 2023 20:52: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 4RWwHl25D5z3QQj; Thu, 24 Aug 2023 20:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htWAr9zVKdEjJJPfLxqsBaqH0S8dZOdbqbeYV9soap4=; b=WLiJyR1bKpH7sKofmgAHLxixunHmF2FM8NxvdWIunlV6SuoMRCoK/xwAMps5yupK6LM5fN /SYqLli5/XGs05n3xYp9uJyJWGE0073t4iF233pHEi2rVp1Pnwdi0/RuD5Keb/GgY0rON/ ercO+7Qvz72vjMORajcxzyYkpKlqpKjpw50V0HZz2+66nHQtLk0H+JWLmqth5NAdC4ISJd c91ZhiDkPy7JXiBPLokw/K/KvL1QyrEplPCG+5QtDhNJPNeJe7em/QrZokMh9ptuMkl8ue w8jpOKILzkIZsIDx/PJQBaxl6/AemRZQKsRhh3lm8u0T12SuCH+lHIfn0eM/6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692910323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htWAr9zVKdEjJJPfLxqsBaqH0S8dZOdbqbeYV9soap4=; b=LAJ5I9Z37ERsC6LD3WWkasMxHz0AFyjiEAiO/QQGiidENGO7bhAMUY2ohL0Viu1KygtesF Anr9tJuU3EQDfXxBFU5/8Mv5VXIvNZ/2bodUz5Pomp1xu8IRWxno2U30Om98ILpagvrD5b kTAjFXU+6VsS7tuNXlg6zyrIRWeUkxxQ1O10Fp1sEgKGgPwFk+8zOZ0IiX+8LBnRGgMizB 2iXa1jT3Y+kBcxNafTwyCNMkqPH52cxGH4DI1Q9sK8x9+j7dLJy6UQHUmrcc6tuV31lVJs D3fMuY7cSdOLPF0fWBcfQampNPc05dY9YhzaVGmHRZGYFeOyvZ54N2EwvlJspA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692910323; a=rsa-sha256; cv=none; b=rxvjklOKCEHr2rClvmProBsy55U8bUPVWDyTkh40veYoK18gMiGxQNRvBoXMyeb89B67dc w/SP2ADccb359HNADSJ24cb26JqO0+WThkuMIXHbnV2RCfGTF8hAxp9zAiXPIl870m2voc yuOiRL+8ID+xo5iU0kyPvQg8N7Vy0A96TKDad9aCG6gVUKO7KlYD06twZAoz4kikJN+KJV 2N31IsGOCCBtTpvaj0HgyaOYMlHqjjXsB6tQ7wUff97tctVdBXujTYee/+QsSEqKg24eWc ZBu3gb/BeeIVJCocB9gQYQfX2iKBGChyEpmdeGIRlzSVSznFOtdmQfZoLi4TBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWwHl1BLGzhjG; Thu, 24 Aug 2023 20:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OKq3dT039664; Thu, 24 Aug 2023 20:52:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OKq3p2039661; Thu, 24 Aug 2023 20:52:03 GMT (envelope-from git) Date: Thu, 24 Aug 2023 20:52:03 GMT Message-Id: <202308242052.37OKq3p2039661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 725e4008efef - main - iflib: invert default restart on VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 725e4008efef32dfbe57b3e21635fa80dde8ee38 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=725e4008efef32dfbe57b3e21635fa80dde8ee38 commit 725e4008efef32dfbe57b3e21635fa80dde8ee38 Author: Kevin Bowling AuthorDate: 2023-08-24 20:42:23 +0000 Commit: Kevin Bowling CommitDate: 2023-08-24 20:48:19 +0000 iflib: invert default restart on VLAN changes In rS360398, a new iflib device method was added to opt out of VLAN events needing an interface reset. I am switching the default to not requiring a restart for: * VLAN events * unknown events After fixing various bugs, I do not think this would be a common need of hardware and it is undesirable from the user's perspective causing link flaps and much slower VLAN configuration. Currently, there are no other restart events besides VLAN events, and setting the ifdi_needs_restart default to false will alleviate the need to churn every driver if an odd event is added in the future for specific hardware. markj points out this could cause churn in the other direction; I will solve that problem with an event registration system as he mentions in the review should we need it in the future. These drivers will opt into restart and need further inspection or work: * ixv (needs code audit, 61a8231 fixed principal issue; re-init probably not necessary) * axgbe (needs code audit; re-init probably not necessary) * iavf - (needs code audit; interaction with Malicious Driver Detection mentioned in rS360398) * mgb - no VLAN functions are currently implemented. Left a comment. MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 --- sys/dev/e1000/if_em.c | 5 ++--- sys/dev/igc/if_igc.c | 5 ++--- sys/dev/ixgbe/if_ix.c | 5 ++--- sys/dev/mgb/if_mgb.c | 1 + sys/net/ifdi_if.m | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 4fa275f08e28..8488f72c4cde 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -4383,7 +4383,7 @@ em_if_get_counter(if_ctx_t ctx, ift_counter cnt) * @ctx: iflib context * @event: event code to check * - * Defaults to returning true for unknown events. + * Defaults to returning false for unknown events. * * @returns true if iflib needs to reinit the interface */ @@ -4392,9 +4392,8 @@ em_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) { switch (event) { case IFLIB_RESTART_VLAN_CONFIG: - return (false); default: - return (true); + return (false); } } diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index c59e379ca2c8..a0f0906e30da 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -2402,7 +2402,7 @@ igc_if_get_counter(if_ctx_t ctx, ift_counter cnt) * @ctx: iflib context * @event: event code to check * - * Defaults to returning true for unknown events. + * Defaults to returning false for unknown events. * * @returns true if iflib needs to reinit the interface */ @@ -2411,9 +2411,8 @@ igc_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) { switch (event) { case IFLIB_RESTART_VLAN_CONFIG: - return (false); default: - return (true); + return (false); } } diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index e8fb5de493ce..17f1f73a526e 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -1256,7 +1256,7 @@ ixgbe_if_i2c_req(if_ctx_t ctx, struct ifi2creq *req) * @ctx: iflib context * @event: event code to check * - * Defaults to returning true for unknown events. + * Defaults to returning false for unknown events. * * @returns true if iflib needs to reinit the interface */ @@ -1265,9 +1265,8 @@ ixgbe_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) { switch (event) { case IFLIB_RESTART_VLAN_CONFIG: - return (false); default: - return (true); + return (false); } } diff --git a/sys/dev/mgb/if_mgb.c b/sys/dev/mgb/if_mgb.c index 4a23ef3cdcaf..6fafb303143c 100644 --- a/sys/dev/mgb/if_mgb.c +++ b/sys/dev/mgb/if_mgb.c @@ -251,6 +251,7 @@ static device_method_t mgb_iflib_methods[] = { */ DEVMETHOD(ifdi_vlan_register, mgb_vlan_register), DEVMETHOD(ifdi_vlan_unregister, mgb_vlan_unregister), + DEVMETHOD(ifdi_needs_restart, mgb_if_needs_restart), /* * Needed for WOL support diff --git a/sys/net/ifdi_if.m b/sys/net/ifdi_if.m index a9c285c4dd31..d52bf66bd110 100644 --- a/sys/net/ifdi_if.m +++ b/sys/net/ifdi_if.m @@ -115,7 +115,7 @@ CODE { static bool null_needs_restart(if_ctx_t _ctx __unused, enum iflib_restart_event _event __unused) { - return (true); + return (false); } }; From nobody Thu Aug 24 21:06: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 4RWwcc0JM2z4rZds; Thu, 24 Aug 2023 21:06: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 4RWwcb6ry8z3TNJ; Thu, 24 Aug 2023 21:06:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692911200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F09/gADvUj/sEnxKcWpXtPp8BUYDqXc5eHvm6EIXiEA=; b=hwrU1HmPuivVZaxop2xTeOXvjWvEhqapI5HSJJ4u672/8UFEj5n/g8RGfx+zc9lccpaVAP CBmLz35O5ieAp2yCpCbn97AfM+m6JYFy1i3fZHbQXILtK1tf7pTrYIR2FWkoDf6JyxaftT zvALi2uvfSK8ooaSh73OLfMt2Oncjv1wzkZrRXt6jPIb2ZM6DVvEtOD9y2GswfoNmKfz6V B8NDz1Gp5SIgaHvevIlY778aY8gHZrVUKEAnNQOUsVj6q8t14C1dfOPPfi+vkPR8QgIbqT ziuRaBvygfXwTl7oGFl4zbWx6Y6AAzHbjEeK4lsaPhYyXuZm6qGpMCHlNL1w/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692911200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F09/gADvUj/sEnxKcWpXtPp8BUYDqXc5eHvm6EIXiEA=; b=psSllE1gB8JZVhPArei4JnOOWXxdJmJTcdROLT608sCRKI5mZuJG8R/F6HxKUU3Mior+bu CRaua+/Cc5O8y7/cePbTSlFoyA6JrmkXLKP26gsDrUC6PtM/7zdB9EjXrxY9FqF7sjbPKa bhAb6zO+v+yBa6Dq6AhC/hoMtsEXDA7pT9/GAK2l1h8dNiBrWjTMqXJT75wqX7PTG0tD5t V4lr/3FqoqSUJrhgmx3M3EjcllgkksbP2tNJzInY357hiZ0yFumkD5xBRrxABUxEZVHZlf jwuR5S16KJA8xr4G5Pu4MSuc4ZJ2NDCqN7aYr32Q0loDVdswZyCd+IifcwM2hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692911200; a=rsa-sha256; cv=none; b=VBlKxUPDf3SNe9dcOGSVvc6QeB/3I1AYCbSrU6TCSCkkEjorxOCB8xhshV1BdtahFg7z83 zfS3ksNNsRPpdG0U0Aatve3i614KADIsUY8kAOTqyCx2aCmOj1B7TiiRf5jaNUh8Q+YXHK Rgj2H44Fz8LlsoFC8LMcxjr++r3LEmoXh1O01ygQpwTiCI8OUxOELfkgYufvPec0ETxj0M sgXVMiNp2Wr6LEySq7C1RqCyYEQo9mGbHtyTzR0KvZfa4if08GLTfx6JPvDI6O6g6MBfnW YaO/rVJZl1c1Iyff/5k9G7WSLX54tzH8C+fOLkj+xMeCP9BJa2gdMr+8abfSrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWwcb5p9Qzhxp; Thu, 24 Aug 2023 21:06:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OL6dKd058638; Thu, 24 Aug 2023 21:06:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OL6dZ4058635; Thu, 24 Aug 2023 21:06:39 GMT (envelope-from git) Date: Thu, 24 Aug 2023 21:06:39 GMT Message-Id: <202308242106.37OL6dZ4058635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: cb5152f961bb - stable/13 - iflib: Fix panic during driver reload stress 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: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cb5152f961bbb89b186ee76aaa8eb631f21cf6c4 Auto-Submitted: auto-generated The branch stable/13 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=cb5152f961bbb89b186ee76aaa8eb631f21cf6c4 commit cb5152f961bbb89b186ee76aaa8eb631f21cf6c4 Author: Przemyslaw Lewandowski AuthorDate: 2023-07-27 22:47:12 +0000 Commit: Eric Joyner CommitDate: 2023-08-24 21:04:16 +0000 iflib: Fix panic during driver reload stress test During a driver reload stress test, after 50-300 reloads a panic occurs. After adding sleeps in between loading and unloading the driver, the issue does not occur. It's possible that loading/unloading too fast may cause the gt_taskqueue pointer to be freed earlier than expected; checking for a null pointer first fixes it. Signed-off-by: Eric Joyner Reviewed by: erj@ Tested by: jeffrey.e.pieper@intel.com Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D39457 (cherry picked from commit 04d4e34538cf8f8ac99b5aa1c6c50b626d976dfd) --- sys/net/iflib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 763ce3adf64b..2ee246170211 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -1628,7 +1628,8 @@ iflib_fast_intr_ctx(void *arg) return (result); } - GROUPTASK_ENQUEUE(gtask); + if (gtask->gt_taskqueue != NULL) + GROUPTASK_ENQUEUE(gtask); return (FILTER_HANDLED); } From nobody Thu Aug 24 21:15: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 4RWwpZ6my1z4rZtr; Thu, 24 Aug 2023 21:15: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 4RWwpZ6JN7z3TwY; Thu, 24 Aug 2023 21:15:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692911718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/q4p1CWZMrYgEwjS76jR7/zuNvn6gjGqQLIEPo7Arsg=; b=k6r0LH/yA9kub7YqJFLH3sjYvXAWbGTGNPtkcCM150dTHiH76479732wkWd6H5teb0EHLF 2WkDEQqX/3kvgwe7dVRFyxNqU7CYji6R+5YkjAb4paV1zNtfjze/GPK/1BEGLjge8SPCfD 17xrLwnv4YMQbO1yQNFdmBsY26bBQ38FMOtIsmudLMHWuCZKWH3IjfL3Zjmc26ZLzihcum sS5kZ14DSf0oPVkKpyT5H1vfe9nvMg0HHBxNqbkMfxyJXA2eUwg2dfa+VQyTBTxk5Xsgya e7uvvBFv6ltWVB54s6+vtzOlY1hioNbbyBso11UllnYm+MsfZrPKhLN94mTGwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692911718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/q4p1CWZMrYgEwjS76jR7/zuNvn6gjGqQLIEPo7Arsg=; b=jP32BjNITK3ch5DL8smDY8y0YcVO6D2LBmEUN1YktT7phrRGd1Q2KcBGkR45NUO7PSXewI xV5COzZdlcE2t/9USdOtj9zQJSBRdn0ewvvNXr7R0ezatdPj00PFlqQkA72C6BGpEuuWXW +9qyf3uAo0B+IAJchvruVLHC3OKou1KbcVcBH4cw2AD7/qNWcY9ZYwWLCt2id4lbGzxvMJ yOh+DU8yZ9gt4tlt95VoQpPA54C9igor6Z2kPjtbm9bsAF13F9UsYHb7saCanSMLxhpkdk ykg3755G8GeFZD/4czd3EAYV4UBw261OJ21IZDgaq7QOSQGHjk1bZegfr2FmXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692911718; a=rsa-sha256; cv=none; b=sHU0UPCwlSPSMeho++YMmy8A+3DyIGfnVAFGbvvGHgGDxVI0ldVZeiUA36w13aH/nvcU/6 GvmVhz4/A625EefGfG6OyWkvdRuJtnxgACVL4/SFXjjGqVTsMyQjXDQ/GQSifZTetT/R7x c1gKZEWT1ARIApBKJ0BoSplwMhWr2Sxca7OQts93QC2PN+0OOz10DoKIG2BCRmIF/jBQ+D E4qCGttSM44a7Kujhf0piFKj2BYbmxFcSmWe7weon95oXRWwgPcjY/wpqZpOFvcgibDXe3 J0aKM/5vCNJJQQfQ5RW85g6PoJzBj+8tJn2vg+xvqsS2pVy1vAjj27CgNNCIqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWwpZ5M1Pzhyq; Thu, 24 Aug 2023 21:15:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OLFIqS075128; Thu, 24 Aug 2023 21:15:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OLFIAD075126; Thu, 24 Aug 2023 21:15:18 GMT (envelope-from git) Date: Thu, 24 Aug 2023 21:15:18 GMT Message-Id: <202308242115.37OLFIAD075126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: 3df6b1d39af5 - stable/13 - iflib: Remove redundant 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: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3df6b1d39af58620edf59be076ab134bf90e083d Auto-Submitted: auto-generated The branch stable/13 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=3df6b1d39af58620edf59be076ab134bf90e083d commit 3df6b1d39af58620edf59be076ab134bf90e083d Author: Eric Joyner AuthorDate: 2023-08-04 17:57:11 +0000 Commit: Eric Joyner CommitDate: 2023-08-24 21:07:22 +0000 iflib: Remove redundant variable In iflib_init_locked(), sctx and scctx both point to the same value, which is the ifc_softc_ctx field in the iflib softc. Remove the declaration and assignment to sctx since scctx can be used instead, and the name of scctx follows the naming convention used for local variables that point to ifc_softc_ctx. In theory there should be no functional impact with this change. Signed-off-by: Eric Joyner Reviewed by: kbowling@ Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D41325 (cherry picked from commit d2dd3d5a989d1a2c9ebfbb90a1e682d3ad9db3c3) --- sys/net/iflib.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 2ee246170211..2a0181fa2d77 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2456,7 +2456,6 @@ iflib_get_rx_mbuf_sz(if_ctx_t ctx) static void iflib_init_locked(if_ctx_t ctx) { - if_softc_ctx_t sctx = &ctx->ifc_softc_ctx; if_softc_ctx_t scctx = &ctx->ifc_softc_ctx; if_t ifp = ctx->ifc_ifp; iflib_fl_t fl; @@ -2486,7 +2485,7 @@ iflib_init_locked(if_ctx_t ctx) if (if_getcapenable(ifp) & IFCAP_TSO6) if_sethwassistbits(ifp, CSUM_IP6_TSO, 0); - for (i = 0, txq = ctx->ifc_txqs; i < sctx->isc_ntxqsets; i++, txq++) { + for (i = 0, txq = ctx->ifc_txqs; i < scctx->isc_ntxqsets; i++, txq++) { CALLOUT_LOCK(txq); callout_stop(&txq->ift_timer); #ifdef DEV_NETMAP @@ -2508,7 +2507,7 @@ iflib_init_locked(if_ctx_t ctx) #endif IFDI_INIT(ctx); MPASS(if_getdrvflags(ifp) == i); - for (i = 0, rxq = ctx->ifc_rxqs; i < sctx->isc_nrxqsets; i++, rxq++) { + for (i = 0, rxq = ctx->ifc_rxqs; i < scctx->isc_nrxqsets; i++, rxq++) { if (iflib_netmap_rxq_init(ctx, rxq) > 0) { /* This rxq is in netmap mode. Skip normal init. */ continue; @@ -2526,7 +2525,7 @@ done: if_setdrvflagbits(ctx->ifc_ifp, IFF_DRV_RUNNING, IFF_DRV_OACTIVE); IFDI_INTR_ENABLE(ctx); txq = ctx->ifc_txqs; - for (i = 0; i < sctx->isc_ntxqsets; i++, txq++) + for (i = 0; i < scctx->isc_ntxqsets; i++, txq++) callout_reset_on(&txq->ift_timer, iflib_timer_default, iflib_timer, txq, txq->ift_timer.c_cpu); From nobody Thu Aug 24 21:15: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 4RWwpc0tlJz4rbBc; Thu, 24 Aug 2023 21:15: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 4RWwpc0RkMz3VGy; Thu, 24 Aug 2023 21:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692911720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yOz4PuUzUBoC7vtGNYyHGX0vh67uncnrzFB8Did+Z48=; b=GgCWKDstiXBw6YjtAx32Y24oVtwoUGv1ndGpBkywuA1G2mVpnRPzjWpQk5vlji7waM47tN 4eOUi+1rugxBlD9/Edaw88OsB4ydmA41pBpl8ZPJbN0biMMHzZIcXrE0k7tjaNJP1Dg6Xw wDKi15A1qFV9trX7VbPBXn/dbUSyPp1+13WybALnPG83knVWQMUdVMGtG3iTw0RJv0K8XP HVcF5Vs19JOJhbwSVnmuosL1OkZVDagL2bODIK2VnPKVOpSaWEWelb+OTSlKXP0jTo8UXo q3gGFg/h1oNouTvAPnSsRPPDpeigkS4HOCdYbngabTIOuzCmGmAUFYQGx7U8rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692911720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yOz4PuUzUBoC7vtGNYyHGX0vh67uncnrzFB8Did+Z48=; b=py8NfcDz6ZsZVK+HiGBApEhlBKnFd4KO4vLI4nrwvl/IuFVbCa799nxFtDZVnZMENdW4zF VXEPte8toEVPK+qq7yHb1QFu+l4LXGqveqYr0EAkM5QCCsOh1MyWOTRPAvx9fpkgwPdWBK MiWjF2FR2qX2gYw8yCJwwiEgaaK2BKvlig5lf7id+VyEEvgcE8BLr11hL0QDbzsmxnSQWp zmuYa8CJZLcISgfb6p1o4npO91RQpc29eb5tAvJjG5nTk7v+xrDLIqN65gMEphQ3ljMzsg 6P8X42a73+iRtzPixe9SGj1STwDId2vqum2oAysypYL2rfdVAlSVwN9jWiWn4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692911720; a=rsa-sha256; cv=none; b=wilVesnVgR3vA8jYWhH5G+b/LVy4sLOp5QcNQ1cHU8MOh2uDEjV2BcB6etlHuGYMFeZtks HoKpRudfBq/Hpj5nxn6BDJ2FWE1XP4X8q26EXKN1IHexROb7N5sy01NMof+B6aNN+QAL6W 8KqPgoTY7caqYvfERpXci3bCpQteYI2wCoRSZQrkr6A3C96g2tbVxINWqVL7U67FtxK8uX uckAl36Bs8DcBeba5Tr5BcFmTJDbwym5eMZNozqFZMu/tpwnk0QGoVXtnoT9F/SNw17gOk zjl6IqMwcx3VZ9avsUPd8bECqgXsOwnnmZ3Nhzf+gX7+EmbdCEFwK2P5V7H6MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWwpb6Pq3zhkX; Thu, 24 Aug 2023 21:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OLFJD7075182; Thu, 24 Aug 2023 21:15:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OLFJca075179; Thu, 24 Aug 2023 21:15:19 GMT (envelope-from git) Date: Thu, 24 Aug 2023 21:15:19 GMT Message-Id: <202308242115.37OLFJca075179@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: dadd804ded83 - stable/13 - iflib: Fix white space and reduce some line lengths List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: dadd804ded83c8fc911ee9607d8e466aaf28d45b Auto-Submitted: auto-generated The branch stable/13 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=dadd804ded83c8fc911ee9607d8e466aaf28d45b commit dadd804ded83c8fc911ee9607d8e466aaf28d45b Author: Eric Joyner AuthorDate: 2023-08-04 17:53:29 +0000 Commit: Eric Joyner CommitDate: 2023-08-24 21:07:40 +0000 iflib: Fix white space and reduce some line lengths This helps align some of the code with the rest of the style used in iflib, but as marius@ points out, this is not style(9). Signed-off-by: Eric Joyner Reviewed by: kbowling@ Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D41324 (cherry picked from commit 7f527d48124bd03fcfb946ce2d5d0c7bc71e099d) --- sys/net/iflib.c | 18 ++++++++++-------- sys/net/iflib.h | 7 +++++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 2a0181fa2d77..d6dcb09312db 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -209,6 +209,7 @@ struct iflib_ctx { #define isc_legacy_intr ifc_txrx.ift_legacy_intr #define isc_txq_select ifc_txrx.ift_txq_select #define isc_txq_select_v2 ifc_txrx.ift_txq_select_v2 + eventhandler_tag ifc_vlan_attach_event; eventhandler_tag ifc_vlan_detach_event; struct ether_addr ifc_mac; @@ -1934,7 +1935,7 @@ iflib_rxsd_alloc(iflib_rxq_t rxq) MPASS(scctx->isc_nrxd[rxq->ifr_fl_offset] > 0); fl = rxq->ifr_fl; - for (int i = 0; i < rxq->ifr_nfl; i++, fl++) { + for (int i = 0; i < rxq->ifr_nfl; i++, fl++) { fl->ifl_size = scctx->isc_nrxd[rxq->ifr_fl_offset]; /* this isn't necessarily the same */ /* Set up DMA tag for RX buffers. */ err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ @@ -6501,7 +6502,8 @@ iflib_irq_alloc_generic(if_ctx_t ctx, if_irq_t irq, int rid, } void -iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, void *arg, int qid, const char *name) +iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, + void *arg, int qid, const char *name) { device_t dev; struct grouptask *gtask; @@ -6998,16 +7000,16 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx) SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_ntxqs", CTLFLAG_RWTUN, &ctx->ifc_sysctl_ntxqs, 0, - "# of txqs to use, 0 => use default #"); + "# of txqs to use, 0 => use default #"); SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_nrxqs", CTLFLAG_RWTUN, &ctx->ifc_sysctl_nrxqs, 0, - "# of rxqs to use, 0 => use default #"); + "# of rxqs to use, 0 => use default #"); SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_qs_enable", CTLFLAG_RWTUN, &ctx->ifc_sysctl_qs_eq_override, 0, "permit #txq != #rxq"); SYSCTL_ADD_INT(ctx_list, oid_list, OID_AUTO, "disable_msix", - CTLFLAG_RWTUN, &ctx->ifc_softc_ctx.isc_disable_msix, 0, - "disable MSI-X (default 0)"); + CTLFLAG_RWTUN, &ctx->ifc_softc_ctx.isc_disable_msix, 0, + "disable MSI-X (default 0)"); SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "rx_budget", CTLFLAG_RWTUN, &ctx->ifc_sysctl_rx_budget, 0, "set the RX budget"); @@ -7019,8 +7021,8 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx) CTLFLAG_RDTUN, &ctx->ifc_sysctl_core_offset, 0, "offset to start using cores at"); SYSCTL_ADD_U8(ctx_list, oid_list, OID_AUTO, "separate_txrx", - CTLFLAG_RDTUN, &ctx->ifc_sysctl_separate_txrx, 0, - "use separate cores for TX and RX"); + CTLFLAG_RDTUN, &ctx->ifc_sysctl_separate_txrx, 0, + "use separate cores for TX and RX"); SYSCTL_ADD_U8(ctx_list, oid_list, OID_AUTO, "use_logical_cores", CTLFLAG_RDTUN, &ctx->ifc_sysctl_use_logical_cores, 0, "try to make use of logical cores for TX and RX"); diff --git a/sys/net/iflib.h b/sys/net/iflib.h index 62da5ae25030..da6dc23aefd4 100644 --- a/sys/net/iflib.h +++ b/sys/net/iflib.h @@ -472,11 +472,14 @@ int iflib_device_iov_add_vf(device_t, uint16_t, const nvlist_t *); int iflib_device_register(device_t dev, void *softc, if_shared_ctx_t sctx, if_ctx_t *ctxp); int iflib_device_deregister(if_ctx_t); -int iflib_irq_alloc(if_ctx_t, if_irq_t, int, driver_filter_t, void *filter_arg, driver_intr_t, void *arg, const char *name); +int iflib_irq_alloc(if_ctx_t, if_irq_t, int, driver_filter_t, void *filter_arg, + driver_intr_t, void *arg, const char *name); int iflib_irq_alloc_generic(if_ctx_t ctx, if_irq_t irq, int rid, iflib_intr_type_t type, driver_filter_t *filter, void *filter_arg, int qid, const char *name); -void iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, void *arg, int qid, const char *name); +void iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, + iflib_intr_type_t type, void *arg, int qid, + const char *name); void iflib_irq_free(if_ctx_t ctx, if_irq_t irq); From nobody Thu Aug 24 21:30: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 4RWx893lKhz4rbvj; Thu, 24 Aug 2023 21:30: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 4RWx893JgMz3Vky; Thu, 24 Aug 2023 21:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692912633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5IDdGwj9EGTYRtuFySpMCa9R7kOe6ZFqMY3C9DewI1k=; b=rjM88xz/ZDTh9jsD5nmH2FJSjbDbC6O0LIovkAHambyVIN7Lo0yskgFyv6okMZxBtF9JnR EUAZyC8qCndEdk3UNayjG1818S31KJkzLqPDB8vWD5iTSJS/r1N5GEv0i9JxIKMTSUC3bK iEiEUztRI/BkvPqGJXBFJy0PIjsoFWnfUyAm3UF1k8zWp9fTd10/Yr0+BwEBq3CKzPgSu9 ubx0hNX+qxJhHBoFQJpcMs8Q4UxQqs8EQjfh57FFxh/OgaMW4tvN+dIlCwahuma/dJIcet sNEbzAR5XCwh6WuvR+ZKixUPJqITPHtIa4YF5tj2Qv9V9NVrE30yIFg++4VZeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692912633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5IDdGwj9EGTYRtuFySpMCa9R7kOe6ZFqMY3C9DewI1k=; b=XaAUJRpFlJkOBd3XZgYNF3Ges3G2b6G5S4nqKAH7Q9ezhRZZPvJTnZ0QI5oKn3++PvzuY7 AW2PGTFZWcMmX+piAwTvEjSCWiTpsaLSTdz2dZSwX5JtusUMTLUXIsb0ljhYBz8WcdhxjK vbzchDsTDMlbvV6hsSUk9LJeO5qXlyUC/BVfrfqW4Gk/re0y+429svEE79NTxl8itP9lFU VWRy2wUk7Ch2N0QSE6imgwaZjBBufflNTaHqcECLxphICaiQMLX5EKihMKwU7Asg0sCBIg 8PiomRX7Ipm12ZloqrdV33+ODng6/Kagu2PiUSSmPHke/3bbSrZXc7l+3VcTmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692912633; a=rsa-sha256; cv=none; b=fvDLloHIGs1cj365Lkaa3CYvtYbZwXlOrTWvXU3C+kAFzY90D3fuUMYloLW3WUvX5KYYPp aRa/5bbUTpdFPOmJ668lZJm9YARlyaAisR45bWnh5oObmYiezteMIJLTsQbpToDg4fY5zY GPQWP1QUecEiWwswU/gBiqetD9kdguuM9m0h92xBQYVw11m4nISI0bqMBga+iSLb3rnpuH tb1qMIJkAu6Xn9OOfEwWj/3BknOo7zLyeCG92bxdBLFEccJjiOaKvMyoTKDWuPci7heG0o SKN+fxtRnDJb7ZblLLHURsrZnaOK2Rs1Ko668iVZC3PIOs6h3g7yds+E8ECCWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWx892N9YzjkP; Thu, 24 Aug 2023 21:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OLUX6Q001144; Thu, 24 Aug 2023 21:30:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OLUXT2001140; Thu, 24 Aug 2023 21:30:33 GMT (envelope-from git) Date: Thu, 24 Aug 2023 21:30:33 GMT Message-Id: <202308242130.37OLUXT2001140@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7ea28254ec53 - main - smartpqi: update to version 4410.0.2005 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ea28254ec5376b5deb86c136e1838d0134dbb22 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7ea28254ec5376b5deb86c136e1838d0134dbb22 commit 7ea28254ec5376b5deb86c136e1838d0134dbb22 Author: John Hall AuthorDate: 2023-08-24 21:18:16 +0000 Commit: Warner Losh CommitDate: 2023-08-24 21:25:09 +0000 smartpqi: update to version 4410.0.2005 This updates the smartpqi driver to Microsemi's latest code. This will be the driver for FreeBSD 14 (with updates), but no MFC is planned. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41550 --- share/man/man4/smartpqi.4 | 59 +- sys/conf/files.amd64 | 1 + sys/dev/smartpqi/smartpqi_cam.c | 294 +++-- sys/dev/smartpqi/smartpqi_cmd.c | 14 +- sys/dev/smartpqi/smartpqi_defines.h | 523 +++++--- sys/dev/smartpqi/smartpqi_discovery.c | 1246 ++++++++++-------- sys/dev/smartpqi/smartpqi_event.c | 83 +- sys/dev/smartpqi/smartpqi_features.c | 520 ++++++++ sys/dev/smartpqi/smartpqi_helper.c | 180 +-- sys/dev/smartpqi/smartpqi_helper.h | 66 + sys/dev/smartpqi/smartpqi_includes.h | 7 +- sys/dev/smartpqi/smartpqi_init.c | 541 +++----- sys/dev/smartpqi/smartpqi_intr.c | 31 +- sys/dev/smartpqi/smartpqi_ioctl.c | 61 +- sys/dev/smartpqi/smartpqi_ioctl.h | 4 +- sys/dev/smartpqi/smartpqi_main.c | 307 ++++- sys/dev/smartpqi/smartpqi_mem.c | 10 +- sys/dev/smartpqi/smartpqi_misc.c | 140 +- sys/dev/smartpqi/smartpqi_prototypes.h | 185 +-- sys/dev/smartpqi/smartpqi_queue.c | 521 ++++---- sys/dev/smartpqi/smartpqi_request.c | 2204 +++++++++++++++++++++++++------- sys/dev/smartpqi/smartpqi_response.c | 248 +++- sys/dev/smartpqi/smartpqi_sis.c | 34 +- sys/dev/smartpqi/smartpqi_structures.h | 591 ++++++--- sys/dev/smartpqi/smartpqi_tag.c | 36 +- sys/modules/smartpqi/Makefile | 2 +- 26 files changed, 5428 insertions(+), 2480 deletions(-) diff --git a/share/man/man4/smartpqi.4 b/share/man/man4/smartpqi.4 index fbe435ca3a7f..3e61ba85cc1a 100644 --- a/share/man/man4/smartpqi.4 +++ b/share/man/man4/smartpqi.4 @@ -1,5 +1,7 @@ -.\" Copyright (c) 2018 Murthy Bhat -.\" All rights reserved. +.\" Copyright (C) 2019-2023, Microchip Technology Inc. and its subsidiaries +.\" Copyright (C) 2016-2018, Microsemi Corporation +.\" Copyright (C) 2016, PMC-Sierra, Inc. +.\" Written by John Hall .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,25 +24,23 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ stable/10/share/man/man4/smartpqi.4 195614 2017-01-11 08:10:18Z jkim $ -.Dd April 6, 2018 +.\" $Id$ +.Dd $Mdocdate$ .Dt SMARTPQI 4 .Os .Sh NAME .Nm smartpqi -.Nd Microsemi smartpqi SCSI driver for PQI controllers +.Nd "Microchip Smart Storage SCSI driver" .Sh SYNOPSIS -To compile this driver into the kernel, -place the following lines in your -kernel configuration file: +To compile this driver into the kernel, place these lines in the kernel +configuration file: .Bd -ragged -offset indent .Cd device pci .Cd device scbus .Cd device smartpqi .Ed .Pp -Alternatively, to load the driver as a -module at boot time, place the following line in +The driver can be loaded as a module at boot time by placing this line in .Xr loader.conf 5 : .Bd -literal -offset indent smartpqi_load="YES" @@ -48,36 +48,33 @@ smartpqi_load="YES" .Sh DESCRIPTION The .Nm -SCSI driver provides support for the new generation of PQI controllers from -Microsemi. -The -.Nm -driver is the first SCSI driver to implement the PQI queuing model. -.Pp -The -.Nm -driver will replace the aacraid driver for Adaptec Series 9 controllers. -.Pp -The -.Pa /dev/smartpqi? -device nodes provide access to the management interface of the controller. -One node exists per installed card. +driver provides support for Microchip Technology Inc. / Adaptec SmartRaid and +SmartHBA SATA/SAS/NVME PCIe controllers .Sh HARDWARE Controllers supported by the .Nm -driver include: +driver include, but not limited to: .Pp .Bl -bullet -compact .It HPE Gen10 Smart Array Controller Family .It -OEM Controllers based on the Microsemi Chipset +Adaptec SmartRaid and SmartHBA Controllers +.It +OEM Controllers based on the Microchip Technology Inc. SmartROC +and SmartIOC Chipsets .El .Sh FILES -.Bl -tag -width /boot/kernel/aac.ko -compact +.Bl -tag -width /boot/kernel/smartpqi.ko -compact .It Pa /dev/smartpqi? smartpqi management interface .El +.Sh NOTES +.Ss Configuration +To configure a Microchip Smart Storage controller, +refer to the User Guide for the controller, +which can be found by searching for the specific controller at +https://www.microchip.com/design-centers/storage .Sh SEE ALSO .Xr kld 4 , .Xr linux 4 , @@ -87,17 +84,13 @@ smartpqi management interface .Xr loader.conf 5 , .Xr camcontrol 8 , .Xr kldload 8 -.Rs -.%T "Microsemi Website" -.%U https://www.microsemi.com/ -.Re .Sh HISTORY The .Nm driver first appeared in .Fx 11.1 . .Sh AUTHORS -.An Murthy Bhat -.Aq murthy.bhat@microsemi.com +.An John Hall +.Aq john.hall@microchip.com .Sh BUGS The controller is not actually paused on suspend/resume. diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 5ad0447f847d..e1499b19bb12 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -372,6 +372,7 @@ dev/smartpqi/smartpqi_cam.c optional smartpqi dev/smartpqi/smartpqi_cmd.c optional smartpqi dev/smartpqi/smartpqi_discovery.c optional smartpqi dev/smartpqi/smartpqi_event.c optional smartpqi +dev/smartpqi/smartpqi_features.c optional smartpqi dev/smartpqi/smartpqi_helper.c optional smartpqi dev/smartpqi/smartpqi_init.c optional smartpqi dev/smartpqi/smartpqi_intr.c optional smartpqi diff --git a/sys/dev/smartpqi/smartpqi_cam.c b/sys/dev/smartpqi/smartpqi_cam.c index 96e1dc10729e..ffdd9fd7da79 100644 --- a/sys/dev/smartpqi/smartpqi_cam.c +++ b/sys/dev/smartpqi/smartpqi_cam.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2021 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2023 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -49,12 +49,15 @@ update_sim_properties(struct cam_sim *sim, struct ccb_pathinq *cpi) cpi->hba_misc = PIM_NOBUSRESET | PIM_UNMAPPED; cpi->hba_eng_cnt = 0; cpi->max_lun = PQI_MAX_MULTILUN; - cpi->max_target = 1088; + cpi->max_target = MAX_TARGET_DEVICES; cpi->maxio = (softs->pqi_cap.max_sg_elem - 1) * PAGE_SIZE; cpi->initiator_id = 255; - strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); - strlcpy(cpi->hba_vid, "Microsemi", HBA_IDLEN); - strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN); + strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN-1); + cpi->sim_vid[sizeof(cpi->sim_vid)-1] = '\0'; + strncpy(cpi->hba_vid, "Microsemi", HBA_IDLEN-1); + cpi->hba_vid[sizeof(cpi->hba_vid)-1] = '\0'; + strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN-1); + cpi->dev_name[sizeof(cpi->dev_name)-1] = '\0'; cpi->unit_number = cam_sim_unit(sim); cpi->bus_id = cam_sim_bus(sim); cpi->base_transfer_speed = 1200000; /* Base bus speed in KB/sec */ @@ -73,7 +76,7 @@ update_sim_properties(struct cam_sim *sim, struct ccb_pathinq *cpi) } /* - * Get transport settings of the smartpqi adapter + * Get transport settings of the smartpqi adapter. */ static void get_transport_settings(struct pqisrc_softstate *softs, @@ -84,7 +87,7 @@ get_transport_settings(struct pqisrc_softstate *softs, struct ccb_trans_settings_spi *spi = &cts->xport_specific.spi; DBG_FUNC("IN\n"); - + cts->protocol = PROTO_SCSI; cts->protocol_version = SCSI_REV_SPC4; cts->transport = XPORT_SPI; @@ -106,10 +109,12 @@ void os_add_device(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { union ccb *ccb; + uint64_t lun; DBG_FUNC("IN\n"); - if(softs->os_specific.sim_registered) { + lun = (device->is_multi_lun) ? CAM_LUN_WILDCARD : device->lun; + if(softs->os_specific.sim_registered) { if ((ccb = xpt_alloc_ccb_nowait()) == NULL) { DBG_ERR("rescan failed (can't allocate CCB)\n"); return; @@ -117,7 +122,7 @@ os_add_device(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(softs->os_specific.sim), - device->target, device->lun) != CAM_REQ_CMP) { + device->target, lun) != CAM_REQ_CMP) { DBG_ERR("rescan failed (can't create path)\n"); xpt_free_ccb(ccb); return; @@ -134,20 +139,25 @@ os_add_device(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) void os_remove_device(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { - struct cam_path *tmppath; + struct cam_path *tmppath = NULL; + uint64_t lun; DBG_FUNC("IN\n"); - + + lun = (device->is_multi_lun) ? CAM_LUN_WILDCARD : device->lun; if(softs->os_specific.sim_registered) { - if (xpt_create_path(&tmppath, NULL, + if (xpt_create_path(&tmppath, NULL, cam_sim_path(softs->os_specific.sim), - device->target, device->lun) != CAM_REQ_CMP) { - DBG_ERR("unable to create path for async event"); + device->target, lun) != CAM_REQ_CMP) { + DBG_ERR("unable to create path for async event\n"); return; } xpt_async(AC_LOST_DEVICE, tmppath, NULL); xpt_free_path(tmppath); - softs->device_list[device->target][device->lun] = NULL; + /* softs->device_list[device->target][device->lun] = NULL; */ + int index = pqisrc_find_device_list_index(softs,device); + if (index >= 0 && index < PQI_MAX_DEVICES) + softs->dev_list[index] = NULL; pqisrc_free_device(softs, device); } @@ -191,22 +201,20 @@ pqi_synch_request(rcb_t *rcb) return; if (rcb->bcount != 0 ) { - if (rcb->data_dir == SOP_DATA_DIR_FROM_DEVICE) + if ((rcb->cm_ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) bus_dmamap_sync(softs->os_specific.pqi_buffer_dmat, - rcb->cm_datamap, - BUS_DMASYNC_POSTREAD); - if (rcb->data_dir == SOP_DATA_DIR_TO_DEVICE) + rcb->cm_datamap,BUS_DMASYNC_POSTREAD); + if ((rcb->cm_ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_OUT) bus_dmamap_sync(softs->os_specific.pqi_buffer_dmat, - rcb->cm_datamap, - BUS_DMASYNC_POSTWRITE); + rcb->cm_datamap,BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(softs->os_specific.pqi_buffer_dmat, - rcb->cm_datamap); + rcb->cm_datamap); } rcb->cm_flags &= ~PQI_CMD_MAPPED; if(rcb->sgt && rcb->nseg) os_mem_free(rcb->softs, (void*)rcb->sgt, - rcb->nseg*sizeof(sgt_t)); + rcb->nseg*sizeof(sgt_t)); DBG_IO("OUT\n"); } @@ -242,6 +250,7 @@ smartpqi_fix_ld_inquiry(pqisrc_softstate_t *softs, struct ccb_scsiio *csio) cdb = (csio->ccb_h.flags & CAM_CDB_POINTER) ? (uint8_t *)csio->cdb_io.cdb_ptr : csio->cdb_io.cdb_bytes; + if(cdb[0] == INQUIRY && (cdb[1] & SI_EVPD) == 0 && (csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN && @@ -249,23 +258,31 @@ smartpqi_fix_ld_inquiry(pqisrc_softstate_t *softs, struct ccb_scsiio *csio) inq = (struct scsi_inquiry_data *)csio->data_ptr; - device = softs->device_list[csio->ccb_h.target_id][csio->ccb_h.target_lun]; + /* device = softs->device_list[csio->ccb_h.target_id][csio->ccb_h.target_lun]; */ + int target = csio->ccb_h.target_id; + int lun = csio->ccb_h.target_lun; + int index = pqisrc_find_btl_list_index(softs,softs->bus_id,target,lun); + if (index != INVALID_ELEM) + device = softs->dev_list[index]; /* Let the disks be probed and dealt with via CAM. Only for LD let it fall through and inquiry be tweaked */ - if (!device || !pqisrc_is_logical_device(device) || - (device->devtype != DISK_DEVICE) || + if( !device || !pqisrc_is_logical_device(device) || + (device->devtype != DISK_DEVICE) || pqisrc_is_external_raid_device(device)) { return; } strncpy(inq->vendor, device->vendor, - SID_VENDOR_SIZE); + SID_VENDOR_SIZE-1); + inq->vendor[sizeof(inq->vendor)-1] = '\0'; strncpy(inq->product, pqisrc_raidlevel_to_string(device->raid_level), - SID_PRODUCT_SIZE); + SID_PRODUCT_SIZE-1); + inq->product[sizeof(inq->product)-1] = '\0'; strncpy(inq->revision, device->volume_offline?"OFF":"OK", - SID_REVISION_SIZE); + SID_REVISION_SIZE-1); + inq->revision[sizeof(inq->revision)-1] = '\0'; } DBG_FUNC("OUT\n"); @@ -308,7 +325,7 @@ os_io_response_success(rcb_t *rcb) if (csio == NULL) panic("csio is null"); - rcb->status = REQUEST_SUCCESS; + rcb->status = PQI_STATUS_SUCCESS; csio->ccb_h.status = CAM_REQ_CMP; pqi_complete_scsi_io(csio, rcb); @@ -383,10 +400,11 @@ os_raid_response_error(rcb_t *rcb, raid_path_error_info_elem_t *err_info) uint8_t *sense_data = NULL; if (sense_data_len) sense_data = err_info->data; + copy_sense_data_to_csio(csio, sense_data, sense_data_len); csio->ccb_h.status = CAM_SCSI_STATUS_ERROR - | CAM_AUTOSNS_VALID - | CAM_REQ_CMP_ERR; + | CAM_AUTOSNS_VALID + | CAM_REQ_CMP_ERR; } break; @@ -425,7 +443,7 @@ os_aio_response_error(rcb_t *rcb, aio_path_error_info_elem_t *err_info) if (rcb == NULL) panic("rcb is null"); - rcb->status = REQUEST_SUCCESS; + rcb->status = PQI_STATUS_SUCCESS; csio = (struct ccb_scsiio *)&rcb->cm_ccb->csio; if (csio == NULL) panic("csio is null"); @@ -462,7 +480,7 @@ os_aio_response_error(rcb_t *rcb, aio_path_error_info_elem_t *err_info) /* Timed out TMF response comes here */ if (rcb->tm_req) { rcb->req_pending = false; - rcb->status = REQUEST_SUCCESS; + rcb->status = PQI_STATUS_SUCCESS; DBG_ERR("AIO Disabled for TMF\n"); return; } @@ -484,14 +502,14 @@ os_aio_response_error(rcb_t *rcb, aio_path_error_info_elem_t *err_info) case PQI_AIO_SERV_RESPONSE_TMF_SUCCEEDED: DBG_ERR("PQI_AIO_SERV_RESPONSE_TMF %s\n", (err_info->service_resp == PQI_AIO_SERV_RESPONSE_TMF_COMPLETE) ? "COMPLETE" : "SUCCEEDED"); - rcb->status = REQUEST_SUCCESS; + rcb->status = PQI_STATUS_SUCCESS; rcb->req_pending = false; return; case PQI_AIO_SERV_RESPONSE_TMF_REJECTED: case PQI_AIO_SERV_RESPONSE_TMF_INCORRECT_LUN: DBG_ERR("PQI_AIO_SERV_RESPONSE_TMF %s\n", (err_info->service_resp == PQI_AIO_SERV_RESPONSE_TMF_REJECTED) ? "REJECTED" : "INCORRECT LUN"); - rcb->status = REQUEST_FAILED; + rcb->status = PQI_STATUS_TIMEOUT; rcb->req_pending = false; return; default: @@ -536,8 +554,9 @@ pqi_request_map_helper(void *arg, bus_dma_segment_t *segs, int nseg, int error) pqisrc_softstate_t *softs = rcb->softs; union ccb *ccb; - if (error || nseg > softs->pqi_cap.max_sg_elem) { - DBG_ERR_BTL(rcb->dvp, "map failed err = %d or nseg(%d) > sgelem(%d)\n", + if (error || nseg > softs->pqi_cap.max_sg_elem) + { + DBG_ERR_BTL(rcb->dvp, "map failed err = %d or nseg(%d) > sgelem(%u)\n", error, nseg, softs->pqi_cap.max_sg_elem); goto error_io; } @@ -556,15 +575,15 @@ pqi_request_map_helper(void *arg, bus_dma_segment_t *segs, int nseg, int error) rcb->sgt[i].flags = 0; } - if (rcb->data_dir == SOP_DATA_DIR_FROM_DEVICE) - bus_dmamap_sync(softs->os_specific.pqi_buffer_dmat, - rcb->cm_datamap, BUS_DMASYNC_PREREAD); - if (rcb->data_dir == SOP_DATA_DIR_TO_DEVICE) - bus_dmamap_sync(softs->os_specific.pqi_buffer_dmat, - rcb->cm_datamap, BUS_DMASYNC_PREWRITE); + if ((rcb->cm_ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) + bus_dmamap_sync(softs->os_specific.pqi_buffer_dmat, + rcb->cm_datamap, BUS_DMASYNC_PREREAD); + if ((rcb->cm_ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_OUT) + bus_dmamap_sync(softs->os_specific.pqi_buffer_dmat, + rcb->cm_datamap, BUS_DMASYNC_PREWRITE); /* Call IO functions depending on pd or ld */ - rcb->status = REQUEST_PENDING; + rcb->status = PQI_STATUS_FAILURE; error = pqisrc_build_send_io(softs, rcb); @@ -607,7 +626,7 @@ pqi_map_request(rcb_t *rcb) bsd_status = bus_dmamap_load_ccb(softs->os_specific.pqi_buffer_dmat, rcb->cm_datamap, ccb, pqi_request_map_helper, rcb, 0); if (bsd_status != BSD_SUCCESS && bsd_status != EINPROGRESS) { - DBG_ERR_BTL(rcb->dvp, "bus_dmamap_load_ccb failed, return status = %d transfer length = %d\n", + DBG_ERR_BTL(rcb->dvp, "bus_dmamap_load_ccb failed, return status = %d transfer length = %u\n", bsd_status, rcb->bcount); return bsd_status; } @@ -618,7 +637,7 @@ pqi_map_request(rcb_t *rcb) * busdma. */ /* Call IO functions depending on pd or ld */ - rcb->status = REQUEST_PENDING; + rcb->status = PQI_STATUS_FAILURE; if (pqisrc_build_send_io(softs, rcb) != PQI_STATUS_SUCCESS) { bsd_status = EIO; @@ -695,7 +714,7 @@ smartpqi_lun_rescan(struct pqisrc_softstate *softs, int target, return; } - bzero(ccb, sizeof(union ccb)); + memset(ccb, 0, sizeof(union ccb)); xpt_setup_ccb(&ccb->ccb_h, path, 5); ccb->ccb_h.func_code = XPT_SCAN_LUN; ccb->ccb_h.cbfcnp = smartpqi_lunrescan_cb; @@ -712,15 +731,17 @@ smartpqi_lun_rescan(struct pqisrc_softstate *softs, int target, void smartpqi_target_rescan(struct pqisrc_softstate *softs) { - int target = 0, lun = 0; + pqi_scsi_dev_t *device; + int index; DBG_FUNC("IN\n"); - for(target = 0; target < PQI_MAX_DEVICES; target++){ - for(lun = 0; lun < PQI_MAX_MULTILUN; lun++){ - if(softs->device_list[target][lun]){ - smartpqi_lun_rescan(softs, target, lun); - } + for(index = 0; index < PQI_MAX_DEVICES; index++){ + /* if(softs->device_list[target][lun]){ */ + if(softs->dev_list[index] != NULL) { + device = softs->dev_list[index]; + DBG_INFO("calling smartpqi_lun_rescan with TL = %d:%d\n",device->target,device->lun); + smartpqi_lun_rescan(softs, device->target, device->lun); } } @@ -758,7 +779,7 @@ void os_complete_outstanding_cmds_nodevice(pqisrc_softstate_t *softs) { int tag = 0; - pqi_scsi_dev_t *dvp = NULL; + pqi_scsi_dev_t *dvp = NULL; DBG_FUNC("IN\n"); @@ -771,7 +792,6 @@ os_complete_outstanding_cmds_nodevice(pqisrc_softstate_t *softs) pqi_complete_scsi_io(&prcb->cm_ccb->csio, prcb); if (dvp) pqisrc_decrement_device_active_io(softs, dvp); - } } @@ -785,21 +805,36 @@ static int pqisrc_io_start(struct cam_sim *sim, union ccb *ccb) { rcb_t *rcb; - uint32_t tag, no_transfer = 0; + uint32_t tag; pqisrc_softstate_t *softs = (struct pqisrc_softstate *) cam_sim_softc(sim); int32_t error; pqi_scsi_dev_t *dvp; + int target, lun, index; DBG_FUNC("IN\n"); - if (softs->device_list[ccb->ccb_h.target_id][ccb->ccb_h.target_lun] == NULL) { + /* if( softs->device_list[ccb->ccb_h.target_id][ccb->ccb_h.target_lun] == NULL ) { */ + target = ccb->ccb_h.target_id; + lun = ccb->ccb_h.target_lun; + index = pqisrc_find_btl_list_index(softs,softs->bus_id,target,lun); + + if (index == INVALID_ELEM) { + ccb->ccb_h.status = CAM_DEV_NOT_THERE; + DBG_INFO("Invalid index/device!!!, Device BTL %u:%d:%d\n", softs->bus_id, target, lun); + return ENXIO; + } + + if( softs->dev_list[index] == NULL ) { ccb->ccb_h.status = CAM_DEV_NOT_THERE; DBG_INFO("Device = %d not there\n", ccb->ccb_h.target_id); return ENXIO; } - dvp = softs->device_list[ccb->ccb_h.target_id][ccb->ccb_h.target_lun]; + /* DBG_INFO("starting IO on BTL = %d:%d:%d index = %d\n",softs->bus_id,target,lun,index); */ + + /* dvp = softs->device_list[ccb->ccb_h.target_id][ccb->ccb_h.target_lun]; */ + dvp = softs->dev_list[index]; /* Check controller state */ if (IN_PQI_RESET(softs)) { ccb->ccb_h.status = CAM_SCSI_BUS_RESET @@ -827,7 +862,7 @@ pqisrc_io_start(struct cam_sim *sim, union ccb *ccb) } tag = pqisrc_get_tag(&softs->taglist); - if (tag == INVALID_ELEM) { + if( tag == INVALID_ELEM ) { DBG_ERR("Get Tag failed\n"); xpt_freeze_simq(softs->os_specific.sim, 1); softs->os_specific.pqi_flags |= PQI_FLAG_BUSY; @@ -835,7 +870,7 @@ pqisrc_io_start(struct cam_sim *sim, union ccb *ccb) return EIO; } - DBG_IO("tag = %d &softs->taglist : %p\n", tag, &softs->taglist); + DBG_IO("tag = %u &softs->taglist : %p\n", tag, &softs->taglist); rcb = &softs->rcb[tag]; os_reset_rcb(rcb); @@ -844,30 +879,13 @@ pqisrc_io_start(struct cam_sim *sim, union ccb *ccb) rcb->cmdlen = ccb->csio.cdb_len; ccb->ccb_h.sim_priv.entries[0].ptr = rcb; - switch (ccb->ccb_h.flags & CAM_DIR_MASK) { - case CAM_DIR_IN: - rcb->data_dir = SOP_DATA_DIR_FROM_DEVICE; - break; - case CAM_DIR_OUT: - rcb->data_dir = SOP_DATA_DIR_TO_DEVICE; - break; - case CAM_DIR_NONE: - no_transfer = 1; - break; - default: - DBG_ERR("Unknown Dir\n"); - break; - } rcb->cm_ccb = ccb; - rcb->dvp = softs->device_list[ccb->ccb_h.target_id][ccb->ccb_h.target_lun]; + /* rcb->dvp = softs->device_list[ccb->ccb_h.target_id][ccb->ccb_h.target_lun]; */ + rcb->dvp = softs->dev_list[index]; + + rcb->cm_data = (void *)ccb->csio.data_ptr; + rcb->bcount = ccb->csio.dxfer_len; - if (!no_transfer) { - rcb->cm_data = (void *)ccb->csio.data_ptr; - rcb->bcount = ccb->csio.dxfer_len; - } else { - rcb->cm_data = NULL; - rcb->bcount = 0; - } /* * Submit the request to the adapter. * @@ -900,7 +918,7 @@ static inline int pqi_tmf_status_to_bsd_tmf_status(int pqi_status, rcb_t *rcb) { if (PQI_STATUS_SUCCESS == pqi_status && - REQUEST_SUCCESS == rcb->status) + PQI_STATUS_SUCCESS == rcb->status) return BSD_SUCCESS; else return EIO; @@ -912,8 +930,8 @@ pqi_tmf_status_to_bsd_tmf_status(int pqi_status, rcb_t *rcb) static int pqisrc_scsi_abort_task(pqisrc_softstate_t *softs, union ccb *ccb) { - struct ccb_hdr *ccb_h = &ccb->ccb_h; rcb_t *rcb = NULL; + struct ccb_hdr *ccb_h = &ccb->ccb_h; rcb_t *prcb = ccb->ccb_h.sim_priv.entries[0].ptr; uint32_t tag; int rval; @@ -924,7 +942,7 @@ pqisrc_scsi_abort_task(pqisrc_softstate_t *softs, union ccb *ccb) rcb = &softs->rcb[tag]; rcb->tag = tag; - if (!rcb->dvp) { + if (rcb->dvp == NULL) { DBG_ERR("dvp is null, tmf type : 0x%x\n", ccb_h->func_code); rval = ENXIO; goto error_tmf; @@ -963,8 +981,9 @@ pqisrc_scsi_abort_task_set(pqisrc_softstate_t *softs, union ccb *ccb) tag = pqisrc_get_tag(&softs->taglist); rcb = &softs->rcb[tag]; rcb->tag = tag; + rcb->cm_ccb = ccb; - if (!rcb->dvp) { + if (rcb->dvp == NULL) { DBG_ERR("dvp is null, tmf type : 0x%x\n", ccb_h->func_code); rval = ENXIO; goto error_tmf; @@ -992,24 +1011,38 @@ error_tmf: static int pqisrc_target_reset( pqisrc_softstate_t *softs, union ccb *ccb) { + + /* pqi_scsi_dev_t *devp = softs->device_list[ccb->ccb_h.target_id][ccb->ccb_h.target_lun]; */ struct ccb_hdr *ccb_h = &ccb->ccb_h; - pqi_scsi_dev_t *devp = softs->device_list[ccb->ccb_h.target_id][ccb->ccb_h.target_lun]; rcb_t *rcb = NULL; uint32_t tag; int rval; + int bus, target, lun; + int index; + DBG_FUNC("IN\n"); + bus = softs->bus_id; + target = ccb->ccb_h.target_id; + lun = ccb->ccb_h.target_lun; + + index = pqisrc_find_btl_list_index(softs,bus,target,lun); + if (index == INVALID_ELEM) { + DBG_ERR("device not found at BTL %d:%d:%d\n",bus,target,lun); + return (-1); + } + + pqi_scsi_dev_t *devp = softs->dev_list[index]; if (devp == NULL) { DBG_ERR("bad target %d, tmf type : 0x%x\n", ccb_h->target_id, ccb_h->func_code); - return ENXIO; + return (-1); } tag = pqisrc_get_tag(&softs->taglist); rcb = &softs->rcb[tag]; rcb->tag = tag; - - devp->reset_in_progress = true; + rcb->cm_ccb = ccb; rcb->tm_req = true; @@ -1017,6 +1050,7 @@ pqisrc_target_reset( pqisrc_softstate_t *softs, union ccb *ccb) SOP_TASK_MANAGEMENT_LUN_RESET); rval = pqi_tmf_status_to_bsd_tmf_status(rval, rcb); + devp->reset_in_progress = false; os_reset_rcb(rcb); @@ -1137,9 +1171,9 @@ smartpqi_adjust_queue_depth(struct cam_path *path, uint32_t queue_depth) { struct ccb_relsim crs; - DBG_INFO("IN\n"); + DBG_FUNC("IN\n"); - memset(&crs, 0, sizeof(crs)); + memset(&crs, 0, sizeof(struct ccb_relsim)); xpt_setup_ccb(&crs.ccb_h, path, 5); crs.ccb_h.func_code = XPT_REL_SIMQ; crs.ccb_h.flags = CAM_DEV_QFREEZE; @@ -1150,7 +1184,7 @@ smartpqi_adjust_queue_depth(struct cam_path *path, uint32_t queue_depth) printf("XPT_REL_SIMQ failed stat=%d\n", crs.ccb_h.status); } - DBG_INFO("OUT\n"); + DBG_FUNC("OUT\n"); } /* @@ -1175,15 +1209,20 @@ smartpqi_async(void *callback_arg, u_int32_t code, } uint32_t t_id = cgd->ccb_h.target_id; - if (t_id <= (PQI_CTLR_INDEX - 1)) { + /* if (t_id <= (PQI_CTLR_INDEX - 1)) { */ + if (t_id >= PQI_CTLR_INDEX) { if (softs != NULL) { - pqi_scsi_dev_t *dvp = softs->device_list[t_id][cgd->ccb_h.target_lun]; - if (dvp == NULL) { - DBG_ERR("Target is null, target id=%d\n", t_id); - break; + /* pqi_scsi_dev_t *dvp = softs->device_list[t_id][cgd->ccb_h.target_lun]; */ + int lun = cgd->ccb_h.target_lun; + int index = pqisrc_find_btl_list_index(softs,softs->bus_id,t_id,lun); + if (index != INVALID_ELEM) { + pqi_scsi_dev_t *dvp = softs->dev_list[index]; + if (dvp == NULL) { + DBG_ERR("Target is null, target id=%u\n", t_id); + break; + } + smartpqi_adjust_queue_depth(path, dvp->queue_depth); } - smartpqi_adjust_queue_depth(path, - dvp->queue_depth); } } break; @@ -1203,7 +1242,7 @@ register_sim(struct pqisrc_softstate *softs, int card_index) { int max_transactions; union ccb *ccb = NULL; - int error; + cam_status status = 0; struct ccb_setasync csa; struct cam_sim *sim; @@ -1230,9 +1269,9 @@ register_sim(struct pqisrc_softstate *softs, int card_index) softs->os_specific.sim = sim; mtx_lock(&softs->os_specific.cam_lock); - error = xpt_bus_register(sim, softs->os_specific.pqi_dev, 0); - if (error != CAM_SUCCESS) { - DBG_ERR("xpt_bus_register failed errno %d\n", error); + status = xpt_bus_register(sim, softs->os_specific.pqi_dev, 0); + if (status != CAM_SUCCESS) { + DBG_ERR("xpt_bus_register failed status=%d\n", status); cam_sim_free(softs->os_specific.sim, FALSE); cam_simq_free(softs->os_specific.devq); mtx_unlock(&softs->os_specific.cam_lock); @@ -1258,11 +1297,11 @@ register_sim(struct pqisrc_softstate *softs, int card_index) return ENXIO; } /* - * Callback to set the queue depth per target which is + * Callback to set the queue depth per target which is * derived from the FW. - */ + */ softs->os_specific.path = ccb->ccb_h.path; - memset(&csa, 0, sizeof(csa)); + memset(&csa, 0, sizeof(struct ccb_setasync)); xpt_setup_ccb(&csa.ccb_h, softs->os_specific.path, 5); csa.ccb_h.func_code = XPT_SASYNC_CB; csa.event_enable = AC_FOUND_DEVICE; @@ -1270,12 +1309,12 @@ register_sim(struct pqisrc_softstate *softs, int card_index) csa.callback_arg = softs; xpt_action((union ccb *)&csa); if (csa.ccb_h.status != CAM_REQ_CMP) { - DBG_ERR("Unable to register smartpqi_aysnc handler: %d!\n", + DBG_ERR("Unable to register smartpqi_aysnc handler: %d!\n", csa.ccb_h.status); } mtx_unlock(&softs->os_specific.cam_lock); - DBG_INFO("OUT\n"); + DBG_FUNC("OUT\n"); return BSD_SUCCESS; } @@ -1287,15 +1326,14 @@ void deregister_sim(struct pqisrc_softstate *softs) { struct ccb_setasync csa; - + DBG_FUNC("IN\n"); if (softs->os_specific.mtx_init) { mtx_lock(&softs->os_specific.cam_lock); } - - memset(&csa, 0, sizeof(csa)); + memset(&csa, 0, sizeof(struct ccb_setasync)); xpt_setup_ccb(&csa.ccb_h, softs->os_specific.path, 5); csa.ccb_h.func_code = XPT_SASYNC_CB; csa.event_enable = 0; @@ -1331,23 +1369,23 @@ deregister_sim(struct pqisrc_softstate *softs) void os_rescan_target(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { - struct cam_path *tmppath; + struct cam_path *tmppath = NULL; - DBG_FUNC("IN\n"); + DBG_FUNC("IN\n"); - if(softs->os_specific.sim_registered) { - if (xpt_create_path(&tmppath, NULL, - cam_sim_path(softs->os_specific.sim), - device->target, device->lun) != CAM_REQ_CMP) { - DBG_ERR("unable to create path for async event!!! Bus: %d Target: %d Lun: %d\n", - device->bus, device->target, device->lun); - return; - } - xpt_async(AC_INQ_CHANGED, tmppath, NULL); - xpt_free_path(tmppath); - } + if(softs->os_specific.sim_registered) { + if (xpt_create_path(&tmppath, NULL, + cam_sim_path(softs->os_specific.sim), + device->target, device->lun) != CAM_REQ_CMP) { + DBG_ERR("unable to create path for async event!!! Bus: %d Target: %d Lun: %d\n", + device->bus, device->target, device->lun); + return; + } + xpt_async(AC_INQ_CHANGED, tmppath, NULL); + xpt_free_path(tmppath); + } - device->scsi_rescan = false; + device->scsi_rescan = false; - DBG_FUNC("OUT\n"); + DBG_FUNC("OUT\n"); } diff --git a/sys/dev/smartpqi/smartpqi_cmd.c b/sys/dev/smartpqi/smartpqi_cmd.c index f5820647fed4..8486ac12df79 100644 --- a/sys/dev/smartpqi/smartpqi_cmd.c +++ b/sys/dev/smartpqi/smartpqi_cmd.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2021 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2023 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -36,10 +36,14 @@ pqisrc_submit_cmnd(pqisrc_softstate_t *softs, ib_queue_t *ib_q, void *req) char *slot = NULL; uint32_t offset; iu_header_t *hdr = (iu_header_t *)req; + /*TODO : Can be fixed a size copying of IU ? */ uint32_t iu_len = hdr->iu_length + 4 ; /* header size */ int i = 0; DBG_FUNC("IN\n"); + /* The code below assumes we only take 1 element (no spanning) */ + ASSERT(iu_len <= ib_q->elem_size); + PQI_LOCK(&ib_q->lock); /* Check queue full */ @@ -55,15 +59,15 @@ pqisrc_submit_cmnd(pqisrc_softstate_t *softs, ib_queue_t *ib_q, void *req) /* Copy the IU */ memcpy(slot, req, iu_len); - DBG_INFO("IU : \n"); + DBG_IO("IU : \n"); for(i = 0; i< iu_len; i++) - DBG_INFO(" IU [ %d ] : %x\n", i, *((unsigned char *)(slot + i))); + DBG_IO(" IU [ %d ] : %x\n", i, *((unsigned char *)(slot + i))); /* Update the local PI */ ib_q->pi_local = (ib_q->pi_local + 1) % ib_q->num_elem; - DBG_INFO("ib_q->pi_local : %x IU size : %d\n", + DBG_IO("ib_q->pi_local : %x IU size : %d\n", ib_q->pi_local, hdr->iu_length); - DBG_INFO("*ib_q->ci_virt_addr: %x\n", + DBG_IO("*ib_q->ci_virt_addr: %x\n", *(ib_q->ci_virt_addr)); /* Inform the fw about the new IU */ diff --git a/sys/dev/smartpqi/smartpqi_defines.h b/sys/dev/smartpqi/smartpqi_defines.h index 20a9fc841140..bb0bb2b709aa 100644 --- a/sys/dev/smartpqi/smartpqi_defines.h +++ b/sys/dev/smartpqi/smartpqi_defines.h @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2021 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2023 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,34 +27,65 @@ #ifndef _PQI_DEFINES_H #define _PQI_DEFINES_H -#define PQI_STATUS_FAILURE -1 -#define PQI_STATUS_TIMEOUT -2 -#define PQI_STATUS_QFULL -3 -#define PQI_STATUS_SUCCESS 0 +#define SIS_POLL_WAIT +#define DEVICE_HINT + +#ifndef CT_ASSERT +/* If the OS hasn't specified a preferred compile time assert, create one */ +#if !defined(__C_ASSERT__) + #define CT_ASSERT(e) extern char __assert_test_case[1 - (2*(!(e)))] +#else + #define CT_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1] +#endif +#endif +#define PQI_STATUS_FAILURE -1 +#define PQI_STATUS_TIMEOUT -2 +#define PQI_STATUS_QFULL -3 +#define PQI_STATUS_SUCCESS 0 + +#define BITS_PER_BYTE 8 +#define PQI_VENDOR_GENERAL_CONFIG_TABLE_UPDATE 0 +#define PQI_VENDOR_GENERAL_HOST_MEMORY_UPDATE 1 +#define PQI_REQUEST_HEADER_LENGTH 4 /* Maximum timeout for internal command completion */ -#define TIMEOUT_INFINITE ((uint32_t) (-1)) -#define PQISRC_CMD_TIMEOUT TIMEOUT_INFINITE +#define TIMEOUT_INFINITE ((uint32_t) (-1)) +#define PQISRC_CMD_TIMEOUT TIMEOUT_INFINITE #define PQISRC_PASSTHROUGH_CMD_TIMEOUT PQISRC_CMD_TIMEOUT /* Delay in milli seconds */ -#define PQISRC_TMF_TIMEOUT (OS_TMF_TIMEOUT_SEC * 1000) +#define PQISRC_TMF_TIMEOUT (OS_TMF_TIMEOUT_SEC * 1000) /* Delay in micro seconds */ -#define PQISRC_PENDING_IO_TIMEOUT_USEC 30000000 /* 30 seconds */ +#define PQISRC_PENDING_IO_TIMEOUT_USEC 30000000 /* 30 seconds */ /* If want to disable atomic operations on device active io, then set to zero */ -#define PQISRC_DEVICE_IO_COUNTER 1 +#define PQISRC_DEVICE_IO_COUNTER 1 + +/* #define SHARE_EVENT_QUEUE_FOR_IO 1 */ -#define INVALID_ELEM 0xffff +#define INVALID_ELEM 0xffff #ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) +#define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif #ifndef MAX -#define MAX(a,b) ((a) > (b) ? (a) : (b)) +#define MAX(a,b) ((a) > (b) ? (a) : (b)) +#endif + +/* defines for stream detection */ +#define TICKS ticks + +#ifndef INT_MAX +#define INT_MAX 0x7FFFFFFF #endif -#define PQISRC_ROUNDUP(x, y) (((x) + (y) - 1) / (y) * (y)) -#define PQISRC_DIV_ROUND_UP(x, y) (((x) + (y) - 1) / (y)) +#define PQISRC_ROUND_UP(x, y) (((x) + (y) - 1) / (y) * (y)) +#define PQISRC_ROUND_DOWN(x, y) (((x) / (y)) * (y)) +#define PQISRC_DIV_ROUND_UP(x, y) (((x) + (y) - 1) / (y)) *** 10834 LINES SKIPPED *** From nobody Thu Aug 24 21:51: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 4RWxc12nHVz4rcpB; Thu, 24 Aug 2023 21:51: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 4RWxc12LHYz3XZD; Thu, 24 Aug 2023 21:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692913873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpaSfCuaNkwK3rFQH/SGVzPjwgljXFZj/sDUg4efAYU=; b=N2S11iF/iztANJbmq2/xI8xC7Bk00KF880VtxPwxjK6w9FCgwWoMBXcTRDgKRnJzD2aOuB mSj82rAkVDpQ3cif7hPraXmbPHltZ6kyIfKZ0Lrocsa0Di5V4Fb++yHoUlTibrB+7sMKUu ivFKc7e6IIiapXHPxqua80YdvhQ9e364Gdg4kIk6RLrF0xqLwv+O+dyT8xjYvAe3PiTlt5 fvCqsYBPhtdLJSxGgUZ9Qpc6oXMcz1ZCJB04zFEZ6nAg5RpPMpgSCXE6EgalQKQx6apMFw jpk96kucWcN97BT8KvJnQKFs/ivleOAd4cHsNTdHsASY8Ekfwwuxm9TA5hUNyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692913873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpaSfCuaNkwK3rFQH/SGVzPjwgljXFZj/sDUg4efAYU=; b=bTIrTQ5y9yinAAsovUOc9+1VbAkO5xhtRvuRsY7exGJop5467r8NuQH18pB/U1HfRwwJgU F1VAAzfhrtEn0/FoLu3zCZrjRpxLhHf8mQL2l+sx9eSUmZZ7Vx5ahYjM3eqFWwKTDxErRE 8cM130f7ilEfxE7z+IMBFowdoa86WBE8LHdC7z9vapYT1Cde8FRiTGkABNDEsU9bysjmbp mxyxXVAjTp/+0U1aYvQ1S22yyesYNntRDMz90nHWweZhVgHGM4djYA+5BZf0/f+AkwgotT rTCIZkkC7lY3Muu2KsZeePoYPKEJof3j+X6VYuygHBye2FfKebp7jkcM/KEURA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692913873; a=rsa-sha256; cv=none; b=m4PsCacWFH78WnjUJfCS20m+dGyW1AiELnaG0NKbSMSLXN6uo6ODm+rmrOAgpNiRmil6Xw tUZ7dr3tw6EqXmJog2m3LUHiMtaKQPn1wwh6SCyAzDhznHVsGlbYo7s/qQ5uTVo65Usqv5 M2oG6BLoWvZHflkOjBYrZfqPDJP0RtyDhzEQZBf+DxpchovGavW3ycMMZKDM6JmQa+yGfE JFYYEKxa/JQbnhQ8QXzt7f2tZNvD/QSOlyIigXujOGqhoNlxiSvySgx5tK7m8sFRbdZqrV 5Tg2At5xr98+Am2aSieYn4hmYBiPzDy/wNWhbcBsNwyAfiYXm0sWELQFmw/yGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWxc11P73zjvs; Thu, 24 Aug 2023 21:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OLpDXY037389; Thu, 24 Aug 2023 21:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OLpDEn037386; Thu, 24 Aug 2023 21:51:13 GMT (envelope-from git) Date: Thu, 24 Aug 2023 21:51:13 GMT Message-Id: <202308242151.37OLpDEn037386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b8b6bef43f87 - main - libc: Fix parsing of hexadecimal numbers in strtol() 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8b6bef43f876a0a0b8c0b4ae65135bcab4c7aa6 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b8b6bef43f876a0a0b8c0b4ae65135bcab4c7aa6 commit b8b6bef43f876a0a0b8c0b4ae65135bcab4c7aa6 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-24 21:31:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-24 21:31:54 +0000 libc: Fix parsing of hexadecimal numbers in strtol() family. This had previously been partly fixed in 2571c7f7200f. MFC after: 1 week Reviewed by: imp, allanjude, emaste Differential Revision: https://reviews.freebsd.org/D41510 --- lib/libc/iconv/_strtol.h | 5 ++++- lib/libc/iconv/_strtoul.h | 5 ++++- lib/libc/locale/wcstoimax.c | 5 ++++- lib/libc/locale/wcstol.c | 7 +++++-- lib/libc/locale/wcstoll.c | 5 ++++- lib/libc/locale/wcstoul.c | 5 ++++- lib/libc/locale/wcstoull.c | 5 ++++- lib/libc/locale/wcstoumax.c | 5 ++++- 8 files changed, 33 insertions(+), 9 deletions(-) diff --git a/lib/libc/iconv/_strtol.h b/lib/libc/iconv/_strtol.h index 786ae2efbaa9..d183edbe8c3a 100644 --- a/lib/libc/iconv/_strtol.h +++ b/lib/libc/iconv/_strtol.h @@ -83,7 +83,10 @@ _FUNCNAME(const char *nptr, char **endptr, int base) c = *s++; } if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X')) { + c == '0' && (*s == 'x' || *s == 'X') && + ((s[1] >= '0' && s[1] <= '9') || + (s[1] >= 'A' && s[1] <= 'F') || + (s[1] >= 'a' && s[1] <= 'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/iconv/_strtoul.h b/lib/libc/iconv/_strtoul.h index 2d5c7776b0e3..eade72e9c2e6 100644 --- a/lib/libc/iconv/_strtoul.h +++ b/lib/libc/iconv/_strtoul.h @@ -79,7 +79,10 @@ _FUNCNAME(const char *nptr, char **endptr, int base) c = *s++; } if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X')) { + c == '0' && (*s == 'x' || *s == 'X') && + ((s[1] >= '0' && s[1] <= '9') || + (s[1] >= 'A' && s[1] <= 'F') || + (s[1] >= 'a' && s[1] <= 'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoimax.c b/lib/libc/locale/wcstoimax.c index 6447fe6dccfd..259faa2b011c 100644 --- a/lib/libc/locale/wcstoimax.c +++ b/lib/libc/locale/wcstoimax.c @@ -78,7 +78,10 @@ wcstoimax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstol.c b/lib/libc/locale/wcstol.c index 183fb00bc507..b0b787384f39 100644 --- a/lib/libc/locale/wcstol.c +++ b/lib/libc/locale/wcstol.c @@ -63,7 +63,7 @@ wcstol_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int do { c = *s++; } while (iswspace_l(c, locale)); - if (c == '-') { + if (c == L'-') { neg = 1; c = *s++; } else { @@ -72,7 +72,10 @@ wcstol_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoll.c b/lib/libc/locale/wcstoll.c index 5e42d878e1c8..ac07d6c6adbf 100644 --- a/lib/libc/locale/wcstoll.c +++ b/lib/libc/locale/wcstoll.c @@ -78,7 +78,10 @@ wcstoll_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoul.c b/lib/libc/locale/wcstoul.c index d097c20db40a..9f58db799c0e 100644 --- a/lib/libc/locale/wcstoul.c +++ b/lib/libc/locale/wcstoul.c @@ -72,7 +72,10 @@ wcstoul_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoull.c b/lib/libc/locale/wcstoull.c index 5f8e8367308b..cbc7253f884d 100644 --- a/lib/libc/locale/wcstoull.c +++ b/lib/libc/locale/wcstoull.c @@ -78,7 +78,10 @@ wcstoull_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoumax.c b/lib/libc/locale/wcstoumax.c index ad9e9c334186..4380cccf2424 100644 --- a/lib/libc/locale/wcstoumax.c +++ b/lib/libc/locale/wcstoumax.c @@ -78,7 +78,10 @@ wcstoumax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; From nobody Thu Aug 24 21:51: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 4RWxc23kbYz4rcxS; Thu, 24 Aug 2023 21:51: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 4RWxc23H2kz3XGL; Thu, 24 Aug 2023 21:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692913874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l9DDv7qNK0gmUv5d+C9kbJiTZwQNRoBelFOQNSCm6K4=; b=Rn3ZVoKLdedPSisEgLoeCATgqm7OennXYNT2ozsAbY+6tixLqqI+WKlK/sH41BrB5fWzMG DPWD6QZIBdOs/g94fLuhEtHifnwniZCyqeuaZBp9ltDffmiSv8kNENGdrj+cAFEAF1J4FC 0pDNp9J5PS/Sdm6JzitmEsnlHfeqB6eTReMslkWwkXIUvaz1Op7HSClfSDOR3HhZgur1Mc fljNrbVovG7Ezk5go6TjKNG+xGw6V3wR+W9gl3dgGLr/xsgHMkGJLTerBU9NpaHGWEaW0A 6+maoFmzYtmk5+gp3bdooZONLSoUztK0omG/apjattmfZ/mdaQD4Nh3ziPSc9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692913874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l9DDv7qNK0gmUv5d+C9kbJiTZwQNRoBelFOQNSCm6K4=; b=fmJrDd3ANDl44nkxj/VkwN9FC/RKwi/NQCxMEKdbOWyEUteGBAxIb4Umw1/L9mYwCnjSz3 13CtGqMBMnmE2MLXAFmBOYEehNWYXis+4Cg76vgrxhB89poY0bptlX9lBJD7c+z/AgrWTA Mnq3llit4ymAfH2rXFluAC2wuFHZCBI22/7Q/Y/PUp0ycy0GKCixef/ZD+UUB/5cxV6HPL X0CWSUWqh1sGHsx3S0Ohvsc0h3jhGbd3pMWsdNrftbGdU3m6QPeSG0mW1RmhCfLkU10KHv T321ngXX0CDcivmtwSCkUgQCHvD21K7lreT144/Cyb13+6Wo1vDliJcL2BNX7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692913874; a=rsa-sha256; cv=none; b=HB69Km/uxLnti+Oi21OAghmEiqRs/gH7S3yDb+aD5zca1I+m7K2P94kNzKZXlw9KBNh2/6 LIrcfAAn75Z/4fSZOCXJyqiEuVv2uzqqoT0d3iy1roin82NRBaQphKTpuG5fS6u51UuNRa 5aoAx9U+OPPQnJ4nAEv9uuRoyPBMuJF8VBZKvPK/OlskDLLZknJLtpTK5heajoIsJwZQpJ lJ0xupwPaWFGM3mYZyd5nLOt37cytLS3GX5/HNmmOFEEgrL5gK83L16dSrthdPKbCDp3wt +w8hKsbCfZKOHHzRKtdoxvYYE4xvD6HsSkhsHZ4J2tB6m8u9gUxE67N+u3ilkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWxc22LwLzk0Y; Thu, 24 Aug 2023 21:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OLpEno037440; Thu, 24 Aug 2023 21:51:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OLpEW0037437; Thu, 24 Aug 2023 21:51:14 GMT (envelope-from git) Date: Thu, 24 Aug 2023 21:51:14 GMT Message-Id: <202308242151.37OLpEW0037437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9b5d724cad10 - main - libc: Add timespec_getres(3) as per C23. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b5d724cad10087e34165199e55f15f2df744ed5 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9b5d724cad10087e34165199e55f15f2df744ed5 commit 9b5d724cad10087e34165199e55f15f2df744ed5 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-24 21:31:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-24 21:31:54 +0000 libc: Add timespec_getres(3) as per C23. This also adds support for TIME_MONOTONIC to timespec_get(3). Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D41524 --- include/time.h | 8 ++++++- lib/libc/gen/Makefile.inc | 2 ++ lib/libc/gen/timespec_get.3 | 17 ++++++++++++-- lib/libc/gen/timespec_get.c | 4 ++++ lib/libc/gen/timespec_getres.3 | 51 ++++++++++++++++++++++++++++++++++++++++++ lib/libc/gen/timespec_getres.c | 24 ++++++++++++++++++++ 6 files changed, 103 insertions(+), 3 deletions(-) diff --git a/include/time.h b/include/time.h index c6c083316423..ef55577a2f84 100644 --- a/include/time.h +++ b/include/time.h @@ -182,9 +182,15 @@ time_t posix2time(time_t t); #if defined(__BSD_VISIBLE) || __ISO_C_VISIBLE >= 2011 || \ (defined(__cplusplus) && __cplusplus >= 201703) #include -/* ISO/IEC 9899:201x 7.27.2.5 The timespec_get function */ +/* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */ #define TIME_UTC 1 /* time elapsed since epoch */ int timespec_get(struct timespec *ts, int base); +#if defined (__BSD_VISIBLE) || __ISO_C_VISIBLE >= 2023 +/* ISO/IEC 9899:2024 7.29.1 Components of time */ +#define TIME_MONOTONIC 2 /* monotonic time */ +/* ISO/IEC 9899:2024 7.29.2.7 The timespec_getres function */ +int timespec_getres(struct timespec *, int); +#endif #endif __END_DECLS diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 34de0e9ddeb0..655843f03715 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -156,6 +156,7 @@ SRCS+= __getosreldate.c \ time.c \ times.c \ timespec_get.c \ + timespec_getres.c \ timezone.c \ tls.c \ ttyname.c \ @@ -319,6 +320,7 @@ MAN+= alarm.3 \ time.3 \ times.3 \ timespec_get.3 \ + timespec_getres.3 \ timezone.3 \ ttyname.3 \ tzset.3 \ diff --git a/lib/libc/gen/timespec_get.3 b/lib/libc/gen/timespec_get.3 index 00d1a7c684c4..7edf4fe17c30 100644 --- a/lib/libc/gen/timespec_get.3 +++ b/lib/libc/gen/timespec_get.3 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 10, 2018 +.Dd August 21, 2023 .Dt TIMESPEC_GET 3 .Os .Sh NAME @@ -55,6 +55,14 @@ In .Fx , this corresponds to .Dv CLOCK_REALTIME . +.Pp +The base +.Dv TIME_MONOTONIC +returns a monotonically-increasing time since an unspecified point in the past. +In +.Fx , +this corresponds to +.Dv CLOCK_MONOTONIC . .Sh RETURN VALUES The .Nm @@ -66,7 +74,8 @@ on failure. .Sh SEE ALSO .Xr clock_gettime 2 , .Xr gettimeofday 2 , -.Xr time 3 +.Xr time 3 , +.Xr timespec_getres 3 .Sh STANDARDS The .Nm @@ -76,6 +85,10 @@ of .Dv TIME_UTC conforms to .St -isoC-2011 . +.\" The +.\" .Dv TIME_MONOTONIC +.\" base conforms to +.\" -isoC-2023 . .Sh HISTORY This interface first appeared in .Fx 12 . diff --git a/lib/libc/gen/timespec_get.c b/lib/libc/gen/timespec_get.c index bcf392cbfa44..96845d545048 100644 --- a/lib/libc/gen/timespec_get.c +++ b/lib/libc/gen/timespec_get.c @@ -44,6 +44,10 @@ timespec_get(struct timespec *ts, int base) if (clock_gettime(CLOCK_REALTIME, ts) == -1) return 0; break; + case TIME_MONOTONIC: + if (clock_gettime(CLOCK_MONOTONIC, ts) == -1) + return 0; + break; default: return 0; } diff --git a/lib/libc/gen/timespec_getres.3 b/lib/libc/gen/timespec_getres.3 new file mode 100644 index 000000000000..e00af6758f1a --- /dev/null +++ b/lib/libc/gen/timespec_getres.3 @@ -0,0 +1,51 @@ +.\"- +.\" Copyright (c) 2023 Dag-Erling Smørgrav +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd August 21, 2023 +.Dt TIMESPEC_GETRES 3 +.Os +.Sh NAME +.Nm timespec_getres +.Nd get clock resolution +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In time.h +.Ft int +.Fn timespec_getres "struct timespec *ts" "int base" +.Sh DESCRIPTION +If +.Fa ts +is non-null and +.Fa base +refers to a supported time base as described in +.Xr timespec_get 3 , +the +.Nm +function fills in the structure pointed to by +.Fa ts +to reflect the resolution of that time base. +.Sh RETURN VALUES +The +.Nm +function returns the value of +.Fa base +if successful and zero otherwise. +.Sh SEE ALSO +.Xr clock_getres 2 , +.Xr timespec_get 3 +.\" .Sh STANDARDS +.\" The +.\" .Nm +.\" function conforms to +.\" .St -isoC-2023 . +.Sh HISTORY +This interface first appeared in +.Fx 14 . +.Sh AUTHORS +The +.Nm +function and this manual page were written by +.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org . diff --git a/lib/libc/gen/timespec_getres.c b/lib/libc/gen/timespec_getres.c new file mode 100644 index 000000000000..4977d22cf910 --- /dev/null +++ b/lib/libc/gen/timespec_getres.c @@ -0,0 +1,24 @@ +/*- + * Copyright (c) 2023 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +int +timespec_getres(struct timespec *ts, int base) +{ + + switch (base) { + case TIME_UTC: + if (clock_getres(CLOCK_REALTIME, ts) == 0) + return (base); + break; + case TIME_MONOTONIC: + if (clock_getres(CLOCK_MONOTONIC, ts) == 0) + return (base); + break; + } + return (0); +} From nobody Thu Aug 24 22:13: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 4RWy6974Jbz4rdm8; Thu, 24 Aug 2023 22:13: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 4RWy696Z1Fz3YnN; Thu, 24 Aug 2023 22:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692915233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+PfHmLKBUZqDcWTcIGsdUj0HR2GiLIcEvDoPDCM5Is0=; b=lmLOiokM03bSRIxw7tJTVEkM1qPq6ky8K1cczryP9JroE8en6hO8DYruP9onhDT3lujFAo nJNQMopXYcC1ZG63s+N/C0fSDBwQ91Jwp9pLCVZCIGf9YC4EFg8Vh8UCflH4Vn0axrZuLn gGVypCEZ5DU7HqZIqppOW2N55TdkQIK+JOuOtFzEv9d6aV/xvDFHEaRmoaEZ/LfX1tdFWC /WrTg0jCFMjilzJnAT6CKAwqPGECJYBPW/SfeaaOsfIrQYveIC9O1TZJhCttJCt6Q7XT3z npQHleefFUL8zjJVF9kSBsaCurXhJ94VQfDdgn+1nGqIWDeufM++92M7AbLqkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692915233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+PfHmLKBUZqDcWTcIGsdUj0HR2GiLIcEvDoPDCM5Is0=; b=IWo+061airKmLSaXKadBcfPunV2izId1vf6THiSqKbwghACX0cuu3xugg0QJzJguidPMQ8 z/m9kGhACm7/E4WV69xvqrbwBLU51zhzHKp6wnYhCpDjNbfkSc/ikAyWjexvfa2jq64EUr WiEDyP3yGWtY74YobnOsKYiK13H2TDzkG+Cu0ixSq5YJ87Bt+dGYNcsQo1Gs+KN447ZSHl sp6nqPiDFaE0t2XZXuwhoMqLiHodhiP+4t6Ominaar42RFNaVDWjzyVSK8mY9/bs7VIz5X J3orby8aDVVWPjLxjE6eUalS0U3ccwnQwg7ezmYDQ1mr4gsPBjVxC2B2lHHJbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692915233; a=rsa-sha256; cv=none; b=fO72bz4LYeEbReBULAOUeZVnMp1TCrSGlIJdof642ZzNVBu84DRK8P0roM4Zayh/M4nSkn syp5VtaaEpJwYrX1yuPKn41DH4NQ12PRrZSPuAGApViA9xClNA9otamrrLFlW51SWx6ofr oqT31uBUrJ4QJoXxmbJuFAZ1LDpicQsfUZ7IGOw1twK0x6dO4TRsZXhIte6ihPKq0gQVsT u2zA7+sKIVEUE9ZhY/tYEDcQBsHJ24e3oQVRqGHMeeAKvzGq5OwpHQ5YOy0EtRUo2LdEVx W+pUvY3RneQ1+R53M6NtF742U3KD0qQeTtXYv4Q6NBXkGT85Npekh1Vq+ijFKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWy695cKpzkmN; Thu, 24 Aug 2023 22:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OMDrP2074452; Thu, 24 Aug 2023 22:13:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OMDrns074449; Thu, 24 Aug 2023 22:13:53 GMT (envelope-from git) Date: Thu, 24 Aug 2023 22:13:53 GMT Message-Id: <202308242213.37OMDrns074449@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: c1d85ac3df82 - main - vfs: try harder to find free vnodes when recycling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c1d85ac3df82df721e3d33b292579c4de491488e Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c1d85ac3df82df721e3d33b292579c4de491488e commit c1d85ac3df82df721e3d33b292579c4de491488e Author: Mateusz Guzik AuthorDate: 2023-08-24 05:34:08 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-24 22:12:40 +0000 vfs: try harder to find free vnodes when recycling The free vnode marker can slide past eligible entries. Artificially reducing vnode limit to 300k and spawning 104 workers each creating a million files results in all of them trying to recycle, which often fails when it should not have to. Because of the excessive traffic in this scenario, the trylock to requeue is virtually guaranteed to fail, meaning nothing gets pushed forward. Since no vnodes were found, the most unfortunate sleep for 1 second is induced (see vn_alloc_hard, the "vlruwk" msleep). Without the fix the machine is mostly idle with almost everyone stuck off CPU waiting for the sleep to finish. With the fix it is busy creating files. Unrelated to the above problem the marker could have landed in a similarly problematic spot for because of any failure in vtryrecycle. Originally reported as poudriere builders stalling in a vnode-count restricted setup. Fixes: 138a5dafba31 ("vfs: trylock vnode requeue") Reported by: Mark Millard --- sys/kern/vfs_subr.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 0f3f00abfd4a..f1e1d1e3a0ca 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -196,6 +196,10 @@ static counter_u64_t recycles_free_count; SYSCTL_COUNTER_U64(_vfs, OID_AUTO, recycles_free, CTLFLAG_RD, &recycles_free_count, "Number of free vnodes recycled to meet vnode cache targets"); +static counter_u64_t vnode_skipped_requeues; +SYSCTL_COUNTER_U64(_vfs, OID_AUTO, vnode_skipped_requeues, CTLFLAG_RD, &vnode_skipped_requeues, + "Number of times LRU requeue was skipped due to lock contention"); + static u_long deferred_inact; SYSCTL_ULONG(_vfs, OID_AUTO, deferred_inact, CTLFLAG_RD, &deferred_inact, 0, "Number of times inactive processing was deferred"); @@ -732,6 +736,7 @@ vntblinit(void *dummy __unused) vnodes_created = counter_u64_alloc(M_WAITOK); recycles_count = counter_u64_alloc(M_WAITOK); recycles_free_count = counter_u64_alloc(M_WAITOK); + vnode_skipped_requeues = counter_u64_alloc(M_WAITOK); /* * Initialize the filesystem syncer. @@ -1280,11 +1285,13 @@ vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp) struct vnode *vp; struct mount *mp; int ocount; + bool retried; mtx_assert(&vnode_list_mtx, MA_OWNED); if (count > max_vnlru_free) count = max_vnlru_free; ocount = count; + retried = false; vp = mvp; for (;;) { if (count == 0) { @@ -1292,6 +1299,24 @@ vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp) } vp = TAILQ_NEXT(vp, v_vnodelist); if (__predict_false(vp == NULL)) { + /* + * The free vnode marker can be past eligible vnodes: + * 1. if vdbatch_process trylock failed + * 2. if vtryrecycle failed + * + * If so, start the scan from scratch. + */ + if (!retried && vnlru_read_freevnodes() > 0) { + TAILQ_REMOVE(&vnode_list, mvp, v_vnodelist); + TAILQ_INSERT_HEAD(&vnode_list, mvp, v_vnodelist); + vp = mvp; + retried++; + continue; + } + + /* + * Give up + */ TAILQ_REMOVE(&vnode_list, mvp, v_vnodelist); TAILQ_INSERT_TAIL(&vnode_list, mvp, v_vnodelist); break; @@ -3528,6 +3553,17 @@ vdbatch_process(struct vdbatch *vd) MPASS(curthread->td_pinned > 0); MPASS(vd->index == VDBATCH_SIZE); + /* + * Attempt to requeue the passed batch, but give up easily. + * + * Despite batching the mechanism is prone to transient *significant* + * lock contention, where vnode_list_mtx becomes the primary bottleneck + * if multiple CPUs get here (one real-world example is highly parallel + * do-nothing make , which will stat *tons* of vnodes). Since it is + * quasi-LRU (read: not that great even if fully honoured) just dodge + * the problem. Parties which don't like it are welcome to implement + * something better. + */ critical_enter(); if (mtx_trylock(&vnode_list_mtx)) { for (i = 0; i < VDBATCH_SIZE; i++) { @@ -3540,6 +3576,8 @@ vdbatch_process(struct vdbatch *vd) } mtx_unlock(&vnode_list_mtx); } else { + counter_u64_add(vnode_skipped_requeues, 1); + for (i = 0; i < VDBATCH_SIZE; i++) { vp = vd->tab[i]; vd->tab[i] = NULL; From nobody Thu Aug 24 22:16: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 4RWy9P5pw3z4rdpg; Thu, 24 Aug 2023 22:16: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 4RWy9P5J8mz3ZGw; Thu, 24 Aug 2023 22:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692915401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ZrkW8Hur8aFcR6N1NPrLBsxAi666I0gGFugFWOqRAY=; b=LPGlyJQleRaQ7a0aO537MYE/tVvr2IYxYXK7t0sN8j4wr5S2aHTMejRjm7SQ+F/TDvKXY7 bZNsPlZqTF2qE8/ISkgQDEgCI9An+7kPvyJQO8HBx3xcGFXHB7QOCp+QCMZvLyanYHswG8 JB1kyV1lHTycKbAK2mh3IpGFFQp8kBovkwsPVsN4jhUWB0ZqMNxYqeblJi2FTK6cQpBFdU FKnmmyXH5K5d9oz7SdeuHtr9N0z3rUBygWxjP0jLuJeXbtlOEO3pDDSsK0MbAnBuM6zlSJ zTZeXHRxoOUa9RTvvxHtaUQqMRtwdEsAlAaMjK9b6QRp/4FPz1STCZYiWB2ByQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692915401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ZrkW8Hur8aFcR6N1NPrLBsxAi666I0gGFugFWOqRAY=; b=waS12j6bG9RsJ7p88QvOG1hfyncy68hdPEdoiqHML8vqKdlmpcy4qGi+esfZFMmdZ65iGm sHMEYWvi0ewEzxxEg1osWphLw8aFdfsWeB2XOCLy286r5q1no5cZ0RDNuv3LvPtNVbat5F 99eLVLK5G9zZpAktXDLElh25xCRGTostBx8BQifvF6HIl9WCKq8L1AlKwrJvxgCaQG+0TQ RC2yWf0JN04AY6wQSzAG8nky64tQzY7fRHYnJM9H23KkHJf+6F3szORvDvmmhhpceH+Hcw 3nD1Nx4//cih9HH16Q2jbmj8UZZNLWWNsC/upnGZ/ssjPKfez7PXzkVnbsMVYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692915401; a=rsa-sha256; cv=none; b=Qtpceu5X5DODWEQ5ehW7MkfkXX9bhHKepNNmoxg9jN9v3I5I6p/XOAM4eM8q8W01+lOj/s 9JDJqWlKTYEquTYwWfJtJRWYnjPOorhwR/aw0PVDuutq4BOXTo0kFvC3LnPErM6fmBBi4T x28a5vsZXO4aH3q9IRVRqIMxwV+TsWmROY//yMHJp/2p1isY5b0PibbmQwnh1AT12FePmT EbeJ3q3QqK+8AuSwQM1LRwiqlzJxrM2Ig7tl92WPPFuq92OggXUDr7oVY2b1DGSX4U7zk7 F1XCSpiwBDWw9gn2AfK0Qlv82D2IFnphtuZhyHIz4KEWw8wPKyBLfwMiwE++TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWy9P4LkwzkZQ; Thu, 24 Aug 2023 22:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OMGfvY074947; Thu, 24 Aug 2023 22:16:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OMGfq5074944; Thu, 24 Aug 2023 22:16:41 GMT (envelope-from git) Date: Thu, 24 Aug 2023 22:16:41 GMT Message-Id: <202308242216.37OMGfq5074944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1b7663a03ca9 - main - smartpqi: Use today's 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b7663a03ca93451ae0b8b3272e5ad991da0fa9a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1b7663a03ca93451ae0b8b3272e5ad991da0fa9a commit 1b7663a03ca93451ae0b8b3272e5ad991da0fa9a Author: Warner Losh AuthorDate: 2023-08-24 22:15:11 +0000 Commit: Warner Losh CommitDate: 2023-08-24 22:16:18 +0000 smartpqi: Use today's date We don't have any other man pages that uses $Mdocdate$ so just inline today's date and remove $Id$ while I'm here. --- share/man/man4/smartpqi.4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/share/man/man4/smartpqi.4 b/share/man/man4/smartpqi.4 index 3e61ba85cc1a..5b7ea923e13e 100644 --- a/share/man/man4/smartpqi.4 +++ b/share/man/man4/smartpqi.4 @@ -24,8 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id$ -.Dd $Mdocdate$ +.Dd August 24, 2023 .Dt SMARTPQI 4 .Os .Sh NAME From nobody Thu Aug 24 22:18:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RWyCZ46lbz4rf9h; Thu, 24 Aug 2023 22:18:34 +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 4RWyCY64fTz3Znk; Thu, 24 Aug 2023 22:18:33 +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 37OMIIqH018840 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 25 Aug 2023 01:18:21 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 37OMIIqH018840 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 37OMIIYM018839; Fri, 25 Aug 2023 01:18:18 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 25 Aug 2023 01:18:18 +0300 From: Konstantin Belousov To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: af93fea71038 - main - timerfd: Move implementation from linux compat to sys/kern Message-ID: References: <202308242029.37OKTmVs091755@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: <202308242029.37OKTmVs091755@gitrepo.freebsd.org> 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: 4RWyCY64fTz3Znk X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] On Thu, Aug 24, 2023 at 08:29:48PM +0000, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=af93fea710385b2b11f0cabd377e7ed6f3d97c34 > > commit af93fea710385b2b11f0cabd377e7ed6f3d97c34 > Author: Jake Freeland > AuthorDate: 2023-08-24 04:39:54 +0000 > Commit: Warner Losh > CommitDate: 2023-08-24 20:28:56 +0000 > > timerfd: Move implementation from linux compat to sys/kern > > Move the timerfd impelemntation from linux compat code to sys/kern. Use > it to implement the new system calls for timerfd. Add a hook to kern_tc > to allow timerfd to know when the system time has stepped. Add kqueue > support to timerfd. Adjust a few names to be less Linux centric. > > RelNotes: YES > Reviewed by: markj (on irc), imp, kib (with reservations), jhb (slack) > Differential Revision: https://reviews.freebsd.org/D38459 > --- > lib/libc/sys/Symbol.map | 3 + > sys/bsm/audit_kevents.h | 1 + > sys/compat/freebsd32/freebsd32_proto.h | 14 + > sys/compat/freebsd32/freebsd32_syscall.h | 5 +- > sys/compat/freebsd32/freebsd32_syscalls.c | 3 + > sys/compat/freebsd32/freebsd32_sysent.c | 3 + > sys/compat/freebsd32/freebsd32_systrace_args.c | 86 ++++ > sys/compat/linux/linux_event.c | 443 ++--------------- > sys/compat/linux/linux_event.h | 11 - > sys/conf/files | 1 + > sys/kern/init_sysent.c | 3 + > sys/kern/kern_descrip.c | 4 +- > sys/kern/kern_tc.c | 2 + > sys/kern/sys_timerfd.c | 632 +++++++++++++++++++++++++ > sys/kern/syscalls.c | 3 + > sys/kern/syscalls.master | 20 + > sys/kern/systrace_args.c | 86 ++++ > sys/sys/file.h | 2 +- > sys/sys/syscall.h | 5 +- > sys/sys/syscall.mk | 5 +- > sys/sys/sysproto.h | 20 + > sys/sys/timerfd.h | 66 +++ > sys/sys/user.h | 6 + > 23 files changed, 999 insertions(+), 425 deletions(-) > > diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map > index 9a07bb457eb8..7937661e3787 100644 > --- a/lib/libc/sys/Symbol.map > +++ b/lib/libc/sys/Symbol.map > @@ -421,6 +421,9 @@ FBSD_1.7 { > kqueuex; > membarrier; > swapoff; > + timerfd_create; > + timerfd_gettime; > + timerfd_settime; > }; > > FBSDprivate_1.0 { > diff --git a/sys/bsm/audit_kevents.h b/sys/bsm/audit_kevents.h > index a6b50a67ee6a..d06381837aad 100644 > --- a/sys/bsm/audit_kevents.h > +++ b/sys/bsm/audit_kevents.h > @@ -661,6 +661,7 @@ > #define AUE_AIO_WRITEV 43267 /* FreeBSD-specific. */ > #define AUE_AIO_READV 43268 /* FreeBSD-specific. */ > #define AUE_FSPACECTL 43269 /* FreeBSD-specific. */ > +#define AUE_TIMERFD 43270 /* FreeBSD/Linux. */ > > /* > * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the > diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h > index bb333e0321a0..50448b6dce16 100644 > --- a/sys/compat/freebsd32/freebsd32_proto.h > +++ b/sys/compat/freebsd32/freebsd32_proto.h > @@ -684,6 +684,16 @@ struct freebsd32_aio_writev_args { > struct freebsd32_aio_readv_args { > char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; > }; > +struct freebsd32_timerfd_gettime_args { > + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; > + char curr_value_l_[PADL_(struct itimerspec32 *)]; struct itimerspec32 * curr_value; char curr_value_r_[PADR_(struct itimerspec32 *)]; > +}; > +struct freebsd32_timerfd_settime_args { > + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; > + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; > + char new_value_l_[PADL_(const struct itimerspec32 *)]; const struct itimerspec32 * new_value; char new_value_r_[PADR_(const struct itimerspec32 *)]; > + char old_value_l_[PADL_(struct itimerspec32 *)]; struct itimerspec32 * old_value; char old_value_r_[PADR_(struct itimerspec32 *)]; > +}; > int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); > int freebsd32_ptrace(struct thread *, struct freebsd32_ptrace_args *); > int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); > @@ -799,6 +809,8 @@ int freebsd32_cpuset_setdomain(struct thread *, struct freebsd32_cpuset_setdomai > int freebsd32___sysctlbyname(struct thread *, struct freebsd32___sysctlbyname_args *); > int freebsd32_aio_writev(struct thread *, struct freebsd32_aio_writev_args *); > int freebsd32_aio_readv(struct thread *, struct freebsd32_aio_readv_args *); > +int freebsd32_timerfd_gettime(struct thread *, struct freebsd32_timerfd_gettime_args *); > +int freebsd32_timerfd_settime(struct thread *, struct freebsd32_timerfd_settime_args *); > > #ifdef COMPAT_43 > > @@ -1292,6 +1304,8 @@ int freebsd11_freebsd32_fstatat(struct thread *, struct freebsd11_freebsd32_fsta > #define FREEBSD32_SYS_AUE_freebsd32___sysctlbyname AUE_SYSCTL > #define FREEBSD32_SYS_AUE_freebsd32_aio_writev AUE_AIO_WRITEV > #define FREEBSD32_SYS_AUE_freebsd32_aio_readv AUE_AIO_READV > +#define FREEBSD32_SYS_AUE_freebsd32_timerfd_gettime AUE_TIMERFD > +#define FREEBSD32_SYS_AUE_freebsd32_timerfd_settime AUE_TIMERFD > > #undef PAD_ > #undef PADL_ > diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h > index c3d8617abf4b..e3777730be1c 100644 > --- a/sys/compat/freebsd32/freebsd32_syscall.h > +++ b/sys/compat/freebsd32/freebsd32_syscall.h > @@ -502,4 +502,7 @@ > #define FREEBSD32_SYS_swapoff 582 > #define FREEBSD32_SYS_kqueuex 583 > #define FREEBSD32_SYS_membarrier 584 > -#define FREEBSD32_SYS_MAXSYSCALL 585 > +#define FREEBSD32_SYS_timerfd_create 585 > +#define FREEBSD32_SYS_freebsd32_timerfd_gettime 586 > +#define FREEBSD32_SYS_freebsd32_timerfd_settime 587 > +#define FREEBSD32_SYS_MAXSYSCALL 588 > diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c > index 19d454743c55..ccc910ee5ca9 100644 > --- a/sys/compat/freebsd32/freebsd32_syscalls.c > +++ b/sys/compat/freebsd32/freebsd32_syscalls.c > @@ -590,4 +590,7 @@ const char *freebsd32_syscallnames[] = { > "swapoff", /* 582 = swapoff */ > "kqueuex", /* 583 = kqueuex */ > "membarrier", /* 584 = membarrier */ > + "timerfd_create", /* 585 = timerfd_create */ > + "freebsd32_timerfd_gettime", /* 586 = freebsd32_timerfd_gettime */ > + "freebsd32_timerfd_settime", /* 587 = freebsd32_timerfd_settime */ > }; > diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c > index 971f06a643c5..fec6f4a47bd6 100644 > --- a/sys/compat/freebsd32/freebsd32_sysent.c > +++ b/sys/compat/freebsd32/freebsd32_sysent.c > @@ -646,4 +646,7 @@ struct sysent freebsd32_sysent[] = { > { .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(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ > { .sy_narg = AS(membarrier_args), .sy_call = (sy_call_t *)sys_membarrier, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 584 = membarrier */ > + { .sy_narg = AS(timerfd_create_args), .sy_call = (sy_call_t *)sys_timerfd_create, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 585 = timerfd_create */ > + { .sy_narg = AS(freebsd32_timerfd_gettime_args), .sy_call = (sy_call_t *)freebsd32_timerfd_gettime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 586 = freebsd32_timerfd_gettime */ > + { .sy_narg = AS(freebsd32_timerfd_settime_args), .sy_call = (sy_call_t *)freebsd32_timerfd_settime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 587 = freebsd32_timerfd_settime */ > }; > diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c > index 5dfc82c30b7b..2c26a0ddab2f 100644 > --- a/sys/compat/freebsd32/freebsd32_systrace_args.c > +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c > @@ -3336,6 +3336,32 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) > *n_args = 3; > break; > } > + /* timerfd_create */ > + case 585: { > + struct timerfd_create_args *p = params; > + iarg[a++] = p->clockid; /* int */ > + iarg[a++] = p->flags; /* int */ > + *n_args = 2; > + break; > + } > + /* freebsd32_timerfd_gettime */ > + case 586: { > + struct freebsd32_timerfd_gettime_args *p = params; > + iarg[a++] = p->fd; /* int */ > + uarg[a++] = (intptr_t)p->curr_value; /* struct itimerspec32 * */ > + *n_args = 2; > + break; > + } > + /* freebsd32_timerfd_settime */ > + case 587: { > + struct freebsd32_timerfd_settime_args *p = params; > + iarg[a++] = p->fd; /* int */ > + iarg[a++] = p->flags; /* int */ > + uarg[a++] = (intptr_t)p->new_value; /* const struct itimerspec32 * */ > + uarg[a++] = (intptr_t)p->old_value; /* struct itimerspec32 * */ > + *n_args = 4; > + break; > + } > default: > *n_args = 0; > break; > @@ -9005,6 +9031,51 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) > break; > }; > break; > + /* timerfd_create */ > + case 585: > + switch (ndx) { > + case 0: > + p = "int"; > + break; > + case 1: > + p = "int"; > + break; > + default: > + break; > + }; > + break; > + /* freebsd32_timerfd_gettime */ > + case 586: > + switch (ndx) { > + case 0: > + p = "int"; > + break; > + case 1: > + p = "userland struct itimerspec32 *"; > + break; > + default: > + break; > + }; > + break; > + /* freebsd32_timerfd_settime */ > + case 587: > + switch (ndx) { > + case 0: > + p = "int"; > + break; > + case 1: > + p = "int"; > + break; > + case 2: > + p = "userland const struct itimerspec32 *"; > + break; > + case 3: > + p = "userland struct itimerspec32 *"; > + break; > + default: > + break; > + }; > + break; > default: > break; > }; > @@ -10873,6 +10944,21 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) > if (ndx == 0 || ndx == 1) > p = "int"; > break; > + /* timerfd_create */ > + case 585: > + if (ndx == 0 || ndx == 1) > + p = "int"; > + break; > + /* freebsd32_timerfd_gettime */ > + case 586: > + if (ndx == 0 || ndx == 1) > + p = "int"; > + break; > + /* freebsd32_timerfd_settime */ > + case 587: > + if (ndx == 0 || ndx == 1) > + p = "int"; > + break; > default: > break; > }; > diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c > index a7db8516e5f0..816c68a90f1d 100644 > --- a/sys/compat/linux/linux_event.c > +++ b/sys/compat/linux/linux_event.c > @@ -44,6 +44,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -99,55 +100,6 @@ struct epoll_copyout_args { > int error; > }; > > -/* timerfd */ > -typedef uint64_t timerfd_t; > - > -static fo_rdwr_t timerfd_read; > -static fo_ioctl_t timerfd_ioctl; > -static fo_poll_t timerfd_poll; > -static fo_kqfilter_t timerfd_kqfilter; > -static fo_stat_t timerfd_stat; > -static fo_close_t timerfd_close; > -static fo_fill_kinfo_t timerfd_fill_kinfo; > - > -static struct fileops timerfdops = { > - .fo_read = timerfd_read, > - .fo_write = invfo_rdwr, > - .fo_truncate = invfo_truncate, > - .fo_ioctl = timerfd_ioctl, > - .fo_poll = timerfd_poll, > - .fo_kqfilter = timerfd_kqfilter, > - .fo_stat = timerfd_stat, > - .fo_close = timerfd_close, > - .fo_chmod = invfo_chmod, > - .fo_chown = invfo_chown, > - .fo_sendfile = invfo_sendfile, > - .fo_fill_kinfo = timerfd_fill_kinfo, > - .fo_flags = DFLAG_PASSABLE > -}; > - > -static void filt_timerfddetach(struct knote *kn); > -static int filt_timerfdread(struct knote *kn, long hint); > - > -static struct filterops timerfd_rfiltops = { > - .f_isfd = 1, > - .f_detach = filt_timerfddetach, > - .f_event = filt_timerfdread > -}; > - > -struct timerfd { > - clockid_t tfd_clockid; > - struct itimerspec tfd_time; > - struct callout tfd_callout; > - timerfd_t tfd_count; > - bool tfd_canceled; > - struct selinfo tfd_sel; > - struct mtx tfd_lock; > -}; > - > -static void linux_timerfd_expire(void *); > -static void linux_timerfd_curval(struct timerfd *, struct itimerspec *); > - > static int > epoll_create_common(struct thread *td, int flags) > { > @@ -658,255 +610,14 @@ linux_eventfd2(struct thread *td, struct linux_eventfd2_args *args) > int > linux_timerfd_create(struct thread *td, struct linux_timerfd_create_args *args) > { > - struct timerfd *tfd; > - struct file *fp; > clockid_t clockid; > - int fflags, fd, error; > - > - if ((args->flags & ~LINUX_TFD_CREATE_FLAGS) != 0) > - return (EINVAL); > - > - error = linux_to_native_clockid(&clockid, args->clockid); > - if (error != 0) > - return (error); > - if (clockid != CLOCK_REALTIME && clockid != CLOCK_MONOTONIC) > - return (EINVAL); > - > - fflags = 0; > - if ((args->flags & LINUX_TFD_CLOEXEC) != 0) > - fflags |= O_CLOEXEC; > - > - error = falloc(td, &fp, &fd, fflags); > - if (error != 0) > - return (error); > - > - tfd = malloc(sizeof(*tfd), M_EPOLL, M_WAITOK | M_ZERO); > - tfd->tfd_clockid = clockid; > - mtx_init(&tfd->tfd_lock, "timerfd", NULL, MTX_DEF); > - > - callout_init_mtx(&tfd->tfd_callout, &tfd->tfd_lock, 0); > - knlist_init_mtx(&tfd->tfd_sel.si_note, &tfd->tfd_lock); > - > - fflags = FREAD; > - if ((args->flags & LINUX_O_NONBLOCK) != 0) > - fflags |= FNONBLOCK; > - > - finit(fp, fflags, DTYPE_LINUXTFD, tfd, &timerfdops); > - fdrop(fp, td); > - > - td->td_retval[0] = fd; > - return (error); > -} > - > -static int > -timerfd_close(struct file *fp, struct thread *td) > -{ > - struct timerfd *tfd; > - > - tfd = fp->f_data; > - if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) > - return (EINVAL); > - > - timespecclear(&tfd->tfd_time.it_value); > - timespecclear(&tfd->tfd_time.it_interval); > - > - callout_drain(&tfd->tfd_callout); > - > - seldrain(&tfd->tfd_sel); > - knlist_destroy(&tfd->tfd_sel.si_note); > - > - fp->f_ops = &badfileops; > - mtx_destroy(&tfd->tfd_lock); > - free(tfd, M_EPOLL); > - > - return (0); > -} > - > -static int > -timerfd_read(struct file *fp, struct uio *uio, struct ucred *active_cred, > - int flags, struct thread *td) > -{ > - struct timerfd *tfd; > - timerfd_t count; > - int error; > - > - tfd = fp->f_data; > - if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) > - return (EINVAL); > - > - if (uio->uio_resid < sizeof(timerfd_t)) > - return (EINVAL); > - > - error = 0; > - mtx_lock(&tfd->tfd_lock); > -retry: > - if (tfd->tfd_canceled) { > - tfd->tfd_count = 0; > - mtx_unlock(&tfd->tfd_lock); > - return (ECANCELED); > - } > - if (tfd->tfd_count == 0) { > - if ((fp->f_flag & FNONBLOCK) != 0) { > - mtx_unlock(&tfd->tfd_lock); > - return (EAGAIN); > - } > - error = mtx_sleep(&tfd->tfd_count, &tfd->tfd_lock, PCATCH, "ltfdrd", 0); > - if (error == 0) > - goto retry; > - } > - if (error == 0) { > - count = tfd->tfd_count; > - tfd->tfd_count = 0; > - mtx_unlock(&tfd->tfd_lock); > - error = uiomove(&count, sizeof(timerfd_t), uio); > - } else > - mtx_unlock(&tfd->tfd_lock); > - > - return (error); > -} > - > -static int > -timerfd_poll(struct file *fp, int events, struct ucred *active_cred, > - struct thread *td) > -{ > - struct timerfd *tfd; > - int revents = 0; > - > - tfd = fp->f_data; > - if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) > - return (POLLERR); > - > - mtx_lock(&tfd->tfd_lock); > - if ((events & (POLLIN|POLLRDNORM)) && tfd->tfd_count > 0) > - revents |= events & (POLLIN|POLLRDNORM); > - if (revents == 0) > - selrecord(td, &tfd->tfd_sel); > - mtx_unlock(&tfd->tfd_lock); > - > - return (revents); > -} > - > -static int > -timerfd_kqfilter(struct file *fp, struct knote *kn) > -{ > - struct timerfd *tfd; > - > - tfd = fp->f_data; > - if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) > - return (EINVAL); > - > - if (kn->kn_filter == EVFILT_READ) > - kn->kn_fop = &timerfd_rfiltops; > - else > - return (EINVAL); > - > - kn->kn_hook = tfd; > - knlist_add(&tfd->tfd_sel.si_note, kn, 0); > - > - return (0); > -} > - > -static void > -filt_timerfddetach(struct knote *kn) > -{ > - struct timerfd *tfd = kn->kn_hook; > - > - mtx_lock(&tfd->tfd_lock); > - knlist_remove(&tfd->tfd_sel.si_note, kn, 1); > - mtx_unlock(&tfd->tfd_lock); > -} > - > -static int > -filt_timerfdread(struct knote *kn, long hint) > -{ > - struct timerfd *tfd = kn->kn_hook; > - > - return (tfd->tfd_count > 0); > -} > - > -static int > -timerfd_ioctl(struct file *fp, u_long cmd, void *data, > - struct ucred *active_cred, struct thread *td) > -{ > - > - if (fp->f_data == NULL || fp->f_type != DTYPE_LINUXTFD) > - return (EINVAL); > - > - switch (cmd) { > - case FIONBIO: > - case FIOASYNC: > - return (0); > - } > - > - return (ENOTTY); > -} > - > -static int > -timerfd_stat(struct file *fp, struct stat *st, struct ucred *active_cred) > -{ > - > - return (ENXIO); > -} > - > -static int > -timerfd_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) > -{ > - > - kif->kf_type = KF_TYPE_UNKNOWN; > - return (0); > -} > - > -static void > -linux_timerfd_clocktime(struct timerfd *tfd, struct timespec *ts) > -{ > - > - if (tfd->tfd_clockid == CLOCK_REALTIME) > - getnanotime(ts); > - else /* CLOCK_MONOTONIC */ > - getnanouptime(ts); > -} > - > -static void > -linux_timerfd_curval(struct timerfd *tfd, struct itimerspec *ots) > -{ > - struct timespec cts; > - > - linux_timerfd_clocktime(tfd, &cts); > - *ots = tfd->tfd_time; > - if (ots->it_value.tv_sec != 0 || ots->it_value.tv_nsec != 0) { > - timespecsub(&ots->it_value, &cts, &ots->it_value); > - if (ots->it_value.tv_sec < 0 || > - (ots->it_value.tv_sec == 0 && > - ots->it_value.tv_nsec == 0)) { > - ots->it_value.tv_sec = 0; > - ots->it_value.tv_nsec = 1; > - } > - } > -} > - > -static int > -linux_timerfd_gettime_common(struct thread *td, int fd, struct itimerspec *ots) > -{ > - struct timerfd *tfd; > - struct file *fp; > int error; > > - error = fget(td, fd, &cap_read_rights, &fp); > + error = linux_to_native_clockid(&clockid, args->clockid); > if (error != 0) > return (error); > - tfd = fp->f_data; > - if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) { > - error = EINVAL; > - goto out; > - } > - > - mtx_lock(&tfd->tfd_lock); > - linux_timerfd_curval(tfd, ots); > - mtx_unlock(&tfd->tfd_lock); > > -out: > - fdrop(fp, td); > - return (error); > + return (kern_timerfd_create(td, clockid, args->flags)); > } > > int > @@ -916,84 +627,14 @@ linux_timerfd_gettime(struct thread *td, struct linux_timerfd_gettime_args *args > struct itimerspec ots; > int error; > > - error = linux_timerfd_gettime_common(td, args->fd, &ots); > + error = kern_timerfd_gettime(td, args->fd, &ots); > if (error != 0) > return (error); > - error = native_to_linux_itimerspec(&lots, &ots); > - if (error == 0) > - error = copyout(&lots, args->old_value, sizeof(lots)); > - return (error); > -} > - > -#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) > -int > -linux_timerfd_gettime64(struct thread *td, struct linux_timerfd_gettime64_args *args) > -{ > - struct l_itimerspec64 lots; > - struct itimerspec ots; > - int error; > > - error = linux_timerfd_gettime_common(td, args->fd, &ots); > - if (error != 0) > - return (error); > - error = native_to_linux_itimerspec64(&lots, &ots); > + error = native_to_linux_itimerspec(&lots, &ots); > if (error == 0) > error = copyout(&lots, args->old_value, sizeof(lots)); > - return (error); > -} > -#endif > - > -static int > -linux_timerfd_settime_common(struct thread *td, int fd, int flags, > - struct itimerspec *nts, struct itimerspec *oval) > -{ > - struct timespec cts, ts; > - struct timerfd *tfd; > - struct timeval tv; > - struct file *fp; > - int error; > - > - if ((flags & ~LINUX_TFD_SETTIME_FLAGS) != 0) > - return (EINVAL); > - > - error = fget(td, fd, &cap_write_rights, &fp); > - if (error != 0) > - return (error); > - tfd = fp->f_data; > - if (fp->f_type != DTYPE_LINUXTFD || tfd == NULL) { > - error = EINVAL; > - goto out; > - } > - > - mtx_lock(&tfd->tfd_lock); > - if (!timespecisset(&nts->it_value)) > - timespecclear(&nts->it_interval); > - if (oval != NULL) > - linux_timerfd_curval(tfd, oval); > - > - bcopy(nts, &tfd->tfd_time, sizeof(*nts)); > - tfd->tfd_count = 0; > - if (timespecisset(&nts->it_value)) { > - linux_timerfd_clocktime(tfd, &cts); > - ts = nts->it_value; > - if ((flags & LINUX_TFD_TIMER_ABSTIME) == 0) { > - timespecadd(&tfd->tfd_time.it_value, &cts, > - &tfd->tfd_time.it_value); > - } else { > - timespecsub(&ts, &cts, &ts); > - } > - TIMESPEC_TO_TIMEVAL(&tv, &ts); > - callout_reset(&tfd->tfd_callout, tvtohz(&tv), > - linux_timerfd_expire, tfd); > - tfd->tfd_canceled = false; > - } else { > - tfd->tfd_canceled = true; > - callout_stop(&tfd->tfd_callout); > - } > - mtx_unlock(&tfd->tfd_lock); > > -out: > - fdrop(fp, td); > return (error); > } > > @@ -1001,7 +642,7 @@ int > linux_timerfd_settime(struct thread *td, struct linux_timerfd_settime_args *args) > { > struct l_itimerspec lots; > - struct itimerspec nts, ots, *pots; > + struct itimerspec nts, ots; > int error; > > error = copyin(args->new_value, &lots, sizeof(lots)); > @@ -1010,23 +651,43 @@ linux_timerfd_settime(struct thread *td, struct linux_timerfd_settime_args *args > error = linux_to_native_itimerspec(&nts, &lots); > if (error != 0) > return (error); > - pots = (args->old_value != NULL ? &ots : NULL); > - error = linux_timerfd_settime_common(td, args->fd, args->flags, > - &nts, pots); > + if (args->old_value == NULL) > + error = kern_timerfd_settime(td, args->fd, args->flags, &nts, NULL); > + else > + error = kern_timerfd_settime(td, args->fd, args->flags, &nts, &ots); > if (error == 0 && args->old_value != NULL) { > error = native_to_linux_itimerspec(&lots, &ots); > if (error == 0) > error = copyout(&lots, args->old_value, sizeof(lots)); > } > + > return (error); > } > > #if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) > +int > +linux_timerfd_gettime64(struct thread *td, struct linux_timerfd_gettime64_args *args) > +{ > + struct l_itimerspec64 lots; > + struct itimerspec ots; > + int error; > + > + error = kern_timerfd_gettime(td, args->fd, &ots); > + if (error != 0) > + return (error); > + > + error = native_to_linux_itimerspec64(&lots, &ots); > + if (error == 0) > + error = copyout(&lots, args->old_value, sizeof(lots)); > + > + return (error); > +} > + > int > linux_timerfd_settime64(struct thread *td, struct linux_timerfd_settime64_args *args) > { > struct l_itimerspec64 lots; > - struct itimerspec nts, ots, *pots; > + struct itimerspec nts, ots; > int error; > > error = copyin(args->new_value, &lots, sizeof(lots)); > @@ -1035,50 +696,16 @@ linux_timerfd_settime64(struct thread *td, struct linux_timerfd_settime64_args * > error = linux_to_native_itimerspec64(&nts, &lots); > if (error != 0) > return (error); > - pots = (args->old_value != NULL ? &ots : NULL); > - error = linux_timerfd_settime_common(td, args->fd, args->flags, > - &nts, pots); > + if (args->old_value == NULL) > + error = kern_timerfd_settime(td, args->fd, args->flags, &nts, NULL); > + else > + error = kern_timerfd_settime(td, args->fd, args->flags, &nts, &ots); > if (error == 0 && args->old_value != NULL) { > error = native_to_linux_itimerspec64(&lots, &ots); > if (error == 0) > error = copyout(&lots, args->old_value, sizeof(lots)); > } > + > return (error); > } > #endif > - > -static void > -linux_timerfd_expire(void *arg) > -{ > - struct timespec cts, ts; > - struct timeval tv; > - struct timerfd *tfd; > - > - tfd = (struct timerfd *)arg; > - > - linux_timerfd_clocktime(tfd, &cts); > - if (timespeccmp(&cts, &tfd->tfd_time.it_value, >=)) { > - if (timespecisset(&tfd->tfd_time.it_interval)) > - timespecadd(&tfd->tfd_time.it_value, > - &tfd->tfd_time.it_interval, > - &tfd->tfd_time.it_value); > - else > - /* single shot timer */ > - timespecclear(&tfd->tfd_time.it_value); > - if (timespecisset(&tfd->tfd_time.it_value)) { > - timespecsub(&tfd->tfd_time.it_value, &cts, &ts); > - TIMESPEC_TO_TIMEVAL(&tv, &ts); > - callout_reset(&tfd->tfd_callout, tvtohz(&tv), > - linux_timerfd_expire, tfd); > - } > - tfd->tfd_count++; > - KNOTE_LOCKED(&tfd->tfd_sel.si_note, 0); > - selwakeup(&tfd->tfd_sel); > - wakeup(&tfd->tfd_count); > - } else if (timespecisset(&tfd->tfd_time.it_value)) { > - timespecsub(&tfd->tfd_time.it_value, &cts, &ts); > - TIMESPEC_TO_TIMEVAL(&tv, &ts); > - callout_reset(&tfd->tfd_callout, tvtohz(&tv), > - linux_timerfd_expire, tfd); > - } > -} > diff --git a/sys/compat/linux/linux_event.h b/sys/compat/linux/linux_event.h > index 32269b0070bc..fa63371b5170 100644 > --- a/sys/compat/linux/linux_event.h > +++ b/sys/compat/linux/linux_event.h > @@ -54,15 +54,4 @@ > > #define LINUX_EFD_SEMAPHORE (1 << 0) > > -#define LINUX_TFD_TIMER_ABSTIME (1 << 0) > -#define LINUX_TFD_TIMER_CANCEL_ON_SET (1 << 1) > -#define LINUX_TFD_CLOEXEC LINUX_O_CLOEXEC > -#define LINUX_TFD_NONBLOCK LINUX_O_NONBLOCK > - > -#define LINUX_TFD_SHARED_FCNTL_FLAGS (LINUX_TFD_CLOEXEC \ > - |LINUX_TFD_NONBLOCK) > -#define LINUX_TFD_CREATE_FLAGS LINUX_TFD_SHARED_FCNTL_FLAGS > -#define LINUX_TFD_SETTIME_FLAGS (LINUX_TFD_TIMER_ABSTIME \ > - |LINUX_TFD_TIMER_CANCEL_ON_SET) > - > #endif /* !_LINUX_EVENT_H_ */ > diff --git a/sys/conf/files b/sys/conf/files > index 3f79ce752c80..8d38b9cc8a2e 100644 > --- a/sys/conf/files > +++ b/sys/conf/files > @@ -3908,6 +3908,7 @@ kern/sys_pipe.c standard > kern/sys_procdesc.c standard > kern/sys_process.c standard > kern/sys_socket.c standard > +kern/sys_timerfd.c standard > kern/syscalls.c standard > kern/sysv_ipc.c standard > kern/sysv_msg.c optional sysvmsg > diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c > index 1e62c46b8be0..d44fec54fcd7 100644 > --- a/sys/kern/init_sysent.c > +++ b/sys/kern/init_sysent.c > @@ -645,4 +645,7 @@ struct sysent sysent[] = { > { .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(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ > { .sy_narg = AS(membarrier_args), .sy_call = (sy_call_t *)sys_membarrier, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 584 = membarrier */ > + { .sy_narg = AS(timerfd_create_args), .sy_call = (sy_call_t *)sys_timerfd_create, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 585 = timerfd_create */ > + { .sy_narg = AS(timerfd_gettime_args), .sy_call = (sy_call_t *)sys_timerfd_gettime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 586 = timerfd_gettime */ > + { .sy_narg = AS(timerfd_settime_args), .sy_call = (sy_call_t *)sys_timerfd_settime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 587 = timerfd_settime */ > }; > diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c > index c5226288afc5..35046c856d54 100644 > --- a/sys/kern/kern_descrip.c > +++ b/sys/kern/kern_descrip.c > @@ -5001,8 +5001,8 @@ file_type_to_name(short type) > return ("proc"); > case DTYPE_EVENTFD: > return ("eventfd"); > - case DTYPE_LINUXTFD: > - return ("ltimer"); > + case DTYPE_TIMERFD: > + return ("timerfd"); > default: > return ("unkn"); > } > diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c > index 170f35830923..26f09cb60260 100644 > --- a/sys/kern/kern_tc.c > +++ b/sys/kern/kern_tc.c > @@ -34,6 +34,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1305,6 +1306,7 @@ tc_setclock(struct timespec *ts) > > /* Avoid rtc_generation == 0, since td_rtcgen == 0 is special. */ > atomic_add_rel_int(&rtc_generation, 2); > + timerfd_jumped(); > sleepq_chains_remove_matching(sleeping_on_old_rtc); > if (timestepwarnings) { > nanotime(&taft); > diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c > new file mode 100644 > index 000000000000..6948fa059b8c > --- /dev/null > +++ b/sys/kern/sys_timerfd.c > @@ -0,0 +1,632 @@ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause > + * > + * Copyright (c) 2014 Dmitry Chagin > + * Copyright (c) 2023 Jake Freeland > + * > + * 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 > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > + > +#ifdef COMPAT_FREEBSD32 > +#include > +#include > +#endif > + > +static MALLOC_DEFINE(M_TIMERFD, "timerfd", "timerfd structures"); > +static LIST_HEAD(, timerfd) timerfd_head; > +static struct unrhdr64 tfdino_unr; > + > +#define TFD_NOJUMP 0 /* Realtime clock has not jumped. */ > +#define TFD_READ 1 /* Jumped, tfd has been read since. */ > +#define TFD_ZREAD 2 /* Jumped backwards, CANCEL_ON_SET=false. */ > +#define TFD_CANCELED 4 /* Jumped, CANCEL_ON_SET=true. */ > +#define TFD_JUMPED (TFD_ZREAD | TFD_CANCELED) > + > +struct timerfd { > + /* User specified. */ > + struct itimerspec tfd_time; /* tfd timer */ > + clockid_t tfd_clockid; /* timing base */ > + int tfd_flags; /* creation flags */ > + int tfd_timflags; /* timer flags */ > + > + /* Used internally. */ > + timerfd_t tfd_count; /* expiration count since last read */ > + bool tfd_expired; /* true upon initial expiration */ > + struct mtx tfd_lock; /* mtx lock */ > + struct callout tfd_callout; /* expiration notification */ > + struct selinfo tfd_sel; /* I/O alerts */ > + struct timespec tfd_boottim; /* cached boottime */ > + int tfd_jumped; /* timer jump status */ > + LIST_ENTRY(timerfd) entry; /* entry in list */ > + > + /* For stat(2). */ > + ino_t tfd_ino; /* inode number */ > + struct timespec tfd_atim; /* time of last read */ > + struct timespec tfd_mtim; /* time of last settime */ > + struct timespec tfd_birthtim; /* creation time */ > +}; > + > +static void > +timerfd_init(void *data) > +{ > + new_unrhdr64(&tfdino_unr, 1); > +} > + > +SYSINIT(timerfd, SI_SUB_VFS, SI_ORDER_ANY, timerfd_init, NULL); > + > +static inline void > +timerfd_getboottime(struct timespec *ts) > +{ > + struct timeval tv; > + getboottime(&tv); > + TIMEVAL_TO_TIMESPEC(&tv, ts); > +} > + > +/* > + * Call when a discontinuous jump has occured in CLOCK_REALTIME and > + * update timerfd's cached boottime. A jump can be triggered using > + * functions like clock_settime(2) or settimeofday(2). > + * > + * Timer is marked TFD_CANCELED if TFD_TIMER_CANCEL_ON_SET is set > *** 850 LINES SKIPPED *** I did a very quick look over the added code. I do not see any protection for the timerfd_head list manipulation. It is not clear what is protected by tfd->tfd_lock: e.g. in timerfd_stat() it covers reading of items, writing of which is not protected by the mtx, everything except tfd_atim. There is no annotations in the timer structure for the locking regime. stat st_ctim is always zero, this is somewhat strange. The tfd = fp->f_data; if (tfd == NULL || fp->f_type != DTYPE_TIMERFD) { triggers UB when f_type is not DTYPE_TIMERFD. compat32 stuff was put into the sys/kern instead of sys/compat/freebsd32. sys/timerfd.h pollutes userspace with sys/proc.h. The regenerated files were put in the same commit as (probably) human written files, why? From nobody Thu Aug 24 22:31: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 4RWyVj3pTyz4rfpP for ; Thu, 24 Aug 2023 22:31:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) (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 4RWyVj16cLz3cFt for ; Thu, 24 Aug 2023 22:31:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-52a4b62c2f5so483873a12.1 for ; Thu, 24 Aug 2023 15:31:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692916299; x=1693521099; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=/p27l67Kn1HIoXp/f59LPHhlkBLW4+1enNUjjEwJAaM=; b=l+OFeHrxiGjDfVbkjEUK1WxjC1qY2hEdT7jmUKCqJxkNW9Dq8c3M3NaT6pK3EQGLEZ PiL6YmqgEtvFfp54RBvQwf7uj1MjgdGGcc2BpVkaX+LOdLPyK7KFGa+XDfQdeRUlM/Yc sPQgrNLRRRyg+TegzZB+SNzn4aWUcD4H/xdY5M/URnpMZebeC90843HHa9uqoogh35yr iCf45/vWCbqUY4T1VwYI8qsJp7hYtRiIwflxljIIaWOm27cNcLLU3RBuvNZ5fVnde4Jq vLTzpC2EhBzmpSC61T8WMp4oZE0URD+iPLqnIK9sTbMkYSBvQq9UYgGcvNaEesOG1bgV ZZLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692916299; x=1693521099; 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=/p27l67Kn1HIoXp/f59LPHhlkBLW4+1enNUjjEwJAaM=; b=Iyq6lpRTd7rHpyFRwpyI6liALutPNW/E8gmiYtB/zwet0vsteCdYjJtCXyjn5WVogS /qF1ZUrJHYMDv8miNIlp2AMWWdlGwdrjyQeh8WQgNrxfSWr689yWPCBNbZ0/6BS2HjeQ vZiegkucQsW4Rxj3tayDY82N2JfqQILhHzLbcaad/bzAsKuzs+nhxk+G49EbEsZmREhw ivdwxSqhI3WHj0HxZ14L0PWrkldfjFcIZQym9MsOTbv6Gk72a3utPNQxvB143CleE8Kd xCAI4zzIkWcomxbUfxjNvQWB5/iaLpBboz7l59DpxSEvBBrqtBUdVajoI4aWMIoAQzQX 90yw== X-Gm-Message-State: AOJu0Yx6rejknhe7WwNKtdkWz0nyqicmu3VV6GyWLWNXYMsSKUfHDr+U aLQOEWNHAG2YiXL5i4sSTrERVbdwvBGQzaDwTcDvvA== X-Google-Smtp-Source: AGHT+IFIvVy3Lr4XQrflXRfQXFNpH4qSj85FdCz4N9joF7DmN/XRZLC9VGoCp1T8hkYxkfP2oJCNb7jXoH9Rv4Hl1As= X-Received: by 2002:aa7:dad5:0:b0:523:2847:fb5a with SMTP id x21-20020aa7dad5000000b005232847fb5amr11467646eds.40.1692916299505; Thu, 24 Aug 2023 15:31: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: <202308242029.37OKTmVs091755@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Thu, 24 Aug 2023 16:31:28 -0600 Message-ID: Subject: Re: git: af93fea71038 - main - timerfd: Move implementation from linux compat to sys/kern To: Konstantin Belousov Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000aac0f30603b2ca1b" X-Rspamd-Queue-Id: 4RWyVj16cLz3cFt X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --000000000000aac0f30603b2ca1b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Aug 24, 2023 at 4:18=E2=80=AFPM Konstantin Belousov wrote: > On Thu, Aug 24, 2023 at 08:29:48PM +0000, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Daf93fea710385b2b11f0cabd377e7ed= 6f3d97c34 > > > > commit af93fea710385b2b11f0cabd377e7ed6f3d97c34 > > Author: Jake Freeland > > AuthorDate: 2023-08-24 04:39:54 +0000 > > Commit: Warner Losh > > CommitDate: 2023-08-24 20:28:56 +0000 > > > > timerfd: Move implementation from linux compat to sys/kern > > > > Move the timerfd impelemntation from linux compat code to sys/kern. > Use > > it to implement the new system calls for timerfd. Add a hook to > kern_tc > > to allow timerfd to know when the system time has stepped. Add kque= ue > > support to timerfd. Adjust a few names to be less Linux centric. > > > > RelNotes: YES > > Reviewed by: markj (on irc), imp, kib (with reservations), jhb > (slack) > > Differential Revision: https://reviews.freebsd.org/D38459 > >[snip] In my haste to get this in, I neglected to clear the commit message with Jake, and missed a few things that he refactored. He pointed out after I pushed the change: One minor complaint, though. Your commit message fails to recognize how much refactoring work I put into timerfd. I refactored a lot of important bits in the native version. The previous Linux-compat version was inaccurat= e and had functional inconsistencies with Linux's timerfd. Just to list them, I added: * Time jump handling through the TFD_TIMER_CANCEL_ON_SET flag. * Accuracy improvements (the Linux-compat implementation would deviate by seconds). * Guards for DoS attacks so timerfd could account for missed events. * Consistent error handling and expected return values that parody Linux. * Descriptor stat() support. for which I offer my profuse apologies for the oversight. > I did a very quick look over the added code. > > I do not see any protection for the timerfd_head list manipulation. > > It is not clear what is protected by tfd->tfd_lock: e.g. in timerfd_stat(= ) > it covers reading of items, writing of which is not protected by the mtx, > everything except tfd_atim. > There is no annotations in the timer structure for the locking regime. > That's a good point. I'll work with Jake to add them. > stat st_ctim is always zero, this is somewhat strange. > I'm not sure what's going on there. > The > tfd =3D fp->f_data; > if (tfd =3D=3D NULL || fp->f_type !=3D DTYPE_TIMERFD) { > triggers UB when f_type is not DTYPE_TIMERFD. > Good catch. I didn't notice. > compat32 stuff was put into the sys/kern instead of sys/compat/freebsd32. > sys/timerfd.h pollutes userspace with sys/proc.h. > I don't think that was intentional. I didn't notice, but you are right on both of these. I'll work with Jake to fix. The second one is easier to fix. > The regenerated files were put in the same commit as (probably) human > written files, why? > That's my mistake. With brooks' new checks in Cirrus CI, I thought we'd transitioned to doing that in the same commit. I misunderstood. Warner --000000000000aac0f30603b2ca1b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Aug 24, 2023 at 4:18=E2=80=AF= PM Konstantin Belousov <kostikbel= @gmail.com> wrote:
On Thu, Aug 24, 2023 at 08:29:48PM +0000, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3Daf93fea710385b2b11f0cabd377e7ed6f3d97c34<= /a>
>
> commit af93fea710385b2b11f0cabd377e7ed6f3d97c34
> Author:=C2=A0 =C2=A0 =C2=A0Jake Freeland <jfree@freebsd.org>
> AuthorDate: 2023-08-24 04:39:54 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2023-08-24 20:28:56 +0000
>
>=C2=A0 =C2=A0 =C2=A0timerfd: Move implementation from linux compat to s= ys/kern
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Move the timerfd impelemntation from linux compat c= ode to sys/kern. Use
>=C2=A0 =C2=A0 =C2=A0it to implement the new system calls for timerfd. A= dd a hook to kern_tc
>=C2=A0 =C2=A0 =C2=A0to allow timerfd to know when the system time has s= tepped. Add kqueue
>=C2=A0 =C2=A0 =C2=A0support to timerfd. Adjust a few names to be less L= inux centric.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0RelNotes: YES
>=C2=A0 =C2=A0 =C2=A0Reviewed by: markj (on irc), imp, kib (with reserva= tions), jhb (slack)
>=C2=A0 =C2=A0 =C2=A0Differential Revision: https://reviews.fre= ebsd.org/D38459
>[snip]

In my haste to get this in, I ne= glected to clear the commit message with Jake, and missed a few things that=
he refactored. He pointed out after I pushed the change:

One minor complaint, though. Your commit message fai= ls to recognize
how m= uch refactoring work I put into timerfd. I refactored a lot of important
bits in the native vers= ion. The previous Linux-compat version was inaccurate
and had functional inconsistencies with Li= nux's timerfd.
Just to list them,= I added:
* Time jump= handling through the TFD_TIMER_CANCEL_ON_SET flag.
* Accuracy improvements (the Linux-compat im= plementation would deviate by seconds).
* Guards for DoS attacks so timerfd could account for mi= ssed events.
* Consis= tent error handling and expected return values that parody Linux.
* Descriptor stat() support.

for which I offer my profuse apologies for the oversight.
=
=C2=A0
I did a = very quick look over the added code.

I do not see any protection for the timerfd_head list manipulation.

It is not clear what is protected by tfd->tfd_lock: e.g. in timerfd_stat= ()
it covers reading of items, writing of which is not protected by the mtx, everything except tfd_atim.
There is no annotations in the timer structure for the locking regime.
<= /blockquote>

That's a good point. I'll work with= Jake to add them.
=C2=A0
stat st_ctim is always zero, this is somewhat strange.

I'm not sure what's going on there.
=C2= =A0
The
=C2=A0 =C2=A0 =C2=A0 =C2=A0 tfd =3D fp->f_data;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (tfd =3D=3D NULL || fp->f_type !=3D DTYPE= _TIMERFD) {
triggers UB when f_type is not DTYPE_TIMERFD.

Good catch. I didn't notice.
=C2=A0
compat32 stuff was put into the sys/kern instead of sys/compat/freebsd32. sys/timerfd.h pollutes userspace with sys/proc.h.

=
I don't think that was intentional. I didn't notice, but= you are right on both of these.
I'll work with Jake to fix. = The second one is easier to fix.
=C2=A0
The regenerated files were put in the same commit as (probably) human
written files, why?

That's my mista= ke. With brooks' new checks in Cirrus CI, I thought=C2=A0 we'd tran= sitioned to
doing that in the same commit. I misunderstood.
=

Warner
--000000000000aac0f30603b2ca1b-- From nobody Thu Aug 24 22:46: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 4RWyqn5mrcz4rg7w; Thu, 24 Aug 2023 22:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWyqn4s87z3fDt; Thu, 24 Aug 2023 22:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692917189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8qtzJw90qODyL5EVspSn6XNOGXTCOpjkkpq02WobcdE=; b=eRwDXulJDur01kOURhfxHRd6R/IWUeTafgqf3FDhnkB/QIi5NV493s59h7iwS7hnK7w/lK usf0sw6vx/lQRNHXwgAKpHGI7E40s9R13NjnbLCi8wT8w3FOlBctJONX85uxF+Ciknf42c llM2lEQObEqTbrFDlqmT5TI/qfMaFx/tC78r2Lw5+WCVliy3AFjFzQxhVgpR7ABGeXlSq5 aP9cFqjKCpyi0L0g2y7rBVjLst7f1JJdJiwdmMTvrt2rCKQB3VeBiykpPlkLJ8geDnEQNY gZOKRRsmIX9yAXFTbQ39NSEp24cJHGJxUfiToadqXLajYhoPu8MpSSFvI4B+rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692917189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8qtzJw90qODyL5EVspSn6XNOGXTCOpjkkpq02WobcdE=; b=clA5JU1iCcSojVUqJKe42556fx68ICSkmvXlFosR/ZvPFe3++bcwXjrsopqaIsev7Vtzks tpwJ2OqbYgvrmH54HTHuiUk74TCkTl96qMgF7maiyD/W8Q8NRJG+O+b9nCLXFv7/VIyU4Z Yin69ZyBnCZqRMGT/tXsn/i4efKcUljKGJK0Akl/H0EuWfdpUWUjjuPcKhNtZZE3MD5w7d ujov2HZfUm5IovWB5yfi8isLd2V/vDCbV02c+VVLS12rkFGN854OpDiQO8rXK2Yqphf0Lu sZCeBNj+po7a1N9O5vLl7zRZL//Q5TZnFfSEytcEwclY+bZrh/NHMAno9ec7WA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692917189; a=rsa-sha256; cv=none; b=IZ2GG4KZt0qZkQVSSpOT1002RtY+lHAESGt1aYW4wS99qePFSRtln2kt7NotUNuD82DVOa MJwspQwJMK31H8Pqrmkc0BfqJtfxUeKvgJ6qIHDw286vWlSLhEAJ/OuLgn53R1Nbb5COr7 p13QJCRMrRqdiKVaTp0NS0HlcrMZDxMbn8QZUHewo9beRstmGyxBc9f4E/hTaH9bPNy987 mn5/tyJvtFxcdLqBQHpgIyiU3RpV1ctaZrsxQ/l8fQ00B4SNytGDtJ3lhh5s1BUAyVFFqY 8+ktGcmhMtvfVJEp+zw6NWoTgQqGNd4QxTaondxMNfetfHcToD+spevjFzu2Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWyqn3nhxzlK9; Thu, 24 Aug 2023 22:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OMkTaq024522; Thu, 24 Aug 2023 22:46:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OMkTxX024519; Thu, 24 Aug 2023 22:46:29 GMT (envelope-from git) Date: Thu, 24 Aug 2023 22:46:29 GMT Message-Id: <202308242246.37OMkTxX024519@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 30cdbb5833f6 - main - freebsd32: Remove mac_syscall from the unimpl 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: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30cdbb5833f66354dee8e976bd1d7c2c699600c8 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=30cdbb5833f66354dee8e976bd1d7c2c699600c8 commit 30cdbb5833f66354dee8e976bd1d7c2c699600c8 Author: Stephen J. Kiernan AuthorDate: 2023-08-24 15:32:26 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-08-24 22:45:31 +0000 freebsd32: Remove mac_syscall from the unimpl list The mac_syscall system call works fine as long as any MAC module that provides a mpo_syscall method handles compat32 appropriately. Regenerate system call files for freebsd32. Reviewed by: sjg Obtained from: Juniper Networks, Inc. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41575 --- sys/compat/freebsd32/freebsd32_syscall.h | 1 + sys/compat/freebsd32/freebsd32_syscalls.c | 2 +- sys/compat/freebsd32/freebsd32_sysent.c | 2 +- sys/compat/freebsd32/freebsd32_systrace_args.c | 30 ++++++++++++++++++++++++++ sys/compat/freebsd32/syscalls.conf | 4 ++-- 5 files changed, 35 insertions(+), 4 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index e3777730be1c..3123c3b1f74c 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -326,6 +326,7 @@ #define FREEBSD32_SYS_lchflags 391 #define FREEBSD32_SYS_uuidgen 392 #define FREEBSD32_SYS_freebsd32_sendfile 393 +#define FREEBSD32_SYS_mac_syscall 394 #define FREEBSD32_SYS_freebsd11_freebsd32_getfsstat 395 #define FREEBSD32_SYS_freebsd11_statfs 396 #define FREEBSD32_SYS_freebsd11_fstatfs 397 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index ccc910ee5ca9..e64c36b32d00 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -399,7 +399,7 @@ const char *freebsd32_syscallnames[] = { "lchflags", /* 391 = lchflags */ "uuidgen", /* 392 = uuidgen */ "freebsd32_sendfile", /* 393 = freebsd32_sendfile */ - "#394", /* 394 = mac_syscall */ + "mac_syscall", /* 394 = mac_syscall */ "compat11.freebsd32_getfsstat", /* 395 = freebsd11 freebsd32_getfsstat */ "compat11.statfs", /* 396 = freebsd11 statfs */ "compat11.fstatfs", /* 397 = freebsd11 fstatfs */ diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index fec6f4a47bd6..2bb45fc3d2e2 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -455,7 +455,7 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(lchflags_args), .sy_call = (sy_call_t *)sys_lchflags, .sy_auevent = AUE_LCHFLAGS, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 391 = lchflags */ { .sy_narg = AS(uuidgen_args), .sy_call = (sy_call_t *)sys_uuidgen, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 392 = uuidgen */ { .sy_narg = AS(freebsd32_sendfile_args), .sy_call = (sy_call_t *)freebsd32_sendfile, .sy_auevent = AUE_SENDFILE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 393 = freebsd32_sendfile */ - { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 394 = mac_syscall */ + { .sy_narg = AS(mac_syscall_args), .sy_call = (sy_call_t *)sys_mac_syscall, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 394 = mac_syscall */ { compat11(AS(freebsd11_freebsd32_getfsstat_args),freebsd32_getfsstat), .sy_auevent = AUE_GETFSSTAT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 395 = freebsd11 freebsd32_getfsstat */ { compat11(AS(freebsd11_statfs_args),statfs), .sy_auevent = AUE_STATFS, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 396 = freebsd11 statfs */ { compat11(AS(freebsd11_fstatfs_args),fstatfs), .sy_auevent = AUE_FSTATFS, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 397 = freebsd11 fstatfs */ diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 2c26a0ddab2f..fb1fddc6ae5e 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -1848,6 +1848,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 8; break; } + /* mac_syscall */ + case 394: { + struct mac_syscall_args *p = params; + uarg[a++] = (intptr_t)p->policy; /* const char * */ + iarg[a++] = p->call; /* int */ + uarg[a++] = (intptr_t)p->arg; /* void * */ + *n_args = 3; + break; + } /* ksem_close */ case 400: { struct ksem_close_args *p = params; @@ -6328,6 +6337,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* mac_syscall */ + case 394: + switch (ndx) { + case 0: + p = "userland const char *"; + break; + case 1: + p = "int"; + break; + case 2: + p = "userland void *"; + break; + default: + break; + }; + break; /* ksem_close */ case 400: switch (ndx) { @@ -10145,6 +10170,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* mac_syscall */ + case 394: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* ksem_close */ case 400: if (ndx == 0 || ndx == 1) diff --git a/sys/compat/freebsd32/syscalls.conf b/sys/compat/freebsd32/syscalls.conf index de198206dc47..af0409d8b3f1 100644 --- a/sys/compat/freebsd32/syscalls.conf +++ b/sys/compat/freebsd32/syscalls.conf @@ -47,7 +47,7 @@ syscall_no_abi_change="aio_cancel thr_exit thr_kill thr_kill2 thr_self thr_set_n obsol="getkerninfo" # Syscalls without implementations: -# *mac_* - should be implemented +# __mac_* - should be implemented # afs3_syscall - requires significant porting, probably doesn't make sense # kldsym - can't be implemented (kernel virtual addresses can't fit in 32-bits) # lgetfh - should be implemented @@ -55,4 +55,4 @@ obsol="getkerninfo" # nnpfs_syscall - requires significant porting, probably doesn't make sense # ntp_gettime - should be implemented # thr_create - was unimplemented and appears to be unnecessicary -unimpl="afs3_syscall kldsym __mac_get_proc __mac_set_proc __mac_get_fd __mac_get_file __mac_set_fd __mac_set_file __mac_get_pid __mac_get_link __mac_set_link __mac_execve mac_syscall nfssvc nlm_syscall ntp_gettime lgetfh nnpfs_syscall thr_create" +unimpl="afs3_syscall kldsym __mac_get_proc __mac_set_proc __mac_get_fd __mac_get_file __mac_set_fd __mac_set_file __mac_get_pid __mac_get_link __mac_set_link __mac_execve nfssvc nlm_syscall ntp_gettime lgetfh nnpfs_syscall thr_create" From nobody Thu Aug 24 22:51: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 4RWyxh4M1Fz4rgJ7; Thu, 24 Aug 2023 22:51: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 4RWyxh3vxyz3fPf; Thu, 24 Aug 2023 22:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692917496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iRMmX39Ykc0TtW+/3IljK1mZBuhdlf9lJkCIA6CHS1w=; b=V9Qq3o2AH1ECM1TV6CrYRMdXbb+KxkcPtPylpscU9tZz8LNMkHQ4L6KkN9S7PogU+s/W6U GIPFbdw2rmOgCzbcKDin56EfpO8AXA8ir56u8cYNf8tiQszZ2a5YHBy8JWoV/jkclvg7jp sRMaANekzZNYg0krNQG+C2N8yBfERrK4pEsDjPcvY/LRu3YRBn840dgsOTnEgIuIt03Sr9 VuYdZruLFx0YXyxZ+C2uTP3BeDZCZ5vZE5rfDSDx8py3prnJ9KzAQLSil4yvHeKC6WCzCn T31UOmRWGBRIzw/LHlQ5ziTo8fMahl3wRntZ6bylxISqrm/SDVpoTPMFHEb/Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692917496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iRMmX39Ykc0TtW+/3IljK1mZBuhdlf9lJkCIA6CHS1w=; b=HnGd1S2YFQNSetyHePqo5IEF6n1NcoqijizcQ6OzqB+Ea29F1eptVHkacBafvenpQ89BmZ K14TuyaSC6Df0huKX9rjDd8qXNnauxu1zzsIlCw0j00zqMmI7OzrBieJ8VuFBRczWtPe7f 9mHv0LCQrsI6H06n6xHva5RAM3X6m5PiKTfKrPiWHvvnAHEsUJ/htCY6PKwAzD+f8zDQ0C oS//mr9CNDbyQF+ETbSGyy/O7d9D//dWbwHWJ807PcI1/6VpzeJmzoja74RbiHD5GvcIP3 U0WVvXCVRCny1nSQTZV8GWs3AmLfpRDkt3D4DpZ5cU3cZ8/RdlhC9FCxy9TinQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692917496; a=rsa-sha256; cv=none; b=sVloYR7zTrr2VUHxTsEiBtIC3Ba6dnzQG0HoWVBk3gHhLr3SSOdpwIlvaxODdZDdTY+a+9 jENFYfZbb4JtuMPliVvfG2rQ+esMiFejtVRS3yhi8GekV8L6feSiFh641y1a4PjQOYQQnP fxkVdDU0nxs5OOcfcgZaJUwujY2FhlbZb7FPk2kM02dxlrmEX8izQM75nm97DF/xRKt0sA T6EZRO911vTFaeCj2er7pYksp9zIvaYPPug5ZTstvrlZMq5rrkRoAkeikrIGB+OxCU86wv xkZMAGcifjE3VHGjT5jy5BNVbJ0DEWG1rw+IroS8wgeqHr0opII8qOwkw1oCNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWyxh2z2NzlKy; Thu, 24 Aug 2023 22:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OMpahs034678; Thu, 24 Aug 2023 22:51:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OMpaji034675; Thu, 24 Aug 2023 22:51:36 GMT (envelope-from git) Date: Thu, 24 Aug 2023 22:51:36 GMT Message-Id: <202308242251.37OMpaji034675@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: 712806fc4b54 - main - vfs: retried++ -> retried = true for the boolean List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 712806fc4b5470eb7d9ce537e3cdf3b386455d86 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=712806fc4b5470eb7d9ce537e3cdf3b386455d86 commit 712806fc4b5470eb7d9ce537e3cdf3b386455d86 Author: Mateusz Guzik AuthorDate: 2023-08-24 22:49:47 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-24 22:50:31 +0000 vfs: retried++ -> retried = true for the boolean No real changes. Noted by: rpokala --- sys/kern/vfs_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index f1e1d1e3a0ca..1c6827ba0587 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1310,7 +1310,7 @@ vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp) TAILQ_REMOVE(&vnode_list, mvp, v_vnodelist); TAILQ_INSERT_HEAD(&vnode_list, mvp, v_vnodelist); vp = mvp; - retried++; + retried = true; continue; } From nobody Thu Aug 24 23:08: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 4RWzJc5Z68z4rhYC; Thu, 24 Aug 2023 23:08: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 4RWzJc56BWz4BC9; Thu, 24 Aug 2023 23:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692918480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyKQiYpZ8dRtdPcj8WLWhHSLYOD5ds+PAb5NjcN1o9I=; b=yRmWsH5ikot5qO8dJp777i+qLNUG2uYJDW7ZhNqSOJoufsvFAajFuTncJFTeBG/UlR3hSh 8NYuX7yVWRBYnyowdPDh0CuTNFK9Mg2VMnVB7dPAVkPvMMw+xLWzB21mD/C4dCF8zKJFBp ko9Jz61mSK5MYF+NBvjn3ROZaCjPndbjtXhBRUtl7t0GwmnllagLWgH5ipxX8ZQ9INv8kW eOoLRTBeuQOYCadY5QCYFlUma+Tw/NROTeqWp5uNkEJrU1wmOJU/ty+A+morGN5dFW7VUE snkHtuiTcZgdIr/8QEfaGHCwNDBmSjSihxD2UfZREE7uGh4FTWoqIjtn4h57PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692918480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyKQiYpZ8dRtdPcj8WLWhHSLYOD5ds+PAb5NjcN1o9I=; b=icYby79SlTIK1psy2yR4CAIqUYwwemtFwHdkhCuKxehnfYF7euAl7UNYs5LRUDR61fqD0E HvRKHWBgPEtR5suJdNsrZgcX7aK0JMkntJw+3StsQkzb8twi/HlLzlgGgmfbEZ6zyU1YS2 05+7EiRkvd8IgEU+BqkxlGHpEIUHTjmM92X7Gm93MprEYQrAFk2tzITjSU8N4VtmlzaMjJ ZCfrhlsqenVuT8PeisXDar4cD2vZL+Ftj9PPUREZPjZ4/xIfOi+U9EpM2IionPoLWKzBTD h3dh/uoN1+P0wSNUAdlVusCvImbp5tX3o+ywRhfb6X5rAdzrPy4sBBK233mW1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692918480; a=rsa-sha256; cv=none; b=PRf2L4QUBBHEirl2P6NHn8TtCeupo3cO7GTtPqbH4+JawjK35OV3vLheUNUlWVZPFmsy60 MBcdc7HIhWLkVNDCObdjj+eQmdolRwu4N4xEqmZK8RnV1P75fdl2kX1xiqMePHem/Ymc3e 6e+JfZn8MkNS0o3m5FiLdHbwpvN78eVuRIrNvzNuR0gHXPn22lbOPTB4GqBIKx90uA9ZXT KAFCPyMrWr9WszFE6X8JbsP22VJbHH2ohIwrFE31HEE9bnBXG+SfYvEXLeMgst/GUv4dF5 I6UXr4x0Ho8aA+NUrFqochyou09ER1POnYYonfUM+IQApOSD8cbNaLTWdoG7pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWzJc3tCtzlNL; Thu, 24 Aug 2023 23:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ON80YA059395; Thu, 24 Aug 2023 23:08:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ON80wQ059392; Thu, 24 Aug 2023 23:08:00 GMT (envelope-from git) Date: Thu, 24 Aug 2023 23:08:00 GMT Message-Id: <202308242308.37ON80wQ059392@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: 29a16ce065db - stable/14 - release: update stable/14 following branching from main List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 29a16ce065dbc28bc9e87c9bfadb08bb58b137e4 Auto-Submitted: auto-generated The branch stable/14 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=29a16ce065dbc28bc9e87c9bfadb08bb58b137e4 commit 29a16ce065dbc28bc9e87c9bfadb08bb58b137e4 Author: Glen Barber AuthorDate: 2023-08-24 23:07:33 +0000 Commit: Glen Barber CommitDate: 2023-08-24 23:07:33 +0000 release: update stable/14 following branching from main Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- UPDATING | 16 ++--------- .../jemalloc/include/jemalloc/jemalloc_FreeBSD.h | 2 +- libexec/rc/rc.conf | 2 +- release/Makefile | 3 --- release/release.conf.sample | 2 +- share/mk/src.opts.mk | 4 +-- sys/amd64/conf/GENERIC | 13 --------- sys/amd64/conf/GENERIC-NODEBUG | 31 ---------------------- sys/arm/conf/GENERIC-NODEBUG | 31 ---------------------- sys/arm/conf/std.armv6 | 13 --------- sys/arm/conf/std.armv7 | 13 --------- sys/arm64/conf/GENERIC-MMCCAM-NODEBUG | 14 ---------- sys/arm64/conf/GENERIC-NODEBUG | 31 ---------------------- sys/arm64/conf/std.arm64 | 11 -------- sys/i386/conf/GENERIC | 10 ------- sys/i386/conf/GENERIC-NODEBUG | 31 ---------------------- sys/powerpc/conf/GENERIC | 9 ------- sys/powerpc/conf/GENERIC-NODEBUG | 31 ---------------------- sys/powerpc/conf/GENERIC64 | 9 ------- sys/powerpc/conf/GENERIC64-NODEBUG | 31 ---------------------- sys/powerpc/conf/GENERIC64LE | 9 ------- sys/powerpc/conf/GENERIC64LE-NODEBUG | 31 ---------------------- sys/riscv/conf/GENERIC | 12 --------- sys/riscv/conf/GENERIC-NODEBUG | 31 ---------------------- sys/sys/param.h | 2 +- 25 files changed, 8 insertions(+), 384 deletions(-) diff --git a/UPDATING b/UPDATING index b818d4dc8d29..92a207f4abf9 100644 --- a/UPDATING +++ b/UPDATING @@ -12,20 +12,8 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: - FreeBSD 14.x has many debugging features turned on, in both the kernel - and userland. These features attempt to detect incorrect use of - system primitives, and encourage loud failure through extra sanity - checking and fail stop semantics. They also substantially impact - system performance. If you want to do performance measurement, - benchmarking, and optimization, you'll want to turn them off. This - includes various WITNESS- related kernel options, INVARIANTS, malloc - debugging flags in userland, and various verbose features in the - kernel. Many developers choose to disable these features on build - machines to maximize performance. (To completely disable malloc - debugging, define WITH_MALLOC_PRODUCTION in /etc/src.conf and rebuild - world, or to merely disable the most expensive debugging functionality - at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20230818: + __FreeBSD_version 1400095 after the branching stable/14 from main. 20230817: Serial communication (in boot loaders, kernel, and userland) has diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h index 00848c0c48e3..ea8e8d42b14e 100644 --- a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h +++ b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h @@ -5,7 +5,7 @@ #undef JEMALLOC_OVERRIDE_VALLOC #ifndef MALLOC_PRODUCTION -#define JEMALLOC_DEBUG +#define MALLOC_PRODUCTION #endif #undef JEMALLOC_DSS diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 26e189953044..f5d0605c8436 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -642,7 +642,7 @@ lpd_flags="" # Flags to lpd (if enabled). nscd_enable="NO" # Run the nsswitch caching daemon. chkprintcap_enable="NO" # Run chkprintcap(8) before running lpd. chkprintcap_flags="-d" # Create missing directories by default. -dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO); +dumpdev="NO" # Device to crashdump to (device name, AUTO, or NO); # this should be commented out here # for stable branches to respect kenv. dumpon_flags="" # Options to pass to dumpon(8), followed by dumpdev. diff --git a/release/Makefile b/release/Makefile index 1ea3f6a284a5..92d0106384a6 100644 --- a/release/Makefile +++ b/release/Makefile @@ -186,7 +186,6 @@ disc1: packagesystem ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf - echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf @@ -223,7 +222,6 @@ bootonly: packagesystem ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf - echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf @@ -258,7 +256,6 @@ dvd: packagesystem ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf - echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf diff --git a/release/release.conf.sample b/release/release.conf.sample index 40f8457e8f89..ac9c1aaa254e 100644 --- a/release/release.conf.sample +++ b/release/release.conf.sample @@ -18,7 +18,7 @@ GITSRC="src.git" GITPORTS="ports.git" ## Set the src/, ports/, and doc/ branches or tags. -SRCBRANCH="main" +SRCBRANCH="stable/14" PORTBRANCH="main" ## Sample configuration for using git from ports. diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 1183a8202168..dd88772fc43b 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -126,7 +126,6 @@ __DEFAULT_YES_OPTIONS = \ LLD \ LLD_BOOTSTRAP \ LLD_IS_LD \ - LLVM_ASSERTIONS \ LLVM_COV \ LLVM_CXXFILT \ LOADER_GELI \ @@ -162,6 +161,7 @@ __DEFAULT_YES_OPTIONS = \ QUOTAS \ RADIUS_SUPPORT \ RBOOTD \ + REPRODUCIBLE_BUILD \ RESCUE \ ROUTED \ SENDMAIL \ @@ -205,11 +205,11 @@ __DEFAULT_NO_OPTIONS = \ HESIOD \ LOADER_VERBOSE \ LOADER_VERIEXEC_PASS_MANIFEST \ + LLVM_ASSERTIONS \ LLVM_BINUTILS \ MALLOC_PRODUCTION \ OFED_EXTRA \ OPENLDAP \ - REPRODUCIBLE_BUILD \ RPCBIND_WARMSTART_SUPPORT \ SORT_THREADS \ ZONEINFO_LEAPSECONDS_SUPPORT \ diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 8d513fdc5f4c..a88f5713de72 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -92,19 +92,6 @@ options RCTL # Resource limits # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -options BUF_TRACKING # Track buffer history -options DDB # Support DDB. -options FULL_BUF_TRACKING # Track more buffer history -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options QUEUE_MACRO_DEBUG_TRASH # Trash queue(2) internal pointers on invalidation -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Kernel Sanitizers #options COVERAGE # Generic kernel coverage. Used by KCOV diff --git a/sys/amd64/conf/GENERIC-NODEBUG b/sys/amd64/conf/GENERIC-NODEBUG deleted file mode 100644 index 85ff32ea329b..000000000000 --- a/sys/amd64/conf/GENERIC-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/amd64 -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC -include "../../conf/std.nodebug" - -ident GENERIC-NODEBUG diff --git a/sys/arm/conf/GENERIC-NODEBUG b/sys/arm/conf/GENERIC-NODEBUG deleted file mode 100644 index 58f78036470d..000000000000 --- a/sys/arm/conf/GENERIC-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/arm -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC -include "../../conf/std.nodebug" - -ident GENERIC-NODEBUG diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6 index f60520d7dd2a..e33da4ceb63a 100644 --- a/sys/arm/conf/std.armv6 +++ b/sys/arm/conf/std.armv6 @@ -62,19 +62,6 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -options DDB # Support DDB -options GDB # Support remote GDB -#options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence -options USB_DEBUG # Enable usb debug support code -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default - # Optional extras, never enabled by default: #options BOOTVERBOSE #options DEBUG # May result in extreme spewage diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7 index 5c1e63af1bad..5858658c9ced 100644 --- a/sys/arm/conf/std.armv7 +++ b/sys/arm/conf/std.armv7 @@ -62,19 +62,6 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -options DDB # Support DDB -options GDB # Support remote GDB -#options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence -options USB_DEBUG # Enable usb debug support code -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default - # Optional extras, never enabled by default: #options BOOTVERBOSE #options DEBUG # May result in extreme spewage diff --git a/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG b/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG deleted file mode 100644 index 6a475c8c6325..000000000000 --- a/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG +++ /dev/null @@ -1,14 +0,0 @@ -# -# GENERIC-MMCCAM-NODEBUG -# -# Custom kernel for arm64 plus MMCCAM as opposed to the prior MMC stack. It is -# present to keep it building in tree since it wouldn't work in LINT. This -# version without debugging features. -# - -#NO_UNIVERSE - -include GENERIC-MMCCAM -include "../../conf/std.nodebug" - -ident GENERIC-MMCCAM-NODEBUG diff --git a/sys/arm64/conf/GENERIC-NODEBUG b/sys/arm64/conf/GENERIC-NODEBUG deleted file mode 100644 index a0dbb030c109..000000000000 --- a/sys/arm64/conf/GENERIC-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/arm64 -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC -include "../../conf/std.nodebug" - -ident GENERIC-NODEBUG diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index a19e7a95ef98..02631aa32164 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -71,17 +71,6 @@ options PERTHREAD_SSP # Per-thread SSP canary # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Kernel Sanitizers #options COVERAGE # Generic kernel coverage. Used by KCOV diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 00932195efcd..c8e9cd439d74 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -86,16 +86,6 @@ options RCTL # Resource limits # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/i386/conf/GENERIC-NODEBUG b/sys/i386/conf/GENERIC-NODEBUG deleted file mode 100644 index 64b9ecb8a332..000000000000 --- a/sys/i386/conf/GENERIC-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/i386 -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC -include "../../conf/std.nodebug" - -ident GENERIC-NODEBUG diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index b01a88d34138..c839e2d63b9e 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -89,15 +89,6 @@ options RCTL # Resource limits # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -options DDB # Support DDB -#options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/powerpc/conf/GENERIC-NODEBUG b/sys/powerpc/conf/GENERIC-NODEBUG deleted file mode 100644 index 9d069a41acc1..000000000000 --- a/sys/powerpc/conf/GENERIC-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/powerpc -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC -include "../../conf/std.nodebug" - -ident GENERIC-NODEBUG diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 45897555791a..c413e37b44fb 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -99,15 +99,6 @@ options RCTL # Resource limits # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -options DDB # Support DDB -#options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/powerpc/conf/GENERIC64-NODEBUG b/sys/powerpc/conf/GENERIC64-NODEBUG deleted file mode 100644 index 2659899940ef..000000000000 --- a/sys/powerpc/conf/GENERIC64-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC64-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/powerpc -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC64. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC64 -include "../../conf/std.nodebug" - -ident GENERIC64-NODEBUG diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 2cd53b860126..83cf664bd5d7 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -95,15 +95,6 @@ options RCTL # Resource limits # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -options DDB # Support DDB -#options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Kernel dump features. options EKCD # Support for encrypted kernel dumps diff --git a/sys/powerpc/conf/GENERIC64LE-NODEBUG b/sys/powerpc/conf/GENERIC64LE-NODEBUG deleted file mode 100644 index ab48bf7a0547..000000000000 --- a/sys/powerpc/conf/GENERIC64LE-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC64LE-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/powerpc -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC64LE. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC64LE -include "../../conf/std.nodebug" - -ident GENERIC64LE-NODEBUG diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 60b96c52f661..5b02f1694fa3 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -175,18 +175,6 @@ device da9063_pmic # Dialog Semiconductor DA9063 PMIC # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence -# options EARLY_PRINTF -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Kernel dump features. options ZSTDIO # zstd-compressed kernel and user dumps diff --git a/sys/riscv/conf/GENERIC-NODEBUG b/sys/riscv/conf/GENERIC-NODEBUG deleted file mode 100644 index ca4d07fbd2da..000000000000 --- a/sys/riscv/conf/GENERIC-NODEBUG +++ /dev/null @@ -1,31 +0,0 @@ -# -# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file -# for FreeBSD/riscv -# -# This configuration file removes several debugging options, including -# WITNESS and INVARIANTS checking, which are known to have significant -# performance impact on running systems. When benchmarking new features -# this kernel should be used instead of the standard GENERIC. -# This kernel configuration should never appear outside of the HEAD -# of the FreeBSD tree. -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# - -include GENERIC -include "../../conf/std.nodebug" - -ident GENERIC-NODEBUG diff --git a/sys/sys/param.h b/sys/sys/param.h index 89f277056069..9a1ae2e2d8d4 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400096 +#define __FreeBSD_version 1400097 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Thu Aug 24 23:10: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 4RWzN25Scqz4rhkN; Thu, 24 Aug 2023 23:10: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 4RWzN24vWCz4CVV; Thu, 24 Aug 2023 23:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692918658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wyynI0wnzOhrRaPj+xjTkFridh6E22zJjMGJcnoixPI=; b=jU4PHHFyGkDP1UXSxEOmNt+rpKpS1Roy5bdC861+dzlyDiRlJdWMgQVNxyzY21+CoulLIt jiUJ+UBlWEPJwp3CSqwgNkFSwzfT4Nm10lnsjyoSWDEQISOfPuN1G9GPxsOE3haICNGuQ1 sMGcInfhW8wv2yHQoQ6sFftD8klhMN69+6yQpAjSgICnVFaLYLtXsqB2Ifzi0ekfPaf7l4 G3HI2SVQGTJDDieid1GgmI0UdSWbodO7a1AGCtG7n4qDCfTr1fLe/G5VicR6GlU8GsFcMW 5YrUX8ox5fAqIw1+I7IWsVc1KbQhsjZEaC42LHq6y0Pwd3hj9D5LA8V8d0f5Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692918658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wyynI0wnzOhrRaPj+xjTkFridh6E22zJjMGJcnoixPI=; b=KeDmjGVDHnUgegipjek2mg8xHA3txn0tYbNV3y8vx5QKVVAm9H6ifS7VoachG4O2s9XQCM 8OhHCU20uEJLN00zs1pruOUPWsLkmEg+gS7kJyupP0KkCNAamRPWUNyx4cmHbV1ITVjxkY j4kYs4P1dlIF9EswCuPwJRvqmz5BApssHcg56/Kt0T43m1aKijzzTIhR4xOE8oMyGDmmCZ 9hL3EU1FvX00zRqco8nhMsQ++5TSF466mIpup26V7SVSpKy8O0C8tWQ0/Wt0pw4E8YuB/d N/w5VyW9TD52hzqTriUaCVfb6RRG8L5fLggXZPYc2OaianTS6+HW0KHVcZVM9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692918658; a=rsa-sha256; cv=none; b=DfCP4UrFvG4l7dM2FQumntZ02jZKBOfZUn0do0s9ep4bzgMFPpswpUaWt2W8GTPaB9k55w WvbgNDn23mpwmx4DVvZwr8SmaFV4ZmkIdjgPOpl275N0kbQhsZohDzYB49aYb5y1csXicF RKWPmcs1uDvV1nMtscAcBGPvePD8u0pqfz1Rvt26NXH0X8GfMNCzbtrl0AW/xzaKu/H+gw 0xHV/KEc1mb1CxTa/qXGGV/IEw9WkN4K38kMB8ZvJ5NyvaadglM2zBOcrXRf3YIgORsguf ok5Fjl44MFzhZUFyeVN/u2/+1XWz4YANQIqPRQmT7sFD+zkwM8XKewVnRXnV8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWzN238hxzm19; Thu, 24 Aug 2023 23:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ONAvrA070920; Thu, 24 Aug 2023 23:10:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ONAv1K070917; Thu, 24 Aug 2023 23:10:57 GMT (envelope-from git) Date: Thu, 24 Aug 2023 23:10:57 GMT Message-Id: <202308242310.37ONAv1K070917@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Glen Barber Subject: git: aee253d8a7ae - main - update main to 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: gjb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aee253d8a7aea40189f8ca74138d6bed10948b1e Auto-Submitted: auto-generated The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=aee253d8a7aea40189f8ca74138d6bed10948b1e commit aee253d8a7aea40189f8ca74138d6bed10948b1e Author: Glen Barber AuthorDate: 2023-08-24 23:10:35 +0000 Commit: Glen Barber CommitDate: 2023-08-24 23:10:35 +0000 update main to 15 Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- UPDATING | 4 ++-- lib/clang/freebsd_cc_version.h | 2 +- lib/clang/include/lld/Common/Version.inc | 2 +- sys/conf/newvers.sh | 4 ++-- sys/sys/param.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/UPDATING b/UPDATING index b818d4dc8d29..9ad9c04a7560 100644 --- a/UPDATING +++ b/UPDATING @@ -12,8 +12,8 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: - FreeBSD 14.x has many debugging features turned on, in both the kernel +NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: + FreeBSD 15.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They also substantially impact diff --git a/lib/clang/freebsd_cc_version.h b/lib/clang/freebsd_cc_version.h index e9737b10d337..277744ae8624 100644 --- a/lib/clang/freebsd_cc_version.h +++ b/lib/clang/freebsd_cc_version.h @@ -1 +1 @@ -#define FREEBSD_CC_VERSION 1400006 +#define FREEBSD_CC_VERSION 1500000 diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index 20810f686dad..b30a085c61cf 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style -#define LLD_FREEBSD_VERSION 1400006 +#define LLD_FREEBSD_VERSION 1500000 #define LLD_VERSION_STRING "16.0.6 (FreeBSD llvmorg-16.0.6-0-g7cbf1a259152-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index fcdfadcad175..40821c100161 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -52,8 +52,8 @@ # TYPE="FreeBSD" -REVISION="14.0" -BRANCH="ALPHA2" +REVISION="15.0" +BRANCH="CURRENT" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/sys/sys/param.h b/sys/sys/param.h index 89f277056069..da88c3e28581 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400096 +#define __FreeBSD_version 1500000 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Thu Aug 24 23:25: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 4RWzhJ6jlWz4rjNn; Thu, 24 Aug 2023 23: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 4RWzhJ6DQcz4Jhv; Thu, 24 Aug 2023 23:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692919504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W3ra1KjF5OzW6t2m5gIpdrW61t9Hj5J7wFrwnQbL2C8=; b=yWDZHwUL3+IIV5YVXck0m6DE7jyoZ7hjmytgJhTmZMIYqTDzpUp4BLsXDHky3/oehlQsGv 3U7VE3fK+orqzBlgB7vnsjB8K0FtwPzKqJsUH9ZYvJX3smTsDxctg/CoB3Rk/uzc9jgD/6 qYSkLbvY3R98xX21ilBTsO01duFGfZausJ8GL6sVN5qoU38FA1+pIRqrH/AWumde3vfcWh dGTa87RRuMp4lnDd3T5pwLVgi3qXmrW6S9ShajlopAMAdHSivMa5cJKthKlOqMrapoOFkJ eOzjT3sAHu9SgayZ4lmj+ssWPt8kZxnocibBZSLtDmk/QSiTTrTSUROZU8xukw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692919504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W3ra1KjF5OzW6t2m5gIpdrW61t9Hj5J7wFrwnQbL2C8=; b=tLo893nw3gPyAfY4UUxQ3LPT+sFDwJH/o7I4MFNIquHOERi/FRiGqe8ivGyOTCNJtH25AZ 7VvcpDM2ooRzoipbEPwkR86hiTumB32Akdnl31SA+5glb309Go3OjGBuzsOQ2qCfmHYbhd uAa32/uKUw+5shha6seGJrAMavkHQXkvZDXJFkuPQMYSTsd/W99lPKk8O+hXBYu5FO25IM IW6ee8Q0gPDngBmFGrzTucfrYdNR6TwQC3ZxUMebxA0ENXR0UhJ4DwUKhY6pP1ZbeV/uaC 0d9WjiJuz7pV/05RRNMnlN/me7obzgDLw5AOsHf1oau1/LF30l/4TNlPLn3chA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692919504; a=rsa-sha256; cv=none; b=jrgikJfxuNEy6UpRuCQqvCoWTy/P4NR6DTtV4dVtpE1/F3CamMw1swlpNNniYeP8w6M0Xw RokSvNuQ//evsxCKKxnFFZO2ZzDdT3Bl3+z4dUPG0aY121oh+/H4vBkcWaAtPI+JQGciWO h/nMQfqZV7n+ye2WKGKWx7B6kGDTqNv3olB6i6nMAnVD7V/uk8oJVAsDdX5SfLU/mYkzGO R9XtTePvoUnAsCg/E2Acg5Yl9suOcgj27JtaCOFzKVhTZc00k3FWTsSOkAlWvskTS51anh nZv9BZDEVvf+vObzXbtZRaLEWeorHX7Eumtjg+hd2UH7GJJ5n1VWEP9svl27HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWzhJ5KLLzmFV; Thu, 24 Aug 2023 23:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ONP4lt091900; Thu, 24 Aug 2023 23:25:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ONP4ib091897; Thu, 24 Aug 2023 23:25:04 GMT (envelope-from git) Date: Thu, 24 Aug 2023 23:25:04 GMT Message-Id: <202308242325.37ONP4ib091897@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: ca63cbbe9554 - stable/13 - ufs: always call ufs_itimes on close List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ca63cbbe95540bfcac3f6020ded5b5ed6522c6a2 Auto-Submitted: auto-generated The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ca63cbbe95540bfcac3f6020ded5b5ed6522c6a2 commit ca63cbbe95540bfcac3f6020ded5b5ed6522c6a2 Author: Mateusz Guzik AuthorDate: 2022-09-12 23:19:42 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-24 23:23:34 +0000 ufs: always call ufs_itimes on close While here dedup code with fifo. Reviewed by: kib, mckusick Differential Revision: https://reviews.freebsd.org/D36522 (cherry picked from commit be931de6c99f346cedb7a364602f1cb654a32caf) --- sys/ufs/ufs/ufs_vnops.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 8483e3f01255..8eeb3ac84f6b 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -351,13 +351,8 @@ ufs_close( } */ *ap) { struct vnode *vp = ap->a_vp; - int usecount; - VI_LOCK(vp); - usecount = vp->v_usecount; - if (usecount > 1) - ufs_itimes_locked(vp); - VI_UNLOCK(vp); + ufs_itimes(vp); return (0); } @@ -2645,14 +2640,8 @@ ufsfifo_close( struct thread *a_td; } */ *ap) { - struct vnode *vp = ap->a_vp; - int usecount; - VI_LOCK(vp); - usecount = vp->v_usecount; - if (usecount > 1) - ufs_itimes_locked(vp); - VI_UNLOCK(vp); + ufs_close(ap); return (fifo_specops.vop_close(ap)); } From nobody Thu Aug 24 23:30: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 4RWzpn0st9z4rjqw; Thu, 24 Aug 2023 23:30: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 4RWzpn0NDnz4KGK; Thu, 24 Aug 2023 23:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692919841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dc8s5HiFtBMF9g/gdHLzsDy5uaH+DLqPieirlywQg9c=; b=mpRG/Auuzw7/sqgS3AuvFL5o7cY75BTK6RiuIi4G4DPT0v9GsqWIOiOXltR37e0uJRFJw7 LoSWS5ksMLqnGRObCaXPrK4xn39obU1XgMK5hHNxqVWozJ7Ngep1jrIco72+1RfnUK0JCK 7lAIISWOZ6VGDjrYJkUdxwTkmetsYxNvxHAWKtpvqFnf6Z4HVYb9y1CevnK/F7wtZNHOxr fxzaupwTA4fhrIvgzFeT0a9Qe2TTcA3iP07XMQO7vMezeU/z7+TJaWzRJHvThMuQb7r1H2 81n4qEPSX20N+lA0sQXqoj5BuStiKCdU9hYI/d/Liy8gPzgb+WuBauP+nkzCbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692919841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dc8s5HiFtBMF9g/gdHLzsDy5uaH+DLqPieirlywQg9c=; b=aC23T+ehmfwDS4L9RV9UARc9cgrYLuJ0xWSwZ+wlbjw1dynkzEivg26hSPj0H0T3nLZ7pm gLViCj7sBwJz7lqbkvA2WV8NB226TL0YV2e8/otLgtWtW/K/dVdV7Opvn5PtcFQlqR59OS PpoXxoxutEPGvYsmiKkvh18w+/VrwmbC0aDwt78oeP3yKxTqofvRHno6uoVw7rtnr6xsEG 35Xrs8ltawg5XStLErBHnSKXt8ZTjtToFqnuh+ALcCT9UffZwPCALhTo3tmmBkPeZbx3La DwmgibYvHFRGEXY+ut5GYYRa6UvG+GJiJ7m/AXnD8Mg2MxnAuRhBzuphitLFqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692919841; a=rsa-sha256; cv=none; b=eE5kpQCKJlDP3oD1fEVcXRg3dwlati3tDVJ/XQk+B3ved4BQClvWU92QnUURjehLn5pmzn IXlI26u6XpWc0VVdYgJWwEFgI9iRVXPF0hDW8qhyqDhqtShZOwkutqKmahtYz1C7w1zc2O qJQMpFQUQ7cWGETlJFsU4YR7BRmGsOEQ7VXxiBhO6APBjkB3Mw0pEa2ndNrkK77aDyHgj7 Nt713ckF/t45vKyuXvkOhjNeI+gbK9oyQpD14/66mGaUurGQEEwsOsL0DXbxp5n61VD2+i zxB40Hd7uF62ozT94dmQuG2t4JvX4wKATAsEkTSQNCuDMblTG2vKTmvfq3X5wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWzpm6TCTzmNn; Thu, 24 Aug 2023 23:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ONUeXx002173; Thu, 24 Aug 2023 23:30:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ONUea3002157; Thu, 24 Aug 2023 23:30:40 GMT (envelope-from git) Date: Thu, 24 Aug 2023 23:30:40 GMT Message-Id: <202308242330.37ONUea3002157@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: 60457d1ea068 - stable/13 - ufs: try to elide the interlock in ufs_itimes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 60457d1ea0680dfec0efa80832339a7b4fa96160 Auto-Submitted: auto-generated The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=60457d1ea0680dfec0efa80832339a7b4fa96160 commit 60457d1ea0680dfec0efa80832339a7b4fa96160 Author: Mateusz Guzik AuthorDate: 2022-09-12 23:20:59 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-24 23:30:34 +0000 ufs: try to elide the interlock in ufs_itimes Reviewed by: kib, mckusick Differential Revision: https://reviews.freebsd.org/D36522 (cherry picked from commit 04f095a49165cf4903fda0f21271be5c6bfa5857) --- sys/ufs/ufs/ufs_vnops.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 8eeb3ac84f6b..a6ca523ae87c 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -188,6 +188,11 @@ ufs_itimes_locked(struct vnode *vp) void ufs_itimes(struct vnode *vp) { + struct inode *ip; + + ip = VTOI(vp); + if ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_UPDATE)) == 0) + return; VI_LOCK(vp); ufs_itimes_locked(vp); From nobody Thu Aug 24 23:35: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 4RWzvw3CKTz4rjyR; Thu, 24 Aug 2023 23:35:08 +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 4RWzvw2dMsz4Kly; Thu, 24 Aug 2023 23:35:08 +0000 (UTC) (envelope-from gjb@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692920108; 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=6/LUpHKFkhFUsxavuoZV0BPCDPgv3JQmNasiPMJDid8=; b=taEf96JacEOvyrmDP0Q4LRjaffjFBpwx8s7Xc6bS77zvoLA/3v7Ut2AeXia/oURh07r0Ef /8NgdeauGbULE/H7CftwGlN/vtUGIqy/jrFGMdfdT+XKEsEflHaRPLSWq/p84IrQLH3VQM GlqgjGYZxLvpUNMmhj9NkAZD39Z23+ELYA7sdzcpTiJcTR/9+u/B1LYPsFe1NSzozppIsz XY74PaxQeJTfxCOGesnt8kinMU5GA+vP/hlCLSA1V9uVwpmNwj0xxFlRseaaAPb6ZdcKAV XWpotC7jpLRNyP2SfspZSfKuLErwruugcoFmt4Jf+4W9S0r6+q9kRnPGIuykuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692920108; 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=6/LUpHKFkhFUsxavuoZV0BPCDPgv3JQmNasiPMJDid8=; b=InWQiUd+77jR2GxA/EYwufh2WYCLSlm/MolOItk6UyirPP06ZruWS4D0YSuGq3Ie3wEsfM 46rCNQwHmE+0gWBfajcZQ09xpU/nf0jj9q548AC0Hc/esAGB71R0yAJguZV8IzJDKKm7I4 Gfs1qv24pVN3JEtyBz9leis2ZHKlRPZHeNC/613hLANqbb/EemExbnXl97cWx/uIrsFGv9 gybvp1wrYuVRX0F85UFjMBbIlKSKmIy8Yv1jblKKVhV+C1Iakj5y7fc0rhVncX0bbQZoJe UjDm0uLOo6td3VYTi+1uWrz+T8mB+0hNMhML1Y02Px6TTB0zJnAnDhbKYaIyqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692920108; a=rsa-sha256; cv=none; b=LwrlB7fCiBIVxwQ5KqEOsCPvj754PiGfLSlj+lj6WbNLjTkQ4VbpEoWWCoph42aO4NtENI NzBcVWTpb4+58RGzx9vcNWfGN93mlRknOqRZd4A56MI0pMfvU+eg473CHpyYOYYwxtoKvv oy+Kw1VmofEmLJjx2+RRG6spMRV728SUITlDNS0nalaBxLX8Xxwa8eo402HwAvWKIp5EjG qXCiYd9V2MHDt/wtkbs14gRhBnHF5T2PqQXagzLtwVmobOvYq45yqdeBTxSO5XIWp2wUqm Ud70JsGSxNKKCpGFSVZovC4nyf8tjj3IVyeTC7pg2xeMkhRqWiSghETjicrSFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 025FF617E; Thu, 24 Aug 2023 23:35:07 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Thu, 24 Aug 2023 23:35:06 +0000 From: Glen Barber To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: HEADS-UP: stable/14 branched Message-ID: <20230824233506.GJ4090@FreeBSD.org> References: <20230824232411.GI4090@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="qD3brAgIG4LbUq6d" Content-Disposition: inline In-Reply-To: <20230824232411.GI4090@FreeBSD.org> --qD3brAgIG4LbUq6d Content-Type: text/plain; charset=us-ascii Content-Disposition: inline No email was sent for the branch commit, presumably because I pushed the branch and did subsequent changes (i.e., version numbers, etc.) afterward. The stable/14 branch has been created, from where the remainder of the 14.0 series will live. Glen On behalf of: re@ Please consider donating to help support my FreeBSD work: https://www.gofundme.com/f/gjbbsd https://paypal.me/gjbbsd --qD3brAgIG4LbUq6d Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmTn6SkACgkQAxRYpUeP 4pMGjQ/+L4f/yZQfI2GusRz16TGyJ9XRuq7y9/UVXm2PLoZDCEELdp1iEed/e1ft qAwT1ANvXuK2JyFy+AaqsW5bNFWc0krdfxqy55Y7j6+xc6/rYaGIrlD6qXpFRVc/ fD57yQXuIFVlzA7U6Qzo6RT1mTXt2YgBjiYOUcgSq9J5tGAPY+lH27FmFXtGji/T 479rl03xUP/LosglzgZhIJSNGzCJAjmd1O3+9WN05z3i0kQD6khtBYZu6SfwGB9h gaPUDW186h+rUbwCHYJhzihTRmtvJoddyxK7EzJiwaWSWmtBWkIFEW4ev8Sbn4ma rKFy1azKogCz4RYkoIhjUbhS7nRBde9NfDBDHeT8/C7s3ON6lK2SHiK674dP0Jfd LKl/DjTCtI3WYe/NOquSP16Gi0MNnV7sK4ey/VAdRVmP0u/RbltGWibQ9YBqCiNn M7KOurWe07ctYW+fVM7qfVFrW5ZAvCYpUOvkPz4sWBPDguC6058qzTAqnj/fq19j hDGckgNEm6vlRPhbzivOJqCcm6/xIlx4AthhPT/FJWDiWVJTA+eRLANztu0Bh36D IioNdJBnBvwFaVdHs2/y9AABxHd3Jo4/nuhxFneLg/6lpoYj7jn5NVJr7Yyt3bqh Y1hqXlRScUm6f5QNNbS5fJtWAf4uL/yacq1dfNDLvKRMyJnMctU= =mdM8 -----END PGP SIGNATURE----- --qD3brAgIG4LbUq6d-- From nobody Thu Aug 24 23:44: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 4RX0690HRWz4rkDM; Thu, 24 Aug 2023 23:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RX0686vnKz4M1T; Thu, 24 Aug 2023 23:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692920641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SDZBELujqNr18TRvOs8EPToqsw1AnnGVEyAQXH9eQZ4=; b=gTMtnqsSUPf+qTh/eClLKllxLr8mJBFMVF8oHUlqzRZIifwHBDBqkqpWGoDpkxGHATMpdf 1MDKEbf19HaezPmSpHmBjxvzWLlyteTuZ/6CE+J34sBPR4SfHgmOHNde8m8uxjjWEoeWNj Iwf4QLGfYXBdfYe9HpNNEc9peFhELAsBPb3GElZJkBMfvHlynohPE3oXHR5avsHBYJK8Cg 92uhh2cTVNrFRkZdqUzUg/QS9SYbbvd8RKTXqN0jFswe9vtoZ/E+ygPRx3ilW9Punhto1T qwKLBVo5Ra4ZittokVHgSkvJAsv359wF90l3mz8qxgS9nMNkNiYozMqL2w3C/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692920641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SDZBELujqNr18TRvOs8EPToqsw1AnnGVEyAQXH9eQZ4=; b=ZVy3NWQygD4i1IHZ62UZ+2mAPzjZj8oB5EK0pdg+LlELn0mBLLtpMmugkLcpPKtYRrqnuh Ay9hJnU6lCTLZwI7NP4mXtibo0jgJmRPYwILmy16gQZdbaUR6M91D0xyLz07XuImFLC4iC /xac+Qj2dEIDce/X7rvNcwHpS0mjfYOH7EBlXAM7w4sNt5xCXl98ssxAcvolp5Zc43ldDJ JToYYxtdUTIBi/i2VWb8wALpQES98c/XmozDKOhZuQ+c9Ji+XlYMH1Xbaam8HEVpQJsO/t 4BBLerdWqGwJq+t3Cu+vN6hx6uGDe0FnFmypiN2M2Zhb9S+CJZv+pdfkncMJfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692920641; a=rsa-sha256; cv=none; b=tD32452BJmrZ3Q46uIbyzQY21ewx7NEdkD5auJeUjhevVCUP9aOpIjBiDDuOJKr2eGBxl+ aVEgzxsAtHZ1YB9yvIMnYpDALvpL4Tg/8WB/M7O2gYqlhC0rOx1FdSTz+pDcECE5izapcz pDAOcV4k3ujJS7ASF02mSkp4aCoh+NuR4NgrM49lx2v02l9NeZ0Km8h/nYC6AoFTVrn46d 8yxtGZf/5Hcrl+9z6Ar8WHdeWL7gpCLShFihMf4/KgB0IqA4OjPOtyWrg56XNdoxOLnS5X WCtRikdlw+9gh2kGkmHmv6BJsTZ51yUOYbPTRzhz6yZNFFgfszSZeaQbW061iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX0685yWqzmDS; Thu, 24 Aug 2023 23:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ONi0FL024761; Thu, 24 Aug 2023 23:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ONi03Z024758; Thu, 24 Aug 2023 23:44:00 GMT (envelope-from git) Date: Thu, 24 Aug 2023 23:44:00 GMT Message-Id: <202308242344.37ONi03Z024758@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: 3efecb71a5ed - stable/14 - UPDATING: fix entry for stable/14 creation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 3efecb71a5eded675f4d0511ebcebf7d4ef98a25 Auto-Submitted: auto-generated The branch stable/14 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=3efecb71a5eded675f4d0511ebcebf7d4ef98a25 commit 3efecb71a5eded675f4d0511ebcebf7d4ef98a25 Author: Glen Barber AuthorDate: 2023-08-24 23:43:28 +0000 Commit: Glen Barber CommitDate: 2023-08-24 23:43:28 +0000 UPDATING: fix entry for stable/14 creation Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- UPDATING | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index 92a207f4abf9..deadbbc555d5 100644 --- a/UPDATING +++ b/UPDATING @@ -12,8 +12,8 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. -20230818: - __FreeBSD_version 1400095 after the branching stable/14 from main. +20230824: + __FreeBSD_version 1400097 after the branching stable/14 from main. 20230817: Serial communication (in boot loaders, kernel, and userland) has From nobody Thu Aug 24 23:45: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 4RX07v4TlVz4qVby; Thu, 24 Aug 2023 23:45: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 4RX07v3zzxz4M10; Thu, 24 Aug 2023 23:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692920731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5n1QikDZKWFc6wuG4s4/stI3z56bwX8VdVFhwpiU9es=; b=Q+WXsts0RaSUTdSAyu+uDhcTyFFWTEpUOn7KGFb01w8RxNiwGxnFTHnMQWg2pESW/sYrYp wD+91hIxwHpORBdctm9A3wI196+30kvyugJUBdw4D9q3XrDe9fFiB97bYeRlXag9cipmzU K6P9Lo3ATJJapPOMEtKjTqtaY0MsZCQB7l/WanDCC4/KGgZoGB82ZQG+YVQeZduoWC9uOi CXHpjAfs6HiHoFfbEXlyvaoajcp1G/lg079JdTZX8HSpeQHo/LHueuel6kvrtIE0XGclfv I139e3zT63BfJoScgFq1oNN+PBhdtJ1/Y8XZOzdy0JLKAIbeYRpUyRLz/zvGVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692920731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5n1QikDZKWFc6wuG4s4/stI3z56bwX8VdVFhwpiU9es=; b=lmgak66pMALjtJCM3Gn/ydFWJTOb7WvcDzUDznPNsRYuOC+btLY3QKzR1pvDm8TYa8qsme 1fuwFIJG1Q9P+yLHKp0rfvqLE5AQ0i7B7rzqfqR/0wV/r/SL/K390OmX6CmTMmsWCu8r+5 7kPwh83zHI00MCOfiImdCiR3cVrXe525zbBnVE7qf5sLUypClurw2sQoYDaO9Dvqfy7JJJ MV0MtD68XyIyDWhaiR2m3HsbA9JZPks+vp/UPAAca/DmyaFTvEZQvwf3PcRDI1csIoTdXG UU7H6B8dNIqvEZMEOkd2fflZX0i/87tdPQ+07rOia+4NKL1vNp+vLyXiMMzyJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692920731; a=rsa-sha256; cv=none; b=ynD9hHvGBatLFOJz6ZS7EZKI5eDlZUBRxKZcBtbO1zREy1WyUnChxPc2k/S7GgBuNXI7Ug zfh0/Fo7OxrF0XA6MzqmZL4V5SozsrbPPf45ETMAslCcC2DUonKdzk+M9Fu5QZbHYMlFCU mXpdhsAuhxp3QkD9hNRrsolXrAb6pji1OFDYlcFgQLTsOk7cnwpBP/TNpj2oHXgexbekmy XwYPNKdp59Y8L80/47kFNUuxN8qe86PJzBh4Q1Ta49Fkvxy5mzZsWFViH/XulpolDm/Xe/ ii2FgX3OIEBZBOQxzCz1ANDQirrIxvP1a6wO0oSJx1YCh70Q+QQCT20c7NVqig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX07v33Fszmp0; Thu, 24 Aug 2023 23:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ONjVmG025111; Thu, 24 Aug 2023 23:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ONjVCx025108; Thu, 24 Aug 2023 23:45:31 GMT (envelope-from git) Date: Thu, 24 Aug 2023 23:45:31 GMT Message-Id: <202308242345.37ONjVCx025108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Glen Barber Subject: git: 52c1066f52d4 - main - UPDATING: add entry for 15.0-CURRENT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52c1066f52d48de3782e8ab3585172a19113e81a Auto-Submitted: auto-generated The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=52c1066f52d48de3782e8ab3585172a19113e81a commit 52c1066f52d48de3782e8ab3585172a19113e81a Author: Glen Barber AuthorDate: 2023-08-24 23:45:12 +0000 Commit: Glen Barber CommitDate: 2023-08-24 23:45:12 +0000 UPDATING: add entry for 15.0-CURRENT Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- UPDATING | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UPDATING b/UPDATING index 9ad9c04a7560..fbb899cc25a4 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20230824: + FreeBSD 15.0-CURRENT. + 20230817: Serial communication (in boot loaders, kernel, and userland) has been changed to default to 115200 bps, in line with common industry From nobody Thu Aug 24 23:59: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 4RX0S84ss7z4qWLV; Thu, 24 Aug 2023 23:59: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 4RX0S84JPHz4N3B; Thu, 24 Aug 2023 23:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692921576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2PuTSSye18cqDpgNqF5RrOGE9yYGZDaa6YeA3XfyFEI=; b=FPDUcNRfpf4pB9nAMESQyk/3+Le0XsJrGYBAr7vMedYgRrO+zqKudEwOi/4g/JVuv4NvDk Uh12mdcrVKMaD8U6iTgV2D8F4T8n0x0yIXZ6vHQ1P7oyiRpBx3tDfhMGTcH/2AwnAvzslc hU4eze6wLoxMA27JOgdhAEwECSHtf5f/jD0W0IkL3De5UvscefFhnoINS+f+XhkinetLRM R5rG/zITqySvpJGbsnDlZKJcyw08pwOuiYyzm7JVWWkNE73ao8G+5967FOHxPyZDhv06H+ 7pedZhJ04f6ng1fhzG5LOg8+Je1wKbSANhI8JrPB7jrPZgHWAKXZYumovtuYtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692921576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2PuTSSye18cqDpgNqF5RrOGE9yYGZDaa6YeA3XfyFEI=; b=n3fvur1hdbSQFElvDj1I86uedMqhT+MywlnSyQg2W4LdJFVROS+k9AdLT+eFwaMBoZymih OXC7MO7wRPnmWV8BeKKJFRTI2gL9OpDLA90Qi0fNcvTvbSZLAUwsKO8Q0XwoaGcBSOQiRW fXauWpQ64gaoRDGf15+nPBcfehHc9u9WAxjV3ziBseoNkySqZOzv9Br4MnFuX/zWMKG/Wr 6jFXQEZn9pv5PqiQHlIl7Kp5wdQLIU5h+2tPvujp7o+ZA7/3jtAjDy5gBrIuTMxxbxpElA GF3FFTJtBvsTRcSezLnAoduNRHujhXBtyIYQjB3gD9ll7Sbfk/f9llGLofAmhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692921576; a=rsa-sha256; cv=none; b=esx4LbTrAdmHSEot+fLTAWopFXrbpk9g7sDVPnzwvmUEGZXq3T3L/B4vcAUsC5T+ZZ+CYp 8NOhELtrzSElm+MvX/H0VWCxIuYz2cjBGHwNCLCvvapcDjQD07an1vtGFwY6Zk46hbIZop 3jqjHM9GSqUJtYndHSkP8PGzIZZIm9GB1WGZ0lAOzsmYyp3BJBV21QMhlgtL5XcX0iK4Tc +oZTEIONKGlMgeyRGAJxqmjqrvfKDAq9wsKPh03GIIlYIduEjx+6zRNkjCq6NUSlCPGfDH pARCrsCuCVxkiaM1A1sEhgMwQSt2vOPJ698IE3GJNAGb2QGnMv1w01Innlxz8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX0S83NJpzmbs; Thu, 24 Aug 2023 23:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ONxaYl041850; Thu, 24 Aug 2023 23:59:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ONxans041847; Thu, 24 Aug 2023 23:59:36 GMT (envelope-from git) Date: Thu, 24 Aug 2023 23:59:36 GMT Message-Id: <202308242359.37ONxans041847@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: 2af9390e54ed - stable/14 - release: update stable/14 to ALPHA3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 2af9390e54edfe1da9dc909a1a03088df5896eba Auto-Submitted: auto-generated The branch stable/14 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=2af9390e54edfe1da9dc909a1a03088df5896eba commit 2af9390e54edfe1da9dc909a1a03088df5896eba Author: Glen Barber AuthorDate: 2023-08-24 23:59:16 +0000 Commit: Glen Barber CommitDate: 2023-08-24 23:59:16 +0000 release: update stable/14 to ALPHA3 Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index fcdfadcad175..401ff0e50edb 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="ALPHA2" +BRANCH="ALPHA3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Aug 25 00:43: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 4RX1QN3vJnz4qYrt; Fri, 25 Aug 2023 00:43: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 4RX1QN3Z5Yz4Qwl; Fri, 25 Aug 2023 00:43:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692924188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yakMIZKR8mo1p3rrC118YiLFiBJ8M/sdZECATXZp4gc=; b=YShU3MnsAkZQDgrmyKNYSmVBYL6APUYs/Vfm1MjokSDw0fEXl6m13ILXd+GlYZC9sHPyMV rE0Yu10S+wDIIAPkKhKAuVt94UY/cnOWIk5JNMo7sAq9ujMcTTP1Xouo3vmvQtPXplSEF7 Q//BSIOquyoDAs/H+zSVUzI6MCl46kDclEzFS6k8kTjn+3j7rcJYubUs1ZLDw/i5wYArWM PBq0a/YEBcOODPmx7NswzkxvscEh579CM9bxZDgqU+UC9zqCpLYs8cKrvUYQRO4mXZ+7Xe YFLYeebLb5H8HwTIjBqTbY057diGw7eSYL2sPh3Ls10iux4JAh+lM0XSojNitg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692924188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yakMIZKR8mo1p3rrC118YiLFiBJ8M/sdZECATXZp4gc=; b=NKYeic4M2gWmaFBO4FnTgOQcnXTmGvydmP0FPZ15soY+i2pMVBPWa522d8FdI1I0ACRiTo dJcx2QztbopzUXGOuWOsVmwOJqCP1ffcAChH+yRxVF0W6uc/K2nYrJP/1wevXkBGS0mcAI xl3HwCScWp5JeP3IQlyezyf/iu4MqTZHJ2+Fhm4jC+bdxoXBGxPi6sQal0fuxIdXeMFdCs tuhTcAebdAxW6eZAkhM/jgPocSGP/rrxJSH2UjRXA1vG9tJH6QNgftlOT+nCcE8zxczg6B L5WhnvC1UZrEFHh1iH4H6nCIWO6OLJ+DcESF4y5nZOlWmajeWCAtpYCZGTBz8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692924188; a=rsa-sha256; cv=none; b=LJk6mu5qAGXCNy6/f2XUx1NBPP3R95jBbwQJWBFpIjsty3D3HyoJ0vg5nhHlhxKJ1dF0Cq 6p2nkz1f7ULXL3v1wQNTqLeJ8xIUJG8+zFyXTN9LtK9B+PxUA5zt+N7VMRgcha7oB1OCWY ZrZzPGqu6E0f926PtoYOIQ5UssVbaUjwxB8ncBNtrWvHbFdzE73eRg07pfzWhEiXPAiiEy nENDPIpIek2d6f9+uGGFpzJ8DQAb2tlobJDC/wgqVu09/DWYDK7szXT+mhnQ96+lZMggXD 9rqLQOVQk3guKoOq+ILllB9arbO7JVyFR3KtOgQ/8MsJes+0k3LchAKqJkujTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1QN2clQzp9c; Fri, 25 Aug 2023 00:43:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P0h8Rg024025; Fri, 25 Aug 2023 00:43:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P0h8Pf024022; Fri, 25 Aug 2023 00:43:08 GMT (envelope-from git) Date: Fri, 25 Aug 2023 00:43:08 GMT Message-Id: <202308250043.37P0h8Pf024022@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: 1554ba03b651 - main - Add mac_grantbylabel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1554ba03b651319ab0e1cde8492ea4516afc648b Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=1554ba03b651319ab0e1cde8492ea4516afc648b commit 1554ba03b651319ab0e1cde8492ea4516afc648b Author: Simon J. Gerraty AuthorDate: 2023-08-25 00:41:22 +0000 Commit: Simon J. Gerraty CommitDate: 2023-08-25 00:42:11 +0000 Add mac_grantbylabel This module allows controlled privilege escallation via mac labels securely associated with a process via mac_veriexec. There are over 700 PRIV_* but we can compress many of them into a single GBL_* thus constraining the size of gbl labels. The goal is to allow a daemon to run as an unprivileged process while still being able a set of privileged operations needed. We add APIs to libveriexec so that userland processes can check labels and an exec_script API that allows a suitably labeled process to run something like a python interpreter directly if necessary; overcomming the 'indirect' flag applied to the interpreter. Add -l option to sbin/veriexec to report labels. Reviewed by: stevek Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D41431 --- etc/mtree/BSD.include.dist | 2 + include/Makefile | 4 +- lib/libveriexec/Makefile | 4 +- lib/libveriexec/exec_script.c | 159 +++++++ lib/libveriexec/gbl_check.c | 125 ++++++ lib/libveriexec/libveriexec.h | 13 +- lib/libveriexec/veriexec_get.c | 174 +++++++- sbin/veriexec/Makefile.depend | 2 +- sbin/veriexec/veriexec.8 | 17 +- sbin/veriexec/veriexec.c | 58 ++- sys/conf/files | 1 + sys/conf/options | 1 + sys/security/mac_grantbylabel/mac_grantbylabel.c | 506 +++++++++++++++++++++++ sys/security/mac_grantbylabel/mac_grantbylabel.h | 63 +++ 14 files changed, 1090 insertions(+), 39 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index dffce2469f33..a243f085a1be 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -333,6 +333,8 @@ .. mac_bsdextended .. + mac_grantbylabel + .. mac_lomac .. mac_mls diff --git a/include/Makefile b/include/Makefile index f3c9230f6d40..1d7651216cf9 100644 --- a/include/Makefile +++ b/include/Makefile @@ -67,7 +67,9 @@ LSUBDIRS= dev/acpica dev/agp dev/ciss dev/filemon dev/firewire \ netinet/netdump \ netinet/tcp_stacks \ netlink/route \ - security/mac_biba security/mac_bsdextended security/mac_lomac \ + security/mac_biba security/mac_bsdextended \ + security/mac_grantbylabel \ + security/mac_lomac \ security/mac_mls security/mac_partition \ security/mac_veriexec \ sys/disk \ diff --git a/lib/libveriexec/Makefile b/lib/libveriexec/Makefile index aa1a60640f0c..154605142074 100644 --- a/lib/libveriexec/Makefile +++ b/lib/libveriexec/Makefile @@ -8,8 +8,10 @@ INCS= libveriexec.h WARNS?= 2 SRCS= \ + exec_script.c \ + gbl_check.c \ veriexec_check.c \ - veriexec_get.c + veriexec_get.c \ .include diff --git a/lib/libveriexec/exec_script.c b/lib/libveriexec/exec_script.c new file mode 100644 index 000000000000..cdbbbab54a03 --- /dev/null +++ b/lib/libveriexec/exec_script.c @@ -0,0 +1,159 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2019-2023, Juniper Networks, Inc. + * All rights reserved. + * + * 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 ``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 "libveriexec.h" + +static char * +find_interpreter(const char *script) +{ + static const char ws[] = " \t\n\r"; + static char buf[MAXPATHLEN+4]; /* allow space for #! etc */ + char *cp; + int fd; + int n; + + cp = NULL; + if ((fd = open(script, O_RDONLY)) >= 0) { + if ((n = read(fd, buf, sizeof(buf))) > 0) { + if (strncmp(buf, "#!", 2) == 0) { + buf[sizeof(buf) - 1] = '\0'; + cp = &buf[2]; + if ((n = strspn(cp, ws)) > 0) + cp += n; + if ((n = strcspn(cp, ws)) > 0) { + cp[n] = '\0'; + } else { + cp = NULL; + } + } + } + close(fd); + } + return (cp); +} + +/** + * @brief exec a python or similar script + * + * Python and similar scripts must normally be signed and + * run directly rather than fed to the interpreter which + * is not normally allowed to be run directly. + * + * If direct execv of script fails due to EAUTH + * and process has GBL_VERIEXEC syslog event and run via + * interpreter. + * + * If interpreter is NULL look at first block of script + * to find ``#!`` magic. + * + * @prarm[in] interpreter + * if NULL, extract from script if necessary + * + * @prarm[in] argv + * argv for execv(2) + * argv[0] must be full path. + * Python at least requires argv[1] to also be the script path. + * + * @return + * error on failure usually EPERM or EAUTH + */ +int +execv_script(const char *interpreter, char * const *argv) +{ + const char *script; + int rc; + + script = argv[0]; + if (veriexec_check_path(script) == 0) { + rc = execv(script, argv); + } + /* still here? we might be allowed to run via interpreter */ + if (gbl_check_pid(0) & GBL_VERIEXEC) { + if (!interpreter) + interpreter = find_interpreter(script); + if (interpreter) { + syslog(LOG_NOTICE, "running %s via %s", + script, interpreter); + rc = execv(interpreter, argv); + } + } + return (rc); +} + +#if defined(MAIN) || defined(UNIT_TEST) +#include +#include + +int +main(int argc __unused, char *argv[]) +{ + const char *interp; + int c; + int s; + pid_t child; + + openlog("exec_script", LOG_PID|LOG_PERROR, LOG_DAEMON); + + interp = NULL; + while ((c = getopt(argc, argv, "i:")) != -1) { + switch (c) { + case 'i': + interp = optarg; + break; + default: + errx(1, "unknown option: -%c", c); + break; + } + } + argc -= optind; + argv += optind; + /* we need a child */ + child = fork(); + if (child < 0) + err(2, "fork"); + if (child == 0) { + c = execv_script(interp, argv); + err(2, "exec_script(%s,%s)", interp, argv[0]); + } + c = waitpid(child, &s, 0); + printf("%s: exit %d\n", argv[0], WEXITSTATUS(s)); + return (0); +} +#endif diff --git a/lib/libveriexec/gbl_check.c b/lib/libveriexec/gbl_check.c new file mode 100644 index 000000000000..c0da93d0857c --- /dev/null +++ b/lib/libveriexec/gbl_check.c @@ -0,0 +1,125 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2019-2023, Juniper Networks, Inc. + * All rights reserved. + * + * 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 ``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 + +/** + * @brief does path have a gbl label + * + * @return + * @li 0 if no/empty label or module not loaded + * @li value of label + */ +unsigned int +gbl_check_path(const char *path) +{ + struct mac_grantbylabel_fetch_gbl_args gbl; + int fd; + int rc; + + rc = 0; + if ((fd = open(path, O_RDONLY|O_VERIFY)) >= 0) { + gbl.u.fd = fd; + if (mac_syscall(MAC_GRANTBYLABEL_NAME, + MAC_GRANTBYLABEL_FETCH_GBL, + &gbl) == 0) { + if (gbl.gbl != GBL_EMPTY) + rc = gbl.gbl; + } + close(fd); + } + return(rc); +} + +/** + * @brief does pid have a gbl label + * + * @return + * @li 0 if no/empty label or module not loaded + * @li value of label + */ +unsigned int +gbl_check_pid(pid_t pid) +{ + struct mac_grantbylabel_fetch_gbl_args gbl; + int rc; + + rc = 0; + gbl.u.pid = pid; + if (mac_syscall(MAC_GRANTBYLABEL_NAME, + MAC_GRANTBYLABEL_FETCH_PID_GBL, &gbl) == 0) { + if (gbl.gbl != GBL_EMPTY) + rc = gbl.gbl; + } + return(rc); +} + + +#ifdef UNIT_TEST +#include +#include +#include + +int +main(int argc, char *argv[]) +{ + pid_t pid; + int pflag = 0; + int c; + unsigned int gbl; + + while ((c = getopt(argc, argv, "p")) != -1) { + switch (c) { + case 'p': + pflag = 1; + break; + default: + break; + } + } + for (; optind < argc; optind++) { + + if (pflag) { + pid = atoi(argv[optind]); + gbl = gbl_check_pid(pid); + } else { + gbl = gbl_check_path(argv[optind]); + } + printf("arg=%s, gbl=%#o\n", argv[optind], gbl); + } + return 0; +} +#endif diff --git a/lib/libveriexec/libveriexec.h b/lib/libveriexec/libveriexec.h index 2d726e76af01..32b2f20d6123 100644 --- a/lib/libveriexec/libveriexec.h +++ b/lib/libveriexec/libveriexec.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2011, 2012, 2013, 2015, Juniper Networks, Inc. + * Copyright (c) 2011-2023, Juniper Networks, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,16 @@ int veriexec_get_path_params(const char *, struct mac_veriexec_syscall_params *); int veriexec_check_path_label(const char *, const char *); int veriexec_check_pid_label(pid_t, const char *); +char * veriexec_get_path_label(const char *, char *, size_t); +char * veriexec_get_pid_label(pid_t, char *, size_t); +unsigned int gbl_check_path(const char *); +unsigned int gbl_check_pid(pid_t); +int execv_script(const char *, char * const *); -#define HAVE_VERIEXEC_CHECK_PID_LABEL 1 +#define HAVE_GBL_CHECK_PID 1 +#define HAVE_VERIEXEC_CHECK_PATH_LABEL 1 +#define HAVE_VERIEXEC_CHECK_PID_LABEL 1 +#define HAVE_VERIEXEC_GET_PATH_LABEL 1 +#define HAVE_VERIEXEC_GET_PID_LABEL 1 #endif /* __LIBVERIEXEC_H__ */ diff --git a/lib/libveriexec/veriexec_get.c b/lib/libveriexec/veriexec_get.c index 8d12d0a9890c..4cfa81de210c 100644 --- a/lib/libveriexec/veriexec_get.c +++ b/lib/libveriexec/veriexec_get.c @@ -59,7 +59,7 @@ veriexec_get_pid_params(pid_t pid, } /** - * @brief get veriexec params for a process + * @brief get veriexec params for a path * * @return * @li 0 if successful @@ -79,9 +79,119 @@ veriexec_get_path_params(const char *file, MAC_VERIEXEC_GET_PARAMS_PATH_SYSCALL, &args); } +/** + * @brief return label associated with a path + * + * @param[in] file + * pathname of file to lookup. + * + * @prarm[in] buf + * if not NULL and big enough copy label to buf. + * otherwise return a copy of label. + * + * @param[in] bufsz + * size of buf, must be greater than found label length. + * + * @return + * @li NULL if no label + * @li pointer to label + */ +char * +veriexec_get_path_label(const char *file, char *buf, size_t bufsz) +{ + struct mac_veriexec_syscall_params params; + char *cp; + + cp = NULL; + if (veriexec_get_path_params(file, ¶ms) == 0) { + /* Does label contain a label */ + if (params.labellen > 0) { + if (buf != NULL && bufsz > params.labellen) { + strlcpy(buf, params.label, bufsz); + cp = buf; + } else + cp = strdup(params.label); + } + } + return cp; +} + +/** + * @brief return label of a process + * + * + * @param[in] pid + * process id of interest. + * + * @prarm[in] buf + * if not NULL and big enough copy label to buf. + * otherwise return a copy of label. + * + * @param[in] bufsz + * size of buf, must be greater than found label length. + * + * @return + * @li NULL if no label + * @li pointer to label + */ +char * +veriexec_get_pid_label(pid_t pid, char *buf, size_t bufsz) +{ + struct mac_veriexec_syscall_params params; + char *cp; + + cp = NULL; + if (veriexec_get_pid_params(pid, ¶ms) == 0) { + /* Does label contain a label */ + if (params.labellen > 0) { + if (buf != NULL && bufsz > params.labellen) { + strlcpy(buf, params.label, bufsz); + cp = buf; + } else + cp = strdup(params.label); + } + } + return cp; +} + +/* + * we match + * ^want$ + * ^want, + * ,want, + * ,want$ + * + * and if want ends with / then we match that prefix too. + */ +static int +check_label_want(const char *label, size_t labellen, + const char *want, size_t wantlen) +{ + char *cp; + + /* Does label contain [,][,] ? */ + if (labellen > 0 && wantlen > 0 && + (cp = strstr(label, want)) != NULL) { + if (cp == label || cp[-1] == ',') { + if (cp[wantlen] == '\0' || cp[wantlen] == ',' || + (cp[wantlen-1] == '/' && want[wantlen-1] == '/')) + return 1; /* yes */ + } + } + return 0; /* no */ +} + /** * @brief check if a process has label that contains what we want * + * @param[in] pid + * process id of interest. + * + * @param[in] want + * the label we are looking for + * if want ends with ``/`` it is assumed a prefix + * otherwise we expect it to be followed by ``,`` or end of string. + * * @return * @li 0 if no * @li 1 if yes @@ -90,20 +200,13 @@ int veriexec_check_pid_label(pid_t pid, const char *want) { struct mac_veriexec_syscall_params params; - char *cp; size_t n; if (want != NULL && + (n = strlen(want)) > 0 && veriexec_get_pid_params(pid, ¶ms) == 0) { - /* Does label contain [,][,] ? */ - if (params.labellen > 0 && - (cp = strstr(params.label, want)) != NULL) { - if (cp == params.label || cp[-1] == ',') { - n = strlen(want); - if (cp[n] == '\0' || cp[n] == ',') - return 1; /* yes */ - } - } + return check_label_want(params.label, params.labellen, + want, n); } return 0; /* no */ } @@ -111,6 +214,14 @@ veriexec_check_pid_label(pid_t pid, const char *want) /** * @brief check if a path has label that contains what we want * + * @param[in] path + * pathname of interest. + * + * @param[in] want + * the label we are looking for + * if want ends with ``/`` it is assumed a prefix + * otherwise we expect it to be followed by ``,`` or end of string. + * * @return * @li 0 if no * @li 1 if yes @@ -119,20 +230,13 @@ int veriexec_check_path_label(const char *file, const char *want) { struct mac_veriexec_syscall_params params; - char *cp; size_t n; if (want != NULL && file != NULL && + (n = strlen(want)) > 0 && veriexec_get_path_params(file, ¶ms) == 0) { - /* Does label contain [,][,] ? */ - if (params.labellen > 0 && - (cp = strstr(params.label, want)) != NULL) { - if (cp == params.label || cp[-1] == ',') { - n = strlen(want); - if (cp[n] == '\0' || cp[n] == ',') - return 1; /* yes */ - } - } + return check_label_want(params.label, params.labellen, + want, n); } return 0; /* no */ } @@ -167,13 +271,19 @@ main(int argc, char *argv[]) { struct mac_veriexec_syscall_params params; pid_t pid; + char buf[BUFSIZ]; + const char *cp; char *want = NULL; + int lflag = 0; int pflag = 0; int error; int c; - while ((c = getopt(argc, argv, "pw:")) != -1) { + while ((c = getopt(argc, argv, "lpw:")) != -1) { switch (c) { + case 'l': + lflag = 1; + break; case 'p': pflag = 1; break; @@ -188,6 +298,12 @@ main(int argc, char *argv[]) if (pflag) { pid = atoi(argv[optind]); + if (lflag) { + cp = veriexec_get_pid_label(pid, buf, sizeof(buf)); + if (cp) + printf("pid=%d label='%s'\n", pid, cp); + continue; + } if (want) { error = veriexec_check_pid_label(pid, want); printf("pid=%d want='%s': %d\n", @@ -196,6 +312,20 @@ main(int argc, char *argv[]) } error = veriexec_get_pid_params(pid, ¶ms); } else { + if (lflag) { + cp = veriexec_get_path_label(argv[optind], + buf, sizeof(buf)); + if (cp) + printf("path='%s' label='%s'\n", + argv[optind], cp); + continue; + } + if (want) { + error = veriexec_check_path_label(argv[optind], want); + printf("path='%s' want='%s': %d\n", + argv[optind], want, error); + continue; + } error = veriexec_get_path_params(argv[optind], ¶ms); } if (error) { diff --git a/sbin/veriexec/Makefile.depend b/sbin/veriexec/Makefile.depend index 9307e12bc8dd..cbe57ebe4cf8 100644 --- a/sbin/veriexec/Makefile.depend +++ b/sbin/veriexec/Makefile.depend @@ -1,7 +1,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ @@ -10,6 +9,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libsecureboot \ lib/libveriexec \ + usr.bin/yacc.host \ .include diff --git a/sbin/veriexec/veriexec.8 b/sbin/veriexec/veriexec.8 index c325f267689d..734b1cda40f6 100644 --- a/sbin/veriexec/veriexec.8 +++ b/sbin/veriexec/veriexec.8 @@ -1,5 +1,7 @@ .\"- -.\" Copyright (c) 2018, Juniper Networks, Inc. +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2018-2023, Juniper Networks, Inc. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 8, 2022 +.Dd August 8, 2023 .Dt VERIEXEC 8 .Os .Sh NAME @@ -39,6 +41,9 @@ .Nm .Fl i Ar state .Nm +.Fl l +.Ar file ... +.Nm .Fl x .Ar file ... .Sh DESCRIPTION @@ -67,6 +72,14 @@ and with to query the current .Ar state . .Pp +With +.Fl l +.Nm +will report any labels associated with the remaining arguments +assumed to be files. +If only a single file argument is given, the bare label (if any) +will be reported, otherwise the pathname followed by label. +.Pp The final form with .Fl x is used to test whether diff --git a/sbin/veriexec/veriexec.c b/sbin/veriexec/veriexec.c index 3899a781625a..0619b261665e 100644 --- a/sbin/veriexec/veriexec.c +++ b/sbin/veriexec/veriexec.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2018, Juniper Networks, Inc. + * Copyright (c) 2018-2023, Juniper Networks, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -53,7 +53,7 @@ static int veriexec_usage(void) { printf("%s", - "Usage:\tveriexec [-h] [-i state] [-C] [-xv state|verbosity] [path]\n"); + "Usage:\tveriexec [-C path] [-hlxv] [-[iz] state] [path]\n"); return (0); } @@ -135,6 +135,45 @@ veriexec_state_modify(const char *arg_text) return (state); } +#ifdef HAVE_VERIEXEC_GET_PATH_LABEL +static void +veriexec_check_labels(int argc, char *argv[]) +{ + char buf[BUFSIZ]; + char *cp; + int n; + + n = (argc - optind); + for (; optind < argc; optind++) { + cp = veriexec_get_path_label(argv[optind], buf, sizeof(buf)); + if (cp) { + if (n > 1) + printf("%s: %s\n", argv[optind], cp); + else + printf("%s\n", cp); + if (cp != buf) + free(cp); + } + } + exit(EX_OK); +} +#endif + +static void +veriexec_check_paths(int argc, char *argv[]) +{ + int x; + + x = EX_OK; + for (; optind < argc; optind++) { + if (veriexec_check_path(argv[optind])) { + warn("%s", argv[optind]); + x = 2; + } + } + exit(x); +} + int main(int argc, char *argv[]) { @@ -147,7 +186,7 @@ main(int argc, char *argv[]) dev_fd = open(_PATH_DEV_VERIEXEC, O_WRONLY, 0); - while ((c = getopt(argc, argv, "hC:i:Sxvz:")) != -1) { + while ((c = getopt(argc, argv, "C:hi:lSxvz:")) != -1) { switch (c) { case 'h': /* Print usage info */ @@ -173,6 +212,11 @@ main(int argc, char *argv[]) exit((x & state) == 0); break; +#ifdef HAVE_VERIEXEC_GET_PATH_LABEL + case 'l': + veriexec_check_labels(argc, argv); + break; +#endif case 'S': /* Strictly enforce certificate validity */ ve_enforce_validity_set(1); @@ -188,13 +232,7 @@ main(int argc, char *argv[]) /* * -x says all other args are paths to check. */ - for (x = EX_OK; optind < argc; optind++) { - if (veriexec_check_path(argv[optind])) { - warn("%s", argv[optind]); - x = 2; - } - } - exit(x); + veriexec_check_paths(argc, argv); break; case 'z': /* Modify the state */ diff --git a/sys/conf/files b/sys/conf/files index 8d38b9cc8a2e..2d429c11f523 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -5147,6 +5147,7 @@ security/mac_priority/mac_priority.c optional mac_priority security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids security/mac_stub/mac_stub.c optional mac_stub security/mac_test/mac_test.c optional mac_test +security/mac_grantbylabel/mac_grantbylabel.c optional mac_grantbylabel security/mac_veriexec/mac_veriexec.c optional mac_veriexec security/mac_veriexec/veriexec_fingerprint.c optional mac_veriexec security/mac_veriexec/veriexec_metadata.c optional mac_veriexec diff --git a/sys/conf/options b/sys/conf/options index 56c1a33216d5..ae94d1b60492 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -168,6 +168,7 @@ MAC_SEEOTHERUIDS opt_dontuse.h MAC_STATIC opt_mac.h MAC_STUB opt_dontuse.h MAC_TEST opt_dontuse.h +MAC_GRANTBYLABEL opt_dontuse.h MAC_VERIEXEC opt_dontuse.h MAC_VERIEXEC_SHA1 opt_dontuse.h MAC_VERIEXEC_SHA256 opt_dontuse.h diff --git a/sys/security/mac_grantbylabel/mac_grantbylabel.c b/sys/security/mac_grantbylabel/mac_grantbylabel.c new file mode 100644 index 000000000000..848131e54590 --- /dev/null +++ b/sys/security/mac_grantbylabel/mac_grantbylabel.c @@ -0,0 +1,506 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2018-2023, Juniper Networks, Inc. + * All rights reserved. + * + * 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 ``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 "opt_mac.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "mac_grantbylabel.h" +#include + +#define MAC_GRANTBYLABEL_FULLNAME "MAC/grantbylabel" + +SYSCTL_DECL(_security_mac); +SYSCTL_NODE(_security_mac, OID_AUTO, grantbylabel, CTLFLAG_RW, 0, + "MAC/grantbylabel policy controls"); + +#ifdef MAC_DEBUG +static int mac_grantbylabel_debug; + +SYSCTL_INT(_security_mac_grantbylabel, OID_AUTO, debug, CTLFLAG_RW, + &mac_grantbylabel_debug, 0, "Debug mac_grantbylabel"); + +#define GRANTBYLABEL_DEBUG(n, x) if (mac_grantbylabel_debug >= (n)) printf x + +#define MAC_GRANTBYLABEL_DBG(_lvl, _fmt, ...) \ + do { \ + GRANTBYLABEL_DEBUG((_lvl), (MAC_GRANTBYLABEL_FULLNAME ": " \ + _fmt "\n", ##__VA_ARGS__)); \ + } while(0) +#else +#define MAC_GRANTBYLABEL_DBG(_lvl, _fmt, ...) +#endif + + +/* label token prefix */ +#define GBL_PREFIX "gbl/" + +static int mac_grantbylabel_slot; + +#define SLOT(l) \ + mac_label_get((l), mac_grantbylabel_slot) +#define SLOT_SET(l, v) \ + mac_label_set((l), mac_grantbylabel_slot, (v)) + + +/** + * @brief parse label into bitmask + * + * We are only interested in tokens prefixed by GBL_PREFIX ("gbl/"). + * + * @return 32bit mask + */ +static gbl_label_t +gbl_parse_label(const char *label) +{ + gbl_label_t gbl; + char *cp; + + if (!(label && *label)) + return GBL_EMPTY; + gbl = 0; + for (cp = strstr(label, GBL_PREFIX); cp; cp = strstr(cp, GBL_PREFIX)) { + /* check we didn't find "fugbl/" */ + if (cp > label && cp[-1] != ',') { + cp += sizeof(GBL_PREFIX); + continue; + } + cp += sizeof(GBL_PREFIX) - 1; + switch (*cp) { + case 'b': + if (strncmp(cp, "bind", 4) == 0) + gbl |= GBL_BIND; + break; + case 'd': + if (strncmp(cp, "daemon", 6) == 0) + gbl |= (GBL_BIND|GBL_IPC|GBL_NET|GBL_PROC| + GBL_SYSCTL|GBL_VACCESS); *** 459 LINES SKIPPED *** From nobody Fri Aug 25 01:08: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 4RX1zZ1xMNz4qZk3; Fri, 25 Aug 2023 01:08: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 4RX1zZ0pclz4SKZ; Fri, 25 Aug 2023 01:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HJVe3YcwXXNoPKDxUILbrgiR5R+VZmmmto2c/iBlZQw=; b=G178mQD/0plGgP8uQzROLI+xliXi4y2npOmaI2NrCjhpznzbi3xcd9uzPAhAOuOBtdsP44 dHkUL3vIc8yOu23KYID+KomEYzwipTpwz7yvz7ybtwMYCZIiXavrP06lnsedL+UuLNY/3C 6wL/dPuSwz/R2CGdpfv3AhCwL73kGCQR5csmv9TkxZ/h8uqI81DqcbMrcKjS5XsaV1B3o5 M1EIMSd5DaGUsXS9zAsWQ4pVCXDc+REHodnXaTisiAsnEy+1LVo1RKOnh+oDXQuG35WcWy 2xRHy6wW5wLo/PeBUPfswQ5O3pYmQigFs4NfGBtssuSc6dE8qQgZPc1/EiFyOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HJVe3YcwXXNoPKDxUILbrgiR5R+VZmmmto2c/iBlZQw=; b=qhuBUslRT+tNusq4R+c85zl2VpTElvC0/qJ0IIgn1kBS3ZCYpaq8jHvjZFq1fkIvVYRmuV 5SM3y+Hsbf57tyiNjgThLxVyldG7E496swJH58/2yleX5avxkrJdGUzFg36zGh7CEJBmrg F9wwkjLipnWix3IAkF6Raukcnh5KDmaBFIHh4ebQD1hUUUvfHh94i/SZfHlWZ7keA9EhXY kF7S6Cev/nsT2ChtmaWDx8bKx9qW10p2A+9Phdu3Jbfly1Fez+BpxVc4neO4c+Mx2KF9RI VCkV43QTPik2Vpt42Op6tsqwz503kh1xVwuhtR1FDtA7rX82uCR+dvfu2hmCSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925706; a=rsa-sha256; cv=none; b=Q+cOwLyTUEY7pMZSlhL+g1RE7RJEkyVtncaH1QcY3z0/bDHxEmK//lULNNP0gNv6i5eMcj XiXxEK5z+7h0/jzvf5foMEk2AypDrbQFeWlsRZkqDRvSSY2tRc/SeMVO4AIDf2rwZhl2tA l6hFXLLumQnqwbwaCuh+1l+d6r6m3JrG295Q/38N+m5rBCMXLYqn0ueTrg8OD/5gpyyDwK ihUzmBEyMQKnXx6xyj5X91uXXIujeNbRKbetn/pvk3ZLgCqMQreaVayXBQao88v7IanH6L jHLZaLynjBU395mLJWprHR4GGsa9xtv2kOAB8l4eRgBImElfrRLIQ2AxheqTXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zY6y8Mzpkt; Fri, 25 Aug 2023 01:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18P4Y058006; Fri, 25 Aug 2023 01:08:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18Pl0058003; Fri, 25 Aug 2023 01:08:25 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:25 GMT Message-Id: <202308250108.37P18Pl0058003@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: 6c79559bf0c6 - stable/13 - mmap(MAP_STACK): on stack grow, use original protection List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6c79559bf0c641a7b06966fa419935ca50dddedf Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6c79559bf0c641a7b06966fa419935ca50dddedf commit 6c79559bf0c641a7b06966fa419935ca50dddedf Author: Konstantin Belousov AuthorDate: 2023-07-19 11:05:32 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:43 +0000 mmap(MAP_STACK): on stack grow, use original protection PR: 272585 (cherry picked from commit 21e45c30c35c9aa732073f725924caf581c93460) --- sys/vm/vm_map.c | 24 ++++++++++++++++-------- sys/vm/vm_map.h | 4 ++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 03d44d773552..c8f3c72302fc 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4489,7 +4489,7 @@ static int vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, vm_size_t growsize, vm_prot_t prot, vm_prot_t max, int cow) { - vm_map_entry_t new_entry, prev_entry; + vm_map_entry_t gap_entry, new_entry, prev_entry; vm_offset_t bot, gap_bot, gap_top, top; vm_size_t init_ssize, sgp; int orient, rv; @@ -4571,11 +4571,14 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, * read-ahead logic is never used for it. Re-use * next_read of the gap entry to store * stack_guard_page for vm_map_growstack(). + * Similarly, since a gap cannot have a backing object, + * store the original stack protections in the + * object offset. */ - if (orient == MAP_STACK_GROWS_DOWN) - vm_map_entry_pred(new_entry)->next_read = sgp; - else - vm_map_entry_succ(new_entry)->next_read = sgp; + gap_entry = orient == MAP_STACK_GROWS_DOWN ? + vm_map_entry_pred(new_entry) : vm_map_entry_succ(new_entry); + gap_entry->next_read = sgp; + gap_entry->offset = prot; } else { (void)vm_map_delete(map, bot, top); } @@ -4595,6 +4598,7 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) struct ucred *cred; vm_offset_t gap_end, gap_start, grow_start; vm_size_t grow_amount, guard, max_grow; + vm_prot_t prot; rlim_t lmemlim, stacklim, vmemlim; int rv, rv1; bool gap_deleted, grow_down, is_procstack; @@ -4735,6 +4739,12 @@ retry: } if (grow_down) { + /* + * The gap_entry "offset" field is overloaded. See + * vm_map_stack_locked(). + */ + prot = gap_entry->offset; + grow_start = gap_entry->end - grow_amount; if (gap_entry->start + grow_amount == gap_entry->end) { gap_start = gap_entry->start; @@ -4747,9 +4757,7 @@ retry: gap_deleted = false; } rv = vm_map_insert(map, NULL, 0, grow_start, - grow_start + grow_amount, - stack_entry->protection, stack_entry->max_protection, - MAP_STACK_GROWS_DOWN); + grow_start + grow_amount, prot, prot, MAP_STACK_GROWS_DOWN); if (rv != KERN_SUCCESS) { if (gap_deleted) { rv1 = vm_map_insert(map, NULL, 0, gap_start, diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 5db7a2230351..85d622ee1bb6 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -95,6 +95,10 @@ union vm_map_object { * a VM object (or sharing map) and offset into that object, * and user-exported inheritance and protection information. * Also included is control information for virtual copy operations. + * + * For stack gap map entries (MAP_ENTRY_GUARD | MAP_ENTRY_GROWS_DOWN + * or UP), the next_read member is reused as the stack_guard_page + * storage, and offset is the stack protection. */ struct vm_map_entry { struct vm_map_entry *left; /* left child or previous entry */ From nobody Fri Aug 25 01:08: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 4RX1zb2l6Pz4qZmB; Fri, 25 Aug 2023 01:08: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 4RX1zb2HBKz4SCF; Fri, 25 Aug 2023 01:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PFUs3TjSK/INqStQm0ods6LNAyGDoXubXBR4o5L6nYo=; b=RYNEfpbepnXZO/lDxgOKTpqiMWB2qd9SUkax1d+IQ7DJ4NEnjWGhheWVqUppqB6hT0YTjB DB9s2P8ARdsNtTiLw4pCEK83k2DWvLKaNn4et0Gvg8uNk4AlPhH+YtJcVDkxusiIV6Rkle zB9tqoWjlET5ZGPkwKjKjX9cHDYwAozizdob/bBu6GVuSH/0xtBAGqxhSJ8nwhDxMaTJ0+ UmljoxNC7NLQ4lZTnHYiOWPyEfzJQS9Ea25BCZvMsZ+RjkREPx9m8MfEHRpw4LbPegmff8 NFNh3Y7ZxlHLMPxEBkeA5Gx0hSVSivfHSgRmsc579VcPGc3rz7BOz2+aDtKvjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PFUs3TjSK/INqStQm0ods6LNAyGDoXubXBR4o5L6nYo=; b=Sr5hQ+Ve0O1IJbfx+nfas/efrQKpHknFZDpv8yz4yfAHJxv3TCrbArYxosnD2bfkBjvHkt 1yIdjfVcUdqjbxR0neD9hqKNFUCnSnGasKE8RvyjoLr7m7bNuzENuL6AOwfrsHkDgZzaaP gc9Smk5G6G9c0mW94hv8bTkqOm87gE6SwgRK9NKFw4lrma3fUYsQfClKVQzDVKDYFx+fhb GVHqATPnsppzRYxFjekb4AYexwlzhgt4SDjIWHUVAgqMNvARzLFJgewrxTGG7Z6dTebsCD DT3IZcys+fwrp+Gx4iYXOHZ7A9s0mgXIwcUt71v9ubGn4CsJR45HAmn3ksicMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925707; a=rsa-sha256; cv=none; b=CuOp8f15gUczk26ZRb9YZkEZ8M++wI3l4K9WEmT/szITFiM0IIwWR9KreoMrBsieD75j7A OVKYtIc/0oKHUWMytimutjfC1TQ5Hz5tH9t5PNu4qb8pFlhWCzMTkOxcFidES2HrbRa1sG yYQZwaJZ/4q3aQnekEWCTFoVk8wEDvthrtkfvKgrvnrC50b71i5tV/RmF7y/qrBFPPEzdT eh+MV2in7qsxXEPIELuJrqxHRzSigZvMgQWAAtifc3X/GxoNeSjte/D/efCaYaFS2PY1/N jHthxxPe8tIJfPiF6o2513EhYwxMiBbuMJKDoPMpyTk0X6yYoo0Xc1nviWlvIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zb14bVzpYw; Fri, 25 Aug 2023 01:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18Rgo058061; Fri, 25 Aug 2023 01:08:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18RBh058058; Fri, 25 Aug 2023 01:08:27 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:27 GMT Message-Id: <202308250108.37P18RBh058058@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: 596c93a96ec8 - stable/13 - vmspace_fork(): do not override offset for the guard 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 596c93a96ec82f7d1132030f9c86a7de27584458 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=596c93a96ec82f7d1132030f9c86a7de27584458 commit 596c93a96ec82f7d1132030f9c86a7de27584458 Author: Konstantin Belousov AuthorDate: 2023-07-20 17:45:01 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:43 +0000 vmspace_fork(): do not override offset for the guard entries (cherry picked from commit db6c7c7f8d870f377fcd1cc98e4832681bb5bdf0) --- sys/vm/vm_map.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index c8f3c72302fc..18763ad2f2bf 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4178,7 +4178,8 @@ vm_map_copy_entry( src_entry->start); } else { dst_entry->object.vm_object = NULL; - dst_entry->offset = 0; + if ((dst_entry->eflags & MAP_ENTRY_GUARD) == 0) + dst_entry->offset = 0; if (src_entry->cred != NULL) { dst_entry->cred = curthread->td_ucred; crhold(dst_entry->cred); From nobody Fri Aug 25 01:08: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 4RX1zc3C8kz4qZwH; Fri, 25 Aug 2023 01:08: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 4RX1zc2YC9z4SJ2; Fri, 25 Aug 2023 01:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sJzxrIzEsxdBD51XgIRPJ5O/fpVQ4YKN9umjXMDoYd0=; b=RqBNBiDpQ6aNmtvhPss1a0wouEmIDF/FHk5kQNePZ/nhpGtvsrPXAafRkYrYHinSibNLis nvF0wx3pEXXGWLDLw0sZaaYJ7zUFtvX1QfKSe4vMke6iNmrXomqFLRqRXx2NvmtGZf/Pwz t+AENQ8EOmkgSUgrbYTqbri2UxtJtutgvBSU7bZ6xjqkECrIIFC8xVw3DVV3pHzjeSLxhs YNr+HWu03Q5TjgJYQhYDMRjiimi+fPgDyOQCq39YWseWyIeCNRDBTw/hYGR7Ty/QieOxSA vjsTqAhyU7B3ra7JjvkrjG3HMS8Pj7wLu/N8AZbOATvK0pEdITe7iTIUEo/qdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sJzxrIzEsxdBD51XgIRPJ5O/fpVQ4YKN9umjXMDoYd0=; b=uwqudzFzX1LK1FOkYliGGCjJtPA+B36k5ESGtT5pM077QqhbRqIQOTKndAIBLP/KfizUsm SdqwQHzyO0rzlN5a/rp1cR1F0oUC/yYngdh/mN5x5PAE58ZEJ5JxoE3BYEG+u7rFT8g87C 69VmpOPW8Jp4YXYoHZb4BTQeIDCcugx1R7QAXG65ar/clWCNDYnOKkAoBi6Z5+0ljuwHBq /YlVTnF3yWbueVfH5+yhwBbno6YGGyXsctxKb80J63N/EbK7R5+IIw0vyDqUDavLNuZTnY C3CmoTwGla65QBd7pk+/3JmdPAaXvBpfQ3h3MXHi8UxWds9WpmFzyIfpe2hEuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925708; a=rsa-sha256; cv=none; b=MPkntUFAYiGFNqqFWx1+ye1TkQhwdGue/x9Zfn0uk4SrUH7mldNKmGk6exK1qkPEfwIs+k 7e9p/0huUjpqqn67RVfUk3oJ3tCzXy+/ELNFcJpv/PrvI1R5aj8JlR2JX80JpBjkTj4r8O 8OApg8D6TAhiRkx+ekCJu2pAFuZ2NDB/wRN/cp/Ty/83XTpH6rhTDl4kkGeUYoWUJINdKv WmwzzfmGoRiDSbiEv046GppeWC++aa5ohm4SvHGB6O05spYEPLjla0ZMbesn7jeopRSBat v65Lh7hAjAaw962ZzCNg1zBICs3AsfbxbP6nMcbMqujn2eRfsxrU7Aom56Hvqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zc1dttzpnm; Fri, 25 Aug 2023 01:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18SHs058102; Fri, 25 Aug 2023 01:08:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18SWd058099; Fri, 25 Aug 2023 01:08:28 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:28 GMT Message-Id: <202308250108.37P18SWd058099@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: b491e9d02da4 - stable/13 - vm_map_insert(): update herald 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b491e9d02da47a237b3edae2d8ca9d9613ff5043 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b491e9d02da47a237b3edae2d8ca9d9613ff5043 commit b491e9d02da47a237b3edae2d8ca9d9613ff5043 Author: Konstantin Belousov AuthorDate: 2023-08-10 07:59:25 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:43 +0000 vm_map_insert(): update herald comment (cherry picked from commit 3b44ee50be815a93d4e2b5d34d1cfc77268f6000) --- sys/vm/vm_map.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 18763ad2f2bf..1f111448a49d 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1601,9 +1601,8 @@ vm_map_lookup_entry( /* * vm_map_insert: * - * Inserts the given whole VM object into the target - * map at the specified address range. The object's - * size should match that of the address range. + * Inserts the given VM object into the target map at the + * specified address range. * * Requires that the map be locked, and leaves it so. * From nobody Fri Aug 25 01:08: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 4RX1zd49Vsz4qZmF; Fri, 25 Aug 2023 01:08: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 4RX1zd3HRVz4SDQ; Fri, 25 Aug 2023 01:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LtKlWOJUzn1sdfatOtGPY/G2PZNk7QmKr3Sv5Zq6w5g=; b=LiOhxnkwEjeEbLtM+EGwKAzKwhFToFO2UJkd/BUbkFWVp/8cpqeg2aYvJufdcpx6wqTq5O oTqSZqZK6vjr4uqsvy8/k31DHv67RYRvzow2lSAPuKtugtTs6vlMPKpVS/bTkyCNK74zns kdWrbqjKGJU/0N74Bss7c9xAfwTSZyehmOGlUrxOxyznPLYWCwSTQV6qo6iNyRaLqWAWPY nc6qpONoBBuRqU/6IqdliiWuRvHBxxTfGVoll2S2Jy93xyKpm64TFt6SnOoS/EZ0Csb3nO SbC6nB7LQ3tyyCDnvtBv290SO74cMpc7XB3OwGgua44EJ3LWY+WMSDoPvC6lxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LtKlWOJUzn1sdfatOtGPY/G2PZNk7QmKr3Sv5Zq6w5g=; b=llGg79FcJ8w9i2IwTMkQfceetUEfHsHrn2zCfLQdI1FXvcP630/Hc5NoTM02vIAAKPiIG7 USb/+76i9yzyzVexO4JSUk697+YiIhGKmp9vx/rekvyHUnR2zYXcJV5m2lwaKUAigmjz6E Pbxw2u6c1hrY8GXEQrYcJRxHTP+t5yxgdiaQ/cUBSf+7oIKxdRV8m+n6KQQlHH7q1iffnM Jd0MV47EayAhvtKztX1d8B293Sbh9XAp+LYJtho6yvQMFZJ14OqmXM/gobEBf5Herh5E4Q /E0FD6QhhEuNdznSEb06YSCjRQSyM0jcUvhzFFb89DyGfB0hOZz4Gwt4wkeD/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925709; a=rsa-sha256; cv=none; b=HaBokUx1B9OWxMxAfDQmg1DQhTtgED25pHHqh0VPfo98wfKKtepSEuZ9+Z2IYQ4b6+U7eE sIDTYvF4bG9JocD0ZTgDl04iTTrjiGfDUu7AXJidbHUjS1m+8CnLW3tITAIqmwV6K+LHke R0XsSewYo72zP2IkdZ04KWZyRMXAsxkTScbTvFxqKfd6Delwu69Hu44oVMwZ3Yys41MYX+ ePFfwI3sr0a6fFJZe3RcRMt0c1Ko5XQ1m6rlSMDBdVWr5/8o9h8pCi1TzkdDnjUQoL2F8c teVksBF6Gdcz4Ke5NB0fDwVVd5Hjuz8jkIdRxZaH5OMoGaDP8bmavR0BKcH/qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zd2NGfzplH; Fri, 25 Aug 2023 01:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18T6J058135; Fri, 25 Aug 2023 01:08:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18ToO058132; Fri, 25 Aug 2023 01:08:29 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:29 GMT Message-Id: <202308250108.37P18ToO058132@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: 820ff1974625 - stable/13 - Add vm_map_insert1(9) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 820ff197462530b169fcc40283a45d18f41b2dfc Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=820ff197462530b169fcc40283a45d18f41b2dfc commit 820ff197462530b169fcc40283a45d18f41b2dfc Author: Konstantin Belousov AuthorDate: 2023-07-19 16:44:18 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:43 +0000 Add vm_map_insert1(9) (cherry picked from commit ba41b0de3ef2b29c5c1155c7550785ed4b491bd8) --- sys/vm/vm_map.c | 75 +++++++++++++++++++++++++++++++++++++++------------------ sys/vm/vm_map.h | 2 +- 2 files changed, 52 insertions(+), 25 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 1f111448a49d..27360f70e1e1 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1599,19 +1599,16 @@ vm_map_lookup_entry( } /* - * vm_map_insert: - * - * Inserts the given VM object into the target map at the - * specified address range. - * - * Requires that the map be locked, and leaves it so. - * - * If object is non-NULL, ref count must be bumped by caller - * prior to making call to account for the new entry. + * vm_map_insert1() is identical to vm_map_insert() except that it + * returns the newly inserted map entry in '*res'. In case the new + * entry is coalesced with a neighbor or an existing entry was + * resized, that entry is returned. In any case, the returned entry + * covers the specified address range. */ -int -vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset, - vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max, int cow) +static int +vm_map_insert1(vm_map_t map, vm_object_t object, vm_ooffset_t offset, + vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max, int cow, + vm_map_entry_t *res) { vm_map_entry_t new_entry, next_entry, prev_entry; struct ucred *cred; @@ -1758,7 +1755,8 @@ charged: map->size += end - prev_entry->end; vm_map_entry_resize(map, prev_entry, end - prev_entry->end); - vm_map_try_merge_entries(map, prev_entry, next_entry); + *res = vm_map_try_merge_entries(map, prev_entry, + next_entry); return (KERN_SUCCESS); } @@ -1819,7 +1817,7 @@ charged: * other cases, which are less common. */ vm_map_try_merge_entries(map, prev_entry, new_entry); - vm_map_try_merge_entries(map, new_entry, next_entry); + *res = vm_map_try_merge_entries(map, new_entry, next_entry); if ((cow & (MAP_PREFAULT | MAP_PREFAULT_PARTIAL)) != 0) { vm_map_pmap_enter(map, start, prot, object, OFF_TO_IDX(offset), @@ -1829,6 +1827,27 @@ charged: return (KERN_SUCCESS); } +/* + * vm_map_insert: + * + * Inserts the given VM object into the target map at the + * specified address range. + * + * Requires that the map be locked, and leaves it so. + * + * If object is non-NULL, ref count must be bumped by caller + * prior to making call to account for the new entry. + */ +int +vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset, + vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max, int cow) +{ + vm_map_entry_t res; + + return (vm_map_insert1(map, object, offset, start, end, prot, max, + cow, &res)); +} + /* * vm_map_findspace: * @@ -2312,13 +2331,14 @@ vm_map_merged_neighbor_dispose(vm_map_t map, vm_map_entry_t entry) /* * vm_map_try_merge_entries: * - * Compare the given map entry to its predecessor, and merge its precessor - * into it if possible. The entry remains valid, and may be extended. - * The predecessor may be deleted. + * Compare two map entries that represent consecutive ranges. If + * the entries can be merged, expand the range of the second to + * cover the range of the first and delete the first. Then return + * the map entry that includes the first range. * * The map must be locked. */ -void +vm_map_entry_t vm_map_try_merge_entries(vm_map_t map, vm_map_entry_t prev_entry, vm_map_entry_t entry) { @@ -2328,7 +2348,9 @@ vm_map_try_merge_entries(vm_map_t map, vm_map_entry_t prev_entry, vm_map_mergeable_neighbors(prev_entry, entry)) { vm_map_entry_unlink(map, prev_entry, UNLINK_MERGE_NEXT); vm_map_merged_neighbor_dispose(map, prev_entry); + return (entry); } + return (prev_entry); } /* @@ -4548,10 +4570,10 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, gap_bot = top; gap_top = addrbos + max_ssize; } - rv = vm_map_insert(map, NULL, 0, bot, top, prot, max, cow); + rv = vm_map_insert1(map, NULL, 0, bot, top, prot, max, cow, + &new_entry); if (rv != KERN_SUCCESS) return (rv); - new_entry = vm_map_entry_succ(prev_entry); KASSERT(new_entry->end == top || new_entry->start == bot, ("Bad entry start/end for new stack entry")); KASSERT((orient & MAP_STACK_GROWS_DOWN) == 0 || @@ -4562,10 +4584,17 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, ("new entry lacks MAP_ENTRY_GROWS_UP")); if (gap_bot == gap_top) return (KERN_SUCCESS); - rv = vm_map_insert(map, NULL, 0, gap_bot, gap_top, VM_PROT_NONE, + rv = vm_map_insert1(map, NULL, 0, gap_bot, gap_top, VM_PROT_NONE, VM_PROT_NONE, MAP_CREATE_GUARD | (orient == MAP_STACK_GROWS_DOWN ? - MAP_CREATE_STACK_GAP_DN : MAP_CREATE_STACK_GAP_UP)); + MAP_CREATE_STACK_GAP_DN : MAP_CREATE_STACK_GAP_UP), &gap_entry); if (rv == KERN_SUCCESS) { + KASSERT((gap_entry->eflags & MAP_ENTRY_GUARD) != 0, + ("entry %p not gap %#x", gap_entry, gap_entry->eflags)); + KASSERT((gap_entry->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP)) != 0, + ("entry %p not stack gap %#x", gap_entry, + gap_entry->eflags)); + /* * Gap can never successfully handle a fault, so * read-ahead logic is never used for it. Re-use @@ -4575,8 +4604,6 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, * store the original stack protections in the * object offset. */ - gap_entry = orient == MAP_STACK_GROWS_DOWN ? - vm_map_entry_pred(new_entry) : vm_map_entry_succ(new_entry); gap_entry->next_read = sgp; gap_entry->offset = prot; } else { diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 85d622ee1bb6..8adfcaf57cb3 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -522,7 +522,7 @@ vm_map_entry_succ(vm_map_entry_t entry) int vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, vm_prot_t new_prot, vm_prot_t new_maxprot, int flags); int vm_map_remove (vm_map_t, vm_offset_t, vm_offset_t); -void vm_map_try_merge_entries(vm_map_t map, vm_map_entry_t prev, +vm_map_entry_t vm_map_try_merge_entries(vm_map_t map, vm_map_entry_t prev, vm_map_entry_t entry); void vm_map_startup (void); int vm_map_submap (vm_map_t, vm_offset_t, vm_offset_t, vm_map_t); From nobody Fri Aug 25 01:08:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RX1zf4l0nz4qbBN; Fri, 25 Aug 2023 01:08: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 4RX1zf46Rpz4SMc; Fri, 25 Aug 2023 01:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QiyGrbXWmuvdFEhOT+xoqF0X5/OMsY+tfE9el+5w9pk=; b=EkOCbSKbqId/mGCEO65/vm+FEg+vy1ptqo0QIhBUX7zBHMcngu1FJc+QR4dVKtcL++uSLg +jKWXigBJOHEhqke+/MJSTpLI+0SeRw34Ohwp3IDGmpK1HGImb9tRE/gd2ME4Vjh9aSvWQ dqhXY38IxuoRUKm0UtskqUBTvqJpCuwtSsZQ9aRfFrYJBqvK95O44KP846m9nz/hW0ERca w/F9ZgvkO+wVor2GQGmuFPLWmbVv75ARpz7mhhSrUoOY/Vz64sfgDOy6zko7K5oP2XjmtH J1de5mOXX1xFYXgypvo378ITTzphFDJcDkI7na5YLLm0/jR/FLPJlcRNKbMwJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QiyGrbXWmuvdFEhOT+xoqF0X5/OMsY+tfE9el+5w9pk=; b=a7RQoI+2MVkHpfAa+cuwepE6GqhHyD2KTzrHQAgx9SH5IsScMITdB6uLLq5TAcltiYHbRM 9UAfyC27DU2piawj36qqNxNEXIfm3koiLeY2uixWSLvoEWMenTFfRJp3wbUOYuNMecPvkY kgbcGOu3RNDn08og2cPtUKR4kTJdZreQFULQHAyO2BBc4a3qm2uLvxnSFpJp1s5bq4jk7u be6QJa3gmbzGUTtH0JWQHffl9wfREgUvrEoMetEniKUalD7a3xcmMJTKY23YFv3EzIwvG/ iBDh/pESKznvyEGGxqnzR42JuIObdcVaahbUoZmU6HPvLvDxGxXAM8b1WyPwlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925710; a=rsa-sha256; cv=none; b=gOge32BmkZhzQuLXnYgySbXdR4OwCOITTya3DrF8kbyjfitEI//1MyEr7xGPgo0Usggks5 DeVWDg7F+5E3oMJbs6rai5lX/gm1sliXOMFYU+MweBZYkAbC7ptUSdahchHKp7iEI8nZeE ko4+0yXlKhBWo8FlpjTLutVldc+RTWeLfC8rm1s2FSOueiu1ucqg4eq1LPoB7pi/Ivav6p bywQAUu4fwazYS+kfGNMQ6gejV6bvuSy2oz/qtGBMFymKS+oJWAt+ZOdyjj4UKcxri5fPO rEDLvrpF/g9lRJwGwxJRTQ5i8Ixls+kuFnUntMPoXNdezOk0a1DwTQd9HiN6YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zf3CLNzpC9; Fri, 25 Aug 2023 01:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18Ulp058177; Fri, 25 Aug 2023 01:08:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18Uck058174; Fri, 25 Aug 2023 01:08:30 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:30 GMT Message-Id: <202308250108.37P18Uck058174@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: 2fab20ed1bc5 - stable/13 - vm_map.c: add CONTAINS_BITS macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2fab20ed1bc565d42d4080b9a8ee81fffdfaebff Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2fab20ed1bc565d42d4080b9a8ee81fffdfaebff commit 2fab20ed1bc565d42d4080b9a8ee81fffdfaebff Author: Konstantin Belousov AuthorDate: 2023-07-29 17:52:52 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:43 +0000 vm_map.c: add CONTAINS_BITS macro (cherry picked from commit 0fb6aae7f0e19c0628c398bbe30297ef9245030e) --- sys/vm/vm_map.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 27360f70e1e1..9588f0591bcc 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -146,6 +146,8 @@ static int vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, static void vm_map_wire_entry_failure(vm_map_t map, vm_map_entry_t entry, vm_offset_t failed_addr); +#define CONTAINS_BITS(set, bits) ((~(set) & (bits)) == 0) + #define ENTRY_CHARGED(e) ((e)->cred != NULL || \ ((e)->object.vm_object != NULL && (e)->object.vm_object->cred != NULL && \ !((e)->eflags & MAP_ENTRY_NEEDS_COPY))) @@ -2727,15 +2729,15 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, vm_map_entry_t entry, first_entry, in_tran, prev_entry; vm_object_t obj; struct ucred *cred; - vm_prot_t old_prot; + vm_prot_t check_prot, old_prot; int rv; if (start == end) return (KERN_SUCCESS); - if ((flags & (VM_MAP_PROTECT_SET_PROT | VM_MAP_PROTECT_SET_MAXPROT)) == - (VM_MAP_PROTECT_SET_PROT | VM_MAP_PROTECT_SET_MAXPROT) && - (new_prot & new_maxprot) != new_prot) + if (CONTAINS_BITS(flags, VM_MAP_PROTECT_SET_PROT | + VM_MAP_PROTECT_SET_MAXPROT) && + !CONTAINS_BITS(new_maxprot, new_prot)) return (KERN_OUT_OF_BOUNDS); again: @@ -2744,8 +2746,7 @@ again: if ((map->flags & MAP_WXORX) != 0 && (flags & VM_MAP_PROTECT_SET_PROT) != 0 && - (new_prot & (VM_PROT_WRITE | VM_PROT_EXECUTE)) == (VM_PROT_WRITE | - VM_PROT_EXECUTE)) { + CONTAINS_BITS(new_prot, VM_PROT_WRITE | VM_PROT_EXECUTE)) { vm_map_unlock(map); return (KERN_PROTECTION_FAILURE); } @@ -2766,6 +2767,11 @@ again: /* * Make a first pass to check for protection violations. */ + check_prot = 0; + if ((flags & VM_MAP_PROTECT_SET_PROT) != 0) + check_prot |= new_prot; + if ((flags & VM_MAP_PROTECT_SET_MAXPROT) != 0) + check_prot |= new_maxprot; for (entry = first_entry; entry->start < end; entry = vm_map_entry_succ(entry)) { if ((entry->eflags & MAP_ENTRY_GUARD) != 0) @@ -2774,12 +2780,7 @@ again: vm_map_unlock(map); return (KERN_INVALID_ARGUMENT); } - if ((flags & VM_MAP_PROTECT_SET_PROT) == 0) - new_prot = entry->protection; - if ((flags & VM_MAP_PROTECT_SET_MAXPROT) == 0) - new_maxprot = entry->max_protection; - if ((new_prot & entry->max_protection) != new_prot || - (new_maxprot & entry->max_protection) != new_maxprot) { + if (!CONTAINS_BITS(entry->max_protection, check_prot)) { vm_map_unlock(map); return (KERN_PROTECTION_FAILURE); } From nobody Fri Aug 25 01:08: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 4RX1zh13PBz4qb7V; Fri, 25 Aug 2023 01:08: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 4RX1zg52Vvz4Sjk; Fri, 25 Aug 2023 01:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ph+Davdv4eSkG986gg2uYVZMwKrfIhj6xY6HA9EME7E=; b=lLuHJ9pMpVnbyoYtOwijSyqfbQshY523BNmrySvDduK8vFAnq2kVz6N+FEzU5r0J/kMjHS brdu3vUNvBBGzPg1gvjY2TlRnsgJ5IPOq3h7BkhoKi0RphX4g+1GViX47R2tVvou24mtYS esAwfPQK/wUmkP/tGQMpvf3XnmRwXl+DMrjZp3Mmy/Q9l68iRxom4Wk2evFMZAZ+bERltF 4GrmHLOg/BSExH5uOHpU5kstNqo6yFwctPJm2Wp4Gfsc2mNwVCzXJbs2HxrKIUuO9sBRiG Rdt7Aydf8xwg+XRw7Q+wBfH8BS5m7h0VlWFGFSaNnZDZ1rD/lyDbB9tT9oxn9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ph+Davdv4eSkG986gg2uYVZMwKrfIhj6xY6HA9EME7E=; b=EZCMATVjFDf8hvaAyla0o1SEgN1EAafvNpQLOk+kVVCX+EhvbexRZPnomlfJgHr4AWudbS cKWWmH7vTaE7DC/B+2kty/q0Cu/5+1FF1+FTlnBdhPT3JF1fj4FApEFXSJ2t4gQ5f2EYlm wJS0irk8XO+Zl7NZKPnmj7u06BqZZKNDO7jzIYvMy1DEBct4RKVKQgef97OEMiuWb07A/A AHIkrgYYSxnonCtS0mJI4Sd3HgZtKui1+kp9Y6TiOn4uHHbcXSMDxkrt9N0Q3nWGXKXyW8 f/z5FTdA8tFTOJbA1O/Z41ErchAW1w93d0ZcavHacPvsP99hhmkIwKyL+2gklA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925711; a=rsa-sha256; cv=none; b=MjVRe0VLzAn8q3OpqQ/ZoZu57Tv7ngeTZC8YLTCGLD5U7ClctLq3TmvdBBffMqmpF8IJMs oq2QiIE4ae2T3jrEKaT4ToZ/y+kasTU1o06YTdWjBfGOc2QOfjWXjcZBBOrxBpdS/EJs3l s/odnLXKzXbJxOj8rD9EEB4nwEFx6DVmk7RkmwltrVm6huyTVTT73F/dHbILjd4ZdCRiv5 ex6VLDka98jNhflBPyZX9E7HW7j/SxRF95M9Pw/wdupGK+3gNSZ7qpCz3jo5FRtkXhRftI VoS2whOuQXstuHPgxP2ElCXkq6yvFcxt9Minko89NXngpkE0LSTY73UXCUxu3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zg45wYzpYx; Fri, 25 Aug 2023 01:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18Vrd058227; Fri, 25 Aug 2023 01:08:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18V3w058224; Fri, 25 Aug 2023 01:08:31 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:31 GMT Message-Id: <202308250108.37P18V3w058224@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: a6e48fe943dc - stable/13 - vm_map_growstack(): handle max protection for stacks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: a6e48fe943dc93b113564401bc22214419192386 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a6e48fe943dc93b113564401bc22214419192386 commit a6e48fe943dc93b113564401bc22214419192386 Author: Konstantin Belousov AuthorDate: 2023-07-25 13:56:29 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 vm_map_growstack(): handle max protection for stacks (cherry picked from commit aa928a52164fe57965491d63e57de66e9c078e1a) --- sys/vm/vm_map.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 9588f0591bcc..d4e4f2c89679 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4606,7 +4606,7 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, * object offset. */ gap_entry->next_read = sgp; - gap_entry->offset = prot; + gap_entry->offset = prot | PROT_MAX(max); } else { (void)vm_map_delete(map, bot, top); } @@ -4626,7 +4626,7 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) struct ucred *cred; vm_offset_t gap_end, gap_start, grow_start; vm_size_t grow_amount, guard, max_grow; - vm_prot_t prot; + vm_prot_t prot, max; rlim_t lmemlim, stacklim, vmemlim; int rv, rv1; bool gap_deleted, grow_down, is_procstack; @@ -4771,7 +4771,8 @@ retry: * The gap_entry "offset" field is overloaded. See * vm_map_stack_locked(). */ - prot = gap_entry->offset; + prot = PROT_EXTRACT(gap_entry->offset); + max = PROT_MAX_EXTRACT(gap_entry->offset); grow_start = gap_entry->end - grow_amount; if (gap_entry->start + grow_amount == gap_entry->end) { @@ -4785,7 +4786,7 @@ retry: gap_deleted = false; } rv = vm_map_insert(map, NULL, 0, grow_start, - grow_start + grow_amount, prot, prot, MAP_STACK_GROWS_DOWN); + grow_start + grow_amount, prot, max, MAP_STACK_GROWS_DOWN); if (rv != KERN_SUCCESS) { if (gap_deleted) { rv1 = vm_map_insert(map, NULL, 0, gap_start, From nobody Fri Aug 25 01:08: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 4RX1zh719vz4qZs5; Fri, 25 Aug 2023 01:08: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 4RX1zh5qtYz4Smc; Fri, 25 Aug 2023 01:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tChOEE5Tl2gkV6nsf9hSCO1oXkhGkad0kgzqAzZZjkE=; b=uIzjGHV1P0J06LI3d/XF7i77lPr1XmhnK1NuDss0XAF1H7Ap7A0TzFJozoYfGMLkh9aLzO e/FgIoPt317zjNJJL6iY8tD7sBC+piQLL8w/1px8ih9ST1E1/kAnvYjyC2nhlkAaYhiEy7 muXlOw1oqbEMmNvAmOS8bO5UZ9r+4LZO/wMVkcrdDW+v9+5ZAHPk+e7Kvev6QAnhy+4lYL tDtNE5xTC6u8DjXfqljWHLzfkX0mauazy6pjtWnlH95qyLyEEkZ+SKGLVElGzMRgewdgd9 +458himO8xj0YbUMoCsfcYBau5X9N+JPU1Xc8Tjpg8rjQTt/YDSC1wceQEo1Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tChOEE5Tl2gkV6nsf9hSCO1oXkhGkad0kgzqAzZZjkE=; b=rWCthZrYRdXCEmLsyWl93sudrCnhM5iadHxg9tOOTC07PG4cLa1e+O5jt0zmn+vjpuA6uO h3lBYnuFDUgACth0bXJEV0Hgdb7IzPVFk2KV7+mSa3LSatPjA+mDPh8XNRPcEbf0i4iiHq SJwcHQUd4dqCuNWJ2Gv4b0yKtR54xMLbSDOthPw5lIzelJvG3K2jB8Ze2mM/oea+/0/Z2V 4QtU3Zd7MhYIl2Y7kuS5RlfenQqkQuLTXythgEFK4iOii7zDTw+HpN4Wm5xXD5XF+aBy4C BZHJDUxjjOsLoa58u8l9OcsrgqCdx1di0URTMGKFZhrwUvOLcdCnPNXbv9GkqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925712; a=rsa-sha256; cv=none; b=oShd5P6BzZtFjJPmbLDDd8/1BKiIh5LsIwZNmP/qItw4MkE6GO67ZV/4jw4F9mkiUYz0fo WTIXQwLe8NJbCSvjJIWtpu5sroBx6Ps3ghLbwPLXJuJsy54KHx2jIcht88kOEoVvKg0Hdz n8foTfgY0ikfl9Tmruzg1LhCpvbCiHyuhxJcnmkzxcYsdDiUaH1E02UBxNAw0Fszb4qHpQ y+ITK4BuMnPUtp55Bpubcic01walEgwaqEE91ofXOajgWPNNrjlbb649edkrXtkl48Q/wO ZwwK31e/HczjvxuMQj72nWcGjKQL9PSogEtmqNG678Cnuiscn5nI42fVjyJgGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zh4wv8zpYy; Fri, 25 Aug 2023 01:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18WNe058298; Fri, 25 Aug 2023 01:08:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18Wtu058295; Fri, 25 Aug 2023 01:08:32 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:32 GMT Message-Id: <202308250108.37P18Wtu058295@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: f28d489aaaa4 - stable/13 - vm_map_protect(): move guard handling at the last phase into an empty dedicated helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f28d489aaaa417afe984a096dfbfecbfb6b2a695 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f28d489aaaa417afe984a096dfbfecbfb6b2a695 commit f28d489aaaa417afe984a096dfbfecbfb6b2a695 Author: Konstantin Belousov AuthorDate: 2023-07-28 00:14:07 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 vm_map_protect(): move guard handling at the last phase into an empty dedicated helper (cherry picked from commit 79169929f04d00e51a901d1e4cb377d2475bf660) --- sys/vm/vm_map.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index d4e4f2c89679..d443c320b799 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2716,6 +2716,13 @@ vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, VM_OBJECT_RUNLOCK(object); } +static void +vm_map_protect_guard(vm_map_entry_t entry, vm_prot_t new_prot, + vm_prot_t new_maxprot, int flags) +{ + MPASS((entry->eflags & MAP_ENTRY_GUARD) != 0); +} + /* * vm_map_protect: * @@ -2774,12 +2781,13 @@ again: check_prot |= new_maxprot; for (entry = first_entry; entry->start < end; entry = vm_map_entry_succ(entry)) { - if ((entry->eflags & MAP_ENTRY_GUARD) != 0) - continue; if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) != 0) { vm_map_unlock(map); return (KERN_INVALID_ARGUMENT); } + if ((entry->eflags & MAP_ENTRY_GUARD) != 0) { + continue; + } if (!CONTAINS_BITS(entry->max_protection, check_prot)) { vm_map_unlock(map); return (KERN_PROTECTION_FAILURE); @@ -2879,10 +2887,15 @@ again: entry->start < end; vm_map_try_merge_entries(map, prev_entry, entry), prev_entry = entry, entry = vm_map_entry_succ(entry)) { - if (rv != KERN_SUCCESS || - (entry->eflags & MAP_ENTRY_GUARD) != 0) + if (rv != KERN_SUCCESS) continue; + if ((entry->eflags & MAP_ENTRY_GUARD) != 0) { + vm_map_protect_guard(entry, new_prot, new_maxprot, + flags); + continue; + } + old_prot = entry->protection; if ((flags & VM_MAP_PROTECT_SET_MAXPROT) != 0) { From nobody Fri Aug 25 01:08: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 4RX1zk0YtLz4qZwZ; Fri, 25 Aug 2023 01:08: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 4RX1zk07jFz4Sqb; Fri, 25 Aug 2023 01:08:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ViWf7ctnZAbHGfrNyGL+aCMGtAMZ/Sif5fQZMmIEIs=; b=FQx7PC8+H83ujdNsQMmm8pzTfHb+wNiyf0rZdLgHhxxY+VFGv5jUnzM+fYtkUt6roq2n4a EYyHoJYRxu4Cv2t9zh5XxG8dtWzlZLcZsnfJ7+FKZmzSZEC1FipmwTSMcRM1vXuS2CyxWX 8oC8SzClWlgxqLZ6pdPPu+dfN5mw+wo/ZSd5V+URbeV0jkY57X2Tr0XT6NAqjwCuZgoOeI w5kNIHmOSlHtv6LV5daZr6o8MiTUySQXqAcscQVFjXlCzNdpve0BKWQBPTAY81YiCsgMqY FLtMlnsVctEeXVkCxt/uXpELXo7gLP/nEo+06m7MGB3VmaYlf7ZYulgmFF/Zqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ViWf7ctnZAbHGfrNyGL+aCMGtAMZ/Sif5fQZMmIEIs=; b=G052ov7JLU8e2c5ztbf1rbiKv8+unYr052Hhpp0f/M/pBC9eAXyru7Qtfju72WltsYCxl7 OZOjsQz+Vbg7ZREBFEfZ0MaOUyEzSD/Es297+cDf38LCrxRoyfe0xkWNb+KRfBVUZswxyY jTa/r+2wZF88/AUr6FJke9S46WUehQeUXMv/abFEurVZ4BW+SqHBmGGb2Ih+a4rv/LaY6b ukOapss2CAhlt6uberhEa6fGQOhZbZRoOf1VArmkASEm/qjEL4z5N7+ql8dBDckqsKVShh pvhJwwx1byCrZNu4K4cXqb4PfiApL7B/7lmZNwNqMiP7emZyP27r6XeC08EmFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925714; a=rsa-sha256; cv=none; b=dm9nZqhCymB62BesTYOqjRg8SrfRBACtbddHxHzu9E2Q6O2wOXHStdosEhJOs7xQjVi3wa i2DA3mQLIlRVzZlRn7/boDzpo+Y2Q/oHXoTRnF6mSjk/lc973O008An3sdzLoncp5Yw5Ea jBJWEdDK+uX8AuZDfVQJAw07FBZLUBDwnb8KemExkasLk2XiFe4KTKnybNUoonADmk+fyY 56GfOlb4laQQcRPjgkOZ/zM5HaiNhcwGPCU5VtBKKgfMLqHvf6btxJiIKB9a1LVIzFniGK rGS6Coufp9e5xAmA1mXKv52ieaLYoo5UiRD8FeDr97DaOju/39OpB1gFTF11aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zj6KQNzpZ0; Fri, 25 Aug 2023 01:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18XIE058355; Fri, 25 Aug 2023 01:08:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18XG0058352; Fri, 25 Aug 2023 01:08:33 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:33 GMT Message-Id: <202308250108.37P18XG0058352@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: bd7afd9e50b3 - stable/13 - vm_map_protect(): handle stack protection stored in the stack guard List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bd7afd9e50b3a0939354c3e8c8ddcc9f696c92f9 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bd7afd9e50b3a0939354c3e8c8ddcc9f696c92f9 commit bd7afd9e50b3a0939354c3e8c8ddcc9f696c92f9 Author: Konstantin Belousov AuthorDate: 2023-07-25 13:32:28 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 vm_map_protect(): handle stack protection stored in the stack guard (cherry picked from commit 55be6be12cd95552a46feccb42db984c8d3cbc36) --- sys/vm/vm_map.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index d443c320b799..09e78b3e18f9 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2720,7 +2720,22 @@ static void vm_map_protect_guard(vm_map_entry_t entry, vm_prot_t new_prot, vm_prot_t new_maxprot, int flags) { + vm_prot_t old_prot; + MPASS((entry->eflags & MAP_ENTRY_GUARD) != 0); + if ((entry->eflags & (MAP_ENTRY_STACK_GAP_UP | + MAP_ENTRY_STACK_GAP_DN)) == 0) + return; + + old_prot = PROT_EXTRACT(entry->offset); + if ((flags & VM_MAP_PROTECT_SET_MAXPROT) != 0) { + entry->offset = PROT_MAX(new_maxprot) | + (new_maxprot & old_prot); + } + if ((flags & VM_MAP_PROTECT_SET_PROT) != 0) { + entry->offset = new_prot | PROT_MAX( + PROT_MAX_EXTRACT(entry->offset)); + } } /* @@ -2736,7 +2751,7 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, vm_map_entry_t entry, first_entry, in_tran, prev_entry; vm_object_t obj; struct ucred *cred; - vm_prot_t check_prot, old_prot; + vm_prot_t check_prot, max_prot, old_prot; int rv; if (start == end) @@ -2785,10 +2800,14 @@ again: vm_map_unlock(map); return (KERN_INVALID_ARGUMENT); } - if ((entry->eflags & MAP_ENTRY_GUARD) != 0) { + if ((entry->eflags & (MAP_ENTRY_GUARD | + MAP_ENTRY_STACK_GAP_DN | MAP_ENTRY_STACK_GAP_UP)) == + MAP_ENTRY_GUARD) continue; - } - if (!CONTAINS_BITS(entry->max_protection, check_prot)) { + max_prot = (entry->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP)) != 0 ? + PROT_MAX_EXTRACT(entry->offset) : entry->max_protection; + if (!CONTAINS_BITS(max_prot, check_prot)) { vm_map_unlock(map); return (KERN_PROTECTION_FAILURE); } From nobody Fri Aug 25 01:08: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 4RX1zl1qRhz4qbBZ; Fri, 25 Aug 2023 01:08: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 4RX1zl16Mfz4Stf; Fri, 25 Aug 2023 01:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qEpVpLIWZJe7GFJdu0M/JIhep5sFG16sOgZ1Z4SYVd8=; b=w6gMj8PZxsLuS2AEhbqw2zvmioFhFDpcgl1hURD3fY2a+kJ2VQWKI+V8R9VwxO8R988sRA e5dnJBbER7P5NwMi3lidbjflEZryBzNIcYPXpx5M1+e0od0NgkSFny/54opv//cel7ga35 fmlsQFhyvl5GbtKW77UBkiRpMZ2ugWxMDtZovF6v4tn2106eACMDW2AZAe3AueuH2Znw+w ho3INqqqnkgJHv0PoruhLkf7eideabWB4qNpc+zyHiaQjTnF91n8KEkdJzYx5LwLiU3Rgy cZF9ETSIVViXHBK6Wohwtf2BmwKjjOGhK9oc4kbzrvSkmMF5kX1ZsgBvKQkeqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qEpVpLIWZJe7GFJdu0M/JIhep5sFG16sOgZ1Z4SYVd8=; b=ilRqTXVd3D0gNkiSfs2eBIrkGYxwfl5EJMDVR0QrON6g18N7LL9zhf3POQZDNkuB1fk1KG xFmTEAsH73JdT4BKacjA31cAh/Vd2DkO1LbIA7UJ5y714DDCPcuyUt6u+EprjFPLBdjLJD pSDgR6jNze5AFgYgaMqdMTVJIAwLulaBz6bKip0UEP8Y7aqcJuUCy4jl3eFvHurVAbadKI 5cJDRGgbz5o5c6C3311PGoCk+5GCzF0qqDS0RzyG8HzRQtioN8OkmBwfx+ZRjEftAEAj3b 72vKXYTWt4ZSMidLXGXvLKZGsTYhTGy87lGzkxEY4wRz4Ohrd1BgWU41T4x0kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925715; a=rsa-sha256; cv=none; b=xK3KAPP6Oevv9fM6/0fAjq5osAJmwNknujswDuubpq4Tdihlk0trPHUxrNydw/bb9XPNME 4KnXFg45UwkkAoZeaDLDbzcavyB8DSlgefCg9pA9Iiocd07TBDNUWldJEtdbtRzbvg6IN+ iboTot/0zxZLu9Pz+WBeRmq1RMH0gCFBsSuW0vne4BEUL0JjX1aolMzMppg6AWYdAun3IB 9DJCkCgISw0pty3HiKeu3kT36BBp93ZH/Q09ok9BBBjwj7fDNbgkAgKhn0+c0jNPtADjVr t976xzepEp/wqXt3DjEnkhiKU7wFIhjC+bEoekg00T3z2hYUCMsx0KqUk2isnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zl0BHrzptZ; Fri, 25 Aug 2023 01:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18YBv058409; Fri, 25 Aug 2023 01:08:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18Yvu058406; Fri, 25 Aug 2023 01:08:34 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:34 GMT Message-Id: <202308250108.37P18Yvu058406@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: ce5d4af8bce6 - stable/13 - vm_map: do not allow to merge stack gap 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ce5d4af8bce6701e8c1370a45146edfca447a618 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ce5d4af8bce6701e8c1370a45146edfca447a618 commit ce5d4af8bce6701e8c1370a45146edfca447a618 Author: Konstantin Belousov AuthorDate: 2023-07-25 18:48:57 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 vm_map: do not allow to merge stack gap entries (cherry picked from commit 9d7ea6cff7a7edc0f3d4fa8d54e6345ee027e754) --- sys/vm/vm_map.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 09e78b3e18f9..076528126e44 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2287,7 +2287,8 @@ vm_map_find_min(vm_map_t map, vm_object_t object, vm_ooffset_t offset, * another entry. */ #define MAP_ENTRY_NOMERGE_MASK (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP | \ - MAP_ENTRY_IN_TRANSITION | MAP_ENTRY_IS_SUB_MAP | MAP_ENTRY_VN_EXEC) + MAP_ENTRY_IN_TRANSITION | MAP_ENTRY_IS_SUB_MAP | MAP_ENTRY_VN_EXEC | \ + MAP_ENTRY_STACK_GAP_UP | MAP_ENTRY_STACK_GAP_DN) static bool vm_map_mergeable_neighbors(vm_map_entry_t prev, vm_map_entry_t entry) From nobody Fri Aug 25 01:08: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 4RX1zm4fjpz4qZkH; Fri, 25 Aug 2023 01:08: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 4RX1zm2L23z4T6f; Fri, 25 Aug 2023 01:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9221Zt/wApvPZBGnYsw62cHU+0ulC4gv/APZIqlw3kA=; b=WMb3oDJ44ugKVd9J1lgQ650q/BIJBkOBQyUugOOqAsy8kQV5oyUDi5nNXOVAZgATr9zCZG 3cpPm4ksgk8cLdyIVxaJGn7VAdz5U4yoM4czlDhX1P1zo31SC76juk738sUki/sFzDpHxK 9wmBUTpFmFq5H5ZY76j3dhMEiIQZbQlVy4cQWwBTUFJEH3kA68yPOf/9e4Xch/E7VgiKUU YRadLM8b1RfVTBdHXx3Hhrun7KVRWtqu24pq9vEUq7PjZAAqAPhLHvvOVDN6JNJwb6wRN3 s2DcUGPSl5NMxHmKh7UrWsuNZoIkBqp07KWaq9P1ue+JUAS1fwC2Mz2bO0+o0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9221Zt/wApvPZBGnYsw62cHU+0ulC4gv/APZIqlw3kA=; b=N7G05x9KWrWPaNO5DE/B/FuF9yDYdr++mchhQhbG0Jb/tuDeIzp819mUIusDjbc98Tt/e3 8l0LGoymrpmSjrw2Aiz6UVl415/BsWdrm4uXH7rzRqQ96q83v4kSukcoRqkjDHx64bPThB NCAIFxIt0x0ovPvAFwoQ8KgFu+I4iAKK2h6cb/xY8Xu/KR4Vct1+XG5YOr5F4WeCjA9zHO GowmMw/27H4EO3nxyIkdLAuORgbO6Gp0YeQo/ui1hBUM9m90mb2yEm/NleDLEvhlRV0p19 hYbOs7WamVkbHSsHRTSS9mzbSLkAGA8ff55drbZmvJU+tX4EgZZNTyLl7MCYfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925716; a=rsa-sha256; cv=none; b=e0DUFKEEJSt4q4g9BDGyTEOysqWcNY1DmUnO9El9oCAh1uuu9exDfUoNiI2aQ3V4BdLwTO ewZo0ZhGuQX/R9yeZ3sCclGL1/+m1mwvxnPVDBykEl5UbXBoUUXEkqgRBVkb+x5Qmr58I+ r/uPSev85QDvdKPsFzU7rc9WCDrVEZSeb7uLmp4jq2xzjXV2V3ARdldDpwMvLl3OH1F/99 mYoODaB4spIiq5PnOVt721GtRPdJZrzlGZ3JMixV0xQ5dm5z0sZ3X2+9B2x/lS2MN1X92V vxCoNl3OBffrq+LhKnUZ7+HQQkfCeaTp7Dq3Or72VgGg9V16f3eX1nco/kERkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zm1Q2Nzpnn; Fri, 25 Aug 2023 01:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18ahg058470; Fri, 25 Aug 2023 01:08:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18aca058468; Fri, 25 Aug 2023 01:08:36 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:36 GMT Message-Id: <202308250108.37P18aca058468@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: f60811fed642 - stable/13 - vm_map_growstack(): restore stack gap data if gap entry was removed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f60811fed6428ebf75c888aec67e71714b75e618 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f60811fed6428ebf75c888aec67e71714b75e618 commit f60811fed6428ebf75c888aec67e71714b75e618 Author: Konstantin Belousov AuthorDate: 2023-07-25 18:52:15 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 vm_map_growstack(): restore stack gap data if gap entry was removed (cherry picked from commit b6037edbd17dd3144aa1a7b0814cd5ebe98d765a) --- sys/vm/vm_map.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 076528126e44..1f223bbbd396 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4658,7 +4658,7 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) struct vmspace *vm; struct ucred *cred; vm_offset_t gap_end, gap_start, grow_start; - vm_size_t grow_amount, guard, max_grow; + vm_size_t grow_amount, guard, max_grow, sgp; vm_prot_t prot, max; rlim_t lmemlim, stacklim, vmemlim; int rv, rv1; @@ -4806,6 +4806,7 @@ retry: */ prot = PROT_EXTRACT(gap_entry->offset); max = PROT_MAX_EXTRACT(gap_entry->offset); + sgp = gap_entry->next_read; grow_start = gap_entry->end - grow_amount; if (gap_entry->start + grow_amount == gap_entry->end) { @@ -4822,10 +4823,13 @@ retry: grow_start + grow_amount, prot, max, MAP_STACK_GROWS_DOWN); if (rv != KERN_SUCCESS) { if (gap_deleted) { - rv1 = vm_map_insert(map, NULL, 0, gap_start, + rv1 = vm_map_insert1(map, NULL, 0, gap_start, gap_end, VM_PROT_NONE, VM_PROT_NONE, - MAP_CREATE_GUARD | MAP_CREATE_STACK_GAP_DN); + MAP_CREATE_GUARD | MAP_CREATE_STACK_GAP_DN, + &gap_entry); MPASS(rv1 == KERN_SUCCESS); + gap_entry->next_read = sgp; + gap_entry->offset = prot | PROT_MAX(max); } else vm_map_entry_resize(map, gap_entry, grow_amount); From nobody Fri Aug 25 01:08: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 4RX1zn3mt4z4qbDn; Fri, 25 Aug 2023 01:08: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 4RX1zn3LRxz4SxJ; Fri, 25 Aug 2023 01:08:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q6upNcGKXtC0tMfspP+Di5qjnGoUp2xQ8PO7voQYumo=; b=hum1su80ZFYKEoeiaboJNZ0bco6BUT/DLUMY7FwTby6ffrIE70i7RmCpy5O8NHlNCGTWKB rfPUrpi0xoxhy3vXgabjYIEHyrASG2ac3jrZpqglNJOJMgWf8uaV09CFudgDVvxNzejEs/ bcXMJMOq4qDn7UBeyIc+EVmCLrlDEi4cKZRFog+DOImkYlA0hyPkBrydcclUbcQkiq2lby fVzudY/t6mN4SZ0Oiy/TWg8YtfqJF/qhaQ86mkXGeIBHiWb9k8ICj8tyT6KuWjBZXAyMTa Im8rjyyEC+QrBJzZSKcXePruFQysIosAtMw8rk3877tPEJNk9eIuAFg5exG8Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q6upNcGKXtC0tMfspP+Di5qjnGoUp2xQ8PO7voQYumo=; b=jDohF+WlJTfchDHZ6p6vcDHOxJRU/T3fd/WWomQdLZ8mauoR2XSX2W3MHn4M2EgysFead6 ZCc+GjnWHJA1u1OscTIANwL+4nFjTm7lYZwZJggvFUKn+NYjX6d2HgbJUbS1btJv7Ni9wz vFd7NSJ18yC3rLOf75jUd4VYz2LN5M3FGC0/pOJcG8a/PEzBIIvPK5jh9bg6bgZlX3Ln6p GkEgN26tnNAIdldRcS8v3d12/Yp04fv9pdht1U6ZVW1v3pAen0CAqODqNywfjbXwRXhY6o ryniRYX4oXeMbl56kji/fiG2mdd7PRJvdYtDhf5+bjDy8FDWQNZaUvOlw1mfcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925717; a=rsa-sha256; cv=none; b=JHjjpVamqSmRfNA0zo2A8gpxQjcRGcUUY0LwRK6w3/4l9UFFjRq2aSl9dIJIBugKLTBQu2 O64kVDn73KzXMANWOJZL3kMAH5pbbcxo4/xGwSb1gKk7lPMPJkhpLVMABC2viP1v6SHTJo 285atGkACXfkrFGuacyxR527gQiVk08qvD3OZvCSIBqUJvwlmxqGZFxkz+MEib78v61rQ+ nDZhq7y2dF/tSW7jADl2zHRq/981g7YcVs8ddemPsxhf7vNiSANbBhM0V3y5haRg+utasW bF9+v3QpKdwM5RMXUNSl2U0WkHgS5n2n0jomyk7iU26Z2xPjdTbSGWFpQgssEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zn2R5Tzpkv; Fri, 25 Aug 2023 01:08:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18bxc058511; Fri, 25 Aug 2023 01:08:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18bdd058508; Fri, 25 Aug 2023 01:08:37 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:37 GMT Message-Id: <202308250108.37P18bdd058508@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: d5fccc19aa1b - stable/13 - vm_map_protect(): add VM_MAP_PROTECT_GROWSDOWN flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d5fccc19aa1b1e9440b5ad3bc386b6bb42fdff78 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d5fccc19aa1b1e9440b5ad3bc386b6bb42fdff78 commit d5fccc19aa1b1e9440b5ad3bc386b6bb42fdff78 Author: Konstantin Belousov AuthorDate: 2023-07-28 00:40:53 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 vm_map_protect(): add VM_MAP_PROTECT_GROWSDOWN flag (cherry picked from commit 90049eabcfadf229e3983f04310a8ea28fe3d2b1) --- sys/vm/vm_map.c | 19 +++++++++++++++++++ sys/vm/vm_map.h | 1 + 2 files changed, 20 insertions(+) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 1f223bbbd396..029605eb272a 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2752,6 +2752,7 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, vm_map_entry_t entry, first_entry, in_tran, prev_entry; vm_object_t obj; struct ucred *cred; + vm_offset_t orig_start; vm_prot_t check_prot, max_prot, old_prot; int rv; @@ -2763,8 +2764,10 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, !CONTAINS_BITS(new_maxprot, new_prot)) return (KERN_OUT_OF_BOUNDS); + orig_start = start; again: in_tran = NULL; + start = orig_start; vm_map_lock(map); if ((map->flags & MAP_WXORX) != 0 && @@ -2787,6 +2790,22 @@ again: if (!vm_map_lookup_entry(map, start, &first_entry)) first_entry = vm_map_entry_succ(first_entry); + if ((flags & VM_MAP_PROTECT_GROWSDOWN) != 0 && + (first_entry->eflags & MAP_ENTRY_GROWS_DOWN) != 0) { + /* + * Handle Linux's PROT_GROWSDOWN flag. + * It means that protection is applied down to the + * whole stack, including the specified range of the + * mapped region, and the grow down region (AKA + * guard). + */ + while (!CONTAINS_BITS(first_entry->eflags, + MAP_ENTRY_GUARD | MAP_ENTRY_STACK_GAP_DN) && + first_entry != vm_map_entry_first(map)) + first_entry = vm_map_entry_pred(first_entry); + start = first_entry->start; + } + /* * Make a first pass to check for protection violations. */ diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 8adfcaf57cb3..9e4e1db0fd98 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -518,6 +518,7 @@ vm_map_entry_succ(vm_map_entry_t entry) #define VM_MAP_PROTECT_SET_PROT 0x0001 #define VM_MAP_PROTECT_SET_MAXPROT 0x0002 +#define VM_MAP_PROTECT_GROWSDOWN 0x0004 int vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, vm_prot_t new_prot, vm_prot_t new_maxprot, int flags); From nobody Fri Aug 25 01: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 4RX1zp5Jlcz4qbDq; Fri, 25 Aug 2023 01:08: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 4RX1zp4Tvfz4Sxn; Fri, 25 Aug 2023 01:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6p4zaOMgpJrmexXFsYXPNBo85A1wEOk4nW28O+yqckU=; b=hMz7/P3l1fRVTclSAY2klZcA+Uz5G7S2Kh/xvZnP7RK1GYTBOMkqJazcPvvK/Gsj+jYGdq PWBaGr6uiCPcd8JvnIhPE7EqDMZJSVeLYJQ/yNt1bocq89t7YT3NDI/ASrrFCRW0v6Yj07 2g3T3/HaoLktaqct8imkoOPI01K5tsdq8I++IBh5N2u7xiPE2b5XoZCyPxdVOTmyhiwKDF b8kFqwnmn/mA8Jcd7Uii1hEFTMIvRpO9ttI2np185awRBYMG9gIjAZtdPq9WsvzCSjYGaa wJdSq0edBDkJgnZDkGD9Sx0MPkc1q+0K/y2ym/cFruWrNHKKCpNMWtdFplg4AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6p4zaOMgpJrmexXFsYXPNBo85A1wEOk4nW28O+yqckU=; b=kpyjUJFrGstXHHL+BjQ7ovctVjyV4vooFgShmQb7QIWk1sIHjY258ovvjYC96jP4fp2JbN JKi47VsMzZT9/OsH4Ta279/6ujANNHU7sMvvwvhXIqBws0QVwK9xxbjj9WsQza2cC7OBLA /RlwM+bnuxyZ1ORiNhoTbRHJQjPnR+tibMM8O1w8uvZUojZ1zFlUG+n/uwtGzPG5jNY81H aem4vdpsq+LvlzPeYchi4qySN0+WQtqKHCy5Oi4xjc2B5T7pDkZoAJsxmNh1Ow2urqf9cw UkVZ+IMGqF7H2gfoO23TKhEKoPxY78luVglQ8v7jhkWxcgDnO9YppBpTwIZv3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925718; a=rsa-sha256; cv=none; b=jykQIZ2ddwSjbJO01lF/Pz0re6SxFubtf6tfdDHoC9jgSAyyv0xB02fXvDRJU6rupWcmag xyrtyxbISUgU7cJkAKpQtlSuhCh7BpPYuMIus21pfrWqSNXszZtLiO2VOIzZ/2Y51O1RBG HpfVU5uBLWIeQQrt81KmwYsCQbSRMvDozKA5H+MskddR3awJZkuixQg6Eqk9v9rMI2x3Qj yESvKuZW5Oqctm5YbJdyPPQKYQa60rogFgY6SKnL/Pv3g+VT6dBwoa2EYB7YvJp6RoYoPE kzWDUEgsE3cWIaOngMhD8E3Q/MuUPTbzwCGt6f1r2eAGJ9mtkzq0qAN0cJ2x9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zp3QRtzplJ; Fri, 25 Aug 2023 01:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18cox058551; Fri, 25 Aug 2023 01:08:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18cN7058548; Fri, 25 Aug 2023 01:08:38 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:38 GMT Message-Id: <202308250108.37P18cN7058548@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: 6283f6e79456 - stable/13 - linuxolator: implement Linux' PROT_GROWSDOWN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6283f6e79456546e836442fc27d4c52e3cbc2134 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6283f6e79456546e836442fc27d4c52e3cbc2134 commit 6283f6e79456546e836442fc27d4c52e3cbc2134 Author: Konstantin Belousov AuthorDate: 2023-07-29 21:00:51 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 linuxolator: implement Linux' PROT_GROWSDOWN (cherry picked from commit 9b65fa69407808e710748875b0af98902110f128) --- sys/compat/cloudabi/cloudabi_mem.c | 2 +- sys/compat/freebsd32/freebsd32_misc.c | 2 +- sys/compat/linux/linux_mmap.c | 14 ++++++++++---- sys/sys/syscallsubr.h | 3 ++- sys/vm/vm_mmap.c | 9 +++++---- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/sys/compat/cloudabi/cloudabi_mem.c b/sys/compat/cloudabi/cloudabi_mem.c index 0b721aea4016..dadf4058f30d 100644 --- a/sys/compat/cloudabi/cloudabi_mem.c +++ b/sys/compat/cloudabi/cloudabi_mem.c @@ -124,7 +124,7 @@ cloudabi_sys_mem_protect(struct thread *td, return (error); return (kern_mprotect(td, (uintptr_t)uap->mapping, uap->mapping_len, - prot)); + prot, 0)); } int diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index ac9486eb3f66..d708efcf91fe 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -480,7 +480,7 @@ freebsd32_mprotect(struct thread *td, struct freebsd32_mprotect_args *uap) prot |= PROT_EXEC; #endif return (kern_mprotect(td, (uintptr_t)PTRIN(uap->addr), uap->len, - prot)); + prot, 0)); } int diff --git a/sys/compat/linux/linux_mmap.c b/sys/compat/linux/linux_mmap.c index 527bd3979584..d371c1b0935a 100644 --- a/sys/compat/linux/linux_mmap.c +++ b/sys/compat/linux/linux_mmap.c @@ -225,16 +225,22 @@ out: int linux_mprotect_common(struct thread *td, uintptr_t addr, size_t len, int prot) { + int flags = 0; - /* XXX Ignore PROT_GROWSDOWN and PROT_GROWSUP for now. */ - prot &= ~(LINUX_PROT_GROWSDOWN | LINUX_PROT_GROWSUP); - if ((prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC)) != 0) + /* XXX Ignore PROT_GROWSUP for now. */ + prot &= ~LINUX_PROT_GROWSUP; + if ((prot & ~(LINUX_PROT_GROWSDOWN | PROT_READ | PROT_WRITE | + PROT_EXEC)) != 0) return (EINVAL); + if ((prot & LINUX_PROT_GROWSDOWN) != 0) { + prot &= ~LINUX_PROT_GROWSDOWN; + flags |= VM_MAP_PROTECT_GROWSDOWN; + } #if defined(__amd64__) linux_fixup_prot(td, &prot); #endif - return (kern_mprotect(td, addr, len, prot)); + return (kern_mprotect(td, addr, len, prot, flags)); } /* diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index d9cd3e7d7f3d..de3c7780fc2c 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -213,7 +213,8 @@ int kern_mmap_racct_check(struct thread *td, struct vm_map *map, vm_size_t size); int kern_mmap_maxprot(struct proc *p, int prot); int kern_mmap_req(struct thread *td, const struct mmap_req *mrp); -int kern_mprotect(struct thread *td, uintptr_t addr, size_t size, int prot); +int kern_mprotect(struct thread *td, uintptr_t addr, size_t size, + int prot, int flags); int kern_msgctl(struct thread *, int, int, struct msqid_ds *); int kern_msgrcv(struct thread *, int, void *, size_t, long, int, long *); int kern_msgsnd(struct thread *, int, const void *, size_t, int, long); diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index b1cc0741fddb..703078d81393 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -642,16 +642,17 @@ int sys_mprotect(struct thread *td, struct mprotect_args *uap) { - return (kern_mprotect(td, (uintptr_t)uap->addr, uap->len, uap->prot)); + return (kern_mprotect(td, (uintptr_t)uap->addr, uap->len, + uap->prot, 0)); } int -kern_mprotect(struct thread *td, uintptr_t addr0, size_t size, int prot) +kern_mprotect(struct thread *td, uintptr_t addr0, size_t size, int prot, + int flags) { vm_offset_t addr; vm_size_t pageoff; int vm_error, max_prot; - int flags; addr = addr0; if ((prot & ~(_PROT_ALL | PROT_MAX(_PROT_ALL))) != 0) @@ -671,7 +672,7 @@ kern_mprotect(struct thread *td, uintptr_t addr0, size_t size, int prot) if (addr + size < addr) return (EINVAL); - flags = VM_MAP_PROTECT_SET_PROT; + flags |= VM_MAP_PROTECT_SET_PROT; if (max_prot != 0) flags |= VM_MAP_PROTECT_SET_MAXPROT; vm_error = vm_map_protect(&td->td_proc->p_vmspace->vm_map, From nobody Fri Aug 25 01:08: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 4RX1zq6Gmyz4qZsH; Fri, 25 Aug 2023 01:08: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 4RX1zq5MsZz4TJt; Fri, 25 Aug 2023 01:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6A22wbvi0CW4u58JPWTVTyanVC7uHkxNCg6KY/zcxZY=; b=KXhHv8vh6Qr796lxsIawHRQ0quKS7ECCNIl9oTDgFgXEqsB9E0QZvum4B8OecPTkORoSGX s9dRkSrJbgSalnZta0bYs0hW83qbGr40gHF5x7S5pw8mPvKf9p31qIh7HVZ++MhagJgLm7 zaIlEVQ9RJzcZ3UA1foo0DKQE/j25Ta/MDrbg24szl9/wrfC4p9P/XiqxnOXKiSF4VDvzk 1pGfoJgIw2QO6AXtkpHOngUA7bt5RCxMw1SQi8oW3f0raORF5EGCHwN2/JcDz39MaDplfy h+QoMcUF2RfQokOMH/IP8tc+R+bDhqyU/qdyDjmF9EaeipX8wpdbYUy58Z8qaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6A22wbvi0CW4u58JPWTVTyanVC7uHkxNCg6KY/zcxZY=; b=hdCmzwaPqk+RwyNhjlXaAEstE7JUrrco9xJtH7E1dbOeH/ZPbCjMtz00cW6fxDK2hUb4hq gT8cvvmHSmdgJtVJI01aS9wI0JcCgFn5j/EHd2UIj6wy6r+x+U9Wfw00fkmLYp0cXW/xUT Sl82QYVY3ptx7iB7IHhM6WvEXy6VA6sBPV/doj39BXVQ+MdoOs18J0uniWfIXQg2XT1MAU 3ewWlM+PMNPcPuDoR9/aMM0R7b+rMqfEKUpGRXqGvwHGILQwYjzcaoTHALc+s4RZUVooiw N35Hw80+wWbTtjwAvroDHFA7y8yGpYg9TmtTR7uRSECVbf8ECz4L45NJX5a6qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925719; a=rsa-sha256; cv=none; b=Y51zv98N33Yxwa7ien3zMfQhDq+ByqoQC62jgwGTsQzQjLGWCGBwTaXvggcAsfHDjgYafb UwjW7NEIIFcPfY7rXjcdDl4vRFUoQl48AtQQ7aSFytCu1GAUdUP39pQgCBbnsxIDmKjJAR mxd2fxpPbmHoF6XmsFI+7gFs1wcW8CI9HWdLC17NCliMgOPJzysZrxd7nUVqpqag8vbWI8 EcF8cWt77Q3AW8EViNb0u3Wv73GvB4KsXHqcG7AtvvBD3K2rFlkadMuSeQCgmQGMnrbvPs SfUtpdrnRyfpi2348vbbT9PDg3mqPRfPi0N4JNZTeNZrB8HzxVXPd4wsra83AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zq4T19zpnp; Fri, 25 Aug 2023 01:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18dhT058605; Fri, 25 Aug 2023 01:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18dPh058602; Fri, 25 Aug 2023 01:08:39 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:39 GMT Message-Id: <202308250108.37P18dPh058602@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: b96ca29b6248 - stable/13 - vm_map.c: plug several more places which might modify entry->offset List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b96ca29b62488f50c468b964ee684e6d0245b2ee Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b96ca29b62488f50c468b964ee684e6d0245b2ee commit b96ca29b62488f50c468b964ee684e6d0245b2ee Author: Konstantin Belousov AuthorDate: 2023-08-15 19:05:33 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 vm_map.c: plug several more places which might modify entry->offset (cherry picked from commit c718009884b3d65528deaff24712cbf98e3be656) --- sys/vm/vm_map.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 029605eb272a..d046cd34afea 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1413,7 +1413,9 @@ vm_map_entry_link(vm_map_t map, vm_map_entry_t entry) KASSERT(entry->end < root->end, ("%s: clip_start not within entry", __func__)); vm_map_splay_findprev(root, &llist); - root->offset += entry->end - root->start; + if ((root->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP)) == 0) + root->offset += entry->end - root->start; root->start = entry->end; max_free_left = vm_map_splay_merge_pred(header, entry, llist); max_free_right = root->max_free = vm_size_max( @@ -1429,7 +1431,9 @@ vm_map_entry_link(vm_map_t map, vm_map_entry_t entry) KASSERT(entry->end == root->end, ("%s: clip_start not within entry", __func__)); vm_map_splay_findnext(root, &rlist); - entry->offset += entry->start - root->start; + if ((entry->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP)) == 0) + entry->offset += entry->start - root->start; root->end = entry->start; max_free_left = root->max_free = vm_size_max( vm_map_splay_merge_left(header, root, llist), @@ -1463,6 +1467,8 @@ vm_map_entry_unlink(vm_map_t map, vm_map_entry_t entry, vm_map_splay_findnext(root, &rlist); if (op == UNLINK_MERGE_NEXT) { rlist->start = root->start; + MPASS((rlist->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP) == 0); rlist->offset = root->offset; } if (llist != header) { @@ -3100,7 +3106,8 @@ vm_map_madvise( entry = vm_map_entry_succ(entry)) { vm_offset_t useEnd, useStart; - if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) != 0) + if ((entry->eflags & (MAP_ENTRY_IS_SUB_MAP | + MAP_ENTRY_GUARD)) != 0) continue; /* From nobody Fri Aug 25 01:08: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 4RX1zr6pq8z4qbHJ; Fri, 25 Aug 2023 01:08: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 4RX1zr69kcz4TKR; Fri, 25 Aug 2023 01:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgK9iC1uEc0UwQUO+7adntZ0mvDDJpTVnnYYgvpzaVg=; b=wwWpGcHfyUGaqoew60c6oUSyCNrJKq1rPrQN0S66X1lSvfnBZGxJbgnCnuDO/8SAD/lgVJ 8bEgLfj+JRGh+fznZlX3PaIYWR66ggZXqe1Lbp6ZtHJdWP+pf4ZAoRUi2VWxq4auEvkt2/ uluGiyx1F58U+AQ0zIkfSbAsZPbb/viB6x6w8C/0pbhp8Z4/JftH/mLs3hSKsrUn/fWD+W 6GXLcHC4CMGYVD5GQAm8d4evkzaQu0KZfLCVnGAF85cVdwjYwmxE4DuyCuCG6ghY7abrJA d+Sdyv4ebqz2r8pP88yXhiHUkUPl19QCAWXKUX3URfWxSsX4iFK9Jy9d09ZIBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgK9iC1uEc0UwQUO+7adntZ0mvDDJpTVnnYYgvpzaVg=; b=KD7t3YqtzNxxqByeSHPYO1HwbxjyJbNnDW+ETo9BMVlNhgxhOSsTbLCBWvc1dcE3xsIkzz drKW8OnOZees/DNKuXyuogfUmBeSEx5GDYtmKh6ilPpl/Z3VeZ8wj7oJyQmdrpB3I+LsYk FRoW4AaoEXRFftisjLTnPPGST8HQBKH9lXGx9HctwEq6Ce5gR7g2zFIHBLTWgE5O8o1AZX kH6HYeOcL4fIwxYabVLyUL6GrvHHuKHSXFMe+BbfAfPhZyH2O7RdmcWtwFSBWl2EM1+iO8 2ifVFT1RYbEFFpafMTcDnH71dqniHr1WQV5Zgz6KbJ5aukct4uQ5Wwp8H96wpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925720; a=rsa-sha256; cv=none; b=MncyAsa0V9dEA6u109yHEA6S7YXHpmILBeKpIynC6wNRWx+ePViXM4cB3K3p7SzrbVl2qS AX4WePY6aFo8+8dRYDmArFXNJxRKh3SpqfVIprPTs2Yn5rpDZRlNssNQAeKsCgaFPT2NJE dqETHIo/faw6GN3fO5weT3E9MwQAK9GQonulQlCOBu6n3bmVPCK61zaAYwlPE5opNes5c2 ZIhbIHZWiaQ0HspmmiVsbKmtrfXkPdd8GyvNu1xZwOmf8PtlJ4QCdR0SSDnvIVseG3AfhC XGoodz8d1OElgZpOsEXVtVTw9aquzhLOGwyGPkYLHvNlItt1/9OX/ZeXncU4Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zr5DfWzpnq; Fri, 25 Aug 2023 01:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18elX058647; Fri, 25 Aug 2023 01:08:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18eWB058644; Fri, 25 Aug 2023 01:08:40 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:40 GMT Message-Id: <202308250108.37P18eWB058644@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: 7a46a70f0e65 - stable/13 - vm_map.c: fix syntax List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7a46a70f0e65f0ce57e0e342409f8470b7f55a5e Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7a46a70f0e65f0ce57e0e342409f8470b7f55a5e commit 7a46a70f0e65f0ce57e0e342409f8470b7f55a5e Author: Konstantin Belousov AuthorDate: 2023-08-18 13:35:25 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 vm_map.c: fix syntax (cherry picked from commit 5f452214f2761b422b1a385865fe4c20265b09fe) --- sys/vm/vm_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index d046cd34afea..97352ba7b4b7 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1468,7 +1468,7 @@ vm_map_entry_unlink(vm_map_t map, vm_map_entry_t entry, if (op == UNLINK_MERGE_NEXT) { rlist->start = root->start; MPASS((rlist->eflags & (MAP_ENTRY_STACK_GAP_DN | - MAP_ENTRY_STACK_GAP_UP) == 0); + MAP_ENTRY_STACK_GAP_UP)) == 0); rlist->offset = root->offset; } if (llist != header) { From nobody Fri Aug 25 01:08:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RX1zt3K9sz4qbBg; Fri, 25 Aug 2023 01:08: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 4RX1zt0BYVz4T8g; Fri, 25 Aug 2023 01:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Me0M66+V/OxKe9RmEl8pTJxM0WJBW+tJw+DB0Gs2/5U=; b=MlyYzlWwc9bYP+7QB77vwWmI/w3KKRqG3lRiokSF8zCIIH9L5hwlKJQk7aEzpYNYd4q1wd UZ2VgUI68B/GBSiQmJNzA3lTUksXU3OFMXdjKmNsShoELqTPXtAp5hWXFl1VRJNL6DpI6i ZCfxM0TZ0ZQiCxDkGRTgd0BubwiGL/rsOlSxxrPtuZpPSvLWKSzndycPA8xuJE4iSK4t7p x0rguPxZf7+DxLTk31dYkpmB63b3N2iTOlD+MlgZexZSDnooQ0WtuCQlRqqrTAjeNUEur2 ZJZZrw8CxldvaQuU4Ztw9p/1O+Gp8yWyxfIRd+CLGjQG2YSbSBluAarM69wEzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Me0M66+V/OxKe9RmEl8pTJxM0WJBW+tJw+DB0Gs2/5U=; b=lJwevqiA/R1+fWxvIsGjeb8BUd8AFGstfO+7aARJ7wrE03fXlvFuPXgK3AEHvxUDJffag3 Xuri2ofcxynthNF9dEnBZeVzgQaO9SWNMHmJ43kBp1jI9K81aatYGR5kGO1eQtO1BqUlkx ZZiUDq3MvSsLQMxYhAaqFk1dxseZNEcliKGr3W0vGAjI9HuPADGg6DNbahmXJ5HIJzWtg/ q9/yUYTlDUbhNSzmRrOzQY8XBngVs5IM7DBLMk64PF7Kx0NTJKHMCww8Y39IVJtENUvFch C1mJRAuMCRd4BP3ZpwasyzZUDKbQ94NAbuJUqX68LxIGGkDb0wHt1ccLkuXP4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925722; a=rsa-sha256; cv=none; b=G+S8l75wf9ryGD9XBg3SvQOMG65TqFp8nFbXiZGUCrJDINU1l5LUHgdSmf5T0qlNUtPHFK ZIBsm9/mKpxfl9Ejw/xrUPIil2lar+axRrOwDN7uZILoev2vLPCvOx0zlrV4bbxuMsnu2W M7XG1q+uWvsALXdciyq9gBQR8SiXKJPPRDINxB1KVxd4ol3Smnnu+4zgBSLoLieCBvKEFj HCgDCl02rdOflo+utYfS+S7bOQ1uBmSoSEgbSOAAWZRPsJVLPxGNDN3CDygpnItPxcWYFf 9hUlSFsJuDB2LIu99vmilMhyaKzafH1ZzQyvrP+BeiD4nHAGpJo06tN8ejpIGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zs6QWLzpnr; Fri, 25 Aug 2023 01:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18fOx058690; Fri, 25 Aug 2023 01:08:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18f1u058687; Fri, 25 Aug 2023 01:08:41 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:41 GMT Message-Id: <202308250108.37P18f1u058687@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: aa8f8a9530c8 - stable/13 - kern/subr_unit.c: fix non-debug build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aa8f8a9530c816166a1ab7427b6141bb51831960 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aa8f8a9530c816166a1ab7427b6141bb51831960 commit aa8f8a9530c816166a1ab7427b6141bb51831960 Author: Konstantin Belousov AuthorDate: 2023-08-18 13:36:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 kern/subr_unit.c: fix non-debug build (cherry picked from commit 1384a0b940e87876d36d50ad58581c24dc642714) --- sys/kern/subr_unit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c index 7fa242440328..4fb2bb3790e2 100644 --- a/sys/kern/subr_unit.c +++ b/sys/kern/subr_unit.c @@ -366,7 +366,7 @@ check_unrhdr(struct unrhdr *uh, int line) struct unr *up; struct unrb *ub; int w; - u_int y, z; + u_int y __diagused, z __diagused; y = uh->first; z = 0; From nobody Fri Aug 25 01:08: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 4RX1zv1NGDz4qZsP; Fri, 25 Aug 2023 01:08: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 4RX1zv0sLHz4TKx; Fri, 25 Aug 2023 01:08:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4HvKb3f2pSgGAHrJTzW1/x9dchLfLEoZE51ygLOTvuA=; b=VaZj9g5PFggMtwJnUDuh2fRjVokrQMLMBOmft5vuOvlAnTaFBejaZyPm7+aVvmMnzRCp3h nC85oZ0WW6dFGotasBSR0LXRBeNAtnO8qwJJEZsSDvSGBOJndZ0NLO/S5fFjEAqLNTMtmc cH9rShYdi9CiD/glBGsYljbLG5UJvcM2VrPtk3aFIKe6SopAZtjl/TEw3ej15oDXACtjfl vwJ4nCeJb1qcRxkOD/34iVhWEAShIZl0/Jx5xJRSiq8x4sSMBLqPBaOhCE67bGtqviXSZt 9Qj6ufPWSUrRgYH+6+0eu9Cg3jSoCR8t+r8KSjcP1+IUz4sMtE5gJxVm0kpehw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4HvKb3f2pSgGAHrJTzW1/x9dchLfLEoZE51ygLOTvuA=; b=O1EVOqCQajYJvGS73eNAZkHyPA3A95n6HFJX87vCorBWFMd6LmZlvgl/JEhCQLjEtocEwg YqJv189+5q01zfdPqhslzPr4+bxVE8ZYefvc1Z0c+LL4gsWuxTpHuR5H0w4kgk0RDiold7 pDdRnSNmZslUsSDGC51OtiHQk9fs7CgFL6ElYfJ9/+OARDCN0dOZmqiNC6AvCKkMUQFieQ zJiF54a4U9IPQWdSb0C5AidkaBAdK/OQXTvqskXAKEwh++1TigvXu89JYvbmYQazdlnhUF M+3cQ8tw8kiCB50outkyltWNZHR5UjvI8b5GnvIhA0JHOQX3+OfWaVtzf1txkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925723; a=rsa-sha256; cv=none; b=sctN29lzWJJyGdpqnka5uw8FNFcxW4+YgfXGGiizpeH1VqxPO+o1oQgbypug1q6eNfEqMR cqilJFqBau/uveV3VXFlnGLxhp8ISWLUu1Qe3xOfosDr71v9BeCWPkq0eniHXU3BFklcU+ olo7qosGiEiNtkMrB9VV9db6OUv07Sg4SEp1IXcTmk0jbY/D9giAU8r1Syqak2IuTw8RIn JiyTGjj7Yo80grQtHxbGMSMHQUnAjrlf5L2onitiFH4mzmD6L0c/oRbUlSec5tsEDiZ7Eb anuGRHWcF3xPVv0JfNE1UNR6bDJgczwSzcgXl4JN9tC5AKUyYn+n8RrDLXoOTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zt749Yzpns; Fri, 25 Aug 2023 01:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18gLa058737; Fri, 25 Aug 2023 01:08:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18gpH058734; Fri, 25 Aug 2023 01:08:42 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:42 GMT Message-Id: <202308250108.37P18gpH058734@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: d709b99b67b0 - stable/13 - std.nodebug: remove DIAGNOSTIC from debug configs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d709b99b67b00dde22241f225bb38a9ea2b416de Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d709b99b67b00dde22241f225bb38a9ea2b416de commit d709b99b67b00dde22241f225bb38a9ea2b416de Author: Konstantin Belousov AuthorDate: 2023-08-18 13:39:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:45 +0000 std.nodebug: remove DIAGNOSTIC from debug configs (cherry picked from commit 431884325075e3532235002fd7e5228b40f16b19) --- sys/conf/std.nodebug | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/conf/std.nodebug b/sys/conf/std.nodebug index 6495bc0203ad..38eb77c8d3a7 100644 --- a/sys/conf/std.nodebug +++ b/sys/conf/std.nodebug @@ -4,6 +4,7 @@ nooptions INVARIANTS nooptions INVARIANT_SUPPORT +nooptions DIAGNOSTIC nooptions WITNESS nooptions WITNESS_SKIPSPIN nooptions DEBUG_VFS_LOCKS From nobody Fri Aug 25 01:08: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 4RX1zw30mRz4qbHW; Fri, 25 Aug 2023 01:08: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 4RX1zw22gjz4TQZ; Fri, 25 Aug 2023 01:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LQpSWAwH5kmpzldYHhWDn9AV4adietPzdAPMpB9d1Js=; b=yA1kGykWzw+FySRaqVt+sJ3Cct+gGQ2Py6QvVTkQrchXJA227i91Khd2dZOtM57u7eZsDH bk2Rzd0Fpdity7UUQunpENQQrwOuaTGlMSmWfKJJOSYBCERkL7IAGvHXyj09ApzfqEM9Iu ofkpCsaeaYsxu5dDpvcYgYw+hd3WVSHNlAe8rBE2cqcGS/Ps/C74gOq9NeyP0ZHzUpKFHS kX9fT1YWlsQf45dC7Ik348RmyJI+s+WQ+z0mH4fR8/oE3qlojP4UG7cdQc5bmozVBylc76 7pKv8h26aayfCwbs1w/zFdUWtQ1bz79rvhRHi5hHYHbCA6mZI4Z2tln995HCMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LQpSWAwH5kmpzldYHhWDn9AV4adietPzdAPMpB9d1Js=; b=CL9J9vuDr9aLTtwa66ED04lSv6jUY7w6vcAwEDZx+3G/FyF28iMw1tVoABNoTTuMZ3FERA c6hy0Z2EuGv4HmB1IVefhkOJt+CDNJTAjjHmn1DV0MapigI/EkYjVDl/svPPoEywNewwWv v6UrqZKH7aCymRFyaY6TRRdbBqL9TvfZtW+IPzBpEq5nHqlILFTveafO05OYsUQlVzVI6d qEQ1dAG9BiDl9hTfOP94Bx43JAbk5fxA9c9+aIQkY8r0DgWxHAyrqHHhjJlHutHnd9ECou j9YTrrbvkIpDO1yclA1ZqVfQefIfyLvWvJR0nmlWx4JjaQF9dwibVBNTPwxMdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925724; a=rsa-sha256; cv=none; b=CtzgjGS0JxG1R0+KPEDmfrFaC8SroI6xkl6aGnaaznrmiO4TSQCq/9sZy1e38spiIN/1YA ExYzzXTYsCN/40HvDA6/JBVjdUnLCrtTZlDkzx5uDSyMdTT9gUKVNLmcMS1E5iKGRgEqTJ YvdIFlYSK5u+A0RSUrL2Eh2qvwoE1dOwFMY10yxP9D5ZrdKWmrYKnsKHPY/tOvtsJQL8Cc Pxlph4c1dJ1yMlHCl6bpXmKVUM60+pGI4EMb5a9ftzNEj8iuLj37u5WjqQKEZz4X/H+WQQ VgORPbaNcXB/49bUgnl2/DJSdaTs1Dx8/n/mDcofW0XlUZ3gF+DBk+UeGeRErQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zw0zNGzpN0; Fri, 25 Aug 2023 01:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18iYS058785; Fri, 25 Aug 2023 01:08:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18iKK058782; Fri, 25 Aug 2023 01:08:44 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:44 GMT Message-Id: <202308250108.37P18iKK058782@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: 94fb5053dabd - stable/13 - subr_unit.c: another attempt to fix the build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 94fb5053dabdb0e5877d246b6569f37d680290fb Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=94fb5053dabdb0e5877d246b6569f37d680290fb commit 94fb5053dabdb0e5877d246b6569f37d680290fb Author: Konstantin Belousov AuthorDate: 2023-08-18 15:42:59 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:45 +0000 subr_unit.c: another attempt to fix the build (cherry picked from commit 04f683b25a81ad47c998e3e496419c08ae4905eb) --- sys/kern/subr_unit.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c index 4fb2bb3790e2..3cac6a7da264 100644 --- a/sys/kern/subr_unit.c +++ b/sys/kern/subr_unit.c @@ -353,6 +353,10 @@ free_iter_unr(void *handle) } #if defined(DIAGNOSTIC) || !defined(_KERNEL) +#ifndef __diagused +#define __diagused +#endif + /* * Consistency check function. * From nobody Fri Aug 25 07:17: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 4RXB9t02vqz4qyHZ; Fri, 25 Aug 2023 07:17: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 4RXB9s6ZG0z3WbK; Fri, 25 Aug 2023 07:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692947873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKHqi5wPZ5hA+w0PCyUUoFuz+hAn5hCwEFelGDl60Qc=; b=RU6eelppfx0YlRUNFUoG7ecXgwQWrALF2F1mgXpKkfuMw2s6rzdXKkEiCsxfhaXWnx6KhZ COqqXN7rrzLUaePvfXg4oSw5ViaJ17fTRS8cIKzZpr5F/RlW7I2Mfj0zVb+6Dm4GOu2XE4 hiu8LG/5rauSJtKMhxrAhQK0tbaIybT5PjyTOHN39gJfAxfX2hxt+WEFA7/e+CxW6vgxSe aYq1fM+EEHskrEgaqi/uAcdXZ5YCusRKKPz1QK9fwmL+pLQRJmR/60DqTvqS74sna+DcGC HPoDBjweHg4Q0PRTVwMK30XNE6piwk17YjdYn9GuYmK2vVKF/xl4RqPK/2pwFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692947873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKHqi5wPZ5hA+w0PCyUUoFuz+hAn5hCwEFelGDl60Qc=; b=XwJfzmaw2wM8pgCyEOo0ZAbWHByYpabJGf/zR3ELJt65RQ+yM1NR8I7KBagtWZ9kWzFx0d aXBVhLLFE1Xp8htBEQ6oswdICWdCvJrs5mO7zForh2WKnrhHyfqcVtGHWsKlQ9vZobWjE8 qiVZvualC52nlUfO5Ph1ZVQ8XpGaJZ+7r0wRsJLo5ix5xZIzenvSgKcXwaX9fzaG9Geepl rjIEja7Rr2P7QFtvRZtSjnZIhkalJ/MlCCR/ehAs3JcxqYptLCdwUlfJp/8mkIcjrp5cUj I6N4c//ToXFVKWybO1wQG4sFQ7HaYM02DfmXETHILnRg8MgqC5M1iswhhSSIXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692947873; a=rsa-sha256; cv=none; b=Zi8LgzL+K8kOVltCun3L0IqLLYfFTsP0HViahmS7QBlhlZrvITzybnhg06DFPtD6223diV Js/dzmtOx5/FBMANY8iampryG+QHqlTcwew2+2e4rlcfsepKVZa0HSLUfZTe23f9C2Tsfx gtpZMfjYWEKfCgFw8ADMajubaezkUG1b+kXwhyVady9WP8KFFI6+Jzmk0z7svok8kaOkMM 3kYjoE1w2PtaGoqoxEt3eQ7NlnFXUAslCZsmtYeLs1Z+ueNFst4X80YtQfrbTcbwSjo/th WmNvRd4QtJJOB9VPNjJxRaEkdZpmzIy5B60MieW6qumourPRKQ2Gc/W4/9e7Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXB9s5MYHzyvY; Fri, 25 Aug 2023 07:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P7Hram074542; Fri, 25 Aug 2023 07:17:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P7Hrjh074539; Fri, 25 Aug 2023 07:17:53 GMT (envelope-from git) Date: Fri, 25 Aug 2023 07:17:53 GMT Message-Id: <202308250717.37P7Hrjh074539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 42d73e9ec146 - stable/13 - ixgbe: define IXGBE_LE32_TO_CPUS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 42d73e9ec1464a4ebc26d32201def571550e9ba9 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=42d73e9ec1464a4ebc26d32201def571550e9ba9 commit 42d73e9ec1464a4ebc26d32201def571550e9ba9 Author: Kevin Bowling AuthorDate: 2023-08-14 01:47:09 +0000 Commit: Kevin Bowling CommitDate: 2023-08-25 07:17:23 +0000 ixgbe: define IXGBE_LE32_TO_CPUS Richard Lowe notes in PR 170267 IXGBE_LE32_TO_CPUS was previously directly defined as le32dec() which is a pure function but the shared code is expecting an in place conversion. In SVN r282289 its assignment was removed altogether. There was some deliberation in the PR on what to define this as, we just need to do the update in place which is easy enough. The uintptr_t casts in the shared code were from a DPDK sync and are unwanted with our new ixgbe_osdep.h implementation. PR: 170267 Reported by: Richard Lowe (cherry picked from commit bef7d49101cdf28830a648f63ff00998fbe54715) --- sys/dev/ixgbe/ixgbe_common.c | 4 ++-- sys/dev/ixgbe/ixgbe_osdep.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c index 91c12eadd1e3..6c1396ad964f 100644 --- a/sys/dev/ixgbe/ixgbe_common.c +++ b/sys/dev/ixgbe/ixgbe_common.c @@ -4640,7 +4640,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, /* first pull in the header so we know the buffer length */ for (bi = 0; bi < dword_len; bi++) { buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi); - IXGBE_LE32_TO_CPUS((uintptr_t)&buffer[bi]); + IXGBE_LE32_TO_CPUS(&buffer[bi]); } /* @@ -4676,7 +4676,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, /* Pull in the rest of the buffer (bi is where we left off) */ for (; bi <= dword_len; bi++) { buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi); - IXGBE_LE32_TO_CPUS((uintptr_t)&buffer[bi]); + IXGBE_LE32_TO_CPUS(&buffer[bi]); } rel_out: diff --git a/sys/dev/ixgbe/ixgbe_osdep.h b/sys/dev/ixgbe/ixgbe_osdep.h index 92942cbab103..7aabfea66484 100644 --- a/sys/dev/ixgbe/ixgbe_osdep.h +++ b/sys/dev/ixgbe/ixgbe_osdep.h @@ -134,7 +134,7 @@ enum { #define IXGBE_CPU_TO_LE16 htole16 #define IXGBE_CPU_TO_LE32 htole32 #define IXGBE_LE32_TO_CPU le32toh -#define IXGBE_LE32_TO_CPUS(x) +#define IXGBE_LE32_TO_CPUS(x) *(x) = le32dec(x) #define IXGBE_CPU_TO_BE16 htobe16 #define IXGBE_CPU_TO_BE32 htobe32 #define IXGBE_BE32_TO_CPU be32toh From nobody Fri Aug 25 14:47: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 4RXN8659Kpz4rPgD; Fri, 25 Aug 2023 14:47: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 4RXN864XHYz4dsZ; Fri, 25 Aug 2023 14:47:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692974822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t0rUxXVOy0ZaS3dqbwYNYXz/3SGNqWEvnD5nr4URRIQ=; b=l4+MxqpvMmjRx9B5I/N/JcR4otkUdNB1iNeTHpAFk2A5ocir0efumsTVxIsK/zSLKW9Cxw WNi7CX262rj1vTMQZiXLq8Ha+HIMbF10ffi0FJU+FlkwBktAaA6bUAyJh91wsTDQZ+gofX 6Kil/HouVGsHMLhgpjb/wOJ+jLjxtokhSy+kftdzeahQO7fZMSbSYWesLvP9NaSY/ByMLD 02rrdX1yxu541F4Qx0UBzMY6koNAK1K5N1DHTewovLFsyAKvoyiOmmu24MiD/GtgZXowxa JY/Uk4JYxl+d65vsyv3TgzdmsmGjWBDrGJNBldguapFaJw3qzfGPeZBIm3W3RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692974822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t0rUxXVOy0ZaS3dqbwYNYXz/3SGNqWEvnD5nr4URRIQ=; b=dfY80rvMapmFocX+rHnIWLjus4nJjWKMA1L6HFzeSqmzpFUjGC+cIgkApdcVzOIpPqt1BW dCEYXZFJHFNelpifOj7NzzCXzZZ23IzZU8jn/nuf1YZ5LDKi/WtjML7B7pqhr5vKCIVXv1 h0JDRwNN9m7j3hn2KtQrZ/n9mePNHcVuF9P2oprhkh62ilUTBJbhUgCjpLj/pg/LuFXKqV cYfH7gqihKwSmMLmGu5SmvxUOgPurOs8DYdNTP6aRls7LYKpJ1oszKt8cGhetI+IrIv2vl IckK8z+kaNSMRTQpOi8e3Sa7Ll19U2kVvakDDqhFF5Q/Yu76ESJOA1MIhdM52g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692974822; a=rsa-sha256; cv=none; b=U9QscjK19B+jGPumd0vUI9Iw8zoYsAO2wZNzCyvE/o7BlMjWN6iqpuRDGC0ADsfQXw4PbE YLpxSYCa6jfyHgcjCVeQVYz8PR2al9nLe7vqNRkzFDFPiNqwaRyvkN5eIHXDVvMnFi4iWQ cxmOE0Y6VuC6yo5aLcJXo1qNXUSz4TI5P3xoayZfHtjRcf+ReU8wJMPEHVoMFvWl5/OVZZ UPD25345kpCO0snvNnGgw7qavM469V9fVGQjRiQUYfxYeC3sH9CX0My+lC6TMm6GoGSnRY 6z1IZ2p4KOdtdd24z5Cmy6+2XFxz36JJq23UeF8WirOlyRzOG4yqlvph9gjrDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXN863T7gz1C4V; Fri, 25 Aug 2023 14:47:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PEl2gt018655; Fri, 25 Aug 2023 14:47:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PEl2gk018652; Fri, 25 Aug 2023 14:47:02 GMT (envelope-from git) Date: Fri, 25 Aug 2023 14:47:02 GMT Message-Id: <202308251447.37PEl2gk018652@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: 02f534b57f84 - main - timerfd: fix up a memory leak and missing 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02f534b57f84d6f4f97c337b05b383c8b3aaf18c Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=02f534b57f84d6f4f97c337b05b383c8b3aaf18c commit 02f534b57f84d6f4f97c337b05b383c8b3aaf18c Author: Mateusz Guzik AuthorDate: 2023-08-25 14:21:39 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-25 14:46:48 +0000 timerfd: fix up a memory leak and missing locking timerfd01 from ltp passes (and some other don't), but none of the tests crash the kernel. This is a bare minimum patch to fix up the immediate regression. Reported by: yasu --- sys/kern/sys_timerfd.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index 6948fa059b8c..2bf2a05c443c 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -59,7 +60,11 @@ #endif static MALLOC_DEFINE(M_TIMERFD, "timerfd", "timerfd structures"); -static LIST_HEAD(, timerfd) timerfd_head; + +static struct sx timerfd_list_lock; +static LIST_HEAD(, timerfd) timerfd_list; +SX_SYSINIT(timerfd, &timerfd_list_lock, "timerfd_list_lock"); + static struct unrhdr64 tfdino_unr; #define TFD_NOJUMP 0 /* Realtime clock has not jumped. */ @@ -125,7 +130,8 @@ timerfd_jumped(void) struct timespec boottime, diff; timerfd_getboottime(&boottime); - LIST_FOREACH(tfd, &timerfd_head, entry) { + sx_xlock(&timerfd_list_lock); + LIST_FOREACH(tfd, &timerfd_list, entry) { mtx_lock(&tfd->tfd_lock); if (tfd->tfd_clockid != CLOCK_REALTIME || (tfd->tfd_timflags & TFD_TIMER_ABSTIME) == 0 || @@ -160,6 +166,7 @@ timerfd_jumped(void) tfd->tfd_boottim = boottime; mtx_unlock(&tfd->tfd_lock); } + sx_xunlock(&timerfd_list_lock); } static int @@ -314,11 +321,14 @@ timerfd_close(struct file *fp, struct thread *td) { struct timerfd *tfd = fp->f_data; + sx_xlock(&timerfd_list_lock); + LIST_REMOVE(tfd, entry); + sx_xunlock(&timerfd_list_lock); + callout_drain(&tfd->tfd_callout); seldrain(&tfd->tfd_sel); knlist_destroy(&tfd->tfd_sel.si_note); mtx_destroy(&tfd->tfd_lock); - LIST_REMOVE(tfd, entry); free(tfd, M_TIMERFD); fp->f_ops = &badfileops; @@ -420,9 +430,11 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) if ((flags & TFD_CLOEXEC) != 0) fflags |= O_CLOEXEC; + error = falloc(td, &fp, &fd, fflags); + if (error != 0) + return (error); + tfd = malloc(sizeof(*tfd), M_TIMERFD, M_WAITOK | M_ZERO); - if (tfd == NULL) - return (ENOMEM); tfd->tfd_clockid = (clockid_t)clockid; tfd->tfd_flags = flags; tfd->tfd_ino = alloc_unr64(&tfdino_unr); @@ -431,16 +443,15 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) knlist_init_mtx(&tfd->tfd_sel.si_note, &tfd->tfd_lock); timerfd_getboottime(&tfd->tfd_boottim); getnanotime(&tfd->tfd_birthtim); - LIST_INSERT_HEAD(&timerfd_head, tfd, entry); + sx_xlock(&timerfd_list_lock); + LIST_INSERT_HEAD(&timerfd_list, tfd, entry); + sx_xunlock(&timerfd_list_lock); - error = falloc(td, &fp, &fd, fflags); - if (error != 0) - return (error); fflags = FREAD; if ((flags & TFD_NONBLOCK) != 0) fflags |= FNONBLOCK; - finit(fp, fflags, DTYPE_TIMERFD, tfd, &timerfdops); + fdrop(fp, td); td->td_retval[0] = fd; From nobody Fri Aug 25 15:10: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 4RXNgH2twnz4rQ6B; Fri, 25 Aug 2023 15:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RXNgH2Rprz4gqt; Fri, 25 Aug 2023 15:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692976235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SHlocsy9Ai6Hh0UShAJjU7C7FKfzQ0sQO1TQPonHvHk=; b=Tvf3D/cmkIPd7IrTZdQLPeTNV3Yb13tqJgZClP6MY1/HEDCctYex8l6riBzg0sBbnqvw+2 N0C/73YcZAaytRhIG9gUtcylRaGXHSHTt5luKTfJ3Awynue/l61k3NWDF2wU9gOooHxHiQ s3wsNDw7ZORdO8ZNBbQi2VTHQORe+a7c5F4ppYTGTdMInEuOGeQocRZAsGIYN9GCeotX31 A1fpSEViBZgG96iXfbl3r/z/kckvP1f78w/OCv6y4daQjJ0j93FVw5y1Ew1jHSDcygZYYe NwO/1PpvUbzyRNq/mWEfrAKC9FEcQHDHjcn5IKJm6b6nNaCy7LPeIlbqpHtufg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692976235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SHlocsy9Ai6Hh0UShAJjU7C7FKfzQ0sQO1TQPonHvHk=; b=DY2m7a7PsQPE/tWjnxrhGiRDLYHLnYMPumXf2xyWzBxCXeU0DuVznI0ALytVv8RxnhfXCV k9nZ5zdFwRGo8b0lNZ/ecASdF0t+LJN8CvnDj2QuclDskTH1YFQsnzdOcmhHQL3O/QG+ux ABVjxPqWgqiGiRw4w2i/EJ/mCKb02S587Yche4wC+73QjIqO0x/JqkSCLROaEypI4IWgyO LRtd1IfBp/WfsTAzHDL8m09a3ijZoeEe828nEHqT7qTO1w2Ntl9Aze2IHWMwQFSRR0JCfe JL1OafWTrK8OUmMEGcWt5+31IaiiesONfyj3kCvw5lMETGW74gP/EmkWtcf1bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692976235; a=rsa-sha256; cv=none; b=xfNfnkSbIeEfgajYghCADk5g8jIuz0rmHIJ6cD4IcA98oED0shvi2Mj7eRjE/4ttFlyUOS YBJW3w/aLw/DpxUxmsoTeSvqBLj93W4qhsXNGhIZDMnlaWB9YFZlO3+v2IlDhKARSjlwQm HrQW/eOxB9X5yIhSfwTWvENwJ5agU7REjfDQI22QgGcWFE0wUqENq4pvUL/mEp1yV8/Jcg SetttBLsBbj8whPl6NpZjlfDB2/E3GSsmHJXqeWMvpoDMPZvxQUB14WPR/jMGYyzbfUfFR urgtglZ1GFTssSUVph/bzG1d3Floc1ro7q76c33M+teIP00N8xVbsN/9CfU1ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXNgH1VYVz1CJb; Fri, 25 Aug 2023 15:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PFAZKX061474; Fri, 25 Aug 2023 15:10:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PFAZCt061459; Fri, 25 Aug 2023 15:10:35 GMT (envelope-from git) Date: Fri, 25 Aug 2023 15:10:35 GMT Message-Id: <202308251510.37PFAZCt061459@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: 5eab523053db - main - timerfd: compute fflags before calling falloc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5eab523053db79b4bd4f926c7d7ac04444d9c1da Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5eab523053db79b4bd4f926c7d7ac04444d9c1da commit 5eab523053db79b4bd4f926c7d7ac04444d9c1da Author: Mateusz Guzik AuthorDate: 2023-08-25 15:09:21 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-25 15:09:21 +0000 timerfd: compute fflags before calling falloc While here dodge list locking in timerfd_adjust if empty. --- sys/kern/sys_timerfd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index 2bf2a05c443c..c8b45a926b02 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -129,6 +129,9 @@ timerfd_jumped(void) struct timerfd *tfd; struct timespec boottime, diff; + if (LIST_EMPTY(&timerfd_list)) + return; + timerfd_getboottime(&boottime); sx_xlock(&timerfd_list_lock); LIST_FOREACH(tfd, &timerfd_list, entry) { @@ -418,7 +421,7 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) { struct file *fp; struct timerfd *tfd; - int error, fd, fflags = 0; + int error, fd, fflags; AUDIT_ARG_VALUE(clockid); AUDIT_ARG_FFLAGS(flags); @@ -427,8 +430,12 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) return (EINVAL); if ((flags & ~(TFD_CLOEXEC | TFD_NONBLOCK)) != 0) return (EINVAL); + + fflags = FREAD; if ((flags & TFD_CLOEXEC) != 0) fflags |= O_CLOEXEC; + if ((flags & TFD_NONBLOCK) != 0) + fflags |= FNONBLOCK; error = falloc(td, &fp, &fd, fflags); if (error != 0) @@ -447,9 +454,6 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) LIST_INSERT_HEAD(&timerfd_list, tfd, entry); sx_xunlock(&timerfd_list_lock); - fflags = FREAD; - if ((flags & TFD_NONBLOCK) != 0) - fflags |= FNONBLOCK; finit(fp, fflags, DTYPE_TIMERFD, tfd, &timerfdops); fdrop(fp, td); From nobody Fri Aug 25 15:28: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 4RXP3m2xq4z4rRXb; Fri, 25 Aug 2023 15:28: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 4RXP3m2LDTz4hT8; Fri, 25 Aug 2023 15:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692977300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EctklE4VLibJFSocWuD84WPnf7CSztRjDji/9SE+SrE=; b=KcxVDHaG5BOlvzo+Ai/RO5prEwpJsnb0Ih3xv6d+1NtLxQXPMmxoaBAXrBCT1FUUaR6cxm cZrUltyoMLq1cx7akAmd7l6eppPHL+RMkkop5YMst4RxWbgRaFENBvtJMYUxuC7VD0Ghcc 6hSCm8dbuDjruGSpUdxgqemvknui2ruNYakK/Z7hslwdxm7IqZRU8rcNen1uiAbvQUGXGR C2cxUB/Sq9jAUQ6bWh9ANcrLiv56bYOf8cnIWm7R1m39Fiv//J9L/jXipLI86tlarhy/zJ rfujexD60v4zeotBLYl/G0CdASNsq+5LO1xRmJorBN/GdDtWfqVLp+X+IPm6mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692977300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EctklE4VLibJFSocWuD84WPnf7CSztRjDji/9SE+SrE=; b=xIMoBXDQ4jDt7JjqI6MyvcTH68gXyeb9HhYvbIUvWNYBMauuiNH/UlO4mbc+oIwmZhjoKR IJ+CXvQ8IRFL7/8cZhPO8xsHkkblWgvKrp21AaRTP34/7SV94j4h5TM0oHhZE7hnC5MM4n Y9hJ3bjHQROlKyr+RrRJ8juhH8kQopjJJCMSb+E/nO+dscRI59WxnNIlSM15WRVUdeMqck e2Xng4+sO3aKrLqLkAnkeMt1NurYN9p2yDoTex5Rxu5wCF1iABiTHknNzffJnINYUlW1aB oV2D0QSYL90DPt0CsqfBjvGQ9Nu+hRm60lDvZsWmMp0PDfp+ZwYCxzB+PZulBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692977300; a=rsa-sha256; cv=none; b=t3KjcHCBvU/ORGpnEAUD3qs73oKOI0sfR0gLjGqiL766bVspsAWpIfmH1NhGWzQAp4Cxol WImQ1BSJEcFLVxAG2FRUqNAiR4NQQ+69qjD/cvhoevnwq6bE5OPyh1AI31c56CtJGobNNw qjwAQb8E1/BIfZPX3Npc04TIn1cyzDCIs4Lfn3GRrwJdWT2JtS3a0jmNUnz04QUUebRLXe P82EILlBtdPBrH1xicnQyGWH7cCmE2dCeTSGoqBtRmDolDeH+tOtZdBElkn+mZyi1yuc9H BpxfCXv9OCRgYnwCkpPVZs019yZUFbfGApvrnWGI13p+3q497MPScfQjVNtiQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXP3m1Nsjz1Cn0; Fri, 25 Aug 2023 15:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PFSKwB085036; Fri, 25 Aug 2023 15:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PFSKK2085033; Fri, 25 Aug 2023 15:28:20 GMT (envelope-from git) Date: Fri, 25 Aug 2023 15:28:20 GMT Message-Id: <202308251528.37PFSKK2085033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: f0c8e8118dbc - main - sctp: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0c8e8118dbcc9251b11154ee7e4680f79901af1 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f0c8e8118dbcc9251b11154ee7e4680f79901af1 commit f0c8e8118dbcc9251b11154ee7e4680f79901af1 Author: Michael Tuexen AuthorDate: 2023-08-25 15:23:34 +0000 Commit: Michael Tuexen CommitDate: 2023-08-25 15:26:58 +0000 sctp: cleanup No functional change intended. Just asserting the conditions when being called. MFC after: 1 week --- sys/netinet/sctp_timer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c index ef5eb8b89a5d..d0f3f936b34d 100644 --- a/sys/netinet/sctp_timer.c +++ b/sys/netinet/sctp_timer.c @@ -87,7 +87,10 @@ static int sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct sctp_nets *net, uint16_t threshold) { - if (net) { + KASSERT(stcb != NULL, ("stcb is NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + + if (net != NULL) { net->error_count++; SCTPDBG(SCTP_DEBUG_TIMER4, "Error count for %p now %d thresh:%d\n", (void *)net, net->error_count, @@ -114,11 +117,6 @@ sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb, sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, inp, stcb, net); } } - } - if (stcb == NULL) - return (0); - - if (net) { if ((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) { if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) { sctp_misc_ints(SCTP_THRESHOLD_INCR, From nobody Fri Aug 25 15:34: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 4RXPBc5wkWz4rRYf; Fri, 25 Aug 2023 15:34: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 4RXPBc5LT2z4jPn; Fri, 25 Aug 2023 15:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692977656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OOKCPVwICrcnc8BUJa5tf9OozV26tEY0vQ1FHoA4mfM=; b=WpLrxrpiPFBoOTIFKdK3XL0WKJkOPKKzX+FBpaUZXVLONCh13qMDcCSXFt69Ris5qVl1eG WHnVsp3hMIJx8bk3iH5r9byu1c5/AJLHfltHdAF5mmji7wHl8wr1/u06YQWl0pz5nu2Ynl vdT7C+O5Tvik/kRLQt1QRURqtqVZsdADxRl2nSL81Hv4tDM7QjKPMZpVawcidVmZBDuM1R XjKz+X/HjxKYMW+Il2p+FYoc1Sa951JQBNddSpwXUc76exEueR/WFFrS8UJbHKwO4qNBhL DEp4XYGEcD2ONzrO5FUeoAqHvUtzEcpbnIPa1z4JZbMGOfQlnmtwwXZt30rQcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692977656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OOKCPVwICrcnc8BUJa5tf9OozV26tEY0vQ1FHoA4mfM=; b=fMFVGJqP4OcJl1mlvvEPaVhdHz3976QuNNb+YPLLKoCEu3Tfg26ouwTpHA47N7MEs5H2gD Y4EE0JxXFJu8/JW1jUnMJA6MrFVJUwOWZ0Gw2kQSS4PatRRmKedJlzACJLPV8dCNAWlfRm mO2JCPoNKYyMR8I+rWDV/UEqiDrxbBl4WJkVDX1xl501QvGXVuHiNaOqwLa4Bl6b6SGWAu YpUXoe63LA8oiN7T3JXks6nt4Zo6FEVuyplP/vp+9mhSI0d+SIHiXrc7NSSulIy6AH8/jv 0I3Xk2D0EZ3/e4cQuhtmTWR2zVxf8Djrbc6gbzhtqAojdxQ6tTq1gFqejbi7Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692977656; a=rsa-sha256; cv=none; b=S+XvFupIhhTf+P55wM5psPKZf2jCMsGM84MuZV4lwEobM0ntcdNIItCDDSh7+J1dap4/ug /IS/+3vi4mKpijB5N00rOG33Jj6Sy7jXnQXIX23mWn5HnArXdhQBObznK0qHNZMXyP6HqC UJ292N8NL34ddicjXJzdsNaLFKuycsvU+WkUzad4+Rq3iUjvBiscYjpDTX0yQ1IltP3N1w pxdFI725+4gg3iY2wXifmSKUIqOA916m4dZeOJG7NkxCQvnUoFzzvLJzgrnhY8lVSzJfsV nOkKi9CpM1RpbzhBPQIoB09/T+Gdifn8XO4r40Ie9CDNgNy7yHFCovf0R+9PIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXPBc4M9wz1DKG; Fri, 25 Aug 2023 15:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PFYG0b000643; Fri, 25 Aug 2023 15:34:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PFYGmv000639; Fri, 25 Aug 2023 15:34:16 GMT (envelope-from git) Date: Fri, 25 Aug 2023 15:34:16 GMT Message-Id: <202308251534.37PFYGmv000639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e40d16ad6ee9 - main - sctp: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e40d16ad6ee952f315356ef091fa282f28fac0d5 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e40d16ad6ee952f315356ef091fa282f28fac0d5 commit e40d16ad6ee952f315356ef091fa282f28fac0d5 Author: Michael Tuexen AuthorDate: 2023-08-25 15:31:19 +0000 Commit: Michael Tuexen CommitDate: 2023-08-25 15:31:19 +0000 sctp: cleanup In particular, don't use a socket level flag, use the inp level one. After adding appropriate locking, this will close a race condition. MFC after: 1 week --- sys/netinet/sctputil.c | 60 +++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 2f021c22165e..381f67f40b99 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4054,14 +4054,14 @@ void sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, uint32_t error, void *data, int so_locked) { - if ((stcb == NULL) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { - /* If the socket is gone we are out of here */ - return; - } - if (stcb->sctp_socket->so_rcv.sb_state & SBS_CANTRCVMORE) { + struct sctp_inpcb *inp; + struct sctp_nets *net; + + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + + inp = stcb->sctp_ep; + if (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET) { return; } if ((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) || @@ -4073,6 +4073,12 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, return; } } + if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || + (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || + (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_CANT_READ)) { + return; + } + switch (notification) { case SCTP_NOTIFY_ASSOC_UP: if (stcb->asoc.assoc_up_sent == 0) { @@ -4091,32 +4097,20 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_assoc_change(SCTP_SHUTDOWN_COMP, stcb, error, NULL, false, false, so_locked); break; case SCTP_NOTIFY_INTERFACE_DOWN: - { - struct sctp_nets *net; - - net = (struct sctp_nets *)data; - sctp_notify_peer_addr_change(stcb, SCTP_ADDR_UNREACHABLE, - (struct sockaddr *)&net->ro._l_addr, error, so_locked); - break; - } + net = (struct sctp_nets *)data; + sctp_notify_peer_addr_change(stcb, SCTP_ADDR_UNREACHABLE, + &net->ro._l_addr.sa, error, so_locked); + break; case SCTP_NOTIFY_INTERFACE_UP: - { - struct sctp_nets *net; - - net = (struct sctp_nets *)data; - sctp_notify_peer_addr_change(stcb, SCTP_ADDR_AVAILABLE, - (struct sockaddr *)&net->ro._l_addr, error, so_locked); - break; - } + net = (struct sctp_nets *)data; + sctp_notify_peer_addr_change(stcb, SCTP_ADDR_AVAILABLE, + &net->ro._l_addr.sa, error, so_locked); + break; case SCTP_NOTIFY_INTERFACE_CONFIRMED: - { - struct sctp_nets *net; - - net = (struct sctp_nets *)data; - sctp_notify_peer_addr_change(stcb, SCTP_ADDR_CONFIRMED, - (struct sockaddr *)&net->ro._l_addr, error, so_locked); - break; - } + net = (struct sctp_nets *)data; + sctp_notify_peer_addr_change(stcb, SCTP_ADDR_CONFIRMED, + &net->ro._l_addr.sa, error, so_locked); + break; case SCTP_NOTIFY_SPECIAL_SP_FAIL: sctp_notify_send_failed2(stcb, error, (struct sctp_stream_queue_pending *)data, so_locked); @@ -4227,7 +4221,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, SCTPDBG(SCTP_DEBUG_UTIL1, "%s: unknown notification %xh (%u)\n", __func__, notification, notification); break; - } /* end switch */ + } } void From nobody Fri Aug 25 15:47:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RXPTd0gKVz4rSWj; Fri, 25 Aug 2023 15:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RXPTd090Dz4lpM; Fri, 25 Aug 2023 15:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692978437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i8Ccok5Na6qc0F9agYHvztanDgNZ4sPlvjR6jDd1gt4=; b=cSPR+hbXHbcpJB6uHTnPQOFZg1piCBVxnb4cbvjxYlDwTqw7kN3PywWKIjdPj7I+wHswbz UIIdELCaitOm397WxfUV7fybUTw3hB9udTQMQuCNDRsHKklrbgZ5nxAEAVS4rCxgihjV2u 1RwT0fb9kvh6TrgE38FnzyBAqlnirMmTH23uHac5v9PL/1B8VeaIuU/C0QQDqaogDshdLg 6TvyJDIU3oCNDirnY7QLS22Z6dEhkoWCnlivVQDuMtQGbLS12KuC7PsZY0ClA3/VFYyINt Ai8hcm9oo4E9PgrDcyrX029cle1IEjdwhLuJvAGP/YEZBtpkr5M5BBeMLgUkZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692978437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i8Ccok5Na6qc0F9agYHvztanDgNZ4sPlvjR6jDd1gt4=; b=WHXKQXxGLlYTzxGbEOGKk1DQMLdAMHTgmHvWejpVYW2861diPMlDw8lxGRkJUtW+X9jkKx GP3rw7LE4HtHHVQloD2jZwDIN48sh40J8cBSOOlODXk3TZ/6zJiahwGGxqRRJaqa7G4e7Q YNVLLWeUkuim/PbNavGNA0enEejUZdpzFNxDw+vxuBT38US86dxPLsuh8eINZa8zXniIdn WcWG8Im/ueMwjRUd2u9OAyvl25Dybe7HVm6WtBibvG5jpRMSaVzhRbML0Q1loDsEgj91r9 EVkDxtXEmovskLH2cC+bb32uKJkygnRqy5YRf3FRtGdvaTMjD1Tnz7csFv3+mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692978437; a=rsa-sha256; cv=none; b=RHNJulXOQoYR3A+7dr+9TcN6f6Xw8g+zlqIal0A/tJvtcN7O+GI4Jvwd8HgBgVIW1OS4c9 DCL2CaUJx1bSf+X1KPAy59m3/DDTjS2KEO6OuW2YlpR8VFHpO7ofGLcYOe2Y87yvSjyIYs /6YK+kg8Do6dv73tfyXClpnZV/0EpLZG4JsrmEhy7MR8hE2Nl/31GFd9wXRE+1iG8j/DuD wCBF/LRZQZeZVscKMWFuqTVPKKckiLQevvUvHQnB381+PLvpzXqRS1mlXnMlMBIXiz3IVP VmO9AwyGI6cvagcNle1BnHik0qr6B9siM1w5ZJBuc8dghjxGe0N1Hm4VXrirlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXPTc6L4cz1Cnv; Fri, 25 Aug 2023 15:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PFlG73017703; Fri, 25 Aug 2023 15:47:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PFlGNt017700; Fri, 25 Aug 2023 15:47:16 GMT (envelope-from git) Date: Fri, 25 Aug 2023 15:47:16 GMT Message-Id: <202308251547.37PFlGNt017700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2f06449d6429 - main - smartpqi: Fix build issues highlighted by gcc12 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f06449d64298fe508e3c585b45effd69a72d696 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2f06449d64298fe508e3c585b45effd69a72d696 commit 2f06449d64298fe508e3c585b45effd69a72d696 Author: Warner Losh AuthorDate: 2023-08-25 15:45:28 +0000 Commit: Warner Losh CommitDate: 2023-08-25 15:46:44 +0000 smartpqi: Fix build issues highlighted by gcc12 Make inline functions defined in a header file as static inline. Mark inline functions used only in the compilation unit they are defined in as merely static (the compiler can figure out it these days). Sponsored by: Netflix --- sys/dev/smartpqi/smartpqi_helper.c | 12 ------------ sys/dev/smartpqi/smartpqi_helper.h | 8 ++++---- sys/dev/smartpqi/smartpqi_prototypes.h | 4 ---- sys/dev/smartpqi/smartpqi_request.c | 6 +++--- 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_helper.c b/sys/dev/smartpqi/smartpqi_helper.c index 68f105001fa0..741ac0a05a06 100644 --- a/sys/dev/smartpqi/smartpqi_helper.c +++ b/sys/dev/smartpqi/smartpqi_helper.c @@ -416,18 +416,6 @@ check_device_pending_commands_to_complete(pqisrc_softstate_t *softs, pqi_scsi_de } #endif -extern inline uint64_t -pqisrc_increment_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device); - -extern inline uint64_t -pqisrc_decrement_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device); - -extern inline void -pqisrc_init_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device); - -extern inline uint64_t -pqisrc_read_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device); - void pqisrc_wait_for_device_commands_to_complete(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { diff --git a/sys/dev/smartpqi/smartpqi_helper.h b/sys/dev/smartpqi/smartpqi_helper.h index cc7030de74ad..507caeb9b0b6 100644 --- a/sys/dev/smartpqi/smartpqi_helper.h +++ b/sys/dev/smartpqi/smartpqi_helper.h @@ -28,7 +28,7 @@ #define _PQI_HELPER_H -inline uint64_t +static inline uint64_t pqisrc_increment_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { #if PQISRC_DEVICE_IO_COUNTER @@ -37,7 +37,7 @@ pqisrc_increment_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *dev #endif } -inline uint64_t +static inline uint64_t pqisrc_decrement_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { #if PQISRC_DEVICE_IO_COUNTER @@ -46,7 +46,7 @@ pqisrc_decrement_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *de #endif } -inline void +static inline void pqisrc_init_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { #if PQISRC_DEVICE_IO_COUNTER @@ -55,7 +55,7 @@ pqisrc_init_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) #endif } -inline uint64_t +static inline uint64_t pqisrc_read_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { #if PQISRC_DEVICE_IO_COUNTER diff --git a/sys/dev/smartpqi/smartpqi_prototypes.h b/sys/dev/smartpqi/smartpqi_prototypes.h index 8eabe5c47cf4..a10e5031d85e 100644 --- a/sys/dev/smartpqi/smartpqi_prototypes.h +++ b/sys/dev/smartpqi/smartpqi_prototypes.h @@ -167,10 +167,6 @@ int pqisrc_send_tmf(pqisrc_softstate_t *, pqi_scsi_dev_t *, rcb_t *, rcb_t *, int); int pqisrc_write_current_time_to_host_wellness(pqisrc_softstate_t *softs); int pqisrc_write_driver_version_to_host_wellness(pqisrc_softstate_t *softs); -extern inline void pqisrc_aio_build_cdb(aio_req_locator_t *, uint32_t, - rcb_t *, uint8_t *); -extern inline boolean_t pqisrc_aio_req_too_big(pqisrc_softstate_t *, pqi_scsi_dev_t *, - rcb_t *, aio_req_locator_t *, uint32_t); void pqisrc_build_aio_common(pqisrc_softstate_t *, pqi_aio_req_t *, rcb_t *, uint32_t); void pqisrc_build_aio_R1_write(pqisrc_softstate_t *, diff --git a/sys/dev/smartpqi/smartpqi_request.c b/sys/dev/smartpqi/smartpqi_request.c index 246ab891126d..1c0bbc2a1db5 100644 --- a/sys/dev/smartpqi/smartpqi_request.c +++ b/sys/dev/smartpqi/smartpqi_request.c @@ -1180,7 +1180,7 @@ fill_lba_for_scsi_rw(pqisrc_softstate_t *softs, uint8_t *cdb, aio_req_locator_t /* determine whether writes to certain types of RAID are supported. */ -inline boolean_t +static boolean_t pqisrc_is_supported_write(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { @@ -1492,7 +1492,7 @@ pqisrc_handle_blk_size_diffs(aio_req_locator_t *l) * handle based on dev type, Raid level, and encryption status. * TODO: make limits dynamic when this becomes possible. */ -inline boolean_t +static boolean_t pqisrc_aio_req_too_big(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device, rcb_t *rcb, aio_req_locator_t *l, uint32_t disk_blk_cnt) @@ -1636,7 +1636,7 @@ pqisrc_aio_show_locator_info(pqisrc_softstate_t *softs, } /* build the aio cdb */ -inline void +static void pqisrc_aio_build_cdb(aio_req_locator_t *l, uint32_t disk_blk_cnt, rcb_t *rcb, uint8_t *cdb) { From nobody Fri Aug 25 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 4RXQCw12bRz4rT6f; Fri, 25 Aug 2023 16: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 4RXQCw0VwCz4qdV; Fri, 25 Aug 2023 16: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=1692980428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eSon4dvRrLViVIHaGQi+hjEcO8MY3fRDGM56oBznvx0=; b=l1MNNiKqJ2c/FaKV8nusApLYQj6DICqrI0A/M/yPrD9zfMJVeD+wE8M34A5+ueYz1S1zbl D9bostOo3fftklBD3qLX+SDDCazt9bMAv2IlL5J/OUoNBuDHetsEIOsL5Nu74PuJlKU+dO TPipcEdPEU+7CZn7HebKSHTK4DsdjY8uGapMQ3vixnPElSAc+UcsyoMQYwW7/alQ7uoZZV ohL4hhWfjP3Vd7AzGZTT/4qPWVk8NmH7ruR3OdD34ne6adbxf7B3WfSx2XtsJWqBGzq8Gv U0DedtN4F8ltT5DG3m+3mFIwArIYkzxtlCaNHdy/rf36+6aQlvoNseAgV1DodA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692980428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eSon4dvRrLViVIHaGQi+hjEcO8MY3fRDGM56oBznvx0=; b=qMqGIxQPosUJdDBT+3IdXJchbfrFhmqqys87C/ynHoG9S4i3o2HajHY58IcxM4WMe/Wa2z nbZz4+qtiPbvW0Oa0Z8Xwk7Ag6Z+5IoDrYMV7B5onXtVkdAaiUBlMJlKIbnWgs4NlI2nM+ XqBR58aBYWtv0z4t0E+eTBo75GDLYDdqaPhwiKxeVi8sXYAt/b0ogcv5ThSiyruybM587y ruMuI90QjQANCVL/OUoDfsVfmamcg/qD3IeEbHTuj84107P+pln2XH93t+m//WnGMczUfB 8TGlCt5AMyLadxffz3CHu06CAbTSEFoEu4FAxTlkQIX9D2E4G/vrBBT+cFRtEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692980428; a=rsa-sha256; cv=none; b=g3u4HZn6F4GJUewUdEUE6qSU9STnJSuD3GKhd0FkH2O3dez7Ipc2DuwmSlCM2QaCmS32tV knSFnlfb77QZoawlMlBRaNa/K3f3KJXQNF35T+mOTjHfa8UwV1T6l9nbmC5CTy567UHGXO tlTj4hifDC0xPH5/XR2pcoDNHztvggMscyqq4kuDsav082i7Cfl4PKIbxad+DmnJjo7a6m 5N+b2KRRzrWkqDSNVRUU/K7ZlfHGFd0A+xjG/+ffPt5bFrMI21A/B2pQ9q08KPC0GgImLj mxx6ujggKIa0/F0frpmlIeoNsJjZnm0o2AxKTmXixdUCxnRSDTZ2mb1wv7WpXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXQCv6RgJz1F02; Fri, 25 Aug 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.17.1/8.17.1) with ESMTP id 37PGKRgS076655; Fri, 25 Aug 2023 16:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PGKRiJ076652; Fri, 25 Aug 2023 16:20:27 GMT (envelope-from git) Date: Fri, 25 Aug 2023 16:20:27 GMT Message-Id: <202308251620.37PGKRiJ076652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2a6b7055a980 - main - nvme: Timeout expired transactions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a6b7055a980f7e7543dfdbda4aa0c356133b77d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2a6b7055a980f7e7543dfdbda4aa0c356133b77d commit 2a6b7055a980f7e7543dfdbda4aa0c356133b77d Author: Warner Losh AuthorDate: 2023-08-25 16:09:50 +0000 Commit: Warner Losh CommitDate: 2023-08-25 16:10:44 +0000 nvme: Timeout expired transactions When we went to having a shared timeout routine, failing the timed-out transaction code was inadvertantly dropped. Reinstate it. Fixes: 502dc84a8b670 Sponsored by: Netflix MFC After: 2 weeks Reviewed by: chuck, jhb Differential Revision: https://reviews.freebsd.org/D36921 --- sys/dev/nvme/nvme_qpair.c | 60 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 45a999c17d89..0ad0b7cbe17f 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -944,6 +944,30 @@ nvme_io_qpair_destroy(struct nvme_qpair *qpair) nvme_qpair_destroy(qpair); } +static void +nvme_abort_complete(void *arg, const struct nvme_completion *status) +{ + struct nvme_tracker *tr = arg; + + /* + * If cdw0 == 1, the controller was not able to abort the command + * we requested. We still need to check the active tracker array, + * to cover race where I/O timed out at same time controller was + * completing the I/O. + */ + if (status->cdw0 == 1 && tr->qpair->act_tr[tr->cid] != NULL) { + /* + * An I/O has timed out, and the controller was unable to + * abort it for some reason. Construct a fake completion + * status, and then complete the I/O's tracker manually. + */ + nvme_printf(tr->qpair->ctrlr, + "abort command failed, aborting command manually\n"); + nvme_qpair_manual_complete_tracker(tr, + NVME_SCT_GENERIC, NVME_SC_ABORTED_BY_REQUEST, 0, ERROR_PRINT_ALL); + } +} + static void nvme_qpair_timeout(void *arg) { @@ -952,36 +976,44 @@ nvme_qpair_timeout(void *arg) struct nvme_tracker *tr; sbintime_t now; bool idle; + bool expired; uint32_t csts; uint8_t cfs; mtx_lock(&qpair->lock); idle = TAILQ_EMPTY(&qpair->outstanding_tr); + again: switch (qpair->recovery_state) { case RECOVERY_NONE: - if (idle) - break; + /* + * Check to see if we need to timeout any commands. If we do, then + * we also enter a recovery phase. + */ now = getsbinuptime(); - idle = true; + expired = false; TAILQ_FOREACH(tr, &qpair->outstanding_tr, tailq) { if (tr->deadline == SBT_MAX) continue; idle = false; if (now > tr->deadline) { - /* - * We're now passed our earliest deadline. We - * need to do expensive things to cope, but next - * time. Flag that and close the door to any - * further processing. - */ - qpair->recovery_state = RECOVERY_START; - nvme_printf(ctrlr, "RECOVERY_START %jd vs %jd\n", - (uintmax_t)now, (uintmax_t)tr->deadline); - break; + expired = true; + nvme_ctrlr_cmd_abort(ctrlr, tr->cid, qpair->id, + nvme_abort_complete, tr); } } - break; + if (!expired) + break; + + /* + * We're now passed our earliest deadline. We need to do + * expensive things to cope, but next time. Flag that + * and close the door to any further processing. + */ + qpair->recovery_state = RECOVERY_START; + nvme_printf(ctrlr, "RECOVERY_START %jd vs %jd\n", + (uintmax_t)now, (uintmax_t)tr->deadline); + /* FALLTHROUGH */ case RECOVERY_START: /* * Read csts to get value of cfs - controller fatal status. From nobody Fri Aug 25 16: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 4RXQCx31pTz4qVVq; Fri, 25 Aug 2023 16:20: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 4RXQCx0YYPz4qdh; Fri, 25 Aug 2023 16:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692980429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lVE/7AxVTbJDBETKwPRHtJsu9VgQOe5u7wHbtz8Fh5E=; b=AD2mga0e+srQv63OG1xTlQnx+9mMObANPsaN4xdP4JEtoxvMZp+PyZtC/cUxGxrcx8rQ+q w8gDzhYT7lBQ/dlP25OEQbx9dk9V4AL/A7gYjfCyIyYVZf3nPPTWSXaJE6aaAdqD444nsp vcidZjxS5As8AsQQRPNHBmMwmu7ehL/B7+fzATyXWNhkNHnJMgUUmP9rVCu9HqcqfrmYZj 2TH4toESb/SfmVJukPrck92ZGlBari/+H19pY+iu3rnZpivdZ0ggHaxOULb3RKOlSyeHw/ 59rSMpVJxcBeSG3SX0NimSH0phqByVkhruAyKaNSdSzf67WdtGdAZyPGR4xZeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692980429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lVE/7AxVTbJDBETKwPRHtJsu9VgQOe5u7wHbtz8Fh5E=; b=JVpMO7nhtCrjQqvUnyYd5g3kVJtf+4R810qKFNyhPSpd7ytKnJbjV/4/wl4GzYucaTHhF0 TPmFgaTSNQETblm0OUGTm1ulxPbvVriplp1x3lZ5NOIDcTa7OeraqMYfv0rkDXnmpaX8pp XEn5qpAFke9xtZ1xDex6NMqKlnFsYC6TIVYRPQUwKYAR8mHUvhElTIwzLk1VjGiYrbI8qY 3i4AdevIt1GyvEChMv4NKf7pCLMc3v85rgTrGvlhIGmB6UzDEoizWSLit10Al1M4aKqwPm /GOugE4dEHSBRoaLEJByj1yTvDDv79JHRG30Jtjh54Ayu27qU8Sighi42zjFxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692980429; a=rsa-sha256; cv=none; b=Ym/+x77Z6pMCkIOHFoXDOY7hokdHzh2p/VZ8aN7ZY6E3odWLkOzsCeICW6fshNZSca02x3 7ojQ2+WytnanVac15G7Zdh2yJYwjebwQHe43NZJx2G7fMR6/cAgxRhQpRJNUWdZ1HcS+0Y WJBIXZmIUhj7iGqcAw0062anA1ooLd+xa1kphtRFMWy9vMVp9qJXtQmXgRrb5N/XXI2Lx3 aDsrP/xpUbGW50Agf/0bchJhUt1Z31GNnakmfZ2hTVfdZEqNpfDcE3lHMp5/Xv7FuKqLka C2mQJ66x1U6j4KXt5QUuXooQ5gUgfPLGSJwHF63IKi3+9NF2wMu4aCEN1cRt4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXQCw6Sl4z1F03; Fri, 25 Aug 2023 16:20:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PGKSRC076697; Fri, 25 Aug 2023 16:20:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PGKST4076694; Fri, 25 Aug 2023 16:20:28 GMT (envelope-from git) Date: Fri, 25 Aug 2023 16:20:28 GMT Message-Id: <202308251620.37PGKST4076694@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d4959bfcd110 - main - nvme: Greatly improve error recovery List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4959bfcd110ea471222c7dd87775ba1f4e3d1d9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d4959bfcd110ea471222c7dd87775ba1f4e3d1d9 commit d4959bfcd110ea471222c7dd87775ba1f4e3d1d9 Author: Warner Losh AuthorDate: 2023-08-25 16:10:08 +0000 Commit: Warner Losh CommitDate: 2023-08-25 16:11:15 +0000 nvme: Greatly improve error recovery Next phase of error recovery: Eliminate the REOVERY_START phase, since we don't need to wait to start recovery. Eliminate the RECOVERY_RESET phase since it is transient, we now transition from RECOVERY_NORMAL into RECOVERY_WAITING. In normal mode, read the status of the controller. If it is in failed state, or appears to be hot-plugged, jump directly to reset which will sort out the proper things to do. This will cause all pending I/O to complete with an abort status before the reset. When in the NORMAL state, call the interrupt handler. This will complete all pending transactions when interrupts are broken or temporarily misbehaving. We then check all the pending completions for timeouts. If we have abort enabled, then we'll send an abort. Otherwise we'll assume the controller is wedged and needs a reset. By calling the interrupt handler here, we'll avoid an issue with the current code where we transitioned to RECOVERY_START which prevented any completions from happening. Now completions happen. In addition and follow-on I/O that is scheduled in the completion routines will be submitted, rather than queued, because the recovery state is correct. This also fixes a problem where I/O would timeout, but never complete, leading to hung I/O. Resetting remains the same as before, just when we chose to reset has changed. A nice side effect of these changes is that we now do I/O when interrupts to the card are totally broken. Followon commits will improve the error reporting and logging when this happens. Performance will be aweful, but will at least be minimally functional. There is a small race when we're checking the completions if interrupts are working, but this is handled in a future commit. Sponsored by: Netflix MFC After: 2 weeks Differential Revision: https://reviews.freebsd.org/D36922 --- sys/dev/nvme/nvme_private.h | 2 - sys/dev/nvme/nvme_qpair.c | 114 +++++++++++++++++++++++++------------------- 2 files changed, 66 insertions(+), 50 deletions(-) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index dc69012cfd71..e4b319b9d8b7 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -149,8 +149,6 @@ struct nvme_tracker { enum nvme_recovery { RECOVERY_NONE = 0, /* Normal operations */ - RECOVERY_START, /* Deadline has passed, start recovering */ - RECOVERY_RESET, /* This pass, initiate reset of controller */ RECOVERY_WAITING, /* waiting for the reset to complete */ }; struct nvme_qpair { diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 0ad0b7cbe17f..6d34c7ddba2d 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -976,88 +976,106 @@ nvme_qpair_timeout(void *arg) struct nvme_tracker *tr; sbintime_t now; bool idle; - bool expired; + bool needs_reset; uint32_t csts; uint8_t cfs; + mtx_lock(&qpair->lock); idle = TAILQ_EMPTY(&qpair->outstanding_tr); -again: switch (qpair->recovery_state) { case RECOVERY_NONE: + /* + * Read csts to get value of cfs - controller fatal status. If + * we are in the hot-plug or controller failed status proceed + * directly to reset. We also bail early if the status reads all + * 1's or the control fatal status bit is now 1. The latter is + * always true when the former is true, but not vice versa. The + * intent of the code is that if the card is gone (all 1's) or + * we've failed, then try to do a reset (which someitmes + * unwedges a card reading all 1's that's not gone away, but + * usually doesn't). + */ + csts = nvme_mmio_read_4(ctrlr, csts); + cfs = (csts >> NVME_CSTS_REG_CFS_SHIFT) & NVME_CSTS_REG_CFS_MASK; + if (csts == NVME_GONE || cfs == 1) + goto do_reset; + + /* + * Next, check to see if we have any completions. If we do, + * we've likely missed an interrupt, but the card is otherwise + * fine. This will also catch all the commands that are about + * to timeout (but there's still a tiny race). Since the timeout + * is long relative to the race between here and the check below, + * this is still a win. + */ + mtx_unlock(&qpair->lock); + nvme_qpair_process_completions(qpair); + mtx_lock(&qpair->lock); + if (qpair->recovery_state != RECOVERY_NONE) { + /* + * Somebody else adjusted recovery state while unlocked, + * we should bail. Unlock the qpair and return without + * doing anything else. + */ + mtx_unlock(&qpair->lock); + return; + } + /* * Check to see if we need to timeout any commands. If we do, then * we also enter a recovery phase. */ now = getsbinuptime(); - expired = false; + needs_reset = false; TAILQ_FOREACH(tr, &qpair->outstanding_tr, tailq) { if (tr->deadline == SBT_MAX) continue; - idle = false; if (now > tr->deadline) { - expired = true; - nvme_ctrlr_cmd_abort(ctrlr, tr->cid, qpair->id, - nvme_abort_complete, tr); + if (tr->req->cb_fn != nvme_abort_complete && + ctrlr->enable_aborts) { + /* + * This isn't an abort command, ask + * for a hardware abort. + */ + nvme_ctrlr_cmd_abort(ctrlr, tr->cid, + qpair->id, nvme_abort_complete, tr); + } else { + /* + * Otherwise we have a live command in + * the card (either one we couldn't + * abort, or aborts weren't enabled). + * The only safe way to proceed is to do + * a reset. + */ + needs_reset = true; + } + } else { + idle = false; } } - if (!expired) + if (!needs_reset) break; /* - * We're now passed our earliest deadline. We need to do - * expensive things to cope, but next time. Flag that - * and close the door to any further processing. - */ - qpair->recovery_state = RECOVERY_START; - nvme_printf(ctrlr, "RECOVERY_START %jd vs %jd\n", - (uintmax_t)now, (uintmax_t)tr->deadline); - /* FALLTHROUGH */ - case RECOVERY_START: - /* - * Read csts to get value of cfs - controller fatal status. - * If no fatal status, try to call the completion routine, and - * if completes transactions, report a missed interrupt and - * return (this may need to be rate limited). Otherwise, if - * aborts are enabled and the controller is not reporting - * fatal status, abort the command. Otherwise, just reset the - * controller and hope for the best. - */ - csts = nvme_mmio_read_4(ctrlr, csts); - cfs = (csts >> NVME_CSTS_REG_CFS_SHIFT) & NVME_CSTS_REG_CFS_MASK; - if (cfs) { - nvme_printf(ctrlr, "Controller in fatal status, resetting\n"); - qpair->recovery_state = RECOVERY_RESET; - goto again; - } - mtx_unlock(&qpair->lock); - if (nvme_qpair_process_completions(qpair)) { - nvme_printf(ctrlr, "Completions present in output without an interrupt\n"); - qpair->recovery_state = RECOVERY_NONE; - } else { - nvme_printf(ctrlr, "timeout with nothing complete, resetting\n"); - qpair->recovery_state = RECOVERY_RESET; - mtx_lock(&qpair->lock); - goto again; - } - mtx_lock(&qpair->lock); - break; - case RECOVERY_RESET: - /* + * We've had a command timeout that we weren't able to abort + * * If we get here due to a possible surprise hot-unplug event, * then we let nvme_ctrlr_reset confirm and fail the * controller. */ + do_reset: nvme_printf(ctrlr, "Resetting controller due to a timeout%s.\n", (csts == 0xffffffff) ? " and possible hot unplug" : (cfs ? " and fatal error status" : "")); nvme_printf(ctrlr, "RECOVERY_WAITING\n"); qpair->recovery_state = RECOVERY_WAITING; nvme_ctrlr_reset(ctrlr); + idle = false; /* We want to keep polling */ break; case RECOVERY_WAITING: - nvme_printf(ctrlr, "waiting\n"); + nvme_printf(ctrlr, "waiting for reset to complete\n"); break; } From nobody Fri Aug 25 16:20: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 4RXQCy1QtRz4qVQY; Fri, 25 Aug 2023 16:20: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 4RXQCy1CDxz4qs7; Fri, 25 Aug 2023 16:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692980430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U95K1kCafbqNvTez2ph684gCVZnSGop2VtlDbZOqbIQ=; b=MHy/ksolIM2Vw3F++itPh2m0Aqi6HzlVem3lwlzyVYbxAHtfI2ScrsoJN4G5xLo4E3rGqU 2rrun5vF3bhkaDDCa3O+avyIsWMIgcjsv5ujjfa/ZkzQ8td2pEr6BNzg1k5nerdGy92oAw WHY3lhrl5QMVZTCsMW4wb6J64NaovohrrYJqtRtmiqLXtgA49HeafzZf7mblVn7gbvKM9z DgyaW1eBwpHoqR27K6l/37A15Aarid3ukQ4JtwUA2r6pQZZngqPsmPP98g8WgJj5iHBUn2 dWWleMxVSEtyf6N2KY8q1AJKotjwpkCbuQTLLgAHpZ/1s8K8MvbgFAq+Q+fJhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692980430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U95K1kCafbqNvTez2ph684gCVZnSGop2VtlDbZOqbIQ=; b=bVjWNZi/IkCsbGS2pehOSTI8EOjZYJRs272p5ScguWG918tA9DSzVifhlDgGM5UhbQfKf8 1RrHyg1wX/q4CtAdwcVHV+AshLiy7bNsCedBgVBENe6O3SJmVM5N0V1of/W1seOOM/3Sef VxdNa5faMIDB8qkJDA4BIa6JgWc8+9spLB7rcQAEBbFQMh+GWOuFHxyP5b4+WYD062aayn MY4YTejs3+klOdbMknoSEu44POhP+M7I9xDiXT1C3fK3BskXh3FvgL03bG+g72QWgMJYKU 0l9n7G1RAgH2Kneu7lAmKP2RY7/5m4jdsdD7LRojDML2QeN2EfF6DDay+v34Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692980430; a=rsa-sha256; cv=none; b=RLXRHQQrGGjojTEKi3ikWic+CHnTnlZqphShNXOZ7nWjb33iCeVcTK9F9NGjaqOy0cbyb0 KUUSAVo1GB1RUD74SG+31Xiqe+YXbI2KccadfLKpcNBIZTM+kLm3uP93CbuL2IKLoZQvmS 7YPLUJyGavCsE+3ArI9XFTiH1+XxhAWJTO+Hz0Bo2gWMJEe/vLzSvnoFEMFkW7ZFgq/4RY oU459OweUjb7pQ/96uohtejwUDbR0Qba83QcE/gpj7X3E+Z0N/M2SStxxUOFZYctLDqOtX UwrPXSjMiPNeg5z5smcMiZubxvpUw1fLWEcsl/xGWbQ18UB+NR87ZuMcB2M6mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXQCy03Bzz1FCs; Fri, 25 Aug 2023 16:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PGKTC4076745; Fri, 25 Aug 2023 16:20:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PGKTJF076743; Fri, 25 Aug 2023 16:20:29 GMT (envelope-from git) Date: Fri, 25 Aug 2023 16:20:29 GMT Message-Id: <202308251620.37PGKTJF076743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8052b01e7e41 - main - nvme: Add exclusion for ISR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8052b01e7e4113fa8296ce43c354116b0a1774b7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8052b01e7e4113fa8296ce43c354116b0a1774b7 commit 8052b01e7e4113fa8296ce43c354116b0a1774b7 Author: Warner Losh AuthorDate: 2023-08-25 16:10:16 +0000 Commit: Warner Losh CommitDate: 2023-08-25 16:11:27 +0000 nvme: Add exclusion for ISR Add a basically uncontended spinlock that we take out while the ISR is running. This has two effects: First, when we get a timeout, we can safely call the nvme_qpair_process_completions w/o racing any ISRs. Second, we can use it to ensure that we don't reset the card while the ISRs are active (right now we just sleep and hope for the best, which usually is fine, but not always). Sponsored by: Netflix MFC After: 2 weeks Reviewed by: chuck, gallatin Differential Revision: https://reviews.freebsd.org/D41452 --- sys/dev/nvme/nvme_ctrlr.c | 51 ++++++++++++++++---- sys/dev/nvme/nvme_private.h | 10 ++-- sys/dev/nvme/nvme_qpair.c | 115 ++++++++++++++++++++++++++++++-------------- sys/dev/nvme/nvme_sysctl.c | 24 +++++++++ 4 files changed, 148 insertions(+), 52 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 7a2ecffe81d4..c4a750901743 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -416,6 +416,34 @@ nvme_ctrlr_disable_qpairs(struct nvme_controller *ctrlr) } } +static void +nvme_pre_reset(struct nvme_controller *ctrlr) +{ + /* + * Make sure that all the ISRs are done before proceeding with the reset + * (and also keep any stray interrupts that happen during this process + * from racing this process). For startup, this is a nop, since the + * hardware is in a good state. But for recovery, where we randomly + * reset the hardware, this ensure that we're not racing the ISRs. + */ + mtx_lock(&ctrlr->adminq.recovery); + for (int i = 0; i < ctrlr->num_io_queues; i++) { + mtx_lock(&ctrlr->ioq[i].recovery); + } +} + +static void +nvme_post_reset(struct nvme_controller *ctrlr) +{ + /* + * Reset complete, unblock ISRs + */ + mtx_unlock(&ctrlr->adminq.recovery); + for (int i = 0; i < ctrlr->num_io_queues; i++) { + mtx_unlock(&ctrlr->ioq[i].recovery); + } +} + static int nvme_ctrlr_hw_reset(struct nvme_controller *ctrlr) { @@ -427,9 +455,11 @@ nvme_ctrlr_hw_reset(struct nvme_controller *ctrlr) err = nvme_ctrlr_disable(ctrlr); if (err != 0) - return err; + goto out; err = nvme_ctrlr_enable(ctrlr); +out: + TSEXIT(); return (err); } @@ -1157,6 +1187,11 @@ nvme_ctrlr_start_config_hook(void *arg) TSENTER(); + /* + * Don't call pre/post reset here. We've not yet created the qpairs, + * haven't setup the ISRs, so there's no need to 'drain' them or + * 'exclude' them. + */ if (nvme_ctrlr_hw_reset(ctrlr) != 0) { fail: nvme_ctrlr_fail(ctrlr); @@ -1201,16 +1236,9 @@ nvme_ctrlr_reset_task(void *arg, int pending) int status; nvme_ctrlr_devctl_log(ctrlr, "RESET", "resetting controller"); + nvme_pre_reset(ctrlr); status = nvme_ctrlr_hw_reset(ctrlr); - /* - * Use pause instead of DELAY, so that we yield to any nvme interrupt - * handlers on this CPU that were blocked on a qpair lock. We want - * all nvme interrupts completed before proceeding with restarting the - * controller. - * - * XXX - any way to guarantee the interrupt handlers have quiesced? - */ - pause("nvmereset", hz / 10); + nvme_post_reset(ctrlr); if (status == 0) nvme_ctrlr_start(ctrlr, true); else @@ -1697,6 +1725,7 @@ nvme_ctrlr_resume(struct nvme_controller *ctrlr) if (ctrlr->is_failed) return (0); + nvme_pre_reset(ctrlr); if (nvme_ctrlr_hw_reset(ctrlr) != 0) goto fail; #ifdef NVME_2X_RESET @@ -1708,6 +1737,7 @@ nvme_ctrlr_resume(struct nvme_controller *ctrlr) if (nvme_ctrlr_hw_reset(ctrlr) != 0) goto fail; #endif + nvme_post_reset(ctrlr); /* * Now that we've reset the hardware, we can restart the controller. Any @@ -1724,6 +1754,7 @@ fail: * the controller. However, we have to return success for the resume * itself, due to questionable APIs. */ + nvme_post_reset(ctrlr); nvme_printf(ctrlr, "Failed to reset on resume, failing.\n"); nvme_ctrlr_fail(ctrlr); (void)atomic_cmpset_32(&ctrlr->is_resetting, 1, 0); diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index e4b319b9d8b7..a6239f30f3bf 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -162,10 +162,9 @@ struct nvme_qpair { struct resource *res; void *tag; - struct callout timer; - sbintime_t deadline; - bool timer_armed; - enum nvme_recovery recovery_state; + struct callout timer; /* recovery lock */ + bool timer_armed; /* recovery lock */ + enum nvme_recovery recovery_state; /* recovery lock */ uint32_t num_entries; uint32_t num_trackers; @@ -182,6 +181,7 @@ struct nvme_qpair { int64_t num_retries; int64_t num_failures; int64_t num_ignored; + int64_t num_recovery_nolock; struct nvme_command *cmd; struct nvme_completion *cpl; @@ -200,7 +200,7 @@ struct nvme_qpair { struct nvme_tracker **act_tr; struct mtx_padalign lock; - + struct mtx_padalign recovery; } __aligned(CACHE_LINE_SIZE); struct nvme_namespace { diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 6d34c7ddba2d..b256c4713c8d 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -528,14 +528,17 @@ nvme_qpair_manual_complete_request(struct nvme_qpair *qpair, nvme_free_request(req); } -bool -nvme_qpair_process_completions(struct nvme_qpair *qpair) +/* Locked version of completion processor */ +static bool +_nvme_qpair_process_completions(struct nvme_qpair *qpair) { struct nvme_tracker *tr; struct nvme_completion cpl; - int done = 0; + bool done = false; bool in_panic = dumping || SCHEDULER_STOPPED(); + mtx_assert(&qpair->recovery, MA_OWNED); + /* * qpair is not enabled, likely because a controller reset is in * progress. Ignore the interrupt - any I/O that was associated with @@ -629,7 +632,7 @@ nvme_qpair_process_completions(struct nvme_qpair *qpair) else tr = NULL; - done++; + done = true; if (tr != NULL) { nvme_qpair_complete_tracker(tr, &cpl, ERROR_PRINT_ALL); qpair->sq_head = cpl.sqhd; @@ -666,12 +669,35 @@ nvme_qpair_process_completions(struct nvme_qpair *qpair) } } - if (done != 0) { + if (done) { bus_space_write_4(qpair->ctrlr->bus_tag, qpair->ctrlr->bus_handle, qpair->cq_hdbl_off, qpair->cq_head); } - return (done != 0); + return (done); +} + +bool +nvme_qpair_process_completions(struct nvme_qpair *qpair) +{ + bool done; + + /* + * Interlock with reset / recovery code. This is an usually uncontended + * to make sure that we drain out of the ISRs before we reset the card + * and to prevent races with the recovery process called from a timeout + * context. + */ + if (!mtx_trylock(&qpair->recovery)) { + qpair->num_recovery_nolock++; + return (false); + } + + done = _nvme_qpair_process_completions(qpair); + + mtx_unlock(&qpair->recovery); + + return (done); } static void @@ -699,6 +725,7 @@ nvme_qpair_construct(struct nvme_qpair *qpair, qpair->ctrlr = ctrlr; mtx_init(&qpair->lock, "nvme qpair lock", NULL, MTX_DEF); + mtx_init(&qpair->recovery, "nvme qpair recovery", NULL, MTX_DEF); /* Note: NVMe PRP format is restricted to 4-byte alignment. */ err = bus_dma_tag_create(bus_get_dma_tag(ctrlr->dev), @@ -765,7 +792,7 @@ nvme_qpair_construct(struct nvme_qpair *qpair, qpair->cpl_bus_addr = queuemem_phys + cmdsz; prpmem_phys = queuemem_phys + cmdsz + cplsz; - callout_init(&qpair->timer, 1); + callout_init_mtx(&qpair->timer, &qpair->recovery, 0); qpair->timer_armed = false; qpair->recovery_state = RECOVERY_WAITING; @@ -903,6 +930,8 @@ nvme_qpair_destroy(struct nvme_qpair *qpair) if (mtx_initialized(&qpair->lock)) mtx_destroy(&qpair->lock); + if (mtx_initialized(&qpair->recovery)) + mtx_destroy(&qpair->recovery); if (qpair->res) { bus_release_resource(qpair->ctrlr->dev, SYS_RES_IRQ, @@ -975,14 +1004,12 @@ nvme_qpair_timeout(void *arg) struct nvme_controller *ctrlr = qpair->ctrlr; struct nvme_tracker *tr; sbintime_t now; - bool idle; + bool idle = false; bool needs_reset; uint32_t csts; uint8_t cfs; - - mtx_lock(&qpair->lock); - idle = TAILQ_EMPTY(&qpair->outstanding_tr); + mtx_assert(&qpair->recovery, MA_OWNED); switch (qpair->recovery_state) { case RECOVERY_NONE: @@ -1003,25 +1030,10 @@ nvme_qpair_timeout(void *arg) goto do_reset; /* - * Next, check to see if we have any completions. If we do, - * we've likely missed an interrupt, but the card is otherwise - * fine. This will also catch all the commands that are about - * to timeout (but there's still a tiny race). Since the timeout - * is long relative to the race between here and the check below, - * this is still a win. + * Process completions. We already have the recovery lock, so + * call the locked version. */ - mtx_unlock(&qpair->lock); - nvme_qpair_process_completions(qpair); - mtx_lock(&qpair->lock); - if (qpair->recovery_state != RECOVERY_NONE) { - /* - * Somebody else adjusted recovery state while unlocked, - * we should bail. Unlock the qpair and return without - * doing anything else. - */ - mtx_unlock(&qpair->lock); - return; - } + _nvme_qpair_process_completions(qpair); /* * Check to see if we need to timeout any commands. If we do, then @@ -1029,7 +1041,13 @@ nvme_qpair_timeout(void *arg) */ now = getsbinuptime(); needs_reset = false; + idle = true; + mtx_lock(&qpair->lock); TAILQ_FOREACH(tr, &qpair->outstanding_tr, tailq) { + /* + * Skip async commands, they are posted to the card for + * an indefinite amount of time and have no deadline. + */ if (tr->deadline == SBT_MAX) continue; if (now > tr->deadline) { @@ -1055,6 +1073,7 @@ nvme_qpair_timeout(void *arg) idle = false; } } + mtx_unlock(&qpair->lock); if (!needs_reset) break; @@ -1076,6 +1095,7 @@ nvme_qpair_timeout(void *arg) break; case RECOVERY_WAITING: nvme_printf(ctrlr, "waiting for reset to complete\n"); + idle = false; /* We want to keep polling */ break; } @@ -1087,7 +1107,6 @@ nvme_qpair_timeout(void *arg) } else { qpair->timer_armed = false; } - mtx_unlock(&qpair->lock); } /* @@ -1196,9 +1215,12 @@ _nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req) if (tr == NULL || qpair->recovery_state != RECOVERY_NONE) { /* - * No tracker is available, or the qpair is disabled due to - * an in-progress controller-level reset or controller - * failure. + * No tracker is available, or the qpair is disabled due to an + * in-progress controller-level reset or controller failure. If + * we lose the race with recovery_state, then we may add an + * extra request to the queue which will be resubmitted later. + * We only set recovery_state to NONE with qpair->lock also + * held. */ if (qpair->ctrlr->is_failed) { @@ -1260,7 +1282,10 @@ nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req) static void nvme_qpair_enable(struct nvme_qpair *qpair) { - mtx_assert(&qpair->lock, MA_OWNED); + if (mtx_initialized(&qpair->recovery)) + mtx_assert(&qpair->recovery, MA_OWNED); + if (mtx_initialized(&qpair->lock)) + mtx_assert(&qpair->lock, MA_OWNED); qpair->recovery_state = RECOVERY_NONE; } @@ -1311,9 +1336,11 @@ nvme_admin_qpair_enable(struct nvme_qpair *qpair) nvme_printf(qpair->ctrlr, "done aborting outstanding admin\n"); + mtx_lock(&qpair->recovery); mtx_lock(&qpair->lock); nvme_qpair_enable(qpair); mtx_unlock(&qpair->lock); + mtx_unlock(&qpair->recovery); } void @@ -1340,8 +1367,8 @@ nvme_io_qpair_enable(struct nvme_qpair *qpair) if (report) nvme_printf(qpair->ctrlr, "done aborting outstanding i/o\n"); + mtx_lock(&qpair->recovery); mtx_lock(&qpair->lock); - nvme_qpair_enable(qpair); STAILQ_INIT(&temp); @@ -1360,6 +1387,7 @@ nvme_io_qpair_enable(struct nvme_qpair *qpair) nvme_printf(qpair->ctrlr, "done resubmitting i/o\n"); mtx_unlock(&qpair->lock); + mtx_unlock(&qpair->recovery); } static void @@ -1367,27 +1395,40 @@ nvme_qpair_disable(struct nvme_qpair *qpair) { struct nvme_tracker *tr, *tr_temp; - mtx_lock(&qpair->lock); + if (mtx_initialized(&qpair->recovery)) + mtx_assert(&qpair->recovery, MA_OWNED); + if (mtx_initialized(&qpair->lock)) + mtx_assert(&qpair->lock, MA_OWNED); + qpair->recovery_state = RECOVERY_WAITING; TAILQ_FOREACH_SAFE(tr, &qpair->outstanding_tr, tailq, tr_temp) { tr->deadline = SBT_MAX; } - mtx_unlock(&qpair->lock); } void nvme_admin_qpair_disable(struct nvme_qpair *qpair) { + mtx_lock(&qpair->recovery); + mtx_lock(&qpair->lock); nvme_qpair_disable(qpair); nvme_admin_qpair_abort_aers(qpair); + + mtx_unlock(&qpair->lock); + mtx_unlock(&qpair->recovery); } void nvme_io_qpair_disable(struct nvme_qpair *qpair) { + mtx_lock(&qpair->recovery); + mtx_lock(&qpair->lock); nvme_qpair_disable(qpair); + + mtx_unlock(&qpair->lock); + mtx_unlock(&qpair->recovery); } void diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c index a1a8a968eebe..ac0d507e2337 100644 --- a/sys/dev/nvme/nvme_sysctl.c +++ b/sys/dev/nvme/nvme_sysctl.c @@ -163,6 +163,7 @@ nvme_qpair_reset_stats(struct nvme_qpair *qpair) qpair->num_retries = 0; qpair->num_failures = 0; qpair->num_ignored = 0; + qpair->num_recovery_nolock = 0; } static int @@ -240,6 +241,21 @@ nvme_sysctl_num_ignored(SYSCTL_HANDLER_ARGS) return (sysctl_handle_64(oidp, &num_ignored, 0, req)); } +static int +nvme_sysctl_num_recovery_nolock(SYSCTL_HANDLER_ARGS) +{ + struct nvme_controller *ctrlr = arg1; + int64_t num; + int i; + + num = ctrlr->adminq.num_recovery_nolock; + + for (i = 0; i < ctrlr->num_io_queues; i++) + num += ctrlr->ioq[i].num_recovery_nolock; + + return (sysctl_handle_64(oidp, &num, 0, req)); +} + static int nvme_sysctl_reset_stats(SYSCTL_HANDLER_ARGS) { @@ -298,6 +314,9 @@ nvme_sysctl_initialize_queue(struct nvme_qpair *qpair, SYSCTL_ADD_QUAD(ctrlr_ctx, que_list, OID_AUTO, "num_ignored", CTLFLAG_RD, &qpair->num_ignored, "Number of interrupts posted, but were administratively ignored"); + SYSCTL_ADD_QUAD(ctrlr_ctx, que_list, OID_AUTO, "num_recovery_nolock", + CTLFLAG_RD, &qpair->num_recovery_nolock, + "Number of times that we failed to lock recovery in the ISR"); SYSCTL_ADD_PROC(ctrlr_ctx, que_list, OID_AUTO, "dump_debug", CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, @@ -366,6 +385,11 @@ nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr) ctrlr, 0, nvme_sysctl_num_ignored, "IU", "Number of interrupts ignored administratively"); + SYSCTL_ADD_PROC(ctrlr_ctx, ctrlr_list, OID_AUTO, + "num_recovery_nolock", CTLTYPE_S64 | CTLFLAG_RD | CTLFLAG_MPSAFE, + ctrlr, 0, nvme_sysctl_num_recovery_nolock, "IU", + "Number of times that we failed to lock recovery in the ISR"); + SYSCTL_ADD_PROC(ctrlr_ctx, ctrlr_list, OID_AUTO, "reset_stats", CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, ctrlr, 0, nvme_sysctl_reset_stats, "IU", "Reset statistics to zero"); From nobody Fri Aug 25 16:52: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 4RXQxJ6yp0z4qXFR; Fri, 25 Aug 2023 16:52: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 4RXQxJ6L0rz4tG5; Fri, 25 Aug 2023 16:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692982372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/BumNmIXnsgGVnAmIolmbioD1a6fHnfxrTpZtqecRY4=; b=BTaY9Ik7dz9ryeaKAMYPHdiq+HNqZivZySfiMTIArCYaaekvIHueCQUhh2f16wmtAnePcH 93JBJBBXxEFYdcyZ6AjfBdAYautgQozSxf2bpYb75T+DfMZCmCN/O6UP2lXKrZzJDw5wZX /fX68qrFjg5hME39ARHxz4v/4GiUcR3wutTL5LFoLy0nBMarWZw9tmUx23m0czl12hOv2d huxSDSA238rJsUWmk7bsGPi6gAbRWmfRDXtLmEqDB71Ns5l0xZTtdS+Ibi7k9a6KNsjRfN CUkq0uthz23fQG2t2sc/M/xZ1LpC34zS721ZZ76qyBb6Vpojktdk+hg8nUqVzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692982372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/BumNmIXnsgGVnAmIolmbioD1a6fHnfxrTpZtqecRY4=; b=J+yHQcWPk8igZNE1bMJgigI9vHOVv+SwxSdojDT7wtF2fpyC+Hsd2CSrhs/LdbcVHFNtnk 1zrws93ykTRMi14bMsmy0oI5eVZNGJCRZNriYHL20BvN7IAQuj9ZE/mfWZePJXVWAoXurY EnmIjdQTZIrMdhyKSxSJikQKGIiMon+06CC02PBr95DbMm0pe3eWuemZHyABzXJmEoXH/L /8awjiTuuBaKLqIjbwrwwfeeghNi+U5W1GnHAV5aM6dLury3pqamNB+Wqj8qw/zK6uHmQY v5M6rtPLzYaHsTw6rHkAs70LfYCdKdrPHmgsv4wMsVrb/fwR5pyYAxvpva62jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692982372; a=rsa-sha256; cv=none; b=VEybg9zsFIprUB32J3gDEO+eWeKPAPPW0iTx6bg7Th1s8zBA7J/8z284a3n26aL2IsAxBC uI90ES3m5W4+OHQXZXy3wmW1zDDkQzCamqbF+AOBS2cOj3bx6xM9zgI7ng/96p3KdiPklm Bl/Ka9IDYYql7iQH7youOkSG1gPyFzyl0PtEKnWOfa+eluykdRErzpg9ikEHQ3ZXYA0VZ8 TWAFUxxLL30iaU+Leo4tfYJx6Y4CaFhXdz+ZsNp++RWlniv4h0OeB37IEkAXvFGC/vO39r JFE1CjkOBDUdxLKyCgDkS0S6Nufwbgjx9D/ps4Q6+Gom29HsROjZwAz1JuaY9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXQxJ5NHBz1FHX; Fri, 25 Aug 2023 16:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PGqqls032817; Fri, 25 Aug 2023 16:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PGqqW7032814; Fri, 25 Aug 2023 16:52:52 GMT (envelope-from git) Date: Fri, 25 Aug 2023 16:52:52 GMT Message-Id: <202308251652.37PGqqW7032814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 2a3716432d20 - main - IfAPI: Retire if_etherbpfmtap() and if_bpfmtap() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a3716432d209c5fef1eb1a719f4c1914e7c8b5a Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=2a3716432d209c5fef1eb1a719f4c1914e7c8b5a commit 2a3716432d209c5fef1eb1a719f4c1914e7c8b5a Author: Justin Hibbits AuthorDate: 2023-07-21 18:16:25 +0000 Commit: Justin Hibbits CommitDate: 2023-08-25 16:50:14 +0000 IfAPI: Retire if_etherbpfmtap() and if_bpfmtap() Summary: These came in the original DrvAPI commits in 2014, and are obsoleted by bpf_mtap_if() and ether_bpf_mtap_if(). The `_if` suffix, rather than prefix, conveys that it's operating on the bpf of the interface, instead than the interface itself. Reviewed by: glebius Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D41146 --- sys/arm/allwinner/if_awg.c | 2 +- sys/arm64/broadcom/genet/if_genet.c | 2 +- sys/dev/bge/if_bge.c | 2 +- sys/dev/bxe/bxe.c | 4 ++-- sys/dev/dwc/if_dwc.c | 2 +- sys/dev/eqos/if_eqos.c | 2 +- sys/dev/fxp/if_fxp.c | 2 +- sys/dev/nfe/if_nfe.c | 2 +- sys/dev/ntb/if_ntb/if_ntb.c | 2 +- sys/net/if.c | 12 ------------ sys/net/if_var.h | 2 -- 11 files changed, 10 insertions(+), 24 deletions(-) diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c index 566ba329e956..f511dd2309bb 100644 --- a/sys/arm/allwinner/if_awg.c +++ b/sys/arm/allwinner/if_awg.c @@ -984,7 +984,7 @@ awg_start_locked(struct awg_softc *sc) if_sendq_prepend(ifp, m); break; } - if_bpfmtap(ifp, m); + bpf_mtap_if(ifp, m); } if (cnt != 0) { diff --git a/sys/arm64/broadcom/genet/if_genet.c b/sys/arm64/broadcom/genet/if_genet.c index 40fc096208c6..0c8730a43913 100644 --- a/sys/arm64/broadcom/genet/if_genet.c +++ b/sys/arm64/broadcom/genet/if_genet.c @@ -1036,7 +1036,7 @@ gen_start_locked(struct gen_softc *sc) if_sendq_prepend(ifp, m); break; } - if_bpfmtap(ifp, m); + bpf_mtap_if(ifp, m); } } diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 77a4cb90d852..ce4d0856f447 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -5368,7 +5368,7 @@ bge_start_locked(if_t ifp) * If there's a BPF listener, bounce a copy of this frame * to him. */ - if_bpfmtap(ifp, m_head); + bpf_mtap_if(ifp, m_head); } if (count > 0) diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index 60450d0a6fbb..36b03ee5c135 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -5574,7 +5574,7 @@ bxe_tx_start_locked(struct bxe_softc *sc, tx_count++; /* send a copy of the frame to any BPF listeners. */ - if_etherbpfmtap(ifp, m); + ether_bpf_mtap_if(ifp, m); tx_bd_avail = bxe_tx_avail(sc, fp); @@ -5715,7 +5715,7 @@ bxe_tx_mq_start_locked(struct bxe_softc *sc, tx_count++; /* send a copy of the frame to any BPF listeners */ - if_etherbpfmtap(ifp, next); + ether_bpf_mtap_if(ifp, next); drbr_advance(ifp, tx_br); } diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index cec3ebfbf4bb..18e86ac025d4 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -1132,7 +1132,7 @@ dwc_txstart_locked(struct dwc_softc *sc) if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0); break; } - if_bpfmtap(ifp, m); + bpf_mtap_if(ifp, m); sc->tx_map_head = next_txidx(sc, sc->tx_map_head); sc->tx_mapcount++; ++enqueued; diff --git a/sys/dev/eqos/if_eqos.c b/sys/dev/eqos/if_eqos.c index d969c019a9a5..692629cc896f 100644 --- a/sys/dev/eqos/if_eqos.c +++ b/sys/dev/eqos/if_eqos.c @@ -597,7 +597,7 @@ eqos_start_locked(if_t ifp) if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0); break; } - if_bpfmtap(ifp, m); + bpf_mtap_if(ifp, m); pending++; } diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 8d695861cffc..d5c977782440 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -1377,7 +1377,7 @@ fxp_start_body(if_t ifp) /* * Pass packet to bpf if there is a listener. */ - if_bpfmtap(ifp, mb_head); + bpf_mtap_if(ifp, mb_head); } /* diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c index aedae79ddf80..901bdd5e1e6e 100644 --- a/sys/dev/nfe/if_nfe.c +++ b/sys/dev/nfe/if_nfe.c @@ -2621,7 +2621,7 @@ nfe_start_locked(if_t ifp) break; } enq++; - if_etherbpfmtap(ifp, m0); + ether_bpf_mtap_if(ifp, m0); } if (enq > 0) { diff --git a/sys/dev/ntb/if_ntb/if_ntb.c b/sys/dev/ntb/if_ntb/if_ntb.c index fb0c601f4222..b3707b8f769c 100644 --- a/sys/dev/ntb/if_ntb/if_ntb.c +++ b/sys/dev/ntb/if_ntb/if_ntb.c @@ -326,7 +326,7 @@ ntb_transmit_locked(struct ntb_net_queue *q) CTR0(KTR_NTB, "TX: ntb_transmit_locked"); while ((m = drbr_peek(ifp, q->br)) != NULL) { CTR1(KTR_NTB, "TX: start mbuf %p", m); - if_etherbpfmtap(ifp, m); + ether_bpf_mtap_if(ifp, m); len = m->m_pkthdr.len; mflags = m->m_flags; rc = ntb_transport_tx_enqueue(q->qp, m, m, len); diff --git a/sys/net/if.c b/sys/net/if.c index fd4db49a658d..7a78ebcfea05 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4909,18 +4909,6 @@ if_gethandle(u_char type) return (if_alloc(type)); } -void -if_bpfmtap(if_t ifp, struct mbuf *m) -{ - BPF_MTAP(ifp, m); -} - -void -if_etherbpfmtap(if_t ifp, struct mbuf *m) -{ - ETHER_BPF_MTAP(ifp, m); -} - void if_vlancap(if_t ifp) { diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 48a503df7ffe..ba37a98c96fb 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -629,8 +629,6 @@ int if_vlantrunkinuse(if_t ifp); caddr_t if_getlladdr(const if_t ifp); struct vnet *if_getvnet(const if_t ifp); void *if_gethandle(u_char); -void if_bpfmtap(if_t ifp, struct mbuf *m); -void if_etherbpfmtap(if_t ifp, struct mbuf *m); void if_vlancap(if_t ifp); int if_transmit(if_t ifp, struct mbuf *m); void if_init(if_t ifp, void *ctx); From nobody Fri Aug 25 16:52: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 4RXQxL1JbVz4qX4M; Fri, 25 Aug 2023 16:52: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 4RXQxL064Kz4tjk; Fri, 25 Aug 2023 16:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692982374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SNBUz7RYDGREEfN21vFM/GIMfADHlBi8Ay2fWSBhvNc=; b=slVQJBkNojgzxUbQ1hxBJ0rCYaPP73ewF1ptdAZcaHmm21QmY5BrADk9UExsbcviBgxU0Z hLj7X3TyQugfF/4ekbfA2HnsY7NJjXvm0LSp7+SwTQaVA/PhXbQ8p6otso6xyBykg9lNDn UMW7/xurTWY0Fl9woRSZwhc5o1zgv7JHQf6Ja37iv0F4IGwOfmAmb1G6jtX+MNGv4tiRHR wuKAjf4gE36J6qYXvSa534l5MTzFKcsQ0ascbpdYz52RpQYUQiw4EJVuMnvD9nY3Y1JgyI 6z2aYHcR0S0U2N1T91yxqdCjNHHaOIZMOGwEjDDhQ5NupYABB3K/9++pqveH/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692982374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SNBUz7RYDGREEfN21vFM/GIMfADHlBi8Ay2fWSBhvNc=; b=kEqkb/z6O4bIv0svFi8JZSjkkF0SogbM6rnAfFKehUdqB0k/3EJ+8DwZJjMYSMmelpSQDW 0ktxM/DWhkVcjH1oiVM0S0gDwdbZWEdIrwGcfNP+7h12LqxcPjUPzY+bd5WoSWJGA1gNru 4/6g/kPoJdr033RqqgTE08fQi0tE/xlKiEHv8dhmFQwWqbMM2k/RAysQKfhnGUN5wdTQd+ yi4q3+RXupkTgMjyAfLkYa8PsoPkAnUyj9GXveqzoOaeW/baY/WLhS7iG+4ztEZV8OHHhL vh4+kiLS/+MwOd12Cj7NYpN/Z6e6VS1TMDD7wEk7Ygn3M+wcmgUYMZpISR1Dgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692982374; a=rsa-sha256; cv=none; b=oGS1EEZ4o/W/cplV8GfiCR3MdP8n/q9SbFsitw2NqfDxG1M9wvpQregeLAGZFiyhBDT6Yp yGoWA6vfVrDwNud/bJPJSjmtLjiNRYPHhrjoIVN1IWjjMbFd+yZzIuop+G0hpQTosnKicg Qzz3A39z61dMPAMXxOsBm1NlXOUDkbxhQqn5DrjtDTzqNJgmQ3KyhRkES1s/yPav2C2Zwp pWJNhYXNUdaqVVm41ZXGTSX2VsUUGtA7rX/CLbFdZzetzq15RBATvzfCU5vWFgJCRo6TwI xDxcjvNpqJFj/ZWAjcuT27HgBlwYqf9+KZ5SwdU7/D5PogDtCGS8G0qzYQac1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXQxK6KFmz1FxX; Fri, 25 Aug 2023 16:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PGqr95032854; Fri, 25 Aug 2023 16:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PGqrOO032851; Fri, 25 Aug 2023 16:52:53 GMT (envelope-from git) Date: Fri, 25 Aug 2023 16:52:53 GMT Message-Id: <202308251652.37PGqrOO032851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: b820820ece09 - main - mac_ipacl: Use 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b820820ece099a73511d7daec407d78f38185a9b Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=b820820ece099a73511d7daec407d78f38185a9b commit b820820ece099a73511d7daec407d78f38185a9b Author: Justin Hibbits AuthorDate: 2023-08-25 16:44:17 +0000 Commit: Justin Hibbits CommitDate: 2023-08-25 16:50:39 +0000 mac_ipacl: Use IfAPI Use `if_t` instead of `struct ifnet *`, and if_name() accessor. Sponsored by: Juniper Networks, Inc. --- sys/security/mac_ipacl/mac_ipacl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/security/mac_ipacl/mac_ipacl.c b/sys/security/mac_ipacl/mac_ipacl.c index 5bcb9d652a13..bed77e7866f2 100644 --- a/sys/security/mac_ipacl/mac_ipacl.c +++ b/sys/security/mac_ipacl/mac_ipacl.c @@ -317,7 +317,7 @@ SYSCTL_PROC(_security_mac_ipacl, OID_AUTO, rules, static int rules_check(struct ucred *cred, - struct ipacl_addr *ip_addr, struct ifnet *ifp) + struct ipacl_addr *ip_addr, if_t ifp) { struct ip_rule *rule; int error; @@ -344,7 +344,7 @@ rules_check(struct ucred *cred, continue; if (strcmp(rule->if_name, "\0") && - strcmp(rule->if_name, ifp->if_xname)) + strcmp(rule->if_name, if_name(ifp))) continue; switch (rule->af) { @@ -397,7 +397,7 @@ rules_check(struct ucred *cred, #ifdef INET static int ipacl_ip4_check_jail(struct ucred *cred, - const struct in_addr *ia, struct ifnet *ifp) + const struct in_addr *ia, if_t ifp) { struct ipacl_addr ip4_addr; @@ -417,7 +417,7 @@ ipacl_ip4_check_jail(struct ucred *cred, #ifdef INET6 static int ipacl_ip6_check_jail(struct ucred *cred, - const struct in6_addr *ia6, struct ifnet *ifp) + const struct in6_addr *ia6, if_t ifp) { struct ipacl_addr ip6_addr; From nobody Fri Aug 25 17:33:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RXRqz1vVnz4qZXn; Fri, 25 Aug 2023 17:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RXRqz16Gpz3DBW; Fri, 25 Aug 2023 17:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692984799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6Me5OOHFCKwcmiZvE8HDzUrANJCfcd0nwOjwZWIUeE=; b=Jd+jK1mHmitsQeJEqhThGOv7b/TwQD0ds/CUUayzgKeEgYlwXJ7L51+DeuBIGzUTK64Z5B HN53RsuIP7Cl2WuF2BsRKxE+srWsI3rphBrGRTcAKfNOlXPGWG2+n9PAUr74YEw8ysBuDm pUN0GdbXoFfx9un6aQN5akke4RPGAAuGwiqj6fV896QnaIM8Z3OSBFe+bJRO4042HYTIDD 7H55MfU/AvYR2Bk8cNA1tJTCA3bSg1PbX1CELcP97VLQOc+EvkntYv2oHN1yPq5A7qTmc/ 2ehM+wD2FW3o6JfOLs0R8NYBdDl4ztgRryyjwzSrTygfpVWTNzZfKI1lJ9CT9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692984799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6Me5OOHFCKwcmiZvE8HDzUrANJCfcd0nwOjwZWIUeE=; b=sW3lhrlk1viDpZHeeWv6oor+jEzRfQm169Ke26sufx6Yd5DaXuOpGZaBnypjDoDod6NoPD 0S3gzQJXcsWZy8tuBxxxgUJzOwFqpSE6YnzSsTQs1wSIvh3V6RfHjOAiEky+yuO0nhIheb 1uPE4A16yJkfCA0m2tAol0ADJ4rosxwBSMoY/IkJXhsi2D6+75exQ3IEznuuUH6HbLmqOO +XMGDsLLk2mbFNfnPBvYrnpsqgrzwluIVjzK1b6dcs5EhNrUHLrgtC+6pRhJjabrG20mNC kRfTIsMqBvXttkjssKqk5BX3bcKrRH7FSnzxM4A4F1i3zm6m4M9dAQEaJZsT6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692984799; a=rsa-sha256; cv=none; b=cwP6oRY5mbwBHDzzpRy7dRQWJC4fv6j9mHJKksQG7CH/oqWLPTJzSGWV3pzHQRIw8LOeqC JIF5C9zCudYSsU2PV9FjuU4JuhwkTeOFLZW02orjdbCvoYieJCDWYV3r7kgWvNpXQKQkzG 7TYGDwtFBfJ7LVje0mCnwTvLRocWzx5TcNpy+XK9P7tKYtOn6krYKZ2ytE91f6DaqE5QQe +I2gPA8QvGpqUQP3pQ/c6KGvQQkLEXBl5JsMO8Wvefm3JgBrSCDBWfSLcMq0sJknHmB0Uw 6E+exFClfMBmP6QE2Vxewar30+gwx0xgfAvXC+QMyf4jvFdqeeZp6eqdwdPLFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXRqz0BDcz1H2V; Fri, 25 Aug 2023 17:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PHXI4e099343; Fri, 25 Aug 2023 17:33:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PHXIHV099340; Fri, 25 Aug 2023 17:33:18 GMT (envelope-from git) Date: Fri, 25 Aug 2023 17:33:18 GMT Message-Id: <202308251733.37PHXIHV099340@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: 24a81a968d21 - main - ifconfig: fix logical error in interface matching for '-l ether' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 24a81a968d21b3eef1a0a2d786859b274546bd34 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=24a81a968d21b3eef1a0a2d786859b274546bd34 commit 24a81a968d21b3eef1a0a2d786859b274546bd34 Author: Gleb Smirnoff AuthorDate: 2023-08-25 17:30:25 +0000 Commit: Gleb Smirnoff CommitDate: 2023-08-25 17:30:25 +0000 ifconfig: fix logical error in interface matching for '-l ether' This affects only ifconfig(8) compiled WITHOUT_NETLINK_SUPPORT, which is not the default. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D41584 Fixes: d1cd0344f7b7d81beda04c3cb8cfee99351c3eb8 --- sbin/ifconfig/ifconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index b26fbaf82776..1a7e5d07e601 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -768,7 +768,7 @@ match_afp(const struct afswtch *afp, int sa_family, const struct sockaddr_dl *sd return (true); /* special case for "ether" address family */ if (!strcmp(afp->af_name, "ether")) { - if (sdl == NULL && !match_ether(sdl)) + if (sdl == NULL || !match_ether(sdl)) return (false); return (true); } From nobody Fri Aug 25 17:33:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RXRr06tK4z4qZBq; Fri, 25 Aug 2023 17:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RXRr02XFhz3CXR; Fri, 25 Aug 2023 17:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692984800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f+Fkm9HagWTRNhF7wrJtdm18waYkpybjWiCG7F6cUl8=; b=jIb1RUv8mYfOLbV6Bqg3o3EQTcyy+NfHL8dhXgpJcdYPAL5NMKqOB/Zo6Bcw5KMdNllIws 3GDjYBnyEzJI2Jn2i2aBZy6MkZZu9pIe8ZG05YUxSFDLpdSPHK47qsrGtj6ls55sWEgIz6 KNqSR/6XsGpqR9aorElAW+Lc3TgFs/s1U7MZnpBchTibBx2pQBxMGw/p8v82p9DI2+Whzu P2Udc6jQ6QqcQ27gCtj9LT4hxXpG7rSE1q90FDDxxp4LBBn29bzIhJUf4ELneWrtg8oXXN WNitQSKvQvDYBXcfhQ6avtf8/+HCCt2WP8FKcoh9Jmvuy+rDoiJrNEj28tjPCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692984800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f+Fkm9HagWTRNhF7wrJtdm18waYkpybjWiCG7F6cUl8=; b=KM1+7cuwBjYNpnVfHKY7wOAnaJV/0vchwoJrjIUKX4OyVcfCJxjF9nvv5GBweqp7rVu4xd taJ1VvYjq6Ep8C+UgIK9darwAcc91zWBMHxcoDAi2o4qZ9Y48dhyYUGiEYFef2n03ku6uh Y2ba9fjUlsANbD/icDxuULs0XpDxojE6Z/kBbBum33AaOSy9uDpqHMzBUzWNz8PW4Q1eVU 8P29HjpO8D3vLFYKEQyeV2RjZh5x82Pt+CuFCv99DlCJbHYx3PZo24UbUSu/M2EqwHXTPQ Kd9itz30JygZFFZocwJuGoX245q/qJAr8MeXGYsqpLXz7gnlcLrj3zIpImG84g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692984800; a=rsa-sha256; cv=none; b=bwEwhpnUhxbs8AG7Cu0/az7ItmAcSlzEwKnPebmksR3+Fca0zKlZC0NeYkKBP193QxfdKf ox1HIhzmW8z5LVKHapG+2xB/2xZGSbDEM+aX/M19SVH2YP/NtYjw6BP8G3YBcyn2yL8M7v TGWRqeWzmHDTG5WCMy6PwYyRYuP+O26x18FI6dQvUBqSdh0aewzwVduwtDte7/fQRetTg1 ptBLiWKF28+FX5R68ZO8f9NGD7ZueonuUw4R7p/0iStsMcli9qk+qJW9AuLkk1i1Hik4Uq hdIuJuhuckFWgJmh/H4FA9GiQ9WBI4PZMHja8IhLc0oNpjonDRKwFJXUyZiM+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXRr017gGz1GtQ; Fri, 25 Aug 2023 17:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PHXKbI099390; Fri, 25 Aug 2023 17:33:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PHXKqw099386; Fri, 25 Aug 2023 17:33:20 GMT (envelope-from git) Date: Fri, 25 Aug 2023 17:33:20 GMT Message-Id: <202308251733.37PHXKqw099386@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: 31016aa0be6d - main - ifconfig: fix 'ifconfig -l ether' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 31016aa0be6dbf7556a91dda14cfe1ff0dcf933b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=31016aa0be6dbf7556a91dda14cfe1ff0dcf933b commit 31016aa0be6dbf7556a91dda14cfe1ff0dcf933b Author: Gleb Smirnoff AuthorDate: 2023-08-25 17:31:26 +0000 Commit: Gleb Smirnoff CommitDate: 2023-08-25 17:31:26 +0000 ifconfig: fix 'ifconfig -l ether' When matching interfaces for being Ethernet, use same trick that the link module does - pass if_type through convert_iftype(). That restores historicaly behaviour of listing lagg(4) ports. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D41585 --- sbin/ifconfig/af_link.c | 11 ----------- sbin/ifconfig/ifconfig.h | 2 ++ sbin/ifconfig/ifconfig_netlink.c | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sbin/ifconfig/af_link.c b/sbin/ifconfig/af_link.c index 17de87539d9a..2a53daeb7d01 100644 --- a/sbin/ifconfig/af_link.c +++ b/sbin/ifconfig/af_link.c @@ -165,17 +165,6 @@ pcp: } #else -static uint8_t -convert_iftype(uint8_t iftype) -{ - switch (iftype) { - case IFT_IEEE8023ADLAG: - return (IFT_ETHER); - case IFT_INFINIBANDLAG: - return (IFT_INFINIBAND); - } - return (iftype); -} static void link_status_nl(if_ctx *ctx, if_link_t *link, if_addr_t *ifa __unused) diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index 80e6b9bc2289..3303c4894ba7 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -38,6 +38,7 @@ #include #include +#include #define __constructor __attribute__((constructor)) @@ -279,6 +280,7 @@ struct afswtch *af_getbyfamily(int af); void af_other_status(if_ctx *ctx); void print_ifstatus(if_ctx *ctx); void print_metric(if_ctx *ctx); +ifType convert_iftype(ifType iftype); /* Netlink-related functions */ void list_interfaces_nl(struct ifconfig_args *args); diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c index 76dd99307f31..c3e8cd413409 100644 --- a/sbin/ifconfig/ifconfig_netlink.c +++ b/sbin/ifconfig/ifconfig_netlink.c @@ -224,6 +224,19 @@ if_nametoindex_nl(struct snl_state *ss, const char *ifname) return (link.ifi_index); } +ifType +convert_iftype(ifType iftype) +{ + switch (iftype) { + case IFT_IEEE8023ADLAG: + return (IFT_ETHER); + case IFT_INFINIBANDLAG: + return (IFT_INFINIBAND); + default: + return (iftype); + } +} + static void prepare_ifaddrs(struct snl_state *ss, struct ifmap *ifmap) { @@ -282,7 +295,7 @@ match_iface(struct ifconfig_args *args, struct iface *iface) struct sockaddr_dl sdl = { .sdl_len = sizeof(struct sockaddr_dl), .sdl_family = AF_LINK, - .sdl_type = link->ifi_type, + .sdl_type = convert_iftype(link->ifi_type), .sdl_alen = NLA_DATA_LEN(link->ifla_address), }; return (match_ether(&sdl)); From nobody Fri Aug 25 17:33: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 4RXRr13s6yz4qZS8; Fri, 25 Aug 2023 17:33: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 4RXRr139mrz3D8k; Fri, 25 Aug 2023 17:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692984801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wn7ZuNPSxBCIrL8HbFXzUnHGndI+cJeyVuqytfqD9iY=; b=LYHhZmePfKlPE+dzNovN6R14Q6YYGnQA25OCQWM8frTSYM6DD4Nh+aYQ0bxkx3DccifZOe mmly0yYmCYdqAe8A5Jjo8zAFXvUTqg/yfLGjvPBQMgb22A4CTud9wDz0e8Gl0L2iF9pkPt JwiG0MOvbySJHEIc7LsqqU6oRuwZRNrJ8ahEYGINqdkqP7BB0UFhxIRhGiGV64NqeRq7q2 ZBqWlkIPRngi1VMe0idAJ+dJTVPNXbDyEAgqy+hJE0jaUPDST+dxkJhwqibLyPwZXsQPRr 0D/jIc7bMZY0mK3mn1D4hWUTHg04oXPJE0L9U1GDiCXgynPzppCzlPcJ5f+NOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692984801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wn7ZuNPSxBCIrL8HbFXzUnHGndI+cJeyVuqytfqD9iY=; b=Ob1iQuR4U0MW5wjjDYUhB09FmVe2e31YmbC0fBdBiSeAB+KQbWYV8GuTkNjVr90uR/v0cI kyZxF6EPECxYTpRQpitk8HZX+hwn+D15veNyv32MobHo7qXL8dFehAli4JwSuGrqTFtoDq B4ZbyctZgZkUQh6z8QkPHbPkxDA65yifhf/KR0IOYWTZFkLWYsVWWyPkDweQLEdQHqnhfe ghE4W79nhwIGXUdtohcb3k6USsBtxR1XtEQRq5dczIRcoWQvPXg7OuCnJHQzkbd/lfriCK zaODknvoHxMmgQYVWVW4YaOIe/P3vCyAWan5V4mBq1hyvybVwU0E1GcHy0+wRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692984801; a=rsa-sha256; cv=none; b=Xkujt2lv57rrTKfQ96RcBRQqlP1Vgx6T07tCtL5nv0tPTg8NJ8fRmCjulK8vh/QxyNSy8F 8KLX6SkDp8m5YVe8c981wmCExc/xn8QQBUK6ixFJwvnWY99+OgWcP/Qz70WXmmPLgqTLwR U7cdCeNebMH5V+BwPjNKGn01PFoc/1x7khr7coAJ7CctMir4AbydZnl7Ti+ooT8BA9RsXs NxWfJZ85ktTJ7r4+5QCM7i8IDN4DJydpOmHZUum/RqHbFffnk+w+mZuuudgOWi0ia6kjef p5bxWmF/YghUbAixz2vgWRTjJLieJS7rwWcPu9FLggOQwiY3D5jEjMXrn9HLdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXRr11rzdz1GtR; Fri, 25 Aug 2023 17:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PHXLpl099432; Fri, 25 Aug 2023 17:33:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PHXLco099429; Fri, 25 Aug 2023 17:33:21 GMT (envelope-from git) Date: Fri, 25 Aug 2023 17:33:21 GMT Message-Id: <202308251733.37PHXLco099429@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: 6f3947be2aff - main - ifconfig: fix 'ifconfig -l link' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6f3947be2aff9350514b5a414104d0afaeb53cdf Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6f3947be2aff9350514b5a414104d0afaeb53cdf commit 6f3947be2aff9350514b5a414104d0afaeb53cdf Author: Gleb Smirnoff AuthorDate: 2023-08-25 17:31:55 +0000 Commit: Gleb Smirnoff CommitDate: 2023-08-25 17:31:55 +0000 ifconfig: fix 'ifconfig -l link' The rtnetlink(4) RTM_GETADDR does not list link level addresses, thus the correct match for interfaces that have a link level address should be based on what was returned by RTM_GETLINK. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D41586 --- sbin/ifconfig/ifconfig_netlink.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c index c3e8cd413409..a6f52ea2a7f0 100644 --- a/sbin/ifconfig/ifconfig_netlink.c +++ b/sbin/ifconfig/ifconfig_netlink.c @@ -299,7 +299,13 @@ match_iface(struct ifconfig_args *args, struct iface *iface) .sdl_alen = NLA_DATA_LEN(link->ifla_address), }; return (match_ether(&sdl)); - } + } else if (args->afp->af_af == AF_LINK) + /* + * The rtnetlink(4) RTM_GETADDR does not list link level + * addresses, so latter cycle won't match anything. Short + * circuit on RTM_GETLINK has provided us an address. + */ + return (link->ifla_address != NULL); for (struct ifa *ifa = iface->ifa; ifa != NULL; ifa = ifa->next) { if (args->afp->af_af == ifa->addr.ifa_family) From nobody Fri Aug 25 18:43: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 4RXTNy29xWz4qf7p; Fri, 25 Aug 2023 18:43: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 4RXTNy1hcdz3N1M; Fri, 25 Aug 2023 18:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692989010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2T3LCl4tFy5QwWJfZGDzHOQPgEAvSc9Gaby4zbSgEc8=; b=g2nJruvCsNioNRZA4EERBS4fRBcIIj6rjJG1R4jz3uOzRa+SuTzAJHwhRMef87rervl+R5 iQ+NBDdYA87iD8mF3+QWRaH9D2Zt5tatwd4J89WXNlZFBDZQHN21ui+jYuatLvVs9fU423 9XEmi69zebNirk4pAQ52rahhWH1YEWYq9KYA0rd5eA8dQsG6RadTzuros4IAcPGo/Gbbxv eyCqpFyx8C5LoJqqa+N8GHUrXWTQg5xNLyuosnZB/Qz2YExAduLgKH4xFDzl2ra7FykBf+ 3a1TRrKabKYtDqOj7neBMjf1TPsFS2ktYh9ZDffLGBUWrL6rYSUQJWL+IW9TWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692989010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2T3LCl4tFy5QwWJfZGDzHOQPgEAvSc9Gaby4zbSgEc8=; b=nXnwGBq7uCE6cPpP1xN72dWcg2Nirk1yuTD58j/XyvDoj0Pk76xZKYnb/xUArtkUL5j+pp Y7vZ3hNNhsafIIjIkoIx8iRocLJBoVtaqTsyBSRyny+q22D91aiqW5OAuuUayKd0KY769N 7dbjK68kE5YoozPSo5IWBK+zx+xKlyxcJOfVvqNx4tXDX8Vg2MHGq2xiOgOnZ9oPqJWYBI mGkQGotT//0DMe9yObUiTOncv+swMbvF5fnxoGz/CJmsWaWlAgU9mA03MtLI8JWhV+UTcN /mOD/YwCdEVkLZEdVXpqwe8TdODO1UjGMGsURRJhVao9nahvzbz3iTl4v5stkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692989010; a=rsa-sha256; cv=none; b=lVg+wRZFVZ4KC+WDpdwQGirSy2bdzoQYQvCKfB3CxrGv1LokqhPiPd2hGAF5cbSD6wSC+p sBHSPfS4jBq3BU8movdS0bwoMFmtWtehQs8iTXwrQro0lvqzccrtx4++7l1Q+HoK2NslVr 0uQ+9eauxTJX8d7Q2MLJMZ2OEkSPi+svSs9Ka0ZyoSWl+EzsXxZh2+PNXgN66WDH00cTnY dnWIjcgx0VNkoCaZu6+JQPGw0FXmo2Rjef2WaXAazYA9YEJYWShle+npG1lUT1iQlJ6fLH 34mHhEevti9E8+NmbKqinFxDmXaPB9L4apAEP3lp7x4J5Rv4yiJKgzaz/SrfVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXTNy0m3Jz1JC4; Fri, 25 Aug 2023 18:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PIhUJl015240; Fri, 25 Aug 2023 18:43:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PIhUtc015238; Fri, 25 Aug 2023 18:43:30 GMT (envelope-from git) Date: Fri, 25 Aug 2023 18:43:30 GMT Message-Id: <202308251843.37PIhUtc015238@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: 7be29291845a - stable/14 - UPDATING: fix a vestigial reference to -CURRENT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 7be29291845aecb5567715dca4d707af1bb6721b Auto-Submitted: auto-generated The branch stable/14 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=7be29291845aecb5567715dca4d707af1bb6721b commit 7be29291845aecb5567715dca4d707af1bb6721b Author: Glen Barber AuthorDate: 2023-08-25 18:42:17 +0000 Commit: Glen Barber CommitDate: 2023-08-25 18:42:17 +0000 UPDATING: fix a vestigial reference to -CURRENT This was missed in a previous commit. Approved by: re (implicit) Submitted by: pstef Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- UPDATING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index deadbbc555d5..ee096e9a6fa6 100644 --- a/UPDATING +++ b/UPDATING @@ -1,4 +1,4 @@ -Updating Information for users of FreeBSD-CURRENT. +Updating Information for users of FreeBSD stable/14. This file is maintained and copyrighted by M. Warner Losh . See end of file for further details. For commonly done items, please see the From nobody Fri Aug 25 19:00: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 4RXTmx1RNBz4qg3G; Fri, 25 Aug 2023 19:00: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 4RXTmx0v3Yz3PHM; Fri, 25 Aug 2023 19:00:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692990049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=koRMs4Biqki9bpHlHeT+HXR0zhq6k9k8/HEjsj2IjTo=; b=B5GYILUh0yloGTJlX9rhRe/fG6VODSSNdkyEJMXAeyigNsBKfV3ny03UDqAELWawTubHi0 lFy5nQ0DwQjKeHTh4yI8QuU/DhFM57AOJdUiXFmakF4sGG2KXMbi92sV7wOE4KNo6kXNeZ J1WxBF/DBnESY7+VXvP0P912DzrC52WEkbCLxZ5apqwtyEuxeoB+54mU6lZNvQLwdIyUk0 6JNcQ9+sDZkibzwN26h5c4mttrK5jAnuaWRMoFro4HY9d2mkzXegQGEv7LY6vme0H7APDm dFXXsgUrkDNO9yPhWNpnq3MzIcTQl9NXv534Fy7xg1jLneKNOMUP9w0qoO19OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692990049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=koRMs4Biqki9bpHlHeT+HXR0zhq6k9k8/HEjsj2IjTo=; b=u2Oi3/L93ZjpoZEnY9JRMZqmx1N0/IDosCff1Lgmytrxhj3HH+abBnWJJWqydFEju0XD+k rsQr7qKx+tB1SYyhZv61Svv+cMn8/7phQnMaaRkVgeZTdSMYYOAj/HOaL+xojnoT3rKGk6 szbdBaR0teoK8hhYjTFq6Qzcm7Tr6xOani+Y6kf0hY0qkOAhs3CUpcJ8JO06/xe2tswk7M ljLG4gKvFmAMxJdYU9Uqf++WHTedPryG//dldJBWCtcMQKszl2wluIo2wIOKl3MBAnYokH vM7Ys92koYsOUCWA+BLwiuY1XYRTEHlCPLm3Ea+bBJizJt6WEWzLIcohOmJaHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692990049; a=rsa-sha256; cv=none; b=iN/Ff2A48VXnrPDwaB72L6o8mjAfgAcptvKmLGLfEd9EeaOKv7SIm/DgCEWUVYCMaY1QuU LQhytSxPXCPfR+djaMxpVrQKcvARqlIeDlmmJgOTMQHBUWIRFVtqtKevNC15IXRBb3KUX3 FxwF3+8o/AwuOil2ba7VcOueign+rDs9Xy7NXfWQDqJJXCqNN9UR2Xlcgowhgy4u2+ckSX CoAklXQDvwrpXmTEhCmxp+5XUDoe7c/mwSyH0EWA55tFXwIf+YDzjTmpQSW+bDLNsJwNOj aiyG30Tjh5DwK4BaBxOb08WJBCedjAVZ4UpsZyFjKDsrpnfkX3OCkdO2rm0v9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXTmw73bCz1Jjk; Fri, 25 Aug 2023 19:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PJ0me6042677; Fri, 25 Aug 2023 19:00:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PJ0mBx042674; Fri, 25 Aug 2023 19:00:48 GMT (envelope-from git) Date: Fri, 25 Aug 2023 19:00:48 GMT Message-Id: <202308251900.37PJ0mBx042674@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: 247e8662d2c0 - main - arm unwind: Reject unaligned stack pointers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 247e8662d2c080c27937ec4d62e80b2358e8c74f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=247e8662d2c080c27937ec4d62e80b2358e8c74f commit 247e8662d2c080c27937ec4d62e80b2358e8c74f Author: John Baldwin AuthorDate: 2023-08-25 19:00:37 +0000 Commit: John Baldwin CommitDate: 2023-08-25 19:00:37 +0000 arm unwind: Reject unaligned stack pointers Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D41533 --- sys/arm/arm/unwind.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/arm/arm/unwind.c b/sys/arm/arm/unwind.c index cdc9ef225ee7..591bae3dfc26 100644 --- a/sys/arm/arm/unwind.c +++ b/sys/arm/arm/unwind.c @@ -398,6 +398,9 @@ unwind_exec_insn(struct unwind_state *state) if (mask == 0) return 1; + if (!__is_aligned(vsp, sizeof(register_t))) + return 1; + /* Update SP */ update_vsp = 1; @@ -430,6 +433,9 @@ unwind_exec_insn(struct unwind_state *state) /* Read how many registers to load */ count = insn & INSN_POP_COUNT_MASK; + if (!__is_aligned(vsp, sizeof(register_t))) + return 1; + /* Update sp */ update_vsp = 1; @@ -460,6 +466,9 @@ unwind_exec_insn(struct unwind_state *state) if (mask == 0 || (mask & 0xf0) != 0) return 1; + if (!__is_aligned(vsp, sizeof(register_t))) + return 1; + /* Update SP */ update_vsp = 1; From nobody Fri Aug 25 19:23: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 4RXVGg2X0Nz4qhZb; Fri, 25 Aug 2023 19:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RXVGg0KZ6z3RdX; Fri, 25 Aug 2023 19:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692991387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S72LbTZpe+vjDUwnP0mkcsytnvuDIo6/C+mcGmv+9T8=; b=rnBK9pcoJ8kxHWO6gEXvHyL2+sY56OYdhmfG66XPokinXVAQgl1QFmNQnzVj3WmgNcGd/X wcGHebj7QwaTRAO3sLHBEucdGk358ECuqyKjcqj/vIOmVP2RaCji0OudD2+TVlrv3Y/CNq A1brFEJTRRIQiJNPHkxH9c6+UNqt0841F1F//JPHZb2vweadYauRycQhDtEZHzK85T7kCK NE+1d9V1pjmC3QSTjD5Ya3FN8/eRdavVXaIRsVVIwliPs+g+vC0lYFtFKeri6V6n32ZOg6 cVYFfJ60D1xogv9838TQ20pDJcB22v4fvRE7JqHyJfpgr0QNEAi4QEiTQFdB8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692991387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S72LbTZpe+vjDUwnP0mkcsytnvuDIo6/C+mcGmv+9T8=; b=BJpifu1JSgrDaQbgunP3MbeL36moVUrrXi9L0AE15JdzwwSBHczWZ149UkTaE8D95B+Z4s XVWp3yhbAjRLIoP7lmgzmkGWl6gOJa7r1q+HCwX3OkmGmC5pYUDq1Zjw/HzO+FvW4NRim4 e9uBM66eXHZyOd4BOMcypEL0H6N3v+/beLuMJ5aliF4wmkeQrbdO2jMIUMIOAhdl91ydfG T7rlPaTzNTI3fqZ9cGfQfLUpGzUFlNqS7PuJKHWd3jw687tVYPrEba1cL6epi7d5/cfFmz aU4g4IRVkLzpp+3EQlqr0yk8ysL8zB0X/QZjNpPd4Y5UE5ZdaCL9EFQaDRjGBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692991387; a=rsa-sha256; cv=none; b=gDfqg47eN2wu+pKhrrn6B73r9TZntITng5xEf3hz7Z59pTnzJH6pdFvhLRrAh3q6uHIqUz RyT3tyu8cPIJg5RMo5poCg3PiBmdmpBeSDpbxk0h11oT8ZMSqePIwW3SOp4VF4yczXifw5 TE+miJm7KJ2e0RVPcZkwqHJhI4zvia6pUClSPRLOe0SaAH10VFnLOEfLT1IG5IV+daBds9 uukMHDyUsT2axKwoH4osIz1aisxT/4qFTrLli3VvKQDJuC/n75maNgE0R5l12y90m8BXKc EmoTsoGVD0CBVNLBrvQTKkbq9PcLxNP5ya8awQmtvTMPNwhG8FbSHaxH/NbVsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXVGf6Vjlz1KRk; Fri, 25 Aug 2023 19:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PJN625082301; Fri, 25 Aug 2023 19:23:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PJN6EM082298; Fri, 25 Aug 2023 19:23:06 GMT (envelope-from git) Date: Fri, 25 Aug 2023 19:23:06 GMT Message-Id: <202308251923.37PJN6EM082298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 3d8ef251aa9d - main - lib/libc/amd64/string/strchrnul.S: fix edge case in scalar 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: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d8ef251aa9dceabd57f7821a0e6749d35317db3 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=3d8ef251aa9dceabd57f7821a0e6749d35317db3 commit 3d8ef251aa9dceabd57f7821a0e6749d35317db3 Author: Robert Clausecker AuthorDate: 2023-08-25 16:22:22 +0000 Commit: Robert Clausecker CommitDate: 2023-08-25 19:21:54 +0000 lib/libc/amd64/string/strchrnul.S: fix edge case in scalar code When the buffer is immediately preceeded by the character we are looking for and begins with one higher than that character, and the buffer is misaligned, a match was errorneously detected in the first character. Fix this by changing the way we prevent matches before the buffer from being detected: instead of removing the corresponding bit from the 0x80..80 mask, set the LSB of bytes before the buffer after xoring with the character we look for. The bug only affects amd64 with ARCHLEVEL=scalar (cf. simd(7)). The change comes at a 2% performance impact for short strings if ARCHLEVEL is set to scalar. The default configuration is not affected. os: FreeBSD arch: amd64 cpu: 11th Gen Intel(R) Core(TM) i7-1165G7 @ 2.80GHz │ strchrnul.scalar.0.out │ strchrnul.scalar.2.out │ │ sec/op │ sec/op vs base │ Short 57.89µ ± 2% 59.08µ ± 1% +2.07% (p=0.030 n=20) Mid 19.24µ ± 0% 19.73µ ± 0% +2.53% (p=0.000 n=20) Long 11.03µ ± 0% 11.03µ ± 0% ~ (p=0.547 n=20) geomean 23.07µ 23.43µ +1.53% │ strchrnul.scalar.0.out │ strchrnul.scalar.2.out │ │ B/s │ B/s vs base │ Short 2.011Gi ± 2% 1.970Gi ± 1% -2.02% (p=0.030 n=20) Mid 6.049Gi ± 0% 5.900Gi ± 0% -2.47% (p=0.000 n=20) Long 10.56Gi ± 0% 10.56Gi ± 0% ~ (p=0.547 n=20) geomean 5.045Gi 4.969Gi -1.50% MFC to: stable/14 MFC after: 3 days Approved by: mjg (blanket, via IRC) Sponsored by: The FreeBSD Foundation --- lib/libc/amd64/string/strchrnul.S | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/libc/amd64/string/strchrnul.S b/lib/libc/amd64/string/strchrnul.S index 9aa9591b07ca..0e70b02311d7 100644 --- a/lib/libc/amd64/string/strchrnul.S +++ b/lib/libc/amd64/string/strchrnul.S @@ -52,22 +52,25 @@ ARCHENTRY(__strchrnul, scalar) movabs $0x0101010101010101, %r8 mov (%rdi), %rax # load first word imul %r8, %rsi # replicate char 8 times - movabs $0x8080808080808080, %r9 /* * Unaligned input: align to 8 bytes. Then proceed the same - * way as with aligned input, but ignore matches before the - * beginning of the string. This is achieved by shifting r9 - * into r10 to have 0x00 bytes before the string begins. + * way as with aligned input, but prevent matches before the + * beginning of the string. This is achieved by oring 0x01 + * into each byte of the buffer before the string */ shl $3, %ecx - mov %r9, %r10 + mov %r8, %r10 add $8, %rdi - shl %cl, %r10 # 0x80 where the string is + shl %cl, %r10 # 0x01 where the string is + xor %r8, %r10 # 0x01 where it is not neg %r8 # negate 01..01 so we can use lea + movabs $0x8080808080808080, %r9 mov %rsi, %rcx xor %rax, %rcx # str ^ c + or %r10, %rax # str without NUL bytes before it + or %r10, %rcx # (str ^ c) without matches before it lea (%rax, %r8, 1), %rdx # str - 0x01..01 lea (%rcx, %r8, 1), %r11 # (str ^ c) - 0x01..01 not %rax # ~str @@ -75,7 +78,7 @@ ARCHENTRY(__strchrnul, scalar) and %rdx, %rax # (str - 0x01..01) & ~str and %r11, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) or %rcx, %rax # matches for both - and %r10, %rax # not including junk bytes or bytes before the string + and %r9, %rax # not including junk bytes jnz 1f /* main loop unrolled twice */ From nobody Fri Aug 25 19:34: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 4RXVX22wVfz4qhh1; Fri, 25 Aug 2023 19:34: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 4RXVX22Sqjz3Sx5; Fri, 25 Aug 2023 19:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692992082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pbWJotOYEwqIhmI9GKFjNjEBNmU6+4814YRNQN7GoKw=; b=iJxpixjFFgWaImwUkjH7+hkyTW7DMWXGwohQDHJmtTk4WYA8ZXd6DYNEqMfmjNFc2YyaCA lZ29tVj5q+n1pxhd7JVtusn0JdtN6ICgYYrqaqAfruePi6rgEIM9N2sK6rW8dCxLBF7sQq oZZb4DljibH2c/FERZUglsJ7xEJQT8HL+3PTx/ME0qXrx1oVUlq8ZUav4uVTPzE4rBfDQd KD5JYu7Mq2W+EziMUsDUSERl2JxyeWlHzv8T4RQf0ZYvhMJhy7SWiCcVEpjrQHpN9/SOah bN7/hRF/Tp1myeX/XMsGAAoQcsxXkp/gt8ubtyOyyMBhjB0LVpQla2El6VHT/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692992082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pbWJotOYEwqIhmI9GKFjNjEBNmU6+4814YRNQN7GoKw=; b=Wq1VNQip7Y0yEFLi4ZmXo4FBMbT8by47hyJDLOiJTR3OObaPdVt5HADq/zvCU8w5hG1RB/ qAdorhuzgOEGLbjeMeWNL34gsTXluszWqjddpFdoT2jg6R2dUfQQNIK2IgY55k3m+loRvX 9ggKPGXZbHNoxBTXBdhuLi98Ca9BHukifp5DpZx5zaUHkltkFzdx/FZWuSqFWL7e2/X9Rw sG63emxrmTxfydSaeIJlyBqm1MvtQw4toha74vWki92LfVNLugMfyXSAza0WPMR41H8rqR 3oKjWQh0E42KBvqPgx/arDYbWvi9jSG5WH1YG1d6x4zJhwUHgmHaVtYXHvuvJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692992082; a=rsa-sha256; cv=none; b=NuhhqLGkAKhZkm7cnTyYvmeByARrfJZdBsk++k2fe4Bc7bgEs6cJ9bvaDSStLErjSb0Tiu T/uyO4Zr7+qMtgywkXeGK+nh34cnm+DC64iA59zMwuoc4RRw5mFZ3nMdatvoaporAnT10A ytVbN03dKSyodk3O4wk4o22lAac+paTTuSexIo4qQzfv99fTCSXRK207hKw2BiLJcBVdRN YrzY6dTOtSFdJZ3/52Gu3q7J4v3LmVYfIrGO8qKb42xLF9+JZurAfjphO5QQg4xCVY9QJM UO0TB6N1qcctX2NO8BKSJK/YXQBPYkYsOEl8bj8PFOxJON7FazJfe7hg5jy3PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXVX21XdKz1K7H; Fri, 25 Aug 2023 19:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PJYgEN099527; Fri, 25 Aug 2023 19:34:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PJYgrQ099525; Fri, 25 Aug 2023 19:34:42 GMT (envelope-from git) Date: Fri, 25 Aug 2023 19:34:42 GMT Message-Id: <202308251934.37PJYgrQ099525@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: 8173fa60ddb7 - main - efirt: Move comment about fpu_kern_enter to where it is called List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 8173fa60ddb7e9a805dec9fef7bf07e74ae4144d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8173fa60ddb7e9a805dec9fef7bf07e74ae4144d commit 8173fa60ddb7e9a805dec9fef7bf07e74ae4144d Author: John Baldwin AuthorDate: 2023-08-25 19:33:00 +0000 Commit: John Baldwin CommitDate: 2023-08-25 19:33:00 +0000 efirt: Move comment about fpu_kern_enter to where it is called Reviewed by: imp, kib, andrew, markj Differential Revision: https://reviews.freebsd.org/D41576 --- sys/amd64/amd64/efirt_machdep.c | 5 ----- sys/dev/efidev/efirt.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/efirt_machdep.c b/sys/amd64/amd64/efirt_machdep.c index 419f27a236bf..22d8cf963880 100644 --- a/sys/amd64/amd64/efirt_machdep.c +++ b/sys/amd64/amd64/efirt_machdep.c @@ -280,11 +280,6 @@ fail: * reason to bother with the virtual map, and no need to add a * complexity into loader. * - * The fpu_kern_enter() call allows firmware to use FPU, as mandated - * by the specification. In particular, CR0.TS bit is cleared. Also - * it enters critical section, giving us neccessary protection against - * context switch. - * * There is no need to disable interrupts around the change of %cr3, * the kernel mappings are correct, while we only grabbed the * userspace portion of VA. Interrupts handlers must not access diff --git a/sys/dev/efidev/efirt.c b/sys/dev/efidev/efirt.c index 535a6caa75bd..2d45b4d6ac66 100644 --- a/sys/dev/efidev/efirt.c +++ b/sys/dev/efidev/efirt.c @@ -285,6 +285,11 @@ rt_ok(void) return (0); } +/* + * The fpu_kern_enter() call in allows firmware to use FPU, as + * mandated by the specification. It also enters a critical section, + * giving us neccessary protection against context switches. + */ static int efi_enter(void) { From nobody Fri Aug 25 19:34: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 4RXVX349szz4qgYb; Fri, 25 Aug 2023 19:34: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 4RXVX33VH7z3SpR; Fri, 25 Aug 2023 19:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692992083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vSTv9JrdPj0NSkd4kT3dl/KTBL6xBhqoRgWcyZK2dBU=; b=PLrQQhy3po78oHsBeFxoVEtsl6bK0dP5QGIxymVzb5EyNVyLRY1AjooYNibjhhdQKKyBOY Np+iCGBGx9XUptX+WQySZrWZQZBzcOJX4mYS23nIvuZDTA3JlA/BCKRCnWK6S99WSyOQWo 4Y+zdMHHj5ImiO8oNGKgvZF3bFcO2p07yBkhcmdHS8fVRgUgdtAQNhpPcESMWzwv1WFeCF M+VbaRF7gp2YbkJguXcMPhTvIHm2GKpp3upJnAsGdaeunCBCYF0D84vfod3v4ME+s9Sj15 yqyVL/Dir07yhAILinFF7Oxzzd9RYTyCdb0JZu8bx67i+LM1ynEvhwYfiQJMoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692992083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vSTv9JrdPj0NSkd4kT3dl/KTBL6xBhqoRgWcyZK2dBU=; b=j5ffAVzyEE9UIROcNRLI+4WQg/LcaO/G9lIC9kk+K3m/JmmqZdb3ua85d/BYj+JHKBYuWe dyfQ/8vKFPQHJDRhYsgKNHtS5Hijd3BoYFaCvFWpeZnugY93el4mWvSUxEihGGBSinm3D0 ry4FAJvlw4Ikmn/Ei/C0xEhUyt0uZ6UVB0BkczFc4JEhXrhaYxLt4H2euWPjdngG56Unes 3hMa1B/Pzcul9k6qA8i3Zr6Z1BpRO/2VSsN+A1VZyVcSM3KkaedDoi5dj0dxjMZrbfqZPf /e2W2SEQy5Be6REqI/jshbuPAJWcUmaL/h35V/7ly6p/gmr9PiTavTLOgG9NKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692992083; a=rsa-sha256; cv=none; b=W/BqVh2Q6DA8qW8c6E/wqawqkwkFeb7R8pe4Adugj4wQRiG5WaEM+P7sE+851WJ22xDkgF nxZbO1c4/80zmuvf1St4DTXV4z5XAqno4jNkSPROMnhV+JV3CkiPygpiNaG7G1j9MGvRDR Y5wrjstghPxS7WfNYkoUhd1WSY/v3UEkldreDLNjVUTKwTK7qvUJdmz56hmK9WnJg1gtYR QlnW0eUPU5UabC/d1DkyWdKE8JtUerjTZsb6XTJXFKZv72NxTSIGWtIZOAbvypR6OsmVQh tNeUiQPenSpVpyfdj6XR+QQsHIBWJBd4ssE4/mJzjsEnGbw9C2+P2EkHS0ExpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXVX32Wkbz1KtZ; Fri, 25 Aug 2023 19:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PJYhR6099569; Fri, 25 Aug 2023 19:34:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PJYh3I099566; Fri, 25 Aug 2023 19:34:43 GMT (envelope-from git) Date: Fri, 25 Aug 2023 19:34:43 GMT Message-Id: <202308251934.37PJYh3I099566@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: 3b0e353fe642 - main - padlock: Switch to using FPU_KERN_NOCTX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3b0e353fe64221b6fbb335348b4a54d12de95243 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3b0e353fe64221b6fbb335348b4a54d12de95243 commit 3b0e353fe64221b6fbb335348b4a54d12de95243 Author: John Baldwin AuthorDate: 2023-08-25 19:34:05 +0000 Commit: John Baldwin CommitDate: 2023-08-25 19:34:05 +0000 padlock: Switch to using FPU_KERN_NOCTX Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D41582 --- sys/crypto/via/padlock.c | 23 +++++++++-------------- sys/crypto/via/padlock.h | 3 --- sys/crypto/via/padlock_cipher.c | 5 +++-- sys/crypto/via/padlock_hash.c | 5 +++-- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/sys/crypto/via/padlock.c b/sys/crypto/via/padlock.c index 314beffbe2f5..b8dae256dbf4 100644 --- a/sys/crypto/via/padlock.c +++ b/sys/crypto/via/padlock.c @@ -36,6 +36,7 @@ #if defined(__amd64__) || defined(__i386__) #include #include +#include #include #include #endif @@ -62,8 +63,7 @@ static int padlock_probesession(device_t, const struct crypto_session_params *); static int padlock_newsession(device_t, crypto_session_t cses, const struct crypto_session_params *); static void padlock_freesession(device_t, crypto_session_t cses); -static void padlock_freesession_one(struct padlock_softc *sc, - struct padlock_session *ses); +static void padlock_freesession_one(struct padlock_session *ses); static int padlock_process(device_t, struct cryptop *crp, int hint __unused); MALLOC_DEFINE(M_PADLOCK, "padlock_data", "PadLock Data"); @@ -177,28 +177,25 @@ static int padlock_newsession(device_t dev, crypto_session_t cses, const struct crypto_session_params *csp) { - struct padlock_softc *sc = device_get_softc(dev); - struct padlock_session *ses = NULL; + struct padlock_session *ses; struct thread *td; int error; ses = crypto_get_driver_session(cses); - ses->ses_fpu_ctx = fpu_kern_alloc_ctx(FPU_KERN_NORMAL); error = padlock_cipher_setup(ses, csp); if (error != 0) { - padlock_freesession_one(sc, ses); + padlock_freesession_one(ses); return (error); } if (csp->csp_mode == CSP_MODE_ETA) { td = curthread; - fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL | - FPU_KERN_KTHR); + fpu_kern_enter(td, NULL, FPU_KERN_NORMAL | FPU_KERN_NOCTX); error = padlock_hash_setup(ses, csp); - fpu_kern_leave(td, ses->ses_fpu_ctx); + fpu_kern_leave(td, NULL); if (error != 0) { - padlock_freesession_one(sc, ses); + padlock_freesession_one(ses); return (error); } } @@ -207,21 +204,19 @@ padlock_newsession(device_t dev, crypto_session_t cses, } static void -padlock_freesession_one(struct padlock_softc *sc, struct padlock_session *ses) +padlock_freesession_one(struct padlock_session *ses) { padlock_hash_free(ses); - fpu_kern_free_ctx(ses->ses_fpu_ctx); } static void padlock_freesession(device_t dev, crypto_session_t cses) { - struct padlock_softc *sc = device_get_softc(dev); struct padlock_session *ses; ses = crypto_get_driver_session(cses); - padlock_freesession_one(sc, ses); + padlock_freesession_one(ses); } static int diff --git a/sys/crypto/via/padlock.h b/sys/crypto/via/padlock.h index 93ee9ab9c8b3..162d281506e2 100644 --- a/sys/crypto/via/padlock.h +++ b/sys/crypto/via/padlock.h @@ -30,8 +30,6 @@ #include #include -#include - union padlock_cw { uint64_t raw; struct { @@ -66,7 +64,6 @@ struct padlock_session { uint8_t *ses_ictx; uint8_t *ses_octx; int ses_mlen; - struct fpu_kern_ctx *ses_fpu_ctx; }; #define PADLOCK_ALIGN(p) (void *)(roundup2((uintptr_t)(p), 16)) diff --git a/sys/crypto/via/padlock_cipher.c b/sys/crypto/via/padlock_cipher.c index 253a84875626..136954870ae3 100644 --- a/sys/crypto/via/padlock_cipher.c +++ b/sys/crypto/via/padlock_cipher.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -221,10 +222,10 @@ padlock_cipher_process(struct padlock_session *ses, struct cryptop *crp, } td = curthread; - fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL | FPU_KERN_KTHR); + fpu_kern_enter(td, NULL, FPU_KERN_NORMAL | FPU_KERN_NOCTX); padlock_cbc(abuf, abuf, crp->crp_payload_length / AES_BLOCK_LEN, key, cw, iv); - fpu_kern_leave(td, ses->ses_fpu_ctx); + fpu_kern_leave(td, NULL); if (allocated) { crypto_copyback(crp, crp->crp_payload_start, diff --git a/sys/crypto/via/padlock_hash.c b/sys/crypto/via/padlock_hash.c index 706452c45a3e..d3cf46e10c5f 100644 --- a/sys/crypto/via/padlock_hash.c +++ b/sys/crypto/via/padlock_hash.c @@ -36,6 +36,7 @@ #if defined(__amd64__) || defined(__i386__) #include #include +#include #include #include #endif @@ -392,13 +393,13 @@ padlock_hash_process(struct padlock_session *ses, struct cryptop *crp, int error; td = curthread; - fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL | FPU_KERN_KTHR); + fpu_kern_enter(td, NULL, FPU_KERN_NORMAL | FPU_KERN_NOCTX); if (crp->crp_auth_key != NULL) padlock_hash_key_setup(ses, crp->crp_auth_key, csp->csp_auth_klen); error = padlock_authcompute(ses, crp); - fpu_kern_leave(td, ses->ses_fpu_ctx); + fpu_kern_leave(td, NULL); return (error); } From nobody Fri Aug 25 19:34: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 4RXVX45Dx7z4qhm0; Fri, 25 Aug 2023 19:34: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 4RXVX44c1kz3Sw5; Fri, 25 Aug 2023 19:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692992084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VAn/kaw9DsUhNqR3+7oiR4CuGjOPkeDCTxR8TU9WM+c=; b=EZTb7/tV0hO5/pb0fdPNzVW6GR2UbPqEQeu6QyzxAPRbw83OtLJ5Lbz2UhVtvQlf3RyaX6 qov8JbuWHI9n1qi5ggEZaRATnWf7aTjV9cZ28WAxXVb5sof7Wnji3UQss3SN0Hf8/VCJnY PUAV8iAFQ6e2feRI749H7Uzr+0sRy6o29vcgEUAbTSM/vd3MOqP75t3VWqs+YvV5F12znt Ddpbr8KAs+Jtib2dM/xJEOKLNk2GWpkSHJUMQERwDLQDvDRqUY9PLFllMgfvCGYhnDoUm/ Q7PhiEy5bHPPr/yihDLNW3cc1m51ZgUENJ5fJBnmNh3cEiV1almnf/VnCBzq4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692992084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VAn/kaw9DsUhNqR3+7oiR4CuGjOPkeDCTxR8TU9WM+c=; b=ngEqQEAJsTKBewJ13EhfRvIRw/8sMQ8egMhZsvex3R54WmQwFWNzLlMDvIM6d4elEfyz9i CzGftA78lFW7mQzZUhq1agHAr4vPTq93PgsoWrhaMrONYr12V7Eue6et82PoBVY6KXzsAx RX/WQ/A3AMIceDIt2z/mbrUEWwveuEPvDWDyBDFqXfyrIT3M2pH0s1m+tsxBonxCtLkGhT crjym0ZmmSUEq55mCUKl2grfiHmRBtmgi6J/ZkSczP9V5/jaGPWpgTo2/A+luava9ZEfP9 pbPehgDPdc341Su4uNKl0vfZM8CFVjjRoZD3O/beZXS4Stnm5WP4fg6xDHEbNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692992084; a=rsa-sha256; cv=none; b=YeLuoYQ3i14sN6XRJTMnDLEFP7IZ29h8YXWj6+jMabn3VYHBjPkGd8UgKEBgg0VamDtIkT Bq1+YPqnRuLIwTdxebo6cJt/I88seqMjHKGgWpVSVRT06PrfyKOcZ3mqhY4ooHzPQbABZL R8Mu8QpUfFQ7vNwBEdBUsxBA8+nRglI3p5sk1Gk/ufK9/sCUXpITjX4H2HEfMrY+lk/0am 0RJBWTDsm3Q2A2frecSXIR7ErNv1N84ByEB9JNTgH88bz/edhhhvjlzMydzY37cKmRUisq PlvL5B5ZlOji6l0ARa6mtV7rW3p1vl3Ha0a3P5U79Hdlf3q6xLDQCvdd9J0NSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXVX43Y1Vz1KWH; Fri, 25 Aug 2023 19:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PJYi2d099615; Fri, 25 Aug 2023 19:34:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PJYifX099612; Fri, 25 Aug 2023 19:34:44 GMT (envelope-from git) Date: Fri, 25 Aug 2023 19:34:44 GMT Message-Id: <202308251934.37PJYifX099612@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: 7aec088cbce8 - main - nehemiah RNG: Switch to using FPU_KERN_NOCTX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 7aec088cbce8381bd5bf730419b8fdcddf43b08d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7aec088cbce8381bd5bf730419b8fdcddf43b08d commit 7aec088cbce8381bd5bf730419b8fdcddf43b08d Author: John Baldwin AuthorDate: 2023-08-25 19:34:16 +0000 Commit: John Baldwin CommitDate: 2023-08-25 19:34:16 +0000 nehemiah RNG: Switch to using FPU_KERN_NOCTX Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D41583 --- sys/dev/random/nehemiah.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/sys/dev/random/nehemiah.c b/sys/dev/random/nehemiah.c index 09c8c32c6d39..e01fdb952108 100644 --- a/sys/dev/random/nehemiah.c +++ b/sys/dev/random/nehemiah.c @@ -43,8 +43,6 @@ #include -static void random_nehemiah_init(void); -static void random_nehemiah_deinit(void); static u_int random_nehemiah_read(void *, u_int); static struct random_source random_nehemiah = { @@ -53,8 +51,6 @@ static struct random_source random_nehemiah = { .rs_read = random_nehemiah_read }; -static struct fpu_kern_ctx *fpu_ctx_save; - /* This H/W source never stores more than 8 bytes in one go */ /* ARGSUSED */ static __inline size_t @@ -75,20 +71,6 @@ VIA_RNG_store(void *buf) return (0); } -static void -random_nehemiah_init(void) -{ - - fpu_ctx_save = fpu_kern_alloc_ctx(FPU_KERN_NORMAL); -} - -static void -random_nehemiah_deinit(void) -{ - - fpu_kern_free_ctx(fpu_ctx_save); -} - /* It is specifically allowed that buf is a multiple of sizeof(long) */ static u_int random_nehemiah_read(void *buf, u_int c) @@ -97,14 +79,14 @@ random_nehemiah_read(void *buf, u_int c) size_t count, ret; uint64_t tmp; - fpu_kern_enter(curthread, fpu_ctx_save, FPU_KERN_NORMAL); + fpu_kern_enter(curthread, NULL, FPU_KERN_NORMAL | FPU_KERN_NOCTX); b = buf; for (count = c; count > 0; count -= ret) { ret = MIN(VIA_RNG_store(&tmp), count); memcpy(b, &tmp, ret); b += ret; } - fpu_kern_leave(curthread, fpu_ctx_save); + fpu_kern_leave(curthread, NULL); return (c); } @@ -119,13 +101,11 @@ nehemiah_modevent(module_t mod, int type, void *unused) if (via_feature_rng & VIA_HAS_RNG) { random_source_register(&random_nehemiah); printf("random: fast provider: \"%s\"\n", random_nehemiah.rs_ident); - random_nehemiah_init(); } break; case MOD_UNLOAD: if (via_feature_rng & VIA_HAS_RNG) { - random_nehemiah_deinit(); random_source_deregister(&random_nehemiah); } break; From nobody Fri Aug 25 19:37: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 4RXVbT2Y2zz4qj4b for ; Fri, 25 Aug 2023 19:37: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 4RXVbT0ympz3VT8 for ; Fri, 25 Aug 2023 19:37:41 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-3fbd33a57b6so11035275e9.2 for ; Fri, 25 Aug 2023 12:37:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692992260; x=1693597060; 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=Ox4G81BDr1lHM/vdblB8TT34Lzj9cw0o8hNr4eibhUE=; b=KPAErHzmD27zIR7bDyvpg9rF8skuOW4ILlHCRgym4h+lZHZmqB912Q010lWdYLsAIW Q3upQjDKmutXLzjFboquEG6KYHTcdjuGRIb+8bKsh6QegJ8imi7iHbMVaWLM8icsnVqa MPHzCdZNSN0M3vYGggywH4rfdtgmpjEk8K/tgqz4l3mDWErTYk8WuIYcOT5pYxAAszvh 3enqGYB9//yomy1OYu8zFfgAEmCkYAXDH25S7aNcJQsS+i4XSGLWvWgiww515zHMGpxU mx833WldDgcPsR2YHTrMoSsic44R/YQSxzWM4SmkYWc1h4mpDD9wsYVY3wR7fZykRi7F ahnw== X-Gm-Message-State: AOJu0YxG1NL5Dv2bunV5vkIxyF5rS4Q97u/5ytAwO+HtxgO9HNBTy6Pd /qg/+GBh0hbrec/FhoneJ1DtLg== X-Google-Smtp-Source: AGHT+IFK1KnbI+fDlO1bdx6UP8yaAmZwtaIBWQk6k+LF293BjX1O1hwPlWnJlNqogIW9PFjCNL1pBA== X-Received: by 2002:a05:600c:285:b0:3fe:fe71:14dd with SMTP id 5-20020a05600c028500b003fefe7114ddmr7986775wmk.1.1692992259457; Fri, 25 Aug 2023 12:37:39 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id q14-20020a1cf30e000000b003fe1630a8f0sm6224396wmq.24.2023.08.25.12.37.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Aug 2023 12:37:39 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 3d8ef251aa9d - main - lib/libc/amd64/string/strchrnul.S: fix edge case in scalar code From: Jessica Clarke In-Reply-To: <202308251923.37PJN6EM082298@gitrepo.freebsd.org> Date: Fri, 25 Aug 2023 20:37:28 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <457A2B01-A4B0-4373-BD06-6BEBED922980@freebsd.org> References: <202308251923.37PJN6EM082298@gitrepo.freebsd.org> To: Robert Clausecker X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RXVbT0ympz3VT8 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 25 Aug 2023, at 20:23, Robert Clausecker wrote: >=20 > The branch main has been updated by fuz: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D3d8ef251aa9dceabd57f7821a0e6749d= 35317db3 >=20 > commit 3d8ef251aa9dceabd57f7821a0e6749d35317db3 > Author: Robert Clausecker > AuthorDate: 2023-08-25 16:22:22 +0000 > Commit: Robert Clausecker > CommitDate: 2023-08-25 19:21:54 +0000 >=20 > lib/libc/amd64/string/strchrnul.S: fix edge case in scalar code >=20 > When the buffer is immediately preceeded by the character we > are looking for and begins with one higher than that character, > and the buffer is misaligned, a match was errorneously detected > in the first character. Fix this by changing the way we prevent > matches before the buffer from being detected: instead of > removing the corresponding bit from the 0x80..80 mask, set the > LSB of bytes before the buffer after xoring with the character we > look for. >=20 > The bug only affects amd64 with ARCHLEVEL=3Dscalar (cf. simd(7)). > The change comes at a 2% performance impact for short strings > if ARCHLEVEL is set to scalar. The default configuration is not > affected. That such bugs are being found in even the *scalar* code is concerning. How confident are we that all the various implementations have in fact been adequately tested if this slipped through? We have the 14 release coming up, and this makes me nervous about whether all this code is really ready for prime time yet. This seems like the kind of thing that needs a long time to bake in -CURRENT so that it can be used in anger and, hopefully, have all the edge cases hit. What have they been tested against, anyway? Can we borrow test suites from other projects? Jess From nobody Fri Aug 25 20:12: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 4RXWN601vFz4qkyR; Fri, 25 Aug 2023 20:12: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 4RXWN56bVrz3XR4; Fri, 25 Aug 2023 20:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692994373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BPPY5gxhBiAlOaDOzRR6wFH+BcUOFwCjerFnt7NF534=; b=t6lrzg1OxaifOfgNE5To5Aygrk6rKinEcpW1gQEH0n2YZbxy7DMGI04yAIPpWVbkKOf9XE bOccOHDGKAsZhmqO5MrN6L+UOuCVXfIvDtFlKNC7PwRDA4+KZy5PJi8Gkln3Rbsv8p4Q5+ vYAOUjKLFJvBczziJQ+bzeSsAY712o/BJWqUR84NizhXm9Uw69+TI2uJ+Sag8J17G70LZ3 dPAUA/UDBSbkU1eJeFwzmW9lHgZKi7UhQmwL4J/dX3qqT4I3Grl82422Tei4ALBV6vEzv+ oODO4O+1bfqMSvHQN001lH0ZZ2/trqVxfW57/LJ0GoyFlc5mgXMEHuwY6uBs7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692994373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BPPY5gxhBiAlOaDOzRR6wFH+BcUOFwCjerFnt7NF534=; b=cDUWPi/fuy66frA0D7M+m9/CcCAyieUM3utYLATmvSAZi58LXlF8Gg5/0FXf7W2UI7RXE4 h+fbnKDRXXxRzYoKfaEFwVAFxZL7i1mivo2JBwRQORK0t9IrXOV8FqPZWUyPZ0P6bzFr4Q ApZlz2Ch4lTcFBEK4etuGOu3F8PJuapaJndXVmoDHPyzx5sEmdhw6+h90dxqeYQO9DV87b IcviduLITXPPOCb9M50wQRjjoxSdIpgU0+UeWsJ01KKwmoUsthhpcmq++i9et36qzfD4Yi Y/qAaQAymEtfOtThNtl/i+534ZH39vDr2rB5tzpVq0zFhdKTIkZb1TrqzIEmow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692994373; a=rsa-sha256; cv=none; b=mzOHAF7WE/2mCtfTGDhWxHNqXlPPntG2d2vQscupgaIiUOgw8ZnVLiFUPMJaFqcTzihghs BxEGxVFbBSd6DkSHa8JGdJITY5mwSeWnxqquF3OgugiwztaikV0Rkp2In+c9MFOvHiKlk8 33Mv9pERvV0/NJgpiijSvC0UtLbGk+L377vKX2Yjd/KGO0yz48UHFLPg0Q7f0To2d+xxkJ tMJboGjux49OWCOY7x+M0C4dnmo1O1O94ZqMvnW1dOkpxYI15OpzCO8FY2AfI1RyRrdXMY S6YSo01YDFWak2as/d74e6aHFhiFLQdsH3gnpXkygh19LWA9PCwFyplMwH4ntw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXWN55dTQz1Ltp; Fri, 25 Aug 2023 20:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PKCrUP065775; Fri, 25 Aug 2023 20:12:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PKCrOs065772; Fri, 25 Aug 2023 20:12:53 GMT (envelope-from git) Date: Fri, 25 Aug 2023 20:12:53 GMT Message-Id: <202308252012.37PKCrOs065772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: b4ef09b9eb11 - main - clk_fixed: reduce and clarify messages due to missing clk-frequency List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4ef09b9eb117d622bb274448e5cffcae0ba3488 Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=b4ef09b9eb117d622bb274448e5cffcae0ba3488 commit b4ef09b9eb117d622bb274448e5cffcae0ba3488 Author: Mike Karels AuthorDate: 2023-08-25 20:11:46 +0000 Commit: Mike Karels CommitDate: 2023-08-25 20:11:46 +0000 clk_fixed: reduce and clarify messages due to missing clk-frequency The current dts for Raspberry 3B+ and 4B have 2 disabled fixed-clock nodes which have no clock-frequency value. Such nodes are non-standard. This results in about 150 messages during autoconfiguration: clk_fixed2: disabled on ofwbus0 clk_fixed2: Cannot FDT parameters. device_attach: clk_fixed2 attach returned 6 Defensively check for clock-frequency in the probe routine, and if none, return an error with a more direct error message (1 line per occurrence, 50 lines total): clk_fixed2: clock-fixed has no clock-frequency Based on a patch by manu. MFC after: 1 week Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41594 --- sys/dev/extres/clk/clk_fixed.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/extres/clk/clk_fixed.c b/sys/dev/extres/clk/clk_fixed.c index f4f1d462233a..e5ca6b31d000 100644 --- a/sys/dev/extres/clk/clk_fixed.c +++ b/sys/dev/extres/clk/clk_fixed.c @@ -157,6 +157,11 @@ clk_fixed_probe(device_t dev) clk_type = ofw_bus_search_compatible(dev, compat_data)->ocd_data; switch (clk_type) { case CLK_TYPE_FIXED: + if (OF_hasprop(ofw_bus_get_node(dev), "clock-frequency") == 0) { + device_printf(dev, + "clock-fixed has no clock-frequency\n"); + return (ENXIO); + } device_set_desc(dev, "Fixed clock"); return (BUS_PROBE_DEFAULT); case CLK_TYPE_FIXED_FACTOR: From nobody Fri Aug 25 20:56:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RXXLv4D61z4qnQX; Fri, 25 Aug 2023 20:56: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 4RXXLv3fxyz3Z8B; Fri, 25 Aug 2023 20:56:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692997015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LHefJl/M5Mr3VDcTr93+eVw9SnxfETWuuTl7Ls38Ktc=; b=fcy7y9w7u6xtWj+6zIrgKWcOpzgBYTHOkJC+hFMAn+bkUK+LgmpV1vBgNg9mIj0C6K3t+l VmsEWUZZdTaLQEMfAUyDzBVeMze4A6qwkLUXmNvUlXoOu88og7Fuv/fAnxD1nzzJBbaNHI aGcfvCgXbXqeeaIs4MNWUqL2ripZUSUvu2fEAJAQOfpzFox/gGMMVVsKdGLvFm/yuFVuoU sPheybjNynwWyLa+NYAGB7+qoNksALi8REuwl0+IXAlzzsw9NDvrYw6Nt6o406DvTh5yG0 r0N4Xe4UDzmRPPN6dV4RzztxVIibR2tpi70SknSg32ugw/f11Q1lAXiOZGLU9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692997015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LHefJl/M5Mr3VDcTr93+eVw9SnxfETWuuTl7Ls38Ktc=; b=ve9fe5nU1o0MOXWsGI2RNwGxSIZq3IIp2PsFIRHwilVQXfctZKr8hPDHQ601jKBHhpkcvK qYv9FghAnZsBvhQ+SzmIeGO1cXrydG+SPF4mJ/q0O/Sp0vS0wjA58FvE4b8DdTJ4aVYz4S x74HUoj4PsOHZm+P1q8ZSZMDxIRz2VcdIVs/K2l4JGcLEOPdEB9VUvHLDRu76Usz46LWQ2 hzU2Z0E5D4SEYb+dQl8L0WCGR5oMP6mw1m5T1nfA7+QJbMAi/aqwD71Rx9H6ZW3OqE0PYE hMs7RJ08v5ldd4wylWEqV2ckhYb0/AnVeG3dIlcyiDMcyObh8l6itsK49/kHqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692997015; a=rsa-sha256; cv=none; b=XgwLyE1rF82cGpVeKJ61WkcVye467u2Mu3bNSBf8Uc221Ah4yYN8/HG6qrcedONnQFYACz WUOH5PJuk26BmsAvn0t2gTYXvpDjUEbzdoX+aFXiTFs+pXDHlox6lxWXJfCIP9ovZ5G3oP KxXe8KIXQizybCft9AH0xAnuM9aINaNMXTR7DCMr/dOkRGeYHbcDtLiMgpQe7Eb+eFYUGv YIsWTWKl4VdbNbrZJ0n50LhiGWF89WSKFAlacOq/0JTeAkmGjY6RcY7ngADc2w5S+BJEhr Bob9FdluugBGw+ixJVYSh+5+gnqigijQYdkemCYdOmkn/C30cU2EnuYyLvO9KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXXLv2jPBz1Mlh; Fri, 25 Aug 2023 20:56:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PKutxk031850; Fri, 25 Aug 2023 20:56:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PKutDY031847; Fri, 25 Aug 2023 20:56:55 GMT (envelope-from git) Date: Fri, 25 Aug 2023 20:56:55 GMT Message-Id: <202308252056.37PKutDY031847@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7a3af0a59b56 - main - dtrace: Remove $FreeBSD$ from genmakefiles.sh. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a3af0a59b56078e88b8009824fdd99e8df3f625 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7a3af0a59b56078e88b8009824fdd99e8df3f625 commit 7a3af0a59b56078e88b8009824fdd99e8df3f625 Author: Domagoj Stolfa AuthorDate: 2023-08-25 20:53:51 +0000 Commit: Warner Losh CommitDate: 2023-08-25 20:55:59 +0000 dtrace: Remove $FreeBSD$ from genmakefiles.sh. $FreeBSD$ is gone in head, so this should be removed as well. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41595 --- cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh index a2814d6c9962..b3663a91d9ef 100755 --- a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh +++ b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh @@ -59,8 +59,6 @@ WITH_CTF=YES local makefile=$(mktemp) cat <<__EOF__ > $makefile -# \$FreeBSD$ - # # This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh. # From nobody Fri Aug 25 21:15: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 4RXXls4n72z4qnts; Fri, 25 Aug 2023 21:15: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 4RXXls4HmCz3dtx; Fri, 25 Aug 2023 21:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692998105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JsparDx98TMKpLmyj2D/2oONf+ykQra5jvDip687/L0=; b=Myxc4uAitRv2zI8Rz5pHmw1Jbd75FFXL8CzudYNzAm5OeisQC815sRQc4LVsdJKEIqxLU2 vXqXxMAC7FhTiJwRtr9kh35QfbYM1GQ+4z7YKRcGQI2SZcpTgGEbWcvIedtpxiAXYn9rFI 5/pu0de2iFGUk4YS5JruBx23dgr0ljF/e8PZb0Rpk9fV1bbeyNaErPMJwESSdvtrIWnZDj 1Td0a6Eblx2+NnhSn7LH3cSbxeqSXcDyhmT9bc0u23fE373XddLsmXzIFb85384tyGZUWs wagFYH7sGYHWTE5FJk10JYT1TEBSaIDxFlrfPU/EwmaAeu3ZgRSPOyWjC1rV/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692998105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JsparDx98TMKpLmyj2D/2oONf+ykQra5jvDip687/L0=; b=YFErrr1GYByKdxSWrMdyJ6w7vdEOgQtDTRVRpVkia41r0lE3WHJRCbw62sPtDypm3LB0PH MPDuzof9htyiS7fokGH9xw6efG5MuhDHWk4LvKzg184Rfq30EeVQr4Hr80bvNOgGtTxOgZ v1vNgU01gbf1aC7AWgzUgnXHIaxCIEYyNdCG+5QFSj6e5NoMjiq1XTFGtnVslrASPTaD/s ucru/sMNopPghFJW4S/9jHiHmDAY+wuvVMh26RQa26W1e2hlYGSEK+uYmCBz60r1GOGPdr 7hcgOdqGY1kcyz+zuLsGIIO6qY/vGf3N50Bf1+Dqr3V7QaGpgP3vzrXQ5SqBQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692998105; a=rsa-sha256; cv=none; b=ELl9uU1znmj9U9eKJ3z4Nmoh+p1+gzSQYKARuFpqv6nU07dPyxflIoMWf+QxA6dyD6o21t 20dO+VB9zL8aRkDZApjsgh27hUIDNEE4Ox9uYMzQMplxq5Ch2+SBoG+glTI9NxRH1P6duZ nw6rxWyqtqPDT7qXqfAeuDHMBkdYjjoI8BLwn/mxec0ZbPV3NtNTI6kK2iO6Uht+OHtIPN jXtlPcgMQBJw/q1Wzg5TXNVtIfgGpke9Oes7tqAD4tOJC43hNXux5FhL+YtsZxFltJHmzs saEFTs8Wks2RGTD/5BrmLceIrVhFiiNU+kSdcENUCXR0JShAMMsJTh8po//K1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXXls25fCz1MP0; Fri, 25 Aug 2023 21:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PLF5jm065478; Fri, 25 Aug 2023 21:15:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PLF5K4065475; Fri, 25 Aug 2023 21:15:05 GMT (envelope-from git) Date: Fri, 25 Aug 2023 21:15:05 GMT Message-Id: <202308252115.37PLF5K4065475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 67dd7233bef6 - main - pccarddevs2h.awk: Remove List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67dd7233bef66f722ad0325b4b81fe7a12c573be Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=67dd7233bef66f722ad0325b4b81fe7a12c573be commit 67dd7233bef66f722ad0325b4b81fe7a12c573be Author: Warner Losh AuthorDate: 2023-08-25 21:02:34 +0000 Commit: Warner Losh CommitDate: 2023-08-25 21:12:44 +0000 pccarddevs2h.awk: Remove pccard support was removed in 31b35400cf77on Dec 14, 2021, but this wasn't. Belatedly remove it. MFC After: 1 week Sponsored by: Netflix --- sys/tools/pccarddevs2h.awk | 173 --------------------------------------------- 1 file changed, 173 deletions(-) diff --git a/sys/tools/pccarddevs2h.awk b/sys/tools/pccarddevs2h.awk deleted file mode 100644 index f6b54addd7f5..000000000000 --- a/sys/tools/pccarddevs2h.awk +++ /dev/null @@ -1,173 +0,0 @@ -#! /usr/bin/awk -f -# $NetBSD: devlist2h.awk,v 1.3 1998/09/05 14:42:06 christos Exp $ - -#- -# SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause -# -# Copyright (c) 1998 The NetBSD Foundation, Inc. -# All rights reserved. -# -# This code is derived from software contributed to The NetBSD Foundation -# by Christos Zoulas. -# -# 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. -# -# Copyright (c) 1995, 1996 Christopher G. Demetriou -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by Christopher G. Demetriou. -# This product includes software developed by Christos Zoulas -# 4. The name of the author(s) 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 -# 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. -# -function collectline(f, line) { - oparen = 0 - line = "" - while (f <= NF) { - if ($f == "#") { - line = line "(" - oparen = 1 - f++ - continue - } - if (oparen) { - line = line $f - if (f < NF) - line = line " " - f++ - continue - } - line = line $f - if (f < NF) - line = line " " - f++ - } - if (oparen) - line = line ")" - return line -} -BEGIN { - nproducts = nvendors = 0 - hfile="pccarddevs.h" -} -NR == 1 { - VERSION = $0 - gsub("\\$", "", VERSION) - - printf("/*\t\$FreeBSD\$\t*/\n\n") > hfile - printf("/*\n") > hfile - printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ - > hfile - printf(" *\n") > hfile - printf(" * generated from:\n") > hfile - printf(" *\t%s\n", VERSION) > hfile - printf(" */\n") > hfile - - next -} -$1 == "vendor" { - nvendors++ - - vendorindex[$2] = nvendors; # record index for this name, for later. - vendors[nvendors, 1] = $2; # name - if ($3 == "-1") - $3 = "0xffffffff"; - vendors[nvendors, 2] = $3; # id - printf("#define\tPCMCIA_VENDOR_%s\t%s\t", vendors[nvendors, 1], - vendors[nvendors, 2]) > hfile - vendors[nvendors, 3] = collectline(4, line) - printf("/* %s */\n", vendors[nvendors, 3]) > hfile - next -} -$1 == "product" { - nproducts++ - - products[nproducts, 1] = $2; # vendor name - if ($3 == "-1") - $3 = "0xffffffff"; - products[nproducts, 2] = $3; # product id - products[nproducts, 3] = $4; # id - - f = 5; - - if ($4 == "{") { - products[nproducts, 3] = "0xffffffff"; - z = "{ " - for (i = 0; i < 4; i++) { - if (f <= NF) { - gsub("&sp", " ", $f) - gsub("&tab", "\t", $f) - gsub("&nl", "\n", $f) - z = z $f " " - f++ - } - else { - if (i == 3) - z = z "NULL " - else - z = z "NULL, " - } - } - products[nproducts, 4] = z $f - f++ - } - else { - products[nproducts, 4] = "{ NULL, NULL, NULL, NULL }" - } - printf("#define\tPCMCIA_CIS_%s_%s\t%s\n", - products[nproducts, 1], products[nproducts, 2], - products[nproducts, 4]) > hfile - printf("#define\tPCMCIA_PRODUCT_%s_%s\t%s\n", products[nproducts, 1], - products[nproducts, 2], products[nproducts, 3]) > hfile - - products[nproducts, 5] = collectline(f, line) - - printf("#define\tPCMCIA_STR_%s_%s\t\"%s\"\n", - products[nproducts, 1], products[nproducts, 2], - products[nproducts, 5]) > hfile - - next -} -{ - print $0 > hfile -} From nobody Fri Aug 25 21:15: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 4RXXlt4ZLKz4qp09; Fri, 25 Aug 2023 21:15: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 4RXXlt3ZZGz3dvD; Fri, 25 Aug 2023 21:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692998106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+x3noQ6S0UIPH6AXDmPrqOFZuJjfg4NAFSS4G7FSt9A=; b=IJM/acOG3m69CsjJ6++RxNAYtX1P54Uz0965PpShkJu1txDTiVbooJjGXqe970HGKeQvwL Iaqx9y27pUsop6CmkQk3m8Rykqp/YJkgozyVT8h1kQkmdT+s2oIhSlhGGwxiRq6s8ognsy Ojj6jHM1sNeTacfCvEJ3kutxyR7HLZdEGWWmE/8rhI4RXL7+HB6Zche3epCAqlDnuHPewZ F85LwKh1knhcbG3Er2hpMD1OLsVpu6lb2ci8i+dO2UaWVSz3tSDuHvJyl8Y5M3OWX6rJtk 7gLDRpaoKLXct5+9TeDJBu0M/ZTmtqqrrWAADA+Y3skfjEPPPHJMHVyhqhhIQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692998106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+x3noQ6S0UIPH6AXDmPrqOFZuJjfg4NAFSS4G7FSt9A=; b=TX/usRQSrgXgK53kykOFdmMaPl9SX/Aw910W/Vj8Wh8Ql8IhLxX3tIQOgMFm/ciaCxR6oV Z4DbvaXU0djmh5o5Xc4fP8Xu3ioi4jg4q2J1x6NyQlYoNwCoziE1f/FI1zJfM5glPmoGa/ AtfGyuWuEmj2N/TvO5BZNMXL66ZOnrUd7n/8GSqNDoaJo7jOV+youUbnTFvUiGH4MbKp5/ /3JJ6aoIGpdQE15gqrIupBI4ns1IrlZ2i8/vFGF7gTEvq9DzN5sJEBF+CbEDqU8RLxrXFU zMs6ckF6Vr9SE6L6ytotDjKbvUknreJvMeJzUnsFHB8pGI+X9r0v9RpfGg/BDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692998106; a=rsa-sha256; cv=none; b=F4cEdQwj7K6HD2pJkEyVNWw1d1675Cgf7bqeNyWtiYx0l7nJkvdaeZHHvncBa+K/FIyT5Q eI2uSNPWsfllY8ucgpCKskRkhT1pOzqEZbRlMoCUeF9CH2qBiD4M5wvkewjx18GgBU1okB 0JxCGXTN6qB0XYDiVA++H/EZF98dR7KeXnYASK82RuY2tc5acCZKgtIwKdeJkgEz2u3Qd5 aaI0ZewLlWV2idYye7oqFOSnDckJLEGnaVZCgxt2OqCy7oJhvNMOJq1VvqUEP5hE44iAaW nRWmzMUN17W/mnDjYNxNvT0EqRKV/j+c0Yz1JvPOaZSyM+a3DRSUj72uFQA8UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXXlt2gk7z1N9J; Fri, 25 Aug 2023 21:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PLF6Fv065517; Fri, 25 Aug 2023 21:15:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PLF6LW065514; Fri, 25 Aug 2023 21:15:06 GMT (envelope-from git) Date: Fri, 25 Aug 2023 21:15:06 GMT Message-Id: <202308252115.37PLF6LW065514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e8f2e3b6ddef - main - Two more $FreeBSD$ stragglers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8f2e3b6ddefe5eb08b472d6516cb923e74917bc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e8f2e3b6ddefe5eb08b472d6516cb923e74917bc commit e8f2e3b6ddefe5eb08b472d6516cb923e74917bc Author: Warner Losh AuthorDate: 2023-08-25 21:14:19 +0000 Commit: Warner Losh CommitDate: 2023-08-25 21:14:19 +0000 Two more $FreeBSD$ stragglers --- crypto/README | 2 -- sys/dev/cxgb/bin2h.pl | 3 --- 2 files changed, 5 deletions(-) diff --git a/crypto/README b/crypto/README index a3c5ccf50a1c..28b7b9a115e9 100644 --- a/crypto/README +++ b/crypto/README @@ -1,5 +1,3 @@ -$FreeBSD$ - This directory is for the EXACT same use as src/contrib, except it holds crypto sources. In other words, this holds raw sources obtained from various third party vendors, with FreeBSD patches applied. No diff --git a/sys/dev/cxgb/bin2h.pl b/sys/dev/cxgb/bin2h.pl index 8d132be43ffb..46ed98de77be 100644 --- a/sys/dev/cxgb/bin2h.pl +++ b/sys/dev/cxgb/bin2h.pl @@ -47,9 +47,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -\$FreeBSD\$ - ***************************************************************************/ END print OUTPUT "$license\n"; From nobody Fri Aug 25 21:53: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 4RXYbl6cxJz4qqs8; Fri, 25 Aug 2023 21:53:07 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::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 "fuz.su", Issuer "fuz.su" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RXYbl0JNFz4BNh; Fri, 25 Aug 2023 21:53:06 +0000 (UTC) (envelope-from fuz@fuz.su) Authentication-Results: mx1.freebsd.org; none Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.16.1/8.16.1) with ESMTPS id 37PLr4aV037443 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 25 Aug 2023 23:53:04 +0200 (CEST) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.16.1/8.16.1/Submit) id 37PLr4pt037442; Fri, 25 Aug 2023 23:53:04 +0200 (CEST) (envelope-from fuz) Date: Fri, 25 Aug 2023 23:53:04 +0200 From: Robert Clausecker To: Jessica Clarke Cc: Robert Clausecker , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 3d8ef251aa9d - main - lib/libc/amd64/string/strchrnul.S: fix edge case in scalar code Message-ID: References: <202308251923.37PJN6EM082298@gitrepo.freebsd.org> <457A2B01-A4B0-4373-BD06-6BEBED922980@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-sha512; protocol="application/pgp-signature"; boundary="hHmT2Y9f8phfyPZ/" Content-Disposition: inline In-Reply-To: <457A2B01-A4B0-4373-BD06-6BEBED922980@freebsd.org> X-Rspamd-Queue-Id: 4RXYbl0JNFz4BNh X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR] --hHmT2Y9f8phfyPZ/ Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jessica, > That such bugs are being found in even the *scalar* code is concerning. > How confident are we that all the various implementations have in fact > been adequately tested if this slipped through? We have the 14 release > coming up, and this makes me nervous about whether all this code is > really ready for prime time yet. This seems like the kind of thing that > needs a long time to bake in -CURRENT so that it can be used in anger > and, hopefully, have all the edge cases hit. What have they been tested > against, anyway? Can we borrow test suites from other projects? Please understand that "scalar" means "no SIMD." It doesn't mean "na=EFve implementation" (it was requested that it be possible to use libc string functions without them touching the SSE state, so I preserved existing scalar implementations and added them where only generic code existed). In fact, scalar implementations are usually more complicated than the SIMD variants as x86 does not have SIMD-like operations for general purpose registers, so they have to be emulated with bit manipulation tricks. Specifically, I used the hasless(x,n) approach from Anderson's Bit Twiddling Hacks [1]. This approach is also used by the generic strchrnul() function, although withough the part (processing the head of the string until alignment is reached) that caused the bug. > That such bugs are being found in even the *scalar* code is concerning. > How confident are we that all the various implementations have in fact > been adequately tested if this slipped through? We have the 14 release > coming up, and this makes me nervous about whether all this code is > really ready for prime time yet. This seems like the kind of thing that > needs a long time to bake in -CURRENT so that it can be used in anger > and, hopefully, have all the edge cases hit. What have they been tested > against, anyway? Can we borrow test suites from other projects? Rest assured that I try my best to thoroughly test the code. We have comprehensive tests for libc string functions (many from NetBSD) and where they are missing or lacking, I have tried to extend the test suite. The ultimate test is building world with the changes applied where many different programs thoroughly exercise all sorts of string functions. This is incidentally how I caught this error: while implementing memchr() using the same approach as strchrnul(), I found that clang would crash when using this function. Debugging turned up this weird corner case, reflecting my own misunderstanding of the properties of the hasless(x,n) function (it tells you where the first match is; subsequent matches are not guaranteed to be accurate). I will check with re@ how to proceed with respect to these changes. If desired, they can be postponed to 14.1, though I think it would be nice to get them in now rather than in a year. [1]: https://graphics.stanford.edu/~seander/bithacks.html#ZeroInWord PS: if you like, I can add you as a subscriber to future submissions of this project so you can assist in code review and early testing. Currently, D41520, D41528, D41557, and D41567 are pending review. Yours, Robert Clausecker --=20 () ascii ribbon campaign - for an 8-bit clean world=20 /\ - against html email - against proprietary attachments --hHmT2Y9f8phfyPZ/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEExWcBrcoFY7LMaPxvWXxDScqS3gUFAmTpIrtfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEM1 NjcwMUFEQ0EwNTYzQjJDQzY4RkM2RjU5N0M0MzQ5Q0E5MkRFMDUACgkQWXxDScqS 3gXWHg/+LgDIG1bteXOeWoGY6Y1wN44MU/EgCKpZ1Eq+CKADqM35+pxd2oYAXwWl YHytN8JNZWOGKgW30xcVWiwzAk7sfa8iX+0TcFM2ZNTpkS1zlltA3THTzggytIuf DCu20KNmx/h41yEhBeO1z6rKtEFzFzW6qoSL4E8lYdJfbehaKiH/UoHTKD9FVQaD XXzvu7FfrnPfetME+wrzSUsNyhEh6XNiI3rLXhid0SSskQTW/putVn+BUrKsDCro 9duqB+U08mboONXrJLZawP8+yGjtZOl6uP7MFlF6Sl6f6QzoNtIAo4gHqdnkFzLU GrrFOETb5JZ2ybDrrEvUAPWdSj0Op/16kyuDLgOK/vqkWcCSBhJnvI9fzBGD24ym KUIWejwUq5ewr18FGnZfARhMT1KAxRhgshLfKVKIKGrfPbyD8uK6I7nVuLqxiier S+iFQa4WbiVNoelJe+tnjWhSdNtMdIIY0Lp93bdLKTCHNC7qpZjYQucP+sqgoo0x 9cOPsxLva4zDSVt8dZgYePHzEIfw4VS6p/fVXf0Dsaeur+Ace87KkIEFtGxhswdP kq2eT/DuD7G4M8R7TDsKKyql3A2DRGvbsnEMMSsaGclvcnUnRm6wugajcUpVUxkZ F46deBkNbLsGWnPcpYa8s/OBy2FaiEte2PVHd3ciPiwJXHVwTPY= =fKWa -----END PGP SIGNATURE----- --hHmT2Y9f8phfyPZ/-- From nobody Fri Aug 25 22:29: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 4RXZQ33qKhz4qtFW for ; Fri, 25 Aug 2023 22:29: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 4RXZQ33L1bz4GdN; Fri, 25 Aug 2023 22:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693002587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RHAcu9BccEgkwK0JWRWP5gTO23dccm4ydxMWGJBshMY=; b=spRJ+6rcz2FolzpN6uMxT58ZzxwZ9e+Asoj8oxGPQqpd4F7Ia80a3vrEcjGuR/7sGEbm+x LN9kKPx4QtWYc+VquWZGpNp/y85+qzgAljI+8a4g5srOMj9ZrZ+OYRZzw1giJNQF2bqNIQ sm98I1V3jStVvKAVaL0NHY+V+HnSQv5fWAKgkXVLhpXoTSzLHDGefnbWPNhp9+Zjdbks2r D+reZd0nZYBmHsR6rKU9NQrt1EG5M8Naq3Z/VtKuBL/qmyl3JYIS+69/wcKH5qMmvnthOH WfY6jWLMdMlNruQVrwp1x4MeEhvVg9bcqXsxF8piZjpBo7lPGPW8cKwjZEo2ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693002587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RHAcu9BccEgkwK0JWRWP5gTO23dccm4ydxMWGJBshMY=; b=S/bOvd1SWm80KwgFV7adL7gQ2I4swBySupPywvrJsTP1qamxJVbHD81oN01rteLRH3wlda xvzAOLgBc5EcrjGsD83Ywx1e5OiKUW1T387Xpi0/vJUKDzwJYFyQ79ocnZRlCx0/Jj2bFk r2mYqQGZCtsjpNg3H+CRHCO09XQeEORyvP7z+kEejNS+hXpATHZAcuJbQeMV3pC4uV5FVT qB4PWcyiiJvp3l5RbfByMokAA8WwcOnSroxv9zK6/LKoYOBcanQZBmwHPV0V0x5s/WVASJ rhIwBVWIcJd/XZlc8MB27hHCdZRsqLNYwH6KOKX0RZh3r7GTiCdTr2Fn841piw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693002587; a=rsa-sha256; cv=none; b=eltcp55lEIMC3IGlh/E90HsjQsZ98tOzMjc3ger98YG2EHVBMH5yPUMRBktFFH1CzGll9f bqT4vibJtUNNb38EAMTIbLIwmLAVsTjN0P7vARLSXYQXKn7EhvHGgVBJ6QYeQPdoNP9jO/ fRE2Am89W6WbfH10Bag5RF4i37TaRNJSmY2ynVEQi3o7pZb9UmkmxRQ/e2hpQIYda8GDqb PZr9gIh/EAOYjBDo2x3kOCXkWEXwrwF/4U9Fc/R8psUZrDvJO8lucuDXOFhBIxjrTd0DBz qYs+PlfyxgnHW96m3/v2V4tKEXcDaFR7RWPGf+0TYUuUV/ocdpeZPBsECgWzhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXZQ32P67z1PV6; Fri, 25 Aug 2023 22:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PMTlP8082518; Fri, 25 Aug 2023 22:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PMTlhV082517; Fri, 25 Aug 2023 22:29:47 GMT (envelope-from git) Date: Fri, 25 Aug 2023 22:29:47 GMT Message-Id: <202308252229.37PMTlhV082517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 009d3288dea5..804414aad224 - 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: 804414aad224b432590afe3f9ec114ffb49e0f13 X-Git-Oldrev: 009d3288dea524c7ad373b04b65bee8bb6f0bfea X-Git-Newrev: 804414aad224b432590afe3f9ec114ffb49e0f13 Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=009d3288dea5..804414aad224 ca960ce56ce1 Update META 736d5962b42e FreeBSD: Fix build on stable/13 after 1302506. 58f4a094b4ef Update changelog for 2.2 6c9aa1d2a6d3 FreeBSD: catch up to __FreeBSD_version 1400093 6db781d52ca0 Add missed DMU_PROJECTUSED_OBJECT prefetch. fdba8cbb796c Avoid extra snprintf() in dsl_deadlist_merge(). 67c5e1ba4fbb Fix the ZFS checksum error histograms with larger record sizes c4e8742149e3 Fix raw receive with different indirect block size. 3a3e0d6fbcd2 intptr_t definition is canonically signed d3d63cac4d31 Linux 6.5 compat: BLK_STS_NEXUS renamed to BLK_STS_RESV_CONFLICT 8beabfd3bfbc set autotrim default to 'off' everywhere 74f8ce4ca5c3 Linux 6.5 compat: disk_check_media_change() was added 7d0df5422c14 Do not request data L1 buffers on scan prefetch. e6ea31de9f15 Rollback before zfs root is mounted 4d2dad04aaa4 Ignore pool ashift property during vdev attachment 929173ab42fa Don't panic if setting vdev properties is unsupported for this vdev type d9bb583c25d8 spa_min_alloc should be GCD, not min 2d8a2b51dcc0 Fix zpl_test_super race with zfs_umount ab0b0393cbd7 zed: Fix zed ASSERT on slot power cycle cf2a225b2481 Don't emit checksum histograms in ereport.fs.zfs.checksum events 6fd87e1d8df1 Don't emit cksum_{actual_expected} in ereport.fs.zfs.checksum events 28430b51e3e2 Add explicit prefetches to bpobj_iterate(). 34b3d498a965 Adjust prefetch parameters. 46adb2820ac3 metaslab: tuneable to better control force ganging 13ec73a02830 shellcheck: disable "unreachable command" check [SC2317] fb344f5aeb70 Linux 6.4 compat: META 2cb992a99cca ZIL: Fix config lock deadlock. 8d21c002c6ae zfs_clone_range: use vmem_malloc for large allocation 87a6e135c5f5 brt_vdev_realloc: use vmem_alloc for large allocation d4edecd1a29f dmu_buf_will_clone: only check that current txg is clean f6facd242937 dbuf_sync_leaf: check DB_READ in state assertions 5a35c68b6747 linux: implement filesystem-side copy/clone functions 9927f219f1e9 linux: implement filesystem-side clone ioctls 6b0a4be5fec6 linux: implement filesystem-side copy/clone functions for EL7 48d0e9465de9 zts: block cloning tests 2848de11e516 Remove zl_issuer_lock from zil_suspend(). 782312c61277 zed: Reduce log noise for large JBODs 704c80f04871 Avoid waiting in dmu_sync_late_arrival(). 5bdfff5cfc8b BRT should return EOPNOTSUPP b22bab2547b7 Remove fastwrite mechanism. e9c59310f7da Check the return value in clonefile test b35374fd6474 Linux 6.5 compat: register_sysctl_table removed 3b8e318b7737 Linux 6.5 compat: use disk_check_media_change when it exists 43e8f6e37fdd Linux 6.5 compat: blkdev changes 325505e5c4e4 Linux 6.4 compat: iter_iov() function now used to get old iov member 6751634d7752 Linux 4.20 compat: wrapper function for iov_iter type access a21ca18d4d29 linux: zfs: ctldir: set [amc]time to snapshot's creation property 114a39964f5c zdb: include cloned blocks in block statistics fcd61d937f21 readmmap.c: fix building with MUSL libc ead3eea3e07c linux/copy_file_range: properly request a fallback copy on Linux <5.3 12373b0cc7c6 zpool_vdev_remove() should handle EALREADY error return a5fdba1185ee Revert "Linux 6.5 compat: register_sysctl_table removed" e47e9bbe86f2 Linux 6.5 compat: register_sysctl_table removed a97b8fc2dd9e Fix some typos 6c94e6496313 Refactor dmu_prefetch(). fdb8fff916f4 linux/spl/kmem_cache: undefine `kmem_cache_alloc` before defining it 36261c8238df Linux 6.5 compat: replace generic_file_splice_read with filemap_splice_read 683edb32b738 libzfs: sendrecv: send_progress_thread: handle SIGINFO/SIGUSR1 019dea0a5585 zfs_clone_range should return a descriptive error codes b8c9070d0944 dracut: support mountpoint=legacy for root dataset 81500902578d Move zinject from openzfs-zfs-test to openzfs-zfsutils 8ce2eba9e6a3 Linux 6.5 compat: Use copy_splice_read instead of filemap_splice_read bdb7df424518 ZIL: Avoid dbuf_read() before dmu_sync(). 8e20e0ff39f0 ZIL: Replay blocks without next block pointer. cae502c17576 copy_file_range: fix fallback when source create on same txg 11fbcacf37d1 zed: Add zedlet to power off slot when drive is faulted eda3fcd56ff9 ZIL: Second attempt to reduce scope of zl_issuer_lock. ed39d668ea63 Update outdated assertion from zio_write_compress 804414aad224 tests/block_cloning: rename and document get_same_blocks helper From nobody Fri Aug 25 22:55: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 4RXZzW0m54z4qvGt; Fri, 25 Aug 2023 22:55: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 4RXZzW0JWXz4HdY; Fri, 25 Aug 2023 22:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693004119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V7WoK9BMPmoPWUq4EHVVLMaFgSz2Lj9XDAf3tzFGrBI=; b=MNnaW8lnlkF5zQqPwDhNpKYU6xKMz8QD3h1WVcd4WYdNMZopKer4uDNy2e9rlocoae+T+U R7KvW5Q/BPc1tRrG8BgJqqzB8ozHfZt0RY28zgrJIt7EToIOAucNhObt616RAFRBCE/8b2 GXmUByNyZR40zG0bfNL47HkPpr2whs17S2HU5+Q7p4ECn0I3N/oNY18OgbMpcl3FQF/9SB dTn6F1Ot5fC9L78nJNSB4Jpq1bMF49V3lXp62UBHyCS6pmSNxrnZ0jE0zn5L+bEjZQMm+O SAl6pVGg5qaaws/9KYiyVBwecG4Lh96b1Ntf/PzKMrPsvo5r9UVm16flKDCfHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693004119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V7WoK9BMPmoPWUq4EHVVLMaFgSz2Lj9XDAf3tzFGrBI=; b=Bg4VaaTpQSlF7boj4NhPKi9IRH9kyan+EPGkhJKvcW/w94S9xiNHEAdOE7nAl93sbixn6C wL0SKjwSn23LQFTwi1SyZEDeczHvFBSA9DCTpyiH3zAAgfMiM0I/U4q/YZM3rnrXn7fDNq AdzftZ1H81q18AYpavTrGw7AJGalr3rXP/uiTswNXPkuj4tkUqeK69ZiygYJdJ19iXfdC3 P8K6pJmYmu6wgFO+PpG+nhadYE++Gdz5nuiZomFFz+XrggEIEGM9DfJ5ogMCsJe/gNPUVB bvYbxpjt+J3nLFGFeEak8m9THnA8mNK0fcgApObDK2T9sVB0yWqMaoJC19702g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693004119; a=rsa-sha256; cv=none; b=HXj6eUMH69+BSvzF0Sx/XZKYyzRdJtKK51lIq4C8tr6C5Wc7vEs8s4K/RACNSQxpbC/ncE 052aYZzaQfFeaWt9jnb7of9AVIQ5/7tlAQdbQmmHZESONwCDoz1To0jjaixcMYYiOUmYXN IeyG0t0AELrmdZ8vynXx5TYcsX4a+k+eb9qktQ8V/evStJx/3rKxjhL1nTT3859EGxlHPT 8ev6xOol74jZWV+/PmDpIWLKrQxI8f0vqPJDAeKypR0wlL/g06bu6qHfvzpaULx0AHRVfl Y+3pYvqiuoOTVev1jbIZlaoObj9gQHL0u6ljNgHdvZ6Ta7ADsvlgn/9pPfwaNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXZzV6Sbpz1QQ1; Fri, 25 Aug 2023 22:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PMtIq3031685; Fri, 25 Aug 2023 22:55:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PMtIuf031682; Fri, 25 Aug 2023 22:55:18 GMT (envelope-from git) Date: Fri, 25 Aug 2023 22:55:18 GMT Message-Id: <202308252255.37PMtIuf031682@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: b61645ef3c4e - stable/13 - vfs: decouple freevnodes from vnode batching List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b61645ef3c4e6b7f66e6e8accad61aab227a0dd9 Auto-Submitted: auto-generated The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b61645ef3c4e6b7f66e6e8accad61aab227a0dd9 commit b61645ef3c4e6b7f66e6e8accad61aab227a0dd9 Author: Mateusz Guzik AuthorDate: 2023-03-21 07:27:25 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-25 22:52:23 +0000 vfs: decouple freevnodes from vnode batching In principle one cpu can keep vholding vnodes, while another vdrops them. In this case it may be the local count will keep growing in an unbounded manner. Roll it up after a threshold instead. While here move it out of dpcpu into struct pcpu. Reviewed by: kib (previous version) Differential Revision: https://reviews.freebsd.org/D39195 (cherry picked from commit b5d43972e3941d6c03d935dc423385f3c2178d68) --- sys/kern/vfs_subr.c | 55 ++++++++++++++++++++++++++++++++--------------------- sys/sys/pcpu.h | 3 ++- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index c85f0512b286..6befc5eead0e 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -284,7 +284,6 @@ SYSCTL_INT(_debug, OID_AUTO, rush_requests, CTLFLAG_RW, &stat_rush_requests, 0, #define VDBATCH_SIZE 8 struct vdbatch { u_int index; - long freevnodes; struct mtx lock; struct vnode *tab[VDBATCH_SIZE]; }; @@ -1431,48 +1430,62 @@ static int vnlruproc_sig; * at any given moment can still exceed slop, but it should not be by significant * margin in practice. */ -#define VNLRU_FREEVNODES_SLOP 128 +#define VNLRU_FREEVNODES_SLOP 126 + +static void __noinline +vfs_freevnodes_rollup(int8_t *lfreevnodes) +{ + + atomic_add_long(&freevnodes, *lfreevnodes); + *lfreevnodes = 0; + critical_exit(); +} static __inline void vfs_freevnodes_inc(void) { - struct vdbatch *vd; + int8_t *lfreevnodes; critical_enter(); - vd = DPCPU_PTR(vd); - vd->freevnodes++; - critical_exit(); + lfreevnodes = PCPU_PTR(vfs_freevnodes); + (*lfreevnodes)++; + if (__predict_false(*lfreevnodes == VNLRU_FREEVNODES_SLOP)) + vfs_freevnodes_rollup(lfreevnodes); + else + critical_exit(); } static __inline void vfs_freevnodes_dec(void) { - struct vdbatch *vd; + int8_t *lfreevnodes; critical_enter(); - vd = DPCPU_PTR(vd); - vd->freevnodes--; - critical_exit(); + lfreevnodes = PCPU_PTR(vfs_freevnodes); + (*lfreevnodes)--; + if (__predict_false(*lfreevnodes == -VNLRU_FREEVNODES_SLOP)) + vfs_freevnodes_rollup(lfreevnodes); + else + critical_exit(); } static u_long vnlru_read_freevnodes(void) { - struct vdbatch *vd; - long slop; + long slop, rfreevnodes; int cpu; - mtx_assert(&vnode_list_mtx, MA_OWNED); - if (freevnodes > freevnodes_old) - slop = freevnodes - freevnodes_old; + rfreevnodes = atomic_load_long(&freevnodes); + + if (rfreevnodes > freevnodes_old) + slop = rfreevnodes - freevnodes_old; else - slop = freevnodes_old - freevnodes; + slop = freevnodes_old - rfreevnodes; if (slop < VNLRU_FREEVNODES_SLOP) - return (freevnodes >= 0 ? freevnodes : 0); - freevnodes_old = freevnodes; + return (rfreevnodes >= 0 ? rfreevnodes : 0); + freevnodes_old = rfreevnodes; CPU_FOREACH(cpu) { - vd = DPCPU_ID_PTR((cpu), vd); - freevnodes_old += vd->freevnodes; + freevnodes_old += cpuid_to_pcpu[cpu]->pc_vfs_freevnodes; } return (freevnodes_old >= 0 ? freevnodes_old : 0); } @@ -3518,7 +3531,6 @@ vdbatch_process(struct vdbatch *vd) mtx_lock(&vnode_list_mtx); critical_enter(); - freevnodes += vd->freevnodes; for (i = 0; i < VDBATCH_SIZE; i++) { vp = vd->tab[i]; TAILQ_REMOVE(&vnode_list, vp, v_vnodelist); @@ -3527,7 +3539,6 @@ vdbatch_process(struct vdbatch *vd) vp->v_dbatchcpu = NOCPU; } mtx_unlock(&vnode_list_mtx); - vd->freevnodes = 0; bzero(vd->tab, sizeof(vd->tab)); vd->index = 0; critical_exit(); diff --git a/sys/sys/pcpu.h b/sys/sys/pcpu.h index 15d74d90778a..58e47f11f917 100644 --- a/sys/sys/pcpu.h +++ b/sys/sys/pcpu.h @@ -187,7 +187,8 @@ struct pcpu { long pc_cp_time[CPUSTATES]; /* statclock ticks */ struct _device *pc_device; /* CPU device handle */ void *pc_netisr; /* netisr SWI cookie */ - int pc_unused1; /* unused field */ + int8_t pc_vfs_freevnodes; /* freevnodes counter */ + char pc_unused1[3]; /* unused pad */ int pc_domain; /* Memory domain. */ struct rm_queue pc_rm_queue; /* rmlock list of trackers */ uintptr_t pc_dynamic; /* Dynamic per-cpu data area */ From nobody Fri Aug 25 22:55: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 4RXZzX4TRHz4qvbw; Fri, 25 Aug 2023 22:55: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 4RXZzX1TsVz4Hf5; Fri, 25 Aug 2023 22:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693004120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vjDrosolCL7gtfiqoCeISi1FyMkfzLXwpW/GX4cg4ec=; b=OcOirwbrCwNHSS0QxUtQY31trqf9Y+5uRqhcX32N95f8KSbYdIXP9eJ7i/YZKMTsP/q1Sr pSkTXNa0Ci9Ew3tFB/n0fpuZnZArT3Vp7/E0JPR6jRtFWU6xHjW/QYEbBGVDfT/B90oXCK mNCePrDMWRSwWUppaH3UM6k5R4QIo0JKOT0WKkeFS+JK5z26zYZpONNU9usNRkro3vpYiS 8a7O4PfZBH4IyZkAIQY/79aWnAzqNjN2iD3oaZFzuOpb+/Bc+AQo91DEcN0V9hFrK8BaYZ eDui4GPgEuiTUYIB1Fz4SzfnAl/ZJG5Ozwgfy0H0TGQ2mgv75TW6B5BT7/M8VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693004120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vjDrosolCL7gtfiqoCeISi1FyMkfzLXwpW/GX4cg4ec=; b=p0qoS2Jjqxo8L/mmtfL5oJXpEIJGFZH7H6r7ffA5vtLSHI+2TrDCjnUz1BGsHgVafFSWs5 ztizjjBRaxsEN/5b/SaM87cvN6ndF3fzrJ4x9Btwzfo0jtY3V2bWn2W5vfP1ss27okSLL2 uwXtn/czXyT2V0+mDkiyNPSXMBsRcYKmwTVPmbCLyKegRib7HvcaNNR2/HFpK7ofVwdHBs HuCcauFOD9u0iekuNiMMCXSaGIphCabCzUWQ4w0pqG3MOJ4xyw/MN0p8VWJS/PM/+Keb6G R2UL3lijMF5Eny6GPJAemoax68wHLX5KV4ttPQUA2FUfYxpZiBDlTSpbsdIqdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693004120; a=rsa-sha256; cv=none; b=xnLtqaK3C0nXOZIvJZShhwiQ9nnrvlWj1czGByrpGJSh/mIVhy9GAX2VFcq1qR4Jr9i4SY n8shlLeAfMdpZYT+/JUZ5/TypH/BlRdLv9rThePp0AFpgikmyzMJdSBX44yvmnvE6x/9Du Siz3cCMt02/tCu5Ik2Jj0RaUC3sLDk+M0abKSkUUquP1aSvMi0DyAN3x2aJNCI+15mug3O n3vmdaUho00oD+mBOyhydZ9U5zYj3410wibbAPzTU7EfDEAJ4OzPQbKVIGZHnvb1v4Amdn Ak8KpEkzs1To0L8WlxF2Dd8skt6xD0O759OHeeRK9uEdo/RXJ7XvKELScxBXqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXZzX0b37z1Q0v; Fri, 25 Aug 2023 22:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PMtJst031727; Fri, 25 Aug 2023 22:55:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PMtJtN031724; Fri, 25 Aug 2023 22:55:19 GMT (envelope-from git) Date: Fri, 25 Aug 2023 22:55:19 GMT Message-Id: <202308252255.37PMtJtN031724@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: 84e1b8b965c2 - stable/13 - vfs: flip deferred_inact to atomic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 84e1b8b965c28e4ea68d033c3c6b3f397d47cf1f Auto-Submitted: auto-generated The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=84e1b8b965c28e4ea68d033c3c6b3f397d47cf1f commit 84e1b8b965c28e4ea68d033c3c6b3f397d47cf1f Author: Mateusz Guzik AuthorDate: 2023-03-25 13:31:17 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-25 22:52:50 +0000 vfs: flip deferred_inact to atomic Turns out it is very rarely triggered, making a per-cpu counter a waste. Examples from real life boxes: uptime counter 135 days 847 138 days 2190 141 days 1 (cherry picked from commit 245767c2782ef2e29340be0a6755be817f16bad4) --- sys/kern/vfs_subr.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 6befc5eead0e..57e619abaa15 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -195,9 +195,9 @@ static counter_u64_t recycles_free_count; SYSCTL_COUNTER_U64(_vfs, OID_AUTO, recycles_free, CTLFLAG_RD, &recycles_free_count, "Number of free vnodes recycled to meet vnode cache targets"); -static counter_u64_t deferred_inact; -SYSCTL_COUNTER_U64(_vfs, OID_AUTO, deferred_inact, CTLFLAG_RD, &deferred_inact, - "Number of times inactive processing was deferred"); +static u_long deferred_inact; +SYSCTL_ULONG(_vfs, OID_AUTO, deferred_inact, CTLFLAG_RD, + &deferred_inact, 0, "Number of times inactive processing was deferred"); /* To keep more than one thread at a time from running vfs_getnewfsid */ static struct mtx mntid_mtx; @@ -724,7 +724,6 @@ vntblinit(void *dummy __unused) vnodes_created = counter_u64_alloc(M_WAITOK); recycles_count = counter_u64_alloc(M_WAITOK); recycles_free_count = counter_u64_alloc(M_WAITOK); - deferred_inact = counter_u64_alloc(M_WAITOK); /* * Initialize the filesystem syncer. @@ -3218,7 +3217,7 @@ vdefer_inactive(struct vnode *vp) vlazy(vp); vp->v_iflag |= VI_DEFINACT; VI_UNLOCK(vp); - counter_u64_add(deferred_inact, 1); + atomic_add_long(&deferred_inact, 1); } static void From nobody Fri Aug 25 22:57: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 4RXb2R30n3z4qvf2; Fri, 25 Aug 2023 22:57: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 4RXb2R0cQfz4JF7; Fri, 25 Aug 2023 22:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693004271; h=from:from:reply-to:subject:subject: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+tlSM2eoQ0qYYb0K7zL7qPjfOEvzL7uWbpfHdMkBbs=; b=exD5kWq9+36KhLPsixGqw2aN0dv2DEPcSi99lwZSNOYP2K9r5oAkbwTL67H8bbxmWd/M6Z Eqm+mlL9dpRqA976xhtzAyRCodSva8TJebq7NdWrQLHrCwEP/js6XVv9jIekTQkZPoqq4x d3SciRNtLnO5DIeHgRpkTcpBk2JHbjuXA24viZ3olzvS0+Y0sghzADyUSVBLr8RMxVkB7D MfcCe6jzQnhIK+83eq5yQJ3M2kho0u6rdJ8SK/fhY5j6R+O7zfvAXFqdcCfasUOmmgSSPs wcJswgYEA5ShijHSliizEq3L4mEYXC83JEFULJkZPFeKJmUreh68GWBV9O1tow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693004271; h=from:from:reply-to:subject:subject: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+tlSM2eoQ0qYYb0K7zL7qPjfOEvzL7uWbpfHdMkBbs=; b=MfCGkgKkYl7B0y7q6TwaJxKDIFxTT9/d7ZHcDsz1W2lML6jbj3fjHp+JVy78awWuwxsfwd RkfNdEZzuFjUKO71J3kkaaprwfNLvU2twCOYndIhRVPeGfZTCGhAiO1zvw+7AaCt0mSMid jKeJqduGRAcAWgpkOpg9qURx58GnD+Ma317XFIDCTUVnuGoakHzDctQFC3KKb43dMW3J5P L7PSJ2HhLCNwE4sb1oOQ+nCOrGoq1vohv0tmW78vFqT2ACpwIrSq/i+ZH05gjGPdKeWpK1 lK/gYvoJp9QZHUfqMSin9OnwfX7hQmiYz4cs+Sg8At0j131+pIg4pOAG9FRwoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693004271; a=rsa-sha256; cv=none; b=D/QZpdQGhwHC733Re02OMUZYojmENCGY/aGEYYVL3818kvavIpzxc1XYCdRpMEVAr4uWN0 TvGcLQRhkfdcCQAvTBv8oWQ7MHKgPK8qIEYlTUeSQjvFzPj74A43WWPwjQ+q/CPQJK7zBy xSywUVapXE78xlPs9PqlbN3XuvNsfQ0kgq71SqqK91DbPJYN0nTvHqWTruxgvKC/xsp2zR Wve/fQvzV7DEQVYQVi6TsrHAFIjwJNfwyDND4lkf01K2BBAbqKDZNu264W2dtjRziXWvDU sJZfgZZ07n3o3N0dYk3Zn6sTLL60gk2WThSZ2heOvLJY0gTXOpbjJS4xNi56GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXb2Q6kJNz1QZt; Fri, 25 Aug 2023 22:57:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PMvoUk032221; Fri, 25 Aug 2023 22:57:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PMvoa8032218; Fri, 25 Aug 2023 22:57:50 GMT (envelope-from git) Date: Fri, 25 Aug 2023 22:57:50 GMT Message-Id: <202308252257.37PMvoa8032218@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: 35f36c3ee64f - stable/13 - vfs: track how many times vn_alloc blocked on hitting the vnode limit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 35f36c3ee64f5066c3de7162b1d0558c1776dd00 Auto-Submitted: auto-generated The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=35f36c3ee64f5066c3de7162b1d0558c1776dd00 commit 35f36c3ee64f5066c3de7162b1d0558c1776dd00 Author: Mateusz Guzik AuthorDate: 2023-08-18 23:56:58 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-25 22:56:40 +0000 vfs: track how many times vn_alloc blocked on hitting the vnode limit (cherry picked from commit 64e881f2db968bf10c4aa22668ea270e1b9dd3c1) --- sys/kern/vfs_subr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 57e619abaa15..5cdefca60e7c 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1728,6 +1728,10 @@ vtryrecycle(struct vnode *vp) * vnlru to clear things up, but ultimately always performs a M_WAITOK allocation. */ static u_long vn_alloc_cyclecount; +static u_long vn_alloc_sleeps; + +SYSCTL_ULONG(_vfs, OID_AUTO, vnode_alloc_sleeps, CTLFLAG_RD, &vn_alloc_sleeps, 0, + "Number of times vnode allocation blocked waiting on vnlru"); static struct vnode * __noinline vn_alloc_hard(struct mount *mp) @@ -1762,6 +1766,7 @@ vn_alloc_hard(struct mount *mp) * Wait for space for a new vnode. */ vnlru_kick(); + vn_alloc_sleeps++; msleep(&vnlruproc_sig, &vnode_list_mtx, PVFS, "vlruwk", hz); if (atomic_load_long(&numvnodes) + 1 > desiredvnodes && vnlru_read_freevnodes() > 1) From nobody Fri Aug 25 23:24: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 4RXbcs6x4cz4qx3T; Fri, 25 Aug 2023 23:24: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 4RXbcs6PnXz4Lg8; Fri, 25 Aug 2023 23:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693005853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ad9ccshCXQlijApPRZ0OaoxMraEkX94L5ffbrCLmteE=; b=OYhE+MEdIezicEfSDZ1hi77t8s9zVN0+6007f3LcmJwkBG0r0BsEl1FY9CLiVq/y/KhrU/ d9XY1j7WbR7eR4jCHonPnorEZ8x+PzZRaMmJ1TDDcYXEO6e2RTGn0lAwuRVCXeHCYDgOHs ykgM+7KJCG917Z9ZTTThN6pGryUYxzgKxOk/w2oHQ+R/8ucIw/RTVvhQTCCq6uEatp00v6 dPrASVv8ksMcm19s8mfOG3xchNAugA0XI9dOuHF+ZheGEUX4qcTAePnxa2uxgUr98aMX70 UmhYoLX2IjmMDzqZ46dY5nphYyLWezqAWbECXhs5yjh2u2pNauqXGk8WRdO6cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693005853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ad9ccshCXQlijApPRZ0OaoxMraEkX94L5ffbrCLmteE=; b=S8aJgNc8kdnm76NQP8+eMCWZjngXp6eyr6FMXJLbK+8J6bQOMbhLqrXYdaQ8iPHboXOrAS Zhtgc12AcZ5TJfbZrtgRHS7EL17+DUU2iSVjPUbV2E4wyAHCpQT+jAtP2u2hXzRRexdJAC gbd03et4lYHA8q6oQxME0XhIuEw6Xl+vgnpLhjjmuJOXfZYyJgnZrQRBrTzW8WFzvPRZOH QX5Fn0u9P75/TuaRR3IaOnU0VR2yLEhtC79jz6SsQQeaZ8ZEDqVcfrGdu68vKOXnSPVTdO tchLPT6c7E8tTo5fLqEu5SO6glcPMzYlZDBLjloC1kt3YlH9FngxB8XvdcU4Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693005853; a=rsa-sha256; cv=none; b=Gh+rzlzD5i6qhTNt706KPadplVYDnm1zNMhNBoc1qk94SrLNirgHgAOWnroO8nDj3ThzcT RIQ9POMlttPhpcIhZ7RNzFFsfjdhzqjUoGykOldd5ytxh1rbS/j8k0d3+7JxZWatKZi2qS 9Dpk1Dq7WLo4JviLfrhLzV53fD4P3TDXgvf9hWXUkQpuT0YmML87knhCTLrOvn8NN3K1kS leeuUm0VkkHNB6DOFC3SNxukbY1Mczc49AgTt/WZH19UFwcYdZm0qiLe+MowvpQXupK9IA Ik1ewMVtaxlXrTfD+P+RXW+yCWxrqh5czKFaKyZZe2fIOPpGtHnfwaVBVJngPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXbcs5SqLz1RHl; Fri, 25 Aug 2023 23:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PNODeU082224; Fri, 25 Aug 2023 23:24:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PNOD5v082221; Fri, 25 Aug 2023 23:24:13 GMT (envelope-from git) Date: Fri, 25 Aug 2023 23:24:13 GMT Message-Id: <202308252324.37PNOD5v082221@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: 023ef8015ee6 - main - OptionalObsoleteFiles.inc: Add libprivate{cbor,fido2}_p.a List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 023ef8015ee6c4e76b63db310800a0f2512fea72 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=023ef8015ee6c4e76b63db310800a0f2512fea72 commit 023ef8015ee6c4e76b63db310800a0f2512fea72 Author: John Baldwin AuthorDate: 2023-08-25 23:22:01 +0000 Commit: John Baldwin CommitDate: 2023-08-25 23:22:01 +0000 OptionalObsoleteFiles.inc: Add libprivate{cbor,fido2}_p.a Two more profile libraries that should be removed by WITHOUT_PROFILE. Found when upgrading a stable/13 VM to stable/14. --- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 470f18346dc5..82ea542d7f55 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6991,9 +6991,11 @@ OLD_FILES+=usr/lib/libprivateatf-c++_p.a OLD_FILES+=usr/lib/libprivateatf-c_p.a OLD_FILES+=usr/lib/libprivateauditd_p.a OLD_FILES+=usr/lib/libprivatebsdstat_p.a +OLD_FILES+=usr/lib/libprivatecbor_p.a OLD_FILES+=usr/lib/libprivatedevdctl_p.a OLD_FILES+=usr/lib/libprivateevent_p.a OLD_FILES+=usr/lib/libprivateevent1_p.a +OLD_FILES+=usr/lib/libprivatefido2_p.a OLD_FILES+=usr/lib/libprivategmock_main_p.a OLD_FILES+=usr/lib/libprivategmock_p.a OLD_FILES+=usr/lib/libprivategtest_main_p.a From nobody Sat Aug 26 01:17: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 4RXf792YRVz4r4V0; Sat, 26 Aug 2023 01:17: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 4RXf7922Zyz4VxK; Sat, 26 Aug 2023 01:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693012629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iEBbGZXtldMT95yTSkwM5DzkRBYuqiOWh5Cn/ofRU3Y=; b=TgzzEcbmimtJFmjuH6ia8TQXrfaN58hG9RdALA6VFvGHTZo4XOP7MfJabuUu2gs3z80g7Y iDNUtLqQwV3vrW8jN9FNXdNMUAOhv4Ene+PPMqRPyqwaAKwasGVk/30ne7wni2F13WXPVz MOipjWLnGuMNnzUhE7RxC3+SGKLHnUydHmzyOVMiZx4eEpY8FDtBxUpRnzGFTRamlCc49K DPiYylVSbpbC+flfDn+oHLUHui7XZBmRUToWAKHUxhoZ2raQ9LuuM1+FM8aVj5PXMtMV5w 2BU1UrCSkHQ7xxPZ4W2xjLd4ykadNqGlbR93P4dTdTZWbglM6qHZctHzyXqOvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693012629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iEBbGZXtldMT95yTSkwM5DzkRBYuqiOWh5Cn/ofRU3Y=; b=SHPMBHs9BgjSx5vRvcSHAYs8LQ/x3q0rZmxMT7J7iv9h7FUhG2qi2Wc7jh5YQXIwIkYdSF 9MrF6Sfbr1ygbc5BV2zWskq2vyJC0cVhmdPOPfJf6T+aKwOxxQIX/krbQYi/8khQ6/ixZR UtRftTa1q5VeHDtnYisanHtP3Z9XPyQ09AEF/gdVkVWl4cfFIzZXqzTtuc+Bp6SzeM36mO sDr5sH+BL0d6k5WgfQhcHaWXSjvohElqk4mGkfL+za+cg1MCZeBYQc9rTZKHix/5lzLOZc fNKWYXDVFp3JxA5O76fjR14GEp6ZNud2TgtLhOYPULkCKpwzVNBU4n/SCoK/yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693012629; a=rsa-sha256; cv=none; b=ui1n/dOD0Nt8WdZ9Y3fUvNGqMTQ7hMK2iLmDp9vKlapO5fy2Ln6rx1XJo7+dcv2K54bVuj V6jOActwT/DOXtCNBH649wKXky5vTjqX4uvYuaxrdBFn6kyvDkKAimExgIjTpngCrxKV5S VFeM6VxsOwJwgXMeItx5qK7b+58stS5Oov1gIItLKqDlCPSLEBb7MgUI4Lj7aQ8m8CngqZ DtXJec+amSeQGj5ugH8P4FcOgBjQlnEiXG48VvA9ePZ+ZiXXXz6I2evBGqzhOu0RGKbcmU EDP39XBu3SHn8YREz+7YOVCIQAAt1qM6vzUjXEkAXGvF4HjlcPHmnncDJoKWpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXf790swrzj8; Sat, 26 Aug 2023 01:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37Q1H99Z065477; Sat, 26 Aug 2023 01:17:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37Q1H9Bk065474; Sat, 26 Aug 2023 01:17:09 GMT (envelope-from git) Date: Sat, 26 Aug 2023 01:17:09 GMT Message-Id: <202308260117.37Q1H9Bk065474@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: bbc8585ef557 - main - caroot: drop VERSION tags from certs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bbc8585ef557be36b3fda75e3a41d725aedb1c1e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=bbc8585ef557be36b3fda75e3a41d725aedb1c1e commit bbc8585ef557be36b3fda75e3a41d725aedb1c1e Author: Kyle Evans AuthorDate: 2023-08-26 00:55:32 +0000 Commit: Kyle Evans CommitDate: 2023-08-26 01:16:35 +0000 caroot: drop VERSION tags from certs With this change, we'll drop the "with $FreeBSD$" lines from trusted/ certs in the next update. untrusted/ will need to be done manually, but I'll likely just do them all manually, commit, then run the script and commit any legitimate updates after confirming the output matches what I did manually. Reported by: imp Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41597 --- secure/caroot/MAca-bundle.pl | 3 --- 1 file changed, 3 deletions(-) diff --git a/secure/caroot/MAca-bundle.pl b/secure/caroot/MAca-bundle.pl index 8521b620337f..4feced90d782 100755 --- a/secure/caroot/MAca-bundle.pl +++ b/secure/caroot/MAca-bundle.pl @@ -38,7 +38,6 @@ use Carp; use MIME::Base64; use Getopt::Long; -my $VERSION = '$FreeBSD$'; my $generated = '@' . 'generated'; my $inputfh = *STDIN; my $debug = 0; @@ -79,7 +78,6 @@ sub print_header($$) ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $VERSION ## ## $generated ## @@ -96,7 +94,6 @@ EOFH ## It contains certificates trusted for server authentication. ## ## Extracted from nss -## with $VERSION ## ## $generated ## From nobody Sat Aug 26 01:17: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 4RXf7B3LWVz4r4BC; Sat, 26 Aug 2023 01:17: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 4RXf7B38sPz4Vvk; Sat, 26 Aug 2023 01:17:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693012630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vuk2QOCZFsP+xGYjDe+eDFHCwVEyInoucDeav9v3/f4=; b=EdTAolW5WEzQ+bfvzw0OMSrnz06GSs+90x5WyNFxYL7S5sgAtirdUwQchU1orFen0hVG49 wyfi2YxC7ujUxeAJyTQmAccVM+v50eai/TdArdHMRhrpQNYbiuZzJoN3oJAfAbR4WxQNHn 0CVjB4tLzLw1ICRdwa+3MRnyO3zR36dDCw0OkAvosvcH8M1YTssnjvUWK3kLWhmgSkxila /ikM5xkEhqHSXTW6mc4PeRy6WK5sTSuFWNt/vB5LJJ7izk02WVFzWQ/azo/6GOVPBmKF2u AcrTRE00R45tNIs1oH8Iibvcp7jSMSjykopEqcjLR22KiYvAT1iNpoC+ov+AVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693012630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vuk2QOCZFsP+xGYjDe+eDFHCwVEyInoucDeav9v3/f4=; b=ZuelBXNGDADsE80afh4n9rZa9A7Qi91pvGILSSCBOXTaAY01/1RiW+h/Ba00Qw1suym6La 0hhFGLoiLmbUum/uEL0QL7Sm6DFYX+ZCvYL2zPcm7T8tXEYYJ64K0fS3yt07m3m8nu/UrI OtRns0znmqSNWSYRsQUtii1X2j3Y1auroj2IWXe3UKTJtsltLXnNtHi2bLTydcf0WmDNX+ g8NDkQfFpmo2ClAmyDAzaNRk8Qp9dFfmexAb8RYbMqgsKDVxPkoituAOGIgc5TMsiHpumZ hmJZQpGzvom6DaNORIMaUWmGZ+qcMaXOrTE2NauwbTdDayaMIXWuHnpC0hR6ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693012630; a=rsa-sha256; cv=none; b=XwEyp4CaJltNkig/G2/936IFDNOv18TvLfBL+r2d+XFYVQSOSQlGsI1snwvp36dv80rW/9 iyOuGMRlNuGOj19VTA3fZ5SksOGPib7RNSmCgdUJdhJLRDkSqdvEJiqDwhkfi40lCk4Dp8 AL9sUv9af9GawWPhT+BV2k3XGw3xovEBDYs49S3nrCNkW86deAvR3RHqmOBt42kO6muy28 BrsXBtSMyG0UgrHUscrP1LHK5DTjqIauhS9OhGfgvPxmFnWvl6PnMTenpDhPZ2U2fEJhBg wgT+m/lYfzLI/40HwMRepdkUo/isTDwSBxAyd/hJrx78YAA1BBBBdaVhxVz75Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXf7B1rSdz15B; Sat, 26 Aug 2023 01:17:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37Q1HA3h065529; Sat, 26 Aug 2023 01:17:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37Q1HAfT065526; Sat, 26 Aug 2023 01:17:10 GMT (envelope-from git) Date: Sat, 26 Aug 2023 01:17:10 GMT Message-Id: <202308260117.37Q1HAfT065526@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: 3f84d4b0fe14 - main - caroot: drop the VERSION tag from already-processed certs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3f84d4b0fe1445bca5f3b6a70fc5641b88c31217 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3f84d4b0fe1445bca5f3b6a70fc5641b88c31217 commit 3f84d4b0fe1445bca5f3b6a70fc5641b88c31217 Author: Kyle Evans AuthorDate: 2023-08-26 00:55:32 +0000 Commit: Kyle Evans CommitDate: 2023-08-26 01:16:36 +0000 caroot: drop the VERSION tag from already-processed certs An update is imminent; drop these now to make it easier to audit the results. --- secure/caroot/trusted/ACCVRAIZ1.pem | 1 - secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem | 1 - secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem | 1 - secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem | 1 - secure/caroot/trusted/Actalis_Authentication_Root_CA.pem | 1 - secure/caroot/trusted/AffirmTrust_Commercial.pem | 1 - secure/caroot/trusted/AffirmTrust_Networking.pem | 1 - secure/caroot/trusted/AffirmTrust_Premium.pem | 1 - secure/caroot/trusted/AffirmTrust_Premium_ECC.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_1.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_2.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_3.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_4.pem | 1 - secure/caroot/trusted/Atos_TrustedRoot_2011.pem | 1 - .../Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem | 1 - secure/caroot/trusted/BJCA_Global_Root_CA1.pem | 1 - secure/caroot/trusted/BJCA_Global_Root_CA2.pem | 1 - secure/caroot/trusted/Baltimore_CyberTrust_Root.pem | 1 - secure/caroot/trusted/Buypass_Class_2_Root_CA.pem | 1 - secure/caroot/trusted/Buypass_Class_3_Root_CA.pem | 1 - secure/caroot/trusted/CA_Disig_Root_R2.pem | 1 - secure/caroot/trusted/CFCA_EV_ROOT.pem | 1 - secure/caroot/trusted/COMODO_Certification_Authority.pem | 1 - secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem | 1 - secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem | 1 - secure/caroot/trusted/Certainly_Root_E1.pem | 1 - secure/caroot/trusted/Certainly_Root_R1.pem | 1 - secure/caroot/trusted/Certigna.pem | 1 - secure/caroot/trusted/Certigna_Root_CA.pem | 1 - secure/caroot/trusted/Certum_EC-384_CA.pem | 1 - secure/caroot/trusted/Certum_Trusted_Network_CA.pem | 1 - secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem | 1 - secure/caroot/trusted/Certum_Trusted_Root_CA.pem | 1 - secure/caroot/trusted/Comodo_AAA_Services_root.pem | 1 - secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem | 1 - secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem | 1 - secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem | 1 - secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem | 1 - secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem | 1 - secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem | 1 - secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem | 1 - secure/caroot/trusted/DigiCert_Global_Root_CA.pem | 1 - secure/caroot/trusted/DigiCert_Global_Root_G2.pem | 1 - secure/caroot/trusted/DigiCert_Global_Root_G3.pem | 1 - secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem | 1 - secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem | 1 - secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem | 1 - secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem | 1 - secure/caroot/trusted/E-Tugra_Certification_Authority.pem | 1 - secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem | 1 - secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem | 1 - secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem | 1 - secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem | 1 - secure/caroot/trusted/GLOBALTRUST_2020.pem | 1 - secure/caroot/trusted/GTS_Root_R1.pem | 1 - secure/caroot/trusted/GTS_Root_R2.pem | 1 - secure/caroot/trusted/GTS_Root_R3.pem | 1 - secure/caroot/trusted/GTS_Root_R4.pem | 1 - secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem | 1 - secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem | 1 - secure/caroot/trusted/GlobalSign_Root_CA.pem | 1 - secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem | 1 - secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem | 1 - secure/caroot/trusted/GlobalSign_Root_E46.pem | 1 - secure/caroot/trusted/GlobalSign_Root_R46.pem | 1 - secure/caroot/trusted/Go_Daddy_Class_2_CA.pem | 1 - secure/caroot/trusted/Go_Daddy_Root_Certificate_Authority_-_G2.pem | 1 - secure/caroot/trusted/HARICA_TLS_ECC_Root_CA_2021.pem | 1 - secure/caroot/trusted/HARICA_TLS_RSA_Root_CA_2021.pem | 1 - .../Hellenic_Academic_and_Research_Institutions_ECC_RootCA_2015.pem | 1 - .../trusted/Hellenic_Academic_and_Research_Institutions_RootCA_2015.pem | 1 - secure/caroot/trusted/HiPKI_Root_CA_-_G1.pem | 1 - secure/caroot/trusted/Hongkong_Post_Root_CA_1.pem | 1 - secure/caroot/trusted/Hongkong_Post_Root_CA_3.pem | 1 - secure/caroot/trusted/ISRG_Root_X1.pem | 1 - secure/caroot/trusted/ISRG_Root_X2.pem | 1 - secure/caroot/trusted/IdenTrust_Commercial_Root_CA_1.pem | 1 - secure/caroot/trusted/IdenTrust_Public_Sector_Root_CA_1.pem | 1 - secure/caroot/trusted/Izenpe_com.pem | 1 - secure/caroot/trusted/Microsec_e-Szigno_Root_CA_2009.pem | 1 - secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem | 1 - secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem | 1 - secure/caroot/trusted/NAVER_Global_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/NetLock_Arany__Class_Gold__F__tan__s__tv__ny.pem | 1 - secure/caroot/trusted/OISTE_WISeKey_Global_Root_GB_CA.pem | 1 - secure/caroot/trusted/OISTE_WISeKey_Global_Root_GC_CA.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_1_G3.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_2.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_2_G3.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_3.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_3_G3.pem | 1 - secure/caroot/trusted/SSL_com_EV_Root_Certification_Authority_ECC.pem | 1 - secure/caroot/trusted/SSL_com_EV_Root_Certification_Authority_RSA_R2.pem | 1 - secure/caroot/trusted/SSL_com_Root_Certification_Authority_ECC.pem | 1 - secure/caroot/trusted/SSL_com_Root_Certification_Authority_RSA.pem | 1 - secure/caroot/trusted/SZAFIR_ROOT_CA2.pem | 1 - secure/caroot/trusted/SecureSign_RootCA11.pem | 1 - secure/caroot/trusted/SecureTrust_CA.pem | 1 - secure/caroot/trusted/Secure_Global_CA.pem | 1 - secure/caroot/trusted/Security_Communication_ECC_RootCA1.pem | 1 - secure/caroot/trusted/Security_Communication_RootCA2.pem | 1 - secure/caroot/trusted/Security_Communication_RootCA3.pem | 1 - secure/caroot/trusted/Security_Communication_Root_CA.pem | 1 - secure/caroot/trusted/Starfield_Class_2_CA.pem | 1 - secure/caroot/trusted/Starfield_Root_Certificate_Authority_-_G2.pem | 1 - .../trusted/Starfield_Services_Root_Certificate_Authority_-_G2.pem | 1 - secure/caroot/trusted/SwissSign_Gold_CA_-_G2.pem | 1 - secure/caroot/trusted/SwissSign_Silver_CA_-_G2.pem | 1 - secure/caroot/trusted/T-TeleSec_GlobalRoot_Class_2.pem | 1 - secure/caroot/trusted/T-TeleSec_GlobalRoot_Class_3.pem | 1 - secure/caroot/trusted/TUBITAK_Kamu_SM_SSL_Kok_Sertifikasi_-_Surum_1.pem | 1 - secure/caroot/trusted/TWCA_Global_Root_CA.pem | 1 - secure/caroot/trusted/TWCA_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem | 1 - secure/caroot/trusted/Telia_Root_CA_v2.pem | 1 - secure/caroot/trusted/Trustwave_Global_Certification_Authority.pem | 1 - .../caroot/trusted/Trustwave_Global_ECC_P256_Certification_Authority.pem | 1 - .../caroot/trusted/Trustwave_Global_ECC_P384_Certification_Authority.pem | 1 - secure/caroot/trusted/TunTrust_Root_CA.pem | 1 - secure/caroot/trusted/UCA_Extended_Validation_Root.pem | 1 - secure/caroot/trusted/UCA_Global_G2_Root.pem | 1 - secure/caroot/trusted/USERTrust_ECC_Certification_Authority.pem | 1 - secure/caroot/trusted/USERTrust_RSA_Certification_Authority.pem | 1 - secure/caroot/trusted/XRamp_Global_CA_Root.pem | 1 - secure/caroot/trusted/certSIGN_ROOT_CA.pem | 1 - secure/caroot/trusted/certSIGN_Root_CA_G2.pem | 1 - secure/caroot/trusted/e-Szigno_Root_CA_2017.pem | 1 - secure/caroot/trusted/ePKI_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/emSign_ECC_Root_CA_-_C3.pem | 1 - secure/caroot/trusted/emSign_ECC_Root_CA_-_G3.pem | 1 - secure/caroot/trusted/emSign_Root_CA_-_C1.pem | 1 - secure/caroot/trusted/emSign_Root_CA_-_G1.pem | 1 - secure/caroot/trusted/vTrus_ECC_Root_CA.pem | 1 - secure/caroot/trusted/vTrus_Root_CA.pem | 1 - secure/caroot/untrusted/Camerfirma_Chambers_of_Commerce_Root.pem | 1 - secure/caroot/untrusted/Camerfirma_Global_Chambersign_Root.pem | 1 - secure/caroot/untrusted/Certum_Root_CA.pem | 1 - secure/caroot/untrusted/Chambers_of_Commerce_Root_-_2008.pem | 1 - secure/caroot/untrusted/Cybertrust_Global_Root.pem | 1 - secure/caroot/untrusted/D-TRUST_Root_CA_3_2013.pem | 1 - secure/caroot/untrusted/DST_Root_CA_X3.pem | 1 - secure/caroot/untrusted/EC-ACC.pem | 1 - .../caroot/untrusted/GeoTrust_Primary_Certification_Authority_-_G2.pem | 1 - secure/caroot/untrusted/GlobalSign_Root_CA_-_R2.pem | 1 - secure/caroot/untrusted/Global_Chambersign_Root_-_2008.pem | 1 - .../Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem | 1 - secure/caroot/untrusted/Network_Solutions_Certificate_Authority.pem | 1 - secure/caroot/untrusted/OISTE_WISeKey_Global_Root_GA_CA.pem | 1 - secure/caroot/untrusted/QuoVadis_Root_CA.pem | 1 - secure/caroot/untrusted/Sonera_Class_2_Root_CA.pem | 1 - secure/caroot/untrusted/Staat_der_Nederlanden_EV_Root_CA.pem | 1 - secure/caroot/untrusted/Staat_der_Nederlanden_Root_CA_-_G3.pem | 1 - secure/caroot/untrusted/SwissSign_Platinum_CA_-_G2.pem | 1 - .../Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem | 1 - .../Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem | 1 - secure/caroot/untrusted/TrustCor_ECA-1.pem | 1 - secure/caroot/untrusted/TrustCor_RootCert_CA-1.pem | 1 - secure/caroot/untrusted/TrustCor_RootCert_CA-2.pem | 1 - secure/caroot/untrusted/Trustis_FPS_Root_CA.pem | 1 - .../caroot/untrusted/VeriSign_Universal_Root_Certification_Authority.pem | 1 - .../Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem | 1 - .../Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem | 1 - 166 files changed, 166 deletions(-) diff --git a/secure/caroot/trusted/ACCVRAIZ1.pem b/secure/caroot/trusted/ACCVRAIZ1.pem index 1c96e53b8f17..dbe720481fe4 100644 --- a/secure/caroot/trusted/ACCVRAIZ1.pem +++ b/secure/caroot/trusted/ACCVRAIZ1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem index 6a64be5ce138..22f5764a5d3f 100644 --- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem +++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem index 71ee49574e84..bbd47304c5c9 100644 --- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem +++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem b/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem index 6114a5ccdb2d..4369ffbf1b30 100644 --- a/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem +++ b/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem index 7c971e1229a2..8ea77deeda58 100644 --- a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem +++ b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Commercial.pem b/secure/caroot/trusted/AffirmTrust_Commercial.pem index 282d1a5dcf6f..b1031ad0f348 100644 --- a/secure/caroot/trusted/AffirmTrust_Commercial.pem +++ b/secure/caroot/trusted/AffirmTrust_Commercial.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Networking.pem b/secure/caroot/trusted/AffirmTrust_Networking.pem index 830cf3f0c3c2..1d6a82f767f7 100644 --- a/secure/caroot/trusted/AffirmTrust_Networking.pem +++ b/secure/caroot/trusted/AffirmTrust_Networking.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Premium.pem b/secure/caroot/trusted/AffirmTrust_Premium.pem index 725747aafdaf..ef4c3286bf1c 100644 --- a/secure/caroot/trusted/AffirmTrust_Premium.pem +++ b/secure/caroot/trusted/AffirmTrust_Premium.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem index 6fe75939863e..1a1b7b14e7be 100644 --- a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem +++ b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_1.pem b/secure/caroot/trusted/Amazon_Root_CA_1.pem index 2aca2eee3e9b..996e32e056e9 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_1.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_2.pem b/secure/caroot/trusted/Amazon_Root_CA_2.pem index 95ca81db30bb..fbcb6a47f445 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_2.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_3.pem b/secure/caroot/trusted/Amazon_Root_CA_3.pem index 294f7dc8f0b6..1e45a816b669 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_3.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_4.pem b/secure/caroot/trusted/Amazon_Root_CA_4.pem index 649917b9638a..889f1dc33d52 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_4.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_4.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem index 7058d3fb6edf..b65333ef383d 100644 --- a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem +++ b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem index db4f44195dbd..12342b79afc9 100644 --- a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem +++ b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/BJCA_Global_Root_CA1.pem b/secure/caroot/trusted/BJCA_Global_Root_CA1.pem index 889f140decc8..5023b4465d21 100644 --- a/secure/caroot/trusted/BJCA_Global_Root_CA1.pem +++ b/secure/caroot/trusted/BJCA_Global_Root_CA1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/BJCA_Global_Root_CA2.pem b/secure/caroot/trusted/BJCA_Global_Root_CA2.pem index da44a530a038..e2b2579a9cdf 100644 --- a/secure/caroot/trusted/BJCA_Global_Root_CA2.pem +++ b/secure/caroot/trusted/BJCA_Global_Root_CA2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem b/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem index 0f356d59962f..d253c062d876 100644 --- a/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem +++ b/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem b/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem index 0168f641fd42..c94745194a1f 100644 --- a/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem +++ b/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem b/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem index 7ae24799e638..b86299675116 100644 --- a/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem +++ b/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/CA_Disig_Root_R2.pem b/secure/caroot/trusted/CA_Disig_Root_R2.pem index 0dda6d97e2aa..aa2b13653811 100644 --- a/secure/caroot/trusted/CA_Disig_Root_R2.pem +++ b/secure/caroot/trusted/CA_Disig_Root_R2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/CFCA_EV_ROOT.pem b/secure/caroot/trusted/CFCA_EV_ROOT.pem index 722499b9ed42..01bb0463a686 100644 --- a/secure/caroot/trusted/CFCA_EV_ROOT.pem +++ b/secure/caroot/trusted/CFCA_EV_ROOT.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/COMODO_Certification_Authority.pem b/secure/caroot/trusted/COMODO_Certification_Authority.pem index fc3e4b554cc3..57fb36edd969 100644 --- a/secure/caroot/trusted/COMODO_Certification_Authority.pem +++ b/secure/caroot/trusted/COMODO_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem b/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem index 5f839a858d00..792e7744bda1 100644 --- a/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem +++ b/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem b/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem index 7faefe98b8bf..c467be08adde 100644 --- a/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem +++ b/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certainly_Root_E1.pem b/secure/caroot/trusted/Certainly_Root_E1.pem index 0750f7128ae6..286022c90cfd 100644 --- a/secure/caroot/trusted/Certainly_Root_E1.pem +++ b/secure/caroot/trusted/Certainly_Root_E1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certainly_Root_R1.pem b/secure/caroot/trusted/Certainly_Root_R1.pem index a4e6f28e33a6..c94f1f4f5e04 100644 --- a/secure/caroot/trusted/Certainly_Root_R1.pem +++ b/secure/caroot/trusted/Certainly_Root_R1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certigna.pem b/secure/caroot/trusted/Certigna.pem index e9104ef6c3da..87ed4d66d4eb 100644 --- a/secure/caroot/trusted/Certigna.pem +++ b/secure/caroot/trusted/Certigna.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certigna_Root_CA.pem b/secure/caroot/trusted/Certigna_Root_CA.pem index a0a7248b51ea..e7f9fd8ea2b5 100644 --- a/secure/caroot/trusted/Certigna_Root_CA.pem +++ b/secure/caroot/trusted/Certigna_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_EC-384_CA.pem b/secure/caroot/trusted/Certum_EC-384_CA.pem index 67b5d644f809..46ea4ccb4f32 100644 --- a/secure/caroot/trusted/Certum_EC-384_CA.pem +++ b/secure/caroot/trusted/Certum_EC-384_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_Trusted_Network_CA.pem b/secure/caroot/trusted/Certum_Trusted_Network_CA.pem index 5f92008a47ab..e0141e43298e 100644 --- a/secure/caroot/trusted/Certum_Trusted_Network_CA.pem +++ b/secure/caroot/trusted/Certum_Trusted_Network_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem b/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem index 8dcc08c17b07..57c438e0ff71 100644 --- a/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem +++ b/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_Trusted_Root_CA.pem b/secure/caroot/trusted/Certum_Trusted_Root_CA.pem index d6034eb6e081..86f0fcc8cc03 100644 --- a/secure/caroot/trusted/Certum_Trusted_Root_CA.pem +++ b/secure/caroot/trusted/Certum_Trusted_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Comodo_AAA_Services_root.pem b/secure/caroot/trusted/Comodo_AAA_Services_root.pem index b74de8633a65..2de8ec9b993a 100644 --- a/secure/caroot/trusted/Comodo_AAA_Services_root.pem +++ b/secure/caroot/trusted/Comodo_AAA_Services_root.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem b/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem index 758d61032898..56b6765b9b3e 100644 --- a/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem +++ b/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem b/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem index 76991855eaa1..9de2c038f456 100644 --- a/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem +++ b/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem index 5d2077a83e4c..0aa7731fe9f2 100644 --- a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem +++ b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem index d70caff62777..85d054b99954 100644 --- a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem +++ b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem b/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem index 517dab4f837a..b81c4744a9a6 100644 --- a/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem +++ b/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem b/secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem index 3739c66f53eb..4993a90b08f6 100644 --- a/secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem +++ b/secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem b/secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem index ee8a53c317d0..c615f8e63cc2 100644 --- a/secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem +++ b/secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Global_Root_CA.pem b/secure/caroot/trusted/DigiCert_Global_Root_CA.pem index cc0b5a3e7630..cfab16709099 100644 --- a/secure/caroot/trusted/DigiCert_Global_Root_CA.pem +++ b/secure/caroot/trusted/DigiCert_Global_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Global_Root_G2.pem b/secure/caroot/trusted/DigiCert_Global_Root_G2.pem index 3775aa16ce1b..78151fb4134f 100644 --- a/secure/caroot/trusted/DigiCert_Global_Root_G2.pem +++ b/secure/caroot/trusted/DigiCert_Global_Root_G2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Global_Root_G3.pem b/secure/caroot/trusted/DigiCert_Global_Root_G3.pem index 650cbb7ce8e2..a3be0dd9dc65 100644 --- a/secure/caroot/trusted/DigiCert_Global_Root_G3.pem +++ b/secure/caroot/trusted/DigiCert_Global_Root_G3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem b/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem index 45bcd8a2be14..86c98926de70 100644 --- a/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem +++ b/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem b/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem index a6f2e6a0c771..28c625e6c46a 100644 --- a/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem +++ b/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem b/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem index cb58c6a21418..1d3a8c4f7a12 100644 --- a/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem +++ b/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem b/secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem index 26d81069d1a8..4632fefb2b9b 100644 --- a/secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem +++ b/secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem b/secure/caroot/trusted/E-Tugra_Certification_Authority.pem index 1f5aa1a16a84..95a0ba7e8de6 100644 --- a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem +++ b/secure/caroot/trusted/E-Tugra_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem b/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem index 589b4f911531..3e58355e78a5 100644 --- a/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem +++ b/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem b/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem index 147ba810d1d6..d48fb141df67 100644 --- a/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem +++ b/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem b/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem index c33759f08280..2a206b3748a3 100644 --- a/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem +++ b/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem index ad40a3142c9a..7e79091827e3 100644 --- a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem +++ b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem index d3f94f45a7e7..947754ffb105 100644 --- a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem +++ b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem index 1bf2c8b128b3..200cee2a7463 100644 --- a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem +++ b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem b/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem index 3f6795a51478..c5f535fe7a73 100644 --- a/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem +++ b/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem b/secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem index 0936e508d0da..acc3636957a1 100644 --- a/secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem +++ b/secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GLOBALTRUST_2020.pem b/secure/caroot/trusted/GLOBALTRUST_2020.pem index 2b9f9fc388f8..7914ff34f93b 100644 --- a/secure/caroot/trusted/GLOBALTRUST_2020.pem +++ b/secure/caroot/trusted/GLOBALTRUST_2020.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GTS_Root_R1.pem b/secure/caroot/trusted/GTS_Root_R1.pem index 4def2f4c2b7f..6910d2801124 100644 --- a/secure/caroot/trusted/GTS_Root_R1.pem +++ b/secure/caroot/trusted/GTS_Root_R1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GTS_Root_R2.pem b/secure/caroot/trusted/GTS_Root_R2.pem index 4bc8cff4c812..c56351d3f7de 100644 --- a/secure/caroot/trusted/GTS_Root_R2.pem +++ b/secure/caroot/trusted/GTS_Root_R2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GTS_Root_R3.pem b/secure/caroot/trusted/GTS_Root_R3.pem index ca17a9220f72..10aa5af7d197 100644 --- a/secure/caroot/trusted/GTS_Root_R3.pem +++ b/secure/caroot/trusted/GTS_Root_R3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GTS_Root_R4.pem b/secure/caroot/trusted/GTS_Root_R4.pem index d8c21bf91bdc..53004c331888 100644 --- a/secure/caroot/trusted/GTS_Root_R4.pem +++ b/secure/caroot/trusted/GTS_Root_R4.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem b/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem index 0b773b02b88c..c0eb35c4dfab 100644 --- a/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem +++ b/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem b/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem index c95e7a2cf92f..2f5b2e2db0c3 100644 --- a/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem +++ b/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GlobalSign_Root_CA.pem b/secure/caroot/trusted/GlobalSign_Root_CA.pem index 1fc32ec982e3..e6ccef46ed7e 100644 --- a/secure/caroot/trusted/GlobalSign_Root_CA.pem +++ b/secure/caroot/trusted/GlobalSign_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem b/secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem index f55b379232f2..9c582e4402d3 100644 --- a/secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem +++ b/secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem b/secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem index b67daf31ec2b..b03dda654e02 100644 --- a/secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem +++ b/secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated *** 1189 LINES SKIPPED *** From nobody Sat Aug 26 01:17: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 4RXf7C4Fbnz4r4b9; Sat, 26 Aug 2023 01:17: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 4RXf7C3vxBz4WG6; Sat, 26 Aug 2023 01:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693012631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=roszOXHPBus9D2rHu9n0VSbwmKpnzjGvTkSNJMFi06c=; b=PByFtlY+Ee2pXUh0fgYHYPmwHoXa9jrNN+LewKaa4HqGQeGSGtmhjovs4gInaObACimfiq 2pMti7jazQ6/TNhhj5isRDf7w5OCr9WqTJWDSeo8xfa8UX+MghaDUI1SM09il5meKwTlCJ M6LEfaEjbPvRvAyhKm/TfR0fZXfk7kzfaZtQqz2xcRjB4rhokVhD/oZw3alf5RN+mqFaUO jSRCTIMvB1JlfkPfYvPR7rCoY0pjzGjwy/hDC/JJknrpkGa6X4e5SINHbjdYE/dg4tyxgi xaV4SKTyDBFI7ZoZ8gxlBuo6WUKJMmzP5IvzJ37PXRU5OhXs8qOWdnpQq4dMgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693012631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=roszOXHPBus9D2rHu9n0VSbwmKpnzjGvTkSNJMFi06c=; b=BH7pniRjHFT3KzQilDoo5buJK9zWlm+MSatTPgIcPtEVz0sS8uUbqO11gYzbKQCDU25GGm dPIeDgOYehkMrYTWGEYZfrKQV+YeZP/Qtn5u2pWxtRqJVH20mGovO2qxSiqbLs1sw7aKT3 zQtwc77K9RdoET9r7xcQMBQiEaJ9E5VQEAFySqlTs2l5nQHq9xXiVafwkA4ErkPA4Yb/lI tFsPTqe1FKD/z03mUDaKtYiG63PXvnbyy/3sX2/3oZTPBBEHMUI2PQlM8NVusMU+sKRVg6 pYno89gJGhGnn2kO47WjfHBF7Em5+lQkYm+UKhjEKzYfOI1amKrR3T2f2iyFSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693012631; a=rsa-sha256; cv=none; b=S7WVYAkep4pzlE/BCp82XJkdgPBEB9IQTEcBv3ApQfYBVZrPm1wUetYKmCSSFSOyqfagEs 4JLe08kuFTQiHGhdBB2aiuuLXYvIKRknz+b+i+ODIAzqdd1MJYTQ0rDTKd3bpGiOclZFNz SL/M6DVpF5hJDgVVdpX03KIdm7t3sRioedG8WWgZIeCTETAjVcF7NKZdX1pyjsaZ1U4sDS yV5xN3Zrd6KTyTdoHzof5Npu6FnyF12bfOH5uJrjHWhkKj15fUVPFqe6yVgnohsFFpA5Qu zIYle6svTlg/PvhhquVbj59vsRiU8FiNlUDA+HfvSB67kzLLleg+oRWbLfV5ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXf7C2hhtzxK; Sat, 26 Aug 2023 01:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37Q1HBTr065574; Sat, 26 Aug 2023 01:17:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37Q1HBee065571; Sat, 26 Aug 2023 01:17:11 GMT (envelope-from git) Date: Sat, 26 Aug 2023 01:17:11 GMT Message-Id: <202308260117.37Q1HBee065571@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: 65fd80909e19 - main - caroot: update the root bundle List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 65fd80909e196c8be2ce5e948775e9cbda2ef069 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=65fd80909e196c8be2ce5e948775e9cbda2ef069 commit 65fd80909e196c8be2ce5e948775e9cbda2ef069 Author: Kyle Evans AuthorDate: 2023-08-26 01:01:47 +0000 Commit: Kyle Evans CommitDate: 2023-08-26 01:16:36 +0000 caroot: update the root bundle Summary: - Six (6) new roots - Four (4) distrusted roots Note that this was intentionally generated with OpenSSL 1.1.1 to avoid mixing updates and non-functional changes -- there will be some churn with OpenSSL 3. The next commit will update the current batch of trusted certs with the format OpenSSL 3 produces, which I've tested against OpenSSL 1.1.1 to be sure that that doesn't hurt us in older branches. --- ObsoleteFiles.inc | 6 + .../Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem | 66 ++++++++++ .../Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem | 133 ++++++++++++++++++++ .../trusted/SSL_com_TLS_ECC_Root_CA_2022.pem | 69 +++++++++++ .../trusted/SSL_com_TLS_RSA_Root_CA_2022.pem | 137 +++++++++++++++++++++ ...ctigo_Public_Server_Authentication_Root_E46.pem | 66 ++++++++++ ...ctigo_Public_Server_Authentication_Root_R46.pem | 134 ++++++++++++++++++++ .../E-Tugra_Certification_Authority.pem | 0 .../E-Tugra_Global_Root_CA_ECC_v3.pem | 0 .../E-Tugra_Global_Root_CA_RSA_v3.pem | 0 .../Hongkong_Post_Root_CA_1.pem | 0 11 files changed, 611 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 655a81cd900f..47709c00667d 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20230825: caroot bundle updated +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Certification_Authority.pem +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem +OLD_FILES+=usr/share/certs/trusted/Hongkong_Post_Root_CA_1.pem + # 20230807: GoogleTest 1.14.0 upgrade. OLD_FILES+=usr/include/private/gmock/gmock-generated-actions.h OLD_FILES+=usr/include/private/gmock/gmock-generated-function-mockers.h diff --git a/secure/caroot/trusted/Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem b/secure/caroot/trusted/Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem new file mode 100644 index 000000000000..af7f2e061651 --- /dev/null +++ b/secure/caroot/trusted/Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem @@ -0,0 +1,66 @@ +## +## Atos TrustedRoot Root CA ECC TLS 2021 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 3d:98:3b:a6:66:3d:90:63:f7:7e:26:57:38:04:ef:00 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: CN = Atos TrustedRoot Root CA ECC TLS 2021, O = Atos, C = DE + Validity + Not Before: Apr 22 09:26:23 2021 GMT + Not After : Apr 17 09:26:22 2041 GMT + Subject: CN = Atos TrustedRoot Root CA ECC TLS 2021, O = Atos, C = DE + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:96:86:58:28:37:0a:67:d0:a0:de:24:19:19:e1: + e4:05:07:1f:97:ed:e8:64:82:b9:f6:c4:71:50:ce: + 8a:0c:ff:d7:b5:76:bb:a1:6c:93:6c:83:a2:68:6e: + a5:d9:be:2c:88:95:41:cd:5d:dd:b1:ca:83:63:83: + cc:c0:be:74:d9:e0:9d:a4:ee:4a:4e:56:e0:98:29: + 41:93:52:10:d5:24:38:02:32:67:f1:94:12:6f:ef: + d7:c5:de:2e:fd:19:80 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 76:28:25:D6:7D:E0:66:9A:7A:09:B2:6A:3B:8E:33:D7:36:D3:4F:A2 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + 30:65:02:30:5b:99:29:f3:9c:31:b6:89:6b:6c:d6:bd:77:e1: + 7c:e7:51:7e:b8:3a:cd:a3:36:5f:7c:f7:3c:77:3e:e4:50:ad: + a8:e7:d2:59:0c:26:8e:30:3b:6e:08:2a:c2:a7:5a:c8:02:31: + 00:99:e3:0c:e7:a3:c3:af:d3:49:2e:46:82:23:66:5d:c9:00: + 14:12:fd:38:f4:e1:98:6b:77:29:7a:db:24:cf:65:40:bf:d2: + dc:8c:11:e8:f4:7d:7f:20:84:a9:42:e4:28 +SHA1 Fingerprint=9E:BC:75:10:42:B3:02:F3:81:F4:F7:30:62:D4:8F:C3:A7:51:B2:DD +-----BEGIN CERTIFICATE----- +MIICFTCCAZugAwIBAgIQPZg7pmY9kGP3fiZXOATvADAKBggqhkjOPQQDAzBMMS4w +LAYDVQQDDCVBdG9zIFRydXN0ZWRSb290IFJvb3QgQ0EgRUNDIFRMUyAyMDIxMQ0w +CwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0yMTA0MjIwOTI2MjNaFw00MTA0 +MTcwOTI2MjJaMEwxLjAsBgNVBAMMJUF0b3MgVHJ1c3RlZFJvb3QgUm9vdCBDQSBF +Q0MgVExTIDIwMjExDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRFMHYwEAYHKoZI +zj0CAQYFK4EEACIDYgAEloZYKDcKZ9Cg3iQZGeHkBQcfl+3oZIK59sRxUM6KDP/X +tXa7oWyTbIOiaG6l2b4siJVBzV3dscqDY4PMwL502eCdpO5KTlbgmClBk1IQ1SQ4 +AjJn8ZQSb+/Xxd4u/RmAo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR2 +KCXWfeBmmnoJsmo7jjPXNtNPojAOBgNVHQ8BAf8EBAMCAYYwCgYIKoZIzj0EAwMD +aAAwZQIwW5kp85wxtolrbNa9d+F851F+uDrNozZffPc8dz7kUK2o59JZDCaOMDtu +CCrCp1rIAjEAmeMM56PDr9NJLkaCI2ZdyQAUEv049OGYa3cpetskz2VAv9LcjBHo +9H1/IISpQuQo +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem b/secure/caroot/trusted/Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem new file mode 100644 index 000000000000..7c6033b46658 --- /dev/null +++ b/secure/caroot/trusted/Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem @@ -0,0 +1,133 @@ +## +## Atos TrustedRoot Root CA RSA TLS 2021 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 53:d5:cf:e6:19:93:0b:fb:2b:05:12:d8:c2:2a:a2:a4 + Signature Algorithm: sha384WithRSAEncryption + Issuer: CN = Atos TrustedRoot Root CA RSA TLS 2021, O = Atos, C = DE + Validity + Not Before: Apr 22 09:21:10 2021 GMT + Not After : Apr 17 09:21:09 2041 GMT + Subject: CN = Atos TrustedRoot Root CA RSA TLS 2021, O = Atos, C = DE + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:b6:80:0e:c4:79:bd:05:8c:7d:b0:a3:9d:4d:22: + 4d:cb:f0:41:97:4d:59:e0:d1:fe:56:8c:97:f2:d7: + bd:8f:6c:b7:23:8f:5f:d5:c4:d8:41:cb:f2:02:1e: + 71:e5:e9:f6:5e:cb:08:2a:5e:30:f2:2d:66:c7:84: + 1b:64:57:38:9d:75:2d:56:c6:2f:61:ef:96:fc:20: + 46:bd:eb:d4:7b:3f:3f:7c:47:38:04:a9:1b:aa:52: + df:13:37:d3:15:15:4e:bd:5f:7c:af:ad:63:c7:79: + dc:08:7b:d5:a0:e5:f7:5b:75:ac:80:55:99:92:61: + 9b:cd:2a:17:7d:db:8f:f4:b5:6a:ea:17:4a:64:28: + 66:15:29:6c:02:f1:6b:d5:ba:a3:33:dc:5a:67:a7: + 05:e2:bf:65:b6:16:b0:10:ed:cd:50:33:c9:70:50: + ec:19:8e:b0:c7:f2:74:5b:6b:44:c6:7d:96:b9:98: + 08:59:66:de:29:01:9b:f4:2a:6d:d3:15:3a:90:6a: + 67:f1:b4:6b:66:d9:21:eb:ca:d9:62:7c:46:10:5c: + de:75:49:67:9e:42:f9:fe:75:a9:a3:ad:ff:76:0a: + 67:40:e3:c5:f7:8d:c7:85:9a:59:9e:62:9a:6a:ed: + 45:87:98:67:b2:d5:4a:3c:d7:b4:3b:00:0d:c0:8f: + 1f:e1:40:c4:ae:6c:21:dc:49:7e:7e:ca:b2:8d:6d: + b6:bf:93:2f:a1:5c:3e:8f:ca:ed:80:8e:58:e1:db: + 57:cf:85:36:38:b2:71:a4:09:8c:92:89:08:88:48: + f1:40:63:18:b2:5b:8c:5a:e3:c3:d3:17:aa:ab:19: + a3:2c:1b:e4:d5:c6:e2:66:7a:d7:82:19:a6:3b:16: + 2c:2f:71:87:5f:45:9e:95:73:93:c2:42:81:21:13: + 96:d7:9d:bb:93:68:15:fa:9d:a4:1d:8c:f2:81:e0: + 58:06:bd:c9:b6:e3:f6:89:5d:89:f9:ac:44:a1:cb: + 6b:fa:16:f1:c7:50:3d:24:da:f7:c3:e4:87:d5:56: + f1:4f:90:30:fa:45:09:59:da:34:ce:e0:13:1c:04: + 7c:00:d4:9b:86:a4:40:bc:d9:dc:4c:57:7e:ae:b7: + 33:b6:5e:76:e1:65:8b:66:df:8d:ca:d7:98:af:ce: + 36:98:8c:9c:83:99:03:70:f3:af:74:ed:c6:0e:36: + e7:bd:ec:c1:73:a7:94:5a:cb:92:64:82:a6:00:c1: + 70:a1:6e:2c:29:e1:58:57:ec:5a:7c:99:6b:25:a4: + 90:3a:80:f4:20:9d:9a:ce:c7:2d:f9:b2:4b:29:95: + 83:e9:35:8d:a7:49:48:a7:0f:4c:19:91:d0:f5:bf: + 10:e0:71 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 74:49:99:D1:FF:B4:7A:68:45:75:C3:7E:B4:DC:CC:CE:39:33:DA:08 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + Signature Algorithm: sha384WithRSAEncryption + 23:43:53:24:62:5c:6d:fd:3e:c2:cf:55:00:6c:c5:56:88:b9: + 0e:dd:3a:e2:25:0d:95:4a:97:ca:80:89:ee:2a:cd:65:f8:db: + 16:e0:09:92:e0:18:c7:78:98:bb:f3:ec:42:52:fb:a9:a4:82: + d7:4d:d8:8a:fc:e4:4e:fd:ab:90:c4:38:75:32:84:9f:ff:b3: + b0:2b:02:33:36:c0:10:90:6f:1d:9c:af:e1:69:93:ec:a3:45: + 2f:14:9f:f5:4c:2a:65:43:72:0c:f7:c3:f8:95:8b:14:f3:85: + 20:62:dd:54:53:dd:2c:dc:18:95:69:4f:83:47:70:40:33:58: + 77:12:0c:a2:eb:52:31:1e:4c:c9:a8:ce:c5:ef:c3:d1:ad:e0: + 6b:03:00:34:26:b4:54:21:35:97:01:dc:5f:1b:f1:7c:e7:55: + fa:2d:68:77:7b:d3:69:cc:d3:0e:6b:ba:4d:76:44:d6:c2:15: + 9a:26:ec:b0:c5:f5:bb:d1:7a:74:c2:6c:cd:c5:b5:5e:f6:4c: + e6:5b:2d:81:db:b3:b7:3a:97:9e:ed:cf:46:b2:50:3d:84:60: + 99:71:b5:33:b5:57:45:e6:42:47:75:6a:0e:b0:08:0c:ae:bd: + de:f7:bb:0f:58:3d:8f:03:31:e8:3d:82:50:ca:2f:5e:0c:5d: + b4:97:be:20:34:07:f4:c4:12:e1:ee:d7:b0:d9:59:2d:69:f7: + 31:04:f4:f2:f9:ab:f9:13:31:f8:01:77:0e:3d:42:23:26:cc: + 9a:72:67:51:21:7a:cc:3c:85:a8:ea:21:6a:3b:db:5a:3c:a5: + 34:9e:9a:c0:2c:df:80:9c:29:e0:df:77:94:d1:a2:80:42:ff: + 6a:4c:5b:11:d0:f5:cd:a2:be:ae:cc:51:5c:c3:d5:54:7b:0c: + ae:d6:b9:06:77:80:e2:ef:07:1a:68:cc:59:51:ad:7e:5c:67: + 6b:b9:db:e2:07:42:5b:b8:01:05:58:39:4d:e4:bb:98:a3:b1: + 32:ec:d9:a3:d6:6f:94:23:ff:3b:b7:29:65:e6:07:e9:ef:b6: + 19:ea:e7:c2:38:1d:32:88:90:3c:13:2b:6e:cc:ef:ab:77:06: + 34:77:84:4f:72:e4:81:84:f9:b9:74:34:de:76:4f:92:2a:53: + b1:25:39:db:3c:ff:e5:3e:a6:0e:e5:6b:9e:ff:db:ec:2f:74: + 83:df:8e:b4:b3:a9:de:14:4d:ff:31:a3:45:73:24:fa:95:29: + cc:12:97:04:a2:38:b6:8d:b0:f0:37:fc:c8:21:7f:3f:b3:24: + 1b:3d:8b:6e:cc:4d:b0:16:0d:96:1d:83:1f:46:c0:9b:bd:43: + 99:e7:c4:96:2e:ce:5f:c9 +SHA1 Fingerprint=18:52:3B:0D:06:37:E4:D6:3A:DF:23:E4:98:FB:5B:16:FB:86:74:48 +-----BEGIN CERTIFICATE----- +MIIFZDCCA0ygAwIBAgIQU9XP5hmTC/srBRLYwiqipDANBgkqhkiG9w0BAQwFADBM +MS4wLAYDVQQDDCVBdG9zIFRydXN0ZWRSb290IFJvb3QgQ0EgUlNBIFRMUyAyMDIx +MQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0yMTA0MjIwOTIxMTBaFw00 +MTA0MTcwOTIxMDlaMEwxLjAsBgNVBAMMJUF0b3MgVHJ1c3RlZFJvb3QgUm9vdCBD +QSBSU0EgVExTIDIwMjExDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRFMIICIjAN +BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtoAOxHm9BYx9sKOdTSJNy/BBl01Z +4NH+VoyX8te9j2y3I49f1cTYQcvyAh5x5en2XssIKl4w8i1mx4QbZFc4nXUtVsYv +Ye+W/CBGvevUez8/fEc4BKkbqlLfEzfTFRVOvV98r61jx3ncCHvVoOX3W3WsgFWZ +kmGbzSoXfduP9LVq6hdKZChmFSlsAvFr1bqjM9xaZ6cF4r9lthawEO3NUDPJcFDs +GY6wx/J0W2tExn2WuZgIWWbeKQGb9Cpt0xU6kGpn8bRrZtkh68rZYnxGEFzedUln +nkL5/nWpo63/dgpnQOPF943HhZpZnmKaau1Fh5hnstVKPNe0OwANwI8f4UDErmwh +3El+fsqyjW22v5MvoVw+j8rtgI5Y4dtXz4U2OLJxpAmMkokIiEjxQGMYsluMWuPD +0xeqqxmjLBvk1cbiZnrXghmmOxYsL3GHX0WelXOTwkKBIROW1527k2gV+p2kHYzy +geBYBr3JtuP2iV2J+axEoctr+hbxx1A9JNr3w+SH1VbxT5Aw+kUJWdo0zuATHAR8 +ANSbhqRAvNncTFd+rrcztl524WWLZt+NyteYr842mIycg5kDcPOvdO3GDjbnvezB +c6eUWsuSZIKmAMFwoW4sKeFYV+xafJlrJaSQOoD0IJ2azsct+bJLKZWD6TWNp0lI +pw9MGZHQ9b8Q4HECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU +dEmZ0f+0emhFdcN+tNzMzjkz2ggwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB +DAUAA4ICAQAjQ1MkYlxt/T7Cz1UAbMVWiLkO3TriJQ2VSpfKgInuKs1l+NsW4AmS +4BjHeJi78+xCUvuppILXTdiK/ORO/auQxDh1MoSf/7OwKwIzNsAQkG8dnK/haZPs +o0UvFJ/1TCplQ3IM98P4lYsU84UgYt1UU90s3BiVaU+DR3BAM1h3Egyi61IxHkzJ +qM7F78PRreBrAwA0JrRUITWXAdxfG/F851X6LWh3e9NpzNMOa7pNdkTWwhWaJuyw +xfW70Xp0wmzNxbVe9kzmWy2B27O3Opee7c9GslA9hGCZcbUztVdF5kJHdWoOsAgM +rr3e97sPWD2PAzHoPYJQyi9eDF20l74gNAf0xBLh7tew2VktafcxBPTy+av5EzH4 +AXcOPUIjJsyacmdRIXrMPIWo6iFqO9taPKU0nprALN+AnCng33eU0aKAQv9qTFsR +0PXNor6uzFFcw9VUewyu1rkGd4Di7wcaaMxZUa1+XGdrudviB0JbuAEFWDlN5LuY +o7Ey7Nmj1m+UI/87tyll5gfp77YZ6ufCOB0yiJA8EytuzO+rdwY0d4RPcuSBhPm5 +dDTedk+SKlOxJTnbPP/lPqYO5Wue/9vsL3SD3460s6neFE3/MaNFcyT6lSnMEpcE +oji2jbDwN/zIIX8/syQbPYtuzE2wFg2WHYMfRsCbvUOZ58SWLs5fyQ== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/SSL_com_TLS_ECC_Root_CA_2022.pem b/secure/caroot/trusted/SSL_com_TLS_ECC_Root_CA_2022.pem new file mode 100644 index 000000000000..1a1f829cd2ef --- /dev/null +++ b/secure/caroot/trusted/SSL_com_TLS_ECC_Root_CA_2022.pem @@ -0,0 +1,69 @@ +## +## SSL.com TLS ECC Root CA 2022 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 14:03:f5:ab:fb:37:8b:17:40:5b:e2:43:b2:a5:d1:c4 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = SSL Corporation, CN = SSL.com TLS ECC Root CA 2022 + Validity + Not Before: Aug 25 16:33:48 2022 GMT + Not After : Aug 19 16:33:47 2046 GMT + Subject: C = US, O = SSL Corporation, CN = SSL.com TLS ECC Root CA 2022 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:45:29:35:73:fa:c2:b8:23:ce:14:7d:a8:b1:4d: + a0:5b:36:ee:2a:2c:53:c3:60:09:35:b2:24:66:26: + 69:c0:b3:95:d6:5d:92:40:19:0e:c6:a5:13:70:f4: + ef:12:51:28:5d:e7:cc:bd:f9:3c:85:c1:cf:94:90: + c9:2b:ce:92:42:58:59:67:fd:94:27:10:64:8c:4f: + 04:b1:4d:49:e4:7b:4f:9b:f5:e7:08:f8:03:88:f7: + a7:c3:92:4b:19:54:81 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:89:8F:2F:A3:E8:2B:A0:14:54:7B:F3:56:B8:26:5F:67:38:0B:9C:D0 + + X509v3 Subject Key Identifier: + 89:8F:2F:A3:E8:2B:A0:14:54:7B:F3:56:B8:26:5F:67:38:0B:9C:D0 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + 30:65:02:30:55:e3:22:56:e9:d7:92:24:58:4f:1e:94:32:0f: + 0c:02:36:c2:fd:ac:74:32:4e:e1:fb:1c:80:88:a3:cc:fb:d7: + eb:2b:ff:37:7d:f0:ed:d7:9e:75:6a:35:76:52:45:e0:02:31: + 00:c7:8d:6f:42:20:8f:be:b6:4d:59:ed:77:4d:29:c4:20:20: + 45:64:86:3a:50:c6:c4:ad:2d:93:f5:18:7d:72:ed:a9:cf:c4: + ac:57:36:28:08:65:df:3c:79:66:7e:a0:ea +SHA1 Fingerprint=9F:5F:D9:1A:54:6D:F5:0C:71:F0:EE:7A:BD:17:49:98:84:73:E2:39 +-----BEGIN CERTIFICATE----- +MIICOjCCAcCgAwIBAgIQFAP1q/s3ixdAW+JDsqXRxDAKBggqhkjOPQQDAzBOMQsw +CQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSUwIwYDVQQDDBxT +U0wuY29tIFRMUyBFQ0MgUm9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2MzM0OFoXDTQ2 +MDgxOTE2MzM0N1owTjELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD1NTTCBDb3Jwb3Jh +dGlvbjElMCMGA1UEAwwcU1NMLmNvbSBUTFMgRUNDIFJvb3QgQ0EgMjAyMjB2MBAG +ByqGSM49AgEGBSuBBAAiA2IABEUpNXP6wrgjzhR9qLFNoFs27iosU8NgCTWyJGYm +acCzldZdkkAZDsalE3D07xJRKF3nzL35PIXBz5SQySvOkkJYWWf9lCcQZIxPBLFN +SeR7T5v15wj4A4j3p8OSSxlUgaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSME +GDAWgBSJjy+j6CugFFR781a4Jl9nOAuc0DAdBgNVHQ4EFgQUiY8vo+groBRUe/NW +uCZfZzgLnNAwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2gAMGUCMFXjIlbp +15IkWE8elDIPDAI2wv2sdDJO4fscgIijzPvX6yv/N33w7deedWo1dlJF4AIxAMeN +b0Igj762TVntd00pxCAgRWSGOlDGxK0tk/UYfXLtqc/ErFc2KAhl3zx5Zn6g6g== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/SSL_com_TLS_RSA_Root_CA_2022.pem b/secure/caroot/trusted/SSL_com_TLS_RSA_Root_CA_2022.pem new file mode 100644 index 000000000000..090019495424 --- /dev/null +++ b/secure/caroot/trusted/SSL_com_TLS_RSA_Root_CA_2022.pem @@ -0,0 +1,137 @@ +## +## SSL.com TLS RSA Root CA 2022 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 6f:be:da:ad:73:bd:08:40:e2:8b:4d:be:d4:f7:5b:91 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = US, O = SSL Corporation, CN = SSL.com TLS RSA Root CA 2022 + Validity + Not Before: Aug 25 16:34:22 2022 GMT + Not After : Aug 19 16:34:21 2046 GMT + Subject: C = US, O = SSL Corporation, CN = SSL.com TLS RSA Root CA 2022 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:d0:a4:09:72:4f:40:88:12:61:3e:35:23:9e:ee: + f6:74:cf:2f:7b:58:3d:ce:3c:0d:10:28:90:2f:97: + f7:8c:48:d8:a0:d8:25:b1:4c:b0:11:4c:17:73:50: + d0:22:4a:63:bb:81:d3:29:6e:d5:b5:09:3e:26:18: + 7f:b2:12:7f:93:98:b7:af:f0:36:bf:f2:ee:18:9e: + 9c:3b:52:c5:47:19:5d:74:f3:64:66:d5:5d:c7:68: + b4:bf:1b:1c:06:a3:bc:8f:40:23:b6:1e:c6:84:bd: + 51:c4:1b:39:c1:95:d2:29:ec:4b:ae:7b:2d:bf:39: + fd:b4:62:de:96:7b:41:c6:9c:a0:e0:06:72:fb:f0: + 07:97:09:39:81:74:af:f7:34:59:11:57:0a:c2:5b: + c1:24:f4:31:73:30:82:c6:9d:ba:02:f7:3e:7c:44: + 5f:83:0d:f3:f1:dd:20:69:16:09:50:e2:d4:55:b6: + e0:80:72:76:6e:4c:47:b7:75:55:59:b4:53:74:d9: + 94:c6:41:ad:58:8a:31:66:0f:1e:a2:1b:29:40:4e: + 2f:df:7b:e6:16:2c:2d:fc:bf:ec:f3:b4:fa:be:18: + f6:9b:49:d4:ee:05:6e:d9:34:f3:9c:f1:ec:01:8b: + d1:20:c6:0f:a0:b5:bc:17:4e:48:7b:51:c2:fc:e9: + 5c:69:37:47:66:b3:68:f8:15:28:f0:b9:d3:a4:15: + cc:5a:4f:ba:52:70:a3:12:45:dd:c6:ba:4e:fb:c2: + d0:f7:a8:52:27:6d:6e:79:b5:8c:fc:7b:8c:c1:16: + 4c:ee:80:7f:be:f0:76:be:41:53:12:33:ae:5a:38: + 42:ab:d7:0f:3e:41:8d:76:07:32:d5:ab:89:f6:4e: + 67:d9:b1:42:75:23:6e:f3:cd:42:b2:fc:55:f5:53: + 87:17:3b:c0:33:58:f1:52:d2:f9:80:a4:f0:e8:f0: + 3b:8b:38:cc:a4:c6:90:7f:0f:9c:fd:8b:d1:a3:cf: + da:83:a7:69:c9:50:36:d5:5c:05:d2:0a:41:74:db: + 63:11:37:c1:a5:a0:96:4b:1e:8c:16:12:77:ae:94: + 34:7b:1e:7f:c2:66:00:e4:aa:83:ea:8a:90:ad:ce: + 36:44:4d:d1:51:e9:bc:1f:f3:6a:05:fd:c0:74:1f: + 25:19:40:51:6e:ea:82:51:40:df:9b:b9:08:2a:06: + 02:d5:23:1c:13:d6:e9:db:db:c6:b0:7a:cb:7b:27: + 9b:fb:e0:d5:46:24:ed:10:4b:63:4b:a5:05:8f:ba: + b8:1d:2b:a6:fa:91:e2:92:52:bd:ec:eb:67:97:6d: + 9a:2d:9f:81:32:05:67:32:fb:48:08:3f:d9:25:b8: + 04:25:2f + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:FB:2E:37:EE:E3:84:7A:27:2E:CD:19:35:B1:33:7C:FF:D4:44:42:B9 + + X509v3 Subject Key Identifier: + FB:2E:37:EE:E3:84:7A:27:2E:CD:19:35:B1:33:7C:FF:D4:44:42:B9 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + Signature Algorithm: sha256WithRSAEncryption + 8d:89:6d:84:45:18:f1:4f:b3:a0:ef:68:a4:c0:1d:ac:30:bc: + 67:66:b0:9a:cd:b6:ab:22:19:66:d3:3b:41:b5:10:9d:10:ba: + 72:6e:29:24:20:1c:01:99:62:d3:96:e0:e2:fb:0c:42:d7:e1: + 5a:c4:96:4d:54:cd:8f:ca:43:53:fd:2a:b8:ea:f8:65:ca:01: + c2:ad:60:68:06:9f:39:1a:51:d9:e0:8d:26:f9:0b:4e:a5:53: + 25:7a:23:a4:1c:ce:08:1b:df:47:88:b2:ad:3e:e0:27:87:8b: + 49:8c:1f:a9:47:58:7b:96:f2:88:1d:18:ae:b3:d1:a6:0a:94: + fa:db:d3:e5:38:0a:6b:79:12:33:fb:4a:59:37:16:40:0e:bb: + de:f5:89:0c:f1:6c:d3:f7:51:6b:5e:35:f5:db:c0:26:ea:12: + 73:4e:a9:91:90:a6:17:c3:6c:2f:38:d4:a3:72:94:43:2c:62: + e1:4e:5c:32:3d:bd:4c:7d:19:47:a2:c3:49:e7:96:3f:8f:9a: + d3:3b:e4:11:d8:8b:03:dc:f6:b6:60:55:18:a6:81:51:f3:e1: + a8:15:6a:eb:e0:0b:f0:14:31:d6:b9:8c:45:3a:a8:10:d8:f0: + b9:27:eb:f7:cb:7a:ef:05:72:96:b5:c4:8f:96:73:c4:e8:56: + 73:9c:bc:69:51:63:bc:ef:67:1c:43:1a:5f:77:19:1f:18:f8: + 1c:25:29:f9:49:99:29:b6:92:3d:a2:83:37:b1:20:91:a8:9b: + 30:e9:6a:6c:b4:23:93:65:04:ab:11:f3:0e:1d:53:24:49:53: + 1d:a1:3f:9d:48:92:11:e2:7d:0d:4f:f5:d7:bd:a2:58:3e:78: + 9d:1e:1f:2b:fe:21:bb:1a:13:b6:b1:28:64:fd:b0:02:00:c7: + 6c:80:a2:bd:16:50:20:0f:72:81:5f:cc:94:ff:bb:99:e6:ba: + 90:cb:ea:f9:c6:0c:c2:ae:c5:19:ce:33:a1:6b:5c:bb:7e:7c: + 34:57:17:ad:f0:3f:ae:cd:ea:af:99:ec:2c:54:7e:8c:ce:2e: + 12:56:48:ef:17:3b:3f:4a:5e:60:d2:dc:74:36:bc:a5:43:63: + cb:0f:5b:a3:02:56:09:9e:24:2c:e1:86:81:8c:fe:ab:17:2c: + fa:c8:e2:32:1a:3a:ff:85:08:c9:83:9f:f2:4a:48:10:54:77: + 37:ed:a2:bc:40:be:e4:10:74:f7:e4:5b:bb:b9:f3:89:f9:8f: + 41:d8:c7:e4:50:90:35:80:3e:1c:b8:4d:90:d3:d4:f7:c3:b0: + a1:7e:84:ca:77:92:31:2c:b8:90:b1:82:7a:74:4e:9b:13:26: + b4:d5:50:66:54:78:ae:60 +SHA1 Fingerprint=EC:2C:83:40:72:AF:26:95:10:FF:0E:F2:03:EE:31:70:F6:78:9D:CA +-----BEGIN CERTIFICATE----- +MIIFiTCCA3GgAwIBAgIQb77arXO9CEDii02+1PdbkTANBgkqhkiG9w0BAQsFADBO +MQswCQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSUwIwYDVQQD +DBxTU0wuY29tIFRMUyBSU0EgUm9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2MzQyMloX +DTQ2MDgxOTE2MzQyMVowTjELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD1NTTCBDb3Jw +b3JhdGlvbjElMCMGA1UEAwwcU1NMLmNvbSBUTFMgUlNBIFJvb3QgQ0EgMjAyMjCC +AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANCkCXJPQIgSYT41I57u9nTP +L3tYPc48DRAokC+X94xI2KDYJbFMsBFMF3NQ0CJKY7uB0ylu1bUJPiYYf7ISf5OY +t6/wNr/y7hienDtSxUcZXXTzZGbVXcdotL8bHAajvI9AI7YexoS9UcQbOcGV0ins +S657Lb85/bRi3pZ7QcacoOAGcvvwB5cJOYF0r/c0WRFXCsJbwST0MXMwgsadugL3 +PnxEX4MN8/HdIGkWCVDi1FW24IBydm5MR7d1VVm0U3TZlMZBrViKMWYPHqIbKUBO +L9975hYsLfy/7PO0+r4Y9ptJ1O4Fbtk085zx7AGL0SDGD6C1vBdOSHtRwvzpXGk3 +R2azaPgVKPC506QVzFpPulJwoxJF3ca6TvvC0PeoUidtbnm1jPx7jMEWTO6Af77w +dr5BUxIzrlo4QqvXDz5BjXYHMtWrifZOZ9mxQnUjbvPNQrL8VfVThxc7wDNY8VLS ++YCk8OjwO4s4zKTGkH8PnP2L0aPP2oOnaclQNtVcBdIKQXTbYxE3waWglksejBYS +d66UNHsef8JmAOSqg+qKkK3ONkRN0VHpvB/zagX9wHQfJRlAUW7qglFA35u5CCoG +AtUjHBPW6dvbxrB6y3snm/vg1UYk7RBLY0ulBY+6uB0rpvqR4pJSvezrZ5dtmi2f +gTIFZzL7SAg/2SW4BCUvAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j +BBgwFoAU+y437uOEeicuzRk1sTN8/9REQrkwHQYDVR0OBBYEFPsuN+7jhHonLs0Z +NbEzfP/UREK5MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAjYlt +hEUY8U+zoO9opMAdrDC8Z2awms22qyIZZtM7QbUQnRC6cm4pJCAcAZli05bg4vsM +QtfhWsSWTVTNj8pDU/0quOr4ZcoBwq1gaAafORpR2eCNJvkLTqVTJXojpBzOCBvf +R4iyrT7gJ4eLSYwfqUdYe5byiB0YrrPRpgqU+tvT5TgKa3kSM/tKWTcWQA673vWJ +DPFs0/dRa1419dvAJuoSc06pkZCmF8NsLzjUo3KUQyxi4U5cMj29TH0ZR6LDSeeW +P4+a0zvkEdiLA9z2tmBVGKaBUfPhqBVq6+AL8BQx1rmMRTqoENjwuSfr98t67wVy +lrXEj5ZzxOhWc5y8aVFjvO9nHEMaX3cZHxj4HCUp+UmZKbaSPaKDN7EgkaibMOlq +bLQjk2UEqxHzDh1TJElTHaE/nUiSEeJ9DU/1172iWD54nR4fK/4huxoTtrEoZP2w +AgDHbICivRZQIA9ygV/MlP+7mea6kMvq+cYMwq7FGc4zoWtcu358NFcXrfA/rs3q +r5nsLFR+jM4uElZI7xc7P0peYNLcdDa8pUNjyw9bowJWCZ4kLOGGgYz+qxcs+sji +Mho6/4UIyYOf8kpIEFR3N+2ivEC+5BB09+Rbu7nzifmPQdjH5FCQNYA+HLhNkNPU +98OwoX6EyneSMSy4kLGCenROmxMmtNVQZlR4rmA= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Sectigo_Public_Server_Authentication_Root_E46.pem b/secure/caroot/trusted/Sectigo_Public_Server_Authentication_Root_E46.pem new file mode 100644 index 000000000000..964350854b3a --- /dev/null +++ b/secure/caroot/trusted/Sectigo_Public_Server_Authentication_Root_E46.pem @@ -0,0 +1,66 @@ +## +## Sectigo Public Server Authentication Root E46 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 42:f2:cc:da:1b:69:37:44:5f:15:fe:75:28:10:b8:f4 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = GB, O = Sectigo Limited, CN = Sectigo Public Server Authentication Root E46 + Validity + Not Before: Mar 22 00:00:00 2021 GMT + Not After : Mar 21 23:59:59 2046 GMT + Subject: C = GB, O = Sectigo Limited, CN = Sectigo Public Server Authentication Root E46 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:76:fa:99:a9:6e:20:ed:f9:d7:77:e3:07:3b:a8: + db:3d:5f:38:e8:ab:55:a6:56:4f:d6:48:ea:ec:7f: + 2d:aa:c3:b2:c5:79:ec:99:61:7f:10:79:c7:02:5a: + f9:04:37:f5:34:35:2b:77:ce:7f:20:8f:52:a3:00: + 89:ec:d5:a7:a2:6d:5b:e3:4b:92:93:a0:80:f5:01: + 94:dc:f0:68:07:1e:cd:ee:fe:25:52:b5:20:43:1c: + 1b:fe:eb:19:ce:43:a3 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Subject Key Identifier: + D1:22:DA:4C:59:F1:4B:5F:26:38:AA:9D:D6:EE:EB:0D:C3:FB:A9:61 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + Signature Algorithm: ecdsa-with-SHA384 + 30:64:02:30:27:ee:a4:5a:a8:21:bb:e9:47:97:94:89:a5:74: + 20:6d:79:4f:c8:bd:93:5e:58:18:fb:2d:1a:00:6a:c9:b8:3d: + d0:a4:4f:44:47:94:01:56:a2:f8:33:25:0c:42:df:aa:02:30: + 1d:ea:e1:2e:88:2e:e1:f9:a7:1d:02:32:4e:f2:9f:6c:55:74: + e3:ae:ae:fb:a5:1a:ee:ed:d2:fc:c2:03:11:eb:45:5c:60:10: + 3d:5c:7f:99:03:5b:6d:54:48:01:8a:73 +SHA1 Fingerprint=EC:8A:39:6C:40:F0:2E:BC:42:75:D4:9F:AB:1C:1A:5B:67:BE:D2:9A +-----BEGIN CERTIFICATE----- +MIICOjCCAcGgAwIBAgIQQvLM2htpN0RfFf51KBC49DAKBggqhkjOPQQDAzBfMQsw +CQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1T +ZWN0aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwHhcN +MjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1OTU5WjBfMQswCQYDVQQGEwJHQjEYMBYG +A1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1YmxpYyBT +ZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAAR2+pmpbiDt+dd34wc7qNs9Xzjoq1WmVk/WSOrsfy2qw7LFeeyZYX8QeccC +WvkEN/U0NSt3zn8gj1KjAIns1aeibVvjS5KToID1AZTc8GgHHs3u/iVStSBDHBv+ +6xnOQ6OjQjBAMB0GA1UdDgQWBBTRItpMWfFLXyY4qp3W7usNw/upYTAOBgNVHQ8B +Af8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNnADBkAjAn7qRa +qCG76UeXlImldCBteU/IvZNeWBj7LRoAasm4PdCkT0RHlAFWovgzJQxC36oCMB3q +4S6ILuH5px0CMk7yn2xVdOOurvulGu7t0vzCAxHrRVxgED1cf5kDW21USAGKcw== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Sectigo_Public_Server_Authentication_Root_R46.pem b/secure/caroot/trusted/Sectigo_Public_Server_Authentication_Root_R46.pem new file mode 100644 index 000000000000..e51aef002852 --- /dev/null +++ b/secure/caroot/trusted/Sectigo_Public_Server_Authentication_Root_R46.pem @@ -0,0 +1,134 @@ +## +## Sectigo Public Server Authentication Root R46 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 75:8d:fd:8b:ae:7c:07:00:fa:a9:25:a7:e1:c7:ad:14 + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = GB, O = Sectigo Limited, CN = Sectigo Public Server Authentication Root R46 + Validity + Not Before: Mar 22 00:00:00 2021 GMT + Not After : Mar 21 23:59:59 2046 GMT + Subject: C = GB, O = Sectigo Limited, CN = Sectigo Public Server Authentication Root R46 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:93:be:d5:36:52:75:d8:01:23:a0:1c:47:42:49: + ee:63:b6:b7:21:fd:c4:95:d5:48:2b:26:7c:14:53: + 10:da:79:fd:2b:b7:2d:a4:d4:2c:fa:ea:32:dd:49: + c2:b9:bd:0f:48:3d:7b:5a:98:54:af:9e:5d:31:74: + 4f:07:fc:50:21:dd:a4:cf:68:4f:1b:12:63:6d:25: + 99:4c:2a:99:f3:48:30:61:fa:81:7c:1e:a7:08:4a: + dc:3e:2b:1c:1f:18:4c:71:aa:35:8c:ad:f8:6e:e8: + 3b:4a:d9:e5:94:02:d6:89:84:13:aa:6d:c8:4f:33: + cc:50:96:37:92:33:dc:5f:88:e7:9f:54:d9:48:f0: + 98:43:d6:66:fd:9f:17:38:43:c5:01:51:0b:d7:e3: + 23:0f:14:5d:5b:14:e7:4b:be:dd:f4:c8:da:03:37: + d1:d6:39:a1:21:51:30:83:b0:6d:d7:30:4e:96:5b: + 91:f0:70:24:ab:bf:45:81:64:43:0d:bd:21:3a:2f: + 3c:e9:9e:0d:cb:20:b5:42:27:cc:da:6f:9b:ee:64: + 30:90:39:cd:93:65:81:21:31:b5:23:50:33:37:22: + e3:38:ed:f8:31:30:cc:45:fe:62:f9:d1:5d:32:79: + 42:87:df:6a:cc:56:19:40:4d:ce:aa:bb:f9:b5:76: + 49:94:f1:27:f8:91:a5:83:e5:06:b3:63:0e:80:dc: + e0:12:55:80:a6:3b:66:b4:39:87:2d:c8:f0:d0:d1: + 14:e9:e4:0d:4d:0e:f6:5d:57:72:c5:3b:1c:47:56: + 9d:e2:d5:fb:81:61:8c:cc:4d:80:90:34:5b:b7:d7: + 14:75:dc:d8:04:48:9f:c0:c1:28:88:b4:e9:1c:ca: + a7:b1:f1:56:b7:7b:49:4c:59:e5:20:15:a8:84:02: + 29:fa:38:94:69:9a:49:06:8f:cd:1f:79:14:17:12: + 0c:83:7a:de:1f:b1:97:ee:f9:97:78:28:a4:c8:44: + 92:e9:7d:26:05:a6:58:72:9b:79:13:d8:11:5f:ae: + c5:38:62:34:68:b2:86:30:8e:f8:90:61:9e:32:6c: + f5:07:36:cd:a2:4c:6e:ec:8a:36:ed:f2:e6:99:15: + 44:70:c3:7c:bc:9c:39:c0:b4:e1:6b:f7:83:25:23: + 57:d9:12:80:e5:49:f0:75:0f:ef:8d:eb:1c:9b:54: + 28:b4:21:3c:fc:7c:0a:ff:ef:7b:6b:75:ff:8b:1d: + a0:19:05:ab:fa:f8:2b:81:42:e8:38:ba:bb:fb:aa: + fd:3d:e0:f3:ca:df:4e:97:97:29:ed:f3:18:56:e9: + a5:96:ac:bd:c3:90:98:b2:e0:f9:a2:d4:a6:47:43: + 7c:6d:cf + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + 56:73:58:64:95:F9:92:1A:B0:12:2A:04:62:79:A1:40:15:88:21:49 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + Signature Algorithm: sha384WithRSAEncryption + 2f:5c:99:3c:fc:06:5e:8c:94:2e:70:ea:d2:32:31:8d:b4:f0: + 51:d5:bc:0a:f3:64:9f:07:5e:d5:c1:73:68:64:7a:a2:b9:0e: + e8:f9:5d:85:2d:a8:37:45:aa:28:f4:96:05:50:60:a9:49:7e: + 9f:e2:99:36:29:13:44:47:6a:9d:55:20:3c:d8:9b:f1:03:32: + ba:da:40:a1:73:ea:83:a1:b7:44:a6:0e:99:01:9b:e4:bc:7f: + be:13:94:7e:ca:a6:1e:76:80:36:3d:84:06:8b:33:26:65:6d: + ca:7e:9e:fe:1f:8c:58:38:7b:1a:83:b1:0f:bc:17:11:bb:e6: + 06:cc:63:fa:81:f2:81:4c:da:0b:10:6b:a1:fa:d5:28:a5:cf: + 06:40:16:ff:7b:7d:18:5e:39:12:a4:53:9e:7e:32:42:10:a6: + 21:91:a9:1c:4e:17:7c:84:bc:9f:8c:d1:e8:df:e6:51:b9:36: + 47:3f:90:b9:c7:bc:02:dc:5b:1c:4f:0e:48:c1:25:83:9c:0a: + 3f:9e:b1:03:33:12:1a:27:ac:f7:22:6c:24:d1:01:41:f8:58: + 03:fe:25:68:22:1f:9a:5a:3c:7c:6c:9e:75:48:f3:81:f1:66: + 67:6e:4c:82:c0:ee:ba:57:0e:18:ef:2e:9a:f7:12:d8:a0:6b: + e9:05:a5:a1:e9:68:f8:bc:4c:3f:12:1e:45:e8:52:c0:a3:bf: + 12:27:79:b9:cc:31:3c:c3:f6:3a:22:16:03:a0:c9:8f:66:a4: + 5b:a2:4d:d6:81:25:06:e9:76:a4:00:0a:3e:cb:cd:35:9b:e0: + e1:38:cb:60:53:86:28:42:41:1c:44:57:e8:a8:ad:ab:45:e3: + 25:10:bc:db:3e:65:41:fb:1b:a6:97:0f:eb:b9:74:79:f9:1e: + bc:1d:57:0d:47:af:c3:2f:9f:87:46:a7:eb:26:5a:0f:56:63: + b5:62:60:6e:00:fb:e3:27:11:22:e7:fe:99:8f:34:f5:b9:e8: + c3:91:72:bd:d8:c3:1e:b9:2e:f2:91:44:51:d0:57:cd:0c:34: + d5:48:21:bf:db:13:f1:66:25:43:52:d2:70:22:36:cd:9f:c4: + 1c:75:20:ad:63:72:63:06:0f:0e:27:ce:d2:6a:0d:bc:b5:39: + 1a:e9:d1:76:7a:d1:5c:e4:e7:49:49:2d:55:37:68:f0:1a:3a: + 98:3e:54:17:87:54:e9:a6:27:50:89:7b:20:2f:3f:ff:bf:a1: + 8b:4a:47:98:ff:2b:7b:49:3e:c3:29:46:60:18:42:ab:33:29: + ba:c0:29:b9:13:89:d3:88:8a:39:41:3b:c9:fd:a6:ed:1f:f4: + 60:63:df:d2:2d:55:01:8b +SHA1 Fingerprint=AD:98:F9:F3:E4:7D:75:3B:65:D4:82:B3:A4:52:17:BB:6E:F5:E4:38 +-----BEGIN CERTIFICATE----- +MIIFijCCA3KgAwIBAgIQdY39i658BwD6qSWn4cetFDANBgkqhkiG9w0BAQwFADBf +MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQD +Ey1TZWN0aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBSNDYw +HhcNMjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1OTU5WjBfMQswCQYDVQQGEwJHQjEY +MBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1Ymxp +YyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBSNDYwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQCTvtU2UnXYASOgHEdCSe5jtrch/cSV1UgrJnwUUxDa +ef0rty2k1Cz66jLdScK5vQ9IPXtamFSvnl0xdE8H/FAh3aTPaE8bEmNtJZlMKpnz +SDBh+oF8HqcIStw+KxwfGExxqjWMrfhu6DtK2eWUAtaJhBOqbchPM8xQljeSM9xf +iOefVNlI8JhD1mb9nxc4Q8UBUQvX4yMPFF1bFOdLvt30yNoDN9HWOaEhUTCDsG3X +ME6WW5HwcCSrv0WBZEMNvSE6Lzzpng3LILVCJ8zab5vuZDCQOc2TZYEhMbUjUDM3 +IuM47fgxMMxF/mL50V0yeUKH32rMVhlATc6qu/m1dkmU8Sf4kaWD5QazYw6A3OAS +VYCmO2a0OYctyPDQ0RTp5A1NDvZdV3LFOxxHVp3i1fuBYYzMTYCQNFu31xR13NgE +SJ/AwSiItOkcyqex8Va3e0lMWeUgFaiEAin6OJRpmkkGj80feRQXEgyDet4fsZfu ++Zd4KKTIRJLpfSYFplhym3kT2BFfrsU4YjRosoYwjviQYZ4ybPUHNs2iTG7sijbt +8uaZFURww3y8nDnAtOFr94MlI1fZEoDlSfB1D++N6xybVCi0ITz8fAr/73trdf+L +HaAZBav6+CuBQug4urv7qv094PPK306Xlynt8xhW6aWWrL3DkJiy4Pmi1KZHQ3xt +zwIDAQABo0IwQDAdBgNVHQ4EFgQUVnNYZJX5khqwEioEYnmhQBWIIUkwDgYDVR0P +AQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAC9c +mTz8Bl6MlC5w6tIyMY208FHVvArzZJ8HXtXBc2hkeqK5Duj5XYUtqDdFqij0lgVQ +YKlJfp/imTYpE0RHap1VIDzYm/EDMrraQKFz6oOht0SmDpkBm+S8f74TlH7Kph52 +gDY9hAaLMyZlbcp+nv4fjFg4exqDsQ+8FxG75gbMY/qB8oFM2gsQa6H61SilzwZA +Fv97fRheORKkU55+MkIQpiGRqRxOF3yEvJ+M0ejf5lG5Nkc/kLnHvALcWxxPDkjB +JYOcCj+esQMzEhonrPcibCTRAUH4WAP+JWgiH5paPHxsnnVI84HxZmduTILA7rpX +DhjvLpr3Etiga+kFpaHpaPi8TD8SHkXoUsCjvxInebnMMTzD9joiFgOgyY9mpFui +TdaBJQbpdqQACj7LzTWb4OE4y2BThihCQRxEV+ioratF4yUQvNs+ZUH7G6aXD+u5 +dHn5HrwdVw1Hr8Mvn4dGp+smWg9WY7ViYG4A++MnESLn/pmPNPW56MORcr3Ywx65 +LvKRRFHQV80MNNVIIb/bE/FmJUNS0nAiNs2fxBx1IK1jcmMGDw4nztJqDby1ORrp +0XZ60Vzk50lJLVU3aPAaOpg+VBeHVOmmJ1CJeyAvP/+/oYtKR5j/K3tJPsMpRmAY +QqszKbrAKbkTidOIijlBO8n9pu0f9GBj39ItVQGL +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem b/secure/caroot/untrusted/E-Tugra_Certification_Authority.pem similarity index 100% rename from secure/caroot/trusted/E-Tugra_Certification_Authority.pem rename to secure/caroot/untrusted/E-Tugra_Certification_Authority.pem diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem b/secure/caroot/untrusted/E-Tugra_Global_Root_CA_ECC_v3.pem similarity index 100% rename from secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem rename to secure/caroot/untrusted/E-Tugra_Global_Root_CA_ECC_v3.pem diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem b/secure/caroot/untrusted/E-Tugra_Global_Root_CA_RSA_v3.pem similarity index 100% rename from secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem rename to secure/caroot/untrusted/E-Tugra_Global_Root_CA_RSA_v3.pem diff --git a/secure/caroot/trusted/Hongkong_Post_Root_CA_1.pem b/secure/caroot/untrusted/Hongkong_Post_Root_CA_1.pem similarity index 100% rename from secure/caroot/trusted/Hongkong_Post_Root_CA_1.pem rename to secure/caroot/untrusted/Hongkong_Post_Root_CA_1.pem From nobody Sat Aug 26 01:17: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 4RXf7F14Wjz4r4BR; Sat, 26 Aug 2023 01:17: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 4RXf7D5kr2z4WGS; Sat, 26 Aug 2023 01:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693012632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NlwvtKBNw2pziz3UQqdm/KQrEe3ThjZe+gPXjK1QII0=; b=tt3OCbWNQhjg8Jd2hk8ejjWUU/PVkd5a4RCUl3vp6bQOnd4ATvwup3lCbIsJY3i91CDtRM 7OKfq8qE0rVeJCeA3Wo+Ah8UsD/koNvp35mzlGmGoZNmFAFQVpLhD9xzHtBmc8yDWbuzkR GSqHBGpQknR9z/V/sp+u1IBrM/L/Qrp1aJSQjUe77dfD8hrkG49bKavCO5kicGYCvosDpR GTuDTOd8W8t/72fDYczR+A+NVguEnpKsMuUgNqKqi9YXekhD1HLgAqkVK2G4sINqwcRMN2 cJyNeJKKXiEdv1J9ug7vkr5XloBrkfiAzX/iJSaa7gG+8dB6sXXc5kEeKDWytA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693012632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NlwvtKBNw2pziz3UQqdm/KQrEe3ThjZe+gPXjK1QII0=; b=G8JqhnrvvrLUdbxu932jxzJZG35nK4ecPnSwlw5jY2pTz3QO0jvc8ubdcEFRnNm00wOhnB pJbp3rUtuhdjgbfSP3nFXHeyPA0Oiyk5wFtKwsPwCr7tkG/CG3/jWN8xTL+UHrC9Zdn4pB 5QoEWdpJVGwiwqrdJyZ6ALyfYCUTfcyj2FTmSbZepLyAyqWV+OT+cGLHzLnwgMDoY7W+vu pg4+XNR6p7Eyi6msWlW0+nOdXsL0g9wIuRgFq5zhoKx/7fw4kPne9EEbmMxR0cufvEPh/P kPy64yxaECDgmcEuv8FGffdYyfIw4LvHG/YAPXVF6Y/ld7HwizS2cFFtKdUJCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693012632; a=rsa-sha256; cv=none; b=DbaWzMFlISMWUvGx45iZ1QCD4fDIDP11yTjFKlYRXbzsLfKtLpIYc/o5A9eQzFBLPO4N9z zHnKMEXfJrmbXgS0Pz/kYAkFgdWxjeH5oL04CfLNFnmoPQfqQRFfRylky2y8BI6CX4K1By zD4uN3wlD25OLo8mfvikmgOY0JQXk9rPWNbEFW3lKZHh5qofFUY0PBUVJLT2lKxGTgPO+m C3vyiFAE7fEg0HCs2Qv8HGQ9WrRVXI5XkSiLeYdaQcIs13X8/UGgTAFcPq950k8BBfUbWU tCV9B1IAaP9DDCSyeBIK3uqIHGTVdE/Oc3/a807nHb1PYqoKXEJfJqLdSfXdSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXf7D4cYWz1QN; Sat, 26 Aug 2023 01:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37Q1HCsf065626; Sat, 26 Aug 2023 01:17:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37Q1HCpJ065623; Sat, 26 Aug 2023 01:17:12 GMT (envelope-from git) Date: Sat, 26 Aug 2023 01:17:12 GMT Message-Id: <202308260117.37Q1HCpJ065623@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: 8ed0ecf8024d - main - caroot: regenerate the root bundle with OpenSSL 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ed0ecf8024d10e9cd21f5880723a6cec4fd4ae6 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8ed0ecf8024d10e9cd21f5880723a6cec4fd4ae6 commit 8ed0ecf8024d10e9cd21f5880723a6cec4fd4ae6 Author: Kyle Evans AuthorDate: 2023-08-26 01:15:39 +0000 Commit: Kyle Evans CommitDate: 2023-08-26 01:16:36 +0000 caroot: regenerate the root bundle with OpenSSL 3 No functional change intended. --- secure/caroot/trusted/ACCVRAIZ1.pem | 68 ++++++++++------------ secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem | 62 ++++++++++---------- .../AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem | 13 +++-- .../caroot/trusted/ANF_Secure_Server_Root_CA.pem | 64 ++++++++++---------- .../trusted/Actalis_Authentication_Root_CA.pem | 64 ++++++++++---------- secure/caroot/trusted/AffirmTrust_Commercial.pem | 33 ++++++----- secure/caroot/trusted/AffirmTrust_Networking.pem | 33 ++++++----- secure/caroot/trusted/AffirmTrust_Premium.pem | 61 +++++++++---------- secure/caroot/trusted/AffirmTrust_Premium_ECC.pem | 13 +++-- secure/caroot/trusted/Amazon_Root_CA_1.pem | 33 ++++++----- secure/caroot/trusted/Amazon_Root_CA_2.pem | 61 +++++++++---------- secure/caroot/trusted/Amazon_Root_CA_3.pem | 9 +-- secure/caroot/trusted/Amazon_Root_CA_4.pem | 13 +++-- secure/caroot/trusted/Atos_TrustedRoot_2011.pem | 37 ++++++------ .../Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem | 13 +++-- .../Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem | 61 +++++++++---------- ...ertificacion_Firmaprofesional_CIF_A62634068.pem | 62 ++++++++++---------- secure/caroot/trusted/BJCA_Global_Root_CA1.pem | 61 +++++++++---------- secure/caroot/trusted/BJCA_Global_Root_CA2.pem | 13 +++-- .../caroot/trusted/Baltimore_CyberTrust_Root.pem | 33 ++++++----- secure/caroot/trusted/Buypass_Class_2_Root_CA.pem | 61 +++++++++---------- secure/caroot/trusted/Buypass_Class_3_Root_CA.pem | 61 +++++++++---------- secure/caroot/trusted/CA_Disig_Root_R2.pem | 61 +++++++++---------- secure/caroot/trusted/CFCA_EV_ROOT.pem | 64 ++++++++++---------- .../trusted/COMODO_Certification_Authority.pem | 35 ++++++----- .../trusted/COMODO_ECC_Certification_Authority.pem | 13 +++-- .../trusted/COMODO_RSA_Certification_Authority.pem | 61 +++++++++---------- secure/caroot/trusted/Certainly_Root_E1.pem | 13 +++-- secure/caroot/trusted/Certainly_Root_R1.pem | 61 +++++++++---------- secure/caroot/trusted/Certigna.pem | 34 +++++------ secure/caroot/trusted/Certigna_Root_CA.pem | 68 ++++++++++------------ secure/caroot/trusted/Certum_EC-384_CA.pem | 13 +++-- .../caroot/trusted/Certum_Trusted_Network_CA.pem | 33 ++++++----- .../caroot/trusted/Certum_Trusted_Network_CA_2.pem | 61 +++++++++---------- secure/caroot/trusted/Certum_Trusted_Root_CA.pem | 61 +++++++++---------- secure/caroot/trusted/Comodo_AAA_Services_root.pem | 36 ++++++------ .../caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem | 16 +++-- .../caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem | 16 +++-- .../trusted/D-TRUST_Root_Class_3_CA_2_2009.pem | 36 ++++++------ .../trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem | 36 ++++++------ .../caroot/trusted/DigiCert_Assured_ID_Root_CA.pem | 36 ++++++------ .../caroot/trusted/DigiCert_Assured_ID_Root_G2.pem | 33 ++++++----- .../caroot/trusted/DigiCert_Assured_ID_Root_G3.pem | 13 +++-- secure/caroot/trusted/DigiCert_Global_Root_CA.pem | 36 ++++++------ secure/caroot/trusted/DigiCert_Global_Root_G2.pem | 33 ++++++----- secure/caroot/trusted/DigiCert_Global_Root_G3.pem | 13 +++-- .../trusted/DigiCert_High_Assurance_EV_Root_CA.pem | 36 ++++++------ .../trusted/DigiCert_TLS_ECC_P384_Root_G5.pem | 13 +++-- .../trusted/DigiCert_TLS_RSA4096_Root_G5.pem | 61 +++++++++---------- secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem | 61 +++++++++---------- .../Entrust_Root_Certification_Authority.pem | 36 ++++++------ .../Entrust_Root_Certification_Authority_-_EC1.pem | 13 +++-- .../Entrust_Root_Certification_Authority_-_G2.pem | 33 ++++++----- .../Entrust_Root_Certification_Authority_-_G4.pem | 61 +++++++++---------- .../Entrust_net_Premium_2048_Secure_Server_CA.pem | 33 ++++++----- secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem | 61 +++++++++---------- secure/caroot/trusted/GLOBALTRUST_2020.pem | 64 ++++++++++---------- secure/caroot/trusted/GTS_Root_R1.pem | 61 +++++++++---------- secure/caroot/trusted/GTS_Root_R2.pem | 61 +++++++++---------- secure/caroot/trusted/GTS_Root_R3.pem | 13 +++-- secure/caroot/trusted/GTS_Root_R4.pem | 13 +++-- .../caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem | 9 +-- .../caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem | 13 +++-- secure/caroot/trusted/GlobalSign_Root_CA.pem | 33 ++++++----- secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem | 33 ++++++----- secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem | 64 ++++++++++---------- secure/caroot/trusted/GlobalSign_Root_E46.pem | 13 +++-- secure/caroot/trusted/GlobalSign_Root_R46.pem | 61 +++++++++---------- secure/caroot/trusted/Go_Daddy_Class_2_CA.pem | 34 +++++------ .../Go_Daddy_Root_Certificate_Authority_-_G2.pem | 33 ++++++----- .../caroot/trusted/HARICA_TLS_ECC_Root_CA_2021.pem | 13 +++-- .../caroot/trusted/HARICA_TLS_RSA_Root_CA_2021.pem | 61 +++++++++---------- ...c_and_Research_Institutions_ECC_RootCA_2015.pem | 13 +++-- ...demic_and_Research_Institutions_RootCA_2015.pem | 61 +++++++++---------- secure/caroot/trusted/HiPKI_Root_CA_-_G1.pem | 61 +++++++++---------- secure/caroot/trusted/Hongkong_Post_Root_CA_3.pem | 64 ++++++++++---------- secure/caroot/trusted/ISRG_Root_X1.pem | 61 +++++++++---------- secure/caroot/trusted/ISRG_Root_X2.pem | 13 +++-- .../trusted/IdenTrust_Commercial_Root_CA_1.pem | 61 +++++++++---------- .../trusted/IdenTrust_Public_Sector_Root_CA_1.pem | 61 +++++++++---------- secure/caroot/trusted/Izenpe_com.pem | 61 +++++++++---------- .../trusted/Microsec_e-Szigno_Root_CA_2009.pem | 36 ++++++------ ...crosoft_ECC_Root_Certificate_Authority_2017.pem | 13 +++-- ...crosoft_RSA_Root_Certificate_Authority_2017.pem | 61 +++++++++---------- .../NAVER_Global_Root_Certification_Authority.pem | 61 +++++++++---------- ...etLock_Arany__Class_Gold__F__tan__s__tv__ny.pem | 33 ++++++----- .../trusted/OISTE_WISeKey_Global_Root_GB_CA.pem | 33 ++++++----- .../trusted/OISTE_WISeKey_Global_Root_GC_CA.pem | 13 +++-- secure/caroot/trusted/QuoVadis_Root_CA_1_G3.pem | 61 +++++++++---------- secure/caroot/trusted/QuoVadis_Root_CA_2.pem | 62 ++++++++++---------- secure/caroot/trusted/QuoVadis_Root_CA_2_G3.pem | 61 +++++++++---------- secure/caroot/trusted/QuoVadis_Root_CA_3.pem | 63 ++++++++++---------- secure/caroot/trusted/QuoVadis_Root_CA_3_G3.pem | 61 +++++++++---------- ...SSL_com_EV_Root_Certification_Authority_ECC.pem | 16 ++--- ..._com_EV_Root_Certification_Authority_RSA_R2.pem | 64 ++++++++++---------- .../SSL_com_Root_Certification_Authority_ECC.pem | 16 ++--- .../SSL_com_Root_Certification_Authority_RSA.pem | 64 ++++++++++---------- .../trusted/SSL_com_TLS_ECC_Root_CA_2022.pem | 16 ++--- .../trusted/SSL_com_TLS_RSA_Root_CA_2022.pem | 64 ++++++++++---------- secure/caroot/trusted/SZAFIR_ROOT_CA2.pem | 33 ++++++----- ...ctigo_Public_Server_Authentication_Root_E46.pem | 13 +++-- ...ctigo_Public_Server_Authentication_Root_R46.pem | 61 +++++++++---------- secure/caroot/trusted/SecureSign_RootCA11.pem | 33 ++++++----- secure/caroot/trusted/SecureTrust_CA.pem | 35 ++++++----- secure/caroot/trusted/Secure_Global_CA.pem | 35 ++++++----- .../trusted/Security_Communication_ECC_RootCA1.pem | 13 +++-- .../trusted/Security_Communication_RootCA2.pem | 33 ++++++----- .../trusted/Security_Communication_RootCA3.pem | 61 +++++++++---------- .../trusted/Security_Communication_Root_CA.pem | 33 ++++++----- secure/caroot/trusted/Starfield_Class_2_CA.pem | 34 +++++------ .../Starfield_Root_Certificate_Authority_-_G2.pem | 33 ++++++----- ...ld_Services_Root_Certificate_Authority_-_G2.pem | 33 ++++++----- secure/caroot/trusted/SwissSign_Gold_CA_-_G2.pem | 65 ++++++++++----------- secure/caroot/trusted/SwissSign_Silver_CA_-_G2.pem | 65 ++++++++++----------- .../trusted/T-TeleSec_GlobalRoot_Class_2.pem | 33 ++++++----- .../trusted/T-TeleSec_GlobalRoot_Class_3.pem | 33 ++++++----- ...BITAK_Kamu_SM_SSL_Kok_Sertifikasi_-_Surum_1.pem | 33 ++++++----- secure/caroot/trusted/TWCA_Global_Root_CA.pem | 61 +++++++++---------- .../trusted/TWCA_Root_Certification_Authority.pem | 33 ++++++----- secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem | 61 +++++++++---------- secure/caroot/trusted/Telia_Root_CA_v2.pem | 64 ++++++++++---------- .../Trustwave_Global_Certification_Authority.pem | 61 +++++++++---------- ...ave_Global_ECC_P256_Certification_Authority.pem | 9 +-- ...ave_Global_ECC_P384_Certification_Authority.pem | 13 +++-- secure/caroot/trusted/TunTrust_Root_CA.pem | 64 ++++++++++---------- .../trusted/UCA_Extended_Validation_Root.pem | 61 +++++++++---------- secure/caroot/trusted/UCA_Global_G2_Root.pem | 61 +++++++++---------- .../USERTrust_ECC_Certification_Authority.pem | 13 +++-- .../USERTrust_RSA_Certification_Authority.pem | 61 +++++++++---------- secure/caroot/trusted/XRamp_Global_CA_Root.pem | 35 ++++++----- secure/caroot/trusted/certSIGN_ROOT_CA.pem | 33 ++++++----- secure/caroot/trusted/certSIGN_Root_CA_G2.pem | 61 +++++++++---------- secure/caroot/trusted/e-Szigno_Root_CA_2017.pem | 12 ++-- .../trusted/ePKI_Root_Certification_Authority.pem | 61 +++++++++---------- secure/caroot/trusted/emSign_ECC_Root_CA_-_C3.pem | 13 +++-- secure/caroot/trusted/emSign_ECC_Root_CA_-_G3.pem | 13 +++-- secure/caroot/trusted/emSign_Root_CA_-_C1.pem | 33 ++++++----- secure/caroot/trusted/emSign_Root_CA_-_G1.pem | 33 ++++++----- secure/caroot/trusted/vTrus_ECC_Root_CA.pem | 13 +++-- secure/caroot/trusted/vTrus_Root_CA.pem | 61 +++++++++---------- secure/caroot/untrusted/AddTrust_External_Root.pem | 34 +++++------ .../untrusted/AddTrust_Low-Value_Services_Root.pem | 34 +++++------ .../Camerfirma_Chambers_of_Commerce_Root.pem | 36 ++++++------ .../Camerfirma_Global_Chambersign_Root.pem | 36 ++++++------ secure/caroot/untrusted/Certum_Root_CA.pem | 33 ++++++----- .../untrusted/Chambers_of_Commerce_Root_-_2008.pem | 65 ++++++++++----------- secure/caroot/untrusted/Cybertrust_Global_Root.pem | 38 ++++++------ secure/caroot/untrusted/D-TRUST_Root_CA_3_2013.pem | 36 ++++++------ secure/caroot/untrusted/DST_Root_CA_X3.pem | 33 ++++++----- .../untrusted/E-Tugra_Certification_Authority.pem | 64 ++++++++++---------- .../untrusted/E-Tugra_Global_Root_CA_ECC_v3.pem | 16 ++--- .../untrusted/E-Tugra_Global_Root_CA_RSA_v3.pem | 64 ++++++++++---------- secure/caroot/untrusted/EC-ACC.pem | 34 +++++------ .../untrusted/EE_Certification_Centre_Root_CA.pem | 33 ++++++----- secure/caroot/untrusted/GeoTrust_Global_CA.pem | 36 ++++++------ .../GeoTrust_Primary_Certification_Authority.pem | 33 ++++++----- ...oTrust_Primary_Certification_Authority_-_G2.pem | 13 +++-- ...oTrust_Primary_Certification_Authority_-_G3.pem | 33 ++++++----- secure/caroot/untrusted/GeoTrust_Universal_CA.pem | 64 ++++++++++---------- .../caroot/untrusted/GeoTrust_Universal_CA_2.pem | 64 ++++++++++---------- .../caroot/untrusted/GlobalSign_Root_CA_-_R2.pem | 38 ++++++------ .../untrusted/Global_Chambersign_Root_-_2008.pem | 65 ++++++++++----------- ...demic_and_Research_Institutions_RootCA_2011.pem | 34 +++++------ .../caroot/untrusted/Hongkong_Post_Root_CA_1.pem | 33 ++++++----- secure/caroot/untrusted/LuxTrust_Global_Root_2.pem | 65 ++++++++++----------- .../Network_Solutions_Certificate_Authority.pem | 35 ++++++----- .../untrusted/OISTE_WISeKey_Global_Root_GA_CA.pem | 33 ++++++----- secure/caroot/untrusted/QuoVadis_Root_CA.pem | 36 ++++++------ secure/caroot/untrusted/Sonera_Class_2_Root_CA.pem | 33 ++++++----- .../untrusted/Staat_der_Nederlanden_EV_Root_CA.pem | 61 +++++++++---------- .../Staat_der_Nederlanden_Root_CA_-_G2.pem | 62 ++++++++++---------- .../Staat_der_Nederlanden_Root_CA_-_G3.pem | 61 +++++++++---------- .../untrusted/SwissSign_Platinum_CA_-_G2.pem | 65 ++++++++++----------- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +++-- ...Public_Primary_Certification_Authority_-_G6.pem | 33 ++++++----- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +++-- ...Public_Primary_Certification_Authority_-_G6.pem | 33 ++++++----- secure/caroot/untrusted/Taiwan_GRCA.pem | 61 +++++++++---------- secure/caroot/untrusted/TrustCor_ECA-1.pem | 36 ++++++------ secure/caroot/untrusted/TrustCor_RootCert_CA-1.pem | 36 ++++++------ secure/caroot/untrusted/TrustCor_RootCert_CA-2.pem | 64 ++++++++++---------- secure/caroot/untrusted/Trustis_FPS_Root_CA.pem | 36 ++++++------ ...Public_Primary_Certification_Authority_-_G4.pem | 13 +++-- ...Public_Primary_Certification_Authority_-_G5.pem | 33 ++++++----- ...Sign_Universal_Root_Certification_Authority.pem | 33 ++++++----- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++++++----- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++++++----- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++++++----- secure/caroot/untrusted/thawte_Primary_Root_CA.pem | 33 ++++++----- .../untrusted/thawte_Primary_Root_CA_-_G2.pem | 13 +++-- .../untrusted/thawte_Primary_Root_CA_-_G3.pem | 33 ++++++----- 191 files changed, 3872 insertions(+), 3791 deletions(-) diff --git a/secure/caroot/trusted/ACCVRAIZ1.pem b/secure/caroot/trusted/ACCVRAIZ1.pem index dbe720481fe4..9c48cb1f7155 100644 --- a/secure/caroot/trusted/ACCVRAIZ1.pem +++ b/secure/caroot/trusted/ACCVRAIZ1.pem @@ -23,7 +23,7 @@ Certificate: Subject: CN = ACCVRAIZ1, OU = PKIACCV, O = ACCV, C = ES Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:9b:a9:ab:bf:61:4a:97:af:2f:97:66:9a:74:5f: d0:d9:96:fd:cf:e2:e4:66:ef:1f:1f:47:33:c2:44: @@ -65,59 +65,55 @@ Certificate: Authority Information Access: CA Issuers - URI:http://www.accv.es/fileadmin/Archivos/certificados/raizaccv1.crt OCSP - URI:http://ocsp.accv.es - X509v3 Subject Key Identifier: D2:87:B4:E3:DF:37:27:93:55:F6:56:EA:81:E5:36:CC:8C:1E:3F:BD X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: - keyid:D2:87:B4:E3:DF:37:27:93:55:F6:56:EA:81:E5:36:CC:8C:1E:3F:BD - + D2:87:B4:E3:DF:37:27:93:55:F6:56:EA:81:E5:36:CC:8C:1E:3F:BD X509v3 Certificate Policies: Policy: X509v3 Any Policy User Notice: Explicit Text: CPS: http://www.accv.es/legislacion_c.htm - X509v3 CRL Distribution Points: - Full Name: URI:http://www.accv.es/fileadmin/Archivos/certificados/raizaccv1_der.crl - X509v3 Key Usage: critical Certificate Sign, CRL Sign X509v3 Subject Alternative Name: email:accv@accv.es Signature Algorithm: sha1WithRSAEncryption - 97:31:02:9f:e7:fd:43:67:48:44:14:e4:29:87:ed:4c:28:66: - d0:8f:35:da:4d:61:b7:4a:97:4d:b5:db:90:e0:05:2e:0e:c6: - 79:d0:f2:97:69:0f:bd:04:47:d9:be:db:b5:29:da:9b:d9:ae: - a9:99:d5:d3:3c:30:93:f5:8d:a1:a8:fc:06:8d:44:f4:ca:16: - 95:7c:33:dc:62:8b:a8:37:f8:27:d8:09:2d:1b:ef:c8:14:27: - 20:a9:64:44:ff:2e:d6:75:aa:6c:4d:60:40:19:49:43:54:63: - da:e2:cc:ba:66:e5:4f:44:7a:5b:d9:6a:81:2b:40:d5:7f:f9: - 01:27:58:2c:c8:ed:48:91:7c:3f:a6:00:cf:c4:29:73:11:36: - de:86:19:3e:9d:ee:19:8a:1b:d5:b0:ed:8e:3d:9c:2a:c0:0d: - d8:3d:66:e3:3c:0d:bd:d5:94:5c:e2:e2:a7:35:1b:04:00:f6: - 3f:5a:8d:ea:43:bd:5f:89:1d:a9:c1:b0:cc:99:e2:4d:00:0a: - da:c9:27:5b:e7:13:90:5c:e4:f5:33:a2:55:6d:dc:e0:09:4d: - 2f:b1:26:5b:27:75:00:09:c4:62:77:29:08:5f:9e:59:ac:b6: - 7e:ad:9f:54:30:22:03:c1:1e:71:64:fe:f9:38:0a:96:18:dd: - 02:14:ac:23:cb:06:1c:1e:a4:7d:8d:0d:de:27:41:e8:ad:da: - 15:b7:b0:23:dd:2b:a8:d3:da:25:87:ed:e8:55:44:4d:88:f4: - 36:7e:84:9a:78:ac:f7:0e:56:49:0e:d6:33:25:d6:84:50:42: - 6c:20:12:1d:2a:d5:be:bc:f2:70:81:a4:70:60:be:05:b5:9b: - 9e:04:44:be:61:23:ac:e9:a5:24:8c:11:80:94:5a:a2:a2:b9: - 49:d2:c1:dc:d1:a7:ed:31:11:2c:9e:19:a6:ee:e1:55:e1:c0: - ea:cf:0d:84:e4:17:b7:a2:7c:a5:de:55:25:06:ee:cc:c0:87: - 5c:40:da:cc:95:3f:55:e0:35:c7:b8:84:be:b4:5d:cd:7a:83: - 01:72:ee:87:e6:5f:1d:ae:b5:85:c6:26:df:e6:c1:9a:e9:1e: - 02:47:9f:2a:a8:6d:a9:5b:cf:ec:45:77:7f:98:27:9a:32:5d: - 2a:e3:84:ee:c5:98:66:2f:96:20:1d:dd:d8:c3:27:d7:b0:f9: - fe:d9:7d:cd:d0:9f:8f:0b:14:58:51:9f:2f:8b:c3:38:2d:de: - e8:8f:d6:8d:87:a4:f5:56:43:16:99:2c:f4:a4:56:b4:34:b8: - 61:37:c9:c2:58:80:1b:a0:97:a1:fc:59:8d:e9:11:f6:d1:0f: - 4b:55:34:46:2a:8b:86:3b + Signature Value: + 97:31:02:9f:e7:fd:43:67:48:44:14:e4:29:87:ed:4c:28:66: + d0:8f:35:da:4d:61:b7:4a:97:4d:b5:db:90:e0:05:2e:0e:c6: + 79:d0:f2:97:69:0f:bd:04:47:d9:be:db:b5:29:da:9b:d9:ae: + a9:99:d5:d3:3c:30:93:f5:8d:a1:a8:fc:06:8d:44:f4:ca:16: + 95:7c:33:dc:62:8b:a8:37:f8:27:d8:09:2d:1b:ef:c8:14:27: + 20:a9:64:44:ff:2e:d6:75:aa:6c:4d:60:40:19:49:43:54:63: + da:e2:cc:ba:66:e5:4f:44:7a:5b:d9:6a:81:2b:40:d5:7f:f9: + 01:27:58:2c:c8:ed:48:91:7c:3f:a6:00:cf:c4:29:73:11:36: + de:86:19:3e:9d:ee:19:8a:1b:d5:b0:ed:8e:3d:9c:2a:c0:0d: + d8:3d:66:e3:3c:0d:bd:d5:94:5c:e2:e2:a7:35:1b:04:00:f6: + 3f:5a:8d:ea:43:bd:5f:89:1d:a9:c1:b0:cc:99:e2:4d:00:0a: + da:c9:27:5b:e7:13:90:5c:e4:f5:33:a2:55:6d:dc:e0:09:4d: + 2f:b1:26:5b:27:75:00:09:c4:62:77:29:08:5f:9e:59:ac:b6: + 7e:ad:9f:54:30:22:03:c1:1e:71:64:fe:f9:38:0a:96:18:dd: + 02:14:ac:23:cb:06:1c:1e:a4:7d:8d:0d:de:27:41:e8:ad:da: + 15:b7:b0:23:dd:2b:a8:d3:da:25:87:ed:e8:55:44:4d:88:f4: + 36:7e:84:9a:78:ac:f7:0e:56:49:0e:d6:33:25:d6:84:50:42: + 6c:20:12:1d:2a:d5:be:bc:f2:70:81:a4:70:60:be:05:b5:9b: + 9e:04:44:be:61:23:ac:e9:a5:24:8c:11:80:94:5a:a2:a2:b9: + 49:d2:c1:dc:d1:a7:ed:31:11:2c:9e:19:a6:ee:e1:55:e1:c0: + ea:cf:0d:84:e4:17:b7:a2:7c:a5:de:55:25:06:ee:cc:c0:87: + 5c:40:da:cc:95:3f:55:e0:35:c7:b8:84:be:b4:5d:cd:7a:83: + 01:72:ee:87:e6:5f:1d:ae:b5:85:c6:26:df:e6:c1:9a:e9:1e: + 02:47:9f:2a:a8:6d:a9:5b:cf:ec:45:77:7f:98:27:9a:32:5d: + 2a:e3:84:ee:c5:98:66:2f:96:20:1d:dd:d8:c3:27:d7:b0:f9: + fe:d9:7d:cd:d0:9f:8f:0b:14:58:51:9f:2f:8b:c3:38:2d:de: + e8:8f:d6:8d:87:a4:f5:56:43:16:99:2c:f4:a4:56:b4:34:b8: + 61:37:c9:c2:58:80:1b:a0:97:a1:fc:59:8d:e9:11:f6:d1:0f: + 4b:55:34:46:2a:8b:86:3b SHA1 Fingerprint=93:05:7A:88:15:C6:4F:CE:88:2F:FA:91:16:52:28:78:BC:53:64:17 -----BEGIN CERTIFICATE----- MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem index 22f5764a5d3f..b526b6694741 100644 --- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem +++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem @@ -24,7 +24,7 @@ Certificate: Subject: C = ES, O = FNMT-RCM, OU = AC RAIZ FNMT-RCM Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:ba:71:80:7a:4c:86:6e:7f:c8:13:6d:c0:c6:7d: 1c:00:97:8f:2c:0c:23:bb:10:9a:40:a9:1a:b7:87: @@ -72,37 +72,37 @@ Certificate: X509v3 Certificate Policies: Policy: X509v3 Any Policy CPS: http://www.cert.fnmt.es/dpcs/ - Signature Algorithm: sha256WithRSAEncryption - 07:90:4a:df:f3:23:4e:f0:c3:9c:51:65:9b:9c:22:a2:8a:0c: - 85:f3:73:29:6b:4d:fe:01:e2:a9:0c:63:01:bf:04:67:a5:9d: - 98:5f:fd:01:13:fa:ec:9a:62:e9:86:fe:b6:62:d2:6e:4c:94: - fb:c0:75:45:7c:65:0c:f8:b2:37:cf:ac:0f:cf:8d:6f:f9:19: - f7:8f:ec:1e:f2:70:9e:f0:ca:b8:ef:b7:ff:76:37:76:5b:f6: - 6e:88:f3:af:62:32:22:93:0d:3a:6a:8e:14:66:0c:2d:53:74: - 57:65:1e:d5:b2:dd:23:81:3b:a5:66:23:27:67:09:8f:e1:77: - aa:43:cd:65:51:08:ed:51:58:fe:e6:39:f9:cb:47:84:a4:15: - f1:76:bb:a4:ee:a4:3b:c4:5f:ef:b2:33:96:11:18:b7:c9:65: - be:18:e1:a3:a4:dc:fa:18:f9:d3:bc:13:9b:39:7a:34:ba:d3: - 41:fb:fa:32:8a:2a:b7:2b:86:0b:69:83:38:be:cd:8a:2e:0b: - 70:ad:8d:26:92:ee:1e:f5:01:2b:0a:d9:d6:97:9b:6e:e0:a8: - 19:1c:3a:21:8b:0c:1e:40:ad:03:e7:dd:66:7e:f5:b9:20:0d: - 03:e8:96:f9:82:45:d4:39:e0:a0:00:5d:d7:98:e6:7d:9e:67: - 73:c3:9a:2a:f7:ab:8b:a1:3a:14:ef:34:bc:52:0e:89:98:9a: - 04:40:84:1d:7e:45:69:93:57:ce:eb:ce:f8:50:7c:4f:1c:6e: - 04:43:9b:f9:d6:3b:23:18:e9:ea:8e:d1:4d:46:8d:f1:3b:e4: - 6a:ca:ba:fb:23:b7:9b:fa:99:01:29:5a:58:5a:2d:e3:f9:d4: - 6d:0e:26:ad:c1:6e:34:bc:32:f8:0c:05:fa:65:a3:db:3b:37: - 83:22:e9:d6:dc:72:33:fd:5d:f2:20:bd:76:3c:23:da:28:f7: - f9:1b:eb:59:64:d5:dc:5f:72:7e:20:fc:cd:89:b5:90:67:4d: - 62:7a:3f:4e:ad:1d:c3:39:fe:7a:f4:28:16:df:41:f6:48:80: - 05:d7:0f:51:79:ac:10:ab:d4:ec:03:66:e6:6a:b0:ba:31:92: - 42:40:6a:be:3a:d3:72:e1:6a:37:55:bc:ac:1d:95:b7:69:61: - f2:43:91:74:e6:a0:d3:0a:24:46:a1:08:af:d6:da:45:19:96: - d4:53:1d:5b:84:79:f0:c0:f7:47:ef:8b:8f:c5:06:ae:9d:4c: - 62:9d:ff:46:04:f8:d3:c9:b6:10:25:40:75:fe:16:aa:c9:4a: - 60:86:2f:ba:ef:30:77:e4:54:e2:b8:84:99:58:80:aa:13:8b: - 51:3a:4f:48:f6:8b:b6:b3 + Signature Value: + 07:90:4a:df:f3:23:4e:f0:c3:9c:51:65:9b:9c:22:a2:8a:0c: + 85:f3:73:29:6b:4d:fe:01:e2:a9:0c:63:01:bf:04:67:a5:9d: + 98:5f:fd:01:13:fa:ec:9a:62:e9:86:fe:b6:62:d2:6e:4c:94: + fb:c0:75:45:7c:65:0c:f8:b2:37:cf:ac:0f:cf:8d:6f:f9:19: + f7:8f:ec:1e:f2:70:9e:f0:ca:b8:ef:b7:ff:76:37:76:5b:f6: + 6e:88:f3:af:62:32:22:93:0d:3a:6a:8e:14:66:0c:2d:53:74: + 57:65:1e:d5:b2:dd:23:81:3b:a5:66:23:27:67:09:8f:e1:77: + aa:43:cd:65:51:08:ed:51:58:fe:e6:39:f9:cb:47:84:a4:15: + f1:76:bb:a4:ee:a4:3b:c4:5f:ef:b2:33:96:11:18:b7:c9:65: + be:18:e1:a3:a4:dc:fa:18:f9:d3:bc:13:9b:39:7a:34:ba:d3: + 41:fb:fa:32:8a:2a:b7:2b:86:0b:69:83:38:be:cd:8a:2e:0b: + 70:ad:8d:26:92:ee:1e:f5:01:2b:0a:d9:d6:97:9b:6e:e0:a8: + 19:1c:3a:21:8b:0c:1e:40:ad:03:e7:dd:66:7e:f5:b9:20:0d: + 03:e8:96:f9:82:45:d4:39:e0:a0:00:5d:d7:98:e6:7d:9e:67: + 73:c3:9a:2a:f7:ab:8b:a1:3a:14:ef:34:bc:52:0e:89:98:9a: + 04:40:84:1d:7e:45:69:93:57:ce:eb:ce:f8:50:7c:4f:1c:6e: + 04:43:9b:f9:d6:3b:23:18:e9:ea:8e:d1:4d:46:8d:f1:3b:e4: + 6a:ca:ba:fb:23:b7:9b:fa:99:01:29:5a:58:5a:2d:e3:f9:d4: + 6d:0e:26:ad:c1:6e:34:bc:32:f8:0c:05:fa:65:a3:db:3b:37: + 83:22:e9:d6:dc:72:33:fd:5d:f2:20:bd:76:3c:23:da:28:f7: + f9:1b:eb:59:64:d5:dc:5f:72:7e:20:fc:cd:89:b5:90:67:4d: + 62:7a:3f:4e:ad:1d:c3:39:fe:7a:f4:28:16:df:41:f6:48:80: + 05:d7:0f:51:79:ac:10:ab:d4:ec:03:66:e6:6a:b0:ba:31:92: + 42:40:6a:be:3a:d3:72:e1:6a:37:55:bc:ac:1d:95:b7:69:61: + f2:43:91:74:e6:a0:d3:0a:24:46:a1:08:af:d6:da:45:19:96: + d4:53:1d:5b:84:79:f0:c0:f7:47:ef:8b:8f:c5:06:ae:9d:4c: + 62:9d:ff:46:04:f8:d3:c9:b6:10:25:40:75:fe:16:aa:c9:4a: + 60:86:2f:ba:ef:30:77:e4:54:e2:b8:84:99:58:80:aa:13:8b: + 51:3a:4f:48:f6:8b:b6:b3 SHA1 Fingerprint=EC:50:35:07:B2:15:C4:95:62:19:E2:A8:9A:5B:42:99:2C:4C:2C:20 -----BEGIN CERTIFICATE----- MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsx diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem index bbd47304c5c9..c90964ddb4d3 100644 --- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem +++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem @@ -43,12 +43,13 @@ Certificate: X509v3 Subject Key Identifier: 01:B9:2F:EF:BF:11:86:60:F2:4F:D0:41:6E:AB:73:1F:E7:D2:6E:49 Signature Algorithm: ecdsa-with-SHA384 - 30:66:02:31:00:ae:4a:e3:2b:40:c3:74:11:f2:95:ad:16:23: - de:4e:0c:1a:e6:5d:a5:24:5e:6b:44:7b:fc:38:e2:4f:cb:9c: - 45:17:11:4c:14:27:26:55:39:75:4a:03:cc:13:90:9f:92:02: - 31:00:fa:4a:6c:60:88:73:f3:ee:b8:98:62:a9:ce:2b:c2:d9: - 8a:a6:70:31:1d:af:b0:94:4c:eb:4f:c6:e3:d1:f3:62:a7:3c: - ff:93:2e:07:5c:49:01:67:69:12:02:72:bf:e7 + Signature Value: + 30:66:02:31:00:ae:4a:e3:2b:40:c3:74:11:f2:95:ad:16:23: + de:4e:0c:1a:e6:5d:a5:24:5e:6b:44:7b:fc:38:e2:4f:cb:9c: + 45:17:11:4c:14:27:26:55:39:75:4a:03:cc:13:90:9f:92:02: + 31:00:fa:4a:6c:60:88:73:f3:ee:b8:98:62:a9:ce:2b:c2:d9: + 8a:a6:70:31:1d:af:b0:94:4c:eb:4f:c6:e3:d1:f3:62:a7:3c: + ff:93:2e:07:5c:49:01:67:69:12:02:72:bf:e7 SHA1 Fingerprint=62:FF:D9:9E:C0:65:0D:03:CE:75:93:D2:ED:3F:2D:32:C9:E3:E5:4A -----BEGIN CERTIFICATE----- MIICbjCCAfOgAwIBAgIQYvYybOXE42hcG2LdnC6dlTAKBggqhkjOPQQDAzB4MQsw diff --git a/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem b/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem index 4369ffbf1b30..158d806bffc3 100644 --- a/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem +++ b/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem @@ -23,7 +23,7 @@ Certificate: Subject: serialNumber = G63287510, C = ES, O = ANF Autoridad de Certificacion, OU = ANF CA Raiz, CN = ANF Secure Server Root CA Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:db:eb:6b:2b:e6:64:54:95:82:90:a3:72:a4:19: 01:9d:9c:0b:81:5f:73:49:ba:a7:ac:f3:04:4e:7b: @@ -63,8 +63,7 @@ Certificate: Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Authority Key Identifier: - keyid:9C:5F:D0:6C:63:A3:5F:93:CA:93:98:08:AD:8C:87:A5:2C:5C:C1:37 - + 9C:5F:D0:6C:63:A3:5F:93:CA:93:98:08:AD:8C:87:A5:2C:5C:C1:37 X509v3 Subject Key Identifier: 9C:5F:D0:6C:63:A3:5F:93:CA:93:98:08:AD:8C:87:A5:2C:5C:C1:37 X509v3 Key Usage: critical @@ -72,35 +71,36 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE Signature Algorithm: sha256WithRSAEncryption - 4e:1e:b9:8a:c6:a0:98:3f:6e:c3:69:c0:6a:5c:49:52:ac:cb: - 2b:5d:78:38:c1:d5:54:84:9f:93:f0:87:19:3d:2c:66:89:eb: - 0d:42:fc:cc:f0:75:85:3f:8b:f4:80:5d:79:e5:17:67:bd:35: - 82:e2:f2:3c:8e:7d:5b:36:cb:5a:80:00:29:f2:ce:2b:2c:f1: - 8f:aa:6d:05:93:6c:72:c7:56:eb:df:50:23:28:e5:45:10:3d: - e8:67:a3:af:0e:55:0f:90:09:62:ef:4b:59:a2:f6:53:f1:c0: - 35:e4:2f:c1:24:bd:79:2f:4e:20:22:3b:fd:1a:20:b0:a4:0e: - 2c:70:ed:74:3f:b8:13:95:06:51:c8:e8:87:26:ca:a4:5b:6a: - 16:21:92:dd:73:60:9e:10:18:de:3c:81:ea:e8:18:c3:7c:89: - f2:8b:50:3e:bd:11:e2:15:03:a8:36:7d:33:01:6c:48:15:d7: - 88:90:99:04:c5:cc:e6:07:f4:bc:f4:90:ed:13:e2:ea:8b:c3: - 8f:a3:33:0f:c1:29:4c:13:4e:da:15:56:71:73:72:82:50:f6: - 9a:33:7c:a2:b1:a8:1a:34:74:65:5c:ce:d1:eb:ab:53:e0:1a: - 80:d8:ea:3a:49:e4:26:30:9b:e5:1c:8a:a8:a9:15:32:86:99: - 92:0a:10:23:56:12:e0:f6:ce:4c:e2:bb:be:db:8d:92:73:01: - 66:2f:62:3e:b2:72:27:45:36:ed:4d:56:e3:97:99:ff:3a:35: - 3e:a5:54:4a:52:59:4b:60:db:ee:fe:78:11:7f:4a:dc:14:79: - 60:b6:6b:64:03:db:15:83:e1:a2:be:f6:23:97:50:f0:09:33: - 36:a7:71:96:25:f3:b9:42:7d:db:38:3f:2c:58:ac:e8:42:e1: - 0e:d8:d3:3b:4c:2e:82:e9:83:2e:6b:31:d9:dd:47:86:4f:6d: - 97:91:2e:4f:e2:28:71:35:16:d1:f2:73:fe:25:2b:07:47:24: - 63:27:c8:f8:f6:d9:6b:fc:12:31:56:08:c0:53:42:af:9c:d0: - 33:7e:fc:06:f0:31:44:03:14:f1:58:ea:f2:6a:0d:a9:11:b2: - 83:be:c5:1a:bf:07:ea:59:dc:a3:88:35:ef:9c:76:32:3c:4d: - 06:22:ce:15:e5:dd:9e:d8:8f:da:de:d2:c4:39:e5:17:81:cf: - 38:47:eb:7f:88:6d:59:1b:df:9f:42:14:ae:7e:cf:a8:b0:66: - 65:da:37:af:9f:aa:3d:ea:28:b6:de:d5:31:58:16:82:5b:ea: - bb:19:75:02:73:1a:ca:48:1a:21:93:90:0a:8e:93:84:a7:7d: - 3b:23:18:92:89:a0:8d:ac + Signature Value: + 4e:1e:b9:8a:c6:a0:98:3f:6e:c3:69:c0:6a:5c:49:52:ac:cb: + 2b:5d:78:38:c1:d5:54:84:9f:93:f0:87:19:3d:2c:66:89:eb: + 0d:42:fc:cc:f0:75:85:3f:8b:f4:80:5d:79:e5:17:67:bd:35: + 82:e2:f2:3c:8e:7d:5b:36:cb:5a:80:00:29:f2:ce:2b:2c:f1: + 8f:aa:6d:05:93:6c:72:c7:56:eb:df:50:23:28:e5:45:10:3d: + e8:67:a3:af:0e:55:0f:90:09:62:ef:4b:59:a2:f6:53:f1:c0: + 35:e4:2f:c1:24:bd:79:2f:4e:20:22:3b:fd:1a:20:b0:a4:0e: + 2c:70:ed:74:3f:b8:13:95:06:51:c8:e8:87:26:ca:a4:5b:6a: + 16:21:92:dd:73:60:9e:10:18:de:3c:81:ea:e8:18:c3:7c:89: + f2:8b:50:3e:bd:11:e2:15:03:a8:36:7d:33:01:6c:48:15:d7: + 88:90:99:04:c5:cc:e6:07:f4:bc:f4:90:ed:13:e2:ea:8b:c3: + 8f:a3:33:0f:c1:29:4c:13:4e:da:15:56:71:73:72:82:50:f6: + 9a:33:7c:a2:b1:a8:1a:34:74:65:5c:ce:d1:eb:ab:53:e0:1a: + 80:d8:ea:3a:49:e4:26:30:9b:e5:1c:8a:a8:a9:15:32:86:99: + 92:0a:10:23:56:12:e0:f6:ce:4c:e2:bb:be:db:8d:92:73:01: + 66:2f:62:3e:b2:72:27:45:36:ed:4d:56:e3:97:99:ff:3a:35: + 3e:a5:54:4a:52:59:4b:60:db:ee:fe:78:11:7f:4a:dc:14:79: + 60:b6:6b:64:03:db:15:83:e1:a2:be:f6:23:97:50:f0:09:33: + 36:a7:71:96:25:f3:b9:42:7d:db:38:3f:2c:58:ac:e8:42:e1: + 0e:d8:d3:3b:4c:2e:82:e9:83:2e:6b:31:d9:dd:47:86:4f:6d: + 97:91:2e:4f:e2:28:71:35:16:d1:f2:73:fe:25:2b:07:47:24: + 63:27:c8:f8:f6:d9:6b:fc:12:31:56:08:c0:53:42:af:9c:d0: + 33:7e:fc:06:f0:31:44:03:14:f1:58:ea:f2:6a:0d:a9:11:b2: + 83:be:c5:1a:bf:07:ea:59:dc:a3:88:35:ef:9c:76:32:3c:4d: + 06:22:ce:15:e5:dd:9e:d8:8f:da:de:d2:c4:39:e5:17:81:cf: + 38:47:eb:7f:88:6d:59:1b:df:9f:42:14:ae:7e:cf:a8:b0:66: + 65:da:37:af:9f:aa:3d:ea:28:b6:de:d5:31:58:16:82:5b:ea: + bb:19:75:02:73:1a:ca:48:1a:21:93:90:0a:8e:93:84:a7:7d: + 3b:23:18:92:89:a0:8d:ac SHA1 Fingerprint=5B:6E:68:D0:CC:15:B6:A0:5F:1E:C1:5F:AE:02:FC:6B:2F:5D:6F:74 -----BEGIN CERTIFICATE----- MIIF7zCCA9egAwIBAgIIDdPjvGz5a7EwDQYJKoZIhvcNAQELBQAwgYQxEjAQBgNV diff --git a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem index 8ea77deeda58..b71e3f700c29 100644 --- a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem +++ b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem @@ -23,7 +23,7 @@ Certificate: Subject: C = IT, L = Milan, O = Actalis S.p.A./03358520967, CN = Actalis Authentication Root CA Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:a7:c6:c4:a5:29:a4:2c:ef:e5:18:c5:b0:50:a3: 6f:51:3b:9f:0a:5a:c9:c2:48:38:0a:c2:1c:a0:18: @@ -67,40 +67,40 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: - keyid:52:D8:88:3A:C8:9F:78:66:ED:89:F3:7B:38:70:94:C9:02:02:36:D0 - + 52:D8:88:3A:C8:9F:78:66:ED:89:F3:7B:38:70:94:C9:02:02:36:D0 X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: sha256WithRSAEncryption - 0b:7b:72:87:c0:60:a6:49:4c:88:58:e6:1d:88:f7:14:64:48: - a6:d8:58:0a:0e:4f:13:35:df:35:1d:d4:ed:06:31:c8:81:3e: - 6a:d5:dd:3b:1a:32:ee:90:3d:11:d2:2e:f4:8e:c3:63:2e:23: - 66:b0:67:be:6f:b6:c0:13:39:60:aa:a2:34:25:93:75:52:de: - a7:9d:ad:0e:87:89:52:71:6a:16:3c:19:1d:83:f8:9a:29:65: - be:f4:3f:9a:d9:f0:f3:5a:87:21:71:80:4d:cb:e0:38:9b:3f: - bb:fa:e0:30:4d:cf:86:d3:65:10:19:18:d1:97:02:b1:2b:72: - 42:68:ac:a0:bd:4e:5a:da:18:bf:6b:98:81:d0:fd:9a:be:5e: - 15:48:cd:11:15:b9:c0:29:5c:b4:e8:88:f7:3e:36:ae:b7:62: - fd:1e:62:de:70:78:10:1c:48:5b:da:bc:a4:38:ba:67:ed:55: - 3e:5e:57:df:d4:03:40:4c:81:a4:d2:4f:63:a7:09:42:09:14: - fc:00:a9:c2:80:73:4f:2e:c0:40:d9:11:7b:48:ea:7a:02:c0: - d3:eb:28:01:26:58:74:c1:c0:73:22:6d:93:95:fd:39:7d:bb: - 2a:e3:f6:82:e3:2c:97:5f:4e:1f:91:94:fa:fe:2c:a3:d8:76: - 1a:b8:4d:b2:38:4f:9b:fa:1d:48:60:79:26:e2:f3:fd:a9:d0: - 9a:e8:70:8f:49:7a:d6:e5:bd:0a:0e:db:2d:f3:8d:bf:eb:e3: - a4:7d:cb:c7:95:71:e8:da:a3:7c:c5:c2:f8:74:92:04:1b:86: - ac:a4:22:53:40:b6:ac:fe:4c:76:cf:fb:94:32:c0:35:9f:76: - 3f:6e:e5:90:6e:a0:a6:26:a2:b8:2c:be:d1:2b:85:fd:a7:68: - c8:ba:01:2b:b1:6c:74:1d:b8:73:95:e7:ee:b7:c7:25:f0:00: - 4c:00:b2:7e:b6:0b:8b:1c:f3:c0:50:9e:25:b9:e0:08:de:36: - 66:ff:37:a5:d1:bb:54:64:2c:c9:27:b5:4b:92:7e:65:ff:d3: - 2d:e1:b9:4e:bc:7f:a4:41:21:90:41:77:a6:39:1f:ea:9e:e3: - 9f:d0:66:6f:05:ec:aa:76:7e:bf:6b:16:a0:eb:b5:c7:fc:92: - 54:2f:2b:11:27:25:37:78:4c:51:6a:b0:f3:cc:58:5d:14:f1: - 6a:48:15:ff:c2:07:b6:b1:8d:0f:8e:5c:50:46:b3:3d:bf:01: - 98:4f:b2:59:54:47:3e:34:7b:78:6d:56:93:2e:73:ea:66:28: - 78:cd:1d:14:bf:a0:8f:2f:2e:b8:2e:8e:f2:14:8a:cc:e9:b5: - 7c:fb:6c:9d:0c:a5:e1:96 + Signature Value: + 0b:7b:72:87:c0:60:a6:49:4c:88:58:e6:1d:88:f7:14:64:48: + a6:d8:58:0a:0e:4f:13:35:df:35:1d:d4:ed:06:31:c8:81:3e: + 6a:d5:dd:3b:1a:32:ee:90:3d:11:d2:2e:f4:8e:c3:63:2e:23: + 66:b0:67:be:6f:b6:c0:13:39:60:aa:a2:34:25:93:75:52:de: + a7:9d:ad:0e:87:89:52:71:6a:16:3c:19:1d:83:f8:9a:29:65: + be:f4:3f:9a:d9:f0:f3:5a:87:21:71:80:4d:cb:e0:38:9b:3f: + bb:fa:e0:30:4d:cf:86:d3:65:10:19:18:d1:97:02:b1:2b:72: + 42:68:ac:a0:bd:4e:5a:da:18:bf:6b:98:81:d0:fd:9a:be:5e: + 15:48:cd:11:15:b9:c0:29:5c:b4:e8:88:f7:3e:36:ae:b7:62: + fd:1e:62:de:70:78:10:1c:48:5b:da:bc:a4:38:ba:67:ed:55: + 3e:5e:57:df:d4:03:40:4c:81:a4:d2:4f:63:a7:09:42:09:14: + fc:00:a9:c2:80:73:4f:2e:c0:40:d9:11:7b:48:ea:7a:02:c0: + d3:eb:28:01:26:58:74:c1:c0:73:22:6d:93:95:fd:39:7d:bb: + 2a:e3:f6:82:e3:2c:97:5f:4e:1f:91:94:fa:fe:2c:a3:d8:76: + 1a:b8:4d:b2:38:4f:9b:fa:1d:48:60:79:26:e2:f3:fd:a9:d0: + 9a:e8:70:8f:49:7a:d6:e5:bd:0a:0e:db:2d:f3:8d:bf:eb:e3: + a4:7d:cb:c7:95:71:e8:da:a3:7c:c5:c2:f8:74:92:04:1b:86: + ac:a4:22:53:40:b6:ac:fe:4c:76:cf:fb:94:32:c0:35:9f:76: + 3f:6e:e5:90:6e:a0:a6:26:a2:b8:2c:be:d1:2b:85:fd:a7:68: + c8:ba:01:2b:b1:6c:74:1d:b8:73:95:e7:ee:b7:c7:25:f0:00: + 4c:00:b2:7e:b6:0b:8b:1c:f3:c0:50:9e:25:b9:e0:08:de:36: + 66:ff:37:a5:d1:bb:54:64:2c:c9:27:b5:4b:92:7e:65:ff:d3: + 2d:e1:b9:4e:bc:7f:a4:41:21:90:41:77:a6:39:1f:ea:9e:e3: + 9f:d0:66:6f:05:ec:aa:76:7e:bf:6b:16:a0:eb:b5:c7:fc:92: + 54:2f:2b:11:27:25:37:78:4c:51:6a:b0:f3:cc:58:5d:14:f1: + 6a:48:15:ff:c2:07:b6:b1:8d:0f:8e:5c:50:46:b3:3d:bf:01: + 98:4f:b2:59:54:47:3e:34:7b:78:6d:56:93:2e:73:ea:66:28: + 78:cd:1d:14:bf:a0:8f:2f:2e:b8:2e:8e:f2:14:8a:cc:e9:b5: + 7c:fb:6c:9d:0c:a5:e1:96 SHA1 Fingerprint=F3:73:B3:87:06:5A:28:84:8A:F2:F3:4A:CE:19:2B:DD:C7:8E:9C:AC -----BEGIN CERTIFICATE----- MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE diff --git a/secure/caroot/trusted/AffirmTrust_Commercial.pem b/secure/caroot/trusted/AffirmTrust_Commercial.pem index b1031ad0f348..b59fd17d8d7b 100644 --- a/secure/caroot/trusted/AffirmTrust_Commercial.pem +++ b/secure/caroot/trusted/AffirmTrust_Commercial.pem @@ -23,7 +23,7 @@ Certificate: Subject: C = US, O = AffirmTrust, CN = AffirmTrust Commercial Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:f6:1b:4f:67:07:2b:a1:15:f5:06:22:cb:1f:01: b2:e3:73:45:06:44:49:2c:bb:49:25:14:d6:ce:c3: @@ -52,21 +52,22 @@ Certificate: X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: sha256WithRSAEncryption - 58:ac:f4:04:0e:cd:c0:0d:ff:0a:fd:d4:ba:16:5f:29:bd:7b: - 68:99:58:49:d2:b4:1d:37:4d:7f:27:7d:46:06:5d:43:c6:86: - 2e:3e:73:b2:26:7d:4f:93:a9:b6:c4:2a:9a:ab:21:97:14:b1: - de:8c:d3:ab:89:15:d8:6b:24:d4:f1:16:ae:d8:a4:5c:d4:7f: - 51:8e:ed:18:01:b1:93:63:bd:bc:f8:61:80:9a:9e:b1:ce:42: - 70:e2:a9:7d:06:25:7d:27:a1:fe:6f:ec:b3:1e:24:da:e3:4b: - 55:1a:00:3b:35:b4:3b:d9:d7:5d:30:fd:81:13:89:f2:c2:06: - 2b:ed:67:c4:8e:c9:43:b2:5c:6b:15:89:02:bc:62:fc:4e:f2: - b5:33:aa:b2:6f:d3:0a:a2:50:e3:f6:3b:e8:2e:44:c2:db:66: - 38:a9:33:56:48:f1:6d:1b:33:8d:0d:8c:3f:60:37:9d:d3:ca: - 6d:7e:34:7e:0d:9f:72:76:8b:1b:9f:72:fd:52:35:41:45:02: - 96:2f:1c:b2:9a:73:49:21:b1:49:47:45:47:b4:ef:6a:34:11: - c9:4d:9a:cc:59:b7:d6:02:9e:5a:4e:65:b5:94:ae:1b:df:29: - b0:16:f1:bf:00:9e:07:3a:17:64:b5:04:b5:23:21:99:0a:95: - 3b:97:7c:ef + Signature Value: + 58:ac:f4:04:0e:cd:c0:0d:ff:0a:fd:d4:ba:16:5f:29:bd:7b: + 68:99:58:49:d2:b4:1d:37:4d:7f:27:7d:46:06:5d:43:c6:86: + 2e:3e:73:b2:26:7d:4f:93:a9:b6:c4:2a:9a:ab:21:97:14:b1: + de:8c:d3:ab:89:15:d8:6b:24:d4:f1:16:ae:d8:a4:5c:d4:7f: + 51:8e:ed:18:01:b1:93:63:bd:bc:f8:61:80:9a:9e:b1:ce:42: + 70:e2:a9:7d:06:25:7d:27:a1:fe:6f:ec:b3:1e:24:da:e3:4b: + 55:1a:00:3b:35:b4:3b:d9:d7:5d:30:fd:81:13:89:f2:c2:06: + 2b:ed:67:c4:8e:c9:43:b2:5c:6b:15:89:02:bc:62:fc:4e:f2: + b5:33:aa:b2:6f:d3:0a:a2:50:e3:f6:3b:e8:2e:44:c2:db:66: + 38:a9:33:56:48:f1:6d:1b:33:8d:0d:8c:3f:60:37:9d:d3:ca: + 6d:7e:34:7e:0d:9f:72:76:8b:1b:9f:72:fd:52:35:41:45:02: + 96:2f:1c:b2:9a:73:49:21:b1:49:47:45:47:b4:ef:6a:34:11: + c9:4d:9a:cc:59:b7:d6:02:9e:5a:4e:65:b5:94:ae:1b:df:29: + b0:16:f1:bf:00:9e:07:3a:17:64:b5:04:b5:23:21:99:0a:95: + 3b:97:7c:ef SHA1 Fingerprint=F9:B5:B6:32:45:5F:9C:BE:EC:57:5F:80:DC:E9:6E:2C:C7:B2:78:B7 -----BEGIN CERTIFICATE----- MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE diff --git a/secure/caroot/trusted/AffirmTrust_Networking.pem b/secure/caroot/trusted/AffirmTrust_Networking.pem index 1d6a82f767f7..33f7a4bebcb6 100644 --- a/secure/caroot/trusted/AffirmTrust_Networking.pem +++ b/secure/caroot/trusted/AffirmTrust_Networking.pem @@ -23,7 +23,7 @@ Certificate: Subject: C = US, O = AffirmTrust, CN = AffirmTrust Networking Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:b4:84:cc:33:17:2e:6b:94:6c:6b:61:52:a0:eb: a3:cf:79:94:4c:e5:94:80:99:cb:55:64:44:65:8f: @@ -52,21 +52,22 @@ Certificate: X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: sha1WithRSAEncryption - 89:57:b2:16:7a:a8:c2:fd:d6:d9:9b:9b:34:c2:9c:b4:32:14: - 4d:a7:a4:df:ec:be:a7:be:f8:43:db:91:37:ce:b4:32:2e:50: - 55:1a:35:4e:76:43:71:20:ef:93:77:4e:15:70:2e:87:c3:c1: - 1d:6d:dc:cb:b5:27:d4:2c:56:d1:52:53:3a:44:d2:73:c8:c4: - 1b:05:65:5a:62:92:9c:ee:41:8d:31:db:e7:34:ea:59:21:d5: - 01:7a:d7:64:b8:64:39:cd:c9:ed:af:ed:4b:03:48:a7:a0:99: - 01:80:dc:65:a3:36:ae:65:59:48:4f:82:4b:c8:65:f1:57:1d: - e5:59:2e:0a:3f:6c:d8:d1:f5:e5:09:b4:6c:54:00:0a:e0:15: - 4d:87:75:6d:b7:58:96:5a:dd:6d:d2:00:a0:f4:9b:48:be:c3: - 37:a4:ba:36:e0:7c:87:85:97:1a:15:a2:de:2e:a2:5b:bd:af: - 18:f9:90:50:cd:70:59:f8:27:67:47:cb:c7:a0:07:3a:7d:d1: - 2c:5d:6c:19:3a:66:b5:7d:fd:91:6f:82:b1:be:08:93:db:14: - 47:f1:a2:37:c7:45:9e:3c:c7:77:af:64:a8:93:df:f6:69:83: - 82:60:f2:49:42:34:ed:5a:00:54:85:1c:16:36:92:0c:5c:fa: - a6:ad:bf:db + Signature Value: + 89:57:b2:16:7a:a8:c2:fd:d6:d9:9b:9b:34:c2:9c:b4:32:14: + 4d:a7:a4:df:ec:be:a7:be:f8:43:db:91:37:ce:b4:32:2e:50: + 55:1a:35:4e:76:43:71:20:ef:93:77:4e:15:70:2e:87:c3:c1: + 1d:6d:dc:cb:b5:27:d4:2c:56:d1:52:53:3a:44:d2:73:c8:c4: + 1b:05:65:5a:62:92:9c:ee:41:8d:31:db:e7:34:ea:59:21:d5: + 01:7a:d7:64:b8:64:39:cd:c9:ed:af:ed:4b:03:48:a7:a0:99: + 01:80:dc:65:a3:36:ae:65:59:48:4f:82:4b:c8:65:f1:57:1d: + e5:59:2e:0a:3f:6c:d8:d1:f5:e5:09:b4:6c:54:00:0a:e0:15: + 4d:87:75:6d:b7:58:96:5a:dd:6d:d2:00:a0:f4:9b:48:be:c3: + 37:a4:ba:36:e0:7c:87:85:97:1a:15:a2:de:2e:a2:5b:bd:af: + 18:f9:90:50:cd:70:59:f8:27:67:47:cb:c7:a0:07:3a:7d:d1: + 2c:5d:6c:19:3a:66:b5:7d:fd:91:6f:82:b1:be:08:93:db:14: + 47:f1:a2:37:c7:45:9e:3c:c7:77:af:64:a8:93:df:f6:69:83: + 82:60:f2:49:42:34:ed:5a:00:54:85:1c:16:36:92:0c:5c:fa: + a6:ad:bf:db SHA1 Fingerprint=29:36:21:02:8B:20:ED:02:F5:66:C5:32:D1:D6:ED:90:9F:45:00:2F -----BEGIN CERTIFICATE----- MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE diff --git a/secure/caroot/trusted/AffirmTrust_Premium.pem b/secure/caroot/trusted/AffirmTrust_Premium.pem index ef4c3286bf1c..ec32ac850bbd 100644 --- a/secure/caroot/trusted/AffirmTrust_Premium.pem +++ b/secure/caroot/trusted/AffirmTrust_Premium.pem @@ -23,7 +23,7 @@ Certificate: Subject: C = US, O = AffirmTrust, CN = AffirmTrust Premium Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:c4:12:df:a9:5f:fe:41:dd:dd:f5:9f:8a:e3:f6: ac:e1:3c:78:9a:bc:d8:f0:7f:7a:a0:33:2a:dc:8d: @@ -69,35 +69,36 @@ Certificate: X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: sha384WithRSAEncryption - b3:57:4d:10:62:4e:3a:e4:ac:ea:b8:1c:af:32:23:c8:b3:49: - 5a:51:9c:76:28:8d:79:aa:57:46:17:d5:f5:52:f6:b7:44:e8: - 08:44:bf:18:84:d2:0b:80:cd:c5:12:fd:00:55:05:61:87:41: - dc:b5:24:9e:3c:c4:d8:c8:fb:70:9e:2f:78:96:83:20:36:de: - 7c:0f:69:13:88:a5:75:36:98:08:a6:c6:df:ac:ce:e3:58:d6: - b7:3e:de:ba:f3:eb:34:40:d8:a2:81:f5:78:3f:2f:d5:a5:fc: - d9:a2:d4:5e:04:0e:17:ad:fe:41:f0:e5:b2:72:fa:44:82:33: - 42:e8:2d:58:f7:56:8c:62:3f:ba:42:b0:9c:0c:5c:7e:2e:65: - 26:5c:53:4f:00:b2:78:7e:a1:0d:99:2d:8d:b8:1d:8e:a2:c4: - b0:fd:60:d0:30:a4:8e:c8:04:62:a9:c4:ed:35:de:7a:97:ed: - 0e:38:5e:92:2f:93:70:a5:a9:9c:6f:a7:7d:13:1d:7e:c6:08: - 48:b1:5e:67:eb:51:08:25:e9:e6:25:6b:52:29:91:9c:d2:39: - 73:08:57:de:99:06:b4:5b:9d:10:06:e1:c2:00:a8:b8:1c:4a: - 02:0a:14:d0:c1:41:ca:fb:8c:35:21:7d:82:38:f2:a9:54:91: - 19:35:93:94:6d:6a:3a:c5:b2:d0:bb:89:86:93:e8:9b:c9:0f: - 3a:a7:7a:b8:a1:f0:78:46:fa:fc:37:2f:e5:8a:84:f3:df:fe: - 04:d9:a1:68:a0:2f:24:e2:09:95:06:d5:95:ca:e1:24:96:eb: - 7c:f6:93:05:bb:ed:73:e9:2d:d1:75:39:d7:e7:24:db:d8:4e: - 5f:43:8f:9e:d0:14:39:bf:55:70:48:99:57:31:b4:9c:ee:4a: - 98:03:96:30:1f:60:06:ee:1b:23:fe:81:60:23:1a:47:62:85: - a5:cc:19:34:80:6f:b3:ac:1a:e3:9f:f0:7b:48:ad:d5:01:d9: - 67:b6:a9:72:93:ea:2d:66:b5:b2:b8:e4:3d:3c:b2:ef:4c:8c: - ea:eb:07:bf:ab:35:9a:55:86:bc:18:a6:b5:a8:5e:b4:83:6c: - 6b:69:40:d3:9f:dc:f1:c3:69:6b:b9:e1:6d:09:f4:f1:aa:50: - 76:0a:7a:7d:7a:17:a1:55:96:42:99:31:09:dd:60:11:8d:05: - 30:7e:e6:8e:46:d1:9d:14:da:c7:17:e4:05:96:8c:c4:24:b5: - 1b:cf:14:07:b2:40:f8:a3:9e:41:86:bc:04:d0:6b:96:c8:2a: - 80:34:fd:bf:ef:06:a3:dd:58:c5:85:3d:3e:8f:fe:9e:29:e0: - b6:b8:09:68:19:1c:18:43 + Signature Value: + b3:57:4d:10:62:4e:3a:e4:ac:ea:b8:1c:af:32:23:c8:b3:49: + 5a:51:9c:76:28:8d:79:aa:57:46:17:d5:f5:52:f6:b7:44:e8: + 08:44:bf:18:84:d2:0b:80:cd:c5:12:fd:00:55:05:61:87:41: + dc:b5:24:9e:3c:c4:d8:c8:fb:70:9e:2f:78:96:83:20:36:de: + 7c:0f:69:13:88:a5:75:36:98:08:a6:c6:df:ac:ce:e3:58:d6: + b7:3e:de:ba:f3:eb:34:40:d8:a2:81:f5:78:3f:2f:d5:a5:fc: + d9:a2:d4:5e:04:0e:17:ad:fe:41:f0:e5:b2:72:fa:44:82:33: + 42:e8:2d:58:f7:56:8c:62:3f:ba:42:b0:9c:0c:5c:7e:2e:65: + 26:5c:53:4f:00:b2:78:7e:a1:0d:99:2d:8d:b8:1d:8e:a2:c4: + b0:fd:60:d0:30:a4:8e:c8:04:62:a9:c4:ed:35:de:7a:97:ed: + 0e:38:5e:92:2f:93:70:a5:a9:9c:6f:a7:7d:13:1d:7e:c6:08: + 48:b1:5e:67:eb:51:08:25:e9:e6:25:6b:52:29:91:9c:d2:39: + 73:08:57:de:99:06:b4:5b:9d:10:06:e1:c2:00:a8:b8:1c:4a: + 02:0a:14:d0:c1:41:ca:fb:8c:35:21:7d:82:38:f2:a9:54:91: + 19:35:93:94:6d:6a:3a:c5:b2:d0:bb:89:86:93:e8:9b:c9:0f: + 3a:a7:7a:b8:a1:f0:78:46:fa:fc:37:2f:e5:8a:84:f3:df:fe: + 04:d9:a1:68:a0:2f:24:e2:09:95:06:d5:95:ca:e1:24:96:eb: + 7c:f6:93:05:bb:ed:73:e9:2d:d1:75:39:d7:e7:24:db:d8:4e: + 5f:43:8f:9e:d0:14:39:bf:55:70:48:99:57:31:b4:9c:ee:4a: + 98:03:96:30:1f:60:06:ee:1b:23:fe:81:60:23:1a:47:62:85: + a5:cc:19:34:80:6f:b3:ac:1a:e3:9f:f0:7b:48:ad:d5:01:d9: + 67:b6:a9:72:93:ea:2d:66:b5:b2:b8:e4:3d:3c:b2:ef:4c:8c: + ea:eb:07:bf:ab:35:9a:55:86:bc:18:a6:b5:a8:5e:b4:83:6c: + 6b:69:40:d3:9f:dc:f1:c3:69:6b:b9:e1:6d:09:f4:f1:aa:50: + 76:0a:7a:7d:7a:17:a1:55:96:42:99:31:09:dd:60:11:8d:05: + 30:7e:e6:8e:46:d1:9d:14:da:c7:17:e4:05:96:8c:c4:24:b5: + 1b:cf:14:07:b2:40:f8:a3:9e:41:86:bc:04:d0:6b:96:c8:2a: + 80:34:fd:bf:ef:06:a3:dd:58:c5:85:3d:3e:8f:fe:9e:29:e0: + b6:b8:09:68:19:1c:18:43 SHA1 Fingerprint=D8:A6:33:2C:E0:03:6F:B1:85:F6:63:4F:7D:6A:06:65:26:32:28:27 -----BEGIN CERTIFICATE----- MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE diff --git a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem index 1a1b7b14e7be..19a9ffb6b45b 100644 --- a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem +++ b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem @@ -42,12 +42,13 @@ Certificate: X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: ecdsa-with-SHA384 - 30:64:02:30:17:09:f3:87:88:50:5a:af:c8:c0:42:bf:47:5f: - f5:6c:6a:86:e0:c4:27:74:e4:38:53:d7:05:7f:1b:34:e3:c6: - 2f:b3:ca:09:3c:37:9d:d7:e7:b8:46:f1:fd:a1:e2:71:02:30: - 42:59:87:43:d4:51:df:ba:d3:09:32:5a:ce:88:7e:57:3d:9c: - 5f:42:6b:f5:07:2d:b5:f0:82:93:f9:59:6f:ae:64:fa:58:e5: - 8b:1e:e3:63:be:b5:81:cd:6f:02:8c:79 + Signature Value: + 30:64:02:30:17:09:f3:87:88:50:5a:af:c8:c0:42:bf:47:5f: + f5:6c:6a:86:e0:c4:27:74:e4:38:53:d7:05:7f:1b:34:e3:c6: + 2f:b3:ca:09:3c:37:9d:d7:e7:b8:46:f1:fd:a1:e2:71:02:30: + 42:59:87:43:d4:51:df:ba:d3:09:32:5a:ce:88:7e:57:3d:9c: + 5f:42:6b:f5:07:2d:b5:f0:82:93:f9:59:6f:ae:64:fa:58:e5: + 8b:1e:e3:63:be:b5:81:cd:6f:02:8c:79 SHA1 Fingerprint=B8:23:6B:00:2F:1D:16:86:53:01:55:6C:11:A4:37:CA:EB:FF:C3:BB -----BEGIN CERTIFICATE----- MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC diff --git a/secure/caroot/trusted/Amazon_Root_CA_1.pem b/secure/caroot/trusted/Amazon_Root_CA_1.pem index 996e32e056e9..5a7236d01703 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_1.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_1.pem @@ -24,7 +24,7 @@ Certificate: Subject: C = US, O = Amazon, CN = Amazon Root CA 1 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:b2:78:80:71:ca:78:d5:e3:71:af:47:80:50:74: 7d:6e:d8:d7:88:76:f4:99:68:f7:58:21:60:f9:74: @@ -53,21 +53,22 @@ Certificate: X509v3 Subject Key Identifier: 84:18:CC:85:34:EC:BC:0C:94:94:2E:08:59:9C:C7:B2:10:4E:0A:08 Signature Algorithm: sha256WithRSAEncryption - 98:f2:37:5a:41:90:a1:1a:c5:76:51:28:20:36:23:0e:ae:e6: - 28:bb:aa:f8:94:ae:48:a4:30:7f:1b:fc:24:8d:4b:b4:c8:a1: - 97:f6:b6:f1:7a:70:c8:53:93:cc:08:28:e3:98:25:cf:23:a4: - f9:de:21:d3:7c:85:09:ad:4e:9a:75:3a:c2:0b:6a:89:78:76: - 44:47:18:65:6c:8d:41:8e:3b:7f:9a:cb:f4:b5:a7:50:d7:05: - 2c:37:e8:03:4b:ad:e9:61:a0:02:6e:f5:f2:f0:c5:b2:ed:5b: - b7:dc:fa:94:5c:77:9e:13:a5:7f:52:ad:95:f2:f8:93:3b:de: - 8b:5c:5b:ca:5a:52:5b:60:af:14:f7:4b:ef:a3:fb:9f:40:95: - 6d:31:54:fc:42:d3:c7:46:1f:23:ad:d9:0f:48:70:9a:d9:75: - 78:71:d1:72:43:34:75:6e:57:59:c2:02:5c:26:60:29:cf:23: - 19:16:8e:88:43:a5:d4:e4:cb:08:fb:23:11:43:e8:43:29:72: - 62:a1:a9:5d:5e:08:d4:90:ae:b8:d8:ce:14:c2:d0:55:f2:86: - f6:c4:93:43:77:66:61:c0:b9:e8:41:d7:97:78:60:03:6e:4a: - 72:ae:a5:d1:7d:ba:10:9e:86:6c:1b:8a:b9:59:33:f8:eb:c4: - 90:be:f1:b9 + Signature Value: + 98:f2:37:5a:41:90:a1:1a:c5:76:51:28:20:36:23:0e:ae:e6: + 28:bb:aa:f8:94:ae:48:a4:30:7f:1b:fc:24:8d:4b:b4:c8:a1: + 97:f6:b6:f1:7a:70:c8:53:93:cc:08:28:e3:98:25:cf:23:a4: + f9:de:21:d3:7c:85:09:ad:4e:9a:75:3a:c2:0b:6a:89:78:76: + 44:47:18:65:6c:8d:41:8e:3b:7f:9a:cb:f4:b5:a7:50:d7:05: + 2c:37:e8:03:4b:ad:e9:61:a0:02:6e:f5:f2:f0:c5:b2:ed:5b: + b7:dc:fa:94:5c:77:9e:13:a5:7f:52:ad:95:f2:f8:93:3b:de: + 8b:5c:5b:ca:5a:52:5b:60:af:14:f7:4b:ef:a3:fb:9f:40:95: + 6d:31:54:fc:42:d3:c7:46:1f:23:ad:d9:0f:48:70:9a:d9:75: + 78:71:d1:72:43:34:75:6e:57:59:c2:02:5c:26:60:29:cf:23: + 19:16:8e:88:43:a5:d4:e4:cb:08:fb:23:11:43:e8:43:29:72: + 62:a1:a9:5d:5e:08:d4:90:ae:b8:d8:ce:14:c2:d0:55:f2:86: + f6:c4:93:43:77:66:61:c0:b9:e8:41:d7:97:78:60:03:6e:4a: + 72:ae:a5:d1:7d:ba:10:9e:86:6c:1b:8a:b9:59:33:f8:eb:c4: + 90:be:f1:b9 SHA1 Fingerprint=8D:A7:F9:65:EC:5E:FC:37:91:0F:1C:6E:59:FD:C1:CC:6A:6E:DE:16 -----BEGIN CERTIFICATE----- MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsF diff --git a/secure/caroot/trusted/Amazon_Root_CA_2.pem b/secure/caroot/trusted/Amazon_Root_CA_2.pem index fbcb6a47f445..5418e52f1cfd 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_2.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_2.pem @@ -24,7 +24,7 @@ Certificate: Subject: C = US, O = Amazon, CN = Amazon Root CA 2 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:ad:96:9f:2d:9c:4a:4c:4a:81:79:51:99:ec:8a: cb:6b:60:51:13:bc:4d:6d:06:fc:b0:08:8d:dd:19: @@ -70,35 +70,36 @@ Certificate: X509v3 Subject Key Identifier: B0:0C:F0:4C:30:F4:05:58:02:48:FD:33:E5:52:AF:4B:84:E3:66:52 Signature Algorithm: sha384WithRSAEncryption - aa:a8:80:8f:0e:78:a3:e0:a2:d4:cd:e6:f5:98:7a:3b:ea:00: - 03:b0:97:0e:93:bc:5a:a8:f6:2c:8c:72:87:a9:b1:fc:7f:73: - fd:63:71:78:a5:87:59:cf:30:e1:0d:10:b2:13:5a:6d:82:f5: - 6a:e6:80:9f:a0:05:0b:68:e4:47:6b:c7:6a:df:b6:fd:77:32: - 72:e5:18:fa:09:f4:a0:93:2c:5d:d2:8c:75:85:76:65:90:0c: - 03:79:b7:31:23:63:ad:78:83:09:86:68:84:ca:ff:f9:cf:26: - 9a:92:79:e7:cd:4b:c5:e7:61:a7:17:cb:f3:a9:12:93:93:6b: - a7:e8:2f:53:92:c4:60:58:b0:cc:02:51:18:5b:85:8d:62:59: - 63:b6:ad:b4:de:9a:fb:26:f7:00:27:c0:5d:55:37:74:99:c9: - 50:7f:e3:59:2e:44:e3:2c:25:ee:ec:4c:32:77:b4:9f:1a:e9: - 4b:5d:20:c5:da:fd:1c:87:16:c6:43:e8:d4:bb:26:9a:45:70: - 5e:a9:0b:37:53:e2:46:7b:27:fd:e0:46:f2:89:b7:cc:42:b6: - cb:28:26:6e:d9:a5:c9:3a:c8:41:13:60:f7:50:8c:15:ae:b2: - 6d:1a:15:1a:57:78:e6:92:2a:d9:65:90:82:3f:6c:02:af:ae: - 12:3a:27:96:36:04:d7:1d:a2:80:63:a9:9b:f1:e5:ba:b4:7c: - 14:b0:4e:c9:b1:1f:74:5f:38:f6:51:ea:9b:fa:2c:a2:11:d4: - a9:2d:27:1a:45:b1:af:b2:4e:71:0d:c0:58:46:d6:69:06:cb: - 53:cb:b3:fe:6b:41:cd:41:7e:7d:4c:0f:7c:72:79:7a:59:cd: - 5e:4a:0e:ac:9b:a9:98:73:79:7c:b4:f4:cc:b9:b8:07:0c:b2: - 74:5c:b8:c7:6f:88:a1:90:a7:f4:aa:f9:bf:67:3a:f4:1a:15: - 62:1e:b7:9f:be:3d:b1:29:af:67:a1:12:f2:58:10:19:53:03: - 30:1b:b8:1a:89:f6:9c:bd:97:03:8e:a3:09:f3:1d:8b:21:f1: - b4:df:e4:1c:d1:9f:65:02:06:ea:5c:d6:13:b3:84:ef:a2:a5: - 5c:8c:77:29:a7:68:c0:6b:ae:40:d2:a8:b4:ea:cd:f0:8d:4b: - 38:9c:19:9a:1b:28:54:b8:89:90:ef:ca:75:81:3e:1e:f2:64: - 24:c7:18:af:4e:ff:47:9e:07:f6:35:65:a4:d3:0a:56:ff:f5: - 17:64:6c:ef:a8:22:25:49:93:b6:df:00:17:da:58:7e:5d:ee: - c5:1b:b0:d1:d1:5f:21:10:c7:f9:f3:ba:02:0a:27:07:c5:f1: - d6:c7:d3:e0:fb:09:60:6c + Signature Value: + aa:a8:80:8f:0e:78:a3:e0:a2:d4:cd:e6:f5:98:7a:3b:ea:00: + 03:b0:97:0e:93:bc:5a:a8:f6:2c:8c:72:87:a9:b1:fc:7f:73: + fd:63:71:78:a5:87:59:cf:30:e1:0d:10:b2:13:5a:6d:82:f5: + 6a:e6:80:9f:a0:05:0b:68:e4:47:6b:c7:6a:df:b6:fd:77:32: + 72:e5:18:fa:09:f4:a0:93:2c:5d:d2:8c:75:85:76:65:90:0c: + 03:79:b7:31:23:63:ad:78:83:09:86:68:84:ca:ff:f9:cf:26: + 9a:92:79:e7:cd:4b:c5:e7:61:a7:17:cb:f3:a9:12:93:93:6b: + a7:e8:2f:53:92:c4:60:58:b0:cc:02:51:18:5b:85:8d:62:59: + 63:b6:ad:b4:de:9a:fb:26:f7:00:27:c0:5d:55:37:74:99:c9: + 50:7f:e3:59:2e:44:e3:2c:25:ee:ec:4c:32:77:b4:9f:1a:e9: + 4b:5d:20:c5:da:fd:1c:87:16:c6:43:e8:d4:bb:26:9a:45:70: + 5e:a9:0b:37:53:e2:46:7b:27:fd:e0:46:f2:89:b7:cc:42:b6: + cb:28:26:6e:d9:a5:c9:3a:c8:41:13:60:f7:50:8c:15:ae:b2: + 6d:1a:15:1a:57:78:e6:92:2a:d9:65:90:82:3f:6c:02:af:ae: + 12:3a:27:96:36:04:d7:1d:a2:80:63:a9:9b:f1:e5:ba:b4:7c: + 14:b0:4e:c9:b1:1f:74:5f:38:f6:51:ea:9b:fa:2c:a2:11:d4: + a9:2d:27:1a:45:b1:af:b2:4e:71:0d:c0:58:46:d6:69:06:cb: + 53:cb:b3:fe:6b:41:cd:41:7e:7d:4c:0f:7c:72:79:7a:59:cd: + 5e:4a:0e:ac:9b:a9:98:73:79:7c:b4:f4:cc:b9:b8:07:0c:b2: + 74:5c:b8:c7:6f:88:a1:90:a7:f4:aa:f9:bf:67:3a:f4:1a:15: + 62:1e:b7:9f:be:3d:b1:29:af:67:a1:12:f2:58:10:19:53:03: + 30:1b:b8:1a:89:f6:9c:bd:97:03:8e:a3:09:f3:1d:8b:21:f1: + b4:df:e4:1c:d1:9f:65:02:06:ea:5c:d6:13:b3:84:ef:a2:a5: + 5c:8c:77:29:a7:68:c0:6b:ae:40:d2:a8:b4:ea:cd:f0:8d:4b: + 38:9c:19:9a:1b:28:54:b8:89:90:ef:ca:75:81:3e:1e:f2:64: + 24:c7:18:af:4e:ff:47:9e:07:f6:35:65:a4:d3:0a:56:ff:f5: + 17:64:6c:ef:a8:22:25:49:93:b6:df:00:17:da:58:7e:5d:ee: + c5:1b:b0:d1:d1:5f:21:10:c7:f9:f3:ba:02:0a:27:07:c5:f1: + d6:c7:d3:e0:fb:09:60:6c SHA1 Fingerprint=5A:8C:EF:45:D7:A6:98:59:76:7A:8C:8B:44:96:B5:78:CF:47:4B:1A -----BEGIN CERTIFICATE----- MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwF diff --git a/secure/caroot/trusted/Amazon_Root_CA_3.pem b/secure/caroot/trusted/Amazon_Root_CA_3.pem index 1e45a816b669..0baa14e92de3 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_3.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_3.pem @@ -41,10 +41,11 @@ Certificate: X509v3 Subject Key Identifier: AB:B6:DB:D7:06:9E:37:AC:30:86:07:91:70:C7:9C:C4:19:B1:78:C0 Signature Algorithm: ecdsa-with-SHA256 - 30:46:02:21:00:e0:85:92:a3:17:b7:8d:f9:2b:06:a5:93:ac: - 1a:98:68:61:72:fa:e1:a1:d0:fb:1c:78:60:a6:43:99:c5:b8: - c4:02:21:00:9c:02:ef:f1:94:9c:b3:96:f9:eb:c6:2a:f8:b6: - 2c:fe:3a:90:14:16:d7:8c:63:24:48:1c:df:30:7d:d5:68:3b + Signature Value: + 30:46:02:21:00:e0:85:92:a3:17:b7:8d:f9:2b:06:a5:93:ac: + 1a:98:68:61:72:fa:e1:a1:d0:fb:1c:78:60:a6:43:99:c5:b8: + c4:02:21:00:9c:02:ef:f1:94:9c:b3:96:f9:eb:c6:2a:f8:b6: + 2c:fe:3a:90:14:16:d7:8c:63:24:48:1c:df:30:7d:d5:68:3b SHA1 Fingerprint=0D:44:DD:8C:3C:8C:1A:1A:58:75:64:81:E9:0F:2E:2A:FF:B3:D2:6E -----BEGIN CERTIFICATE----- MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5 diff --git a/secure/caroot/trusted/Amazon_Root_CA_4.pem b/secure/caroot/trusted/Amazon_Root_CA_4.pem index 889f1dc33d52..06ccb20544dc 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_4.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_4.pem @@ -43,12 +43,13 @@ Certificate: X509v3 Subject Key Identifier: D3:EC:C7:3A:65:6E:CC:E1:DA:76:9A:56:FB:9C:F3:86:6D:57:E5:81 Signature Algorithm: ecdsa-with-SHA384 - 30:65:02:30:3a:8b:21:f1:bd:7e:11:ad:d0:ef:58:96:2f:d6: - eb:9d:7e:90:8d:2b:cf:66:55:c3:2c:e3:28:a9:70:0a:47:0e: - f0:37:59:12:ff:2d:99:94:28:4e:2a:4f:35:4d:33:5a:02:31: - 00:ea:75:00:4e:3b:c4:3a:94:12:91:c9:58:46:9d:21:13:72: - a7:88:9c:8a:e4:4c:4a:db:96:d4:ac:8b:6b:6b:49:12:53:33: - ad:d7:e4:be:24:fc:b5:0a:76:d4:a5:bc:10 + Signature Value: + 30:65:02:30:3a:8b:21:f1:bd:7e:11:ad:d0:ef:58:96:2f:d6: + eb:9d:7e:90:8d:2b:cf:66:55:c3:2c:e3:28:a9:70:0a:47:0e: + f0:37:59:12:ff:2d:99:94:28:4e:2a:4f:35:4d:33:5a:02:31: + 00:ea:75:00:4e:3b:c4:3a:94:12:91:c9:58:46:9d:21:13:72: + a7:88:9c:8a:e4:4c:4a:db:96:d4:ac:8b:6b:6b:49:12:53:33: + ad:d7:e4:be:24:fc:b5:0a:76:d4:a5:bc:10 SHA1 Fingerprint=F6:10:84:07:D6:F8:BB:67:98:0C:C2:E2:44:C2:EB:AE:1C:EF:63:BE -----BEGIN CERTIFICATE----- MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5 diff --git a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem index b65333ef383d..736143dc94ff 100644 --- a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem +++ b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem @@ -23,7 +23,7 @@ Certificate: Subject: CN = Atos TrustedRoot 2011, O = Atos, C = DE Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:95:85:3b:97:6f:2a:3b:2e:3b:cf:a6:f3:29:35: be:cf:18:ac:3e:aa:d9:f8:4d:a0:3e:1a:47:b9:bc: @@ -50,29 +50,28 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: *** 10317 LINES SKIPPED *** From nobody Sat Aug 26 14:31: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 4RXzl86c8sz4qZcb; Sat, 26 Aug 2023 14:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RXzl85qYyz3KlJ; Sat, 26 Aug 2023 14:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693060260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i18bFLBjYEOfCgKGLzpP1vSSTZJBSPQD2kMYYApG3Z4=; b=In4kzi69HY7aRL+RLVbms6mAD/uj/8uSds/Uxu/44KNZ6qI2HqdrMhqCRIGUzkOHtdgEnC fyZsqwg60OUxQ+7mEzFSYhqp0dncEjw2qZsVanAvDy59U9rCOBLiTaoMjBgVJn28qgUbqr 166GhSxJs5sNCpABc8IvR1ee0Wk4FdfItP8WenmjM0i0nwI5EThB5TfuUP5KRuo5Q3LlzM 8q0Fvs3ust0bDBEd9GPIlbZsn3MlOOnFX0Ob+b67LNc5AE800QniuIKLGMlLxHp8GV2gDG Yg4kGjksS2l0APmHtUy8VVh8FpZ6atstxfHq+chBOeWRITE4+pIFiRaTgARB7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693060260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i18bFLBjYEOfCgKGLzpP1vSSTZJBSPQD2kMYYApG3Z4=; b=EFrhXwC1g81tn6IdHI0a4W8Xg1a1EROGvuYFpVQvuA7KV+WY06MEJhqR9y5C/u5d8xPo4T NaTB97tKXOI1QPjzVr9WrluLOKaGgfzeK/KA69ympuq/ZNu7TwDte8AdNDltX8FmjPi5AF ymBOiAvqBZo7lCiN7fCU/Sgf1x6N4fZesbAfogciEYqHzEKm4WDZ15jGscT2/waFYcNCkf IS6T9ZhbnSAmYJZ2Kj0WpJEPE16KE8K4fXT2PW8DbFe6cP0teRbzxXix/eHBLBF9fzHOd0 CHFw/dJW6zCHSB7hFFA7OV1210CCjPTwGEdhymYsV6TDnPKEcFR3jy5bo7UIBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693060260; a=rsa-sha256; cv=none; b=xUDMkJkYODf+RGoWVbIJqkf3FqSrtvTE8yo5rLJVR9mrwtnMpx64nwaP6nNp2Q+2YVOLs8 TLkmH7qUHz16bYzpqFJHz+NmZ719DBO6SEhR/+AvhIG9G+CCajr0WI+ntqo5SRpeUXZ2PJ nlWTMnytW1JMT63eN3htBGYwxZvRBk4/mziYRpkcWwHDZoxwf725IjTnnpJM/0+90SK4Yc jrerBkLGnNtCPj21ltG0/l4nkvUCVVqqSQ4LGQPlF+G0uh1QtXki5m44NfabTKXsaFOsKZ QZXebyVnXjIGLEE4x/+97u/cbChKFDM1UNkCPRE+nLdbQqAr43iyqTqMbpOwNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXzl84d0DzdQr; Sat, 26 Aug 2023 14:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37QEV0er090382; Sat, 26 Aug 2023 14:31:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37QEV0UF090379; Sat, 26 Aug 2023 14:31:00 GMT (envelope-from git) Date: Sat, 26 Aug 2023 14:31:00 GMT Message-Id: <202308261431.37QEV0UF090379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: b5c4616582ce - main - Fix MNT_IGNORE for devfs, fdescfs and nullfs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5c4616582cebdcf4dee909a3c2f5b113c4ae59e Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=b5c4616582cebdcf4dee909a3c2f5b113c4ae59e commit b5c4616582cebdcf4dee909a3c2f5b113c4ae59e Author: Doug Rabson AuthorDate: 2023-08-26 09:32:32 +0000 Commit: Doug Rabson CommitDate: 2023-08-26 11:08:37 +0000 Fix MNT_IGNORE for devfs, fdescfs and nullfs The MNT_IGNORE flag can be used to mark certain filesystem mounts so that utilities such as df(1) and mount(8) can filter out those mounts by default. This can be used, for instance, to reduce the noise from running container workloads inside jails which often have at least three and sometimes as many as ten mounts per container. The flag is supplied by the nmount(2) system call and is recorded so that it can be reported by statfs(2). Unfortunately several filesystems override the default behaviour and mask out the flag, defeating its purpose. This change preserves the MNT_IGNORE flag for those filesystems so that it can be reported correctly. MFC after: 1 week --- sys/fs/devfs/devfs_vfsops.c | 2 +- sys/fs/fdescfs/fdesc_vfsops.c | 2 +- sys/fs/nullfs/null_vfsops.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c index a81a63ebf27a..dbc29fbe4d78 100644 --- a/sys/fs/devfs/devfs_vfsops.c +++ b/sys/fs/devfs/devfs_vfsops.c @@ -224,7 +224,7 @@ static int devfs_statfs(struct mount *mp, struct statfs *sbp) { - sbp->f_flags = 0; + sbp->f_flags = mp->mnt_flag & MNT_IGNORE; sbp->f_bsize = DEV_BSIZE; sbp->f_iosize = DEV_BSIZE; sbp->f_blocks = 2; /* 1K to keep df happy */ diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index 309134798374..30924580dece 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -219,7 +219,7 @@ fdesc_statfs(struct mount *mp, struct statfs *sbp) freefd += (lim - fdp->fd_nfiles); FILEDESC_SUNLOCK(fdp); - sbp->f_flags = 0; + sbp->f_flags = mp->mnt_flag & MNT_IGNORE; sbp->f_bsize = DEV_BSIZE; sbp->f_iosize = DEV_BSIZE; sbp->f_blocks = 2; /* 1K to keep df happy */ diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 6acff89189f5..4b2954d5bea1 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -360,7 +360,7 @@ nullfs_statfs(struct mount *mp, struct statfs *sbp) /* now copy across the "interesting" information and fake the rest */ sbp->f_type = mstat->f_type; sbp->f_flags = (sbp->f_flags & (MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | - MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED)) | + MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_IGNORE)) | (mstat->f_flags & ~(MNT_ROOTFS | MNT_AUTOMOUNTED)); sbp->f_bsize = mstat->f_bsize; sbp->f_iosize = mstat->f_iosize; From nobody Sat Aug 26 14:32: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 4RXzmT46K6z4qZdX; Sat, 26 Aug 2023 14:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RXzmT3dC2z3LNf; Sat, 26 Aug 2023 14:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693060329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nDopRmdcrkGZVBP9yYFLjznFGZMHfUsibB449XDgHQc=; b=XB6a8Twd44IfbkDGwaHyOGbzo4Tpq5N6+3SFEROnxG+1gyTmgWR1Nm/VaKtqNTC0UWIKsA 9CuvFVM6lKnv2ngTsAIa1LJozClv34LbbcnkHsPpgzSlDzwzWzCMwTfdjcQaLLYtpOY1BT e+rp1dTE/pcTmRGV4NU7nUAKGT6TDm2EDiGwa5LQtL3xczFTn39+b1If721dSqOjH/kFpg tz/L9EEOJuJarQxrmsP0INShW6/fk26nJPhEqVLG/kffuuvoPYY4cLAIuxpVOYMUxvZHFb tzPgRqteyl8l2/Htv3VulWGPHNgexZZkI3O+FOrvrqsEV6s65bGAVPPbvvgbkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693060329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nDopRmdcrkGZVBP9yYFLjznFGZMHfUsibB449XDgHQc=; b=ZxUBDPr/LGEeK9O0ZPDpI1r7IsJtOzwM8SiCOOUix6VeRgPAqOo5HFgYO+NfwqzuqSk6hT Xk0HsbFgO5zn0sxkCxZQLcaQV6Aqmvc4dT79txjYRNDBGQM0idc0JINtsUInuVWRm7nOEO b7PYq178iQL2zhqnIp//bKv1h48TNj7ChMXwF2Y7EwZiURopL0+UUX8Chdhj9UpIIbsu0e ALs6hqxxbtqkN8wdUJRrTw/rr6m36HLa3JsCdTcFNp1CwQRnzAVQR0fth4CmpwM1GGbZWG TTGWeWqR0Ma1+95xZ8U0238lHWBV7GfHACUur2TpLcg23VtwxitUZCUvqsWoHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693060329; a=rsa-sha256; cv=none; b=ZN21DQiTaCmyt/A9QoKeuovQMXnJ0fH34VbaVxu3u6/xICCLuZ6IhCkfl+rbFgglhuFAUH GtN0RIwNItfRoL5GWj6Un2mb4/d5NDmALeJdKsv9/E9n/zrP5kvVfsWlkaGGWkStEoOUq+ fDPX3uD/fL6sPYumq6R3gKWf3nBK3AIuwf3xTHhy92DLmf3nwVaukpvEJZc3rRDcAlQOOW Taf+1LOxBZ/Ch6zr5DL3xEyTfVAoM2OJMS1PlWUMbR/V5fmBFF5SDMy3Kw6mEXSDo2J5Sy B6qxqbdf7fwYoZmm+Big3Y8hZusN89+Dy2nyoQHZQ0PQujthKHror/7jfHXZdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXzmT2NfGzf1d; Sat, 26 Aug 2023 14:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37QEW9ik094098; Sat, 26 Aug 2023 14:32:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37QEW9jM094091; Sat, 26 Aug 2023 14:32:09 GMT (envelope-from git) Date: Sat, 26 Aug 2023 14:32:09 GMT Message-Id: <202308261432.37QEW9jM094091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: db5505172906 - main - dtsec: Support multicast receive. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db55051729066a8b162fe2f05e0e2b6c29907e8b Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=db55051729066a8b162fe2f05e0e2b6c29907e8b commit db55051729066a8b162fe2f05e0e2b6c29907e8b Author: Justin Hibbits AuthorDate: 2023-08-25 15:36:35 +0000 Commit: Justin Hibbits CommitDate: 2023-08-26 14:32:12 +0000 dtsec: Support multicast receive. Implemented based on the tsec(4) multicast support. This is the minimum required to support VLANs. The hardware does support vlan tagging, among other acceleration features, which will be added at a later time. MFC after: 2 weeks --- sys/dev/dpaa/if_dtsec.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/sys/dev/dpaa/if_dtsec.c b/sys/dev/dpaa/if_dtsec.c index 2c0dee05a03f..de5ca75c9a77 100644 --- a/sys/dev/dpaa/if_dtsec.c +++ b/sys/dev/dpaa/if_dtsec.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include "fman.h" @@ -69,6 +70,7 @@ #define DTSEC_MAX_FRAME_SIZE 9600 #define DTSEC_REG_MAXFRM 0x110 +#define DTSEC_REG_GADDR(i) (0x0a0 + 4*(i)) /** * @group dTSEC private defines. @@ -338,6 +340,33 @@ dtsec_set_mtu(struct dtsec_softc *sc, unsigned int mtu) return (0); } +static u_int +dtsec_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) +{ + struct dtsec_softc *sc = arg; + + FM_MAC_AddHashMacAddr(sc->sc_mach, (t_EnetAddr *)LLADDR(sdl)); + + return (1); +} + +static void +dtsec_setup_multicast(struct dtsec_softc *sc) +{ + int i; + + if (if_getflags(sc->sc_ifnet) & IFF_ALLMULTI) { + for (i = 0; i < 8; i++) + bus_write_4(sc->sc_mem, DTSEC_REG_GADDR(i), 0xFFFFFFFF); + + return; + } + + fman_dtsec_reset_filter_table(rman_get_virtual(sc->sc_mem), + true, false); + if_foreach_llmaddr(sc->sc_ifnet, dtsec_hash_maddr, sc); +} + static int dtsec_if_enable_locked(struct dtsec_softc *sc) { @@ -357,6 +386,8 @@ dtsec_if_enable_locked(struct dtsec_softc *sc) if (error != E_OK) return (EIO); + dtsec_setup_multicast(sc); + if_setdrvflagbits(sc->sc_ifnet, IFF_DRV_RUNNING, 0); /* Refresh link state */ @@ -686,7 +717,7 @@ dtsec_attach(device_t dev) if_setsoftc(ifp, sc); - if_setflags(ifp, IFF_SIMPLEX | IFF_BROADCAST); + if_setflags(ifp, IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST); if_setinitfn(ifp, dtsec_if_init); if_setstartfn(ifp, dtsec_if_start); if_setioctlfn(ifp, dtsec_if_ioctl); From nobody Sat Aug 26 18:22: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 4RY4tM1jCXz4qr45; Sat, 26 Aug 2023 18:22: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 4RY4tM13mqz4G1c; Sat, 26 Aug 2023 18:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693074155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3/B/Ui7bte5746gchZ/kGpRKNjGQVuxAHVAHOrn20Z0=; b=EMox5uF/uh66Iayr1sYDtHyNTLQkvfip5DbCGQIm4herbEo35iYMmWoIJA4B4HXVlHoolC bQHuStCsydZKqp2l2ZD4lV/uAUAMyiuCd8DTiY5MX451s89NnIfEhPxNP45/NuSykPuoI0 RXrnMyzUU/Nj8teSjqBjwgrLKdBrpAcSpunkZ0+ni7wdNu/z2VqDMUFE264FP6Zq0E2Sf0 zjioUo6QCc3WfbCjic5fhMlI+mDygD0Op5OYL2FofqxoZrgw0npBbAksskICZsvmupuk6V wiwtU3ZaXJvCWDg5+lSYzoHrRMWPNKS9Lyr5zd6wfy+xk2ED3/pjuOrKiKpWow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693074155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3/B/Ui7bte5746gchZ/kGpRKNjGQVuxAHVAHOrn20Z0=; b=MLxTonxsQf0qZFJfDVcWDW27ipeqiXOHyxcvD2yZHhDUOJRD1Glbo9zuZj85pjZa19RYzA +uRcqTEjI5M2TS1lWxdHOi9e+2wntWFZYc2Paa03bZALZrGsaSTMq01vzjdcs4wnsiSGUA 5VfAc+W9y1u1jCt4Bah5qazAOiy9EzXyCArTl/4W2p4qyDbbqhP/9tBhb0pLD4XPeRx12I 7Lg7fLFWWl45yFdYkyfKpMDqhXxuUxmeGl4jRccOji+YPYEcqBEd+6COhoajwoj71YZLX8 WvM/HXipdEV3xvhoBp8uForQeDjSXUriMl9SMu2oTXAuxeHMQc2wWDdJgejNXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693074155; a=rsa-sha256; cv=none; b=gG8iPLAqub/T2avX/8rN/kOfwqOqbqGp8HUO+/Utk4gkerIP8AYAaddvZwmAZKK4u+3ETk y+g2D4GUqQefhpjMrOoe9CH6wxSdoJ51+FiO1ZfguprFch8jXw7rj8npc9+75pHmiYIpf4 DblxMn8H6FotMc1vWxAGJdtMy31zbNXSGytn1oVTYcvnVFOKK6rRUMa2PXA6pw6bZLGd+y AyimKW8kKBpFNWKxzzWVhh+XjstgtGWBDiqsY9MtDPmdoYJgOHhDPcrWIUT62AAUgA924J ggVQZOAZA32L4hPncYdmE8w+/Z+rtO9Aokc+BdsRUXPmrYOETl/OPf+g1zssrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RY4tM06mFzlfT; Sat, 26 Aug 2023 18:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37QIMYXx080394; Sat, 26 Aug 2023 18:22:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37QIMYc0080391; Sat, 26 Aug 2023 18:22:34 GMT (envelope-from git) Date: Sat, 26 Aug 2023 18:22:34 GMT Message-Id: <202308261822.37QIMYc0080391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: b67a8f006d3c - stable/13 - etc: remove leftover leading empty comments, blank lines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b67a8f006d3c35062c506b2cf575eb55798493b6 Auto-Submitted: auto-generated The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=b67a8f006d3c35062c506b2cf575eb55798493b6 commit b67a8f006d3c35062c506b2cf575eb55798493b6 Author: Mike Karels AuthorDate: 2023-08-22 18:03:28 +0000 Commit: Mike Karels CommitDate: 2023-08-26 18:20:25 +0000 etc: remove leftover leading empty comments, blank lines Remove leftover empty leading comments/blank lines that had been spacers between $FreeBSD$ and the following content in config files in src/etc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41548 (cherry picked from commit 9d6049d5da8ce70b3f815431bdedcee9c04f60cc) --- etc/group | 1 - etc/mail/Makefile | 2 -- etc/master.passwd | 1 - etc/mtree/Makefile | 1 - etc/mtree/README | 1 - etc/root/dot.k5login | 1 - etc/shells | 1 - 7 files changed, 8 deletions(-) diff --git a/etc/group b/etc/group index c9aa917b99f0..35df51838ae4 100644 --- a/etc/group +++ b/etc/group @@ -1,4 +1,3 @@ -# wheel:*:0:root daemon:*:1: kmem:*:2: diff --git a/etc/mail/Makefile b/etc/mail/Makefile index bbbdc1a96dc6..fd4801b0c336 100644 --- a/etc/mail/Makefile +++ b/etc/mail/Makefile @@ -1,5 +1,3 @@ -# -# # This Makefile provides an easy way to generate the configuration # file and database maps for the sendmail(8) daemon. # diff --git a/etc/master.passwd b/etc/master.passwd index de05fbfca808..11707f401e5a 100644 --- a/etc/master.passwd +++ b/etc/master.passwd @@ -1,4 +1,3 @@ -# root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile index 1fa51e4a8153..1a70f5fd3a52 100644 --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= mtree diff --git a/etc/mtree/README b/etc/mtree/README index fd4a062552d9..bd813057b5bd 100644 --- a/etc/mtree/README +++ b/etc/mtree/README @@ -1,4 +1,3 @@ - Note: If you modify these files, please keep hier(7) updated! These files are used to create empty file hierarchies for building the diff --git a/etc/root/dot.k5login b/etc/root/dot.k5login index 5721e640fe21..c3b55dfc6f0b 100644 --- a/etc/root/dot.k5login +++ b/etc/root/dot.k5login @@ -1,3 +1,2 @@ -# # user1/root@YOUR.REALM.WHEREVER # user2/root@YOUR.REALM.WHEREVER diff --git a/etc/shells b/etc/shells index a8b2942e1257..0e8674ba884d 100644 --- a/etc/shells +++ b/etc/shells @@ -1,4 +1,3 @@ -# # List of acceptable shells for chpass(1). # Ftpd will not allow users to connect who are not using # one of these shells. From nobody Sat Aug 26 19:12: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 4RY6091pynz4qtRC; Sat, 26 Aug 2023 19:12: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 4RY6086pfgz4JVF; Sat, 26 Aug 2023 19:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693077161; h=from:from:reply-to:subject:subject: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/XxVSRDpHW5ddojTfQlfsilgscs1SHmizM0QyRHRM=; b=H4hdT5nqE9huyx0/t2RKtiFG2EYMZFiDjWjbDSpP4JsDv97egsbOyZdin+YR/y5lsh7gmE bBjNuDE+Dgbs+51iUbuX6FZpyj7aYNjoyx0w5ly5h5qwVdiumaG/cuAn/bUpNYBYOGIJ7F HTZPo/gjaAlXuUsOp1H5dMmmWnuQkmI/cX9g1OjiwPmSdzYxn/rKAMKrv+Y+VEaHNXM/pu CsS7Ap/WFScvEf2o7vP7U570kP3hI3+554PStc5jwv//YRNURiDp8CgW/2z1FjT3JsM9R5 APkYkHErbx/G1p0UaiMNZp91cUMWeE2SOg7/MYti7ApoePuTvZ3Ne9uWeRBMuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693077161; h=from:from:reply-to:subject:subject: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/XxVSRDpHW5ddojTfQlfsilgscs1SHmizM0QyRHRM=; b=TjBrIHCHaZ8I+fkUfw5vGQJpEmVGbAqLLcHm7+wsXPz6yjA4Z9EJ/LU7ZwVRo/CHGjlDAu gdI4eb/UMTL/O+pW5v72ppkhN1RnC0mrLbHb3qL2Nx1MCY/vrxfV2OTSAKodtdJZIOy3BF 6aCj2pOsh6x/TVeAdGUnRx87qZYoUOAvA/79faAG8h33uqpHrYgcRvn6KM1oUQt9zU5HD9 kPADNW8n1qAZFIhHiiSNUzFrW/P8WDP9wfNvA6jEprKMm29u5hBEisYIPtCAa+kvJP4GC1 pPNoMxTgKOMp9FMbTMFfryJ5q+Hvuk9CB21TS5ADSymHrpDZ0UBuCO2nqzWgLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693077161; a=rsa-sha256; cv=none; b=iDnIMG7Y9u3A2Z9Q9WBj7+Bg0C90bFVO7nUpNpHqSSwxcM2D2Agsqf1coomTLIQMKEk6fp uPNBs3m7pp2iAPBbZwzyC35L+mUtqRoJb6LIZ5ea2MWCTti/ZKHYKu2O4rkEL75UR7uZLf l1i738U7vGulgz9Fz9ZAXwpA0AmBypvTrmapKvddmpF9UapI72lajhJjqDibmF50vYNzWL jzUTjzxdG4iUpAFAxZ69oPeAy0t5QQ7zVj9V9stzjQivIWzGvKpvdf6SvPme/o+rAgI0H/ 7uqPEvbSDfa5mkM7h7mzg4IRgnUpHYCf+GuvFB/Okonlzmz5fHa37z4fDHXhwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RY6085tvtzn00; Sat, 26 Aug 2023 19:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37QJCevN063966; Sat, 26 Aug 2023 19:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37QJCesb063964; Sat, 26 Aug 2023 19:12:40 GMT (envelope-from git) Date: Sat, 26 Aug 2023 19:12:40 GMT Message-Id: <202308261912.37QJCesb063964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: b3a714652ff0 - main - kqueue(9): sweep references to knlist_remove_inevent() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3a714652ff00f83b2072caaa1fd8b9699c93789 Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=b3a714652ff00f83b2072caaa1fd8b9699c93789 commit b3a714652ff00f83b2072caaa1fd8b9699c93789 Author: Robert Wing AuthorDate: 2023-08-26 19:11:50 +0000 Commit: Robert Wing CommitDate: 2023-08-26 19:11:50 +0000 kqueue(9): sweep references to knlist_remove_inevent() knlist_remove_inevent() gone in 9e590ff04b687e910579a5851d95cedf9eb10bfd --- ObsoleteFiles.inc | 3 +++ share/man/man9/Makefile | 1 - share/man/man9/kqueue.9 | 17 ++--------------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 47709c00667d..c2780a84eb6d 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20230826: +OLD_FILES+=usr/share/man/man9/knlist_remove_inevent.9.gz + # 20230825: caroot bundle updated OLD_FILES+=usr/share/certs/trusted/E-Tugra_Certification_Authority.pem OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index eb670c924077..07a107b4bd7d 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1394,7 +1394,6 @@ MLINKS+=kqueue.9 knlist_add.9 \ kqueue.9 knlist_init.9 \ kqueue.9 knlist_init_mtx.9 \ kqueue.9 knlist_remove.9 \ - kqueue.9 knlist_remove_inevent.9 \ kqueue.9 knote_fdclose.9 \ kqueue.9 KNOTE_LOCKED.9 \ kqueue.9 KNOTE_UNLOCKED.9 \ diff --git a/share/man/man9/kqueue.9 b/share/man/man9/kqueue.9 index 28a948481e3e..ddd834bb1807 100644 --- a/share/man/man9/kqueue.9 +++ b/share/man/man9/kqueue.9 @@ -30,7 +30,7 @@ .Nm kqfd_register , .Nm knote_fdclose , .Nm knlist_init , knlist_init_mtx , -.Nm knlist_add , knlist_remove , knlist_remove_inevent , knlist_empty , +.Nm knlist_add , knlist_remove , knlist_empty , .Nm knlist_clear , knlist_delete , knlist_destroy , .Nm KNOTE_LOCKED , KNOTE_UNLOCKED .Nd "event delivery subsystem" @@ -58,8 +58,6 @@ .Fn knlist_add "struct knlist *knl" "struct knote *kn" "int islocked" .Ft void .Fn knlist_remove "struct knlist *knl" "struct knote *kn" "int islocked" -.Ft void -.Fn knlist_remove_inevent "struct knlist *knl" "struct knote *kn" .Ft int .Fn knlist_empty "struct knlist *knl" .Ft void @@ -157,8 +155,7 @@ function will be called to detach the if the .Vt knote has not already been detached by a call to -.Fn knlist_remove , -.Fn knlist_remove_inevent +.Fn knlist_remove or .Fn knlist_delete . The list @@ -186,16 +183,6 @@ The .Va kn_data value should be updated as necessary to reflect the current value, such as number of bytes available for reading, or buffer space available for writing. -If the note needs to be removed, -.Fn knlist_remove_inevent -must be called. -The function -.Fn knlist_remove_inevent -will remove the note from the list, the -.Va f_detach -function will not be called and the -.Vt knote -will not be returned as an event. .Pp Locks .Em must not